diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 2ac30d2f17..c4de781a23 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -9,6 +9,7 @@
 /Resources/ServerInfo/Guidebook/ServerRules/ @crazybrain23
 
 /Resources/Prototypes/Maps/** @Emisse @ArtisticRoomba
+/Resources/Maps/** @Emisse @ArtisticRoomba
 
 /Resources/Prototypes/Body/ @DrSmugleaf # suffering
 /Resources/Prototypes/Entities/Mobs/Player/ @DrSmugleaf
diff --git a/Content.Benchmarks/PvsBenchmark.cs b/Content.Benchmarks/PvsBenchmark.cs
index 1edbcb6448..51a013539e 100644
--- a/Content.Benchmarks/PvsBenchmark.cs
+++ b/Content.Benchmarks/PvsBenchmark.cs
@@ -6,7 +6,6 @@ using BenchmarkDotNet.Attributes;
 using Content.IntegrationTests;
 using Content.IntegrationTests.Pair;
 using Content.Server.Mind;
-using Content.Server.Warps;
 using Content.Shared.Warps;
 using Robust.Shared;
 using Robust.Shared.Analyzers;
diff --git a/Content.Client/Administration/Components/HeadstandComponent.cs b/Content.Client/Administration/Components/HeadstandComponent.cs
deleted file mode 100644
index a4e3bfc5aa..0000000000
--- a/Content.Client/Administration/Components/HeadstandComponent.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Content.Shared.Administration.Components;
-using Robust.Shared.GameStates;
-
-namespace Content.Client.Administration.Components;
-
-[RegisterComponent]
-public sealed partial class HeadstandComponent : SharedHeadstandComponent
-{
-
-}
diff --git a/Content.Client/Administration/Systems/HeadstandSystem.cs b/Content.Client/Administration/Systems/HeadstandSystem.cs
index d0634e4ddd..8ab337f3cc 100644
--- a/Content.Client/Administration/Systems/HeadstandSystem.cs
+++ b/Content.Client/Administration/Systems/HeadstandSystem.cs
@@ -1,4 +1,4 @@
-using Content.Client.Administration.Components;
+using Content.Shared.Administration.Components;
 using Robust.Client.GameObjects;
 
 namespace Content.Client.Administration.Systems;
diff --git a/Content.Client/Animals/Systems/ParrotMemorySystem.cs b/Content.Client/Animals/Systems/ParrotMemorySystem.cs
new file mode 100644
index 0000000000..cdf62a4eae
--- /dev/null
+++ b/Content.Client/Animals/Systems/ParrotMemorySystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared.Animals.Systems;
+
+namespace Content.Client.Animals.Systems;
+
+public sealed class ParrotMemorySystem : SharedParrotMemorySystem;
diff --git a/Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs b/Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs
index 15ebc8a993..d96980fb1d 100644
--- a/Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs
+++ b/Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs
@@ -1,6 +1,6 @@
 using Content.Shared.Anomaly.Components;
 using Content.Shared.Anomaly.Effects;
-using Content.Shared.Body.Components;
+using Content.Shared.Humanoid;
 using Robust.Client.GameObjects;
 
 namespace Content.Client.Anomaly.Effects;
@@ -25,9 +25,8 @@ public sealed class ClientInnerBodyAnomalySystem : SharedInnerBodyAnomalySystem
 
         var index = _sprite.LayerMapReserve((ent.Owner, sprite), ent.Comp.LayerMap);
 
-        if (TryComp<BodyComponent>(ent, out var body) &&
-            body.Prototype is not null &&
-            ent.Comp.SpeciesSprites.TryGetValue(body.Prototype.Value, out var speciesSprite))
+        if (TryComp<HumanoidAppearanceComponent>(ent, out var humanoidAppearance) &&
+            ent.Comp.SpeciesSprites.TryGetValue(humanoidAppearance.Species, out var speciesSprite))
         {
             _sprite.LayerSetSprite((ent.Owner, sprite), index, speciesSprite);
         }
diff --git a/Content.Client/Atmos/EntitySystems/PipeColorVisualizerSystem.cs b/Content.Client/Atmos/EntitySystems/PipeColorVisualizerSystem.cs
index b23a44e403..5595f441f7 100644
--- a/Content.Client/Atmos/EntitySystems/PipeColorVisualizerSystem.cs
+++ b/Content.Client/Atmos/EntitySystems/PipeColorVisualizerSystem.cs
@@ -1,46 +1,11 @@
 using Content.Client.Atmos.Components;
 using Robust.Client.GameObjects;
-using Content.Client.UserInterface.Systems.Storage.Controls;
 using Content.Shared.Atmos.Piping;
-using Content.Shared.Hands;
-using Content.Shared.Atmos.Components;
-using Content.Shared.Item;
 
 namespace Content.Client.Atmos.EntitySystems;
 
 public sealed class PipeColorVisualizerSystem : VisualizerSystem<PipeColorVisualsComponent>
 {
-    [Dependency] private readonly SharedItemSystem _itemSystem = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<PipeColorVisualsComponent, GetInhandVisualsEvent>(OnGetVisuals);
-        SubscribeLocalEvent<PipeColorVisualsComponent, BeforeRenderInGridEvent>(OnDrawInGrid);
-    }
-
-    /// <summary>
-    ///     This method is used to display the color changes of the pipe on the screen..
-    /// </summary>
-    private void OnGetVisuals(Entity<PipeColorVisualsComponent> item, ref GetInhandVisualsEvent args)
-    {
-        foreach (var (_, layerData) in args.Layers)
-        {
-            if (TryComp(item.Owner, out AtmosPipeColorComponent? pipeColor))
-                layerData.Color = pipeColor.Color;
-        }
-    }
-
-    /// <summary>
-    ///     This method is used to change the pipe's color in a container grid.
-    /// </summary>
-    private void OnDrawInGrid(Entity<PipeColorVisualsComponent> item, ref BeforeRenderInGridEvent args)
-    {
-        if (TryComp(item.Owner, out AtmosPipeColorComponent? pipeColor))
-            args.Color = pipeColor.Color;
-    }
-
     protected override void OnAppearanceChange(EntityUid uid, PipeColorVisualsComponent component, ref AppearanceChangeEvent args)
     {
         if (TryComp<SpriteComponent>(uid, out var sprite)
@@ -50,8 +15,6 @@ public sealed class PipeColorVisualizerSystem : VisualizerSystem<PipeColorVisual
             var layer = sprite[PipeVisualLayers.Pipe];
             layer.Color = color.WithAlpha(layer.Color.A);
         }
-
-        _itemSystem.VisualsChanged(uid);
     }
 }
 
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml.cs b/Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml.cs
index 8502cd2712..8586049cb1 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml.cs
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml.cs
@@ -59,7 +59,7 @@ public sealed partial class PumpControl : BoxContainer
 
         foreach (var value in Enum.GetValues<VentPumpDirection>())
         {
-            _pumpDirection.AddItem(Loc.GetString($"{value}"), (int) value);
+            _pumpDirection.AddItem(Loc.GetString($"air-alarm-ui-pump-direction-{value.ToString().ToLower()}"), (int) value);
         }
 
         _pumpDirection.SelectId((int) _data.PumpDirection);
@@ -72,7 +72,7 @@ public sealed partial class PumpControl : BoxContainer
 
         foreach (var value in Enum.GetValues<VentPressureBound>())
         {
-            _pressureCheck.AddItem(Loc.GetString($"{value}"), (int) value);
+            _pressureCheck.AddItem(Loc.GetString($"air-alarm-ui-pressure-bound-{value.ToString().ToLower()}"), (int) value);
         }
 
         _pressureCheck.SelectId((int) _data.PressureChecks);
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml b/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml
index 34c1a9dd1a..c26aa2cf6e 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml
@@ -27,9 +27,15 @@
                 </BoxContainer>
                 <!-- Lower row: every single gas -->
                 <Collapsible Margin="2 2 2 2">
-                    <CollapsibleHeading Title="Gas filters" />
+                    <CollapsibleHeading Title="{Loc 'air-alarm-ui-widget-gas-filters'}" />
                     <CollapsibleBody Margin="20 0 0 0">
-                        <GridContainer HorizontalExpand="True" Name="CGasContainer" Columns="3" />
+                        <BoxContainer Orientation="Vertical">
+                            <BoxContainer Margin="2">
+                                <Button Name="CSelectAll" Text="{Loc 'air-alarm-ui-scrubber-select-all-gases-label'}" />
+                                <Button Name="CDeselectAll" Text="{Loc 'air-alarm-ui-scrubber-deselect-all-gases-label'}" />
+                            </BoxContainer>
+                            <GridContainer Name="CGasContainer" Columns="3" />
+                        </BoxContainer>
                     </CollapsibleBody>
                 </Collapsible>
             </BoxContainer>
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs b/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs
index 9762f63992..70da57df2e 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs
@@ -1,15 +1,21 @@
 using Content.Shared.Atmos;
+using Content.Shared.Atmos.EntitySystems;
 using Content.Shared.Atmos.Monitor.Components;
 using Content.Shared.Atmos.Piping.Unary.Components;
+using Content.Shared.Atmos.Prototypes;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Atmos.Monitor.UI.Widgets;
 
 [GenerateTypedNameReferences]
 public sealed partial class ScrubberControl : BoxContainer
 {
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IEntityManager _entMan = default!;
+
     private GasVentScrubberData _data;
     private string _address;
 
@@ -22,12 +28,18 @@ public sealed partial class ScrubberControl : BoxContainer
     private FloatSpinBox _volumeRate => CVolumeRate;
     private CheckBox _wideNet => CWideNet;
     private Button _copySettings => CCopySettings;
+    private Button _selectAll => CSelectAll;
+    private Button _deselectAll => CDeselectAll;
 
     private GridContainer _gases => CGasContainer;
     private Dictionary<Gas, Button> _gasControls = new();
 
     public ScrubberControl(GasVentScrubberData data, string address)
     {
+
+        IoCManager.InjectDependencies(this);
+        var atmosphereSystem = _entMan.System<SharedAtmosphereSystem>();
+
         RobustXamlLoader.Load(this);
 
         Name = address;
@@ -61,7 +73,7 @@ public sealed partial class ScrubberControl : BoxContainer
 
         foreach (var value in Enum.GetValues<ScrubberPumpDirection>())
         {
-            _pumpDirection.AddItem(Loc.GetString($"{value}"), (int) value);
+            _pumpDirection.AddItem(Loc.GetString($"air-alarm-ui-pump-direction-{value.ToString().ToLower()}"), (int) value);
         }
 
         _pumpDirection.SelectId((int) _data.PumpDirection);
@@ -78,12 +90,28 @@ public sealed partial class ScrubberControl : BoxContainer
             ScrubberDataCopied?.Invoke(_data);
         };
 
-        foreach (var value in Enum.GetValues<Gas>())
+        var allGases = Enum.GetValues<Gas>();
+        _selectAll.OnPressed += _ =>
         {
+            _data.FilterGases = new HashSet<Gas>(allGases);
+            ScrubberDataChanged?.Invoke(_address, _data);
+        };
+
+        _deselectAll.OnPressed += _ =>
+        {
+            _data.FilterGases = [];
+            ScrubberDataChanged?.Invoke(_address, _data);
+        };
+
+        foreach (var value in allGases)
+        {
+            ProtoId<GasPrototype> gasProtoId = atmosphereSystem.GetGas(value);
+            var gasName = _prototypeManager.Index(gasProtoId).Name;
+
             var gasButton = new Button
             {
                 Name = value.ToString(),
-                Text = Loc.GetString($"{value}"),
+                Text = Loc.GetString(gasName),
                 ToggleMode = true,
                 HorizontalExpand = true,
                 Pressed = _data.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 9e88b0bff4..d9945b1acc 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml.cs
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml.cs
@@ -1,16 +1,22 @@
 using Content.Client.Message;
 using Content.Shared.Atmos;
+using Content.Shared.Atmos.EntitySystems;
 using Content.Shared.Atmos.Monitor;
+using Content.Shared.Atmos.Prototypes;
 using Content.Shared.Temperature;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Atmos.Monitor.UI.Widgets;
 
 [GenerateTypedNameReferences]
 public sealed partial class SensorInfo : BoxContainer
 {
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IEntityManager _entMan = default!;
+
     public Action<string, AtmosMonitorThresholdType, AtmosAlarmThreshold, Gas?>? OnThresholdUpdate;
     public event Action<AtmosSensorData>? SensorDataCopied;
     private string _address;
@@ -23,6 +29,9 @@ public sealed partial class SensorInfo : BoxContainer
 
     public SensorInfo(AtmosSensorData data, string address)
     {
+        IoCManager.InjectDependencies(this);
+        var atmosphereSystem = _entMan.System<SharedAtmosphereSystem>();
+
         RobustXamlLoader.Load(this);
 
         _address = address;
@@ -45,8 +54,12 @@ public sealed partial class SensorInfo : BoxContainer
             var label = new RichTextLabel();
 
             var fractionGas = amount / data.TotalMoles;
+
+            ProtoId<GasPrototype> gasProtoId = atmosphereSystem.GetGas(gas);
+            var gasName = _prototypeManager.Index(gasProtoId).Name;
+
             label.SetMarkup(Loc.GetString("air-alarm-ui-gases-indicator",
-                ("gas", $"{gas}"),
+                ("gas", Loc.GetString(gasName)),
                 ("color", AirAlarmWindow.ColorForThreshold(fractionGas, data.GasThresholds[gas])),
                 ("amount", $"{amount:0.####}"),
                 ("percentage", $"{(100 * fractionGas):0.##}")));
@@ -54,7 +67,7 @@ public sealed partial class SensorInfo : BoxContainer
             _gasLabels.Add(gas, label);
 
             var threshold = data.GasThresholds[gas];
-            var gasThresholdControl = new ThresholdControl(Loc.GetString($"air-alarm-ui-thresholds-gas-title", ("gas", $"{gas}")), threshold, AtmosMonitorThresholdType.Gas, gas, 100);
+            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) =>
             {
@@ -90,6 +103,9 @@ public sealed partial class SensorInfo : BoxContainer
 
     public void ChangeData(AtmosSensorData data)
     {
+        IoCManager.InjectDependencies(this);
+        var atmosphereSystem = _entMan.System<SharedAtmosphereSystem>();
+
         SensorAddress.Title = Loc.GetString("air-alarm-ui-window-listing-title", ("address", _address), ("state", data.AlarmState));
 
         AlarmStateLabel.SetMarkup(Loc.GetString("air-alarm-ui-window-alarm-state-indicator",
@@ -112,8 +128,12 @@ public sealed partial class SensorInfo : BoxContainer
             }
 
             var fractionGas = amount / data.TotalMoles;
+
+            ProtoId<GasPrototype> gasProtoId = atmosphereSystem.GetGas(gas);
+            var gasName = _prototypeManager.Index(gasProtoId).Name;
+
             label.SetMarkup(Loc.GetString("air-alarm-ui-gases-indicator",
-                ("gas", $"{gas}"),
+                ("gas", Loc.GetString(gasName)),
                 ("color", AirAlarmWindow.ColorForThreshold(fractionGas, data.GasThresholds[gas])),
                 ("amount", $"{amount:0.####}"),
                 ("percentage", $"{(100 * fractionGas):0.##}")));
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml b/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml
index 0d5e741d0f..7ce21fdd78 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml
@@ -2,6 +2,6 @@
     HorizontalExpand="True" Orientation="Vertical"
             Margin = "20 0 0 0" MinSize="160 0" >
     <Label Name="CBoundLabel" HorizontalAlignment="Center" />
-    <CheckBox Name="CBoundEnabled" HorizontalAlignment="Center" Text="{Loc 'Enable'}" Pressed="True" />
+    <CheckBox Name="CBoundEnabled" HorizontalAlignment="Center" Text="{Loc 'air-alarm-ui-widget-enable'}" Pressed="True" />
     <FloatSpinBox Name="CSpinner" />
 </BoxContainer>
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdControl.xaml b/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdControl.xaml
index 635a70f532..76fc1621ab 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdControl.xaml
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdControl.xaml
@@ -6,7 +6,7 @@
         <CollapsibleBody Margin="20 0 0 0">
             <BoxContainer Orientation="Vertical">
                 <BoxContainer Orientation="Horizontal">
-                    <CheckBox Name="CEnabled" Text="{Loc 'Enabled'}" />
+                    <CheckBox Name="CEnabled" Text="{Loc 'air-alarm-ui-widget-enable'}" />
                 </BoxContainer>
                 <!-- Upper row: Danger bounds -->
                 <BoxContainer Name="CDangerBounds" Orientation="Horizontal" Margin="0 0 0 2"/>
diff --git a/Content.Client/CardboardBox/CardboardBoxSystem.cs b/Content.Client/CardboardBox/CardboardBoxSystem.cs
index e52ce03a76..ecebe16727 100644
--- a/Content.Client/CardboardBox/CardboardBoxSystem.cs
+++ b/Content.Client/CardboardBox/CardboardBoxSystem.cs
@@ -1,8 +1,8 @@
 using System.Numerics;
-using Content.Shared.Body.Components;
 using Content.Shared.CardboardBox;
 using Content.Shared.CardboardBox.Components;
 using Content.Shared.Examine;
+using Content.Shared.Mobs.Components;
 using Content.Shared.Movement.Components;
 using Robust.Client.GameObjects;
 
@@ -15,13 +15,13 @@ public sealed class CardboardBoxSystem : SharedCardboardBoxSystem
     [Dependency] private readonly ExamineSystemShared _examine = default!;
     [Dependency] private readonly SpriteSystem _sprite = default!;
 
-    private EntityQuery<BodyComponent> _bodyQuery;
+    private EntityQuery<MobStateComponent> _mobStateQuery;
 
     public override void Initialize()
     {
         base.Initialize();
 
-        _bodyQuery = GetEntityQuery<BodyComponent>();
+        _mobStateQuery = GetEntityQuery<MobStateComponent>();
 
         SubscribeNetworkEvent<PlayBoxEffectMessage>(OnBoxEffect);
     }
@@ -66,8 +66,8 @@ public sealed class CardboardBoxSystem : SharedCardboardBoxSystem
             if (!_examine.InRangeUnOccluded(sourcePos, mapPos, box.Distance, null))
                 continue;
 
-            // no effect for anything too exotic
-            if (!_bodyQuery.HasComp(mob))
+            // no effect for non-mobs that have MobMover, such as mechs and vehicles.
+            if (!_mobStateQuery.HasComp(mob))
                 continue;
 
             var ent = Spawn(box.Effect, mapPos);
diff --git a/Content.Client/Changeling/Transform/ChangelingTransformBoundUserInterface.cs b/Content.Client/Changeling/Transform/ChangelingTransformBoundUserInterface.cs
new file mode 100644
index 0000000000..8e383bc967
--- /dev/null
+++ b/Content.Client/Changeling/Transform/ChangelingTransformBoundUserInterface.cs
@@ -0,0 +1,35 @@
+using Content.Shared.Changeling.Transform;
+using JetBrains.Annotations;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.Changeling.Transform;
+
+[UsedImplicitly]
+public sealed partial class ChangelingTransformBoundUserInterface(EntityUid owner, Enum uiKey) : BoundUserInterface(owner, uiKey)
+{
+    private ChangelingTransformMenu? _window;
+
+    protected override void Open()
+    {
+        base.Open();
+
+        _window = this.CreateWindow<ChangelingTransformMenu>();
+
+        _window.OnIdentitySelect += SendIdentitySelect;
+    }
+
+    protected override void UpdateState(BoundUserInterfaceState state)
+    {
+        base.UpdateState(state);
+
+        if (state is not ChangelingTransformBoundUserInterfaceState current)
+            return;
+
+        _window?.UpdateState(current);
+    }
+
+    public void SendIdentitySelect(NetEntity identityId)
+    {
+        SendPredictedMessage(new ChangelingTransformIdentitySelectMessage(identityId));
+    }
+}
diff --git a/Content.Client/Changeling/Transform/ChangelingTransformMenu.xaml b/Content.Client/Changeling/Transform/ChangelingTransformMenu.xaml
new file mode 100644
index 0000000000..38ae0ec715
--- /dev/null
+++ b/Content.Client/Changeling/Transform/ChangelingTransformMenu.xaml
@@ -0,0 +1,8 @@
+<ui:RadialMenu
+    xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
+    CloseButtonStyleClass="RadialMenuCloseButton"
+    VerticalExpand="True"
+    HorizontalExpand="True">
+    <ui:RadialContainer Name="Main">
+    </ui:RadialContainer>
+</ui:RadialMenu>
diff --git a/Content.Client/Changeling/Transform/ChangelingTransformMenu.xaml.cs b/Content.Client/Changeling/Transform/ChangelingTransformMenu.xaml.cs
new file mode 100644
index 0000000000..beef9ae427
--- /dev/null
+++ b/Content.Client/Changeling/Transform/ChangelingTransformMenu.xaml.cs
@@ -0,0 +1,60 @@
+using System.Numerics;
+using Content.Client.UserInterface.Controls;
+using Content.Shared.Changeling.Transform;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Changeling.Transform;
+
+[GenerateTypedNameReferences]
+public sealed partial class ChangelingTransformMenu : RadialMenu
+{
+    [Dependency] private readonly IEntityManager _entity = default!;
+    public event Action<NetEntity>? OnIdentitySelect;
+
+    public ChangelingTransformMenu()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+    }
+
+    public void UpdateState(ChangelingTransformBoundUserInterfaceState state)
+    {
+        Main.DisposeAllChildren();
+        foreach (var identity in state.Identites)
+        {
+            var identityUid = _entity.GetEntity(identity);
+
+            if (!_entity.TryGetComponent<MetaDataComponent>(identityUid, out var metadata))
+                continue;
+
+            var identityName = metadata.EntityName;
+
+            var button = new ChangelingTransformMenuButton()
+            {
+                StyleClasses = { "RadialMenuButton" },
+                SetSize = new Vector2(64, 64),
+                ToolTip = identityName,
+            };
+
+            var entView = new SpriteView()
+            {
+                SetSize = new Vector2(48, 48),
+                VerticalAlignment = VAlignment.Center,
+                HorizontalAlignment = HAlignment.Center,
+                Stretch = SpriteView.StretchMode.Fill,
+            };
+            entView.SetEntity(identityUid);
+            button.OnButtonUp += _ =>
+            {
+                OnIdentitySelect?.Invoke(identity);
+                Close();
+            };
+            button.AddChild(entView);
+            Main.AddChild(button);
+        }
+    }
+}
+
+public sealed class ChangelingTransformMenuButton : RadialMenuTextureButtonWithSector;
diff --git a/Content.Client/Cloning/CloningSystem.cs b/Content.Client/Cloning/CloningSystem.cs
new file mode 100644
index 0000000000..9bfa230295
--- /dev/null
+++ b/Content.Client/Cloning/CloningSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared.Cloning;
+
+namespace Content.Client.Cloning;
+
+public sealed partial class CloningSystem : SharedCloningSystem;
diff --git a/Content.Client/Clothing/ClientClothingSystem.cs b/Content.Client/Clothing/ClientClothingSystem.cs
index 065179c714..8d53e90e34 100644
--- a/Content.Client/Clothing/ClientClothingSystem.cs
+++ b/Content.Client/Clothing/ClientClothingSystem.cs
@@ -59,7 +59,7 @@ public sealed class ClientClothingSystem : ClothingSystem
         base.Initialize();
 
         SubscribeLocalEvent<ClothingComponent, GetEquipmentVisualsEvent>(OnGetVisuals);
-        SubscribeLocalEvent<ClothingComponent, InventoryTemplateUpdated>(OnInventoryTemplateUpdated);
+        SubscribeLocalEvent<InventoryComponent, InventoryTemplateUpdated>(OnInventoryTemplateUpdated);
 
         SubscribeLocalEvent<InventoryComponent, VisualsChangedEvent>(OnVisualsChanged);
         SubscribeLocalEvent<SpriteComponent, DidUnequipEvent>(OnDidUnequip);
@@ -82,20 +82,19 @@ public sealed class ClientClothingSystem : ClothingSystem
         }
     }
 
-    private void OnInventoryTemplateUpdated(Entity<ClothingComponent> ent, ref InventoryTemplateUpdated args)
+    private void OnInventoryTemplateUpdated(Entity<InventoryComponent> ent, ref InventoryTemplateUpdated args)
     {
-        UpdateAllSlots(ent.Owner, clothing: ent.Comp);
+        UpdateAllSlots(ent.Owner, ent.Comp);
     }
 
     private void UpdateAllSlots(
         EntityUid uid,
-        InventoryComponent? inventoryComponent = null,
-        ClothingComponent? clothing = null)
+        InventoryComponent? inventoryComponent = null)
     {
         var enumerator = _inventorySystem.GetSlotEnumerator((uid, inventoryComponent));
         while (enumerator.NextItem(out var item, out var slot))
         {
-            RenderEquipment(uid, item, slot.Name, inventoryComponent, clothingComponent: clothing);
+            RenderEquipment(uid, item, slot.Name, inventoryComponent);
         }
     }
 
diff --git a/Content.Client/Commands/DebugCommands.cs b/Content.Client/Commands/DebugCommands.cs
index c4aa8847e4..ec9f74526e 100644
--- a/Content.Client/Commands/DebugCommands.cs
+++ b/Content.Client/Commands/DebugCommands.cs
@@ -1,53 +1,42 @@
 using Content.Client.Markers;
 using Content.Client.Popups;
 using Content.Client.SubFloor;
-using Content.Shared.SubFloor;
-using Robust.Client.GameObjects;
 using Robust.Shared.Console;
-using DrawDepth = Content.Shared.DrawDepth.DrawDepth;
 
 namespace Content.Client.Commands;
 
-internal sealed class ShowMarkersCommand : LocalizedCommands
+internal sealed class ShowMarkersCommand : LocalizedEntityCommands
 {
-    [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
+    [Dependency] private readonly MarkerSystem _markerSystem = default!;
 
     public override string Command => "showmarkers";
 
-    public override string Help => LocalizationManager.GetString($"cmd-{Command}-help", ("command", Command));
-
     public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        _entitySystemManager.GetEntitySystem<MarkerSystem>().MarkersVisible ^= true;
+        _markerSystem.MarkersVisible ^= true;
     }
 }
 
-internal sealed class ShowSubFloor : LocalizedCommands
+internal sealed class ShowSubFloor : LocalizedEntityCommands
 {
-    [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
+    [Dependency] private readonly SubFloorHideSystem _subfloorSystem = default!;
 
     public override string Command => "showsubfloor";
 
-    public override string Help => LocalizationManager.GetString($"cmd-{Command}-help", ("command", Command));
-
     public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        _entitySystemManager.GetEntitySystem<SubFloorHideSystem>().ShowAll ^= true;
+        _subfloorSystem.ShowAll ^= true;
     }
 }
 
-internal sealed class NotifyCommand : LocalizedCommands
+internal sealed class NotifyCommand : LocalizedEntityCommands
 {
-    [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
+    [Dependency] private readonly PopupSystem _popupSystem = default!;
 
     public override string Command => "notify";
 
-    public override string Help => LocalizationManager.GetString($"cmd-{Command}-help", ("command", Command));
-
     public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        var message = args[0];
-
-        _entitySystemManager.GetEntitySystem<PopupSystem>().PopupCursor(message);
+        _popupSystem.PopupCursor(args[0]);
     }
 }
diff --git a/Content.Client/Commands/MappingClientSideSetupCommand.cs b/Content.Client/Commands/MappingClientSideSetupCommand.cs
index 99a8ba00fe..70a383b5f6 100644
--- a/Content.Client/Commands/MappingClientSideSetupCommand.cs
+++ b/Content.Client/Commands/MappingClientSideSetupCommand.cs
@@ -1,32 +1,29 @@
 using Content.Client.Actions;
-using Content.Client.Mapping;
 using Content.Client.Markers;
-using JetBrains.Annotations;
+using Content.Client.SubFloor;
 using Robust.Client.Graphics;
-using Robust.Client.State;
 using Robust.Shared.Console;
 
 namespace Content.Client.Commands;
 
-[UsedImplicitly]
-internal sealed class MappingClientSideSetupCommand : LocalizedCommands
+internal sealed class MappingClientSideSetupCommand : LocalizedEntityCommands
 {
-    [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
     [Dependency] private readonly ILightManager _lightManager = default!;
+    [Dependency] private readonly ActionsSystem _actionSystem = default!;
+    [Dependency] private readonly MarkerSystem _markerSystem = default!;
+    [Dependency] private readonly SubFloorHideSystem _subfloorSystem = default!;
 
     public override string Command => "mappingclientsidesetup";
 
-    public override string Help => LocalizationManager.GetString($"cmd-{Command}-help", ("command", Command));
-
     public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        if (!_lightManager.LockConsoleAccess)
-        {
-            _entitySystemManager.GetEntitySystem<MarkerSystem>().MarkersVisible = true;
-            _lightManager.Enabled = false;
-            shell.ExecuteCommand("showsubfloor");
-            _entitySystemManager.GetEntitySystem<ActionsSystem>().LoadActionAssignments("/mapping_actions.yml", false);
-        }
+        if (_lightManager.LockConsoleAccess)
+            return;
+
+        _markerSystem.MarkersVisible = true;
+        _lightManager.Enabled = false;
+        _subfloorSystem.ShowAll = true;
+        _actionSystem.LoadActionAssignments("/mapping_actions.yml", false);
     }
 }
 
diff --git a/Content.Client/Damage/Systems/StaminaSystem.cs b/Content.Client/Damage/Systems/StaminaSystem.cs
index 046c72a8fa..67abb77674 100644
--- a/Content.Client/Damage/Systems/StaminaSystem.cs
+++ b/Content.Client/Damage/Systems/StaminaSystem.cs
@@ -4,6 +4,7 @@ using Content.Shared.Damage.Systems;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Systems;
 using Robust.Client.GameObjects;
+using Robust.Shared.Utility;
 
 namespace Content.Client.Damage.Systems;
 
@@ -104,6 +105,8 @@ public sealed partial class StaminaSystem : SharedStaminaSystem
 
     private void PlayAnimation(Entity<StaminaComponent, SpriteComponent> entity)
     {
+        DebugTools.Assert(entity.Comp1.CritThreshold > entity.Comp1.AnimationThreshold, $"Animation threshold on {ToPrettyString(entity)} was not less than the crit threshold. This will cause errors, animation has been cancelled.");
+
         var step = Math.Clamp((entity.Comp1.StaminaDamage - entity.Comp1.AnimationThreshold) /
                               (entity.Comp1.CritThreshold - entity.Comp1.AnimationThreshold),
             0f,
diff --git a/Content.Client/Explosion/SmokeOnTriggerSystem.cs b/Content.Client/Explosion/SmokeOnTriggerSystem.cs
deleted file mode 100644
index cac255e1ba..0000000000
--- a/Content.Client/Explosion/SmokeOnTriggerSystem.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using Content.Shared.Explosion.EntitySystems;
-
-namespace Content.Client.Explosion;
-
-public sealed class SmokeOnTriggerSystem : SharedSmokeOnTriggerSystem
-{
-}
\ No newline at end of file
diff --git a/Content.Client/Explosion/TriggerOnProximityComponent.cs b/Content.Client/Explosion/TriggerOnProximityComponent.cs
deleted file mode 100644
index 5fa9bbfd23..0000000000
--- a/Content.Client/Explosion/TriggerOnProximityComponent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using Content.Shared.Explosion;
-using Content.Shared.Explosion.Components;
-
-namespace Content.Client.Explosion;
-
-[RegisterComponent, Access(typeof(TriggerSystem))]
-public sealed partial class TriggerOnProximityComponent : SharedTriggerOnProximityComponent {}
diff --git a/Content.Client/Explosion/TriggerSystem.cs b/Content.Client/Explosion/TriggerSystem.cs
deleted file mode 100644
index e18569a18e..0000000000
--- a/Content.Client/Explosion/TriggerSystem.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Content.Client.Explosion;
-
-public sealed partial class TriggerSystem : EntitySystem
-{
-    public override void Initialize()
-    {
-        base.Initialize();
-        InitializeProximity();
-    }
-}
diff --git a/Content.Client/Forensics/Systems/ForensicsSystem.cs b/Content.Client/Forensics/Systems/ForensicsSystem.cs
new file mode 100644
index 0000000000..048fff600e
--- /dev/null
+++ b/Content.Client/Forensics/Systems/ForensicsSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared.Forensics.Systems;
+
+namespace Content.Client.Forensics.Systems;
+
+public sealed class ForensicsSystem : SharedForensicsSystem;
diff --git a/Content.Client/HotPotato/HotPotatoSystem.cs b/Content.Client/HotPotato/HotPotatoSystem.cs
index 028a3b70d9..a1495ab994 100644
--- a/Content.Client/HotPotato/HotPotatoSystem.cs
+++ b/Content.Client/HotPotato/HotPotatoSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.HotPotato;
 using Robust.Shared.Random;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
 namespace Content.Client.HotPotato;
@@ -10,6 +11,9 @@ public sealed class HotPotatoSystem : SharedHotPotatoSystem
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
 
+    private readonly EntProtoId _hotPotatoEffectId = "HotPotatoEffect";
+
+    // TODO: particle system
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
@@ -23,7 +27,7 @@ public sealed class HotPotatoSystem : SharedHotPotatoSystem
             if (_timing.CurTime < comp.TargetTime)
                 continue;
             comp.TargetTime = _timing.CurTime + TimeSpan.FromSeconds(comp.EffectCooldown);
-            Spawn("HotPotatoEffect", _transform.GetMapCoordinates(uid).Offset(_random.NextVector2(0.25f)));
+            Spawn(_hotPotatoEffectId, _transform.GetMapCoordinates(uid).Offset(_random.NextVector2(0.25f)));
         }
     }
 }
diff --git a/Content.Client/Instruments/InstrumentSystem.cs b/Content.Client/Instruments/InstrumentSystem.cs
index d861f4163b..c01845bb13 100644
--- a/Content.Client/Instruments/InstrumentSystem.cs
+++ b/Content.Client/Instruments/InstrumentSystem.cs
@@ -294,7 +294,6 @@ public sealed partial class InstrumentSystem : SharedInstrumentSystem
         SetMaster(uid, null);
         TrySetChannels(uid, data);
 
-        instrument.MidiEventBuffer.Clear();
         instrument.Renderer.OnMidiEvent += instrument.MidiEventBuffer.Add;
         return true;
     }
diff --git a/Content.Client/Inventory/ClientInventorySystem.cs b/Content.Client/Inventory/ClientInventorySystem.cs
index de58077e44..97da176ed2 100644
--- a/Content.Client/Inventory/ClientInventorySystem.cs
+++ b/Content.Client/Inventory/ClientInventorySystem.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Client.Clothing;
 using Content.Client.Examine;
 using Content.Client.Verbs.UI;
@@ -11,6 +12,7 @@ using Robust.Client.UserInterface;
 using Robust.Shared.Containers;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Player;
+using Robust.Shared.Timing;
 
 namespace Content.Client.Inventory
 {
@@ -19,7 +21,7 @@ namespace Content.Client.Inventory
     {
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IUserInterfaceManager _ui = default!;
-
+        [Dependency] private readonly IGameTiming _timing = default!;
         [Dependency] private readonly ClientClothingSystem _clothingVisualsSystem = default!;
         [Dependency] private readonly ExamineSystem _examine = default!;
 
@@ -91,6 +93,14 @@ namespace Content.Client.Inventory
 
         private void OnShutdown(EntityUid uid, InventoryComponent component, ComponentShutdown args)
         {
+            if (TryComp(uid, out InventorySlotsComponent? inventorySlots))
+            {
+                foreach (var slot in component.Slots)
+                {
+                    TryRemoveSlotData((uid, inventorySlots), (SlotData)slot);
+                }
+            }
+
             if (uid == _playerManager.LocalEntity)
                 OnUnlinkInventory?.Invoke();
         }
@@ -102,46 +112,22 @@ namespace Content.Client.Inventory
 
         private void OnPlayerAttached(EntityUid uid, InventorySlotsComponent component, LocalPlayerAttachedEvent args)
         {
-            if (TryGetSlots(uid, out var definitions))
-            {
-                foreach (var definition in definitions)
-                {
-                    if (!TryGetSlotContainer(uid, definition.Name, out var container, out _))
-                        continue;
-
-                    if (!component.SlotData.TryGetValue(definition.Name, out var data))
-                    {
-                        data = new SlotData(definition);
-                        component.SlotData[definition.Name] = data;
-                    }
-
-                    data.Container = container;
-                }
-            }
-
             OnLinkInventorySlots?.Invoke(uid, component);
         }
 
+        protected override void OnInit(Entity<InventoryComponent> ent, ref ComponentInit args)
+        {
+            base.OnInit(ent, ref args);
+
+            _clothingVisualsSystem.InitClothing(ent.Owner, ent.Comp);
+        }
+
         public override void Shutdown()
         {
             CommandBinds.Unregister<ClientInventorySystem>();
             base.Shutdown();
         }
 
-        protected override void OnInit(EntityUid uid, InventoryComponent component, ComponentInit args)
-        {
-            base.OnInit(uid, component, args);
-            _clothingVisualsSystem.InitClothing(uid, component);
-
-            if (!TryComp(uid, out InventorySlotsComponent? inventorySlots))
-                return;
-
-            foreach (var slot in component.Slots)
-            {
-                TryAddSlotDef(uid, inventorySlots, slot);
-            }
-        }
-
         public void ReloadInventory(InventorySlotsComponent? component = null)
         {
             var player = _playerManager.LocalEntity;
@@ -165,7 +151,10 @@ namespace Content.Client.Inventory
         public void UpdateSlot(EntityUid owner, InventorySlotsComponent component, string slotName,
             bool? blocked = null, bool? highlight = null)
         {
-            var oldData = component.SlotData[slotName];
+            // The slot might have been removed when changing templates, which can cause items to be dropped.
+            if (!component.SlotData.TryGetValue(slotName, out var oldData))
+                return;
+
             var newHighlight = oldData.Highlighted;
             var newBlocked = oldData.Blocked;
 
@@ -181,14 +170,28 @@ namespace Content.Client.Inventory
                 EntitySlotUpdate?.Invoke(newData);
         }
 
-        public bool TryAddSlotDef(EntityUid owner, InventorySlotsComponent component, SlotDefinition newSlotDef)
+        public bool TryAddSlotData(Entity<InventorySlotsComponent> ent, SlotData newSlotData)
         {
-            SlotData newSlotData = newSlotDef; //convert to slotData
-            if (!component.SlotData.TryAdd(newSlotDef.Name, newSlotData))
+            if (!ent.Comp.SlotData.TryAdd(newSlotData.SlotName, newSlotData))
                 return false;
 
-            if (owner == _playerManager.LocalEntity)
+            if (TryGetSlotContainer(ent.Owner, newSlotData.SlotName, out var newContainer, out _))
+                ent.Comp.SlotData[newSlotData.SlotName].Container = newContainer;
+
+            if (ent.Owner == _playerManager.LocalEntity)
                 OnSlotAdded?.Invoke(newSlotData);
+
+            return true;
+        }
+
+        public bool TryRemoveSlotData(Entity<InventorySlotsComponent> ent, SlotData removedSlotData)
+        {
+            if (!ent.Comp.SlotData.Remove(removedSlotData.SlotName))
+                return false;
+
+            if (ent.Owner == _playerManager.LocalEntity)
+                OnSlotRemoved?.Invoke(removedSlotData);
+
             return true;
         }
 
@@ -239,33 +242,51 @@ namespace Content.Client.Inventory
         {
             base.UpdateInventoryTemplate(ent);
 
-            if (TryComp(ent, out InventorySlotsComponent? inventorySlots))
+            if (!TryComp<InventorySlotsComponent>(ent, out var inventorySlots))
+                return;
+
+            List<SlotData> slotDataToRemove = new(); // don't modify dict while iterating
+
+            foreach (var slotData in inventorySlots.SlotData.Values)
             {
-                foreach (var slot in ent.Comp.Slots)
-                {
-                    if (inventorySlots.SlotData.TryGetValue(slot.Name, out var slotData))
-                        slotData.SlotDef = slot;
-                }
+                if (!ent.Comp.Slots.Any(s => s.Name == slotData.SlotName))
+                    slotDataToRemove.Add(slotData);
             }
+
+            // remove slots that are no longer in the new template
+            foreach (var slotData in slotDataToRemove)
+            {
+                TryRemoveSlotData((ent.Owner, inventorySlots), slotData);
+            }
+
+            // update existing slots or add them if they don't exist yet
+            foreach (var slot in ent.Comp.Slots)
+            {
+                if (inventorySlots.SlotData.TryGetValue(slot.Name, out var slotData))
+                    slotData.SlotDef = slot;
+                else
+                    TryAddSlotData((ent.Owner, inventorySlots), (SlotData)slot);
+            }
+
+            if (ent.Owner == _playerManager.LocalEntity)
+                ReloadInventory(inventorySlots);
         }
 
         public sealed class SlotData
         {
-            public SlotDefinition SlotDef;
-            public EntityUid? HeldEntity => Container?.ContainedEntity;
-            public bool Blocked;
-            public bool Highlighted;
-
-            [ViewVariables]
-            public ContainerSlot? Container;
-            public bool HasSlotGroup => SlotDef.SlotGroup != "Default";
-            public Vector2i ButtonOffset => SlotDef.UIWindowPosition;
-            public string SlotName => SlotDef.Name;
-            public bool ShowInWindow => SlotDef.ShowInWindow;
-            public string SlotGroup => SlotDef.SlotGroup;
-            public string SlotDisplayName => SlotDef.DisplayName;
-            public string TextureName => "Slots/" + SlotDef.TextureName;
-            public string FullTextureName => SlotDef.FullTextureName;
+            [ViewVariables] public SlotDefinition SlotDef;
+            [ViewVariables] public EntityUid? HeldEntity => Container?.ContainedEntity;
+            [ViewVariables] public bool Blocked;
+            [ViewVariables] public bool Highlighted;
+            [ViewVariables] public ContainerSlot? Container;
+            [ViewVariables] public bool HasSlotGroup => SlotDef.SlotGroup != "Default";
+            [ViewVariables] public Vector2i ButtonOffset => SlotDef.UIWindowPosition;
+            [ViewVariables] public string SlotName => SlotDef.Name;
+            [ViewVariables] public bool ShowInWindow => SlotDef.ShowInWindow;
+            [ViewVariables] public string SlotGroup => SlotDef.SlotGroup;
+            [ViewVariables] public string SlotDisplayName => SlotDef.DisplayName;
+            [ViewVariables] public string TextureName => "Slots/" + SlotDef.TextureName;
+            [ViewVariables] public string FullTextureName => SlotDef.FullTextureName;
 
             public SlotData(SlotDefinition slotDef, ContainerSlot? container = null, bool highlighted = false,
                 bool blocked = false)
diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
index 12eb7ffc23..d95cb5bb8c 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -1020,7 +1020,7 @@ namespace Content.Client.Lobby.UI
 
             _loadoutWindow = new LoadoutWindow(Profile, roleLoadout, roleLoadoutProto, _playerManager.LocalSession, collection)
             {
-                Title = jobProto?.ID + "-loadout",
+                Title = Loc.GetString("loadout-window-title-loadout", ("job", $"{jobProto?.LocalizedName}")),
             };
 
             // Refresh the buttons etc.
diff --git a/Content.Client/Medical/Cryogenics/CryoPodSystem.cs b/Content.Client/Medical/Cryogenics/CryoPodSystem.cs
index 13db5a8421..c1cbfc573e 100644
--- a/Content.Client/Medical/Cryogenics/CryoPodSystem.cs
+++ b/Content.Client/Medical/Cryogenics/CryoPodSystem.cs
@@ -1,7 +1,5 @@
 using System.Numerics;
-using Content.Shared.Emag.Systems;
 using Content.Shared.Medical.Cryogenics;
-using Content.Shared.Verbs;
 using Robust.Client.GameObjects;
 
 namespace Content.Client.Medical.Cryogenics;
@@ -15,11 +13,6 @@ public sealed class CryoPodSystem : SharedCryoPodSystem
     {
         base.Initialize();
 
-        SubscribeLocalEvent<CryoPodComponent, ComponentInit>(OnComponentInit);
-        SubscribeLocalEvent<CryoPodComponent, GetVerbsEvent<AlternativeVerb>>(AddAlternativeVerbs);
-        SubscribeLocalEvent<CryoPodComponent, GotEmaggedEvent>(OnEmagged);
-        SubscribeLocalEvent<CryoPodComponent, CryoPodPryFinished>(OnCryoPodPryFinished);
-
         SubscribeLocalEvent<CryoPodComponent, AppearanceChangeEvent>(OnAppearanceChange);
         SubscribeLocalEvent<InsideCryoPodComponent, ComponentStartup>(OnCryoPodInsertion);
         SubscribeLocalEvent<InsideCryoPodComponent, ComponentRemove>(OnCryoPodRemoval);
@@ -53,8 +46,8 @@ public sealed class CryoPodSystem : SharedCryoPodSystem
             return;
         }
 
-        if (!_appearance.TryGetData<bool>(uid, CryoPodComponent.CryoPodVisuals.ContainsEntity, out var isOpen, args.Component)
-            || !_appearance.TryGetData<bool>(uid, CryoPodComponent.CryoPodVisuals.IsOn, out var isOn, args.Component))
+        if (!_appearance.TryGetData<bool>(uid, CryoPodVisuals.ContainsEntity, out var isOpen, args.Component)
+            || !_appearance.TryGetData<bool>(uid, CryoPodVisuals.IsOn, out var isOn, args.Component))
         {
             return;
         }
diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml b/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml
index 469faf209d..da0b9f60d8 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml
@@ -5,15 +5,15 @@
     <BoxContainer Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True">
         <networkConfigurator:NetworkConfiguratorDeviceList Name="DeviceList" MinHeight="500" />
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="8 8 8 1">
-            <Button Name="Set" Text="Set" Access="Public" ToolTip="{Loc 'network-configurator-tooltip-set'}" HorizontalExpand="True" StyleClasses="ButtonSquare"/>
-            <Button Name="Add" Text="Add" Access="Public" ToolTip="{Loc 'network-configurator-tooltip-add'}" HorizontalExpand="True" StyleClasses="ButtonSquare"/>
+            <Button Name="Set" Text="{Loc 'network-configurator-text-set'}" Access="Public" ToolTip="{Loc 'network-configurator-tooltip-set'}" HorizontalExpand="True" StyleClasses="ButtonSquare"/>
+            <Button Name="Add" Text="{Loc 'network-configurator-text-add'}" Access="Public" ToolTip="{Loc 'network-configurator-tooltip-add'}" HorizontalExpand="True" StyleClasses="ButtonSquare"/>
             <!-- Edit might not be needed  -->
             <!--<Button Name="Edit" Text="Edit" Access="Public" ToolTip="{Loc 'network-configurator-tooltip-edit'}" HorizontalExpand="True" StyleClasses="ButtonSquare"/>-->
-            <Button Name="Clear" Text="Clear" Access="Public" ToolTip="{Loc 'network-configurator-tooltip-clear'}" HorizontalExpand="True"/>
+            <Button Name="Clear" Text="{Loc 'network-configurator-text-clear'}" Access="Public" ToolTip="{Loc 'network-configurator-tooltip-clear'}" HorizontalExpand="True"/>
         </BoxContainer>
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="8 0 8 8">
-            <Button Name="Copy" Text="Copy" Access="Public" ToolTip="{Loc 'network-configurator-tooltip-copy'}" HorizontalExpand="True" StyleClasses="OpenRight"/>
-            <Button Name="Show" Text="Show" Access="Public" ToggleMode="True" ToolTip="{Loc 'network-configurator-tooltip-show'}" HorizontalExpand="True" StyleClasses="ButtonSquare"/>
+            <Button Name="Copy" Text="{Loc 'network-configurator-text-copy'}" Access="Public" ToolTip="{Loc 'network-configurator-tooltip-copy'}" HorizontalExpand="True" StyleClasses="OpenRight"/>
+            <Button Name="Show" Text="{Loc 'network-configurator-text-show'}" Access="Public" ToggleMode="True" ToolTip="{Loc 'network-configurator-tooltip-show'}" HorizontalExpand="True" StyleClasses="ButtonSquare"/>
         </BoxContainer>
         <Label Name="Count" StyleClasses="LabelSubText" HorizontalAlignment="Right" Margin="0 0 12 8"/>
     </BoxContainer>
diff --git a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml
index 29279d1733..f764d18b47 100644
--- a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml
+++ b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml
@@ -25,6 +25,7 @@
                 <CheckBox Name="IntegerScalingCheckBox"
                           Text="{Loc 'ui-options-vp-integer-scaling'}"
                           ToolTip="{Loc 'ui-options-vp-integer-scaling-tooltip'}" />
+                <ui:OptionDropDown Name="DropDownFilterMode" Title="{Loc 'ui-options-filter-label'}" />
                 <CheckBox Name="ViewportVerticalFitCheckBox"
                           Text="{Loc 'ui-options-vp-vertical-fit'}"
                           ToolTip="{Loc 'ui-options-vp-vertical-fit-tooltip'}" />
diff --git a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs
index efd788c58a..c9c7300155 100644
--- a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs
@@ -39,6 +39,14 @@ public sealed partial class GraphicsTab : Control
                 new OptionDropDownCVar<float>.ValueOption(2.00f, Loc.GetString("ui-options-scale-200")),
             ]);
 
+        Control.AddOptionDropDown(
+            CCVars.ViewportScalingFilterMode,
+            DropDownFilterMode,
+            [
+                new OptionDropDownCVar<string>.ValueOption("nearest", Loc.GetString("ui-options-filter-nearest")),
+                new OptionDropDownCVar<string>.ValueOption("bilinear", Loc.GetString("ui-options-filter-bilinear")),
+            ]);
+
         var vpStretch = Control.AddOptionCheckBox(CCVars.ViewportStretch, ViewportStretchCheckBox);
         var vpVertFit = Control.AddOptionCheckBox(CCVars.ViewportVerticalFit, ViewportVerticalFitCheckBox);
         Control.AddOptionSlider(
@@ -50,6 +58,7 @@ public sealed partial class GraphicsTab : Control
 
         vpStretch.ImmediateValueChanged += _ => UpdateViewportSettingsVisibility();
         vpVertFit.ImmediateValueChanged += _ => UpdateViewportSettingsVisibility();
+        IntegerScalingCheckBox.OnToggled += _ => UpdateViewportSettingsVisibility();
 
         Control.AddOptionSlider(
             CCVars.ViewportWidth,
@@ -77,6 +86,7 @@ public sealed partial class GraphicsTab : Control
         IntegerScalingCheckBox.Visible = ViewportStretchCheckBox.Pressed;
         ViewportVerticalFitCheckBox.Visible = ViewportStretchCheckBox.Pressed;
         ViewportWidthSlider.Visible = !ViewportStretchCheckBox.Pressed || !ViewportVerticalFitCheckBox.Pressed;
+        DropDownFilterMode.Visible = !IntegerScalingCheckBox.Pressed && ViewportStretchCheckBox.Pressed;
     }
 
     private void UpdateViewportWidthRange()
diff --git a/Content.Client/Playtime/ClientsidePlaytimeTrackingManager.cs b/Content.Client/Playtime/ClientsidePlaytimeTrackingManager.cs
index 330ff9122f..9a4f75d596 100644
--- a/Content.Client/Playtime/ClientsidePlaytimeTrackingManager.cs
+++ b/Content.Client/Playtime/ClientsidePlaytimeTrackingManager.cs
@@ -94,7 +94,7 @@ public sealed class ClientsidePlaytimeTrackingManager
             return;
         }
 
-        // At less than 1 minute of time diff, there's not much point, and saving regardless will brick tests
+        // At less than 1 minute of time diff, there's not much point
         // The reason this isn't checking for 0 is because TotalMinutes is fractional, rather than solely whole minutes
         if (timeDiffMinutes < 1)
             return;
diff --git a/Content.Client/Rotation/RotationVisualizerSystem.cs b/Content.Client/Rotation/RotationVisualizerSystem.cs
index 8dbcf97320..b5be4d0b17 100644
--- a/Content.Client/Rotation/RotationVisualizerSystem.cs
+++ b/Content.Client/Rotation/RotationVisualizerSystem.cs
@@ -24,7 +24,7 @@ public sealed class RotationVisualizerSystem : SharedRotationVisualsSystem
             return;
 
         if (!_appearance.TryGetData<RotationState>(uid, RotationVisuals.RotationState, out var state, args.Component))
-            return;
+            state = RotationState.Vertical;
 
         switch (state)
         {
diff --git a/Content.Client/Singularity/Systems/EmitterSystem.cs b/Content.Client/Singularity/Systems/EmitterSystem.cs
index e9e0846340..b35c3297a1 100644
--- a/Content.Client/Singularity/Systems/EmitterSystem.cs
+++ b/Content.Client/Singularity/Systems/EmitterSystem.cs
@@ -12,6 +12,8 @@ public sealed class EmitterSystem : SharedEmitterSystem
     /// <inheritdoc/>
     public override void Initialize()
     {
+        base.Initialize();
+
         SubscribeLocalEvent<EmitterComponent, AppearanceChangeEvent>(OnAppearanceChange);
     }
 
diff --git a/Content.Client/Sprite/ScaleVisualsSystem.cs b/Content.Client/Sprite/ScaleVisualsSystem.cs
new file mode 100644
index 0000000000..06d25e0a1d
--- /dev/null
+++ b/Content.Client/Sprite/ScaleVisualsSystem.cs
@@ -0,0 +1,38 @@
+using System.Numerics;
+using Content.Shared.Sprite;
+using Robust.Client.GameObjects;
+
+namespace Content.Client.Sprite;
+
+public sealed class ScaleVisualsSystem : SharedScaleVisualsSystem
+{
+    [Dependency] private readonly SpriteSystem _sprite = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ScaleVisualsComponent, AppearanceChangeEvent>(OnChangeData);
+    }
+
+    private void OnChangeData(Entity<ScaleVisualsComponent> ent, ref AppearanceChangeEvent args)
+    {
+        if (!args.AppearanceData.TryGetValue(ScaleVisuals.Scale, out var scale) ||
+            args.Sprite == null) return;
+
+        // save the original scale
+        ent.Comp.OriginalScale ??= args.Sprite.Scale;
+
+        var vecScale = (Vector2)scale;
+        _sprite.SetScale((ent.Owner, args.Sprite), vecScale);
+    }
+
+    // revert to the original scale
+    protected override void ResetScale(Entity<ScaleVisualsComponent> ent)
+    {
+        base.ResetScale(ent);
+
+        if (ent.Comp.OriginalScale != null)
+            _sprite.SetScale(ent.Owner, ent.Comp.OriginalScale.Value);
+    }
+}
diff --git a/Content.Client/Storage/Systems/StorageSystem.cs b/Content.Client/Storage/Systems/StorageSystem.cs
index bd6659de01..1a21de4b99 100644
--- a/Content.Client/Storage/Systems/StorageSystem.cs
+++ b/Content.Client/Storage/Systems/StorageSystem.cs
@@ -40,6 +40,11 @@ public sealed class StorageSystem : SharedStorageSystem
         component.MaxItemSize = state.MaxItemSize;
         component.Whitelist = state.Whitelist;
         component.Blacklist = state.Blacklist;
+        component.StorageInsertSound = state.StorageInsertSound;
+        component.StorageRemoveSound = state.StorageRemoveSound;
+        component.StorageOpenSound = state.StorageOpenSound;
+        component.StorageCloseSound = state.StorageCloseSound;
+        component.DefaultStorageOrientation = state.DefaultStorageOrientation;
 
         _oldStoredItems.Clear();
 
diff --git a/Content.Client/Store/Ui/StoreMenu.xaml b/Content.Client/Store/Ui/StoreMenu.xaml
index 843c9dc029..1ee86a5a68 100644
--- a/Content.Client/Store/Ui/StoreMenu.xaml
+++ b/Content.Client/Store/Ui/StoreMenu.xaml
@@ -21,7 +21,7 @@
                     Name="RefundButton"
                     MinWidth="64"
                     HorizontalAlignment="Right"
-                    Text="Refund" />
+                    Text="{Loc 'store-ui-refund-text'}" />
             </BoxContainer>
             <LineEdit Name="SearchBar" Margin="4" PlaceHolder="Search" HorizontalExpand="True"/>
                 <PanelContainer VerticalExpand="True">
diff --git a/Content.Client/Trigger/TimerTriggerVisualizerComponent.cs b/Content.Client/Trigger/Components/TimerTriggerVisualizerComponent.cs
similarity index 84%
rename from Content.Client/Trigger/TimerTriggerVisualizerComponent.cs
rename to Content.Client/Trigger/Components/TimerTriggerVisualizerComponent.cs
index 0e5a74b83b..0cb89edd89 100644
--- a/Content.Client/Trigger/TimerTriggerVisualizerComponent.cs
+++ b/Content.Client/Trigger/Components/TimerTriggerVisualizerComponent.cs
@@ -1,7 +1,8 @@
+using Content.Client.Trigger.Systems;
 using Robust.Client.Animations;
 using Robust.Shared.Audio;
 
-namespace Content.Client.Trigger;
+namespace Content.Client.Trigger.Components;
 
 [RegisterComponent]
 [Access(typeof(TimerTriggerVisualizerSystem))]
@@ -16,28 +17,27 @@ public sealed partial class TimerTriggerVisualsComponent : Component
     /// <summary>
     /// The RSI state used while the device has not been primed.
     /// </summary>
-    [DataField("unprimedSprite")]
-    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public string UnprimedSprite = "icon";
 
     /// <summary>
     /// The RSI state used when the device is primed.
     /// Not VVWrite-able because it's only used at component init to construct the priming animation.
     /// </summary>
-    [DataField("primingSprite")]
+    [DataField]
     public string PrimingSprite = "primed";
 
     /// <summary>
     /// The sound played when the device is primed.
     /// Not VVWrite-able because it's only used at component init to construct the priming animation.
     /// </summary>
-    [DataField("primingSound")]
+    [DataField, ViewVariables]
     public SoundSpecifier? PrimingSound;
 
     /// <summary>
     /// The actual priming animation.
     /// Constructed at component init from the sprite and sound.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
+    [ViewVariables]
     public Animation PrimingAnimation = default!;
 }
diff --git a/Content.Client/Explosion/TriggerSystem.Proximity.cs b/Content.Client/Trigger/Systems/ProximityTriggerAnimationSystem.cs
similarity index 91%
rename from Content.Client/Explosion/TriggerSystem.Proximity.cs
rename to Content.Client/Trigger/Systems/ProximityTriggerAnimationSystem.cs
index 03e7436971..7954399505 100644
--- a/Content.Client/Explosion/TriggerSystem.Proximity.cs
+++ b/Content.Client/Trigger/Systems/ProximityTriggerAnimationSystem.cs
@@ -1,11 +1,12 @@
 using Content.Shared.Trigger;
+using Content.Shared.Trigger.Components.Triggers;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Animations;
 
-namespace Content.Client.Explosion;
+namespace Content.Client.Trigger.Systems;
 
-public sealed partial class TriggerSystem
+public sealed class ProximityTriggerAnimationSystem : EntitySystem
 {
     [Dependency] private readonly AnimationPlayerSystem _player = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
@@ -18,7 +19,7 @@ public sealed partial class TriggerSystem
 
     private const string AnimKey = "proximity";
 
-    private static readonly Animation _flasherAnimation = new Animation
+    private static readonly Animation FlasherAnimation = new Animation
     {
         Length = TimeSpan.FromSeconds(0.6f),
         AnimationTracks = {
@@ -42,8 +43,10 @@ public sealed partial class TriggerSystem
         }
     };
 
-    private void InitializeProximity()
+    public override void Initialize()
     {
+        base.Initialize();
+
         SubscribeLocalEvent<TriggerOnProximityComponent, ComponentInit>(OnProximityInit);
         SubscribeLocalEvent<TriggerOnProximityComponent, AppearanceChangeEvent>(OnProxAppChange);
         SubscribeLocalEvent<TriggerOnProximityComponent, AnimationCompletedEvent>(OnProxAnimation);
@@ -94,7 +97,7 @@ public sealed partial class TriggerSystem
                 break;
             case ProximityTriggerVisuals.Active:
                 if (_player.HasRunningAnimation(uid, player, AnimKey)) return;
-                _player.Play((uid, player), _flasherAnimation, AnimKey);
+                _player.Play((uid, player), FlasherAnimation, AnimKey);
                 break;
             case ProximityTriggerVisuals.Off:
             default:
diff --git a/Content.Client/Trigger/Systems/ReleaseGasOnTriggerSystem.cs b/Content.Client/Trigger/Systems/ReleaseGasOnTriggerSystem.cs
new file mode 100644
index 0000000000..a183282dde
--- /dev/null
+++ b/Content.Client/Trigger/Systems/ReleaseGasOnTriggerSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared.Trigger.Systems;
+
+namespace Content.Client.Trigger.Systems;
+
+public sealed class ReleaseGasOnTriggerSystem : SharedReleaseGasOnTriggerSystem;
diff --git a/Content.Client/Trigger/TimerTriggerVisualizerSystem.cs b/Content.Client/Trigger/Systems/TimerTriggerVisualizerSystem.cs
similarity index 80%
rename from Content.Client/Trigger/TimerTriggerVisualizerSystem.cs
rename to Content.Client/Trigger/Systems/TimerTriggerVisualizerSystem.cs
index b3d85f2017..7c977c7589 100644
--- a/Content.Client/Trigger/TimerTriggerVisualizerSystem.cs
+++ b/Content.Client/Trigger/Systems/TimerTriggerVisualizerSystem.cs
@@ -1,11 +1,10 @@
+using Content.Client.Trigger.Components;
 using Content.Shared.Trigger;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.GameObjects;
 
-namespace Content.Client.Trigger;
+namespace Content.Client.Trigger.Systems;
 
 public sealed class TimerTriggerVisualizerSystem : VisualizerSystem<TimerTriggerVisualsComponent>
 {
@@ -17,25 +16,26 @@ public sealed class TimerTriggerVisualizerSystem : VisualizerSystem<TimerTrigger
         SubscribeLocalEvent<TimerTriggerVisualsComponent, ComponentInit>(OnComponentInit);
     }
 
-    private void OnComponentInit(EntityUid uid, TimerTriggerVisualsComponent comp, ComponentInit args)
+    private void OnComponentInit(Entity<TimerTriggerVisualsComponent> ent, ref ComponentInit args)
     {
-        comp.PrimingAnimation = new Animation
+        ent.Comp.PrimingAnimation = new Animation
         {
             Length = TimeSpan.MaxValue,
             AnimationTracks = {
-                new AnimationTrackSpriteFlick() {
+                new AnimationTrackSpriteFlick()
+                {
                     LayerKey = TriggerVisualLayers.Base,
-                    KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(comp.PrimingSprite, 0f) }
+                    KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(ent.Comp.PrimingSprite, 0f) }
                 }
             },
         };
 
-        if (comp.PrimingSound != null)
+        if (ent.Comp.PrimingSound != null)
         {
-            comp.PrimingAnimation.AnimationTracks.Add(
+            ent.Comp.PrimingAnimation.AnimationTracks.Add(
                 new AnimationTrackPlaySound()
                 {
-                    KeyFrames = { new AnimationTrackPlaySound.KeyFrame(_audioSystem.ResolveSound(comp.PrimingSound), 0) }
+                    KeyFrames = { new AnimationTrackPlaySound.KeyFrame(_audioSystem.ResolveSound(ent.Comp.PrimingSound), 0) }
                 }
             );
         }
diff --git a/Content.Client/UserInterface/Controls/MainViewport.cs b/Content.Client/UserInterface/Controls/MainViewport.cs
index 721d750115..0e947da7cf 100644
--- a/Content.Client/UserInterface/Controls/MainViewport.cs
+++ b/Content.Client/UserInterface/Controls/MainViewport.cs
@@ -30,6 +30,8 @@ namespace Content.Client.UserInterface.Controls
             };
 
             AddChild(Viewport);
+
+            _cfg.OnValueChanged(CCVars.ViewportScalingFilterMode, _ => UpdateCfg(), true);
         }
 
         protected override void EnteredTree()
@@ -52,6 +54,7 @@ namespace Content.Client.UserInterface.Controls
             var renderScaleUp = _cfg.GetCVar(CCVars.ViewportScaleRender);
             var fixedFactor = _cfg.GetCVar(CCVars.ViewportFixedScaleFactor);
             var verticalFit = _cfg.GetCVar(CCVars.ViewportVerticalFit);
+            var filterMode = _cfg.GetCVar(CCVars.ViewportScalingFilterMode);
 
             if (stretch)
             {
@@ -60,7 +63,11 @@ namespace Content.Client.UserInterface.Controls
                 {
                     // Did not find a snap, enable stretching.
                     Viewport.FixedStretchSize = null;
-                    Viewport.StretchMode = ScalingViewportStretchMode.Bilinear;
+                    Viewport.StretchMode = filterMode switch
+                    {
+                        "nearest" => ScalingViewportStretchMode.Nearest,
+                        "bilinear" => ScalingViewportStretchMode.Bilinear
+                    };
                     Viewport.IgnoreDimension = verticalFit ? ScalingViewportIgnoreDimension.Horizontal : ScalingViewportIgnoreDimension.None;
 
                     if (renderScaleUp)
diff --git a/Content.Client/UserInterface/StatsWindow.xaml b/Content.Client/UserInterface/StatsWindow.xaml
index 9cda4e41c6..8a287b4aa7 100644
--- a/Content.Client/UserInterface/StatsWindow.xaml
+++ b/Content.Client/UserInterface/StatsWindow.xaml
@@ -5,7 +5,7 @@
         <ScrollContainer HorizontalExpand="True"
                          VerticalExpand="True"
                          SizeFlagsStretchRatio="6">
-            <GridContainer Name="Values"/>
+            <GridContainer Name="Values" HSeparationOverride="0" VSeparationOverride="15"/>
         </ScrollContainer>
     </BoxContainer>
 </DefaultWindow>
diff --git a/Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs b/Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs
index b2160c085a..ec6293811f 100644
--- a/Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs
+++ b/Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs
@@ -194,8 +194,6 @@ public sealed class InventoryUIController : UIController, IOnStateEntered<Gamepl
             }
         }
 
-        return;
-
         int GetIndex(Vector2i position)
         {
             return position.Y * maxWidth + position.X;
diff --git a/Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs b/Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
index 60c74939f6..d07db112c8 100644
--- a/Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
+++ b/Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
@@ -185,12 +185,7 @@ public sealed class ItemGridPiece : Control, IEntityControl
 
             handle.SetTransform(pos, iconRotation);
             var box = new UIBox2(root, root + sprite.Size * scale);
-
-            var ev = new BeforeRenderInGridEvent(new Color(255, 255, 255));
-            _entityManager.EventBus.RaiseLocalEvent(Entity, ev);
-
-            handle.DrawTextureRect(sprite, box, ev.Color);
-
+            handle.DrawTextureRect(sprite, box);
             handle.SetTransform(GlobalPixelPosition, Angle.Zero);
         }
         else
@@ -303,19 +298,6 @@ public sealed class ItemGridPiece : Control, IEntityControl
     public EntityUid? UiEntity => Entity;
 }
 
-/// <summary>
-///     This event gets raised before a sprite gets drawn in a grid and lets to change the sprite color for several gameobjects that have special sprites to render in containers.
-/// </summary>
-public sealed class BeforeRenderInGridEvent : EntityEventArgs
-{
-    public Color Color { get; set; }
-
-    public BeforeRenderInGridEvent(Color color)
-    {
-        Color = color;
-    }
-}
-
 public enum ItemGridPieceMarks
 {
     First,
diff --git a/Content.IntegrationTests/Tests/Damageable/StaminaComponentTest.cs b/Content.IntegrationTests/Tests/Damageable/StaminaComponentTest.cs
new file mode 100644
index 0000000000..f0a594dbd4
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Damageable/StaminaComponentTest.cs
@@ -0,0 +1,29 @@
+using Content.Shared.Damage.Components;
+
+namespace Content.IntegrationTests.Tests.Damageable;
+
+public sealed class StaminaComponentTest
+{
+    [Test]
+    public async Task ValidatePrototypes()
+    {
+        await using var pair = await PoolManager.GetServerClient();
+        var server = pair.Server;
+
+        var protos = pair.GetPrototypesWithComponent<StaminaComponent>();
+
+        await server.WaitAssertion(() =>
+        {
+            Assert.Multiple(() =>
+            {
+                foreach (var (proto, comp) in protos)
+                {
+                    Assert.That(comp.AnimationThreshold, Is.LessThan(comp.CritThreshold),
+                        $"Animation threshold on {proto.ID} must be less than its crit threshold.");
+                }
+            });
+        });
+
+        await pair.CleanReturnAsync();
+    }
+}
diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs b/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs
index 2570e2246a..dae3203f9f 100644
--- a/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs
+++ b/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs
@@ -1,11 +1,9 @@
 #nullable enable
 using Content.Server.Cuffs;
-using Content.Shared.Body.Components;
 using Content.Shared.Cuffs.Components;
 using Content.Shared.Hands.Components;
 using Robust.Server.Console;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
 
 namespace Content.IntegrationTests.Tests.GameObjects.Components.ActionBlocking
 {
@@ -22,9 +20,15 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.ActionBlocking
   components:
   - type: Cuffable
   - type: Hands
+    hands:
+      hand_right:
+        location: Right
+      hand_left:
+        location: Left
+    sortedHands:
+    - hand_right
+    - hand_left
   - type: ComplexInteraction
-  - type: Body
-    prototype: Human
 
 - type: entity
   name: HandcuffsDummy
@@ -47,7 +51,6 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.ActionBlocking
             HandsComponent hands = default!;
 
             var entityManager = server.ResolveDependency<IEntityManager>();
-            var mapManager = server.ResolveDependency<IMapManager>();
             var host = server.ResolveDependency<IServerConsoleHost>();
 
             var map = await pair.CreateTestMap();
@@ -73,7 +76,6 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.ActionBlocking
                 {
                     Assert.That(entityManager.TryGetComponent(human, out cuffed!), $"Human has no {nameof(CuffableComponent)}");
                     Assert.That(entityManager.TryGetComponent(human, out hands!), $"Human has no {nameof(HandsComponent)}");
-                    Assert.That(entityManager.TryGetComponent(human, out BodyComponent? _), $"Human has no {nameof(BodyComponent)}");
                     Assert.That(entityManager.TryGetComponent(cuffs, out HandcuffComponent? _), $"Handcuff has no {nameof(HandcuffComponent)}");
                     Assert.That(entityManager.TryGetComponent(secondCuffs, out HandcuffComponent? _), $"Second handcuffs has no {nameof(HandcuffComponent)}");
                 });
diff --git a/Content.IntegrationTests/Tests/Payload/ModularGrenadeTests.cs b/Content.IntegrationTests/Tests/Payload/ModularGrenadeTests.cs
index 4db79373d3..f5a15295fd 100644
--- a/Content.IntegrationTests/Tests/Payload/ModularGrenadeTests.cs
+++ b/Content.IntegrationTests/Tests/Payload/ModularGrenadeTests.cs
@@ -1,6 +1,6 @@
 using Content.IntegrationTests.Tests.Interaction;
-using Content.Server.Explosion.Components;
-using Content.Shared.Explosion.Components;
+using Content.Shared.Trigger.Components;
+using Content.Shared.Trigger.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 
@@ -25,19 +25,19 @@ public sealed class ModularGrenadeTests : InteractionTest
         await InteractUsing(Cable);
 
         // Insert & remove trigger
-        AssertComp<OnUseTimerTriggerComponent>(false);
+        AssertComp<TimerTriggerComponent>(false);
         await InteractUsing(Trigger);
-        AssertComp<OnUseTimerTriggerComponent>();
+        AssertComp<TimerTriggerComponent>();
         await FindEntity(Trigger, LookupFlags.Uncontained, shouldSucceed: false);
         await InteractUsing(Pry);
-        AssertComp<OnUseTimerTriggerComponent>(false);
+        AssertComp<TimerTriggerComponent>(false);
 
         // Trigger was dropped to floor, not deleted.
         await FindEntity(Trigger, LookupFlags.Uncontained);
 
         // Re-insert
         await InteractUsing(Trigger);
-        AssertComp<OnUseTimerTriggerComponent>();
+        AssertComp<TimerTriggerComponent>();
 
         // Insert & remove payload.
         await InteractUsing(Payload);
@@ -56,13 +56,14 @@ public sealed class ModularGrenadeTests : InteractionTest
         await Pickup();
         AssertComp<ActiveTimerTriggerComponent>(false);
         await UseInHand();
+        AssertComp<ActiveTimerTriggerComponent>(true);
 
         // So uhhh grenades in hands don't destroy themselves when exploding. Maybe that will be fixed eventually.
         await Drop();
 
         // Wait until grenade explodes
-        var timer = Comp<ActiveTimerTriggerComponent>();
-        while (timer.TimeRemaining >= 0)
+        var triggerSys = SEntMan.System<TriggerSystem>();
+        while (Target != null && triggerSys.GetRemainingTime(SEntMan.GetEntity(Target.Value))?.TotalSeconds >= 0.0)
         {
             await RunTicks(10);
         }
diff --git a/Content.IntegrationTests/Tests/StoreTests.cs b/Content.IntegrationTests/Tests/StoreTests.cs
index e6aed78755..39df0fc8cc 100644
--- a/Content.IntegrationTests/Tests/StoreTests.cs
+++ b/Content.IntegrationTests/Tests/StoreTests.cs
@@ -128,7 +128,7 @@ public sealed class StoreTests
 
 
                     var buyMsg = new StoreBuyListingMessage(discountedListingItem.ID){Actor = human};
-                    server.EntMan.EventBus.RaiseComponentEvent(pda, storeComponent, buyMsg);
+                    server.EntMan.EventBus.RaiseLocalEvent(pda, buyMsg);
 
                     var newBalance = storeComponent.Balance[UplinkSystem.TelecrystalCurrencyPrototype];
                     Assert.That(newBalance.Value, Is.EqualTo((originalBalance - plainDiscountedCost).Value), "Expected to have balance reduced by discounted cost");
@@ -141,7 +141,7 @@ public sealed class StoreTests
                     Assert.That(costAfterBuy.Value, Is.EqualTo(prototypeCost.Value), "Expected cost after discount refund to be equal to prototype cost.");
 
                     var refundMsg = new StoreRequestRefundMessage { Actor = human };
-                    server.EntMan.EventBus.RaiseComponentEvent(pda, storeComponent, refundMsg);
+                    server.EntMan.EventBus.RaiseLocalEvent(pda, refundMsg);
 
                     // get refreshed item after refund re-generated items
                     discountedListingItem = storeComponent.FullListingsCatalog.First(x => x.ID == itemId);
diff --git a/Content.Server/Abilities/Mime/MimePowersComponent.cs b/Content.Server/Abilities/Mime/MimePowersComponent.cs
deleted file mode 100644
index 24ffe5d023..0000000000
--- a/Content.Server/Abilities/Mime/MimePowersComponent.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using Content.Shared.Alert;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Server.Abilities.Mime
-{
-    /// <summary>
-    /// Lets its owner entity use mime powers, like placing invisible walls.
-    /// </summary>
-    [RegisterComponent]
-    public sealed partial class MimePowersComponent : Component
-    {
-        /// <summary>
-        /// Whether this component is active or not.
-        /// </summarY>
-        [DataField("enabled")]
-        public bool Enabled = true;
-
-        /// <summary>
-        /// The wall prototype to use.
-        /// </summary>
-        [DataField("wallPrototype", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-        public string WallPrototype = "WallInvisible";
-
-        [DataField("invisibleWallAction", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-        public string? InvisibleWallAction = "ActionMimeInvisibleWall";
-
-        [DataField("invisibleWallActionEntity")] public EntityUid? InvisibleWallActionEntity;
-
-        // The vow zone lies below
-        public bool VowBroken = false;
-
-        /// <summary>
-        /// Whether this mime is ready to take the vow again.
-        /// Note that if they already have the vow, this is also false.
-        /// </summary>
-        public bool ReadyToRepent = false;
-
-        /// <summary>
-        /// Time when the mime can repent their vow
-        /// </summary>
-        [DataField("vowRepentTime", customTypeSerializer: typeof(TimeOffsetSerializer))]
-        public TimeSpan VowRepentTime = TimeSpan.Zero;
-
-        /// <summary>
-        /// How long it takes the mime to get their powers back
-        /// </summary>
-        [DataField("vowCooldown")]
-        public TimeSpan VowCooldown = TimeSpan.FromMinutes(5);
-
-        [DataField]
-        public ProtoId<AlertPrototype> VowAlert = "VowOfSilence";
-
-        [DataField]
-        public ProtoId<AlertPrototype> VowBrokenAlert = "VowBroken";
-
-        /// <summary>
-        /// Does this component prevent the mime from writing on paper while their vow is active?
-        /// </summary>
-        [DataField]
-        public bool PreventWriting = false;
-
-        /// <summary>
-        /// What message is displayed when the mime fails to write?
-        /// </summary>
-        [DataField]
-        public LocId FailWriteMessage = "paper-component-illiterate-mime";
-    }
-}
diff --git a/Content.Server/Abilities/Mime/MimePowersSystem.cs b/Content.Server/Abilities/Mime/MimePowersSystem.cs
deleted file mode 100644
index 29c7b1710c..0000000000
--- a/Content.Server/Abilities/Mime/MimePowersSystem.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-using Content.Server.Popups;
-using Content.Shared.Abilities.Mime;
-using Content.Shared.Actions;
-using Content.Shared.Actions.Events;
-using Content.Shared.Alert;
-using Content.Shared.Coordinates.Helpers;
-using Content.Shared.Maps;
-using Content.Shared.Paper;
-using Content.Shared.Physics;
-using Robust.Shared.Containers;
-using Robust.Shared.Map;
-using Robust.Shared.Timing;
-using Content.Shared.Speech.Muting;
-
-namespace Content.Server.Abilities.Mime
-{
-    public sealed class MimePowersSystem : EntitySystem
-    {
-        [Dependency] private readonly PopupSystem _popupSystem = default!;
-        [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
-        [Dependency] private readonly AlertsSystem _alertsSystem = default!;
-        [Dependency] private readonly TurfSystem _turf = default!;
-        [Dependency] private readonly IMapManager _mapMan = default!;
-        [Dependency] private readonly SharedContainerSystem _container = default!;
-        [Dependency] private readonly IGameTiming _timing = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<MimePowersComponent, ComponentInit>(OnComponentInit);
-            SubscribeLocalEvent<MimePowersComponent, InvisibleWallActionEvent>(OnInvisibleWall);
-
-            SubscribeLocalEvent<MimePowersComponent, BreakVowAlertEvent>(OnBreakVowAlert);
-            SubscribeLocalEvent<MimePowersComponent, RetakeVowAlertEvent>(OnRetakeVowAlert);
-        }
-
-        public override void Update(float frameTime)
-        {
-            base.Update(frameTime);
-            // Queue to track whether mimes can retake vows yet
-
-            var query = EntityQueryEnumerator<MimePowersComponent>();
-            while (query.MoveNext(out var uid, out var mime))
-            {
-                if (!mime.VowBroken || mime.ReadyToRepent)
-                    continue;
-
-                if (_timing.CurTime < mime.VowRepentTime)
-                    continue;
-
-                mime.ReadyToRepent = true;
-                _popupSystem.PopupEntity(Loc.GetString("mime-ready-to-repent"), uid, uid);
-            }
-        }
-
-        private void OnComponentInit(EntityUid uid, MimePowersComponent component, ComponentInit args)
-        {
-            EnsureComp<MutedComponent>(uid);
-            if (component.PreventWriting)
-            {
-                EnsureComp<BlockWritingComponent>(uid, out var illiterateComponent);
-                illiterateComponent.FailWriteMessage = component.FailWriteMessage;
-                Dirty(uid, illiterateComponent);
-            }
-
-            _alertsSystem.ShowAlert(uid, component.VowAlert);
-            _actionsSystem.AddAction(uid, ref component.InvisibleWallActionEntity, component.InvisibleWallAction, uid);
-        }
-
-        /// <summary>
-        /// Creates an invisible wall in a free space after some checks.
-        /// </summary>
-        private void OnInvisibleWall(EntityUid uid, MimePowersComponent component, InvisibleWallActionEvent args)
-        {
-            if (!component.Enabled)
-                return;
-
-            if (_container.IsEntityOrParentInContainer(uid))
-                return;
-
-            var xform = Transform(uid);
-            // Get the tile in front of the mime
-            var offsetValue = xform.LocalRotation.ToWorldVec();
-            var coords = xform.Coordinates.Offset(offsetValue).SnapToGrid(EntityManager, _mapMan);
-            var tile = _turf.GetTileRef(coords);
-            if (tile == null)
-                return;
-
-            // Check if the tile is blocked by a wall or mob, and don't create the wall if so
-            if (_turf.IsTileBlocked(tile.Value, CollisionGroup.Impassable | CollisionGroup.Opaque))
-            {
-                _popupSystem.PopupEntity(Loc.GetString("mime-invisible-wall-failed"), uid, uid);
-                return;
-            }
-
-            _popupSystem.PopupEntity(Loc.GetString("mime-invisible-wall-popup", ("mime", uid)), uid);
-            // Make sure we set the invisible wall to despawn properly
-            Spawn(component.WallPrototype, _turf.GetTileCenter(tile.Value));
-            // Handle args so cooldown works
-            args.Handled = true;
-        }
-
-        private void OnBreakVowAlert(Entity<MimePowersComponent> ent, ref BreakVowAlertEvent args)
-        {
-            if (args.Handled)
-                return;
-            BreakVow(ent, ent);
-            args.Handled = true;
-        }
-
-        private void OnRetakeVowAlert(Entity<MimePowersComponent> ent, ref RetakeVowAlertEvent args)
-        {
-            if (args.Handled)
-                return;
-            RetakeVow(ent, ent);
-            args.Handled = true;
-        }
-
-        /// <summary>
-        /// Break this mime's vow to not speak.
-        /// </summary>
-        public void BreakVow(EntityUid uid, MimePowersComponent? mimePowers = null)
-        {
-            if (!Resolve(uid, ref mimePowers))
-                return;
-
-            if (mimePowers.VowBroken)
-                return;
-
-            mimePowers.Enabled = false;
-            mimePowers.VowBroken = true;
-            mimePowers.VowRepentTime = _timing.CurTime + mimePowers.VowCooldown;
-            RemComp<MutedComponent>(uid);
-            if (mimePowers.PreventWriting)
-                RemComp<BlockWritingComponent>(uid);
-            _alertsSystem.ClearAlert(uid, mimePowers.VowAlert);
-            _alertsSystem.ShowAlert(uid, mimePowers.VowBrokenAlert);
-            _actionsSystem.RemoveAction(uid, mimePowers.InvisibleWallActionEntity);
-        }
-
-        /// <summary>
-        /// Retake this mime's vow to not speak.
-        /// </summary>
-        public void RetakeVow(EntityUid uid, MimePowersComponent? mimePowers = null)
-        {
-            if (!Resolve(uid, ref mimePowers))
-                return;
-
-            if (!mimePowers.ReadyToRepent)
-            {
-                _popupSystem.PopupEntity(Loc.GetString("mime-not-ready-repent"), uid, uid);
-                return;
-            }
-
-            mimePowers.Enabled = true;
-            mimePowers.ReadyToRepent = false;
-            mimePowers.VowBroken = false;
-            AddComp<MutedComponent>(uid);
-            if (mimePowers.PreventWriting)
-            {
-                EnsureComp<BlockWritingComponent>(uid, out var illiterateComponent);
-                illiterateComponent.FailWriteMessage = mimePowers.FailWriteMessage;
-                Dirty(uid, illiterateComponent);
-            }
-
-            _alertsSystem.ClearAlert(uid, mimePowers.VowBrokenAlert);
-            _alertsSystem.ShowAlert(uid, mimePowers.VowAlert);
-            _actionsSystem.AddAction(uid, ref mimePowers.InvisibleWallActionEntity, mimePowers.InvisibleWallAction, uid);
-        }
-    }
-}
diff --git a/Content.Server/Administration/Commands/VariantizeCommand.cs b/Content.Server/Administration/Commands/VariantizeCommand.cs
index a75f72b1c7..428207bde6 100644
--- a/Content.Server/Administration/Commands/VariantizeCommand.cs
+++ b/Content.Server/Administration/Commands/VariantizeCommand.cs
@@ -44,7 +44,7 @@ public sealed class VariantizeCommand : IConsoleCommand
         foreach (var tile in mapsSystem.GetAllTiles(euid.Value, gridComp))
         {
             var def = turfSystem.GetContentTileDefinition(tile);
-            var newTile = new Tile(tile.Tile.TypeId, tile.Tile.Flags, tileSystem.PickVariant(def));
+            var newTile = new Tile(tile.Tile.TypeId, tile.Tile.Flags, tileSystem.PickVariant(def), tile.Tile.RotationMirroring);
             mapsSystem.SetTile(euid.Value, gridComp, tile.GridIndices, newTile);
         }
     }
diff --git a/Content.Server/Administration/Commands/WarpCommand.cs b/Content.Server/Administration/Commands/WarpCommand.cs
index 06d771ec2f..aa1218f0bf 100644
--- a/Content.Server/Administration/Commands/WarpCommand.cs
+++ b/Content.Server/Administration/Commands/WarpCommand.cs
@@ -1,6 +1,5 @@
 using System.Linq;
 using System.Numerics;
-using Content.Server.Warps;
 using Content.Shared.Administration;
 using Content.Shared.Follower;
 using Content.Shared.Ghost;
diff --git a/Content.Server/Administration/Components/HeadstandComponent.cs b/Content.Server/Administration/Components/HeadstandComponent.cs
deleted file mode 100644
index 2ab097fad4..0000000000
--- a/Content.Server/Administration/Components/HeadstandComponent.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Content.Shared.Administration.Components;
-using Robust.Shared.GameStates;
-
-namespace Content.Server.Administration.Components;
-
-[RegisterComponent]
-public sealed partial class HeadstandComponent : SharedHeadstandComponent
-{
-
-}
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
index 672ae695bf..2b5ea90b12 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
@@ -27,9 +27,9 @@ public sealed partial class AdminVerbSystem
     private static readonly EntProtoId DefaultNukeOpRule = "LoneOpsSpawn";
     private static readonly EntProtoId DefaultRevsRule = "Revolutionary";
     private static readonly EntProtoId DefaultThiefRule = "Thief";
-    private static readonly ProtoId<StartingGearPrototype> PirateGearId = "PirateGear";
-
+    private static readonly EntProtoId DefaultChangelingRule = "Changeling";
     private static readonly EntProtoId ParadoxCloneRuleId = "ParadoxCloneSpawn";
+    private static readonly ProtoId<StartingGearPrototype> PirateGearId = "PirateGear";
 
     // All antag verbs have names so invokeverb works.
     private void AddAntagVerbs(GetVerbsEvent<Verb> args)
@@ -58,7 +58,7 @@ public sealed partial class AdminVerbSystem
                 _antag.ForceMakeAntag<TraitorRuleComponent>(targetPlayer, DefaultTraitorRule);
             },
             Impact = LogImpact.High,
-            Message = string.Join(": ", traitorName,  Loc.GetString("admin-verb-make-traitor")),
+            Message = string.Join(": ", traitorName, Loc.GetString("admin-verb-make-traitor")),
         };
         args.Verbs.Add(traitor);
 
@@ -153,6 +153,21 @@ public sealed partial class AdminVerbSystem
         };
         args.Verbs.Add(thief);
 
+        var changelingName = Loc.GetString("admin-verb-text-make-changeling");
+        Verb changeling = new()
+        {
+            Text = changelingName,
+            Category = VerbCategory.Antag,
+            Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/Objects/Weapons/Melee/armblade.rsi"), "icon"),
+            Act = () =>
+            {
+                _antag.ForceMakeAntag<ChangelingRuleComponent>(targetPlayer, DefaultChangelingRule);
+            },
+            Impact = LogImpact.High,
+            Message = string.Join(": ", changelingName, Loc.GetString("admin-verb-make-changeling")),
+        };
+        args.Verbs.Add(changeling);
+
         var paradoxCloneName = Loc.GetString("admin-verb-text-make-paradox-clone");
         Verb paradox = new()
         {
diff --git a/Content.Server/AlertLevel/AlertLevelChangeOnTriggerComponent.cs b/Content.Server/AlertLevel/AlertLevelChangeOnTriggerComponent.cs
deleted file mode 100644
index aa6c5ba2bd..0000000000
--- a/Content.Server/AlertLevel/AlertLevelChangeOnTriggerComponent.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Content.Server.AlertLevel.Systems;
-
-namespace Content.Server.AlertLevel;
-/// <summary>
-/// This component is for changing the alert level of the station when triggered.
-/// </summary>
-[RegisterComponent, Access(typeof(AlertLevelChangeOnTriggerSystem))]
-public sealed partial class AlertLevelChangeOnTriggerComponent : Component
-{
-    ///<summary>
-    ///The alert level to change to when triggered.
-    ///</summary>
-    [DataField]
-    public string Level = "blue";
-
-    /// <summary>
-    ///Whether to play the sound when the alert level changes.
-    /// </summary>
-    [DataField]
-    public bool PlaySound = true;
-
-    /// <summary>
-    ///Whether to say the announcement when the alert level changes.
-    /// </summary>
-    [DataField]
-    public bool Announce = true;
-
-    /// <summary>
-    ///Force the alert change. This applies if the alert level is not selectable or not.
-    /// </summary>
-    [DataField]
-    public bool Force = false;
-}
diff --git a/Content.Server/Animals/Systems/ParrotMemorySystem.cs b/Content.Server/Animals/Systems/ParrotMemorySystem.cs
index eb3429821c..a88957913f 100644
--- a/Content.Server/Animals/Systems/ParrotMemorySystem.cs
+++ b/Content.Server/Animals/Systems/ParrotMemorySystem.cs
@@ -5,13 +5,13 @@ using Content.Server.Animals.Components;
 using Content.Server.Mind;
 using Content.Server.Popups;
 using Content.Server.Radio;
-using Content.Server.Speech;
-using Content.Server.Speech.Components;
 using Content.Server.Vocalization.Systems;
+using Content.Shared.Animals.Components;
+using Content.Shared.Animals.Systems;
 using Content.Shared.Database;
 using Content.Shared.Mobs.Systems;
-using Content.Shared.Popups;
-using Content.Shared.Verbs;
+using Content.Shared.Speech;
+using Content.Shared.Speech.Components;
 using Content.Shared.Whitelist;
 using Robust.Shared.Network;
 using Robust.Shared.Random;
@@ -25,7 +25,7 @@ namespace Content.Server.Animals.Systems;
 /// (radiovocalizer) and stores them in a list. When an entity with a VocalizerComponent attempts to vocalize, this will
 /// try to set the message from memory.
 /// </summary>
-public sealed partial class ParrotMemorySystem : EntitySystem
+public sealed partial class ParrotMemorySystem : SharedParrotMemorySystem
 {
     [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
@@ -42,8 +42,6 @@ public sealed partial class ParrotMemorySystem : EntitySystem
 
         SubscribeLocalEvent<EraseEvent>(OnErase);
 
-        SubscribeLocalEvent<ParrotMemoryComponent, GetVerbsEvent<Verb>>(OnGetVerbs);
-
         SubscribeLocalEvent<ParrotListenerComponent, MapInitEvent>(ListenerOnMapInit);
 
         SubscribeLocalEvent<ParrotListenerComponent, ListenEvent>(OnListen);
@@ -57,30 +55,6 @@ public sealed partial class ParrotMemorySystem : EntitySystem
         DeletePlayerMessages(args.PlayerNetUserId);
     }
 
-    private void OnGetVerbs(Entity<ParrotMemoryComponent> entity, ref GetVerbsEvent<Verb> args)
-    {
-        var user = args.User;
-
-        // limit this to admins
-        if (!_admin.IsAdmin(user))
-            return;
-
-        // simple verb that just clears the memory list
-        var clearMemoryVerb = new Verb()
-        {
-            Text = Loc.GetString("parrot-verb-clear-memory"),
-            Category = VerbCategory.Admin,
-            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/clear-parrot.png")),
-            Act = () =>
-            {
-                entity.Comp.SpeechMemories.Clear();
-                _popup.PopupEntity(Loc.GetString("parrot-popup-memory-cleared"), entity, user, PopupType.Medium);
-            },
-        };
-
-        args.Verbs.Add(clearMemoryVerb);
-    }
-
     private void ListenerOnMapInit(Entity<ParrotListenerComponent> entity, ref MapInitEvent args)
     {
         // If an entity has a ParrotListenerComponent it really ought to have an ActiveListenerComponent
diff --git a/Content.Server/Atmos/Monitor/Components/AtmosAlarmableComponent.cs b/Content.Server/Atmos/Monitor/Components/AtmosAlarmableComponent.cs
index e291334ad0..cc53df2ecd 100644
--- a/Content.Server/Atmos/Monitor/Components/AtmosAlarmableComponent.cs
+++ b/Content.Server/Atmos/Monitor/Components/AtmosAlarmableComponent.cs
@@ -48,7 +48,7 @@ public sealed partial class AtmosAlarmableComponent : Component
     public HashSet<string> SyncWithTags { get; private set; } = new();
 
     [DataField("monitorAlertTypes")]
-    public HashSet<AtmosMonitorThresholdType>? MonitorAlertTypes { get; private set; }
+    public AtmosMonitorThresholdTypeFlags MonitorAlertTypes { get; private set; }
 
     /// <summary>
     ///     If this device should receive only. If it can only
diff --git a/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs b/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs
index 830479561d..ffb1fe0d27 100644
--- a/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs
+++ b/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs
@@ -59,7 +59,7 @@ public sealed partial class AtmosMonitorComponent : Component
     public AtmosAlarmType LastAlarmState = AtmosAlarmType.Normal;
 
     [DataField("trippedThresholds")]
-    public HashSet<AtmosMonitorThresholdType> TrippedThresholds = new();
+    public AtmosMonitorThresholdTypeFlags TrippedThresholds;
 
     /// <summary>
     ///     Registered devices in this atmos monitor. Alerts will be sent directly
diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs
index b6bc4bd303..2dcba3f464 100644
--- a/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs
@@ -108,9 +108,9 @@ public sealed class AtmosAlarmableSystem : EntitySystem
                     break;
                 }
 
-                if (args.Data.TryGetValue(AlertTypes, out HashSet<AtmosMonitorThresholdType>? types) && component.MonitorAlertTypes != null)
+                if (args.Data.TryGetValue(AlertTypes, out AtmosMonitorThresholdTypeFlags types) && component.MonitorAlertTypes != AtmosMonitorThresholdTypeFlags.None)
                 {
-                    isValid = types.Any(type => component.MonitorAlertTypes.Contains(type));
+                    isValid = (types & component.MonitorAlertTypes) != 0;
                 }
 
                 if (!component.NetworkAlarmStates.ContainsKey(args.SenderAddress))
diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
index 520afe0c58..452b300331 100644
--- a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
@@ -207,7 +207,7 @@ public sealed class AtmosMonitorSystem : EntitySystem
         if (component.MonitorFire
             && component.LastAlarmState != AtmosAlarmType.Danger)
         {
-            component.TrippedThresholds.Add(AtmosMonitorThresholdType.Temperature);
+            component.TrippedThresholds |= AtmosMonitorThresholdTypeFlags.Temperature;
             Alert(uid, AtmosAlarmType.Danger, null, component); // technically???
         }
 
@@ -218,7 +218,7 @@ public sealed class AtmosMonitorSystem : EntitySystem
             && component.TemperatureThreshold.CheckThreshold(args.Temperature, out var temperatureState)
             && temperatureState > component.LastAlarmState)
         {
-            component.TrippedThresholds.Add(AtmosMonitorThresholdType.Temperature);
+            component.TrippedThresholds |= AtmosMonitorThresholdTypeFlags.Temperature;
             Alert(uid, AtmosAlarmType.Danger, null, component);
         }
     }
@@ -259,7 +259,7 @@ public sealed class AtmosMonitorSystem : EntitySystem
         if (!Resolve(uid, ref monitor)) return;
 
         var state = AtmosAlarmType.Normal;
-        HashSet<AtmosMonitorThresholdType> alarmTypes = new(monitor.TrippedThresholds);
+        var alarmTypes = monitor.TrippedThresholds;
 
         if (monitor.TemperatureThreshold != null
             && monitor.TemperatureThreshold.CheckThreshold(air.Temperature, out var temperatureState))
@@ -267,11 +267,11 @@ public sealed class AtmosMonitorSystem : EntitySystem
             if (temperatureState > state)
             {
                 state = temperatureState;
-                alarmTypes.Add(AtmosMonitorThresholdType.Temperature);
+                alarmTypes |= AtmosMonitorThresholdTypeFlags.Temperature;
             }
             else if (temperatureState == AtmosAlarmType.Normal)
             {
-                alarmTypes.Remove(AtmosMonitorThresholdType.Temperature);
+                alarmTypes &= ~AtmosMonitorThresholdTypeFlags.Temperature;
             }
         }
 
@@ -282,11 +282,11 @@ public sealed class AtmosMonitorSystem : EntitySystem
             if (pressureState > state)
             {
                 state = pressureState;
-                alarmTypes.Add(AtmosMonitorThresholdType.Pressure);
+                alarmTypes |= AtmosMonitorThresholdTypeFlags.Pressure;
             }
             else if (pressureState == AtmosAlarmType.Normal)
             {
-                alarmTypes.Remove(AtmosMonitorThresholdType.Pressure);
+                alarmTypes &= ~AtmosMonitorThresholdTypeFlags.Pressure;
             }
         }
 
@@ -306,17 +306,17 @@ public sealed class AtmosMonitorSystem : EntitySystem
 
             if (tripped)
             {
-                alarmTypes.Add(AtmosMonitorThresholdType.Gas);
+                alarmTypes |= AtmosMonitorThresholdTypeFlags.Gas;
             }
             else
             {
-                alarmTypes.Remove(AtmosMonitorThresholdType.Gas);
+                alarmTypes &= ~AtmosMonitorThresholdTypeFlags.Gas;
             }
         }
 
         // if the state of the current air doesn't match the last alarm state,
         // we update the state
-        if (state != monitor.LastAlarmState || !alarmTypes.SetEquals(monitor.TrippedThresholds))
+        if (state != monitor.LastAlarmState || alarmTypes != monitor.TrippedThresholds)
         {
             Alert(uid, state, alarmTypes, monitor);
         }
@@ -327,7 +327,7 @@ public sealed class AtmosMonitorSystem : EntitySystem
     /// </summary>
     /// <param name="state">The alarm state to set this monitor to.</param>
     /// <param name="alarms">The alarms that caused this alarm state.</param>
-    public void Alert(EntityUid uid, AtmosAlarmType state, HashSet<AtmosMonitorThresholdType>? alarms = null, AtmosMonitorComponent? monitor = null)
+    public void Alert(EntityUid uid, AtmosAlarmType state, AtmosMonitorThresholdTypeFlags? alarms = null, AtmosMonitorComponent? monitor = null)
     {
         if (!Resolve(uid, ref monitor))
             return;
diff --git a/Content.Shared/Atmos/Components/AtmosPipeColorComponent.cs b/Content.Server/Atmos/Piping/Components/AtmosPipeColorComponent.cs
similarity index 63%
rename from Content.Shared/Atmos/Components/AtmosPipeColorComponent.cs
rename to Content.Server/Atmos/Piping/Components/AtmosPipeColorComponent.cs
index ee8e55491f..a8edb07d31 100644
--- a/Content.Shared/Atmos/Components/AtmosPipeColorComponent.cs
+++ b/Content.Server/Atmos/Piping/Components/AtmosPipeColorComponent.cs
@@ -1,22 +1,19 @@
-using Content.Shared.Atmos.EntitySystems;
-using Robust.Shared.GameStates;
+using Content.Server.Atmos.Piping.EntitySystems;
 using JetBrains.Annotations;
 
-namespace Content.Shared.Atmos.Components;
+namespace Content.Server.Atmos.Piping.Components;
 
-[RegisterComponent, NetworkedComponent]
-[AutoGenerateComponentState]
+[RegisterComponent]
 public sealed partial class AtmosPipeColorComponent : Component
 {
     [DataField]
-    [AutoNetworkedField]
     public Color Color { get; set; } = Color.White;
 
     [ViewVariables(VVAccess.ReadWrite), UsedImplicitly]
     public Color ColorVV
     {
         get => Color;
-        set => IoCManager.Resolve<IEntityManager>().System<AtmosPipeColorSystem>().SetColor((Owner, this), value);
+        set => IoCManager.Resolve<IEntityManager>().System<AtmosPipeColorSystem>().SetColor(Owner, this, value);
     }
 }
 
diff --git a/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeColorSystem.cs b/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeColorSystem.cs
new file mode 100644
index 0000000000..91f70467b4
--- /dev/null
+++ b/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeColorSystem.cs
@@ -0,0 +1,48 @@
+using Content.Server.Atmos.Piping.Components;
+using Content.Shared.Atmos.Piping;
+using Robust.Server.GameObjects;
+
+namespace Content.Server.Atmos.Piping.EntitySystems
+{
+    public sealed class AtmosPipeColorSystem : EntitySystem
+    {
+        [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            SubscribeLocalEvent<AtmosPipeColorComponent, ComponentStartup>(OnStartup);
+            SubscribeLocalEvent<AtmosPipeColorComponent, ComponentShutdown>(OnShutdown);
+        }
+
+        private void OnStartup(EntityUid uid, AtmosPipeColorComponent component, ComponentStartup args)
+        {
+            if (!TryComp(uid, out AppearanceComponent? appearance))
+                return;
+
+            _appearance.SetData(uid, PipeColorVisuals.Color, component.Color, appearance);
+        }
+
+        private void OnShutdown(EntityUid uid, AtmosPipeColorComponent component, ComponentShutdown args)
+        {
+            if (!TryComp(uid, out AppearanceComponent? appearance))
+                return;
+
+            _appearance.SetData(uid, PipeColorVisuals.Color, Color.White, appearance);
+        }
+
+        public void SetColor(EntityUid uid, AtmosPipeColorComponent component, Color color)
+        {
+            component.Color = color;
+
+            if (!TryComp(uid, out AppearanceComponent? appearance))
+                return;
+
+            _appearance.SetData(uid, PipeColorVisuals.Color, color, appearance);
+
+            var ev = new AtmosPipeColorChangedEvent(color);
+            RaiseLocalEvent(uid, ref ev);
+        }
+    }
+}
diff --git a/Content.Server/Body/Systems/BrainSystem.cs b/Content.Server/Body/Systems/BrainSystem.cs
index 86d2cb61ff..e916849a81 100644
--- a/Content.Server/Body/Systems/BrainSystem.cs
+++ b/Content.Server/Body/Systems/BrainSystem.cs
@@ -1,47 +1,46 @@
 using Content.Server.Body.Components;
 using Content.Server.Ghost.Components;
-using Content.Shared.Body.Components;
 using Content.Shared.Body.Events;
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
+using Content.Shared.Mobs.Components;
 using Content.Shared.Pointing;
 
-namespace Content.Server.Body.Systems
+namespace Content.Server.Body.Systems;
+
+public sealed class BrainSystem : EntitySystem
 {
-    public sealed class BrainSystem : EntitySystem
+    [Dependency] private readonly SharedMindSystem _mindSystem = default!;
+
+    public override void Initialize()
     {
-        [Dependency] private readonly SharedMindSystem _mindSystem = default!;
+        base.Initialize();
 
-        public override void Initialize()
-        {
-            base.Initialize();
+        SubscribeLocalEvent<BrainComponent, OrganAddedToBodyEvent>((uid, _, args) => HandleMind(args.Body, uid));
+        SubscribeLocalEvent<BrainComponent, OrganRemovedFromBodyEvent>((uid, _, args) => HandleMind(uid, args.OldBody));
+        SubscribeLocalEvent<BrainComponent, PointAttemptEvent>(OnPointAttempt);
+    }
 
-            SubscribeLocalEvent<BrainComponent, OrganAddedToBodyEvent>((uid, _, args) => HandleMind(args.Body, uid));
-            SubscribeLocalEvent<BrainComponent, OrganRemovedFromBodyEvent>((uid, _, args) => HandleMind(uid, args.OldBody));
-            SubscribeLocalEvent<BrainComponent, PointAttemptEvent>(OnPointAttempt);
-        }
+    private void HandleMind(EntityUid newEntity, EntityUid oldEntity)
+    {
+        if (TerminatingOrDeleted(newEntity) || TerminatingOrDeleted(oldEntity))
+            return;
 
-        private void HandleMind(EntityUid newEntity, EntityUid oldEntity)
-        {
-            if (TerminatingOrDeleted(newEntity) || TerminatingOrDeleted(oldEntity))
-                return;
+        EnsureComp<MindContainerComponent>(newEntity);
+        EnsureComp<MindContainerComponent>(oldEntity);
 
-            EnsureComp<MindContainerComponent>(newEntity);
-            EnsureComp<MindContainerComponent>(oldEntity);
+        var ghostOnMove = EnsureComp<GhostOnMoveComponent>(newEntity);
+        ghostOnMove.MustBeDead = HasComp<MobStateComponent>(newEntity); // Don't ghost living players out of their bodies.
 
-            var ghostOnMove = EnsureComp<GhostOnMoveComponent>(newEntity);
-            if (HasComp<BodyComponent>(newEntity))
-                ghostOnMove.MustBeDead = true;
+        if (!_mindSystem.TryGetMind(oldEntity, out var mindId, out var mind))
+            return;
 
-            if (!_mindSystem.TryGetMind(oldEntity, out var mindId, out var mind))
-                return;
+        _mindSystem.TransferTo(mindId, newEntity, mind: mind);
+    }
 
-            _mindSystem.TransferTo(mindId, newEntity, mind: mind);
-        }
-
-        private void OnPointAttempt(Entity<BrainComponent> ent, ref PointAttemptEvent args)
-        {
-            args.Cancel();
-        }
+    private void OnPointAttempt(Entity<BrainComponent> ent, ref PointAttemptEvent args)
+    {
+        args.Cancel();
     }
 }
+
diff --git a/Content.Server/Cargo/Systems/PricingSystem.cs b/Content.Server/Cargo/Systems/PricingSystem.cs
index 5e449eb8da..24ee4ffaf2 100644
--- a/Content.Server/Cargo/Systems/PricingSystem.cs
+++ b/Content.Server/Cargo/Systems/PricingSystem.cs
@@ -90,19 +90,22 @@ public sealed class PricingSystem : EntitySystem
         if (args.Handled)
             return;
 
-        if (!TryComp<BodyComponent>(uid, out var body) || !TryComp<MobStateComponent>(uid, out var state))
+        if (!TryComp<MobStateComponent>(uid, out var state))
         {
-            Log.Error($"Tried to get the mob price of {ToPrettyString(uid)}, which has no {nameof(BodyComponent)} and no {nameof(MobStateComponent)}.");
+            Log.Error($"Tried to get the mob price of {ToPrettyString(uid)}, which has no {nameof(MobStateComponent)}.");
             return;
         }
 
-        // TODO: Better handling of missing.
-        var partList = _bodySystem.GetBodyChildren(uid, body).ToList();
-        var totalPartsPresent = partList.Sum(_ => 1);
-        var totalParts = partList.Count;
+        var partPenalty = 0.0;
+        if (TryComp<BodyComponent>(uid, out var body))
+        {
+            var partList = _bodySystem.GetBodyChildren(uid, body).ToList();
+            var totalPartsPresent = partList.Sum(_ => 1);
+            var totalParts = partList.Count;
 
-        var partRatio = totalPartsPresent / (double) totalParts;
-        var partPenalty = component.Price * (1 - partRatio) * component.MissingBodyPartPenalty;
+            var partRatio = totalPartsPresent / (double) totalParts;
+            partPenalty = component.Price * (1 - partRatio) * component.MissingBodyPartPenalty;
+        }
 
         args.Price += (component.Price - partPenalty) * (_mobStateSystem.IsAlive(uid, state) ? 1.0 : component.DeathPenalty);
     }
diff --git a/Content.Server/Chat/Managers/ChatSanitizationManager.cs b/Content.Server/Chat/Managers/ChatSanitizationManager.cs
index 0c78e45f86..106e5313e6 100644
--- a/Content.Server/Chat/Managers/ChatSanitizationManager.cs
+++ b/Content.Server/Chat/Managers/ChatSanitizationManager.cs
@@ -12,86 +12,86 @@ namespace Content.Server.Chat.Managers;
 /// </summary>
 public sealed class ChatSanitizationManager : IChatSanitizationManager
 {
-    private static readonly Dictionary<string, string> ShorthandToEmote = new()
-    {
-        { ":)", "chatsan-smiles" },
-        { ":]", "chatsan-smiles" },
-        { "=)", "chatsan-smiles" },
-        { "=]", "chatsan-smiles" },
-        { "(:", "chatsan-smiles" },
-        { "[:", "chatsan-smiles" },
-        { "(=", "chatsan-smiles" },
-        { "[=", "chatsan-smiles" },
-        { "^^", "chatsan-smiles" },
-        { "^-^", "chatsan-smiles" },
-        { ":(", "chatsan-frowns" },
-        { ":[", "chatsan-frowns" },
-        { "=(", "chatsan-frowns" },
-        { "=[", "chatsan-frowns" },
-        { "):", "chatsan-frowns" },
-        { ")=", "chatsan-frowns" },
-        { "]:", "chatsan-frowns" },
-        { "]=", "chatsan-frowns" },
-        { ":D", "chatsan-smiles-widely" },
-        { "D:", "chatsan-frowns-deeply" },
-        { ":O", "chatsan-surprised" },
-        { ":3", "chatsan-smiles" },
-        { ":S", "chatsan-uncertain" },
-        { ":>", "chatsan-grins" },
-        { ":<", "chatsan-pouts" },
-        { "xD", "chatsan-laughs" },
-        { ":'(", "chatsan-cries" },
-        { ":'[", "chatsan-cries" },
-        { "='(", "chatsan-cries" },
-        { "='[", "chatsan-cries" },
-        { ")':", "chatsan-cries" },
-        { "]':", "chatsan-cries" },
-        { ")'=", "chatsan-cries" },
-        { "]'=", "chatsan-cries" },
-        { ";-;", "chatsan-cries" },
-        { ";_;", "chatsan-cries" },
-        { "qwq", "chatsan-cries" },
-        { ":u", "chatsan-smiles-smugly" },
-        { ":v", "chatsan-smiles-smugly" },
-        { ">:i", "chatsan-annoyed" },
-        { ":i", "chatsan-sighs" },
-        { ":|", "chatsan-sighs" },
-        { ":p", "chatsan-stick-out-tongue" },
-        { ";p", "chatsan-stick-out-tongue" },
-        { ":b", "chatsan-stick-out-tongue" },
-        { "0-0", "chatsan-wide-eyed" },
-        { "o-o", "chatsan-wide-eyed" },
-        { "o.o", "chatsan-wide-eyed" },
-        { "._.", "chatsan-surprised" },
-        { ".-.", "chatsan-confused" },
-        { "-_-", "chatsan-unimpressed" },
-        { "smh", "chatsan-unimpressed" },
-        { "o/", "chatsan-waves" },
-        { "^^/", "chatsan-waves" },
-        { ":/", "chatsan-uncertain" },
-        { ":\\", "chatsan-uncertain" },
-        { "lmao", "chatsan-laughs" },
-        { "lmfao", "chatsan-laughs" },
-        { "lol", "chatsan-laughs" },
-        { "lel", "chatsan-laughs" },
-        { "kek", "chatsan-laughs" },
-        { "rofl", "chatsan-laughs" },
-        { "o7", "chatsan-salutes" },
-        { ";_;7", "chatsan-tearfully-salutes" },
-        { "idk", "chatsan-shrugs" },
-        { ";)", "chatsan-winks" },
-        { ";]", "chatsan-winks" },
-        { "(;", "chatsan-winks" },
-        { "[;", "chatsan-winks" },
-        { ":')", "chatsan-tearfully-smiles" },
-        { ":']", "chatsan-tearfully-smiles" },
-        { "=')", "chatsan-tearfully-smiles" },
-        { "=']", "chatsan-tearfully-smiles" },
-        { "(':", "chatsan-tearfully-smiles" },
-        { "[':", "chatsan-tearfully-smiles" },
-        { "('=", "chatsan-tearfully-smiles" },
-        { "['=", "chatsan-tearfully-smiles" }
-    };
+    private static readonly (Regex regex, string emoteKey)[] ShorthandToEmote =
+    [
+        Entry(":)", "chatsan-smiles"),
+        Entry(":]", "chatsan-smiles"),
+        Entry("=)", "chatsan-smiles"),
+        Entry("=]", "chatsan-smiles"),
+        Entry("(:", "chatsan-smiles"),
+        Entry("[:", "chatsan-smiles"),
+        Entry("(=", "chatsan-smiles"),
+        Entry("[=", "chatsan-smiles"),
+        Entry("^^", "chatsan-smiles"),
+        Entry("^-^", "chatsan-smiles"),
+        Entry(":(", "chatsan-frowns"),
+        Entry(":[", "chatsan-frowns"),
+        Entry("=(", "chatsan-frowns"),
+        Entry("=[", "chatsan-frowns"),
+        Entry("):", "chatsan-frowns"),
+        Entry(")=", "chatsan-frowns"),
+        Entry("]:", "chatsan-frowns"),
+        Entry("]=", "chatsan-frowns"),
+        Entry(":D", "chatsan-smiles-widely"),
+        Entry("D:", "chatsan-frowns-deeply"),
+        Entry(":O", "chatsan-surprised"),
+        Entry(":3", "chatsan-smiles"),
+        Entry(":S", "chatsan-uncertain"),
+        Entry(":>", "chatsan-grins"),
+        Entry(":<", "chatsan-pouts"),
+        Entry("xD", "chatsan-laughs"),
+        Entry(":'(", "chatsan-cries"),
+        Entry(":'[", "chatsan-cries"),
+        Entry("='(", "chatsan-cries"),
+        Entry("='[", "chatsan-cries"),
+        Entry(")':", "chatsan-cries"),
+        Entry("]':", "chatsan-cries"),
+        Entry(")'=", "chatsan-cries"),
+        Entry("]'=", "chatsan-cries"),
+        Entry(";-;", "chatsan-cries"),
+        Entry(";_;", "chatsan-cries"),
+        Entry("qwq", "chatsan-cries"),
+        Entry(":u", "chatsan-smiles-smugly"),
+        Entry(":v", "chatsan-smiles-smugly"),
+        Entry(">:i", "chatsan-annoyed"),
+        Entry(":i", "chatsan-sighs"),
+        Entry(":|", "chatsan-sighs"),
+        Entry(":p", "chatsan-stick-out-tongue"),
+        Entry(";p", "chatsan-stick-out-tongue"),
+        Entry(":b", "chatsan-stick-out-tongue"),
+        Entry("0-0", "chatsan-wide-eyed"),
+        Entry("o-o", "chatsan-wide-eyed"),
+        Entry("o.o", "chatsan-wide-eyed"),
+        Entry("._.", "chatsan-surprised"),
+        Entry(".-.", "chatsan-confused"),
+        Entry("-_-", "chatsan-unimpressed"),
+        Entry("smh", "chatsan-unimpressed"),
+        Entry("o/", "chatsan-waves"),
+        Entry("^^/", "chatsan-waves"),
+        Entry(":/", "chatsan-uncertain"),
+        Entry(":\\", "chatsan-uncertain"),
+        Entry("lmao", "chatsan-laughs"),
+        Entry("lmfao", "chatsan-laughs"),
+        Entry("lol", "chatsan-laughs"),
+        Entry("lel", "chatsan-laughs"),
+        Entry("kek", "chatsan-laughs"),
+        Entry("rofl", "chatsan-laughs"),
+        Entry("o7", "chatsan-salutes"),
+        Entry(";_;7", "chatsan-tearfully-salutes"),
+        Entry("idk", "chatsan-shrugs"),
+        Entry(";)", "chatsan-winks"),
+        Entry(";]", "chatsan-winks"),
+        Entry("(;", "chatsan-winks"),
+        Entry("[;", "chatsan-winks"),
+        Entry(":')", "chatsan-tearfully-smiles"),
+        Entry(":']", "chatsan-tearfully-smiles"),
+        Entry("=')", "chatsan-tearfully-smiles"),
+        Entry("=']", "chatsan-tearfully-smiles"),
+        Entry("(':", "chatsan-tearfully-smiles"),
+        Entry("[':", "chatsan-tearfully-smiles"),
+        Entry("('=", "chatsan-tearfully-smiles"),
+        Entry("['=", "chatsan-tearfully-smiles"),
+    ];
 
     [Dependency] private readonly IConfigurationManager _configurationManager = default!;
     [Dependency] private readonly ILocalizationManager _loc = default!;
@@ -125,21 +125,8 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager
         // -1 is just a canary for nothing found yet
         var lastEmoteIndex = -1;
 
-        foreach (var (shorthand, emoteKey) in ShorthandToEmote)
+        foreach (var (r, emoteKey) in ShorthandToEmote)
         {
-            // We have to escape it because shorthands like ":)" or "-_-" would break the regex otherwise.
-            var escaped = Regex.Escape(shorthand);
-
-            // So there are 2 cases:
-            // - If there is whitespace before it and after it is either punctuation, whitespace, or the end of the line
-            //   Delete the word and the whitespace before
-            // - If it is at the start of the string and is followed by punctuation, whitespace, or the end of the line
-            //   Delete the word and the punctuation if it exists.
-            var pattern =
-                $@"\s{escaped}(?=\p{{P}}|\s|$)|^{escaped}(?:\p{{P}}|(?=\s|$))";
-
-            var r = new Regex(pattern, RegexOptions.RightToLeft | RegexOptions.IgnoreCase);
-
             // We're using sanitized as the original message until the end so that we can make sure the indices of
             // the emotes are accurate.
             var lastMatch = r.Match(sanitized);
@@ -159,4 +146,21 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager
         sanitized = message.Trim();
         return emote is not null;
     }
+
+    private static (Regex regex, string emoteKey) Entry(string shorthand, string emoteKey)
+    {
+        // We have to escape it because shorthands like ":)" or "-_-" would break the regex otherwise.
+        var escaped = Regex.Escape(shorthand);
+
+        // So there are 2 cases:
+        // - If there is whitespace before it and after it is either punctuation, whitespace, or the end of the line
+        //   Delete the word and the whitespace before
+        // - If it is at the start of the string and is followed by punctuation, whitespace, or the end of the line
+        //   Delete the word and the punctuation if it exists.
+        var pattern = new Regex(
+            $@"\s{escaped}(?=\p{{P}}|\s|$)|^{escaped}(?:\p{{P}}|(?=\s|$))",
+            RegexOptions.RightToLeft | RegexOptions.IgnoreCase | RegexOptions.Compiled);
+
+        return (pattern, emoteKey);
+    }
 }
diff --git a/Content.Server/Chat/SpeakOnTriggerComponent.cs b/Content.Server/Chat/SpeakOnTriggerComponent.cs
deleted file mode 100644
index d879cbf1bf..0000000000
--- a/Content.Server/Chat/SpeakOnTriggerComponent.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Content.Shared.Dataset;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Chat;
-
-/// <summary>
-///     Makes the entity speak when triggered. If the item has UseDelay component, the system will respect that cooldown.
-/// </summary>
-[RegisterComponent]
-public sealed partial class SpeakOnTriggerComponent : Component
-{
-    /// <summary>
-    ///     The identifier for the dataset prototype containing messages to be spoken by this entity.
-    /// </summary>
-    [DataField(required: true)]
-    public ProtoId<LocalizedDatasetPrototype> Pack = string.Empty;
-}
diff --git a/Content.Server/Chat/SuicideSystem.cs b/Content.Server/Chat/SuicideSystem.cs
index 9ae50a8c97..dca2959f98 100644
--- a/Content.Server/Chat/SuicideSystem.cs
+++ b/Content.Server/Chat/SuicideSystem.cs
@@ -67,6 +67,9 @@ public sealed class SuicideSystem : EntitySystem
         if (!suicideGhostEvent.Handled || _tagSystem.HasTag(victim, CannotSuicideTag))
             return false;
 
+        // TODO: fix this
+        // This is a handled event, but the result is never used
+        // It looks like TriggerOnMobstateChange is supposed to prevent you from suiciding
         var suicideEvent = new SuicideEvent(victim);
         RaiseLocalEvent(victim, suicideEvent);
 
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index 0b3a9c0a66..d49da57801 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -60,11 +60,6 @@ public sealed partial class ChatSystem : SharedChatSystem
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
     [Dependency] private readonly ExamineSystemShared _examineSystem = default!;
 
-    public const int VoiceRange = 10; // how far voice goes in world units
-    public const int WhisperClearRange = 2; // how far whisper goes while still being understandable, in world units
-    public const int WhisperMuffledRange = 5; // how far whisper goes at all, in world units
-    public const string DefaultAnnouncementSound = "/Audio/Announcements/announce.ogg";
-
     private bool _loocEnabled = true;
     private bool _deadLoocEnabled;
     private bool _critLoocEnabled;
diff --git a/Content.Server/Cloning/CloningSystem.Subscriptions.cs b/Content.Server/Cloning/CloningSystem.Subscriptions.cs
index eba806ceb8..84ef050305 100644
--- a/Content.Server/Cloning/CloningSystem.Subscriptions.cs
+++ b/Content.Server/Cloning/CloningSystem.Subscriptions.cs
@@ -1,11 +1,16 @@
 using Content.Server.Forensics;
+using Content.Server.Speech.EntitySystems;
 using Content.Shared.Cloning.Events;
-using Content.Shared.Clothing.Components;
 using Content.Shared.FixedPoint;
+using Content.Shared.Inventory;
 using Content.Shared.Labels.Components;
 using Content.Shared.Labels.EntitySystems;
+using Content.Shared.Movement.Components;
+using Content.Shared.Movement.Systems;
 using Content.Shared.Paper;
 using Content.Shared.Stacks;
+using Content.Shared.Speech.Components;
+using Content.Shared.Storage;
 using Content.Shared.Store;
 using Content.Shared.Store.Components;
 using Robust.Shared.Prototypes;
@@ -13,47 +18,58 @@ using Robust.Shared.Prototypes;
 namespace Content.Server.Cloning;
 
 /// <summary>
-///     The part of item cloning responsible for copying over important components.
-///     This is used for <see cref="CopyItem"/>.
-///     Anything not copied over here gets reverted to the values the item had in its prototype.
+/// The part of item cloning responsible for copying over important components.
 /// </summary>
 /// <remarks>
-///     This method of copying items is of course not perfect as we cannot clone every single component, which would be pretty much impossible with our ECS.
-///     We only consider the most important components so the paradox clone gets similar equipment.
-///     This method of using subscriptions was chosen to make it easy for forks to add their own custom components that need to be copied.
+/// These are all not part of their corresponding systems because we don't want systems every system to depend on a CloningSystem namespace import, which is still heavily coupled to med code.
+/// TODO: Create a more generic "CopyEntity" method/event (probably in RT) that doesn't have this problem and then move all these subscriptions.
 /// </remarks>
-public sealed partial class CloningSystem : EntitySystem
+public sealed partial class CloningSystem
 {
     [Dependency] private readonly SharedStackSystem _stack = default!;
     [Dependency] private readonly LabelSystem _label = default!;
     [Dependency] private readonly ForensicsSystem _forensics = default!;
     [Dependency] private readonly PaperSystem _paper = default!;
+    [Dependency] private readonly VocalSystem _vocal = default!;
+    [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<StackComponent, CloningItemEvent>(OnCloneStack);
-        SubscribeLocalEvent<LabelComponent, CloningItemEvent>(OnCloneLabel);
-        SubscribeLocalEvent<PaperComponent, CloningItemEvent>(OnClonePaper);
-        SubscribeLocalEvent<ForensicsComponent, CloningItemEvent>(OnCloneForensics);
-        SubscribeLocalEvent<StoreComponent, CloningItemEvent>(OnCloneStore);
+        // These are used for <see cref="CopyItem"/>.
+        // Anything not copied over here gets reverted to the values the item had in its prototype.
+        // This method of copying items is of course not perfect as we cannot clone every single component, which would be pretty much impossible with our ECS.
+        // We only consider the most important components so the paradox clone gets similar equipment.
+        // This method of using subscriptions was chosen to make it easy for forks to add their own custom components that need to be copied.
+        SubscribeLocalEvent<StackComponent, CloningItemEvent>(OnCloneItemStack);
+        SubscribeLocalEvent<LabelComponent, CloningItemEvent>(OnCloneItemLabel);
+        SubscribeLocalEvent<PaperComponent, CloningItemEvent>(OnCloneItemPaper);
+        SubscribeLocalEvent<ForensicsComponent, CloningItemEvent>(OnCloneItemForensics);
+        SubscribeLocalEvent<StoreComponent, CloningItemEvent>(OnCloneItemStore);
+
+        // These are for cloning components that cannot be cloned using CopyComp.
+        // Put them into CloningSettingsPrototype.EventComponents to have them be applied to the clone.
+        SubscribeLocalEvent<VocalComponent, CloningEvent>(OnCloneVocal);
+        SubscribeLocalEvent<StorageComponent, CloningEvent>(OnCloneStorage);
+        SubscribeLocalEvent<InventoryComponent, CloningEvent>(OnCloneInventory);
+        SubscribeLocalEvent<MovementSpeedModifierComponent, CloningEvent>(OnCloneInventory);
     }
 
-    private void OnCloneStack(Entity<StackComponent> ent, ref CloningItemEvent args)
+    private void OnCloneItemStack(Entity<StackComponent> ent, ref CloningItemEvent args)
     {
         // if the clone is a stack as well, adjust the count of the copy
         if (TryComp<StackComponent>(args.CloneUid, out var cloneStackComp))
             _stack.SetCount(args.CloneUid, ent.Comp.Count, cloneStackComp);
     }
 
-    private void OnCloneLabel(Entity<LabelComponent> ent, ref CloningItemEvent args)
+    private void OnCloneItemLabel(Entity<LabelComponent> ent, ref CloningItemEvent args)
     {
         // copy the label
         _label.Label(args.CloneUid, ent.Comp.CurrentLabel);
     }
 
-    private void OnClonePaper(Entity<PaperComponent> ent, ref CloningItemEvent args)
+    private void OnCloneItemPaper(Entity<PaperComponent> ent, ref CloningItemEvent args)
     {
         // copy the text and any stamps
         if (TryComp<PaperComponent>(args.CloneUid, out var clonePaperComp))
@@ -63,13 +79,13 @@ public sealed partial class CloningSystem : EntitySystem
         }
     }
 
-    private void OnCloneForensics(Entity<ForensicsComponent> ent, ref CloningItemEvent args)
+    private void OnCloneItemForensics(Entity<ForensicsComponent> ent, ref CloningItemEvent args)
     {
         // copy any forensics to the cloned item
         _forensics.CopyForensicsFrom(ent.Comp, args.CloneUid);
     }
 
-    private void OnCloneStore(Entity<StoreComponent> ent, ref CloningItemEvent args)
+    private void OnCloneItemStore(Entity<StoreComponent> ent, ref CloningItemEvent args)
     {
         // copy the current amount of currency in the store
         // at the moment this takes care of uplink implants and the portable nukie uplinks
@@ -80,4 +96,35 @@ public sealed partial class CloningSystem : EntitySystem
         }
     }
 
+    private void OnCloneVocal(Entity<VocalComponent> ent, ref CloningEvent args)
+    {
+        if (!args.Settings.EventComponents.Contains(Factory.GetRegistration(ent.Comp.GetType()).Name))
+            return;
+
+        _vocal.CopyComponent(ent.AsNullable(), args.CloneUid);
+    }
+
+    private void OnCloneStorage(Entity<StorageComponent> ent, ref CloningEvent args)
+    {
+        if (!args.Settings.EventComponents.Contains(Factory.GetRegistration(ent.Comp.GetType()).Name))
+            return;
+
+        _storage.CopyComponent(ent.AsNullable(), args.CloneUid);
+    }
+
+    private void OnCloneInventory(Entity<InventoryComponent> ent, ref CloningEvent args)
+    {
+        if (!args.Settings.EventComponents.Contains(Factory.GetRegistration(ent.Comp.GetType()).Name))
+            return;
+
+        _inventory.CopyComponent(ent.AsNullable(), args.CloneUid);
+    }
+
+    private void OnCloneInventory(Entity<MovementSpeedModifierComponent> ent, ref CloningEvent args)
+    {
+        if (!args.Settings.EventComponents.Contains(Factory.GetRegistration(ent.Comp.GetType()).Name))
+            return;
+
+        _movementSpeedModifier.CopyComponent(ent.AsNullable(), args.CloneUid);
+    }
 }
diff --git a/Content.Server/Cloning/CloningSystem.cs b/Content.Server/Cloning/CloningSystem.cs
index 97ab41e7b1..b0d62be523 100644
--- a/Content.Server/Cloning/CloningSystem.cs
+++ b/Content.Server/Cloning/CloningSystem.cs
@@ -24,7 +24,7 @@ namespace Content.Server.Cloning;
 ///     System responsible for making a copy of a humanoid's body.
 ///     For the cloning machines themselves look at CloningPodSystem, CloningConsoleSystem and MedicalScannerSystem instead.
 /// </summary>
-public sealed partial class CloningSystem : EntitySystem
+public sealed partial class CloningSystem : SharedCloningSystem
 {
     [Dependency] private readonly HumanoidAppearanceSystem _humanoidSystem = default!;
     [Dependency] private readonly InventorySystem _inventory = default!;
@@ -84,13 +84,7 @@ public sealed partial class CloningSystem : EntitySystem
         return true;
     }
 
-    /// <summary>
-    ///     Copy components from one entity to another based on a CloningSettingsPrototype.
-    /// </summary>
-    /// <param name="original">The orignal Entity to clone components from.</param>
-    /// <param name="clone">The target Entity to clone components to.</param>
-    /// <param name="settings">The clone settings prototype containing the list of components to clone.</param>
-    public void CloneComponents(EntityUid original, EntityUid clone, CloningSettingsPrototype settings)
+    public override void CloneComponents(EntityUid original, EntityUid clone, CloningSettingsPrototype settings)
     {
         var componentsToCopy = settings.Components;
         var componentsToEvent = settings.EventComponents;
@@ -128,7 +122,8 @@ public sealed partial class CloningSystem : EntitySystem
             }
 
             // If the original does not have the component, then the clone shouldn't have it either.
-            RemComp(clone, componentRegistration.Type);
+            if (!HasComp(original, componentRegistration.Type))
+                RemComp(clone, componentRegistration.Type);
         }
 
         var cloningEv = new CloningEvent(settings, clone);
diff --git a/Content.Server/Damage/Systems/DamageUserOnTriggerSystem.cs b/Content.Server/Damage/Systems/DamageUserOnTriggerSystem.cs
deleted file mode 100644
index 8a0ee51076..0000000000
--- a/Content.Server/Damage/Systems/DamageUserOnTriggerSystem.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using Content.Server.Explosion.EntitySystems;
-using Content.Shared.Damage;
-using Content.Shared.Damage.Components;
-
-namespace Content.Server.Damage.Systems;
-
-// System for damage that occurs on specific trigger, towards the user..
-public sealed class DamageUserOnTriggerSystem : EntitySystem
-{
-    [Dependency] private readonly DamageableSystem _damageableSystem = default!;
-
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<DamageUserOnTriggerComponent, TriggerEvent>(OnTrigger);
-    }
-
-    private void OnTrigger(EntityUid uid, DamageUserOnTriggerComponent component, TriggerEvent args)
-    {
-        if (args.User is null)
-            return;
-
-        args.Handled |= OnDamageTrigger(uid, args.User.Value, component);
-    }
-
-    private bool OnDamageTrigger(EntityUid source, EntityUid target, DamageUserOnTriggerComponent? component = null)
-    {
-        if (!Resolve(source, ref component))
-        {
-            return false;
-        }
-
-        var damage = new DamageSpecifier(component.Damage);
-        var ev = new BeforeDamageUserOnTriggerEvent(damage, target);
-        RaiseLocalEvent(source, ev);
-
-        return _damageableSystem.TryChangeDamage(target, ev.Damage, component.IgnoreResistances, origin: source) is not null;
-    }
-}
-
-public sealed class BeforeDamageUserOnTriggerEvent : EntityEventArgs
-{
-    public DamageSpecifier Damage { get; set;  }
-    public EntityUid Tripper { get; }
-
-    public BeforeDamageUserOnTriggerEvent(DamageSpecifier damage, EntityUid target)
-    {
-        Damage = damage;
-        Tripper = target;
-    }
-}
diff --git a/Content.Server/Defusable/Systems/DefusableSystem.cs b/Content.Server/Defusable/Systems/DefusableSystem.cs
index 1e9caece94..5c589d2131 100644
--- a/Content.Server/Defusable/Systems/DefusableSystem.cs
+++ b/Content.Server/Defusable/Systems/DefusableSystem.cs
@@ -1,5 +1,4 @@
 using Content.Server.Defusable.Components;
-using Content.Server.Explosion.Components;
 using Content.Server.Explosion.EntitySystems;
 using Content.Server.Popups;
 using Content.Server.Wires;
@@ -8,13 +7,13 @@ using Content.Shared.Construction.Components;
 using Content.Shared.Database;
 using Content.Shared.Defusable;
 using Content.Shared.Examine;
-using Content.Shared.Explosion.Components;
-using Content.Shared.Explosion.Components.OnTrigger;
 using Content.Shared.Popups;
+using Content.Shared.Trigger.Components;
+using Content.Shared.Trigger.Components.Effects;
+using Content.Shared.Trigger.Systems;
 using Content.Shared.Verbs;
 using Content.Shared.Wires;
 using Robust.Server.GameObjects;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 
 namespace Content.Server.Defusable.Systems;
@@ -74,12 +73,13 @@ public sealed class DefusableSystem : SharedDefusableSystem
             {
                 args.PushMarkup(Loc.GetString("defusable-examine-defused", ("name", uid)));
             }
-            else if (comp.Activated && TryComp<ActiveTimerTriggerComponent>(uid, out var activeComp))
+            else if (comp.Activated)
             {
-                if (comp.DisplayTime)
+                var remaining = _trigger.GetRemainingTime(uid);
+                if (comp.DisplayTime && remaining != null)
                 {
                     args.PushMarkup(Loc.GetString("defusable-examine-live", ("name", uid),
-                        ("time", MathF.Floor(activeComp.TimeRemaining))));
+                        ("time", Math.Floor(remaining.Value.TotalSeconds))));
                 }
                 else
                 {
@@ -139,16 +139,9 @@ public sealed class DefusableSystem : SharedDefusableSystem
         SetActivated(comp, true);
 
         _popup.PopupEntity(Loc.GetString("defusable-popup-begun", ("name", uid)), uid);
-        if (TryComp<OnUseTimerTriggerComponent>(uid, out var timerTrigger))
+        if (TryComp<TimerTriggerComponent>(uid, out var timerTrigger))
         {
-            _trigger.HandleTimerTrigger(
-                uid,
-                user,
-                timerTrigger.Delay,
-                timerTrigger.BeepInterval,
-                timerTrigger.InitialBeepDelay,
-                timerTrigger.BeepSound
-            );
+            _trigger.ActivateTimerTrigger((uid, timerTrigger));
         }
 
         RaiseLocalEvent(uid, new BombArmedEvent(uid));
@@ -168,7 +161,7 @@ public sealed class DefusableSystem : SharedDefusableSystem
 
         RaiseLocalEvent(uid, new BombDetonatedEvent(uid));
 
-        _explosion.TriggerExplosive(uid, user:detonator);
+        _explosion.TriggerExplosive(uid, user: detonator);
         QueueDel(uid);
 
         _appearance.SetData(uid, DefusableVisuals.Active, comp.Activated);
@@ -188,7 +181,7 @@ public sealed class DefusableSystem : SharedDefusableSystem
         {
             SetUsable(comp, false);
             RemComp<ExplodeOnTriggerComponent>(uid);
-            RemComp<OnUseTimerTriggerComponent>(uid);
+            RemComp<TimerTriggerComponent>(uid);
         }
         RemComp<ActiveTimerTriggerComponent>(uid);
 
@@ -246,7 +239,7 @@ public sealed class DefusableSystem : SharedDefusableSystem
         if (comp is not { Activated: true, DelayWireUsed: false })
             return;
 
-        _trigger.TryDelay(wire.Owner, 30f);
+        _trigger.TryDelay(wire.Owner, TimeSpan.FromSeconds(30));
         _popup.PopupEntity(Loc.GetString("defusable-popup-wire-chirp", ("name", wire.Owner)), wire.Owner);
         comp.DelayWireUsed = true;
     }
@@ -268,7 +261,7 @@ public sealed class DefusableSystem : SharedDefusableSystem
         if (comp is { Activated: true, ProceedWireUsed: false })
         {
             comp.ProceedWireUsed = true;
-            _trigger.TryDelay(wire.Owner, -15f);
+            _trigger.TryDelay(wire.Owner, TimeSpan.FromSeconds(-15));
         }
 
         _popup.PopupEntity(Loc.GetString("defusable-popup-wire-proceed-pulse", ("name", wire.Owner)), wire.Owner);
@@ -298,7 +291,7 @@ public sealed class DefusableSystem : SharedDefusableSystem
         {
             if (!comp.ActivatedWireUsed)
             {
-                _trigger.TryDelay(wire.Owner, 30f);
+                _trigger.TryDelay(wire.Owner, TimeSpan.FromSeconds(30));
                 _popup.PopupEntity(Loc.GetString("defusable-popup-wire-chirp", ("name", wire.Owner)), wire.Owner);
                 comp.ActivatedWireUsed = true;
             }
diff --git a/Content.Server/Destructible/DestructibleSystem.cs b/Content.Server/Destructible/DestructibleSystem.cs
index 82d5ffcb9a..b4a79c6830 100644
--- a/Content.Server/Destructible/DestructibleSystem.cs
+++ b/Content.Server/Destructible/DestructibleSystem.cs
@@ -1,4 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using Content.Server.Administration.Logs;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Systems;
@@ -14,15 +15,13 @@ using Content.Shared.Damage;
 using Content.Shared.Database;
 using Content.Shared.Destructible;
 using Content.Shared.FixedPoint;
+using Content.Shared.Humanoid;
+using Content.Shared.Trigger.Systems;
 using JetBrains.Annotations;
 using Robust.Server.Audio;
-using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
-using System.Linq;
-using Content.Shared.Humanoid;
-using Robust.Shared.Player;
 
 namespace Content.Server.Destructible
 {
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/TimerStartBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/TimerStartBehavior.cs
index 97a5f8b7ef..cf337ac76a 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/TimerStartBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/TimerStartBehavior.cs
@@ -5,6 +5,6 @@ public sealed partial class TimerStartBehavior : IThresholdBehavior
 {
     public void Execute(EntityUid owner, DestructibleSystem system, EntityUid? cause = null)
     {
-        system.TriggerSystem.StartTimer(owner, cause);
+        system.TriggerSystem.ActivateTimerTrigger(owner, cause);
     }
 }
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/TriggerBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/TriggerBehavior.cs
index 03bdb8ff69..66da79063c 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/TriggerBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/TriggerBehavior.cs
@@ -1,10 +1,18 @@
-namespace Content.Server.Destructible.Thresholds.Behaviors;
+using Content.Shared.Trigger.Systems;
+
+namespace Content.Server.Destructible.Thresholds.Behaviors;
 
 [DataDefinition]
 public sealed partial class TriggerBehavior : IThresholdBehavior
 {
+    /// <summary>
+    /// The trigger key to use when triggering.
+    /// </summary>
+    [DataField]
+    public string? KeyOut { get; set; } = TriggerSystem.DefaultTriggerKey;
+
     public void Execute(EntityUid owner, DestructibleSystem system, EntityUid? cause = null)
     {
-        system.TriggerSystem.Trigger(owner, cause);
+        system.TriggerSystem.Trigger(owner, cause, KeyOut);
     }
 }
diff --git a/Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs b/Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs
index d957f0171e..ff20ac4d8d 100644
--- a/Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs
+++ b/Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs
@@ -1,4 +1,6 @@
 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;
diff --git a/Content.Server/DeviceLinking/Systems/MemoryCellSystem.cs b/Content.Server/DeviceLinking/Systems/MemoryCellSystem.cs
index 45e4d21750..7743a97d72 100644
--- a/Content.Server/DeviceLinking/Systems/MemoryCellSystem.cs
+++ b/Content.Server/DeviceLinking/Systems/MemoryCellSystem.cs
@@ -1,5 +1,4 @@
 using Content.Server.DeviceLinking.Components;
-using Content.Server.DeviceNetwork;
 using Content.Shared.DeviceLinking;
 using Content.Shared.DeviceLinking.Events;
 using Content.Shared.DeviceNetwork;
diff --git a/Content.Server/DeviceLinking/Systems/SignallerSystem.cs b/Content.Server/DeviceLinking/Systems/SignallerSystem.cs
index a5091508ed..7d684d1cd5 100644
--- a/Content.Server/DeviceLinking/Systems/SignallerSystem.cs
+++ b/Content.Server/DeviceLinking/Systems/SignallerSystem.cs
@@ -1,6 +1,5 @@
 using Content.Server.Administration.Logs;
 using Content.Server.DeviceLinking.Components;
-using Content.Server.Explosion.EntitySystems;
 using Content.Shared.Database;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Timing;
@@ -10,7 +9,6 @@ namespace Content.Server.DeviceLinking.Systems;
 public sealed class SignallerSystem : EntitySystem
 {
     [Dependency] private readonly DeviceLinkSystem _link = default!;
-    [Dependency] private readonly UseDelaySystem _useDelay = default!;
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
 
     public override void Initialize()
@@ -19,7 +17,6 @@ public sealed class SignallerSystem : EntitySystem
 
         SubscribeLocalEvent<SignallerComponent, ComponentInit>(OnInit);
         SubscribeLocalEvent<SignallerComponent, UseInHandEvent>(OnUseInHand);
-        SubscribeLocalEvent<SignallerComponent, TriggerEvent>(OnTrigger);
     }
 
     private void OnInit(EntityUid uid, SignallerComponent component, ComponentInit args)
@@ -36,16 +33,4 @@ public sealed class SignallerSystem : EntitySystem
         _link.InvokePort(uid, component.Port);
         args.Handled = true;
     }
-
-    private void OnTrigger(EntityUid uid, SignallerComponent component, TriggerEvent args)
-    {
-        if (!TryComp(uid, out UseDelayComponent? useDelay)
-            // if on cooldown, do nothing
-            // and set cooldown to prevent clocks
-            || !_useDelay.TryResetDelay((uid, useDelay), true))
-            return;
-
-        _link.InvokePort(uid, component.Port);
-        args.Handled = true;
-    }
 }
diff --git a/Content.Server/Electrocution/ElectrocutionSystem.cs b/Content.Server/Electrocution/ElectrocutionSystem.cs
index bb9e71cfc3..05dfffa4a9 100644
--- a/Content.Server/Electrocution/ElectrocutionSystem.cs
+++ b/Content.Server/Electrocution/ElectrocutionSystem.cs
@@ -58,7 +58,7 @@ public sealed class ElectrocutionSystem : SharedElectrocutionSystem
     [Dependency] private readonly MetaDataSystem _metaData = default!;
     [Dependency] private readonly TurfSystem _turf = default!;
 
-    private static readonly ProtoId<StatusEffectPrototype> StatusEffectKey = "Electrocution";
+    private static readonly ProtoId<StatusEffectPrototype> StatusKeyIn = "Electrocution";
     private static readonly ProtoId<DamageTypePrototype> DamageType = "Shock";
     private static readonly ProtoId<TagPrototype> WindowTag = "Window";
 
@@ -386,12 +386,12 @@ public sealed class ElectrocutionSystem : SharedElectrocutionSystem
         }
 
         if (!Resolve(uid, ref statusEffects, false) ||
-            !_statusEffects.CanApplyEffect(uid, StatusEffectKey, statusEffects))
+            !_statusEffects.CanApplyEffect(uid, StatusKeyIn, statusEffects))
         {
             return false;
         }
 
-        if (!_statusEffects.TryAddStatusEffect<ElectrocutedComponent>(uid, StatusEffectKey, time, refresh, statusEffects))
+        if (!_statusEffects.TryAddStatusEffect<ElectrocutedComponent>(uid, StatusKeyIn, time, refresh, statusEffects))
             return false;
 
         var shouldStun = siemensCoefficient > 0.5f;
diff --git a/Content.Server/Emoting/Components/BodyEmotesComponent.cs b/Content.Server/Emoting/Components/BodyEmotesComponent.cs
index 3fd71def0d..d911a89ec9 100644
--- a/Content.Server/Emoting/Components/BodyEmotesComponent.cs
+++ b/Content.Server/Emoting/Components/BodyEmotesComponent.cs
@@ -1,6 +1,6 @@
 using Content.Server.Emoting.Systems;
 using Content.Shared.Chat.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Emoting.Components;
 
@@ -14,11 +14,6 @@ public sealed partial class BodyEmotesComponent : Component
     /// <summary>
     ///     Emote sounds prototype id for body emotes.
     /// </summary>
-    [DataField("soundsId", customTypeSerializer: typeof(PrototypeIdSerializer<EmoteSoundsPrototype>))]
-    public string? SoundsId;
-
-    /// <summary>
-    ///     Loaded emote sounds prototype used for body emotes.
-    /// </summary>
-    public EmoteSoundsPrototype? Sounds;
+    [DataField]
+    public ProtoId<EmoteSoundsPrototype>? SoundsId;
 }
diff --git a/Content.Server/Emoting/Systems/BodyEmotesSystem.cs b/Content.Server/Emoting/Systems/BodyEmotesSystem.cs
index 594eb0ec6d..aef79f1419 100644
--- a/Content.Server/Emoting/Systems/BodyEmotesSystem.cs
+++ b/Content.Server/Emoting/Systems/BodyEmotesSystem.cs
@@ -14,15 +14,8 @@ public sealed class BodyEmotesSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<BodyEmotesComponent, ComponentStartup>(OnStartup);
-        SubscribeLocalEvent<BodyEmotesComponent, EmoteEvent>(OnEmote);
-    }
 
-    private void OnStartup(EntityUid uid, BodyEmotesComponent component, ComponentStartup args)
-    {
-        if (component.SoundsId == null)
-            return;
-        _proto.TryIndex(component.SoundsId, out component.Sounds);
+        SubscribeLocalEvent<BodyEmotesComponent, EmoteEvent>(OnEmote);
     }
 
     private void OnEmote(EntityUid uid, BodyEmotesComponent component, ref EmoteEvent args)
@@ -43,6 +36,9 @@ public sealed class BodyEmotesSystem : EntitySystem
         if (!TryComp(uid, out HandsComponent? hands) || hands.Count <= 0)
             return false;
 
-        return _chat.TryPlayEmoteSound(uid, component.Sounds, emote);
+        if (!_proto.Resolve(component.SoundsId, out var sounds))
+            return false;
+
+        return _chat.TryPlayEmoteSound(uid, sounds, emote);
     }
 }
diff --git a/Content.Server/Emp/EmpOnTriggerComponent.cs b/Content.Server/Emp/EmpOnTriggerComponent.cs
deleted file mode 100644
index fac509ea9f..0000000000
--- a/Content.Server/Emp/EmpOnTriggerComponent.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-namespace Content.Server.Emp;
-
-/// <summary>
-/// Upon being triggered will EMP area around it.
-/// </summary>
-[RegisterComponent]
-[Access(typeof(EmpSystem))]
-public sealed partial class EmpOnTriggerComponent : Component
-{
-    [DataField("range"), ViewVariables(VVAccess.ReadWrite)]
-    public float Range = 1.0f;
-
-    /// <summary>
-    /// How much energy will be consumed per battery in range
-    /// </summary>
-    [DataField("energyConsumption"), ViewVariables(VVAccess.ReadWrite)]
-    public float EnergyConsumption;
-
-    /// <summary>
-    /// How long it disables targets in seconds
-    /// </summary>
-    [DataField("disableDuration"), ViewVariables(VVAccess.ReadWrite)]
-    public float DisableDuration = 60f;
-}
diff --git a/Content.Server/Emp/EmpSystem.cs b/Content.Server/Emp/EmpSystem.cs
index 4b5143aa40..67f9cabd42 100644
--- a/Content.Server/Emp/EmpSystem.cs
+++ b/Content.Server/Emp/EmpSystem.cs
@@ -1,10 +1,7 @@
-using Content.Server.Explosion.EntitySystems;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Radio;
 using Content.Server.SurveillanceCamera;
 using Content.Shared.Emp;
-using Content.Shared.Examine;
-using Robust.Server.GameObjects;
 using Robust.Shared.Map;
 
 namespace Content.Server.Emp;
@@ -12,15 +9,12 @@ namespace Content.Server.Emp;
 public sealed class EmpSystem : SharedEmpSystem
 {
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
-    [Dependency] private readonly TransformSystem _transform = default!;
 
     public const string EmpPulseEffectPrototype = "EffectEmpPulse";
 
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<EmpDisabledComponent, ExaminedEvent>(OnExamine);
-        SubscribeLocalEvent<EmpOnTriggerComponent, TriggerEvent>(HandleEmpTrigger);
 
         SubscribeLocalEvent<EmpDisabledComponent, RadioSendAttemptEvent>(OnRadioSendAttempt);
         SubscribeLocalEvent<EmpDisabledComponent, RadioReceiveAttemptEvent>(OnRadioReceiveAttempt);
@@ -28,14 +22,7 @@ public sealed class EmpSystem : SharedEmpSystem
         SubscribeLocalEvent<EmpDisabledComponent, SurveillanceCameraSetActiveAttemptEvent>(OnCameraSetActive);
     }
 
-    /// <summary>
-    ///   Triggers an EMP pulse at the given location, by first raising an <see cref="EmpAttemptEvent"/>, then a raising <see cref="EmpPulseEvent"/> on all entities in range.
-    /// </summary>
-    /// <param name="coordinates">The location to trigger the EMP pulse at.</param>
-    /// <param name="range">The range of the EMP pulse.</param>
-    /// <param name="energyConsumption">The amount of energy consumed by the EMP pulse.</param>
-    /// <param name="duration">The duration of the EMP effects.</param>
-    public void EmpPulse(MapCoordinates coordinates, float range, float energyConsumption, float duration)
+    public override void EmpPulse(MapCoordinates coordinates, float range, float energyConsumption, float duration)
     {
         foreach (var uid in _lookup.GetEntitiesInRange(coordinates, range))
         {
@@ -86,15 +73,15 @@ public sealed class EmpSystem : SharedEmpSystem
     {
         var ev = new EmpPulseEvent(energyConsumption, false, false, TimeSpan.FromSeconds(duration));
         RaiseLocalEvent(uid, ref ev);
+
         if (ev.Affected)
-        {
             Spawn(EmpDisabledEffectPrototype, Transform(uid).Coordinates);
-        }
-        if (ev.Disabled)
-        {
-            var disabled = EnsureComp<EmpDisabledComponent>(uid);
-            disabled.DisabledUntil = Timing.CurTime + TimeSpan.FromSeconds(duration);
-        }
+
+        if (!ev.Disabled)
+            return;
+
+        var disabled = EnsureComp<EmpDisabledComponent>(uid);
+        disabled.DisabledUntil = Timing.CurTime + TimeSpan.FromSeconds(duration);
     }
 
     public override void Update(float frameTime)
@@ -113,17 +100,6 @@ public sealed class EmpSystem : SharedEmpSystem
         }
     }
 
-    private void OnExamine(EntityUid uid, EmpDisabledComponent component, ExaminedEvent args)
-    {
-        args.PushMarkup(Loc.GetString("emp-disabled-comp-on-examine"));
-    }
-
-    private void HandleEmpTrigger(EntityUid uid, EmpOnTriggerComponent comp, TriggerEvent args)
-    {
-        EmpPulse(_transform.GetMapCoordinates(uid), comp.Range, comp.EnergyConsumption, comp.DisableDuration);
-        args.Handled = true;
-    }
-
     private void OnRadioSendAttempt(EntityUid uid, EmpDisabledComponent component, ref RadioSendAttemptEvent args)
     {
         args.Cancelled = true;
@@ -148,9 +124,7 @@ public sealed class EmpSystem : SharedEmpSystem
 /// <summary>
 /// Raised on an entity before <see cref="EmpPulseEvent"/>. Cancel this to prevent the emp event being raised.
 /// </summary>
-public sealed partial class EmpAttemptEvent : CancellableEntityEventArgs
-{
-}
+public sealed partial class EmpAttemptEvent : CancellableEntityEventArgs;
 
 [ByRefEvent]
 public record struct EmpPulseEvent(float EnergyConsumption, bool Affected, bool Disabled, TimeSpan Duration);
diff --git a/Content.Server/EntityEffects/EntityEffectSystem.cs b/Content.Server/EntityEffects/EntityEffectSystem.cs
index 54270ca53d..1277c8df59 100644
--- a/Content.Server/EntityEffects/EntityEffectSystem.cs
+++ b/Content.Server/EntityEffects/EntityEffectSystem.cs
@@ -133,7 +133,7 @@ public sealed class EntityEffectSystem : EntitySystem
         args.Result = false;
         if (TryComp(args.Args.TargetEntity, out TemperatureComponent? temp))
         {
-            if (temp.CurrentTemperature > args.Condition.Min && temp.CurrentTemperature < args.Condition.Max)
+            if (temp.CurrentTemperature >= args.Condition.Min && temp.CurrentTemperature <= args.Condition.Max)
                 args.Result = true;
         }
     }
diff --git a/Content.Server/Explosion/Components/ActiveTriggerOnTimedCollideComponent.cs b/Content.Server/Explosion/Components/ActiveTriggerOnTimedCollideComponent.cs
deleted file mode 100644
index 9d8073413c..0000000000
--- a/Content.Server/Explosion/Components/ActiveTriggerOnTimedCollideComponent.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace Content.Server.Explosion.Components;
-
-[RegisterComponent]
-public sealed partial class ActiveTriggerOnTimedCollideComponent : Component { }
diff --git a/Content.Server/Explosion/Components/AutomatedTimerComponent.cs b/Content.Server/Explosion/Components/AutomatedTimerComponent.cs
deleted file mode 100644
index c01aeb91e5..0000000000
--- a/Content.Server/Explosion/Components/AutomatedTimerComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-///     Disallows starting the timer by hand, must be stuck or triggered by a system using <c>StartTimer</c>.
-/// </summary>
-[RegisterComponent]
-public sealed partial class AutomatedTimerComponent : Component
-{
-}
diff --git a/Content.Server/Explosion/Components/OnTrigger/AnchorOnTriggerComponent.cs b/Content.Server/Explosion/Components/OnTrigger/AnchorOnTriggerComponent.cs
deleted file mode 100644
index d83b57c188..0000000000
--- a/Content.Server/Explosion/Components/OnTrigger/AnchorOnTriggerComponent.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Content.Server.Explosion.EntitySystems;
-
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-/// Will anchor the attached entity upon a <see cref="TriggerEvent"/>.
-/// </summary>
-[RegisterComponent]
-public sealed partial class AnchorOnTriggerComponent : Component
-{
-    [DataField("removeOnTrigger")]
-    public bool RemoveOnTrigger = true;
-}
diff --git a/Content.Server/Explosion/Components/OnTrigger/DeleteOnTriggerComponent.cs b/Content.Server/Explosion/Components/OnTrigger/DeleteOnTriggerComponent.cs
deleted file mode 100644
index 9846cad84b..0000000000
--- a/Content.Server/Explosion/Components/OnTrigger/DeleteOnTriggerComponent.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Content.Server.Explosion.EntitySystems;
-
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-/// Will delete the attached entity upon a <see cref="TriggerEvent"/>.
-/// </summary>
-[RegisterComponent]
-public sealed partial class DeleteOnTriggerComponent : Component
-{
-}
diff --git a/Content.Server/Explosion/Components/OnTrigger/GibOnTriggerComponent.cs b/Content.Server/Explosion/Components/OnTrigger/GibOnTriggerComponent.cs
deleted file mode 100644
index da58467659..0000000000
--- a/Content.Server/Explosion/Components/OnTrigger/GibOnTriggerComponent.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-/// Gibs on trigger, self explanatory.
-/// Also in case of an implant using this, gibs the implant user instead.
-/// </summary>
-[RegisterComponent]
-public sealed partial class GibOnTriggerComponent : Component
-{
-    /// <summary>
-    /// Should gibbing also delete the owners items?
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("deleteItems")]
-    public bool DeleteItems = false;
-}
diff --git a/Content.Server/Explosion/Components/OnTrigger/SoundOnTriggerComponent.cs b/Content.Server/Explosion/Components/OnTrigger/SoundOnTriggerComponent.cs
deleted file mode 100644
index 7f9f16a227..0000000000
--- a/Content.Server/Explosion/Components/OnTrigger/SoundOnTriggerComponent.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Content.Server.Explosion.EntitySystems;
-using Robust.Shared.Audio;
-
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-/// Will play sound from the attached entity upon a <see cref="TriggerEvent"/>.
-/// </summary>
-[RegisterComponent]
-public sealed partial class SoundOnTriggerComponent : Component
-{
-    [DataField("removeOnTrigger")]
-    public bool RemoveOnTrigger = true;
-
-    [DataField("sound")]
-    public SoundSpecifier? Sound = new SoundPathSpecifier("/Audio/Effects/Grenades/supermatter_start.ogg");
-}
diff --git a/Content.Server/Explosion/Components/OnTrigger/TwoStageTriggerComponent.cs b/Content.Server/Explosion/Components/OnTrigger/TwoStageTriggerComponent.cs
deleted file mode 100644
index a63d6fcf66..0000000000
--- a/Content.Server/Explosion/Components/OnTrigger/TwoStageTriggerComponent.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-
-namespace Content.Server.Explosion.Components.OnTrigger;
-
-/// <summary>
-/// After being triggered applies the specified components and runs triggers again.
-/// </summary>
-[RegisterComponent, AutoGenerateComponentPause]
-public sealed partial class TwoStageTriggerComponent : Component
-{
-    /// <summary>
-    /// How long it takes for the second stage to be triggered.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("triggerDelay")]
-    public TimeSpan TriggerDelay = TimeSpan.FromSeconds(10);
-
-    /// <summary>
-    /// This list of components that will be added for the second trigger.
-    /// </summary>
-    [DataField("components", required: true)]
-    public ComponentRegistry SecondStageComponents = new();
-
-    [DataField("nextTriggerTime", customTypeSerializer: typeof(TimeOffsetSerializer))]
-    [AutoPausedField]
-    public TimeSpan? NextTriggerTime;
-
-    [DataField("triggered")]
-    public bool Triggered = false;
-
-    [DataField("ComponentsIsLoaded")]
-    public bool ComponentsIsLoaded = false;
-}
diff --git a/Content.Server/Explosion/Components/ProjectileGrenadeComponent.cs b/Content.Server/Explosion/Components/ProjectileGrenadeComponent.cs
index 58d687e025..20a73b46b5 100644
--- a/Content.Server/Explosion/Components/ProjectileGrenadeComponent.cs
+++ b/Content.Server/Explosion/Components/ProjectileGrenadeComponent.cs
@@ -45,4 +45,10 @@ public sealed partial class ProjectileGrenadeComponent : Component
     /// </summary>
     [DataField]
     public float MaxVelocity = 6f;
+
+    /// <summary>
+    /// The trigger key that will activate the grenade.
+    /// </summary>
+    [DataField]
+    public string TriggerKey = "timer";
 }
diff --git a/Content.Server/Explosion/Components/ShockOnTriggerComponent.cs b/Content.Server/Explosion/Components/ShockOnTriggerComponent.cs
deleted file mode 100644
index a553cc047a..0000000000
--- a/Content.Server/Explosion/Components/ShockOnTriggerComponent.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-using Content.Server.Explosion.EntitySystems;
-
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-/// A component that electrocutes an entity having this component when a trigger is triggered.
-/// </summary>
-[RegisterComponent, AutoGenerateComponentPause]
-[Access(typeof(TriggerSystem))]
-public sealed partial class ShockOnTriggerComponent : Component
-{
-    /// <summary>
-    /// The force of an electric shock when the trigger is triggered.
-    /// </summary>
-    [DataField]
-    public int Damage = 5;
-
-    /// <summary>
-    /// Duration of electric shock when the trigger is triggered.
-    /// </summary>
-    [DataField]
-    public TimeSpan Duration = TimeSpan.FromSeconds(2);
-
-    /// <summary>
-    /// The minimum delay between repeating triggers.
-    /// </summary>
-    [DataField]
-    public TimeSpan Cooldown = TimeSpan.FromSeconds(4);
-
-    /// <summary>
-    /// When can the trigger run again?
-    /// </summary>
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
-    [AutoPausedField]
-    public TimeSpan NextTrigger = TimeSpan.Zero;
-}
diff --git a/Content.Server/Explosion/Components/SpawnOnTriggerComponent.cs b/Content.Server/Explosion/Components/SpawnOnTriggerComponent.cs
deleted file mode 100644
index c28ec7faeb..0000000000
--- a/Content.Server/Explosion/Components/SpawnOnTriggerComponent.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Content.Server.Explosion.EntitySystems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-///     Spawns a protoype when triggered.
-/// </summary>
-[RegisterComponent, Access(typeof(TriggerSystem))]
-public sealed partial class SpawnOnTriggerComponent : Component
-{
-    /// <summary>
-    ///     The prototype to spawn.
-    /// </summary>
-    [DataField(required: true)]
-    public EntProtoId Proto = string.Empty;
-
-    /// <summary>
-    ///     Use MapCoordinates for spawning?
-    ///     Set to true if you don't want the new entity parented to the spawner.
-    /// </summary>
-    [DataField]
-    public bool mapCoords;
-}
diff --git a/Content.Server/Explosion/Components/TimerStartOnSignalComponent.cs b/Content.Server/Explosion/Components/TimerStartOnSignalComponent.cs
deleted file mode 100644
index 9adc6dab87..0000000000
--- a/Content.Server/Explosion/Components/TimerStartOnSignalComponent.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Content.Shared.DeviceLinking;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Server.Explosion.Components
-{
-    /// <summary>
-    /// Sends a trigger when signal is received.
-    /// </summary>
-    [RegisterComponent]
-    public sealed partial class TimerStartOnSignalComponent : Component
-    {
-        [DataField("port", customTypeSerializer: typeof(PrototypeIdSerializer<SinkPortPrototype>))]
-        public string Port = "Timer";
-    }
-}
diff --git a/Content.Server/Explosion/Components/TriggerOnActivateComponent.cs b/Content.Server/Explosion/Components/TriggerOnActivateComponent.cs
deleted file mode 100644
index 1531c7425e..0000000000
--- a/Content.Server/Explosion/Components/TriggerOnActivateComponent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-/// Triggers on click.
-/// </summary>
-[RegisterComponent]
-public sealed partial class TriggerOnActivateComponent : Component { }
diff --git a/Content.Server/Explosion/Components/TriggerOnCollideComponent.cs b/Content.Server/Explosion/Components/TriggerOnCollideComponent.cs
deleted file mode 100644
index 28c2ed8c34..0000000000
--- a/Content.Server/Explosion/Components/TriggerOnCollideComponent.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-///     Triggers when colliding with another entity.
-/// </summary>
-[RegisterComponent]
-public sealed partial class TriggerOnCollideComponent : Component
-{
-    /// <summary>
-    ///     The fixture with which to collide.
-    /// </summary>
-    [DataField(required: true)]
-    public string FixtureID = string.Empty;
-
-    /// <summary>
-    ///     Doesn't trigger if the other colliding fixture is nonhard.
-    /// </summary>
-    [DataField]
-    public bool IgnoreOtherNonHard = true;
-}
diff --git a/Content.Server/Explosion/Components/TriggerOnMobstateChangeComponent.cs b/Content.Server/Explosion/Components/TriggerOnMobstateChangeComponent.cs
deleted file mode 100644
index a6cdda247c..0000000000
--- a/Content.Server/Explosion/Components/TriggerOnMobstateChangeComponent.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Content.Shared.Mobs;
-
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-/// Use where you want something to trigger on mobstate change
-/// </summary>
-[RegisterComponent]
-public sealed partial class TriggerOnMobstateChangeComponent : Component
-{
-    /// <summary>
-    /// What state should trigger this?
-    /// </summary>
-    [ViewVariables]
-    [DataField("mobState", required: true)]
-    public List<MobState> MobState = new();
-
-    /// <summary>
-    /// If true, prevents suicide attempts for the trigger to prevent cheese.
-    /// </summary>
-    [ViewVariables]
-    [DataField("preventSuicide")]
-    public bool PreventSuicide = false;
-}
diff --git a/Content.Server/Explosion/Components/TriggerOnProximityComponent.cs b/Content.Server/Explosion/Components/TriggerOnProximityComponent.cs
deleted file mode 100644
index 4f3fb4754e..0000000000
--- a/Content.Server/Explosion/Components/TriggerOnProximityComponent.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using Content.Server.Explosion.EntitySystems;
-using Content.Shared.Explosion;
-using Content.Shared.Explosion.Components;
-using Content.Shared.Physics;
-using Robust.Shared.Physics.Collision.Shapes;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Dynamics;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-
-namespace Content.Server.Explosion.Components
-{
-
-    /// <summary>
-    /// Raises a <see cref="TriggerEvent"/> whenever an entity collides with a fixture attached to the owner of this component.
-    /// </summary>
-    [RegisterComponent, AutoGenerateComponentPause]
-    public sealed partial class TriggerOnProximityComponent : SharedTriggerOnProximityComponent
-    {
-        public const string FixtureID = "trigger-on-proximity-fixture";
-
-        [ViewVariables]
-        public readonly Dictionary<EntityUid, PhysicsComponent> Colliding = new();
-
-        /// <summary>
-        /// What is the shape of the proximity fixture?
-        /// </summary>
-        [ViewVariables]
-        [DataField("shape")]
-        public IPhysShape Shape = new PhysShapeCircle(2f);
-
-        /// <summary>
-        /// How long the the proximity trigger animation plays for.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("animationDuration")]
-        public TimeSpan AnimationDuration = TimeSpan.FromSeconds(0.6f);
-
-        /// <summary>
-        /// Whether the entity needs to be anchored for the proximity to work.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("requiresAnchored")]
-        public bool RequiresAnchored = true;
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("enabled")]
-        public bool Enabled = true;
-
-        /// <summary>
-        /// The minimum delay between repeating triggers.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("cooldown")]
-        public TimeSpan Cooldown = TimeSpan.FromSeconds(5);
-
-        /// <summary>
-        /// When can the trigger run again?
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("nextTrigger", customTypeSerializer: typeof(TimeOffsetSerializer))]
-        [AutoPausedField]
-        public TimeSpan NextTrigger = TimeSpan.Zero;
-
-        /// <summary>
-        /// When will the visual state be updated again after activation?
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("nextVisualUpdate", customTypeSerializer: typeof(TimeOffsetSerializer))]
-        [AutoPausedField]
-        public TimeSpan NextVisualUpdate = TimeSpan.Zero;
-
-        /// <summary>
-        /// What speed should the other object be moving at to trigger the proximity fixture?
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("triggerSpeed")]
-        public float TriggerSpeed = 3.5f;
-
-        /// <summary>
-        /// If this proximity is triggered should we continually repeat it?
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("repeating")]
-        public bool Repeating = true;
-
-        /// <summary>
-        /// What layer is the trigger fixture on?
-        /// </summary>
-        [ViewVariables]
-        [DataField("layer", customTypeSerializer: typeof(FlagSerializer<CollisionLayer>))]
-        public int Layer = (int) (CollisionGroup.MidImpassable | CollisionGroup.LowImpassable | CollisionGroup.HighImpassable);
-    }
-}
diff --git a/Content.Server/Explosion/Components/TriggerOnSignalComponent.cs b/Content.Server/Explosion/Components/TriggerOnSignalComponent.cs
deleted file mode 100644
index fb7495612c..0000000000
--- a/Content.Server/Explosion/Components/TriggerOnSignalComponent.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Content.Shared.DeviceLinking;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Server.Explosion.Components
-{
-    /// <summary>
-    /// Sends a trigger when signal is received.
-    /// </summary>
-    [RegisterComponent]
-    public sealed partial class TriggerOnSignalComponent : Component
-    {
-        [DataField("port", customTypeSerializer: typeof(PrototypeIdSerializer<SinkPortPrototype>))]
-        public string Port = "Trigger";
-    }
-}
diff --git a/Content.Server/Explosion/Components/TriggerOnSlipComponent.cs b/Content.Server/Explosion/Components/TriggerOnSlipComponent.cs
deleted file mode 100644
index 16632b9b72..0000000000
--- a/Content.Server/Explosion/Components/TriggerOnSlipComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Content.Server.Explosion.Components;
-
-[RegisterComponent]
-public sealed partial class TriggerOnSlipComponent : Component
-{
-}
diff --git a/Content.Server/Explosion/Components/TriggerOnSpawnComponent.cs b/Content.Server/Explosion/Components/TriggerOnSpawnComponent.cs
deleted file mode 100644
index 704ff410cd..0000000000
--- a/Content.Server/Explosion/Components/TriggerOnSpawnComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-/// calls the trigger when the object is initialized
-/// </summary>
-[RegisterComponent]
-public sealed partial class TriggerOnSpawnComponent : Component
-{
-}
diff --git a/Content.Server/Explosion/Components/TriggerOnStepTriggerComponent.cs b/Content.Server/Explosion/Components/TriggerOnStepTriggerComponent.cs
deleted file mode 100644
index 49e99ff785..0000000000
--- a/Content.Server/Explosion/Components/TriggerOnStepTriggerComponent.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-/// This is used for entities that want the more generic 'trigger' behavior after a step trigger occurs.
-/// Not done by default, since it's not useful for everything and might cause weird behavior. But it is useful for a lot of stuff like mousetraps.
-/// </summary>
-[RegisterComponent]
-public sealed partial class TriggerOnStepTriggerComponent : Component
-{
-}
diff --git a/Content.Server/Explosion/Components/TriggerOnTimedCollideComponent.cs b/Content.Server/Explosion/Components/TriggerOnTimedCollideComponent.cs
deleted file mode 100644
index d53bcbcc5d..0000000000
--- a/Content.Server/Explosion/Components/TriggerOnTimedCollideComponent.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-/// Triggers when the entity is overlapped for the specified duration.
-/// </summary>
-[RegisterComponent]
-public sealed partial class TriggerOnTimedCollideComponent : Component
-{
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("threshold")]
-    public float Threshold;
-
-    /// <summary>
-    /// A collection of entities that are colliding with this, and their own unique accumulator.
-    /// </summary>
-    [ViewVariables]
-    public readonly Dictionary<EntityUid, float> Colliding = new();
-}
diff --git a/Content.Server/Explosion/Components/TriggerOnUseComponent.cs b/Content.Server/Explosion/Components/TriggerOnUseComponent.cs
deleted file mode 100644
index 2b44d2fbac..0000000000
--- a/Content.Server/Explosion/Components/TriggerOnUseComponent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-/// Triggers on use in hand.
-/// </summary>
-[RegisterComponent]
-public sealed partial class TriggerOnUseComponent : Component { }
diff --git a/Content.Server/Explosion/Components/TriggerOnVoiceComponent.cs b/Content.Server/Explosion/Components/TriggerOnVoiceComponent.cs
deleted file mode 100644
index 7d07f496d0..0000000000
--- a/Content.Server/Explosion/Components/TriggerOnVoiceComponent.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-namespace Content.Server.Explosion.Components
-{
-    /// <summary>
-    /// Sends a trigger when the keyphrase is heard
-    /// </summary>
-    [RegisterComponent]
-    public sealed partial class TriggerOnVoiceComponent : Component
-    {
-        public bool IsListening => IsRecording || !string.IsNullOrWhiteSpace(KeyPhrase);
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("keyPhrase")]
-        public string? KeyPhrase;
-
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("listenRange")]
-        public int ListenRange { get; private set; } = 4;
-
-        [DataField("isRecording")]
-        public bool IsRecording = false;
-
-        [DataField("minLength")]
-        public int MinLength = 3;
-
-        [DataField("maxLength")]
-        public int MaxLength = 50;
-    }
-}
diff --git a/Content.Server/Explosion/Components/TriggerWhenEmptyComponent.cs b/Content.Server/Explosion/Components/TriggerWhenEmptyComponent.cs
deleted file mode 100644
index ad39b9c515..0000000000
--- a/Content.Server/Explosion/Components/TriggerWhenEmptyComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-/// Triggers a gun when attempting to shoot while it's empty
-/// </summary>
-[RegisterComponent]
-public sealed partial class TriggerWhenEmptyComponent : Component
-{
-}
diff --git a/Content.Server/Explosion/Components/TriggerWhitelistComponent.cs b/Content.Server/Explosion/Components/TriggerWhitelistComponent.cs
deleted file mode 100644
index 80becf17cc..0000000000
--- a/Content.Server/Explosion/Components/TriggerWhitelistComponent.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Content.Shared.Whitelist;
-
-namespace Content.Server.Explosion.Components;
-
-/// <summary>
-/// Checks if the user of a Trigger satisfies a whitelist and blacklist condition.
-/// Cancels the trigger otherwise.
-/// </summary>
-[RegisterComponent]
-public sealed partial class TriggerWhitelistComponent : Component
-{
-    /// <summary>
-    /// Whitelist for what entites can cause this trigger.
-    /// </summary>
-    [DataField]
-    public EntityWhitelist? Whitelist;
-
-    /// <summary>
-    /// Blacklist for what entites can cause this trigger.
-    /// </summary>
-    [DataField]
-    public EntityWhitelist? Blacklist;
-}
diff --git a/Content.Server/Explosion/EntitySystems/ProjectileGrenadeSystem.cs b/Content.Server/Explosion/EntitySystems/ProjectileGrenadeSystem.cs
index 6953010e46..4b93f22cd1 100644
--- a/Content.Server/Explosion/EntitySystems/ProjectileGrenadeSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ProjectileGrenadeSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.Explosion.Components;
 using Content.Server.Weapons.Ranged.Systems;
+using Content.Shared.Trigger;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
@@ -45,6 +46,9 @@ public sealed class ProjectileGrenadeSystem : EntitySystem
     /// </summary>
     private void OnFragTrigger(Entity<ProjectileGrenadeComponent> entity, ref TriggerEvent args)
     {
+        if (args.Key != entity.Comp.TriggerKey)
+            return;
+
         FragmentIntoProjectiles(entity.Owner, entity.Comp);
         args.Handled = true;
     }
diff --git a/Content.Server/Explosion/EntitySystems/ReleaseGasOnTriggerSystem.cs b/Content.Server/Explosion/EntitySystems/ReleaseGasOnTriggerSystem.cs
deleted file mode 100644
index ae3f84f843..0000000000
--- a/Content.Server/Explosion/EntitySystems/ReleaseGasOnTriggerSystem.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using Content.Server.Atmos.EntitySystems;
-using Content.Shared.Explosion.Components.OnTrigger;
-using Content.Shared.Explosion.EntitySystems;
-using Robust.Shared.Timing;
-
-namespace Content.Server.Explosion.EntitySystems;
-
-/// <summary>
-/// Releases a gas mixture to the atmosphere when triggered.
-/// Can also release gas over a set timespan to prevent trolling people
-/// with the instant-wall-of-pressure-inator.
-/// </summary>
-public sealed partial class ReleaseGasOnTriggerSystem : SharedReleaseGasOnTriggerSystem
-{
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-    [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<ReleaseGasOnTriggerComponent, TriggerEvent>(OnTrigger);
-    }
-
-    /// <summary>
-    /// Shrimply sets the component to active when triggered, allowing it to release over time.
-    /// </summary>
-    private void OnTrigger(Entity<ReleaseGasOnTriggerComponent> ent, ref TriggerEvent args)
-    {
-        ent.Comp.Active = true;
-        ent.Comp.NextReleaseTime = _timing.CurTime;
-        ent.Comp.StartingTotalMoles = ent.Comp.Air.TotalMoles;
-        UpdateAppearance(ent.Owner, true);
-    }
-
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        var curTime = _timing.CurTime;
-        var query = EntityQueryEnumerator<ReleaseGasOnTriggerComponent>();
-
-        while (query.MoveNext(out var uid, out var comp))
-        {
-            if (!comp.Active || comp.NextReleaseTime > curTime)
-                continue;
-
-            var giverGasMix = comp.Air.Remove(comp.StartingTotalMoles * comp.RemoveFraction);
-            var environment = _atmosphereSystem.GetContainingMixture(uid, false, true);
-
-            if (environment == null)
-            {
-                UpdateAppearance(uid, false);
-                RemCompDeferred<ReleaseGasOnTriggerComponent>(uid);
-                continue;
-            }
-
-            _atmosphereSystem.Merge(environment, giverGasMix);
-            comp.NextReleaseTime += comp.ReleaseInterval;
-
-            if (comp.PressureLimit != 0 && environment.Pressure >= comp.PressureLimit ||
-                comp.Air.TotalMoles <= 0)
-            {
-                UpdateAppearance(uid, false);
-                RemCompDeferred<ReleaseGasOnTriggerComponent>(uid);
-                continue;
-            }
-        }
-    }
-
-    private void UpdateAppearance(Entity<AppearanceComponent?> entity, bool state)
-    {
-        if (!Resolve(entity, ref entity.Comp, false))
-            return;
-
-        _appearance.SetData(entity, ReleaseGasOnTriggerVisuals.Key, state);
-    }
-}
diff --git a/Content.Server/Explosion/EntitySystems/RepulseAttractOnTriggerSystem.cs b/Content.Server/Explosion/EntitySystems/RepulseAttractOnTriggerSystem.cs
deleted file mode 100644
index 9e595c5d9e..0000000000
--- a/Content.Server/Explosion/EntitySystems/RepulseAttractOnTriggerSystem.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Content.Shared.Explosion.Components.OnTrigger;
-using Content.Shared.Explosion.EntitySystems;
-using Content.Shared.RepulseAttract;
-using Content.Shared.Timing;
-
-namespace Content.Server.Explosion.EntitySystems;
-
-public sealed class RepulseAttractOnTriggerSystem : SharedRepulseAttractOnTriggerSystem
-{
-    [Dependency] private readonly RepulseAttractSystem _repulse = default!;
-    [Dependency] private readonly SharedTransformSystem _transform = default!;
-    [Dependency] private readonly UseDelaySystem _delay = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<SharedRepulseAttractOnTriggerComponent, TriggerEvent>(OnTrigger);
-    }
-
-    private void OnTrigger(Entity<SharedRepulseAttractOnTriggerComponent> ent, ref TriggerEvent args)
-    {
-        if (_delay.IsDelayed(ent.Owner))
-            return;
-
-        var position = _transform.GetMapCoordinates(ent);
-        _repulse.TryRepulseAttract(position, args.User, ent.Comp.Speed, ent.Comp.Range, ent.Comp.Whitelist, ent.Comp.CollisionMask);
-    }
-}
diff --git a/Content.Server/Explosion/EntitySystems/ScatteringGrenadeSystem.cs b/Content.Server/Explosion/EntitySystems/ScatteringGrenadeSystem.cs
index 2657ba3449..5f7df28beb 100644
--- a/Content.Server/Explosion/EntitySystems/ScatteringGrenadeSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ScatteringGrenadeSystem.cs
@@ -1,5 +1,8 @@
 using Content.Shared.Explosion.Components;
 using Content.Shared.Throwing;
+using Content.Shared.Trigger;
+using Content.Shared.Trigger.Systems;
+using Content.Shared.Trigger.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
@@ -15,6 +18,7 @@ public sealed class ScatteringGrenadeSystem : SharedScatteringGrenadeSystem
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly ThrowingSystem _throwingSystem = default!;
     [Dependency] private readonly TransformSystem _transformSystem = default!;
+    [Dependency] private readonly TriggerSystem _trigger = default!;
 
     public override void Initialize()
     {
@@ -30,6 +34,9 @@ public sealed class ScatteringGrenadeSystem : SharedScatteringGrenadeSystem
     /// </summary>
     private void OnScatteringTrigger(Entity<ScatteringGrenadeComponent> entity, ref TriggerEvent args)
     {
+        if (args.Key != entity.Comp.TriggerKey)
+            return;
+
         entity.Comp.IsTriggered = true;
         args.Handled = true;
     }
@@ -76,13 +83,12 @@ public sealed class ScatteringGrenadeSystem : SharedScatteringGrenadeSystem
 
                     _throwingSystem.TryThrow(contentUid, direction, component.Velocity);
 
-                    if (component.TriggerContents)
+                    if (component.TriggerContents && TryComp<TimerTriggerComponent>(contentUid, out var contentTimer))
                     {
                         additionalIntervalDelay += _random.NextFloat(component.IntervalBetweenTriggersMin, component.IntervalBetweenTriggersMax);
-                        var contentTimer = EnsureComp<ActiveTimerTriggerComponent>(contentUid);
-                        contentTimer.TimeRemaining = component.DelayBeforeTriggerContents + additionalIntervalDelay;
-                        var ev = new ActiveTimerTriggerEvent(contentUid, uid);
-                        RaiseLocalEvent(contentUid, ref ev);
+
+                        _trigger.SetDelay((contentUid, contentTimer), TimeSpan.FromSeconds(component.DelayBeforeTriggerContents + additionalIntervalDelay));
+                        _trigger.ActivateTimerTrigger((contentUid, contentTimer));
                     }
                 }
 
diff --git a/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs b/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs
deleted file mode 100644
index 19335d3446..0000000000
--- a/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using Content.Shared.Explosion.Components;
-using Content.Shared.Explosion.EntitySystems;
-using Content.Server.Fluids.EntitySystems;
-using Content.Server.Spreader;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Coordinates.Helpers;
-using Content.Shared.Maps;
-using Robust.Server.GameObjects;
-using Robust.Shared.Map;
-
-namespace Content.Server.Explosion.EntitySystems;
-
-/// <summary>
-/// Handles creating smoke when <see cref="SmokeOnTriggerComponent"/> is triggered.
-/// </summary>
-public sealed class SmokeOnTriggerSystem : SharedSmokeOnTriggerSystem
-{
-    [Dependency] private readonly IMapManager _mapMan = default!;
-    [Dependency] private readonly SharedMapSystem _map = default!;
-    [Dependency] private readonly SmokeSystem _smoke = default!;
-    [Dependency] private readonly TransformSystem _transform = default!;
-    [Dependency] private readonly SpreaderSystem _spreader = default!;
-    [Dependency] private readonly TurfSystem _turf = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<SmokeOnTriggerComponent, TriggerEvent>(OnTrigger);
-    }
-
-    private void OnTrigger(EntityUid uid, SmokeOnTriggerComponent comp, TriggerEvent args)
-    {
-        var xform = Transform(uid);
-        var mapCoords = _transform.GetMapCoordinates(uid, xform);
-        if (!_mapMan.TryFindGridAt(mapCoords, out var gridUid, out var grid) ||
-            !_map.TryGetTileRef(gridUid, grid, xform.Coordinates, out var tileRef) ||
-            tileRef.Tile.IsEmpty)
-        {
-            return;
-        }
-
-        if (_spreader.RequiresFloorToSpread(comp.SmokePrototype.ToString()) && _turf.IsSpace(tileRef))
-            return;
-
-        var coords = _map.MapToGrid(gridUid, mapCoords);
-        var ent = Spawn(comp.SmokePrototype, coords.SnapToGrid());
-        if (!TryComp<SmokeComponent>(ent, out var smoke))
-        {
-            Log.Error($"Smoke prototype {comp.SmokePrototype} was missing SmokeComponent");
-            Del(ent);
-            return;
-        }
-
-        _smoke.StartSmoke(ent, comp.Solution, comp.Duration, comp.SpreadAmount, smoke);
-    }
-}
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs
deleted file mode 100644
index d06e9fa1c2..0000000000
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs
+++ /dev/null
@@ -1,170 +0,0 @@
-using Content.Server.Explosion.Components;
-using Content.Shared.Examine;
-using Content.Shared.Explosion.Components;
-using Content.Shared.Interaction.Events;
-using Content.Shared.Popups;
-using Content.Shared.Sticky;
-using Content.Shared.Verbs;
-
-namespace Content.Server.Explosion.EntitySystems;
-
-public sealed partial class TriggerSystem
-{
-    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
-
-    private void InitializeOnUse()
-    {
-        SubscribeLocalEvent<OnUseTimerTriggerComponent, UseInHandEvent>(OnTimerUse);
-        SubscribeLocalEvent<OnUseTimerTriggerComponent, ExaminedEvent>(OnExamined);
-        SubscribeLocalEvent<OnUseTimerTriggerComponent, GetVerbsEvent<AlternativeVerb>>(OnGetAltVerbs);
-        SubscribeLocalEvent<OnUseTimerTriggerComponent, EntityStuckEvent>(OnStuck);
-        SubscribeLocalEvent<RandomTimerTriggerComponent, MapInitEvent>(OnRandomTimerTriggerMapInit);
-    }
-
-    private void OnStuck(EntityUid uid, OnUseTimerTriggerComponent component, ref EntityStuckEvent args)
-    {
-        if (!component.StartOnStick)
-            return;
-
-        StartTimer((uid, component), args.User);
-    }
-
-    private void OnExamined(EntityUid uid, OnUseTimerTriggerComponent component, ExaminedEvent args)
-    {
-        if (args.IsInDetailsRange && component.Examinable)
-            args.PushText(Loc.GetString("examine-trigger-timer", ("time", component.Delay)));
-    }
-
-    /// <summary>
-    ///     Add an alt-click interaction that cycles through delays.
-    /// </summary>
-    private void OnGetAltVerbs(EntityUid uid, OnUseTimerTriggerComponent component, GetVerbsEvent<AlternativeVerb> args)
-    {
-        if (!args.CanInteract || !args.CanAccess || args.Hands == null)
-            return;
-
-        if (component.UseVerbInstead)
-        {
-            args.Verbs.Add(new AlternativeVerb()
-            {
-                Text = Loc.GetString("verb-start-detonation"),
-                Act = () => StartTimer((uid, component), args.User),
-                Priority = 2
-            });
-        }
-
-        if (component.AllowToggleStartOnStick)
-        {
-            args.Verbs.Add(new AlternativeVerb()
-            {
-                Text = Loc.GetString("verb-toggle-start-on-stick"),
-                Act = () => ToggleStartOnStick(uid, args.User, component)
-            });
-        }
-
-        if (component.DelayOptions == null || component.DelayOptions.Count == 1)
-            return;
-
-        args.Verbs.Add(new AlternativeVerb()
-        {
-            Category = TimerOptions,
-            Text = Loc.GetString("verb-trigger-timer-cycle"),
-            Act = () => CycleDelay(component, args.User),
-            Priority = 1
-        });
-
-        foreach (var option in component.DelayOptions)
-        {
-            if (MathHelper.CloseTo(option, component.Delay))
-            {
-                args.Verbs.Add(new AlternativeVerb()
-                {
-                    Category = TimerOptions,
-                    Text = Loc.GetString("verb-trigger-timer-set-current", ("time", option)),
-                    Disabled = true,
-                    Priority = (int) (-100 * option)
-                });
-                continue;
-            }
-
-            args.Verbs.Add(new AlternativeVerb()
-            {
-                Category = TimerOptions,
-                Text = Loc.GetString("verb-trigger-timer-set", ("time", option)),
-                Priority = (int) (-100 * option),
-
-                Act = () =>
-                {
-                    component.Delay = option;
-                    _popupSystem.PopupEntity(Loc.GetString("popup-trigger-timer-set", ("time", option)), args.User, args.User);
-                },
-            });
-        }
-    }
-
-    private void OnRandomTimerTriggerMapInit(Entity<RandomTimerTriggerComponent> ent, ref MapInitEvent args)
-    {
-        var (_, comp) = ent;
-
-        if (!TryComp<OnUseTimerTriggerComponent>(ent, out var timerTriggerComp))
-            return;
-
-        timerTriggerComp.Delay = _random.NextFloat(comp.Min, comp.Max);
-    }
-
-    private void CycleDelay(OnUseTimerTriggerComponent component, EntityUid user)
-    {
-        if (component.DelayOptions == null || component.DelayOptions.Count == 1)
-            return;
-
-        // This is somewhat inefficient, but its good enough. This is run rarely, and the lists should be short.
-
-        component.DelayOptions.Sort();
-
-        if (component.DelayOptions[^1] <= component.Delay)
-        {
-            component.Delay = component.DelayOptions[0];
-            _popupSystem.PopupEntity(Loc.GetString("popup-trigger-timer-set", ("time", component.Delay)), user, user);
-            return;
-        }
-
-        foreach (var option in component.DelayOptions)
-        {
-            if (option > component.Delay)
-            {
-                component.Delay = option;
-                _popupSystem.PopupEntity(Loc.GetString("popup-trigger-timer-set", ("time", option)), user, user);
-                return;
-            }
-        }
-    }
-
-    private void ToggleStartOnStick(EntityUid grenade, EntityUid user, OnUseTimerTriggerComponent comp)
-    {
-        if (comp.StartOnStick)
-        {
-            comp.StartOnStick = false;
-            _popupSystem.PopupEntity(Loc.GetString("popup-start-on-stick-off"), grenade, user);
-        }
-        else
-        {
-            comp.StartOnStick = true;
-            _popupSystem.PopupEntity(Loc.GetString("popup-start-on-stick-on"), grenade, user);
-        }
-    }
-
-    private void OnTimerUse(EntityUid uid, OnUseTimerTriggerComponent component, UseInHandEvent args)
-    {
-        if (args.Handled || HasComp<AutomatedTimerComponent>(uid) || component.UseVerbInstead)
-            return;
-
-        if (component.DoPopup)
-            _popupSystem.PopupEntity(Loc.GetString("trigger-activated", ("device", uid)), args.User, args.User);
-
-        StartTimer((uid, component), args.User);
-
-        args.Handled = true;
-    }
-
-    public static VerbCategory TimerOptions = new("verb-categories-timer", "/Textures/Interface/VerbIcons/clock.svg.192dpi.png");
-}
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.Proximity.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.Proximity.cs
deleted file mode 100644
index 426bade10e..0000000000
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.Proximity.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-using Content.Server.Explosion.Components;
-using Content.Shared.Trigger;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Events;
-using Robust.Shared.Utility;
-using Robust.Shared.Timing;
-
-namespace Content.Server.Explosion.EntitySystems;
-
-public sealed partial class TriggerSystem
-{
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-
-    private void InitializeProximity()
-    {
-        SubscribeLocalEvent<TriggerOnProximityComponent, StartCollideEvent>(OnProximityStartCollide);
-        SubscribeLocalEvent<TriggerOnProximityComponent, EndCollideEvent>(OnProximityEndCollide);
-        SubscribeLocalEvent<TriggerOnProximityComponent, MapInitEvent>(OnMapInit);
-        SubscribeLocalEvent<TriggerOnProximityComponent, ComponentShutdown>(OnProximityShutdown);
-        // Shouldn't need re-anchoring.
-        SubscribeLocalEvent<TriggerOnProximityComponent, AnchorStateChangedEvent>(OnProximityAnchor);
-    }
-
-    private void OnProximityAnchor(EntityUid uid, TriggerOnProximityComponent component, ref AnchorStateChangedEvent args)
-    {
-        component.Enabled = !component.RequiresAnchored ||
-                            args.Anchored;
-
-        SetProximityAppearance(uid, component);
-
-        if (!component.Enabled)
-        {
-            component.Colliding.Clear();
-        }
-        // Re-check for contacts as we cleared them.
-        else if (TryComp<PhysicsComponent>(uid, out var body))
-        {
-            _broadphase.RegenerateContacts((uid, body));
-        }
-    }
-
-    private void OnProximityShutdown(EntityUid uid, TriggerOnProximityComponent component, ComponentShutdown args)
-    {
-        component.Colliding.Clear();
-    }
-
-    private void OnMapInit(EntityUid uid, TriggerOnProximityComponent component, MapInitEvent args)
-    {
-        component.Enabled = !component.RequiresAnchored ||
-                            Transform(uid).Anchored;
-
-        SetProximityAppearance(uid, component);
-
-        if (!TryComp<PhysicsComponent>(uid, out var body))
-            return;
-
-        _fixtures.TryCreateFixture(
-            uid,
-            component.Shape,
-            TriggerOnProximityComponent.FixtureID,
-            hard: false,
-            body: body,
-            collisionLayer: component.Layer);
-    }
-
-    private void OnProximityStartCollide(EntityUid uid, TriggerOnProximityComponent component, ref StartCollideEvent args)
-    {
-        if (args.OurFixtureId != TriggerOnProximityComponent.FixtureID)
-            return;
-
-        component.Colliding[args.OtherEntity] = args.OtherBody;
-    }
-
-    private static void OnProximityEndCollide(EntityUid uid, TriggerOnProximityComponent component, ref EndCollideEvent args)
-    {
-        if (args.OurFixtureId != TriggerOnProximityComponent.FixtureID)
-            return;
-
-        component.Colliding.Remove(args.OtherEntity);
-    }
-
-    private void SetProximityAppearance(EntityUid uid, TriggerOnProximityComponent component)
-    {
-        if (TryComp(uid, out AppearanceComponent? appearance))
-        {
-            _appearance.SetData(uid, ProximityTriggerVisualState.State, component.Enabled ? ProximityTriggerVisuals.Inactive : ProximityTriggerVisuals.Off, appearance);
-        }
-    }
-
-    private void Activate(EntityUid uid, EntityUid user, TriggerOnProximityComponent component)
-    {
-        DebugTools.Assert(component.Enabled);
-
-        var curTime = _timing.CurTime;
-
-        if (!component.Repeating)
-        {
-            component.Enabled = false;
-            component.Colliding.Clear();
-        }
-        else
-        {
-            component.NextTrigger = curTime + component.Cooldown;
-        }
-
-        // Queue a visual update for when the animation is complete.
-        component.NextVisualUpdate = curTime + component.AnimationDuration;
-
-        if (TryComp(uid, out AppearanceComponent? appearance))
-        {
-            _appearance.SetData(uid, ProximityTriggerVisualState.State, ProximityTriggerVisuals.Active, appearance);
-        }
-
-        Trigger(uid, user);
-    }
-
-    private void UpdateProximity()
-    {
-        var curTime = _timing.CurTime;
-
-        var query = EntityQueryEnumerator<TriggerOnProximityComponent>();
-        while (query.MoveNext(out var uid, out var trigger))
-        {
-            if (curTime >= trigger.NextVisualUpdate)
-            {
-                // Update the visual state once the animation is done.
-                trigger.NextVisualUpdate = TimeSpan.MaxValue;
-                SetProximityAppearance(uid, trigger);
-            }
-
-            if (!trigger.Enabled)
-                continue;
-
-            if (curTime < trigger.NextTrigger)
-                // The trigger's on cooldown.
-                continue;
-
-            // Check for anything colliding and moving fast enough.
-            foreach (var (collidingUid, colliding) in trigger.Colliding)
-            {
-                if (Deleted(collidingUid))
-                    continue;
-
-                if (colliding.LinearVelocity.Length() < trigger.TriggerSpeed)
-                    continue;
-
-                // Trigger!
-                Activate(uid, collidingUid, trigger);
-                break;
-            }
-        }
-    }
-}
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.Signal.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.Signal.cs
deleted file mode 100644
index 99e8c97d53..0000000000
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.Signal.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using Content.Server.DeviceLinking.Systems;
-using Content.Server.Explosion.Components;
-using Content.Shared.DeviceLinking.Events;
-
-namespace Content.Server.Explosion.EntitySystems
-{
-    public sealed partial class TriggerSystem
-    {
-        [Dependency] private readonly DeviceLinkSystem _signalSystem = default!;
-        private void InitializeSignal()
-        {
-            SubscribeLocalEvent<TriggerOnSignalComponent,SignalReceivedEvent>(OnSignalReceived);
-            SubscribeLocalEvent<TriggerOnSignalComponent,ComponentInit>(OnInit);
-
-            SubscribeLocalEvent<TimerStartOnSignalComponent,SignalReceivedEvent>(OnTimerSignalReceived);
-            SubscribeLocalEvent<TimerStartOnSignalComponent,ComponentInit>(OnTimerSignalInit);
-        }
-
-        private void OnSignalReceived(EntityUid uid, TriggerOnSignalComponent component, ref SignalReceivedEvent args)
-        {
-            if (args.Port != component.Port)
-                return;
-
-            Trigger(uid, args.Trigger);
-        }
-        private void OnInit(EntityUid uid, TriggerOnSignalComponent component, ComponentInit args)
-        {
-            _signalSystem.EnsureSinkPorts(uid, component.Port);
-        }
-
-        private void OnTimerSignalReceived(EntityUid uid, TimerStartOnSignalComponent component, ref SignalReceivedEvent args)
-        {
-            if (args.Port != component.Port)
-                return;
-
-            StartTimer(uid, args.Trigger);
-        }
-        private void OnTimerSignalInit(EntityUid uid, TimerStartOnSignalComponent component, ComponentInit args)
-        {
-            _signalSystem.EnsureSinkPorts(uid, component.Port);
-        }
-    }
-}
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.TimedCollide.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.TimedCollide.cs
deleted file mode 100644
index ea10b7c69b..0000000000
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.TimedCollide.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System.Linq;
-using Content.Server.Explosion.Components;
-using Content.Server.Explosion.EntitySystems;
-using Robust.Shared.Physics.Dynamics;
-using Robust.Shared.Physics.Events;
-
-namespace Content.Server.Explosion.EntitySystems;
-
-public sealed partial class TriggerSystem
-{
-    private void InitializeTimedCollide()
-    {
-        SubscribeLocalEvent<TriggerOnTimedCollideComponent, StartCollideEvent>(OnTimerCollide);
-        SubscribeLocalEvent<TriggerOnTimedCollideComponent, EndCollideEvent>(OnTimerEndCollide);
-        SubscribeLocalEvent<TriggerOnTimedCollideComponent, ComponentRemove>(OnComponentRemove);
-    }
-
-    private void OnTimerCollide(EntityUid uid, TriggerOnTimedCollideComponent component, ref StartCollideEvent args)
-    {
-        //Ensures the entity trigger will have an active component
-        EnsureComp<ActiveTriggerOnTimedCollideComponent>(uid);
-        var otherUID = args.OtherEntity;
-        if (component.Colliding.ContainsKey(otherUID))
-            return;
-        component.Colliding.Add(otherUID, 0);
-    }
-
-    private void OnTimerEndCollide(EntityUid uid, TriggerOnTimedCollideComponent component, ref EndCollideEvent args)
-    {
-        var otherUID = args.OtherEntity;
-        component.Colliding.Remove(otherUID);
-
-        if (component.Colliding.Count == 0 && HasComp<ActiveTriggerOnTimedCollideComponent>(uid))
-            RemComp<ActiveTriggerOnTimedCollideComponent>(uid);
-    }
-
-    private void OnComponentRemove(EntityUid uid, TriggerOnTimedCollideComponent component, ComponentRemove args)
-    {
-        if (HasComp<ActiveTriggerOnTimedCollideComponent>(uid))
-            RemComp<ActiveTriggerOnTimedCollideComponent>(uid);
-    }
-
-    private void UpdateTimedCollide(float frameTime)
-    {
-        var query = EntityQueryEnumerator<ActiveTriggerOnTimedCollideComponent, TriggerOnTimedCollideComponent>();
-        while (query.MoveNext(out var uid, out _, out var triggerOnTimedCollide))
-        {
-            foreach (var (collidingEntity, collidingTimer) in triggerOnTimedCollide.Colliding)
-            {
-                triggerOnTimedCollide.Colliding[collidingEntity] += frameTime;
-                if (collidingTimer > triggerOnTimedCollide.Threshold)
-                {
-                    RaiseLocalEvent(uid, new TriggerEvent(uid, collidingEntity), true);
-                    triggerOnTimedCollide.Colliding[collidingEntity] -= triggerOnTimedCollide.Threshold;
-                }
-            }
-        }
-    }
-}
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.Voice.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.Voice.cs
deleted file mode 100644
index a96508e37c..0000000000
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.Voice.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-using Content.Server.Explosion.Components;
-using Content.Server.Speech;
-using Content.Server.Speech.Components;
-using Content.Shared.Database;
-using Content.Shared.Examine;
-using Content.Shared.Verbs;
-
-namespace Content.Server.Explosion.EntitySystems
-{
-    public sealed partial class TriggerSystem
-    {
-        private void InitializeVoice()
-        {
-            SubscribeLocalEvent<TriggerOnVoiceComponent, ComponentInit>(OnVoiceInit);
-            SubscribeLocalEvent<TriggerOnVoiceComponent, ExaminedEvent>(OnVoiceExamine);
-            SubscribeLocalEvent<TriggerOnVoiceComponent, GetVerbsEvent<AlternativeVerb>>(OnVoiceGetAltVerbs);
-            SubscribeLocalEvent<TriggerOnVoiceComponent, ListenEvent>(OnListen);
-        }
-
-        private void OnVoiceInit(EntityUid uid, TriggerOnVoiceComponent component, ComponentInit args)
-        {
-            if (component.IsListening)
-                EnsureComp<ActiveListenerComponent>(uid).Range = component.ListenRange;
-            else
-                RemCompDeferred<ActiveListenerComponent>(uid);
-        }
-
-        private void OnListen(Entity<TriggerOnVoiceComponent> ent, ref ListenEvent args)
-        {
-            var component = ent.Comp;
-            var message = args.Message.Trim();
-
-            if (component.IsRecording)
-            {
-                var ev = new ListenAttemptEvent(args.Source);
-                RaiseLocalEvent(ent, ev);
-
-                if (ev.Cancelled)
-                    return;
-
-                if (message.Length >= component.MinLength && message.Length <= component.MaxLength)
-                    FinishRecording(ent, args.Source, args.Message);
-                else if (message.Length > component.MaxLength)
-                    _popupSystem.PopupEntity(Loc.GetString("popup-trigger-voice-record-failed-too-long"), ent);
-                else if (message.Length < component.MinLength)
-                    _popupSystem.PopupEntity(Loc.GetString("popup-trigger-voice-record-failed-too-short"), ent);
-
-                return;
-            }
-
-            if (!string.IsNullOrWhiteSpace(component.KeyPhrase) && message.IndexOf(component.KeyPhrase, StringComparison.InvariantCultureIgnoreCase) is var index and >= 0 )
-            {
-                _adminLogger.Add(LogType.Trigger, LogImpact.Medium,
-                        $"A voice-trigger on {ToPrettyString(ent):entity} was triggered by {ToPrettyString(args.Source):speaker} speaking the key-phrase {component.KeyPhrase}.");
-                Trigger(ent, args.Source);
-
-                var messageWithoutPhrase = message.Remove(index, component.KeyPhrase.Length).Trim();
-
-                var voice = new VoiceTriggeredEvent(args.Source, message, messageWithoutPhrase);
-                RaiseLocalEvent(ent, ref voice);
-            }
-        }
-
-        private void OnVoiceGetAltVerbs(Entity<TriggerOnVoiceComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
-        {
-            if (!args.CanInteract || !args.CanAccess)
-                return;
-
-            var component = ent.Comp;
-
-            var @event = args;
-            args.Verbs.Add(new AlternativeVerb()
-            {
-                Text = Loc.GetString(component.IsRecording ? "verb-trigger-voice-stop" : "verb-trigger-voice-record"),
-                Act = () =>
-                {
-                    if (component.IsRecording)
-                        StopRecording(ent);
-                    else
-                        StartRecording(ent, @event.User);
-                },
-                Priority = 1
-            });
-
-            if (string.IsNullOrWhiteSpace(component.KeyPhrase))
-                return;
-
-            args.Verbs.Add(new AlternativeVerb()
-            {
-                Text = Loc.GetString("verb-trigger-voice-clear"),
-                Act = () =>
-                {
-                    component.KeyPhrase = null;
-                    component.IsRecording = false;
-                    RemComp<ActiveListenerComponent>(ent);
-                }
-            });
-        }
-
-        public void StartRecording(Entity<TriggerOnVoiceComponent> ent, EntityUid user)
-        {
-            var component = ent.Comp;
-            component.IsRecording = true;
-            EnsureComp<ActiveListenerComponent>(ent).Range = component.ListenRange;
-
-            _adminLogger.Add(LogType.Trigger, LogImpact.Low,
-                    $"A voice-trigger on {ToPrettyString(ent):entity} has started recording. User: {ToPrettyString(user):user}");
-
-            _popupSystem.PopupEntity(Loc.GetString("popup-trigger-voice-start-recording"), ent);
-        }
-
-        public void StopRecording(Entity<TriggerOnVoiceComponent> ent)
-        {
-            var component = ent.Comp;
-            component.IsRecording = false;
-            if (string.IsNullOrWhiteSpace(component.KeyPhrase))
-                RemComp<ActiveListenerComponent>(ent);
-
-            _popupSystem.PopupEntity(Loc.GetString("popup-trigger-voice-stop-recording"), ent);
-        }
-
-        public void FinishRecording(Entity<TriggerOnVoiceComponent> ent, EntityUid source, string message)
-        {
-            var component = ent.Comp;
-            component.KeyPhrase = message;
-            component.IsRecording = false;
-
-            _adminLogger.Add(LogType.Trigger, LogImpact.Low,
-                    $"A voice-trigger on {ToPrettyString(ent):entity} has recorded a new keyphrase: '{component.KeyPhrase}'. Recorded from {ToPrettyString(source):speaker}");
-
-            _popupSystem.PopupEntity(Loc.GetString("popup-trigger-voice-recorded", ("keyphrase", component.KeyPhrase!)), ent);
-        }
-
-        private void OnVoiceExamine(EntityUid uid, TriggerOnVoiceComponent component, ExaminedEvent args)
-        {
-            if (args.IsInDetailsRange)
-            {
-                args.PushText(string.IsNullOrWhiteSpace(component.KeyPhrase)
-                    ? Loc.GetString("trigger-voice-uninitialized")
-                    : Loc.GetString("examine-trigger-voice", ("keyphrase", component.KeyPhrase)));
-            }
-        }
-    }
-}
-
-
-/// <summary>
-///    Raised when a voice trigger is activated, containing the message that triggered it.
-/// </summary>
-/// <param name="Source"> The EntityUid of the entity sending the message</param>
-/// <param name="Message"> The contents of the message</param>
-/// <param name="MessageWithoutPhrase"> The message without the phrase that triggered it.</param>
-[ByRefEvent]
-public readonly record struct VoiceTriggeredEvent(EntityUid Source, string Message, string MessageWithoutPhrase);
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
deleted file mode 100644
index f3a3f0c87c..0000000000
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
+++ /dev/null
@@ -1,454 +0,0 @@
-using Content.Server.Administration.Logs;
-using Content.Server.Body.Systems;
-using Content.Server.Explosion.Components;
-using Content.Shared.Flash;
-using Content.Server.Electrocution;
-using Content.Server.Pinpointer;
-using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Flash.Components;
-using Content.Server.Radio.EntitySystems;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Components.SolutionManager;
-using Content.Shared.Database;
-using Content.Shared.Explosion.Components;
-using Content.Shared.Explosion.Components.OnTrigger;
-using Content.Shared.Implants.Components;
-using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
-using Content.Shared.Inventory;
-using Content.Shared.Mobs;
-using Content.Shared.Mobs.Components;
-using Content.Shared.Payload.Components;
-using Content.Shared.Radio;
-using Content.Shared.Slippery;
-using Content.Shared.StepTrigger.Systems;
-using Content.Shared.Trigger;
-using Content.Shared.Weapons.Ranged.Events;
-using Content.Shared.Whitelist;
-using JetBrains.Annotations;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Containers;
-using Robust.Shared.Physics.Events;
-using Robust.Shared.Physics.Systems;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-using Robust.Shared.Utility;
-
-namespace Content.Server.Explosion.EntitySystems
-{
-    /// <summary>
-    /// Raised whenever something is Triggered on the entity.
-    /// </summary>
-    public sealed class TriggerEvent : HandledEntityEventArgs
-    {
-        public EntityUid Triggered { get; }
-        public EntityUid? User { get; }
-
-        public TriggerEvent(EntityUid triggered, EntityUid? user = null)
-        {
-            Triggered = triggered;
-            User = user;
-        }
-    }
-
-    /// <summary>
-    /// Raised before a trigger is activated.
-    /// </summary>
-    [ByRefEvent]
-    public record struct BeforeTriggerEvent(EntityUid Triggered, EntityUid? User, bool Cancelled = false);
-
-    /// <summary>
-    /// Raised when timer trigger becomes active.
-    /// </summary>
-    [ByRefEvent]
-    public readonly record struct ActiveTimerTriggerEvent(EntityUid Triggered, EntityUid? User);
-
-    [UsedImplicitly]
-    public sealed partial class TriggerSystem : EntitySystem
-    {
-        [Dependency] private readonly ExplosionSystem _explosions = default!;
-        [Dependency] private readonly FixtureSystem _fixtures = default!;
-        [Dependency] private readonly SharedFlashSystem _flashSystem = default!;
-        [Dependency] private readonly SharedBroadphaseSystem _broadphase = default!;
-        [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-        [Dependency] private readonly SharedContainerSystem _container = default!;
-        [Dependency] private readonly BodySystem _body = default!;
-        [Dependency] private readonly SharedAudioSystem _audio = default!;
-        [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
-        [Dependency] private readonly NavMapSystem _navMap = default!;
-        [Dependency] private readonly RadioSystem _radioSystem = default!;
-        [Dependency] private readonly IRobustRandom _random = default!;
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
-        [Dependency] private readonly InventorySystem _inventory = default!;
-        [Dependency] private readonly ElectrocutionSystem _electrocution = default!;
-        [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            InitializeProximity();
-            InitializeOnUse();
-            InitializeSignal();
-            InitializeTimedCollide();
-            InitializeVoice();
-            InitializeMobstate();
-
-            SubscribeLocalEvent<TriggerOnSpawnComponent, MapInitEvent>(OnSpawnTriggered);
-            SubscribeLocalEvent<TriggerOnCollideComponent, StartCollideEvent>(OnTriggerCollide);
-            SubscribeLocalEvent<TriggerOnActivateComponent, ActivateInWorldEvent>(OnActivate);
-            SubscribeLocalEvent<TriggerOnUseComponent, UseInHandEvent>(OnUse);
-            SubscribeLocalEvent<TriggerImplantActionComponent, ActivateImplantEvent>(OnImplantTrigger);
-            SubscribeLocalEvent<TriggerOnStepTriggerComponent, StepTriggeredOffEvent>(OnStepTriggered);
-            SubscribeLocalEvent<TriggerOnSlipComponent, SlipEvent>(OnSlipTriggered);
-            SubscribeLocalEvent<TriggerWhenEmptyComponent, OnEmptyGunShotEvent>(OnEmptyTriggered);
-            SubscribeLocalEvent<RepeatingTriggerComponent, MapInitEvent>(OnRepeatInit);
-
-            SubscribeLocalEvent<SpawnOnTriggerComponent, TriggerEvent>(OnSpawnTrigger);
-            SubscribeLocalEvent<DeleteOnTriggerComponent, TriggerEvent>(HandleDeleteTrigger);
-            SubscribeLocalEvent<ExplodeOnTriggerComponent, TriggerEvent>(HandleExplodeTrigger);
-            SubscribeLocalEvent<FlashOnTriggerComponent, TriggerEvent>(HandleFlashTrigger);
-            SubscribeLocalEvent<GibOnTriggerComponent, TriggerEvent>(HandleGibTrigger);
-
-            SubscribeLocalEvent<AnchorOnTriggerComponent, TriggerEvent>(OnAnchorTrigger);
-            SubscribeLocalEvent<SoundOnTriggerComponent, TriggerEvent>(OnSoundTrigger);
-            SubscribeLocalEvent<ShockOnTriggerComponent, TriggerEvent>(HandleShockTrigger);
-            SubscribeLocalEvent<RattleComponent, TriggerEvent>(HandleRattleTrigger);
-
-            SubscribeLocalEvent<TriggerWhitelistComponent, BeforeTriggerEvent>(HandleWhitelist);
-        }
-
-        private void HandleWhitelist(Entity<TriggerWhitelistComponent> ent, ref BeforeTriggerEvent args)
-        {
-            args.Cancelled = !_whitelist.CheckBoth(args.User, ent.Comp.Blacklist, ent.Comp.Whitelist);
-        }
-
-        private void OnSoundTrigger(EntityUid uid, SoundOnTriggerComponent component, TriggerEvent args)
-        {
-            if (component.RemoveOnTrigger) // if the component gets removed when it's triggered
-            {
-                var xform = Transform(uid);
-                _audio.PlayPvs(component.Sound, xform.Coordinates); // play the sound at its last known coordinates
-            }
-            else // if the component doesn't get removed when triggered
-            {
-                _audio.PlayPvs(component.Sound, uid); // have the sound follow the entity itself
-            }
-        }
-
-        private void HandleShockTrigger(Entity<ShockOnTriggerComponent> shockOnTrigger, ref TriggerEvent args)
-        {
-            if (!_container.TryGetContainingContainer(shockOnTrigger.Owner, out var container))
-                return;
-
-            var containerEnt = container.Owner;
-            var curTime = _timing.CurTime;
-
-            if (curTime < shockOnTrigger.Comp.NextTrigger)
-            {
-                // The trigger's on cooldown.
-                return;
-            }
-
-            _electrocution.TryDoElectrocution(containerEnt, null, shockOnTrigger.Comp.Damage, shockOnTrigger.Comp.Duration, true, ignoreInsulation: true);
-            shockOnTrigger.Comp.NextTrigger = curTime + shockOnTrigger.Comp.Cooldown;
-        }
-
-        private void OnAnchorTrigger(EntityUid uid, AnchorOnTriggerComponent component, TriggerEvent args)
-        {
-            var xform = Transform(uid);
-
-            if (xform.Anchored)
-                return;
-
-            _transformSystem.AnchorEntity(uid, xform);
-
-            if (component.RemoveOnTrigger)
-                RemCompDeferred<AnchorOnTriggerComponent>(uid);
-        }
-
-        private void OnSpawnTrigger(Entity<SpawnOnTriggerComponent> ent, ref TriggerEvent args)
-        {
-            var xform = Transform(ent);
-
-            if (ent.Comp.mapCoords)
-            {
-                var mapCoords = _transformSystem.GetMapCoordinates(ent, xform);
-                Spawn(ent.Comp.Proto, mapCoords);
-            }
-            else
-            {
-                var coords = xform.Coordinates;
-                if (!coords.IsValid(EntityManager))
-                    return;
-                Spawn(ent.Comp.Proto, coords);
-
-            }
-        }
-
-        private void HandleExplodeTrigger(EntityUid uid, ExplodeOnTriggerComponent component, TriggerEvent args)
-        {
-            _explosions.TriggerExplosive(uid, user: args.User);
-            args.Handled = true;
-        }
-
-        private void HandleFlashTrigger(EntityUid uid, FlashOnTriggerComponent component, TriggerEvent args)
-        {
-            _flashSystem.FlashArea(uid, args.User, component.Range, component.Duration, probability: component.Probability);
-            args.Handled = true;
-        }
-
-        private void HandleDeleteTrigger(EntityUid uid, DeleteOnTriggerComponent component, TriggerEvent args)
-        {
-            QueueDel(uid);
-            args.Handled = true;
-        }
-
-        private void HandleGibTrigger(EntityUid uid, GibOnTriggerComponent component, TriggerEvent args)
-        {
-            if (!TryComp(uid, out TransformComponent? xform))
-                return;
-            if (component.DeleteItems)
-            {
-                var items = _inventory.GetHandOrInventoryEntities(xform.ParentUid);
-                foreach (var item in items)
-                {
-                    Del(item);
-                }
-            }
-            _body.GibBody(xform.ParentUid, true);
-            args.Handled = true;
-        }
-
-
-        private void HandleRattleTrigger(EntityUid uid, RattleComponent component, TriggerEvent args)
-        {
-            if (!TryComp<SubdermalImplantComponent>(uid, out var implanted))
-                return;
-
-            if (implanted.ImplantedEntity == null)
-                return;
-
-            // Gets location of the implant
-            var posText = FormattedMessage.RemoveMarkupOrThrow(_navMap.GetNearestBeaconString(uid));
-            var critMessage = Loc.GetString(component.CritMessage, ("user", implanted.ImplantedEntity.Value), ("position", posText));
-            var deathMessage = Loc.GetString(component.DeathMessage, ("user", implanted.ImplantedEntity.Value), ("position", posText));
-
-            if (!TryComp<MobStateComponent>(implanted.ImplantedEntity, out var mobstate))
-                return;
-
-            // Sends a message to the radio channel specified by the implant
-            if (mobstate.CurrentState == MobState.Critical)
-                _radioSystem.SendRadioMessage(uid, critMessage, _prototypeManager.Index<RadioChannelPrototype>(component.RadioChannel), uid);
-            if (mobstate.CurrentState == MobState.Dead)
-                _radioSystem.SendRadioMessage(uid, deathMessage, _prototypeManager.Index<RadioChannelPrototype>(component.RadioChannel), uid);
-
-            args.Handled = true;
-        }
-
-        private void OnTriggerCollide(EntityUid uid, TriggerOnCollideComponent component, ref StartCollideEvent args)
-        {
-            if (args.OurFixtureId == component.FixtureID && (!component.IgnoreOtherNonHard || args.OtherFixture.Hard))
-                Trigger(uid, args.OtherEntity);
-        }
-
-        private void OnSpawnTriggered(EntityUid uid, TriggerOnSpawnComponent component, MapInitEvent args)
-        {
-            Trigger(uid);
-        }
-
-        private void OnActivate(EntityUid uid, TriggerOnActivateComponent component, ActivateInWorldEvent args)
-        {
-            if (args.Handled || !args.Complex)
-                return;
-
-            Trigger(uid, args.User);
-            args.Handled = true;
-        }
-
-        private void OnUse(Entity<TriggerOnUseComponent> ent, ref UseInHandEvent args)
-        {
-            if (args.Handled)
-                return;
-
-            Trigger(ent.Owner, args.User);
-            args.Handled = true;
-        }
-
-        private void OnImplantTrigger(EntityUid uid, TriggerImplantActionComponent component, ActivateImplantEvent args)
-        {
-            args.Handled = Trigger(uid);
-        }
-
-        private void OnStepTriggered(EntityUid uid, TriggerOnStepTriggerComponent component, ref StepTriggeredOffEvent args)
-        {
-            Trigger(uid, args.Tripper);
-        }
-
-        private void OnSlipTriggered(EntityUid uid, TriggerOnSlipComponent component, ref SlipEvent args)
-        {
-            Trigger(uid, args.Slipped);
-        }
-
-        private void OnEmptyTriggered(EntityUid uid, TriggerWhenEmptyComponent component, ref OnEmptyGunShotEvent args)
-        {
-            Trigger(uid, args.EmptyGun);
-        }
-
-        private void OnRepeatInit(Entity<RepeatingTriggerComponent> ent, ref MapInitEvent args)
-        {
-            ent.Comp.NextTrigger = _timing.CurTime + ent.Comp.Delay;
-        }
-
-        public bool Trigger(EntityUid trigger, EntityUid? user = null)
-        {
-            var beforeTriggerEvent = new BeforeTriggerEvent(trigger, user);
-            RaiseLocalEvent(trigger, ref beforeTriggerEvent);
-            if (beforeTriggerEvent.Cancelled)
-                return false;
-
-            var triggerEvent = new TriggerEvent(trigger, user);
-            EntityManager.EventBus.RaiseLocalEvent(trigger, triggerEvent, true);
-            return triggerEvent.Handled;
-        }
-
-        public void TryDelay(EntityUid uid, float amount, ActiveTimerTriggerComponent? comp = null)
-        {
-            if (!Resolve(uid, ref comp, false))
-                return;
-
-            comp.TimeRemaining += amount;
-        }
-
-        /// <summary>
-        /// Start the timer for triggering the device.
-        /// </summary>
-        public void StartTimer(Entity<OnUseTimerTriggerComponent?> ent, EntityUid? user)
-        {
-            if (!Resolve(ent, ref ent.Comp, false))
-                return;
-
-            var comp = ent.Comp;
-            HandleTimerTrigger(ent, user, comp.Delay, comp.BeepInterval, comp.InitialBeepDelay, comp.BeepSound);
-        }
-
-        public void HandleTimerTrigger(EntityUid uid, EntityUid? user, float delay, float beepInterval, float? initialBeepDelay, SoundSpecifier? beepSound)
-        {
-            if (delay <= 0)
-            {
-                RemComp<ActiveTimerTriggerComponent>(uid);
-                Trigger(uid, user);
-                return;
-            }
-
-            if (HasComp<ActiveTimerTriggerComponent>(uid))
-                return;
-
-            if (user != null)
-            {
-                // Check if entity is bomb/mod. grenade/etc
-                if (_container.TryGetContainer(uid, "payload", out BaseContainer? container) &&
-                    container.ContainedEntities.Count > 0 &&
-                    TryComp(container.ContainedEntities[0], out ChemicalPayloadComponent? chemicalPayloadComponent))
-                {
-                    // If a beaker is missing, the entity won't explode, so no reason to log it
-                    if (chemicalPayloadComponent?.BeakerSlotA.Item is not { } beakerA ||
-                        chemicalPayloadComponent?.BeakerSlotB.Item is not { } beakerB ||
-                        !TryComp(beakerA, out SolutionContainerManagerComponent? containerA) ||
-                        !TryComp(beakerB, out SolutionContainerManagerComponent? containerB) ||
-                        !TryComp(beakerA, out FitsInDispenserComponent? fitsA) ||
-                        !TryComp(beakerB, out FitsInDispenserComponent? fitsB) ||
-                        !_solutionContainerSystem.TryGetSolution((beakerA, containerA), fitsA.Solution, out _, out var solutionA) ||
-                        !_solutionContainerSystem.TryGetSolution((beakerB, containerB), fitsB.Solution, out _, out var solutionB))
-                        return;
-
-                    _adminLogger.Add(LogType.Trigger,
-                        $"{ToPrettyString(user.Value):user} started a {delay} second timer trigger on entity {ToPrettyString(uid):timer}, which contains {SharedSolutionContainerSystem.ToPrettyString(solutionA)} in one beaker and {SharedSolutionContainerSystem.ToPrettyString(solutionB)} in the other.");
-                }
-                else
-                {
-                    _adminLogger.Add(LogType.Trigger,
-                        $"{ToPrettyString(user.Value):user} started a {delay} second timer trigger on entity {ToPrettyString(uid):timer}");
-                }
-
-            }
-            else
-            {
-                _adminLogger.Add(LogType.Trigger,
-                    $"{delay} second timer trigger started on entity {ToPrettyString(uid):timer}");
-            }
-
-            var active = AddComp<ActiveTimerTriggerComponent>(uid);
-            active.TimeRemaining = delay;
-            active.User = user;
-            active.BeepSound = beepSound;
-            active.BeepInterval = beepInterval;
-            active.TimeUntilBeep = initialBeepDelay == null ? active.BeepInterval : initialBeepDelay.Value;
-
-            var ev = new ActiveTimerTriggerEvent(uid, user);
-            RaiseLocalEvent(uid, ref ev);
-
-            if (TryComp<AppearanceComponent>(uid, out var appearance))
-                _appearance.SetData(uid, TriggerVisuals.VisualState, TriggerVisualState.Primed, appearance);
-        }
-
-        public override void Update(float frameTime)
-        {
-            base.Update(frameTime);
-
-            UpdateProximity();
-            UpdateTimer(frameTime);
-            UpdateTimedCollide(frameTime);
-            UpdateRepeat();
-        }
-
-        private void UpdateTimer(float frameTime)
-        {
-            HashSet<EntityUid> toRemove = new();
-            var query = EntityQueryEnumerator<ActiveTimerTriggerComponent>();
-            while (query.MoveNext(out var uid, out var timer))
-            {
-                timer.TimeRemaining -= frameTime;
-                timer.TimeUntilBeep -= frameTime;
-
-                if (timer.TimeRemaining <= 0)
-                {
-                    Trigger(uid, timer.User);
-                    toRemove.Add(uid);
-                    continue;
-                }
-
-                if (timer.BeepSound == null || timer.TimeUntilBeep > 0)
-                    continue;
-
-                timer.TimeUntilBeep += timer.BeepInterval;
-                _audio.PlayPvs(timer.BeepSound, uid, timer.BeepSound.Params);
-            }
-
-            foreach (var uid in toRemove)
-            {
-                RemComp<ActiveTimerTriggerComponent>(uid);
-
-                // In case this is a re-usable grenade, un-prime it.
-                if (TryComp<AppearanceComponent>(uid, out var appearance))
-                    _appearance.SetData(uid, TriggerVisuals.VisualState, TriggerVisualState.Unprimed, appearance);
-            }
-        }
-
-        private void UpdateRepeat()
-        {
-            var now = _timing.CurTime;
-            var query = EntityQueryEnumerator<RepeatingTriggerComponent>();
-            while (query.MoveNext(out var uid, out var comp))
-            {
-                if (comp.NextTrigger > now)
-                    continue;
-
-                comp.NextTrigger = now + comp.Delay;
-                Trigger(uid);
-            }
-        }
-    }
-}
diff --git a/Content.Server/Explosion/EntitySystems/TwoStageTriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TwoStageTriggerSystem.cs
deleted file mode 100644
index 8488fd14bb..0000000000
--- a/Content.Server/Explosion/EntitySystems/TwoStageTriggerSystem.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-using Robust.Shared.Timing;
-using Robust.Shared.Serialization.Manager;
-using Content.Server.Explosion.Components.OnTrigger;
-
-namespace Content.Server.Explosion.EntitySystems;
-
-public sealed class TwoStageTriggerSystem : EntitySystem
-{
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly ISerializationManager _serializationManager = default!;
-    [Dependency] private readonly TriggerSystem _triggerSystem = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<TwoStageTriggerComponent, TriggerEvent>(OnTrigger);
-    }
-
-    private void OnTrigger(EntityUid uid, TwoStageTriggerComponent component, TriggerEvent args)
-    {
-        if (component.Triggered)
-            return;
-
-        component.Triggered = true;
-        component.NextTriggerTime = _timing.CurTime + component.TriggerDelay;
-    }
-
-    private void LoadComponents(EntityUid uid, TwoStageTriggerComponent component)
-    {
-        foreach (var (name, entry) in component.SecondStageComponents)
-        {
-            var comp = (Component) Factory.GetComponent(name);
-            var temp = (object)comp;
-
-            if (EntityManager.TryGetComponent(uid, entry.Component.GetType(), out var c))
-                RemComp(uid, c);
-
-            _serializationManager.CopyTo(entry.Component, ref temp);
-            AddComp(uid, comp);
-        }
-        component.ComponentsIsLoaded = true;
-    }
-
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        var enumerator = EntityQueryEnumerator<TwoStageTriggerComponent>();
-        while (enumerator.MoveNext(out var uid, out var component))
-        {
-            if (!component.Triggered)
-                continue;
-
-            if (!component.ComponentsIsLoaded)
-                LoadComponents(uid, component);
-
-            if (_timing.CurTime < component.NextTriggerTime)
-                continue;
-
-            component.NextTriggerTime = null;
-            _triggerSystem.Trigger(uid);
-        }
-    }
-}
diff --git a/Content.Server/Forensics/Systems/ForensicsSystem.cs b/Content.Server/Forensics/Systems/ForensicsSystem.cs
index 9f94e39fb7..cc74c1d141 100644
--- a/Content.Server/Forensics/Systems/ForensicsSystem.cs
+++ b/Content.Server/Forensics/Systems/ForensicsSystem.cs
@@ -12,6 +12,7 @@ using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.DoAfter;
 using Content.Shared.Forensics;
 using Content.Shared.Forensics.Components;
+using Content.Shared.Forensics.Systems;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Inventory;
@@ -23,7 +24,7 @@ using Content.Shared.Hands.Components;
 
 namespace Content.Server.Forensics
 {
-    public sealed class ForensicsSystem : EntitySystem
+    public sealed class ForensicsSystem : SharedForensicsSystem
     {
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly InventorySystem _inventory = default!;
@@ -317,12 +318,7 @@ namespace Content.Server.Forensics
         }
 
         #region Public API
-
-        /// <summary>
-        /// Give the entity a new, random DNA string and call an event to notify other systems like the bloodstream that it has been changed.
-        /// Does nothing if it does not have the DnaComponent.
-        /// </summary>
-        public void RandomizeDNA(Entity<DnaComponent?> ent)
+        public override void RandomizeDNA(Entity<DnaComponent?> ent)
         {
             if (!Resolve(ent, ref ent.Comp, false))
                 return;
@@ -334,11 +330,7 @@ namespace Content.Server.Forensics
             RaiseLocalEvent(ent.Owner, ref ev);
         }
 
-        /// <summary>
-        /// Give the entity a new, random fingerprint string.
-        /// Does nothing if it does not have the FingerprintComponent.
-        /// </summary>
-        public void RandomizeFingerprint(Entity<FingerprintComponent?> ent)
+        public override void RandomizeFingerprint(Entity<FingerprintComponent?> ent)
         {
             if (!Resolve(ent, ref ent.Comp, false))
                 return;
diff --git a/Content.Server/GameTicking/Rules/ChangelingRuleSystem.cs b/Content.Server/GameTicking/Rules/ChangelingRuleSystem.cs
new file mode 100644
index 0000000000..a64b0e904a
--- /dev/null
+++ b/Content.Server/GameTicking/Rules/ChangelingRuleSystem.cs
@@ -0,0 +1,23 @@
+using Content.Server.GameTicking.Rules.Components;
+using Content.Server.Roles;
+using Content.Shared.Changeling;
+
+namespace Content.Server.GameTicking.Rules;
+
+/// <summary>
+/// Game rule system for Changelings
+/// </summary>
+public sealed class ChangelingRuleSystem : GameRuleSystem<ChangelingRuleComponent>
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ChangelingRoleComponent, GetBriefingEvent>(OnGetBriefing);
+    }
+
+    private void OnGetBriefing(Entity<ChangelingRoleComponent> ent, ref GetBriefingEvent args)
+    {
+        args.Append(Loc.GetString("changeling-briefing"));
+    }
+}
diff --git a/Content.Server/GameTicking/Rules/Components/ChangelingRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/ChangelingRuleComponent.cs
new file mode 100644
index 0000000000..13891c1988
--- /dev/null
+++ b/Content.Server/GameTicking/Rules/Components/ChangelingRuleComponent.cs
@@ -0,0 +1,7 @@
+namespace Content.Server.GameTicking.Rules.Components;
+
+/// <summary>
+/// Gamerule component for handling a changeling antagonist.
+/// </summary>
+[RegisterComponent]
+public sealed partial class ChangelingRuleComponent : Component;
diff --git a/Content.Server/GameTicking/Rules/Components/ParadoxCloneRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/ParadoxCloneRuleComponent.cs
index e28a0bc35f..f1e8e41258 100644
--- a/Content.Server/GameTicking/Rules/Components/ParadoxCloneRuleComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/ParadoxCloneRuleComponent.cs
@@ -14,7 +14,7 @@ public sealed partial class ParadoxCloneRuleComponent : Component
     ///     Cloning settings to be used.
     /// </summary>
     [DataField]
-    public ProtoId<CloningSettingsPrototype> Settings = "Antag";
+    public ProtoId<CloningSettingsPrototype> Settings = "ParadoxCloningSettings";
 
     /// <summary>
     ///     Visual effect spawned when gibbing at round end.
diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
index 2d96cae861..0a2882aa3c 100644
--- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
@@ -125,8 +125,8 @@ public sealed class TraitorRuleSystem : GameRuleSystem<TraitorRuleComponent>
         if (traitorRole is not null)
         {
             Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Add traitor briefing components");
-            AddComp<RoleBriefingComponent>(traitorRole.Value.Owner);
-            Comp<RoleBriefingComponent>(traitorRole.Value.Owner).Briefing = briefing;
+            EnsureComp<RoleBriefingComponent>(traitorRole.Value.Owner, out var briefingComp);
+            briefingComp.Briefing = briefing;
         }
         else
         {
diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs
index 3e09d86189..1a3c9031fe 100644
--- a/Content.Server/Ghost/GhostSystem.cs
+++ b/Content.Server/Ghost/GhostSystem.cs
@@ -6,7 +6,6 @@ using Content.Server.GameTicking;
 using Content.Server.Ghost.Components;
 using Content.Server.Mind;
 using Content.Server.Roles.Jobs;
-using Content.Server.Warps;
 using Content.Shared.Actions;
 using Content.Shared.CCVar;
 using Content.Shared.Damage;
@@ -30,7 +29,6 @@ using Content.Shared.Storage.Components;
 using Content.Shared.Tag;
 using Content.Shared.Warps;
 using Robust.Server.GameObjects;
-using Robust.Server.Player;
 using Robust.Shared.Configuration;
 using Robust.Shared.Map;
 using Robust.Shared.Physics.Components;
diff --git a/Content.Server/GhostKick/GhostKickUserOnTriggerComponent.cs b/Content.Server/GhostKick/GhostKickUserOnTriggerComponent.cs
deleted file mode 100644
index 11fb0156a4..0000000000
--- a/Content.Server/GhostKick/GhostKickUserOnTriggerComponent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Server.GhostKick;
-
-[RegisterComponent]
-public sealed partial class GhostKickUserOnTriggerComponent : Component
-{
-
-}
diff --git a/Content.Server/GhostKick/GhostKickUserOnTriggerSystem.cs b/Content.Server/GhostKick/GhostKickUserOnTriggerSystem.cs
deleted file mode 100644
index 2a5d9065fa..0000000000
--- a/Content.Server/GhostKick/GhostKickUserOnTriggerSystem.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Content.Server.Explosion.EntitySystems;
-using Robust.Shared.Player;
-
-namespace Content.Server.GhostKick;
-
-public sealed class GhostKickUserOnTriggerSystem : EntitySystem
-{
-    [Dependency] private readonly GhostKickManager _ghostKickManager = default!;
-
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<GhostKickUserOnTriggerComponent, TriggerEvent>(HandleMineTriggered);
-    }
-
-    private void HandleMineTriggered(EntityUid uid, GhostKickUserOnTriggerComponent userOnTriggerComponent, TriggerEvent args)
-    {
-        if (!TryComp(args.User, out ActorComponent? actor))
-            return;
-
-        _ghostKickManager.DoDisconnect(
-            actor.PlayerSession.Channel,
-            "Tripped over a kick mine, crashed through the fourth wall");
-
-        args.Handled = true;
-    }
-}
diff --git a/Content.Server/Holopad/HolopadSystem.cs b/Content.Server/Holopad/HolopadSystem.cs
index f2bd0e05ad..884fb3ae71 100644
--- a/Content.Server/Holopad/HolopadSystem.cs
+++ b/Content.Server/Holopad/HolopadSystem.cs
@@ -1,7 +1,6 @@
 using Content.Server.Chat.Systems;
 using Content.Server.Popups;
 using Content.Server.Power.EntitySystems;
-using Content.Server.Speech.Components;
 using Content.Server.Telephone;
 using Content.Shared.Access.Systems;
 using Content.Shared.Audio;
@@ -12,6 +11,7 @@ using Content.Shared.Labels.Components;
 using Content.Shared.Power;
 using Content.Shared.Silicons.StationAi;
 using Content.Shared.Speech;
+using Content.Shared.Speech.Components;
 using Content.Shared.Telephone;
 using Content.Shared.UserInterface;
 using Content.Shared.Verbs;
@@ -560,7 +560,7 @@ public sealed class HolopadSystem : SharedHolopadSystem
             entity.Comp.User = (user.Value, holopadUser);
         }
 
-        // Add the new user to PVS and sync their appearance with any 
+        // Add the new user to PVS and sync their appearance with any
         // holopads connected to the one they are using
         _pvs.AddGlobalOverride(user.Value);
         SyncHolopadHologramAppearanceWithTarget(entity, entity.Comp.User);
diff --git a/Content.Server/HotPotato/HotPotatoSystem.cs b/Content.Server/HotPotato/HotPotatoSystem.cs
index 8ca33fb8cd..554fe098b0 100644
--- a/Content.Server/HotPotato/HotPotatoSystem.cs
+++ b/Content.Server/HotPotato/HotPotatoSystem.cs
@@ -1,61 +1,5 @@
-using Content.Server.Audio;
-using Content.Server.Explosion.EntitySystems;
-using Content.Shared.Damage.Systems;
-using Content.Shared.Hands.Components;
-using Content.Shared.Hands.EntitySystems;
 using Content.Shared.HotPotato;
-using Content.Shared.Popups;
-using Content.Shared.Weapons.Melee.Events;
 
 namespace Content.Server.HotPotato;
 
-public sealed class HotPotatoSystem : SharedHotPotatoSystem
-{
-    [Dependency] private readonly SharedHandsSystem _hands = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly AmbientSoundSystem _ambientSound = default!;
-    [Dependency] private readonly DamageOnHoldingSystem _damageOnHolding = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<HotPotatoComponent, ActiveTimerTriggerEvent>(OnActiveTimer);
-        SubscribeLocalEvent<HotPotatoComponent, MeleeHitEvent>(OnMeleeHit);
-    }
-
-    private void OnActiveTimer(EntityUid uid, HotPotatoComponent comp, ref ActiveTimerTriggerEvent args)
-    {
-        EnsureComp<ActiveHotPotatoComponent>(uid);
-        comp.CanTransfer = false;
-        _ambientSound.SetAmbience(uid, true);
-        _damageOnHolding.SetEnabled(uid, true);
-        Dirty(uid, comp);
-    }
-
-    private void OnMeleeHit(EntityUid uid, HotPotatoComponent comp, MeleeHitEvent args)
-    {
-        if (!HasComp<ActiveHotPotatoComponent>(uid))
-            return;
-
-        comp.CanTransfer = true;
-        foreach (var hitEntity in args.HitEntities)
-        {
-            if (!TryComp<HandsComponent>(hitEntity, out var hands))
-                continue;
-
-            if (!_hands.IsHolding((hitEntity, hands), uid, out _) && _hands.TryForcePickupAnyHand(hitEntity, uid, handsComp: hands))
-            {
-                _popup.PopupEntity(Loc.GetString("hot-potato-passed",
-                    ("from", args.User), ("to", hitEntity)), uid, PopupType.Medium);
-                break;
-            }
-
-            _popup.PopupEntity(Loc.GetString("hot-potato-failed",
-                ("to", hitEntity)), uid, PopupType.Medium);
-
-            break;
-        }
-        comp.CanTransfer = false;
-        Dirty(uid, comp);
-    }
-}
+public sealed class HotPotatoSystem : SharedHotPotatoSystem;
diff --git a/Content.Server/IgnitionSource/IgniteOnTriggerComponent.cs b/Content.Server/IgnitionSource/IgniteOnTriggerComponent.cs
deleted file mode 100644
index 939198c45e..0000000000
--- a/Content.Server/IgnitionSource/IgniteOnTriggerComponent.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using Robust.Shared.Audio;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-
-namespace Content.Server.IgnitionSource;
-
-/// <summary>
-/// Ignites for a certain length of time when triggered.
-/// Requires <see cref="Shared.IgnitionSourceComponent"/> along with triggering components.
-/// </summary>
-[RegisterComponent, Access(typeof(IgniteOnTriggerSystem))]
-public sealed partial class IgniteOnTriggerComponent : Component
-{
-    /// <summary>
-    /// Once ignited, the time it will unignite at.
-    /// </summary>
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
-    public TimeSpan IgnitedUntil = TimeSpan.Zero;
-
-    /// <summary>
-    /// How long the ignition source is active for after triggering.
-    /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public TimeSpan IgnitedTime = TimeSpan.FromSeconds(0.5);
-
-    /// <summary>
-    /// Sound to play when igniting.
-    /// </summary>
-    [DataField]
-    public SoundSpecifier IgniteSound = new SoundCollectionSpecifier("WelderOn");
-}
diff --git a/Content.Server/Implants/Components/ScramImplantComponent.cs b/Content.Server/Implants/Components/ScramImplantComponent.cs
deleted file mode 100644
index f3bbc9e584..0000000000
--- a/Content.Server/Implants/Components/ScramImplantComponent.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Content.Server.Implants;
-using Robust.Shared.Audio;
-
-namespace Content.Server.Implants.Components;
-
-/// <summary>
-/// Randomly teleports entity when triggered.
-/// </summary>
-[RegisterComponent]
-public sealed partial class ScramImplantComponent : Component
-{
-    /// <summary>
-    /// Up to how far to teleport the user
-    /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float TeleportRadius = 100f;
-
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public SoundSpecifier TeleportSound = new SoundPathSpecifier("/Audio/Effects/teleport_arrival.ogg");
-}
diff --git a/Content.Server/Implants/SubdermalImplantSystem.cs b/Content.Server/Implants/SubdermalImplantSystem.cs
index e2482b7b60..f0530358a6 100644
--- a/Content.Server/Implants/SubdermalImplantSystem.cs
+++ b/Content.Server/Implants/SubdermalImplantSystem.cs
@@ -1,66 +1,21 @@
-using Content.Server.Cuffs;
-using Content.Server.Forensics;
-using Content.Server.Humanoid;
-using Content.Server.Implants.Components;
 using Content.Server.Store.Components;
 using Content.Server.Store.Systems;
-using Content.Shared.Cuffs.Components;
-using Content.Shared.Forensics;
-using Content.Shared.Forensics.Components;
-using Content.Shared.Humanoid;
 using Content.Shared.Implants;
-using Content.Shared.Implants.Components;
 using Content.Shared.Interaction;
-using Content.Shared.Physics;
 using Content.Shared.Popups;
-using Content.Shared.Preferences;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Map;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Random;
-using System.Numerics;
-using Content.Shared.Movement.Pulling.Components;
-using Content.Shared.Movement.Pulling.Systems;
-using Content.Server.IdentityManagement;
-using Content.Shared.DetailExaminable;
 using Content.Shared.Store.Components;
-using Robust.Shared.Collections;
-using Robust.Shared.Map.Components;
 
 namespace Content.Server.Implants;
 
 public sealed class SubdermalImplantSystem : SharedSubdermalImplantSystem
 {
-    [Dependency] private readonly CuffableSystem _cuffable = default!;
-    [Dependency] private readonly HumanoidAppearanceSystem _humanoidAppearance = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly MetaDataSystem _metaData = default!;
     [Dependency] private readonly StoreSystem _store = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly SharedTransformSystem _xform = default!;
-    [Dependency] private readonly ForensicsSystem _forensicsSystem = default!;
-    [Dependency] private readonly PullingSystem _pullingSystem = default!;
-    [Dependency] private readonly EntityLookupSystem _lookupSystem = default!;
-    [Dependency] private readonly SharedMapSystem _mapSystem = default!;
-    [Dependency] private readonly IdentitySystem _identity = default!;
-
-    private EntityQuery<PhysicsComponent> _physicsQuery;
-    private HashSet<Entity<MapGridComponent>> _targetGrids = [];
-
     public override void Initialize()
     {
         base.Initialize();
 
-        _physicsQuery = GetEntityQuery<PhysicsComponent>();
-
-        SubscribeLocalEvent<SubdermalImplantComponent, UseFreedomImplantEvent>(OnFreedomImplant);
         SubscribeLocalEvent<StoreComponent, ImplantRelayEvent<AfterInteractUsingEvent>>(OnStoreRelay);
-        SubscribeLocalEvent<SubdermalImplantComponent, ActivateImplantEvent>(OnActivateImplantEvent);
-        SubscribeLocalEvent<SubdermalImplantComponent, UseScramImplantEvent>(OnScramImplant);
-        SubscribeLocalEvent<SubdermalImplantComponent, UseDnaScramblerImplantEvent>(OnDnaScramblerImplant);
-
     }
 
     private void OnStoreRelay(EntityUid uid, StoreComponent store, ImplantRelayEvent<AfterInteractUsingEvent> implantRelay)
@@ -85,148 +40,4 @@ public sealed class SubdermalImplantSystem : SharedSubdermalImplantSystem
         var msg = Loc.GetString("store-currency-inserted-implant", ("used", args.Used));
         _popup.PopupEntity(msg, args.User, args.User);
     }
-
-    private void OnFreedomImplant(EntityUid uid, SubdermalImplantComponent component, UseFreedomImplantEvent args)
-    {
-        if (!TryComp<CuffableComponent>(component.ImplantedEntity, out var cuffs) || cuffs.Container.ContainedEntities.Count < 1)
-            return;
-
-        _cuffable.Uncuff(component.ImplantedEntity.Value, cuffs.LastAddedCuffs, cuffs.LastAddedCuffs);
-        args.Handled = true;
-    }
-
-    private void OnActivateImplantEvent(EntityUid uid, SubdermalImplantComponent component, ActivateImplantEvent args)
-    {
-        args.Handled = true;
-    }
-
-    private void OnScramImplant(EntityUid uid, SubdermalImplantComponent component, UseScramImplantEvent args)
-    {
-        if (component.ImplantedEntity is not { } ent)
-            return;
-
-        if (!TryComp<ScramImplantComponent>(uid, out var implant))
-            return;
-
-        // We need stop the user from being pulled so they don't just get "attached" with whoever is pulling them.
-        // This can for example happen when the user is cuffed and being pulled.
-        if (TryComp<PullableComponent>(ent, out var pull) && _pullingSystem.IsPulled(ent, pull))
-            _pullingSystem.TryStopPull(ent, pull);
-
-        // Check if the user is pulling anything, and drop it if so
-        if (TryComp<PullerComponent>(ent, out var puller) && TryComp<PullableComponent>(puller.Pulling, out var pullable))
-            _pullingSystem.TryStopPull(puller.Pulling.Value, pullable);
-
-        var xform = Transform(ent);
-        var targetCoords = SelectRandomTileInRange(xform, implant.TeleportRadius);
-
-        if (targetCoords != null)
-        {
-            _xform.SetCoordinates(ent, targetCoords.Value);
-            _audio.PlayPvs(implant.TeleportSound, ent);
-            args.Handled = true;
-        }
-    }
-
-    private EntityCoordinates? SelectRandomTileInRange(TransformComponent userXform, float radius)
-    {
-        var userCoords = _xform.ToMapCoordinates(userXform.Coordinates);
-        _targetGrids.Clear();
-        _lookupSystem.GetEntitiesInRange(userCoords, radius, _targetGrids);
-        Entity<MapGridComponent>? targetGrid = null;
-
-        if (_targetGrids.Count == 0)
-            return null;
-
-        // Give preference to the grid the entity is currently on.
-        // This does not guarantee that if the probability fails that the owner's grid won't be picked.
-        // In reality the probability is higher and depends on the number of grids.
-        if (userXform.GridUid != null && TryComp<MapGridComponent>(userXform.GridUid, out var gridComp))
-        {
-            var userGrid = new Entity<MapGridComponent>(userXform.GridUid.Value, gridComp);
-            if (_random.Prob(0.5f))
-            {
-                _targetGrids.Remove(userGrid);
-                targetGrid = userGrid;
-            }
-        }
-
-        if (targetGrid == null)
-            targetGrid = _random.GetRandom().PickAndTake(_targetGrids);
-
-        EntityCoordinates? targetCoords = null;
-
-        do
-        {
-            var valid = false;
-
-            var range = (float) Math.Sqrt(radius);
-            var box = Box2.CenteredAround(userCoords.Position, new Vector2(range, range));
-            var tilesInRange = _mapSystem.GetTilesEnumerator(targetGrid.Value.Owner, targetGrid.Value.Comp, box, false);
-            var tileList = new ValueList<Vector2i>();
-
-            while (tilesInRange.MoveNext(out var tile))
-            {
-                tileList.Add(tile.GridIndices);
-            }
-
-            while (tileList.Count != 0)
-            {
-                var tile = tileList.RemoveSwap(_random.Next(tileList.Count));
-                valid = true;
-                foreach (var entity in _mapSystem.GetAnchoredEntities(targetGrid.Value.Owner, targetGrid.Value.Comp,
-                             tile))
-                {
-                    if (!_physicsQuery.TryGetComponent(entity, out var body))
-                        continue;
-
-                    if (body.BodyType != BodyType.Static ||
-                        !body.Hard ||
-                        (body.CollisionLayer & (int) CollisionGroup.MobMask) == 0)
-                        continue;
-
-                    valid = false;
-                    break;
-                }
-
-                if (valid)
-                {
-                    targetCoords = new EntityCoordinates(targetGrid.Value.Owner,
-                        _mapSystem.TileCenterToVector(targetGrid.Value, tile));
-                    break;
-                }
-            }
-
-            if (valid || _targetGrids.Count == 0) // if we don't do the check here then PickAndTake will blow up on an empty set.
-                break;
-
-            targetGrid = _random.GetRandom().PickAndTake(_targetGrids);
-        } while (true);
-
-        return targetCoords;
-    }
-
-    private void OnDnaScramblerImplant(EntityUid uid, SubdermalImplantComponent component, UseDnaScramblerImplantEvent args)
-    {
-        if (component.ImplantedEntity is not { } ent)
-            return;
-
-        if (TryComp<HumanoidAppearanceComponent>(ent, out var humanoid))
-        {
-            var newProfile = HumanoidCharacterProfile.RandomWithSpecies(humanoid.Species);
-            _humanoidAppearance.LoadProfile(ent, newProfile, humanoid);
-            _metaData.SetEntityName(ent, newProfile.Name, raiseEvents: false); // raising events would update ID card, station record, etc.
-
-            // If the entity has the respecive components, then scramble the dna and fingerprint strings
-            _forensicsSystem.RandomizeDNA(ent);
-            _forensicsSystem.RandomizeFingerprint(ent);
-
-            RemComp<DetailExaminableComponent>(ent); // remove MRP+ custom description if one exists
-            _identity.QueueIdentityUpdate(ent); // manually queue identity update since we don't raise the event
-            _popup.PopupEntity(Loc.GetString("scramble-implant-activated-popup"), ent, ent);
-        }
-
-        args.Handled = true;
-        QueueDel(uid);
-    }
 }
diff --git a/Content.Server/Kitchen/EntitySystems/SharpSystem.cs b/Content.Server/Kitchen/EntitySystems/SharpSystem.cs
index cce5fb5bd3..0275e4d1a7 100644
--- a/Content.Server/Kitchen/EntitySystems/SharpSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/SharpSystem.cs
@@ -38,7 +38,7 @@ public sealed class SharpSystem : EntitySystem
     {
         base.Initialize();
 
-        SubscribeLocalEvent<SharpComponent, AfterInteractEvent>(OnAfterInteract, before: [typeof(UtensilSystem)]);
+        SubscribeLocalEvent<SharpComponent, AfterInteractEvent>(OnAfterInteract, before: [typeof(IngestionSystem)]);
         SubscribeLocalEvent<SharpComponent, SharpDoAfterEvent>(OnDoAfter);
 
         SubscribeLocalEvent<ButcherableComponent, GetVerbsEvent<InteractionVerb>>(OnGetInteractionVerbs);
@@ -117,19 +117,18 @@ public sealed class SharpSystem : EntitySystem
             popupEnt = Spawn(proto, coords.Offset(_robustRandom.NextVector2(0.25f)));
         }
 
-        var hasBody = TryComp<BodyComponent>(args.Args.Target.Value, out var body);
-
         // only show a big popup when butchering living things.
-        var popupType = PopupType.Small;
-        if (hasBody)
-            popupType = PopupType.LargeCaution;
+        // Meant to differentiate cutting up clothes and cutting up your boss.
+        var popupType = HasComp<MobStateComponent>(args.Args.Target.Value)
+            ? PopupType.LargeCaution
+            : PopupType.Small;
 
         _popupSystem.PopupEntity(Loc.GetString("butcherable-knife-butchered-success", ("target", args.Args.Target.Value), ("knife", Identity.Entity(uid, EntityManager))),
-            popupEnt, args.Args.User, popupType);
-
-        if (hasBody)
-            _bodySystem.GibBody(args.Args.Target.Value, body: body);
+            popupEnt,
+            args.Args.User,
+            popupType);
 
+        _bodySystem.GibBody(args.Args.Target.Value); // does nothing if ent can't be gibbed
         _destructibleSystem.DestroyEntity(args.Args.Target.Value);
 
         args.Handled = true;
diff --git a/Content.Server/LandMines/LandMineSystem.cs b/Content.Server/LandMines/LandMineSystem.cs
index 57d25ef8ab..fdea8e9c65 100644
--- a/Content.Server/LandMines/LandMineSystem.cs
+++ b/Content.Server/LandMines/LandMineSystem.cs
@@ -1,9 +1,9 @@
-using Content.Server.Explosion.EntitySystems;
 using Content.Shared.Armable;
 using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.LandMines;
 using Content.Shared.Popups;
 using Content.Shared.StepTrigger.Systems;
+using Content.Shared.Trigger.Systems;
 using Robust.Shared.Audio.Systems;
 
 namespace Content.Server.LandMines;
@@ -28,15 +28,15 @@ public sealed class LandMineSystem : EntitySystem
     /// </summary>
     private void HandleStepOnTriggered(EntityUid uid, LandMineComponent component, ref StepTriggeredOnEvent args)
     {
-      if (!string.IsNullOrEmpty(component.TriggerText))
-      {
-          _popupSystem.PopupCoordinates(
-              Loc.GetString(component.TriggerText, ("mine", uid)),
-              Transform(uid).Coordinates,
-              args.Tripper,
-              PopupType.LargeCaution);
-      }
-      _audioSystem.PlayPvs(component.Sound, uid);
+        if (!string.IsNullOrEmpty(component.TriggerText))
+        {
+            _popupSystem.PopupCoordinates(
+                Loc.GetString(component.TriggerText, ("mine", uid)),
+                Transform(uid).Coordinates,
+                args.Tripper,
+                PopupType.LargeCaution);
+        }
+        _audioSystem.PlayPvs(component.Sound, uid);
     }
 
     /// <summary>
@@ -44,7 +44,8 @@ public sealed class LandMineSystem : EntitySystem
     /// </summary>
     private void HandleStepOffTriggered(EntityUid uid, LandMineComponent component, ref StepTriggeredOffEvent args)
     {
-        _trigger.Trigger(uid, args.Tripper);
+        // TODO: Adjust to the new trigger system
+        _trigger.Trigger(uid, args.Tripper, TriggerSystem.DefaultTriggerKey);
     }
 
     /// <summary>
diff --git a/Content.Server/Medical/CryoPodEjectLockWireAction.cs b/Content.Server/Medical/CryoPodEjectLockWireAction.cs
index 6fbf9eb250..d9bd2b3250 100644
--- a/Content.Server/Medical/CryoPodEjectLockWireAction.cs
+++ b/Content.Server/Medical/CryoPodEjectLockWireAction.cs
@@ -1,4 +1,3 @@
-using Content.Server.Medical.Components;
 using Content.Server.Wires;
 using Content.Shared.Medical.Cryogenics;
 using Content.Shared.Wires;
@@ -8,7 +7,7 @@ namespace Content.Server.Medical;
 /// <summary>
 /// Causes a failure in the cryo pod ejection system when cut. A crowbar will be needed to pry open the pod.
 /// </summary>
-public sealed partial class CryoPodEjectLockWireAction: ComponentWireAction<CryoPodComponent>
+public sealed partial class CryoPodEjectLockWireAction : ComponentWireAction<CryoPodComponent>
 {
     public override Color Color { get; set; } = Color.Red;
     public override string Name { get; set; } = "wire-name-lock";
@@ -18,7 +17,10 @@ public sealed partial class CryoPodEjectLockWireAction: ComponentWireAction<Cryo
     public override bool Cut(EntityUid user, Wire wire, CryoPodComponent cryoPodComponent)
     {
         if (!cryoPodComponent.PermaLocked)
+        {
             cryoPodComponent.Locked = true;
+            EntityManager.Dirty(wire.Owner, cryoPodComponent);
+        }
 
         return true;
     }
@@ -26,7 +28,10 @@ public sealed partial class CryoPodEjectLockWireAction: ComponentWireAction<Cryo
     public override bool Mend(EntityUid user, Wire wire, CryoPodComponent cryoPodComponent)
     {
         if (!cryoPodComponent.PermaLocked)
+        {
             cryoPodComponent.Locked = false;
+            EntityManager.Dirty(wire.Owner, cryoPodComponent);
+        }
 
         return true;
     }
diff --git a/Content.Server/Medical/CryoPodSystem.cs b/Content.Server/Medical/CryoPodSystem.cs
index 1160f6aa17..20dc114918 100644
--- a/Content.Server/Medical/CryoPodSystem.cs
+++ b/Content.Server/Medical/CryoPodSystem.cs
@@ -1,8 +1,6 @@
-using Content.Server.Administration.Logs;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Atmos.Piping.Components;
 using Content.Server.Atmos.Piping.Unary.EntitySystems;
-using Content.Server.Body.Systems;
 using Content.Server.Medical.Components;
 using Content.Server.NodeContainer.EntitySystems;
 using Content.Server.NodeContainer.NodeGroups;
@@ -10,29 +8,11 @@ using Content.Server.NodeContainer.Nodes;
 using Content.Server.Temperature.Components;
 using Content.Shared.Atmos;
 using Content.Shared.Body.Components;
-using Content.Shared.Chemistry;
-using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Climbing.Systems;
-using Content.Shared.Containers.ItemSlots;
-using Content.Shared.Database;
-using Content.Shared.DoAfter;
-using Content.Shared.DragDrop;
-using Content.Shared.Emag.Systems;
-using Content.Shared.Examine;
-using Content.Shared.Interaction;
 using Content.Shared.Medical.Cryogenics;
 using Content.Shared.MedicalScanner;
-using Content.Shared.Power;
-using Content.Shared.Tools;
-using Content.Shared.Tools.Systems;
 using Content.Shared.UserInterface;
-using Content.Shared.Verbs;
-using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
 
 namespace Content.Server.Medical;
 
@@ -40,147 +20,20 @@ public sealed partial class CryoPodSystem : SharedCryoPodSystem
 {
     [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
     [Dependency] private readonly GasCanisterSystem _gasCanisterSystem = default!;
-    [Dependency] private readonly ClimbSystem _climbSystem = default!;
-    [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!;
-    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
-    [Dependency] private readonly BloodstreamSystem _bloodstreamSystem = default!;
-    [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
-    [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
-    [Dependency] private readonly SharedToolSystem _toolSystem = default!;
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
-    [Dependency] private readonly MetaDataSystem _metaDataSystem = default!;
-    [Dependency] private readonly ReactiveSystem _reactiveSystem = default!;
-    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
     [Dependency] private readonly NodeContainerSystem _nodeContainer = default!;
-
-    private static readonly ProtoId<ToolQualityPrototype> PryingQuality = "Prying";
+    [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<CryoPodComponent, ComponentInit>(OnComponentInit);
-        SubscribeLocalEvent<CryoPodComponent, GetVerbsEvent<AlternativeVerb>>(AddAlternativeVerbs);
-        SubscribeLocalEvent<CryoPodComponent, GotEmaggedEvent>(OnEmagged);
-        SubscribeLocalEvent<CryoPodComponent, CryoPodDragFinished>(OnDragFinished);
-        SubscribeLocalEvent<CryoPodComponent, CryoPodPryFinished>(OnCryoPodPryFinished);
-
-        SubscribeLocalEvent<CryoPodComponent, AtmosDeviceUpdateEvent>(OnCryoPodUpdateAtmosphere);
-        SubscribeLocalEvent<CryoPodComponent, DragDropTargetEvent>(HandleDragDropOn);
-        SubscribeLocalEvent<CryoPodComponent, InteractUsingEvent>(OnInteractUsing);
-        SubscribeLocalEvent<CryoPodComponent, ExaminedEvent>(OnExamined);
-        SubscribeLocalEvent<CryoPodComponent, PowerChangedEvent>(OnPowerChanged);
-        SubscribeLocalEvent<CryoPodComponent, GasAnalyzerScanEvent>(OnGasAnalyzed);
-        SubscribeLocalEvent<CryoPodComponent, ActivatableUIOpenAttemptEvent>(OnActivateUIAttempt);
         SubscribeLocalEvent<CryoPodComponent, AfterActivatableUIOpenEvent>(OnActivateUI);
+        SubscribeLocalEvent<CryoPodComponent, AtmosDeviceUpdateEvent>(OnCryoPodUpdateAtmosphere);
+        SubscribeLocalEvent<CryoPodComponent, GasAnalyzerScanEvent>(OnGasAnalyzed);
         SubscribeLocalEvent<CryoPodComponent, EntRemovedFromContainerMessage>(OnEjected);
     }
 
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        var curTime = _gameTiming.CurTime;
-        var bloodStreamQuery = GetEntityQuery<BloodstreamComponent>();
-        var metaDataQuery = GetEntityQuery<MetaDataComponent>();
-        var itemSlotsQuery = GetEntityQuery<ItemSlotsComponent>();
-        var fitsInDispenserQuery = GetEntityQuery<FitsInDispenserComponent>();
-        var solutionContainerManagerQuery = GetEntityQuery<SolutionContainerManagerComponent>();
-        var query = EntityQueryEnumerator<ActiveCryoPodComponent, CryoPodComponent>();
-
-        while (query.MoveNext(out var uid, out _, out var cryoPod))
-        {
-            metaDataQuery.TryGetComponent(uid, out var metaDataComponent);
-            if (curTime < cryoPod.NextInjectionTime + _metaDataSystem.GetPauseTime(uid, metaDataComponent))
-                continue;
-            cryoPod.NextInjectionTime = curTime + TimeSpan.FromSeconds(cryoPod.BeakerTransferTime);
-
-            if (!itemSlotsQuery.TryGetComponent(uid, out var itemSlotsComponent))
-            {
-                continue;
-            }
-            var container = _itemSlotsSystem.GetItemOrNull(uid, cryoPod.SolutionContainerName, itemSlotsComponent);
-            var patient = cryoPod.BodyContainer.ContainedEntity;
-            if (container != null
-                && container.Value.Valid
-                && patient != null
-                && fitsInDispenserQuery.TryGetComponent(container, out var fitsInDispenserComponent)
-                && solutionContainerManagerQuery.TryGetComponent(container,
-                    out var solutionContainerManagerComponent)
-                && _solutionContainerSystem.TryGetFitsInDispenser((container.Value, fitsInDispenserComponent, solutionContainerManagerComponent),
-                    out var containerSolution, out _))
-            {
-                if (!bloodStreamQuery.TryGetComponent(patient, out var bloodstream))
-                {
-                    continue;
-                }
-
-                var solutionToInject = _solutionContainerSystem.SplitSolution(containerSolution.Value, cryoPod.BeakerTransferAmount);
-                _bloodstreamSystem.TryAddToChemicals((patient.Value, bloodstream), solutionToInject);
-                _reactiveSystem.DoEntityReaction(patient.Value, solutionToInject, ReactionMethod.Injection);
-            }
-        }
-    }
-
-    public override EntityUid? EjectBody(EntityUid uid, CryoPodComponent? cryoPodComponent)
-    {
-        if (!Resolve(uid, ref cryoPodComponent))
-            return null;
-        if (cryoPodComponent.BodyContainer.ContainedEntity is not { Valid: true } contained)
-            return null;
-        base.EjectBody(uid, cryoPodComponent);
-        _climbSystem.ForciblySetClimbing(contained, uid);
-        return contained;
-    }
-
-    #region Interaction
-
-    private void HandleDragDropOn(Entity<CryoPodComponent> entity, ref DragDropTargetEvent args)
-    {
-        if (entity.Comp.BodyContainer.ContainedEntity != null)
-            return;
-
-        var doAfterArgs = new DoAfterArgs(EntityManager, args.User, entity.Comp.EntryDelay, new CryoPodDragFinished(), entity, target: args.Dragged, used: entity)
-        {
-            BreakOnDamage = true,
-            BreakOnMove = true,
-            NeedHand = false,
-        };
-        _doAfterSystem.TryStartDoAfter(doAfterArgs);
-        args.Handled = true;
-    }
-
-    private void OnDragFinished(Entity<CryoPodComponent> entity, ref CryoPodDragFinished args)
-    {
-        if (args.Cancelled || args.Handled || args.Args.Target == null)
-            return;
-
-        if (InsertBody(entity.Owner, args.Args.Target.Value, entity.Comp))
-        {
-            if (!TryComp(entity.Owner, out CryoPodAirComponent? cryoPodAir))
-                _adminLogger.Add(LogType.Action, LogImpact.Medium,
-                    $"{ToPrettyString(args.User)} inserted {ToPrettyString(args.Args.Target.Value)} into {ToPrettyString(entity.Owner)}");
-
-            _adminLogger.Add(LogType.Action, LogImpact.Medium,
-                $"{ToPrettyString(args.User)} inserted {ToPrettyString(args.Args.Target.Value)} into {ToPrettyString(entity.Owner)} which contains gas: {cryoPodAir!.Air.ToPrettyString():gasMix}");
-        }
-        args.Handled = true;
-    }
-
-    private void OnActivateUIAttempt(Entity<CryoPodComponent> entity, ref ActivatableUIOpenAttemptEvent args)
-    {
-        if (args.Cancelled)
-        {
-            return;
-        }
-
-        var containedEntity = entity.Comp.BodyContainer.ContainedEntity;
-        if (containedEntity == null || containedEntity == args.User || !HasComp<ActiveCryoPodComponent>(entity))
-        {
-            args.Cancel();
-        }
-    }
-
     private void OnActivateUI(Entity<CryoPodComponent> entity, ref AfterActivatableUIOpenEvent args)
     {
         if (!entity.Comp.BodyContainer.ContainedEntity.HasValue)
@@ -210,54 +63,6 @@ public sealed partial class CryoPodSystem : SharedCryoPodSystem
         ));
     }
 
-    private void OnInteractUsing(Entity<CryoPodComponent> entity, ref InteractUsingEvent args)
-    {
-        if (args.Handled || !entity.Comp.Locked || entity.Comp.BodyContainer.ContainedEntity == null)
-            return;
-
-        args.Handled = _toolSystem.UseTool(args.Used, args.User, entity.Owner, entity.Comp.PryDelay, PryingQuality, new CryoPodPryFinished());
-    }
-
-    private void OnExamined(Entity<CryoPodComponent> entity, ref ExaminedEvent args)
-    {
-        var container = _itemSlotsSystem.GetItemOrNull(entity.Owner, entity.Comp.SolutionContainerName);
-        if (args.IsInDetailsRange && container != null && _solutionContainerSystem.TryGetFitsInDispenser(container.Value, out _, out var containerSolution))
-        {
-            using (args.PushGroup(nameof(CryoPodComponent)))
-            {
-                args.PushMarkup(Loc.GetString("cryo-pod-examine", ("beaker", Name(container.Value))));
-                if (containerSolution.Volume == 0)
-                {
-                    args.PushMarkup(Loc.GetString("cryo-pod-empty-beaker"));
-                }
-            }
-        }
-    }
-
-    private void OnPowerChanged(Entity<CryoPodComponent> entity, ref PowerChangedEvent args)
-    {
-        // Needed to avoid adding/removing components on a deleted entity
-        if (Terminating(entity))
-        {
-            return;
-        }
-
-        if (args.Powered)
-        {
-            EnsureComp<ActiveCryoPodComponent>(entity);
-        }
-        else
-        {
-            RemComp<ActiveCryoPodComponent>(entity);
-            _uiSystem.CloseUi(entity.Owner, HealthAnalyzerUiKey.Key);
-        }
-        UpdateAppearance(entity.Owner, entity.Comp);
-    }
-
-    #endregion
-
-    #region Atmos handler
-
     private void OnCryoPodUpdateAtmosphere(Entity<CryoPodComponent> entity, ref AtmosDeviceUpdateEvent args)
     {
         if (!_nodeContainer.TryGetNode(entity.Owner, entity.Comp.PortName, out PortablePipeNode? portNode))
@@ -302,6 +107,4 @@ public sealed partial class CryoPodSystem : SharedCryoPodSystem
         // if body is ejected - no need to display health-analyzer
         _uiSystem.CloseUi(cryoPod.Owner, HealthAnalyzerUiKey.Key);
     }
-
-    #endregion
 }
diff --git a/Content.Server/Mobs/CritMobActionsSystem.cs b/Content.Server/Mobs/CritMobActionsSystem.cs
index c897102dca..c266037a8f 100644
--- a/Content.Server/Mobs/CritMobActionsSystem.cs
+++ b/Content.Server/Mobs/CritMobActionsSystem.cs
@@ -65,6 +65,10 @@ public sealed class CritMobActionsSystem : EntitySystem
         _quickDialog.OpenDialog(actor.PlayerSession, Loc.GetString("action-name-crit-last-words"), "",
             (string lastWords) =>
             {
+                // if a person is gibbed/deleted, they can't say last words
+                if (Deleted(uid))
+                    return;
+
                 // Intentionally does not check for muteness
                 if (actor.PlayerSession.AttachedEntity != uid
                     || !_mobState.IsCritical(uid))
diff --git a/Content.Server/Morgue/MorgueSystem.cs b/Content.Server/Morgue/MorgueSystem.cs
index a07accf777..92ed16a06b 100644
--- a/Content.Server/Morgue/MorgueSystem.cs
+++ b/Content.Server/Morgue/MorgueSystem.cs
@@ -1,6 +1,6 @@
 using Content.Server.Storage.Components;
-using Content.Shared.Body.Components;
 using Content.Shared.Examine;
+using Content.Shared.Mobs.Components;
 using Content.Shared.Morgue;
 using Content.Shared.Morgue.Components;
 using Robust.Shared.Audio.Systems;
@@ -59,7 +59,7 @@ public sealed class MorgueSystem : EntitySystem
 
         foreach (var ent in storage.Contents.ContainedEntities)
         {
-            if (!hasMob && HasComp<BodyComponent>(ent))
+            if (!hasMob && HasComp<MobStateComponent>(ent))
                 hasMob = true;
 
             if (HasComp<ActorComponent>(ent))
diff --git a/Content.Server/Mousetrap/MousetrapSystem.cs b/Content.Server/Mousetrap/MousetrapSystem.cs
deleted file mode 100644
index 3afe858ce0..0000000000
--- a/Content.Server/Mousetrap/MousetrapSystem.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using Content.Server.Damage.Systems;
-using Content.Server.Explosion.EntitySystems;
-using Content.Server.Popups;
-using Content.Shared.Interaction.Events;
-using Content.Shared.Inventory;
-using Content.Shared.Mousetrap;
-using Content.Shared.StepTrigger;
-using Content.Shared.StepTrigger.Systems;
-using Robust.Server.GameObjects;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Player;
-
-namespace Content.Server.Mousetrap;
-
-public sealed class MousetrapSystem : EntitySystem
-{
-    [Dependency] private readonly PopupSystem _popupSystem = default!;
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<MousetrapComponent, UseInHandEvent>(OnUseInHand);
-        SubscribeLocalEvent<MousetrapComponent, BeforeDamageUserOnTriggerEvent>(BeforeDamageOnTrigger);
-        SubscribeLocalEvent<MousetrapComponent, StepTriggerAttemptEvent>(OnStepTriggerAttempt);
-        SubscribeLocalEvent<MousetrapComponent, TriggerEvent>(OnTrigger);
-    }
-
-    private void OnUseInHand(EntityUid uid, MousetrapComponent component, UseInHandEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        component.IsActive = !component.IsActive;
-        _popupSystem.PopupEntity(component.IsActive
-            ? Loc.GetString("mousetrap-on-activate")
-            : Loc.GetString("mousetrap-on-deactivate"),
-            uid,
-            args.User);
-
-        UpdateVisuals(uid);
-
-        args.Handled = true;
-    }
-
-    private void OnStepTriggerAttempt(EntityUid uid, MousetrapComponent component, ref StepTriggerAttemptEvent args)
-    {
-        args.Continue |= component.IsActive;
-    }
-
-    private void BeforeDamageOnTrigger(EntityUid uid, MousetrapComponent component, BeforeDamageUserOnTriggerEvent args)
-    {
-        if (TryComp(args.Tripper, out PhysicsComponent? physics) && physics.Mass != 0)
-        {
-            // The idea here is inverse,
-            // Small - big damage,
-            // Large - small damage
-            // yes i punched numbers into a calculator until the graph looked right
-            var scaledDamage = -50 * Math.Atan(physics.Mass - component.MassBalance) + (25 * Math.PI);
-            args.Damage *= scaledDamage;
-        }
-    }
-
-    private void OnTrigger(EntityUid uid, MousetrapComponent component, TriggerEvent args)
-    {
-        component.IsActive = false;
-        UpdateVisuals(uid);
-    }
-
-    private void UpdateVisuals(EntityUid uid, MousetrapComponent? mousetrap = null, AppearanceComponent? appearance = null)
-    {
-        if (!Resolve(uid, ref mousetrap, ref appearance, false))
-        {
-            return;
-        }
-
-        _appearance.SetData(uid, MousetrapVisuals.Visual,
-            mousetrap.IsActive ? MousetrapVisuals.Armed : MousetrapVisuals.Unarmed, appearance);
-    }
-}
diff --git a/Content.Server/NPC/Systems/NPCSteeringSystem.cs b/Content.Server/NPC/Systems/NPCSteeringSystem.cs
index 6a736f3bc9..3585711860 100644
--- a/Content.Server/NPC/Systems/NPCSteeringSystem.cs
+++ b/Content.Server/NPC/Systems/NPCSteeringSystem.cs
@@ -30,11 +30,16 @@ using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using Content.Shared.Prying.Systems;
 using Microsoft.Extensions.ObjectPool;
+using Prometheus;
 
 namespace Content.Server.NPC.Systems;
 
 public sealed partial class NPCSteeringSystem : SharedNPCSteeringSystem
 {
+    private static readonly Gauge ActiveSteeringGauge = Metrics.CreateGauge(
+        "npc_steering_active_count",
+        "Amount of NPCs trying to actively do steering");
+
     /*
      * We use context steering to determine which way to move.
      * This involves creating an array of possible directions and assigning a value for the desireability of each direction.
@@ -87,6 +92,8 @@ public sealed partial class NPCSteeringSystem : SharedNPCSteeringSystem
 
     private object _obstacles = new();
 
+    private int _activeSteeringCount;
+
     public override void Initialize()
     {
         base.Initialize();
@@ -244,12 +251,15 @@ public sealed partial class NPCSteeringSystem : SharedNPCSteeringSystem
         };
         var curTime = _timing.CurTime;
 
+        _activeSteeringCount = 0;
+
         Parallel.For(0, index, options, i =>
         {
             var (uid, steering, mover, xform) = npcs[i];
             Steer(uid, steering, mover, xform, frameTime, curTime);
         });
 
+        ActiveSteeringGauge.Set(_activeSteeringCount);
 
         if (_subscribedSessions.Count > 0)
         {
@@ -324,6 +334,8 @@ public sealed partial class NPCSteeringSystem : SharedNPCSteeringSystem
             return;
         }
 
+        Interlocked.Increment(ref _activeSteeringCount);
+
         var agentRadius = steering.Radius;
         var worldPos = _transform.GetWorldPosition(xform);
         var (layer, mask) = _physics.GetHardCollision(uid);
diff --git a/Content.Server/NPC/Systems/NPCSystem.cs b/Content.Server/NPC/Systems/NPCSystem.cs
index c7690cb295..27b2a1691d 100644
--- a/Content.Server/NPC/Systems/NPCSystem.cs
+++ b/Content.Server/NPC/Systems/NPCSystem.cs
@@ -8,6 +8,7 @@ using Content.Shared.Mobs;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.NPC;
 using Content.Shared.NPC.Systems;
+using Prometheus;
 using Robust.Server.GameObjects;
 using Robust.Shared.Configuration;
 using Robust.Shared.Player;
@@ -19,6 +20,10 @@ namespace Content.Server.NPC.Systems
     /// </summary>
     public sealed partial class NPCSystem : EntitySystem
     {
+        private static readonly Gauge ActiveGauge = Metrics.CreateGauge(
+            "npc_active_count",
+            "Amount of NPCs that are actively processing");
+
         [Dependency] private readonly IConfigurationManager _configurationManager = default!;
         [Dependency] private readonly HTNSystem _htn = default!;
         [Dependency] private readonly MobStateSystem _mobState = default!;
@@ -138,6 +143,8 @@ namespace Content.Server.NPC.Systems
 
             // Add your system here.
             _htn.UpdateNPC(ref _count, _maxUpdates, frameTime);
+
+            ActiveGauge.Set(Count<ActiveNPCComponent>());
         }
 
         public void OnMobStateChange(EntityUid uid, HTNComponent component, MobStateChangedEvent args)
diff --git a/Content.Server/NPC/Systems/NPCUtilitySystem.cs b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
index 489ac6de55..6de26cd056 100644
--- a/Content.Server/NPC/Systems/NPCUtilitySystem.cs
+++ b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
@@ -44,9 +44,9 @@ public sealed class NPCUtilitySystem : EntitySystem
     [Dependency] private readonly ContainerSystem _container = default!;
     [Dependency] private readonly DrinkSystem _drink = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
-    [Dependency] private readonly FoodSystem _food = default!;
     [Dependency] private readonly HandsSystem _hands = default!;
     [Dependency] private readonly InventorySystem _inventory = default!;
+    [Dependency] private readonly IngestionSystem _ingestion = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
     [Dependency] private readonly NpcFactionSystem _npcFaction = default!;
     [Dependency] private readonly OpenableSystem _openable = default!;
@@ -174,14 +174,8 @@ public sealed class NPCUtilitySystem : EntitySystem
         {
             case FoodValueCon:
             {
-                if (!TryComp<FoodComponent>(targetUid, out var food))
-                    return 0f;
-
-                // mice can't eat unpeeled bananas, need monkey's help
-                if (_openable.IsClosed(targetUid))
-                    return 0f;
-
-                if (!_food.IsDigestibleBy(owner, targetUid, food))
+                // do we have a mouth available? Is the food item opened?
+                if (!_ingestion.CanConsume(owner, targetUid))
                     return 0f;
 
                 var avoidBadFood = !HasComp<IgnoreBadFoodComponent>(owner);
@@ -194,15 +188,16 @@ public sealed class NPCUtilitySystem : EntitySystem
                 if (avoidBadFood && HasComp<BadFoodComponent>(targetUid))
                     return 0f;
 
+                var nutrition = _ingestion.TotalNutrition(targetUid, owner);
+                if (nutrition <= 1.0f)
+                    return 0f;
+
                 return 1f;
             }
             case DrinkValueCon:
             {
-                if (!TryComp<DrinkComponent>(targetUid, out var drink))
-                    return 0f;
-
-                // can't drink closed drinks
-                if (_openable.IsClosed(targetUid))
+                // can't drink closed drinks and can't drink with a mask on...
+                if (!_ingestion.CanConsume(owner, targetUid))
                     return 0f;
 
                 // only drink when thirsty
@@ -214,7 +209,9 @@ public sealed class NPCUtilitySystem : EntitySystem
                     return 0f;
 
                 // needs to have something that will satiate thirst, mice wont try to drink 100% pure mutagen.
-                var hydration = _drink.TotalHydration(targetUid, drink);
+                // We don't check if the solution is metabolizable cause all drinks should be currently.
+                // If that changes then simply use the other overflow.
+                var hydration = _ingestion.TotalHydration(targetUid);
                 if (hydration <= 1.0f)
                     return 0f;
 
diff --git a/Content.Server/Ninja/Systems/SpiderChargeSystem.cs b/Content.Server/Ninja/Systems/SpiderChargeSystem.cs
index 6594d7883b..c08576a5ce 100644
--- a/Content.Server/Ninja/Systems/SpiderChargeSystem.cs
+++ b/Content.Server/Ninja/Systems/SpiderChargeSystem.cs
@@ -1,4 +1,3 @@
-using Content.Server.Explosion.EntitySystems;
 using Content.Server.Mind;
 using Content.Server.Objectives.Components;
 using Content.Server.Popups;
@@ -7,6 +6,7 @@ using Content.Shared.Ninja.Components;
 using Content.Shared.Ninja.Systems;
 using Content.Shared.Roles;
 using Content.Shared.Sticky;
+using Content.Shared.Trigger;
 
 namespace Content.Server.Ninja.Systems;
 
@@ -80,6 +80,9 @@ public sealed class SpiderChargeSystem : SharedSpiderChargeSystem
     /// </summary>
     private void OnExplode(EntityUid uid, SpiderChargeComponent comp, TriggerEvent args)
     {
+        if (args.Key != comp.TriggerKey)
+            return;
+
         if (!TryComp<SpaceNinjaComponent>(comp.Planter, out var ninja))
             return;
 
diff --git a/Content.Server/Nutrition/Components/MessyDrinkerComponent.cs b/Content.Server/Nutrition/Components/MessyDrinkerComponent.cs
new file mode 100644
index 0000000000..5519c5d983
--- /dev/null
+++ b/Content.Server/Nutrition/Components/MessyDrinkerComponent.cs
@@ -0,0 +1,30 @@
+using Content.Shared.FixedPoint;
+using Content.Shared.Nutrition.Prototypes;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Nutrition.Components;
+
+/// <summary>
+/// Entities with this component occasionally spill some of the solution they're ingesting.
+/// </summary>
+[RegisterComponent]
+public sealed partial class MessyDrinkerComponent : Component
+{
+    [DataField]
+    public float SpillChance = 0.2f;
+
+    /// <summary>
+    /// The amount of solution that is spilled when <see cref="SpillChance"/> procs.
+    /// </summary>
+    [DataField]
+    public FixedPoint2 SpillAmount = 1.0;
+
+    /// <summary>
+    /// The types of food prototypes we can spill
+    /// </summary>
+    [DataField]
+    public List<ProtoId<EdiblePrototype>> SpillableTypes = new List<ProtoId<EdiblePrototype>> { "Drink" };
+
+    [DataField]
+    public LocId? SpillMessagePopup;
+}
diff --git a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
index 5c0aca1578..e85393e6f7 100644
--- a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
@@ -1,15 +1,15 @@
-using Content.Server.Explosion.EntitySystems;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Nutrition.Components;
 using Content.Server.Popups;
 using Content.Shared.Containers.ItemSlots;
-using Content.Shared.Explosion.Components;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Nutrition;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Rejuvenate;
 using Content.Shared.Throwing;
+using Content.Shared.Trigger.Components;
+using Content.Shared.Trigger.Systems;
 using Content.Shared.Chemistry.EntitySystems;
 using JetBrains.Annotations;
 using Robust.Shared.Audio;
@@ -77,15 +77,9 @@ namespace Content.Server.Nutrition.EntitySystems
             {
                 if (_itemSlots.TryEject(uid, itemSlot, user: null, out var item))
                 {
-                    if (TryComp<OnUseTimerTriggerComponent>(item.Value, out var timerTrigger))
+                    if (TryComp<TimerTriggerComponent>(item.Value, out var timerTrigger))
                     {
-                        _trigger.HandleTimerTrigger(
-                            item.Value,
-                            null,
-                            timerTrigger.Delay,
-                            timerTrigger.BeepInterval,
-                            timerTrigger.InitialBeepDelay,
-                            timerTrigger.BeepSound);
+                        _trigger.ActivateTimerTrigger((item.Value, timerTrigger));
                     }
                 }
             }
diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
index deb49ea668..1677f1d822 100644
--- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
@@ -1,49 +1,16 @@
-using Content.Server.Body.Systems;
-using Content.Server.Fluids.EntitySystems;
-using Content.Server.Forensics;
-using Content.Server.Inventory;
-using Content.Server.Popups;
-using Content.Shared.Administration.Logs;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Systems;
-using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Database;
-using Content.Shared.EntityEffects.Effects;
-using Content.Shared.FixedPoint;
-using Content.Shared.IdentityManagement;
-using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
-using Content.Shared.Nutrition;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.EntitySystems;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
+
 
 namespace Content.Server.Nutrition.EntitySystems;
 
 public sealed class DrinkSystem : SharedDrinkSystem
 {
-    [Dependency] private readonly BodySystem _body = default!;
-    [Dependency] private readonly FoodSystem _food = default!;
-    [Dependency] private readonly IPrototypeManager _proto = default!;
-    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly OpenableSystem _openable = default!;
-    [Dependency] private readonly PopupSystem _popup = default!;
-    [Dependency] private readonly PuddleSystem _puddle = default!;
-    [Dependency] private readonly ReactiveSystem _reaction = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedInteractionSystem _interaction = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
-    [Dependency] private readonly StomachSystem _stomach = default!;
-    [Dependency] private readonly ForensicsSystem _forensics = default!;
 
     public override void Initialize()
     {
@@ -54,59 +21,6 @@ public sealed class DrinkSystem : SharedDrinkSystem
         SubscribeLocalEvent<DrinkComponent, ComponentInit>(OnDrinkInit);
         // run before inventory so for bucket it always tries to drink before equipping (when empty)
         // run after openable so its always open -> drink
-        SubscribeLocalEvent<DrinkComponent, UseInHandEvent>(OnUse, before: [typeof(ServerInventorySystem)], after: [typeof(OpenableSystem)]);
-        SubscribeLocalEvent<DrinkComponent, AfterInteractEvent>(AfterInteract);
-        SubscribeLocalEvent<DrinkComponent, ConsumeDoAfterEvent>(OnDoAfter);
-    }
-
-    /// <summary>
-    /// Get the total hydration factor contained in a drink's solution.
-    /// </summary>
-    public float TotalHydration(EntityUid uid, DrinkComponent? comp = null)
-    {
-        if (!Resolve(uid, ref comp))
-            return 0f;
-
-        if (!_solutionContainer.TryGetSolution(uid, comp.Solution, out _, out var solution))
-            return 0f;
-
-        var total = 0f;
-        foreach (var quantity in solution.Contents)
-        {
-            var reagent = _proto.Index<ReagentPrototype>(quantity.Reagent.Prototype);
-            if (reagent.Metabolisms == null)
-                continue;
-
-            foreach (var entry in reagent.Metabolisms.Values)
-            {
-                foreach (var effect in entry.Effects)
-                {
-                    // ignores any effect conditions, just cares about how much it can hydrate
-                    if (effect is SatiateThirst thirst)
-                    {
-                        total += thirst.HydrationFactor * quantity.Quantity.Float();
-                    }
-                }
-            }
-        }
-
-        return total;
-    }
-
-    private void AfterInteract(Entity<DrinkComponent> entity, ref AfterInteractEvent args)
-    {
-        if (args.Handled || args.Target == null || !args.CanReach)
-            return;
-
-        args.Handled = TryDrink(args.User, args.Target.Value, entity.Comp, entity);
-    }
-
-    private void OnUse(Entity<DrinkComponent> entity, ref UseInHandEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        args.Handled = TryDrink(args.User, args.User, entity.Comp, entity);
     }
 
     private void OnDrinkInit(Entity<DrinkComponent> entity, ref ComponentInit args)
@@ -146,108 +60,4 @@ public sealed class DrinkSystem : SharedDrinkSystem
         var drainAvailable = DrinkVolume(uid, component);
         _appearance.SetData(uid, FoodVisuals.Visual, drainAvailable.Float(), appearance);
     }
-
-    /// <summary>
-    ///     Raised directed at a victim when someone has force fed them a drink.
-    /// </summary>
-    private void OnDoAfter(Entity<DrinkComponent> entity, ref ConsumeDoAfterEvent args)
-    {
-        if (args.Handled || args.Cancelled || entity.Comp.Deleted)
-            return;
-
-        if (!TryComp<BodyComponent>(args.Target, out var body))
-            return;
-
-        if (args.Used is null || !_solutionContainer.TryGetSolution(args.Used.Value, args.Solution, out var soln, out var solution))
-            return;
-
-        if (_openable.IsClosed(args.Used.Value, args.Target.Value, predicted: true))
-            return;
-
-        // TODO this should really be checked every tick.
-        if (_food.IsMouthBlocked(args.Target.Value))
-            return;
-
-        // TODO this should really be checked every tick.
-        if (!_interaction.InRangeUnobstructed(args.User, args.Target.Value))
-            return;
-
-        var transferAmount = FixedPoint2.Min(entity.Comp.TransferAmount, solution.Volume);
-        var drained = _solutionContainer.SplitSolution(soln.Value, transferAmount);
-        var forceDrink = args.User != args.Target;
-
-        args.Handled = true;
-        if (transferAmount <= 0)
-            return;
-
-        if (!_body.TryGetBodyOrganEntityComps<StomachComponent>((args.Target.Value, body), out var stomachs))
-        {
-            _popup.PopupEntity(Loc.GetString(forceDrink ? "drink-component-try-use-drink-cannot-drink-other" : "drink-component-try-use-drink-had-enough"), args.Target.Value, args.User);
-
-            if (HasComp<RefillableSolutionComponent>(args.Target.Value))
-            {
-                _puddle.TrySpillAt(args.User, drained, out _);
-                return;
-            }
-
-            _solutionContainer.Refill(args.Target.Value, soln.Value, drained);
-            return;
-        }
-
-        var firstStomach = stomachs.FirstOrNull(stomach => _stomach.CanTransferSolution(stomach.Owner, drained, stomach.Comp1));
-
-        //All stomachs are full or can't handle whatever solution we have.
-        if (firstStomach == null)
-        {
-            _popup.PopupEntity(Loc.GetString("drink-component-try-use-drink-had-enough"), args.Target.Value, args.Target.Value);
-
-            if (forceDrink)
-            {
-                _popup.PopupEntity(Loc.GetString("drink-component-try-use-drink-had-enough-other"), args.Target.Value, args.User);
-                _puddle.TrySpillAt(args.Target.Value, drained, out _);
-            }
-            else
-                _solutionContainer.TryAddSolution(soln.Value, drained);
-
-            return;
-        }
-
-        var flavors = args.FlavorMessage;
-
-        if (forceDrink)
-        {
-            var targetName = Identity.Entity(args.Target.Value, EntityManager);
-            var userName = Identity.Entity(args.User, EntityManager);
-
-            _popup.PopupEntity(Loc.GetString("drink-component-force-feed-success", ("user", userName), ("flavors", flavors)), args.Target.Value, args.Target.Value);
-
-            _popup.PopupEntity(
-                Loc.GetString("drink-component-force-feed-success-user", ("target", targetName)),
-                args.User, args.User);
-
-            // log successful forced drinking
-            _adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(entity.Owner):user} forced {ToPrettyString(args.User):target} to drink {ToPrettyString(entity.Owner):drink}");
-        }
-        else
-        {
-            _popup.PopupEntity(
-                Loc.GetString("drink-component-try-use-drink-success-slurp-taste", ("flavors", flavors)), args.User,
-                args.User);
-            _popup.PopupEntity(
-                Loc.GetString("drink-component-try-use-drink-success-slurp"), args.User, Filter.PvsExcept(args.User), true);
-
-            // log successful voluntary drinking
-            _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(args.User):target} drank {ToPrettyString(entity.Owner):drink}");
-        }
-
-        _audio.PlayPvs(entity.Comp.UseSound, args.Target.Value, AudioParams.Default.WithVolume(-2f).WithVariation(0.25f));
-
-        _reaction.DoEntityReaction(args.Target.Value, solution, ReactionMethod.Ingestion);
-        _stomach.TryTransferSolution(firstStomach.Value.Owner, drained, firstStomach.Value.Comp1);
-
-        _forensics.TransferDna(entity, args.Target.Value);
-
-        if (!forceDrink && solution.Volume > 0)
-            args.Repeat = true;
-    }
 }
diff --git a/Content.Server/Nutrition/EntitySystems/MessyDrinkerSystem.cs b/Content.Server/Nutrition/EntitySystems/MessyDrinkerSystem.cs
new file mode 100644
index 0000000000..dc8c11bb7f
--- /dev/null
+++ b/Content.Server/Nutrition/EntitySystems/MessyDrinkerSystem.cs
@@ -0,0 +1,48 @@
+using Content.Server.Fluids.EntitySystems;
+using Content.Server.Nutrition.Components;
+using Content.Shared.Nutrition;
+using Content.Shared.Nutrition.EntitySystems;
+using Content.Shared.Popups;
+using Robust.Shared.Random;
+
+namespace Content.Server.Nutrition.EntitySystems;
+
+public sealed class MessyDrinkerSystem : EntitySystem
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly IngestionSystem _ingestion = default!;
+    [Dependency] private readonly PuddleSystem _puddle = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<MessyDrinkerComponent, IngestingEvent>(OnIngested);
+    }
+
+    private void OnIngested(Entity<MessyDrinkerComponent> ent, ref IngestingEvent ev)
+    {
+        if (ev.Split.Volume <= ent.Comp.SpillAmount)
+            return;
+
+        var proto = _ingestion.GetEdibleType(ev.Food);
+
+        if (proto == null || !ent.Comp.SpillableTypes.Contains(proto.Value))
+            return;
+
+        // Cannot spill if you're being forced to drink.
+        if (ev.ForceFed)
+            return;
+
+        if (!_random.Prob(ent.Comp.SpillChance))
+            return;
+
+        if (ent.Comp.SpillMessagePopup != null)
+            _popup.PopupEntity(Loc.GetString(ent.Comp.SpillMessagePopup), ent, ent, PopupType.MediumCaution);
+
+        var split = ev.Split.SplitSolution(ent.Comp.SpillAmount);
+
+        _puddle.TrySpillAt(ent, split, out _);
+    }
+}
diff --git a/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs b/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
index 3ce285b06c..2a13d07797 100644
--- a/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
@@ -22,6 +22,7 @@ public sealed class SliceableFoodSystem : EntitySystem
 {
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedDestructibleSystem _destroy = default!;
     [Dependency] private readonly TransformSystem _transform = default!;
     [Dependency] private readonly DoAfterSystem _doAfter = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
@@ -64,31 +65,27 @@ public sealed class SliceableFoodSystem : EntitySystem
         if (args.Cancelled || args.Handled || args.Args.Target == null)
             return;
 
-        if (TrySliceFood(entity, args.User, args.Used, entity.Comp))
+        if (TrySliceFood(entity.Owner, args.User, args.Used))
             args.Handled = true;
     }
 
-    private bool TrySliceFood(EntityUid uid,
+    private bool TrySliceFood(Entity<TransformComponent?, SliceableFoodComponent?, EdibleComponent?> entity,
         EntityUid user,
-        EntityUid? usedItem,
-        SliceableFoodComponent? component = null,
-        FoodComponent? food = null,
-        TransformComponent? transform = null)
+        EntityUid? usedItem)
     {
-        if (!Resolve(uid, ref component, ref food, ref transform) ||
-            string.IsNullOrEmpty(component.Slice))
+        if (!Resolve(entity, ref entity.Comp1, ref entity.Comp2, ref entity.Comp3) || string.IsNullOrEmpty(entity.Comp2.Slice))
             return false;
 
-        if (!_solutionContainer.TryGetSolution(uid, food.Solution, out var soln, out var solution))
+        if (!_solutionContainer.TryGetSolution(entity.Owner, entity.Comp3.Solution, out var soln, out var solution))
             return false;
 
         if (!TryComp<UtensilComponent>(usedItem, out var utensil) || (utensil.Types & UtensilType.Knife) == 0)
             return false;
 
-        var sliceVolume = solution.Volume / FixedPoint2.New(component.TotalCount);
-        for (int i = 0; i < component.TotalCount; i++)
+        var sliceVolume = solution.Volume / FixedPoint2.New(entity.Comp2.TotalCount);
+        for (int i = 0; i < entity.Comp2.TotalCount; i++)
         {
-            var sliceUid = Slice(uid, user, component, transform);
+            var sliceUid = Slice(entity, user);
 
             var lostSolution =
                 _solutionContainer.SplitSolution(soln.Value, sliceVolume);
@@ -97,11 +94,11 @@ public sealed class SliceableFoodSystem : EntitySystem
             FillSlice(sliceUid, lostSolution);
         }
 
-        _audio.PlayPvs(component.Sound, transform.Coordinates, AudioParams.Default.WithVolume(-2));
+        _audio.PlayPvs(entity.Comp2.Sound, entity.Comp1.Coordinates, AudioParams.Default.WithVolume(-2));
         var ev = new SliceFoodEvent();
-        RaiseLocalEvent(uid, ref ev);
+        RaiseLocalEvent(entity, ref ev);
 
-        DeleteFood(uid, user, food);
+        DeleteFood(entity, user);
         return true;
     }
 
@@ -109,19 +106,16 @@ public sealed class SliceableFoodSystem : EntitySystem
     /// Create a new slice in the world and returns its entity.
     /// The solutions must be set afterwards.
     /// </summary>
-    public EntityUid Slice(EntityUid uid,
-        EntityUid user,
-        SliceableFoodComponent? comp = null,
-        TransformComponent? transform = null)
+    public EntityUid Slice(Entity<TransformComponent?, SliceableFoodComponent?> entity, EntityUid user)
     {
-        if (!Resolve(uid, ref comp, ref transform))
+        if (!Resolve(entity, ref entity.Comp1, ref entity.Comp2))
             return EntityUid.Invalid;
 
-        var sliceUid = Spawn(comp.Slice, _transform.GetMapCoordinates(uid));
+        var sliceUid = Spawn(entity.Comp2.Slice, _transform.GetMapCoordinates((entity, entity.Comp1)));
 
         // try putting the slice into the container if the food being sliced is in a container!
         // this lets you do things like slice a pizza up inside of a hot food cart without making a food-everywhere mess
-        _transform.DropNextTo(sliceUid, (uid, transform));
+        _transform.DropNextTo(sliceUid, entity);
         _transform.SetLocalRotation(sliceUid, 0);
 
         if (!_container.IsEntityOrParentInContainer(sliceUid))
@@ -134,7 +128,7 @@ public sealed class SliceableFoodSystem : EntitySystem
         return sliceUid;
     }
 
-    private void DeleteFood(EntityUid uid, EntityUid user, FoodComponent foodComp)
+    private void DeleteFood(EntityUid uid, EntityUid user)
     {
         var ev = new BeforeFullySlicedEvent
         {
@@ -144,38 +138,32 @@ public sealed class SliceableFoodSystem : EntitySystem
         if (ev.Cancelled)
             return;
 
-        var dev = new DestructionEventArgs();
-        RaiseLocalEvent(uid, dev);
-
-        // Locate the sliced food and spawn its trash
-        foreach (var trash in foodComp.Trash)
-        {
-            var trashUid = Spawn(trash, _transform.GetMapCoordinates(uid));
-
-            // try putting the trash in the food's container too, to be consistent with slice spawning?
-            _transform.DropNextTo(trashUid, uid);
-            _transform.SetLocalRotation(trashUid, 0);
-        }
-
-        QueueDel(uid);
+        _destroy.DestroyEntity(uid);
     }
 
-    private void FillSlice(EntityUid sliceUid, Solution solution)
+    private void FillSlice(Entity<EdibleComponent?> slice, Solution solution)
     {
-        // Replace all reagents on prototype not just copying poisons (example: slices of eaten pizza should have less nutrition)
-        if (TryComp<FoodComponent>(sliceUid, out var sliceFoodComp) &&
-            _solutionContainer.TryGetSolution(sliceUid, sliceFoodComp.Solution, out var itsSoln, out var itsSolution))
-        {
-            _solutionContainer.RemoveAllSolution(itsSoln.Value);
+        if (!Resolve(slice, ref slice.Comp, false))
+            return;
 
-            var lostSolutionPart = solution.SplitSolution(itsSolution.AvailableVolume);
-            _solutionContainer.TryAddSolution(itsSoln.Value, lostSolutionPart);
-        }
+        // Replace all reagents on prototype not just copying poisons (example: slices of eaten pizza should have less nutrition)
+        if (!_solutionContainer.TryGetSolution(slice.Owner, slice.Comp.Solution, out var itsSoln, out var itsSolution))
+            return;
+
+        _solutionContainer.RemoveAllSolution(itsSoln.Value);
+
+        var lostSolutionPart = solution.SplitSolution(itsSolution.AvailableVolume);
+        _solutionContainer.TryAddSolution(itsSoln.Value, lostSolutionPart);
     }
 
     private void OnComponentStartup(Entity<SliceableFoodComponent> entity, ref ComponentStartup args)
     {
-        var foodComp = EnsureComp<FoodComponent>(entity);
+        // TODO: When Food Component is fully kill delete this awful method
+        // This exists just to make tests fail I guess, awesome!
+        // If you're here because your test just failed, make sure that:
+        // Your food has the edible component
+        // The solution listed in the edible component exists
+        var foodComp = EnsureComp<EdibleComponent>(entity);
         _solutionContainer.EnsureSolution(entity.Owner, foodComp.Solution, out _);
     }
 }
diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs
index 5a269eace5..5de6a5a631 100644
--- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs
+++ b/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs
@@ -22,7 +22,7 @@ namespace Content.Server.Nutrition.EntitySystems
         [Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
         [Dependency] private readonly DamageableSystem _damageableSystem = default!;
         [Dependency] private readonly EmagSystem _emag = default!;
-        [Dependency] private readonly FoodSystem _foodSystem = default!;
+        [Dependency] private readonly IngestionSystem _ingestion = default!;
         [Dependency] private readonly ExplosionSystem _explosionSystem = default!;
         [Dependency] private readonly PopupSystem _popupSystem = default!;
 
@@ -42,7 +42,8 @@ namespace Content.Server.Nutrition.EntitySystems
             if (!args.CanReach
                 || !_solutionContainerSystem.TryGetRefillableSolution(entity.Owner, out _, out var solution)
                 || !HasComp<BloodstreamComponent>(args.Target)
-                || _foodSystem.IsMouthBlocked(args.Target.Value, args.User))
+                || _ingestion.HasMouthAvailable(args.Target.Value, args.User)
+                )
             {
                 return;
             }
diff --git a/Content.Server/Nutrition/Events/DrinkEvents.cs b/Content.Server/Nutrition/Events/DrinkEvents.cs
new file mode 100644
index 0000000000..b7a7403105
--- /dev/null
+++ b/Content.Server/Nutrition/Events/DrinkEvents.cs
@@ -0,0 +1,12 @@
+using Content.Shared.Chemistry.Components;
+
+namespace Content.Server.Nutrition.Events;
+
+/// <summary>
+/// Raised on the entity drinking. This is right before they actually transfer the solution into the stomach.
+/// </summary>
+/// <param name="Drink">The drink that is being drank.</param>
+/// <param name="Solution">The solution that will be digested.</param>
+/// <param name="Forced">Whether the target was forced to drink the solution by somebody else.</param>
+[ByRefEvent]
+public record struct BeforeIngestDrinkEvent(EntityUid Drink, Solution Solution, bool Forced);
diff --git a/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs b/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs
index 808829f6d9..c9e9326c1e 100644
--- a/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs
+++ b/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs
@@ -1,6 +1,5 @@
 using Content.Server.Objectives.Components;
 using Content.Server.Roles;
-using Content.Server.Warps;
 using Content.Shared.Objectives.Components;
 using Content.Shared.Ninja.Components;
 using Content.Shared.Roles;
diff --git a/Content.Server/Payload/EntitySystems/PayloadSystem.cs b/Content.Server/Payload/EntitySystems/PayloadSystem.cs
index 18444bc590..11e97c5b93 100644
--- a/Content.Server/Payload/EntitySystems/PayloadSystem.cs
+++ b/Content.Server/Payload/EntitySystems/PayloadSystem.cs
@@ -1,10 +1,10 @@
 using Content.Server.Administration.Logs;
-using Content.Server.Explosion.EntitySystems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Database;
 using Content.Shared.Examine;
 using Content.Shared.Payload.Components;
 using Content.Shared.Tag;
+using Content.Shared.Trigger;
 using Content.Shared.Chemistry.EntitySystems;
 using Robust.Shared.Containers;
 using Robust.Shared.Serialization.Manager;
@@ -54,18 +54,22 @@ public sealed class PayloadSystem : EntitySystem
 
     private void OnCaseTriggered(EntityUid uid, PayloadCaseComponent component, TriggerEvent args)
     {
+        // TODO: Adjust to the new trigger system
+
         if (!TryComp(uid, out ContainerManagerComponent? contMan))
             return;
 
         // Pass trigger event onto all contained payloads. Payload capacity configurable by construction graphs.
         foreach (var ent in GetAllPayloads(uid, contMan))
         {
-            RaiseLocalEvent(ent, args, false);
+            RaiseLocalEvent(ent, ref args, false);
         }
     }
 
     private void OnTriggerTriggered(EntityUid uid, PayloadTriggerComponent component, TriggerEvent args)
     {
+        // TODO: Adjust to the new trigger system
+
         if (!component.Active)
             return;
 
@@ -75,7 +79,7 @@ public sealed class PayloadSystem : EntitySystem
         // Ensure we don't enter a trigger-loop
         DebugTools.Assert(!_tagSystem.HasTag(uid, PayloadTag));
 
-        RaiseLocalEvent(parent, args, false);
+        RaiseLocalEvent(parent, ref args);
     }
 
     private void OnEntityInserted(EntityUid uid, PayloadCaseComponent _, EntInsertedIntoContainerMessage args)
@@ -146,6 +150,7 @@ public sealed class PayloadSystem : EntitySystem
 
     private void HandleChemicalPayloadTrigger(Entity<ChemicalPayloadComponent> entity, ref TriggerEvent args)
     {
+        // TODO: Adjust to the new trigger system
         if (entity.Comp.BeakerSlotA.Item is not EntityUid beakerA
             || entity.Comp.BeakerSlotB.Item is not EntityUid beakerB
             || !TryComp(beakerA, out FitsInDispenserComponent? compA)
diff --git a/Content.Server/Physics/Controllers/MoverController.cs b/Content.Server/Physics/Controllers/MoverController.cs
index f0a723f3c0..5c87de1863 100644
--- a/Content.Server/Physics/Controllers/MoverController.cs
+++ b/Content.Server/Physics/Controllers/MoverController.cs
@@ -7,6 +7,7 @@ using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Shuttles.Systems;
+using Prometheus;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Player;
 using DroneConsoleComponent = Content.Server.Shuttles.DroneConsoleComponent;
@@ -17,6 +18,10 @@ namespace Content.Server.Physics.Controllers;
 
 public sealed class MoverController : SharedMoverController
 {
+    private static readonly Gauge ActiveMoverGauge = Metrics.CreateGauge(
+        "physics_active_mover_count",
+        "Active amount of InputMovers being processed by MoverController");
+
     [Dependency] private readonly ThrusterSystem _thruster = default!;
     [Dependency] private readonly SharedTransformSystem _xformSystem = default!;
 
@@ -97,6 +102,8 @@ public sealed class MoverController : SharedMoverController
             HandleMobMovement(mover, frameTime);
         }
 
+        ActiveMoverGauge.Set(_movers.Count);
+
         HandleShuttleMovement(frameTime);
     }
 
diff --git a/Content.Server/Pinpointer/NavMapSystem.cs b/Content.Server/Pinpointer/NavMapSystem.cs
index 89e2837b35..2a736b5d50 100644
--- a/Content.Server/Pinpointer/NavMapSystem.cs
+++ b/Content.Server/Pinpointer/NavMapSystem.cs
@@ -2,7 +2,6 @@ using Content.Server.Administration.Logs;
 using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Station.Systems;
-using Content.Server.Warps;
 using Content.Shared.Database;
 using Content.Shared.Examine;
 using Content.Shared.Localizations;
@@ -63,7 +62,6 @@ public sealed partial class NavMapSystem : SharedNavMapSystem
         SubscribeLocalEvent<NavMapBeaconComponent, AnchorStateChangedEvent>(OnNavMapBeaconAnchor);
         SubscribeLocalEvent<ConfigurableNavMapBeaconComponent, NavMapBeaconConfigureBuiMessage>(OnConfigureMessage);
         SubscribeLocalEvent<ConfigurableNavMapBeaconComponent, MapInitEvent>(OnConfigurableMapInit);
-        SubscribeLocalEvent<ConfigurableNavMapBeaconComponent, ExaminedEvent>(OnConfigurableExamined);
     }
 
     private void OnStationInit(StationGridAddedEvent ev)
@@ -224,17 +222,6 @@ public sealed partial class NavMapSystem : SharedNavMapSystem
         UpdateBeaconEnabledVisuals((ent, navMap));
     }
 
-    private void OnConfigurableExamined(Entity<ConfigurableNavMapBeaconComponent> ent, ref ExaminedEvent args)
-    {
-        if (!args.IsInDetailsRange || !TryComp<NavMapBeaconComponent>(ent, out var navMap))
-            return;
-
-        args.PushMarkup(Loc.GetString("nav-beacon-examine-text",
-            ("enabled", navMap.Enabled),
-            ("color", navMap.Color.ToHexNoAlpha()),
-            ("label", navMap.Text ?? string.Empty)));
-    }
-
     #endregion
 
     #region: Grid functions
diff --git a/Content.Server/Polymorph/Components/PolymorphOnTriggerComponent.cs b/Content.Server/Polymorph/Components/PolymorphOnTriggerComponent.cs
deleted file mode 100644
index a11b4f4d4c..0000000000
--- a/Content.Server/Polymorph/Components/PolymorphOnTriggerComponent.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Content.Shared.Polymorph;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Polymorph.Components;
-
-/// <summary>
-/// Intended for use with the trigger system.
-/// Polymorphs the user of the trigger.
-/// </summary>
-[RegisterComponent]
-public sealed partial class PolymorphOnTriggerComponent : Component
-{
-    /// <summary>
-    /// Polymorph settings.
-    /// </summary>
-    [DataField(required: true)]
-    public ProtoId<PolymorphPrototype> Polymorph;
-}
diff --git a/Content.Server/Polymorph/Systems/PolymorphSystem.Map.cs b/Content.Server/Polymorph/Systems/PolymorphSystem.Map.cs
index 1db624439a..fd24ad9774 100644
--- a/Content.Server/Polymorph/Systems/PolymorphSystem.Map.cs
+++ b/Content.Server/Polymorph/Systems/PolymorphSystem.Map.cs
@@ -31,7 +31,9 @@ public sealed partial class PolymorphSystem
         if (PausedMap != null && Exists(PausedMap))
             return;
 
-        PausedMap = _map.CreateMap();
-        _map.SetPaused(PausedMap.Value, true);
+        var mapUid = _map.CreateMap();
+        _metaData.SetEntityName(mapUid, Loc.GetString("polymorph-paused-map-name"));
+        _map.SetPaused(mapUid, true);
+        PausedMap = mapUid;
     }
 }
diff --git a/Content.Server/Polymorph/Systems/PolymorphSystem.Trigger.cs b/Content.Server/Polymorph/Systems/PolymorphSystem.Trigger.cs
deleted file mode 100644
index 452b060315..0000000000
--- a/Content.Server/Polymorph/Systems/PolymorphSystem.Trigger.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Content.Shared.Polymorph;
-using Content.Server.Polymorph.Components;
-using Content.Server.Explosion.EntitySystems;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Polymorph.Systems;
-
-public sealed partial class PolymorphSystem
-{
-    /// <summary>
-    /// Need to do this so we don't get a collection enumeration error in physics by polymorphing
-    /// an entity we're colliding with in case of TriggerOnCollide.
-    /// Also makes sure other trigger effects don't activate in nullspace after we have polymorphed.
-    /// </summary>
-    private Queue<(EntityUid Ent, ProtoId<PolymorphPrototype> Polymorph)> _queuedPolymorphUpdates = new();
-
-    private void InitializeTrigger()
-    {
-        SubscribeLocalEvent<PolymorphOnTriggerComponent, TriggerEvent>(OnTrigger);
-    }
-
-    private void OnTrigger(Entity<PolymorphOnTriggerComponent> ent, ref TriggerEvent args)
-    {
-        if (args.User == null)
-            return;
-
-        _queuedPolymorphUpdates.Enqueue((args.User.Value, ent.Comp.Polymorph));
-        args.Handled = true;
-    }
-
-    public void UpdateTrigger()
-    {
-        while (_queuedPolymorphUpdates.TryDequeue(out var data))
-        {
-            if (TerminatingOrDeleted(data.Item1))
-                continue;
-
-            PolymorphEntity(data.Item1, data.Item2);
-        }
-    }
-}
diff --git a/Content.Server/Polymorph/Systems/PolymorphSystem.cs b/Content.Server/Polymorph/Systems/PolymorphSystem.cs
index 696b19199e..d0f8b4e8fc 100644
--- a/Content.Server/Polymorph/Systems/PolymorphSystem.cs
+++ b/Content.Server/Polymorph/Systems/PolymorphSystem.cs
@@ -53,12 +53,10 @@ public sealed partial class PolymorphSystem : EntitySystem
         SubscribeLocalEvent<PolymorphableComponent, PolymorphActionEvent>(OnPolymorphActionEvent);
         SubscribeLocalEvent<PolymorphedEntityComponent, RevertPolymorphActionEvent>(OnRevertPolymorphActionEvent);
 
-        SubscribeLocalEvent<PolymorphedEntityComponent, BeforeFullyEatenEvent>(OnBeforeFullyEaten);
         SubscribeLocalEvent<PolymorphedEntityComponent, BeforeFullySlicedEvent>(OnBeforeFullySliced);
         SubscribeLocalEvent<PolymorphedEntityComponent, DestructionEventArgs>(OnDestruction);
 
         InitializeMap();
-        InitializeTrigger();
     }
 
     public override void Update(float frameTime)
@@ -85,8 +83,6 @@ public sealed partial class PolymorphSystem : EntitySystem
                 Revert((uid, comp));
             }
         }
-
-        UpdateTrigger();
     }
 
     private void OnComponentStartup(Entity<PolymorphableComponent> ent, ref ComponentStartup args)
@@ -129,16 +125,6 @@ public sealed partial class PolymorphSystem : EntitySystem
         Revert((ent, ent));
     }
 
-    private void OnBeforeFullyEaten(Entity<PolymorphedEntityComponent> ent, ref BeforeFullyEatenEvent args)
-    {
-        var (_, comp) = ent;
-        if (comp.Configuration.RevertOnEat)
-        {
-            args.Cancel();
-            Revert((ent, ent));
-        }
-    }
-
     private void OnBeforeFullySliced(Entity<PolymorphedEntityComponent> ent, ref BeforeFullySlicedEvent args)
     {
         var (_, comp) = ent;
@@ -173,15 +159,18 @@ public sealed partial class PolymorphSystem : EntitySystem
     }
 
     /// <summary>
-    /// Polymorphs the target entity into another
+    /// Polymorphs the target entity into another.
     /// </summary>
     /// <param name="uid">The entity that will be transformed</param>
-    /// <param name="configuration">Polymorph data</param>
-    /// <returns></returns>
+    /// <param name="configuration">The new polymorph configuration</param>
+    /// <returns>The new entity, or null if the polymorph failed.</returns>
     public EntityUid? PolymorphEntity(EntityUid uid, PolymorphConfiguration configuration)
     {
-        // if it's already morphed, don't allow it again with this condition active.
-        if (!configuration.AllowRepeatedMorphs && HasComp<PolymorphedEntityComponent>(uid))
+        // If they're morphed, check their current config to see if they can be
+        // morphed again
+        if (!configuration.IgnoreAllowRepeatedMorphs
+            && TryComp<PolymorphedEntityComponent>(uid, out var currentPoly)
+            && !currentPoly.Configuration.AllowRepeatedMorphs)
             return null;
 
         // If this polymorph has a cooldown, check if that amount of time has passed since the
diff --git a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
index 3829fc34d2..f052c460f5 100644
--- a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
+++ b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
@@ -2,15 +2,14 @@ using System.Linq;
 using Content.Server.Chat.Systems;
 using Content.Server.Interaction;
 using Content.Server.Popups;
-using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Radio.Components;
-using Content.Server.Speech;
-using Content.Server.Speech.Components;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Power;
 using Content.Shared.Radio;
+using Content.Shared.Speech;
+using Content.Shared.Speech.Components;
 using Content.Shared.Chat;
 using Content.Shared.Radio.Components;
 using Robust.Shared.Prototypes;
diff --git a/Content.Server/Rotatable/FlippableComponent.cs b/Content.Server/Rotatable/FlippableComponent.cs
deleted file mode 100644
index 98eb0f6d5c..0000000000
--- a/Content.Server/Rotatable/FlippableComponent.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Server.Rotatable
-{
-    [RegisterComponent]
-    public sealed partial class FlippableComponent : Component
-    {
-        /// <summary>
-        ///     Entity to replace this entity with when the current one is 'flipped'.
-        /// </summary>
-        [DataField("mirrorEntity", required: true, customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-        public string MirrorEntity = default!;
-    }
-}
diff --git a/Content.Server/Rotatable/RotatableSystem.cs b/Content.Server/Rotatable/RotatableSystem.cs
deleted file mode 100644
index 5190b0e92e..0000000000
--- a/Content.Server/Rotatable/RotatableSystem.cs
+++ /dev/null
@@ -1,197 +0,0 @@
-using Content.Server.Popups;
-using Content.Shared.ActionBlocker;
-using Content.Shared.Input;
-using Content.Shared.Interaction;
-using Content.Shared.Rotatable;
-using Content.Shared.Verbs;
-using Robust.Shared.Input.Binding;
-using Robust.Shared.Map;
-using Robust.Shared.Player;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Utility;
-
-namespace Content.Server.Rotatable
-{
-    /// <summary>
-    ///     Handles verbs for the <see cref="RotatableComponent"/> and <see cref="FlippableComponent"/> components.
-    /// </summary>
-    public sealed class RotatableSystem : EntitySystem
-    {
-        [Dependency] private readonly PopupSystem _popup = default!;
-        [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
-        [Dependency] private readonly SharedInteractionSystem _interaction = default!;
-        [Dependency] private readonly SharedTransformSystem _transform = default!;
-
-        public override void Initialize()
-        {
-            SubscribeLocalEvent<FlippableComponent, GetVerbsEvent<Verb>>(AddFlipVerb);
-            SubscribeLocalEvent<RotatableComponent, GetVerbsEvent<Verb>>(AddRotateVerbs);
-
-            CommandBinds.Builder
-                .Bind(ContentKeyFunctions.RotateObjectClockwise, new PointerInputCmdHandler(HandleRotateObjectClockwise))
-                .Bind(ContentKeyFunctions.RotateObjectCounterclockwise, new PointerInputCmdHandler(HandleRotateObjectCounterclockwise))
-                .Bind(ContentKeyFunctions.FlipObject, new PointerInputCmdHandler(HandleFlipObject))
-                .Register<RotatableSystem>();
-        }
-
-        private void AddFlipVerb(EntityUid uid, FlippableComponent component, GetVerbsEvent<Verb> args)
-        {
-            if (!args.CanAccess
-                || !args.CanInteract
-                || !args.CanComplexInteract)
-                return;
-
-            // Check if the object is anchored.
-            if (TryComp(uid, out PhysicsComponent? physics) && physics.BodyType == BodyType.Static)
-                return;
-
-            Verb verb = new()
-            {
-                Act = () => Flip(uid, component),
-                Text = Loc.GetString("flippable-verb-get-data-text"),
-                Category = VerbCategory.Rotate,
-                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/flip.svg.192dpi.png")),
-                Priority = -3, // show flip last
-                DoContactInteraction = true
-            };
-            args.Verbs.Add(verb);
-        }
-
-        private void AddRotateVerbs(EntityUid uid, RotatableComponent component, GetVerbsEvent<Verb> args)
-        {
-            if (!args.CanAccess
-                || !args.CanInteract
-                || !args.CanComplexInteract
-                || Transform(uid).NoLocalRotation) // Good ol prototype inheritance, eh?
-                return;
-
-            // Check if the object is anchored, and whether we are still allowed to rotate it.
-            if (!component.RotateWhileAnchored &&
-                TryComp(uid, out PhysicsComponent? physics) &&
-                physics.BodyType == BodyType.Static)
-                return;
-
-            Verb resetRotation = new()
-            {
-                DoContactInteraction = true,
-                Act = () => Comp<TransformComponent>(uid).LocalRotation = Angle.Zero,
-                Category = VerbCategory.Rotate,
-                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/refresh.svg.192dpi.png")),
-                Text = "Reset",
-                Priority = -2, // show CCW, then CW, then reset
-                CloseMenu = false,
-            };
-            args.Verbs.Add(resetRotation);
-
-            // rotate clockwise
-            Verb rotateCW = new()
-            {
-                Act = () => Comp<TransformComponent>(uid).LocalRotation -= component.Increment,
-                Category = VerbCategory.Rotate,
-                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/rotate_cw.svg.192dpi.png")),
-                Priority = -1,
-                CloseMenu = false, // allow for easy double rotations.
-            };
-            args.Verbs.Add(rotateCW);
-
-            // rotate counter-clockwise
-            Verb rotateCCW = new()
-            {
-                Act = () => Comp<TransformComponent>(uid).LocalRotation += component.Increment,
-                Category = VerbCategory.Rotate,
-                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/rotate_ccw.svg.192dpi.png")),
-                Priority = 0,
-                CloseMenu = false, // allow for easy double rotations.
-            };
-            args.Verbs.Add(rotateCCW);
-        }
-
-        /// <summary>
-        ///     Replace a flippable entity with it's flipped / mirror-symmetric entity.
-        /// </summary>
-        public void Flip(EntityUid uid, FlippableComponent component)
-        {
-            var oldTransform = Comp<TransformComponent>(uid);
-            var entity = Spawn(component.MirrorEntity, oldTransform.Coordinates);
-            var newTransform = Comp<TransformComponent>(entity);
-            newTransform.LocalRotation = oldTransform.LocalRotation;
-            _transform.Unanchor(entity, newTransform);
-            Del(uid);
-        }
-
-        public bool HandleRotateObjectClockwise(ICommonSession? playerSession, EntityCoordinates coordinates, EntityUid entity)
-        {
-            if (playerSession?.AttachedEntity is not { Valid: true } player || !Exists(player))
-                return false;
-
-            if (!TryComp<RotatableComponent>(entity, out var rotatableComp))
-                return false;
-
-            if (!_actionBlocker.CanInteract(player, entity)
-                || !_actionBlocker.CanComplexInteract(player)
-                || !_interaction.InRangeAndAccessible(player, entity))
-                return false;
-
-            // Check if the object is anchored, and whether we are still allowed to rotate it.
-            if (!rotatableComp.RotateWhileAnchored && TryComp(entity, out PhysicsComponent? physics) &&
-                physics.BodyType == BodyType.Static)
-            {
-                _popup.PopupEntity(Loc.GetString("rotatable-component-try-rotate-stuck"), entity, player);
-                return false;
-            }
-
-            Transform(entity).LocalRotation -= rotatableComp.Increment;
-            return true;
-        }
-
-        public bool HandleRotateObjectCounterclockwise(ICommonSession? playerSession, EntityCoordinates coordinates, EntityUid entity)
-        {
-            if (playerSession?.AttachedEntity is not { Valid: true } player || !Exists(player))
-                return false;
-
-            if (!TryComp<RotatableComponent>(entity, out var rotatableComp))
-                return false;
-
-            if (!_actionBlocker.CanInteract(player, entity)
-                || !_actionBlocker.CanComplexInteract(player)
-                || !_interaction.InRangeAndAccessible(player, entity))
-                return false;
-
-            // Check if the object is anchored, and whether we are still allowed to rotate it.
-            if (!rotatableComp.RotateWhileAnchored && TryComp(entity, out PhysicsComponent? physics) &&
-                physics.BodyType == BodyType.Static)
-            {
-                _popup.PopupEntity(Loc.GetString("rotatable-component-try-rotate-stuck"), entity, player);
-                return false;
-            }
-
-            Transform(entity).LocalRotation += rotatableComp.Increment;
-            return true;
-        }
-
-        public bool HandleFlipObject(ICommonSession? playerSession, EntityCoordinates coordinates, EntityUid entity)
-        {
-            if (playerSession?.AttachedEntity is not { Valid: true } player || !Exists(player))
-                return false;
-
-            if (!TryComp<FlippableComponent>(entity, out var flippableComp))
-                return false;
-
-            if (!_actionBlocker.CanInteract(player, entity)
-                || !_actionBlocker.CanComplexInteract(player)
-                || !_interaction.InRangeAndAccessible(player, entity))
-                return false;
-
-            // Check if the object is anchored.
-            if (TryComp(entity, out PhysicsComponent? physics) && physics.BodyType == BodyType.Static)
-            {
-                _popup.PopupEntity(Loc.GetString("flippable-component-try-flip-is-stuck"), entity, player);
-                return false;
-            }
-
-            Flip(entity, flippableComp);
-            return true;
-        }
-    }
-}
diff --git a/Content.Server/Salvage/Expeditions/SalvageStructureComponent.cs b/Content.Server/Salvage/Expeditions/SalvageStructureComponent.cs
deleted file mode 100644
index f79d33412a..0000000000
--- a/Content.Server/Salvage/Expeditions/SalvageStructureComponent.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Content.Server.Salvage.Expeditions.Structure;
-
-/// <summary>
-/// Mission objective for salvage expeditions.
-/// </summary>
-[RegisterComponent, Access(typeof(SalvageSystem))]
-public sealed partial class SalvageStructureComponent : Component
-{
-
-}
diff --git a/Content.Server/Salvage/SalvageSystem.Expeditions.cs b/Content.Server/Salvage/SalvageSystem.Expeditions.cs
index aa31c465f8..adc97ac824 100644
--- a/Content.Server/Salvage/SalvageSystem.Expeditions.cs
+++ b/Content.Server/Salvage/SalvageSystem.Expeditions.cs
@@ -1,17 +1,13 @@
 using System.Linq;
 using System.Threading;
 using Content.Server.Salvage.Expeditions;
-using Content.Server.Salvage.Expeditions.Structure;
 using Content.Shared.CCVar;
 using Content.Shared.Examine;
-using Content.Shared.Random.Helpers;
 using Content.Shared.Salvage.Expeditions;
 using Content.Shared.Shuttles.Components;
-using Robust.Shared.Audio;
 using Robust.Shared.CPUJob.JobQueues;
 using Robust.Shared.CPUJob.JobQueues.Queues;
 using Robust.Shared.GameStates;
-using Robust.Shared.Map;
 
 namespace Content.Server.Salvage;
 
@@ -39,8 +35,6 @@ public sealed partial class SalvageSystem
         SubscribeLocalEvent<SalvageExpeditionComponent, ComponentShutdown>(OnExpeditionShutdown);
         SubscribeLocalEvent<SalvageExpeditionComponent, ComponentGetState>(OnExpeditionGetState);
 
-        SubscribeLocalEvent<SalvageStructureComponent, ExaminedEvent>(OnStructureExamine);
-
         _cooldown = _configurationManager.GetCVar(CCVars.SalvageExpeditionCooldown);
         Subs.CVar(_configurationManager, CCVars.SalvageExpeditionCooldown, SetCooldownChange);
     }
@@ -189,9 +183,4 @@ public sealed partial class SalvageSystem
         _salvageJobs.Add((job, cancelToken));
         _salvageQueue.EnqueueJob(job);
     }
-
-    private void OnStructureExamine(EntityUid uid, SalvageStructureComponent component, ExaminedEvent args)
-    {
-        args.PushMarkup(Loc.GetString("salvage-expedition-structure-examine"));
-    }
 }
diff --git a/Content.Server/Salvage/SpawnSalvageMissionJob.cs b/Content.Server/Salvage/SpawnSalvageMissionJob.cs
index 75b22598f9..f212fa4a83 100644
--- a/Content.Server/Salvage/SpawnSalvageMissionJob.cs
+++ b/Content.Server/Salvage/SpawnSalvageMissionJob.cs
@@ -11,7 +11,6 @@ using Content.Server.Ghost.Roles.Components;
 using Content.Server.Parallax;
 using Content.Server.Procedural;
 using Content.Server.Salvage.Expeditions;
-using Content.Server.Salvage.Expeditions.Structure;
 using Content.Shared.Atmos;
 using Content.Shared.Construction.EntitySystems;
 using Content.Shared.Dataset;
diff --git a/Content.Server/Sandbox/Commands/ColorNetworkCommand.cs b/Content.Server/Sandbox/Commands/ColorNetworkCommand.cs
index 89c1182eae..8237ccb2eb 100644
--- a/Content.Server/Sandbox/Commands/ColorNetworkCommand.cs
+++ b/Content.Server/Sandbox/Commands/ColorNetworkCommand.cs
@@ -1,6 +1,6 @@
 using Content.Server.Administration.Managers;
-using Content.Shared.Atmos.Components;
-using Content.Shared.Atmos.EntitySystems;
+using Content.Server.Atmos.Piping.Components;
+using Content.Server.Atmos.Piping.EntitySystems;
 using Content.Shared.Administration;
 using Content.Shared.NodeContainer;
 using Content.Shared.NodeContainer.NodeGroups;
@@ -78,7 +78,7 @@ namespace Content.Server.Sandbox.Commands
                 if (!EntityManager.TryGetComponent(x.Owner, out AtmosPipeColorComponent? atmosPipeColorComponent))
                     continue;
 
-                _pipeColorSystem.SetColor((x.Owner, atmosPipeColorComponent), color);
+                _pipeColorSystem.SetColor(x.Owner, atmosPipeColorComponent, color);
             }
         }
     }
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs b/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs
index e950d3f288..debed525f6 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs
@@ -119,7 +119,7 @@ public sealed partial class BorgSystem
 
         var message = Loc.GetString(ent.Comp.DestroyingPopup, ("name", Name(ent)));
         Popup.PopupEntity(message, ent);
-        _trigger.StartTimer(ent.Owner, user: null);
+        _trigger.ActivateTimerTrigger(ent.Owner);
 
         // prevent a shitter borg running into people
         RemComp<InputMoverComponent>(ent);
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.cs b/Content.Server/Silicons/Borgs/BorgSystem.cs
index 0cd407000f..f33b71c54e 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.cs
@@ -4,7 +4,6 @@ using Content.Server.Actions;
 using Content.Server.Administration.Logs;
 using Content.Server.Administration.Managers;
 using Content.Server.DeviceNetwork.Systems;
-using Content.Server.Explosion.EntitySystems;
 using Content.Server.Hands.Systems;
 using Content.Server.PowerCell;
 using Content.Shared.Alert;
@@ -25,6 +24,7 @@ using Content.Shared.Roles;
 using Content.Shared.Silicons.Borgs;
 using Content.Shared.Silicons.Borgs.Components;
 using Content.Shared.Throwing;
+using Content.Shared.Trigger.Systems;
 using Content.Shared.Whitelist;
 using Content.Shared.Wires;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Singularity/EntitySystems/EmitterSystem.cs b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs
index 662df43e12..28d3eedd32 100644
--- a/Content.Server/Singularity/EntitySystems/EmitterSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs
@@ -7,7 +7,6 @@ using Content.Server.Projectiles;
 using Content.Server.Weapons.Ranged.Systems;
 using Content.Shared.Database;
 using Content.Shared.DeviceLinking.Events;
-using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Lock;
 using Content.Shared.Popups;
@@ -15,9 +14,7 @@ using Content.Shared.Power;
 using Content.Shared.Projectiles;
 using Content.Shared.Singularity.Components;
 using Content.Shared.Singularity.EntitySystems;
-using Content.Shared.Verbs;
 using Content.Shared.Weapons.Ranged.Components;
-using JetBrains.Annotations;
 using Robust.Shared.Map;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
@@ -28,7 +25,6 @@ using Timer = Robust.Shared.Timing.Timer;
 
 namespace Content.Server.Singularity.EntitySystems
 {
-    [UsedImplicitly]
     public sealed class EmitterSystem : SharedEmitterSystem
     {
         [Dependency] private readonly IRobustRandom _random = default!;
@@ -46,8 +42,6 @@ namespace Content.Server.Singularity.EntitySystems
             SubscribeLocalEvent<EmitterComponent, PowerConsumerReceivedChanged>(ReceivedChanged);
             SubscribeLocalEvent<EmitterComponent, PowerChangedEvent>(OnApcChanged);
             SubscribeLocalEvent<EmitterComponent, ActivateInWorldEvent>(OnActivate);
-            SubscribeLocalEvent<EmitterComponent, GetVerbsEvent<Verb>>(OnGetVerb);
-            SubscribeLocalEvent<EmitterComponent, ExaminedEvent>(OnExamined);
             SubscribeLocalEvent<EmitterComponent, AnchorStateChangedEvent>(OnAnchorStateChanged);
             SubscribeLocalEvent<EmitterComponent, SignalReceivedEvent>(OnSignalReceived);
         }
@@ -99,47 +93,6 @@ namespace Content.Server.Singularity.EntitySystems
             }
         }
 
-        private void OnGetVerb(EntityUid uid, EmitterComponent component, GetVerbsEvent<Verb> args)
-        {
-            if (!args.CanAccess || !args.CanInteract || !args.CanComplexInteract || args.Hands == null)
-                return;
-
-            if (TryComp<LockComponent>(uid, out var lockComp) && lockComp.Locked)
-                return;
-
-            if (component.SelectableTypes.Count < 2)
-                return;
-
-            foreach (var type in component.SelectableTypes)
-            {
-                var proto = _prototype.Index<EntityPrototype>(type);
-
-                var v = new Verb
-                {
-                    Priority = 1,
-                    Category = VerbCategory.SelectType,
-                    Text = proto.Name,
-                    Disabled = type == component.BoltType,
-                    Impact = LogImpact.Medium,
-                    DoContactInteraction = true,
-                    Act = () =>
-                    {
-                        component.BoltType = type;
-                        _popup.PopupEntity(Loc.GetString("emitter-component-type-set", ("type", proto.Name)), uid);
-                    }
-                };
-                args.Verbs.Add(v);
-            }
-        }
-
-        private void OnExamined(EntityUid uid, EmitterComponent component, ExaminedEvent args)
-        {
-            if (component.SelectableTypes.Count < 2)
-                return;
-            var proto = _prototype.Index<EntityPrototype>(component.BoltType);
-            args.PushMarkup(Loc.GetString("emitter-component-current-type", ("type", proto.Name)));
-        }
-
         private void ReceivedChanged(
             EntityUid uid,
             EmitterComponent component,
diff --git a/Content.Server/Sound/Components/EmitSoundOnTriggerComponent.cs b/Content.Server/Sound/Components/EmitSoundOnTriggerComponent.cs
deleted file mode 100644
index 5338351948..0000000000
--- a/Content.Server/Sound/Components/EmitSoundOnTriggerComponent.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Content.Server.Explosion.EntitySystems;
-using Content.Shared.Sound.Components;
-
-namespace Content.Server.Sound.Components
-{
-    /// <summary>
-    /// Whenever a <see cref="TriggerEvent"/> is run play a sound in PVS range.
-    /// </summary>
-    [RegisterComponent]
-    public sealed partial class EmitSoundOnTriggerComponent : BaseEmitSoundComponent
-    {
-    }
-}
diff --git a/Content.Server/Sound/EmitSoundSystem.cs b/Content.Server/Sound/EmitSoundSystem.cs
index 9d7e8496c3..1720d67d02 100644
--- a/Content.Server/Sound/EmitSoundSystem.cs
+++ b/Content.Server/Sound/EmitSoundSystem.cs
@@ -1,6 +1,3 @@
-using Content.Server.Explosion.EntitySystems;
-using Content.Server.Sound.Components;
-using Content.Shared.UserInterface;
 using Content.Shared.Sound;
 using Content.Shared.Sound.Components;
 using Robust.Shared.Timing;
@@ -38,16 +35,9 @@ public sealed class EmitSoundSystem : SharedEmitSoundSystem
     {
         base.Initialize();
 
-        SubscribeLocalEvent<EmitSoundOnTriggerComponent, TriggerEvent>(HandleEmitSoundOnTrigger);
         SubscribeLocalEvent<SpamEmitSoundComponent, MapInitEvent>(HandleSpamEmitSoundMapInit);
     }
 
-    private void HandleEmitSoundOnTrigger(EntityUid uid, EmitSoundOnTriggerComponent component, TriggerEvent args)
-    {
-        TryEmitSound(uid, component, args.User, false);
-        args.Handled = true;
-    }
-
     private void HandleSpamEmitSoundMapInit(Entity<SpamEmitSoundComponent> entity, ref MapInitEvent args)
     {
         SpamEmitSoundReset(entity);
diff --git a/Content.Server/Speech/Components/ActiveListenerComponent.cs b/Content.Server/Speech/Components/ActiveListenerComponent.cs
deleted file mode 100644
index 4553fafa51..0000000000
--- a/Content.Server/Speech/Components/ActiveListenerComponent.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Content.Server.Chat.Systems;
-
-namespace Content.Server.Speech.Components;
-
-/// <summary>
-///     This component is used to relay speech events to other systems.
-/// </summary>
-[RegisterComponent]
-public sealed partial class ActiveListenerComponent : Component
-{
-    [DataField("range")]
-    public float Range = ChatSystem.VoiceRange;
-}
diff --git a/Content.Server/Speech/EntitySystems/BlockListeningSystem.cs b/Content.Server/Speech/EntitySystems/BlockListeningSystem.cs
index a13eda1f73..6b09877512 100644
--- a/Content.Server/Speech/EntitySystems/BlockListeningSystem.cs
+++ b/Content.Server/Speech/EntitySystems/BlockListeningSystem.cs
@@ -1,4 +1,5 @@
 using Content.Server.Speech.Components;
+using Content.Shared.Speech;
 
 namespace Content.Server.Speech.EntitySystems;
 
diff --git a/Content.Server/Speech/EntitySystems/ListeningSystem.cs b/Content.Server/Speech/EntitySystems/ListeningSystem.cs
index ea3569e055..17513d80e7 100644
--- a/Content.Server/Speech/EntitySystems/ListeningSystem.cs
+++ b/Content.Server/Speech/EntitySystems/ListeningSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.Chat.Systems;
-using Content.Server.Speech.Components;
+using Content.Shared.Speech;
+using Content.Shared.Speech.Components;
 
 namespace Content.Server.Speech.EntitySystems;
 
diff --git a/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs b/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs
index 5b215e9bea..c285063d2d 100644
--- a/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs
@@ -19,9 +19,21 @@ namespace Content.Server.Speech.EntitySystems
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly ILocalizationManager _loc = default!;
 
+        private readonly Dictionary<ProtoId<ReplacementAccentPrototype>, (Regex regex, string replacement)[]>
+            _cachedReplacements = new();
+
         public override void Initialize()
         {
             SubscribeLocalEvent<ReplacementAccentComponent, AccentGetEvent>(OnAccent);
+
+            _proto.PrototypesReloaded += OnPrototypesReloaded;
+        }
+
+        public override void Shutdown()
+        {
+            base.Shutdown();
+
+            _proto.PrototypesReloaded -= OnPrototypesReloaded;
         }
 
         private void OnAccent(EntityUid uid, ReplacementAccentComponent component, AccentGetEvent args)
@@ -48,27 +60,22 @@ namespace Content.Server.Speech.EntitySystems
                 return prototype.FullReplacements.Length != 0 ? Loc.GetString(_random.Pick(prototype.FullReplacements)) : "";
             }
 
-            if (prototype.WordReplacements == null)
-                return message;
-
             // Prohibition of repeated word replacements.
             // All replaced words placed in the final message are placed here as dashes (___) with the same length.
             // The regex search goes through this buffer message, from which the already replaced words are crossed out,
             // ensuring that the replaced words cannot be replaced again.
             var maskMessage = message;
 
-            foreach (var (first, replace) in prototype.WordReplacements)
+            foreach (var (regex, replace) in GetCachedReplacements(prototype))
             {
-                var f = _loc.GetString(first);
-                var r = _loc.GetString(replace);
                 // this is kind of slow but its not that bad
                 // essentially: go over all matches, try to match capitalization where possible, then replace
                 // rather than using regex.replace
-                for (int i = Regex.Count(maskMessage, $@"(?<!\w){f}(?!\w)", RegexOptions.IgnoreCase); i > 0; i--)
+                for (int i = regex.Count(maskMessage); i > 0; i--)
                 {
                     // fetch the match again as the character indices may have changed
-                    Match match = Regex.Match(maskMessage, $@"(?<!\w){f}(?!\w)", RegexOptions.IgnoreCase);
-                    var replacement = r;
+                    Match match = regex.Match(maskMessage);
+                    var replacement = replace;
 
                     // Intelligently replace capitalization
                     // two cases where we will do so:
@@ -98,5 +105,40 @@ namespace Content.Server.Speech.EntitySystems
 
             return message;
         }
+
+        private (Regex regex, string replacement)[] GetCachedReplacements(ReplacementAccentPrototype prototype)
+        {
+            if (!_cachedReplacements.TryGetValue(prototype.ID, out var replacements))
+            {
+                replacements = GenerateCachedReplacements(prototype);
+                _cachedReplacements.Add(prototype.ID, replacements);
+            }
+
+            return replacements;
+        }
+
+        private (Regex regex, string replacement)[] GenerateCachedReplacements(ReplacementAccentPrototype prototype)
+        {
+            if (prototype.WordReplacements is not { } replacements)
+                return [];
+
+            return replacements.Select(kv =>
+                {
+                    var (first, replace) = kv;
+                    var firstLoc = _loc.GetString(first);
+                    var replaceLoc = _loc.GetString(replace);
+
+                    var regex = new Regex($@"(?<!\w){firstLoc}(?!\w)", RegexOptions.IgnoreCase);
+
+                    return (regex, replaceLoc);
+
+                })
+                .ToArray();
+        }
+
+        private void OnPrototypesReloaded(PrototypesReloadedEventArgs obj)
+        {
+            _cachedReplacements.Clear();
+        }
     }
 }
diff --git a/Content.Server/Speech/EntitySystems/VocalSystem.cs b/Content.Server/Speech/EntitySystems/VocalSystem.cs
index fb88238288..275140ff5b 100644
--- a/Content.Server/Speech/EntitySystems/VocalSystem.cs
+++ b/Content.Server/Speech/EntitySystems/VocalSystem.cs
@@ -2,6 +2,7 @@ using Content.Server.Actions;
 using Content.Server.Chat.Systems;
 using Content.Server.Speech.Components;
 using Content.Shared.Chat.Prototypes;
+using Content.Shared.Cloning.Events;
 using Content.Shared.Humanoid;
 using Content.Shared.Speech;
 using Content.Shared.Speech.Components;
@@ -31,6 +32,25 @@ public sealed class VocalSystem : EntitySystem
         SubscribeLocalEvent<VocalComponent, ScreamActionEvent>(OnScreamAction);
     }
 
+    /// <summary>
+    /// Copy this component's datafields from one entity to another.
+    /// This can't use CopyComp because of the ScreamActionEntity DataField, which should not be copied.
+    /// <summary>
+    public void CopyComponent(Entity<VocalComponent?> source, EntityUid target)
+    {
+        if (!Resolve(source, ref source.Comp))
+            return;
+
+        var targetComp = EnsureComp<VocalComponent>(target);
+        targetComp.Sounds = source.Comp.Sounds;
+        targetComp.ScreamId = source.Comp.ScreamId;
+        targetComp.Wilhelm = source.Comp.Wilhelm;
+        targetComp.WilhelmProbability = source.Comp.WilhelmProbability;
+        LoadSounds(target, targetComp);
+
+        Dirty(target, targetComp);
+    }
+
     private void OnMapInit(EntityUid uid, VocalComponent component, MapInitEvent args)
     {
         // try to add scream action when vocal comp added
diff --git a/Content.Server/Speech/Muting/MutingSystem.cs b/Content.Server/Speech/Muting/MutingSystem.cs
index edf82bbfb2..f588e2238d 100644
--- a/Content.Server/Speech/Muting/MutingSystem.cs
+++ b/Content.Server/Speech/Muting/MutingSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Abilities.Mime;
+using Content.Shared.Abilities.Mime;
 using Content.Server.Chat.Systems;
 using Content.Server.Popups;
 using Content.Server.Speech.Components;
diff --git a/Content.Server/SprayPainter/SprayPainterSystem.cs b/Content.Server/SprayPainter/SprayPainterSystem.cs
index a5e08a91a6..24ab5e0ea2 100644
--- a/Content.Server/SprayPainter/SprayPainterSystem.cs
+++ b/Content.Server/SprayPainter/SprayPainterSystem.cs
@@ -1,5 +1,5 @@
-using Content.Shared.Atmos.Components;
-using Content.Shared.Atmos.EntitySystems;
+using Content.Server.Atmos.Piping.Components;
+using Content.Server.Atmos.Piping.EntitySystems;
 using Content.Server.Charges;
 using Content.Server.Decals;
 using Content.Server.Destructible;
@@ -147,7 +147,7 @@ public sealed class SprayPainterSystem : SharedSprayPainterSystem
             return;
 
         Audio.PlayPvs(ent.Comp.SpraySound, ent);
-        _pipeColor.SetColor((target, color), args.Color);
+        _pipeColor.SetColor(target, color, args.Color);
 
         args.Handled = true;
     }
diff --git a/Content.Server/Sprite/ScaleVisualsSystem.cs b/Content.Server/Sprite/ScaleVisualsSystem.cs
new file mode 100644
index 0000000000..53e9233e60
--- /dev/null
+++ b/Content.Server/Sprite/ScaleVisualsSystem.cs
@@ -0,0 +1,5 @@
+using Content.Shared.Sprite;
+
+namespace Content.Server.Sprite;
+
+public sealed class ScaleVisualsSystem : SharedScaleVisualsSystem;
diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs
index 4deb5238a5..4029488159 100644
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs
@@ -1,6 +1,6 @@
 using Content.Server.Chat.Systems;
-using Content.Server.Speech;
-using Content.Server.Speech.Components;
+using Content.Shared.Speech;
+using Content.Shared.Speech.Components;
 using Content.Shared.Whitelist;
 using Robust.Shared.Player;
 using static Content.Server.Chat.Systems.ChatSystem;
diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
index 624f414d78..2a288d9017 100644
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
@@ -1,6 +1,8 @@
+using Content.Server.Administration.Logs;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.Emp;
 using Content.Shared.ActionBlocker;
+using Content.Shared.Database;
 using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Events;
 using Content.Shared.Power;
@@ -21,6 +23,8 @@ public sealed class SurveillanceCameraSystem : EntitySystem
     [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!;
     [Dependency] private readonly UserInterfaceSystem _userInterface = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+
 
     // Pings a surveillance camera subnet. All cameras will always respond
     // with a data message if they are on the same subnet.
@@ -170,6 +174,7 @@ public sealed class SurveillanceCameraSystem : EntitySystem
         component.CameraId = args.Name;
         component.NameSet = true;
         UpdateSetupInterface(uid, component);
+        _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,
diff --git a/Content.Server/Tabletop/TabletopSystem.Map.cs b/Content.Server/Tabletop/TabletopSystem.Map.cs
index 5e116d81ef..89563ec6bf 100644
--- a/Content.Server/Tabletop/TabletopSystem.Map.cs
+++ b/Content.Server/Tabletop/TabletopSystem.Map.cs
@@ -37,7 +37,7 @@ namespace Content.Server.Tabletop
         /// <returns></returns>
         private Vector2 GetNextTabletopPosition()
         {
-            return UlamSpiral(_tabletops++) * TabletopSeparation;
+            return UlamSpiral(++_tabletops) * TabletopSeparation;
         }
 
         /// <summary>
@@ -62,11 +62,11 @@ namespace Content.Server.Tabletop
         /// <summary>
         ///     Algorithm for mapping scalars to 2D positions in the same pattern as an Ulam Spiral.
         /// </summary>
-        /// <param name="n">Scalar to map to a 2D position.</param>
+        /// <param name="n">Scalar to map to a 2D position. Must be greater than or equal to 1.</param>
         /// <returns>The mapped 2D position for the scalar.</returns>
         private Vector2i UlamSpiral(int n)
         {
-            var k = (int)MathF.Ceiling(MathF.Sqrt(n) - 1) / 2;
+            var k = (int)MathF.Ceiling((MathF.Sqrt(n) - 1) / 2);
             var t = 2 * k + 1;
             var m = (int)MathF.Pow(t, 2);
             t--;
diff --git a/Content.Server/Telephone/TelephoneSystem.cs b/Content.Server/Telephone/TelephoneSystem.cs
index 4c87707cc6..46f45d1286 100644
--- a/Content.Server/Telephone/TelephoneSystem.cs
+++ b/Content.Server/Telephone/TelephoneSystem.cs
@@ -3,8 +3,6 @@ using Content.Server.Administration.Logs;
 using Content.Server.Chat.Systems;
 using Content.Server.Interaction;
 using Content.Server.Power.EntitySystems;
-using Content.Server.Speech;
-using Content.Server.Speech.Components;
 using Content.Shared.Chat;
 using Content.Shared.Database;
 using Content.Shared.Labels.Components;
@@ -13,6 +11,7 @@ using Content.Shared.Power;
 using Content.Shared.Silicons.StationAi;
 using Content.Shared.Silicons.Borgs.Components;
 using Content.Shared.Speech;
+using Content.Shared.Speech.Components;
 using Content.Shared.Telephone;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
diff --git a/Content.Server/Tips/TipsSystem.cs b/Content.Server/Tips/TipsSystem.cs
index effbb7ba87..cd7f7b52f5 100644
--- a/Content.Server/Tips/TipsSystem.cs
+++ b/Content.Server/Tips/TipsSystem.cs
@@ -68,9 +68,13 @@ public sealed class TipsSystem : EntitySystem
     {
         return args.Length switch
         {
-            1 => CompletionResult.FromHintOptions(CompletionHelper.SessionNames(), Loc.GetString("cmd-tippy-auto-1")),
+            1 => CompletionResult.FromHintOptions(
+                CompletionHelper.SessionNames(players: _playerManager),
+                Loc.GetString("cmd-tippy-auto-1")),
             2 => CompletionResult.FromHint(Loc.GetString("cmd-tippy-auto-2")),
-            3 => CompletionResult.FromHintOptions(CompletionHelper.PrototypeIDs<EntityPrototype>(), Loc.GetString("cmd-tippy-auto-3")),
+            3 => CompletionResult.FromHintOptions(
+                CompletionHelper.PrototypeIdsLimited<EntityPrototype>(args[2], _prototype),
+                Loc.GetString("cmd-tippy-auto-3")),
             4 => CompletionResult.FromHint(Loc.GetString("cmd-tippy-auto-4")),
             5 => CompletionResult.FromHint(Loc.GetString("cmd-tippy-auto-5")),
             6 => CompletionResult.FromHint(Loc.GetString("cmd-tippy-auto-6")),
diff --git a/Content.Server/Toilet/ToiletSystem.cs b/Content.Server/Toilet/ToiletSystem.cs
deleted file mode 100644
index e184ddf0d5..0000000000
--- a/Content.Server/Toilet/ToiletSystem.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Content.Shared.Toilet.Systems;
-
-namespace Content.Server.Toilet;
-
-public sealed class ToiletSystem : SharedToiletSystem
-{
-
-}
diff --git a/Content.Server/Tools/ToolSystem.cs b/Content.Server/Tools/ToolSystem.cs
index a88dbd3653..c8defb5ef9 100644
--- a/Content.Server/Tools/ToolSystem.cs
+++ b/Content.Server/Tools/ToolSystem.cs
@@ -1,47 +1,5 @@
-using Content.Shared.Chemistry.Components.SolutionManager;
-using Content.Shared.FixedPoint;
-using Content.Shared.Tools.Components;
-
-using SharedToolSystem = Content.Shared.Tools.Systems.SharedToolSystem;
+using Content.Shared.Tools.Systems;
 
 namespace Content.Server.Tools;
 
-public sealed class ToolSystem : SharedToolSystem
-{
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        UpdateWelders(frameTime);
-    }
-
-    //todo move to shared once you can remove reagents from shared without it freaking out.
-    private void UpdateWelders(float frameTime)
-    {
-        var query = EntityQueryEnumerator<WelderComponent, SolutionContainerManagerComponent>();
-        while (query.MoveNext(out var uid, out var welder, out var solutionContainer))
-        {
-            if (!welder.Enabled)
-                continue;
-
-            welder.WelderTimer += frameTime;
-
-            if (welder.WelderTimer < welder.WelderUpdateTimer)
-                continue;
-
-            if (!SolutionContainerSystem.TryGetSolution((uid, solutionContainer), welder.FuelSolutionName, out var solutionComp, out var solution))
-                continue;
-
-            SolutionContainerSystem.RemoveReagent(solutionComp.Value, welder.FuelReagent, welder.FuelConsumption * welder.WelderTimer);
-
-            if (solution.GetTotalPrototypeQuantity(welder.FuelReagent) <= FixedPoint2.Zero)
-            {
-                ItemToggle.Toggle(uid, predicted: false);
-            }
-
-            Dirty(uid, welder);
-            welder.WelderTimer -= welder.WelderUpdateTimer;
-        }
-    }
-}
-
+public sealed class ToolSystem : SharedToolSystem;
diff --git a/Content.Server/Toolshed/Commands/Misc/ScaleCommand.cs b/Content.Server/Toolshed/Commands/Misc/ScaleCommand.cs
new file mode 100644
index 0000000000..67bd21737f
--- /dev/null
+++ b/Content.Server/Toolshed/Commands/Misc/ScaleCommand.cs
@@ -0,0 +1,82 @@
+using System.Numerics;
+using Content.Server.Administration;
+using Content.Shared.Administration;
+using Content.Shared.Sprite;
+using Robust.Shared.Physics.Systems;
+using Robust.Shared.Toolshed;
+
+namespace Content.Server.Toolshed.Commands.Misc;
+
+/// <summary>
+/// Used to change an entity's sprite scale.
+/// </summary>
+[ToolshedCommand, AdminCommand(AdminFlags.VarEdit)]
+public sealed class ScaleCommand : ToolshedCommand
+{
+    private SharedScaleVisualsSystem? _scaleVisuals;
+    private SharedPhysicsSystem? _physics;
+
+    [CommandImplementation("set")]
+    public IEnumerable<EntityUid> Set([PipedArgument] IEnumerable<EntityUid> input, Vector2 scale)
+    {
+        _scaleVisuals ??= GetSys<SharedScaleVisualsSystem>();
+
+        foreach (var ent in input)
+        {
+            _scaleVisuals.SetSpriteScale(ent, scale);
+            yield return ent;
+        }
+    }
+
+    [CommandImplementation("multiply")]
+    public IEnumerable<EntityUid> Multiply([PipedArgument] IEnumerable<EntityUid> input, float factor)
+    {
+        _scaleVisuals ??= GetSys<SharedScaleVisualsSystem>();
+
+        foreach (var ent in input)
+        {
+            var scale = _scaleVisuals.GetSpriteScale(ent) * factor;
+            _scaleVisuals.SetSpriteScale(ent, scale);
+            yield return ent;
+        }
+    }
+
+    [CommandImplementation("multiplyvector")]
+    public IEnumerable<EntityUid> Multiply([PipedArgument] IEnumerable<EntityUid> input, Vector2 factor)
+    {
+        _scaleVisuals ??= GetSys<SharedScaleVisualsSystem>();
+
+        foreach (var ent in input)
+        {
+            var scale = _scaleVisuals.GetSpriteScale(ent) * factor;
+            _scaleVisuals.SetSpriteScale(ent, scale);
+            yield return ent;
+        }
+    }
+
+    [CommandImplementation("multiplywithfixture")]
+    public IEnumerable<EntityUid> MultiplyWithFixture([PipedArgument] IEnumerable<EntityUid> input, float factor)
+    {
+        _scaleVisuals ??= GetSys<SharedScaleVisualsSystem>();
+        _physics ??= GetSys<SharedPhysicsSystem>();
+
+        foreach (var ent in input)
+        {
+            var scale = _scaleVisuals.GetSpriteScale(ent) * factor;
+            _scaleVisuals.SetSpriteScale(ent, scale);
+            _physics.ScaleFixtures(ent, factor);
+            yield return ent;
+        }
+    }
+
+    [CommandImplementation("get")]
+    public IEnumerable<Vector2> Get([PipedArgument] IEnumerable<EntityUid> input)
+    {
+        _scaleVisuals ??= GetSys<SharedScaleVisualsSystem>();
+
+        foreach (var ent in input)
+        {
+            yield return _scaleVisuals.GetSpriteScale(ent);
+        }
+    }
+}
diff --git a/Content.Server/AlertLevel/Systems/AlertLevelChangeOnTriggerSystem.cs b/Content.Server/Trigger/Systems/AlertLevelChangeOnTriggerSystem.cs
similarity index 74%
rename from Content.Server/AlertLevel/Systems/AlertLevelChangeOnTriggerSystem.cs
rename to Content.Server/Trigger/Systems/AlertLevelChangeOnTriggerSystem.cs
index 0c9734b943..1a3e49dd44 100644
--- a/Content.Server/AlertLevel/Systems/AlertLevelChangeOnTriggerSystem.cs
+++ b/Content.Server/Trigger/Systems/AlertLevelChangeOnTriggerSystem.cs
@@ -1,8 +1,9 @@
 using Content.Server.AlertLevel;
-using Content.Server.Explosion.EntitySystems;
+using Content.Shared.Trigger;
+using Content.Shared.Trigger.Components.Effects;
 using Content.Server.Station.Systems;
 
-namespace Content.Server.AlertLevel.Systems;
+namespace Content.Server.Trigger.Systems;
 
 public sealed class AlertLevelChangeOnTriggerSystem : EntitySystem
 {
@@ -18,10 +19,14 @@ public sealed class AlertLevelChangeOnTriggerSystem : EntitySystem
 
     private void OnTrigger(Entity<AlertLevelChangeOnTriggerComponent> ent, ref TriggerEvent args)
     {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
         var stationUid = _station.GetOwningStation(ent.Owner);
-        if (!stationUid.HasValue)
+        if (stationUid == null)
             return;
 
         _alertLevelSystem.SetLevel(stationUid.Value, ent.Comp.Level, ent.Comp.PlaySound, ent.Comp.Announce, ent.Comp.Force);
+        args.Handled = true;
     }
 }
diff --git a/Content.Server/Trigger/Systems/GhostKickUserOnTriggerSystem.cs b/Content.Server/Trigger/Systems/GhostKickUserOnTriggerSystem.cs
new file mode 100644
index 0000000000..0fae6ff1c5
--- /dev/null
+++ b/Content.Server/Trigger/Systems/GhostKickUserOnTriggerSystem.cs
@@ -0,0 +1,38 @@
+using Content.Shared.Trigger;
+using Content.Shared.Trigger.Components.Effects;
+using Content.Server.GhostKick;
+using Robust.Shared.Player;
+
+namespace Content.Server.Trigger.Systems;
+
+public sealed class GhostKickUserOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly GhostKickManager _ghostKickManager = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<GhostKickOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<GhostKickOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        if (!TryComp(target, out ActorComponent? actor))
+            return;
+
+        _ghostKickManager.DoDisconnect(
+            actor.PlayerSession.Channel,
+            Loc.GetString(ent.Comp.Reason));
+
+        args.Handled = true;
+    }
+}
diff --git a/Content.Server/IgnitionSource/IgniteOnTriggerSystem.cs b/Content.Server/Trigger/Systems/IgniteOnTriggerSystem.cs
similarity index 66%
rename from Content.Server/IgnitionSource/IgniteOnTriggerSystem.cs
rename to Content.Server/Trigger/Systems/IgniteOnTriggerSystem.cs
index 0e9dd56622..f4d88b774a 100644
--- a/Content.Server/IgnitionSource/IgniteOnTriggerSystem.cs
+++ b/Content.Server/Trigger/Systems/IgniteOnTriggerSystem.cs
@@ -1,10 +1,9 @@
-using Content.Server.Explosion.EntitySystems;
 using Content.Shared.IgnitionSource;
-using Content.Shared.Timing;
-using Robust.Shared.Audio.Systems;
+using Content.Shared.Trigger;
+using Content.Shared.Trigger.Components.Effects;
 using Robust.Shared.Timing;
 
-namespace Content.Server.IgnitionSource;
+namespace Content.Server.Trigger.Systems;
 
 /// <summary>
 /// Handles igniting when triggered and stopping ignition after the delay.
@@ -13,8 +12,6 @@ public sealed class IgniteOnTriggerSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly SharedIgnitionSourceSystem _source = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly UseDelaySystem _useDelay = default!;
 
     public override void Initialize()
     {
@@ -23,6 +20,8 @@ public sealed class IgniteOnTriggerSystem : EntitySystem
         SubscribeLocalEvent<IgniteOnTriggerComponent, TriggerEvent>(OnTrigger);
     }
 
+    // TODO: move this into ignition source component
+    // it already has an update loop
     public override void Update(float deltaTime)
     {
         base.Update(deltaTime);
@@ -42,14 +41,18 @@ public sealed class IgniteOnTriggerSystem : EntitySystem
 
     private void OnTrigger(Entity<IgniteOnTriggerComponent> ent, ref TriggerEvent args)
     {
-        // prevent spamming sound and ignition
-        if (!TryComp(ent.Owner, out UseDelayComponent? useDelay) || _useDelay.IsDelayed((ent.Owner, useDelay)))
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
             return;
 
-        _source.SetIgnited(ent.Owner);
-        _audio.PlayPvs(ent.Comp.IgniteSound, ent);
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
 
-        _useDelay.TryResetDelay((ent.Owner, useDelay));
+        if (target == null)
+            return;
+
+        _source.SetIgnited(target.Value);
         ent.Comp.IgnitedUntil = _timing.CurTime + ent.Comp.IgnitedTime;
+        Dirty(ent);
+
+        args.Handled = true;
     }
 }
diff --git a/Content.Server/Trigger/Systems/PolymorphOnTriggerSystem.cs b/Content.Server/Trigger/Systems/PolymorphOnTriggerSystem.cs
new file mode 100644
index 0000000000..8b4741b9ad
--- /dev/null
+++ b/Content.Server/Trigger/Systems/PolymorphOnTriggerSystem.cs
@@ -0,0 +1,51 @@
+using Content.Server.Polymorph.Systems;
+using Content.Shared.Polymorph;
+using Content.Shared.Trigger;
+using Content.Shared.Trigger.Components.Effects;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Trigger.Systems;
+
+public sealed partial class PolymorphOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly PolymorphSystem _polymorph = default!;
+
+    /// <summary>
+    /// Need to do this so we don't get a collection enumeration error in physics by polymorphing
+    /// an entity we're colliding with in case of TriggerOnCollide.
+    /// Also makes sure other trigger effects don't activate in nullspace after we have polymorphed.
+    /// </summary>
+    private Queue<(EntityUid Uid, ProtoId<PolymorphPrototype> Polymorph)> _queuedPolymorphUpdates = new();
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<PolymorphOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<PolymorphOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        _queuedPolymorphUpdates.Enqueue((target.Value, ent.Comp.Polymorph));
+        args.Handled = true;
+    }
+
+    public override void Update(float frametime)
+    {
+        while (_queuedPolymorphUpdates.TryDequeue(out var data))
+        {
+            if (TerminatingOrDeleted(data.Uid))
+                continue;
+
+            _polymorph.PolymorphEntity(data.Uid, data.Polymorph);
+        }
+    }
+}
diff --git a/Content.Server/Trigger/Systems/RattleOnTriggerSystem.cs b/Content.Server/Trigger/Systems/RattleOnTriggerSystem.cs
new file mode 100644
index 0000000000..963ac36b7f
--- /dev/null
+++ b/Content.Server/Trigger/Systems/RattleOnTriggerSystem.cs
@@ -0,0 +1,49 @@
+using Content.Server.Radio.EntitySystems;
+using Content.Server.Pinpointer;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Trigger;
+using Content.Shared.Trigger.Components.Effects;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Server.Trigger.Systems;
+
+public sealed class RattleOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly RadioSystem _radio = default!;
+    [Dependency] private readonly NavMapSystem _navMap = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<RattleOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<RattleOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        if (!TryComp<MobStateComponent>(target.Value, out var mobstate))
+            return;
+
+        args.Handled = true;
+
+        if (!ent.Comp.Messages.TryGetValue(mobstate.CurrentState, out var messageId))
+            return;
+
+        // Gets the location of the user
+        var posText = FormattedMessage.RemoveMarkupOrThrow(_navMap.GetNearestBeaconString(target.Value));
+
+        var message = Loc.GetString(messageId, ("user", target.Value), ("position", posText));
+        // Sends a message to the radio channel specified by the implant
+        _radio.SendRadioMessage(ent.Owner, message, _prototypeManager.Index(ent.Comp.RadioChannel), ent.Owner);
+    }
+}
diff --git a/Content.Server/Trigger/Systems/ReleaseGasOnTriggerSystem.cs b/Content.Server/Trigger/Systems/ReleaseGasOnTriggerSystem.cs
new file mode 100644
index 0000000000..a38ca2a759
--- /dev/null
+++ b/Content.Server/Trigger/Systems/ReleaseGasOnTriggerSystem.cs
@@ -0,0 +1,48 @@
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.Trigger.Components.Effects;
+using Content.Shared.Trigger.Systems;
+using Robust.Shared.Timing;
+
+namespace Content.Server.Trigger.Systems;
+
+public sealed class ReleaseGasOnTriggerSystem : SharedReleaseGasOnTriggerSystem
+{
+    [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var curTime = _timing.CurTime;
+        var query = EntityQueryEnumerator<ReleaseGasOnTriggerComponent>();
+
+        while (query.MoveNext(out var uid, out var comp))
+        {
+            if (!comp.Active || comp.NextReleaseTime > curTime)
+                continue;
+
+            var giverGasMix = comp.Air.Remove(comp.StartingTotalMoles * comp.RemoveFraction);
+            var environment = _atmosphereSystem.GetContainingMixture(uid, false, true);
+
+            if (environment == null)
+            {
+                _appearance.SetData(uid, ReleaseGasOnTriggerVisuals.Key, false);
+                RemCompDeferred<ReleaseGasOnTriggerComponent>(uid);
+                continue;
+            }
+
+            _atmosphereSystem.Merge(environment, giverGasMix);
+            comp.NextReleaseTime += comp.ReleaseInterval;
+
+            if (comp.PressureLimit != 0 && environment.Pressure >= comp.PressureLimit ||
+                comp.Air.TotalMoles <= 0)
+            {
+                _appearance.SetData(uid, ReleaseGasOnTriggerVisuals.Key, false);
+                RemCompDeferred<ReleaseGasOnTriggerComponent>(uid);
+            }
+        }
+    }
+}
diff --git a/Content.Server/Trigger/Systems/SmokeOnTriggerSystem.cs b/Content.Server/Trigger/Systems/SmokeOnTriggerSystem.cs
new file mode 100644
index 0000000000..97799b9cc6
--- /dev/null
+++ b/Content.Server/Trigger/Systems/SmokeOnTriggerSystem.cs
@@ -0,0 +1,68 @@
+using Content.Server.Fluids.EntitySystems;
+using Content.Server.Spreader;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Coordinates.Helpers;
+using Content.Shared.Maps;
+using Content.Shared.Trigger;
+using Content.Shared.Trigger.Components.Effects;
+using Robust.Server.GameObjects;
+using Robust.Shared.Map;
+
+namespace Content.Server.Trigger.Systems;
+
+/// <summary>
+/// Handles creating smoke when <see cref="SmokeOnTriggerComponent"/> is triggered.
+/// </summary>
+public sealed class SmokeOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly IMapManager _mapMan = default!;
+    [Dependency] private readonly MapSystem _map = default!;
+    [Dependency] private readonly SmokeSystem _smoke = default!;
+    [Dependency] private readonly TransformSystem _transform = default!;
+    [Dependency] private readonly SpreaderSystem _spreader = default!;
+    [Dependency] private readonly TurfSystem _turf = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<SmokeOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<SmokeOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        // TODO: move all of this into an API function in SmokeSystem
+        var xform = Transform(target.Value);
+        var mapCoords = _transform.GetMapCoordinates(target.Value, xform);
+        if (!_mapMan.TryFindGridAt(mapCoords, out var gridUid, out var gridComp) ||
+            !_map.TryGetTileRef(gridUid, gridComp, xform.Coordinates, out var tileRef) ||
+            tileRef.Tile.IsEmpty)
+        {
+            return;
+        }
+
+        if (_spreader.RequiresFloorToSpread(ent.Comp.SmokePrototype.ToString()) && _turf.IsSpace(tileRef))
+            return;
+
+        var coords = _map.MapToGrid(gridUid, mapCoords);
+        var smoke = Spawn(ent.Comp.SmokePrototype, coords.SnapToGrid());
+        if (!TryComp<SmokeComponent>(smoke, out var smokeComp))
+        {
+            Log.Error($"Smoke prototype {ent.Comp.SmokePrototype} was missing SmokeComponent");
+            Del(smoke);
+            return;
+        }
+
+        _smoke.StartSmoke(smoke, ent.Comp.Solution, (float)ent.Comp.Duration.TotalSeconds, ent.Comp.SpreadAmount, smokeComp);
+
+        args.Handled = true;
+    }
+}
diff --git a/Content.Server/Chat/Systems/SpeakOnTriggerSystem.cs b/Content.Server/Trigger/Systems/SpeakOnTriggerSystem.cs
similarity index 53%
rename from Content.Server/Chat/Systems/SpeakOnTriggerSystem.cs
rename to Content.Server/Trigger/Systems/SpeakOnTriggerSystem.cs
index 28be6a5373..6da6f707c1 100644
--- a/Content.Server/Chat/Systems/SpeakOnTriggerSystem.cs
+++ b/Content.Server/Trigger/Systems/SpeakOnTriggerSystem.cs
@@ -1,13 +1,13 @@
-using Content.Server.Explosion.EntitySystems;
-using Content.Shared.Timing;
+using Content.Server.Chat.Systems;
+using Content.Shared.Trigger;
+using Content.Shared.Trigger.Components.Effects;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
-namespace Content.Server.Chat.Systems;
+namespace Content.Server.Trigger.Systems;
 
 public sealed class SpeakOnTriggerSystem : EntitySystem
 {
-    [Dependency] private readonly UseDelaySystem _useDelay = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly ChatSystem _chat = default!;
@@ -15,32 +15,34 @@ public sealed class SpeakOnTriggerSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
+
         SubscribeLocalEvent<SpeakOnTriggerComponent, TriggerEvent>(OnTrigger);
     }
 
     private void OnTrigger(Entity<SpeakOnTriggerComponent> ent, ref TriggerEvent args)
     {
-        TrySpeak(ent);
-        args.Handled = true;
-    }
-
-    private void TrySpeak(Entity<SpeakOnTriggerComponent> ent)
-    {
-        // If it doesn't have the use delay component, still send the message.
-        if (TryComp<UseDelayComponent>(ent.Owner, out var useDelay) && _useDelay.IsDelayed((ent.Owner, useDelay)))
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
             return;
 
-        if (!_prototypeManager.TryIndex(ent.Comp.Pack, out var messagePack))
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
             return;
 
-        var message = Loc.GetString(_random.Pick(messagePack.Values));
+        string message;
+        if (ent.Comp.Text != null)
+            message = Loc.GetString(ent.Comp.Text);
+        else
+        {
+            if (!_prototypeManager.TryIndex(ent.Comp.Pack, out var messagePack))
+                return;
+            message = Loc.GetString(_random.Pick(messagePack.Values));
+        }
         // Chatcode moment: messages starting with "." are considered radio messages.
         // Prepending ">" forces the message to be spoken instead.
         // TODO chat refactor: remove this
         message = '>' + message;
-        _chat.TrySendInGameICMessage(ent.Owner, message, InGameICChatType.Speak, true);
-
-        if (useDelay != null)
-            _useDelay.TryResetDelay((ent.Owner, useDelay));
+        _chat.TrySendInGameICMessage(target.Value, message, InGameICChatType.Speak, true);
+        args.Handled = true;
     }
 }
diff --git a/Content.Server/UserInterface/StatValuesCommand.cs b/Content.Server/UserInterface/StatValuesCommand.cs
index d64984b574..263dfa8b9e 100644
--- a/Content.Server/UserInterface/StatValuesCommand.cs
+++ b/Content.Server/UserInterface/StatValuesCommand.cs
@@ -6,10 +6,12 @@ using Content.Server.EUI;
 using Content.Server.Item;
 using Content.Server.Power.Components;
 using Content.Shared.Administration;
+using Content.Shared.Damage.Prototypes;
 using Content.Shared.Item;
 using Content.Shared.Research.Prototypes;
 using Content.Shared.UserInterface;
 using Content.Shared.Weapons.Melee;
+using Content.Shared.Wieldable.Components;
 using Robust.Shared.Console;
 using Robust.Shared.Prototypes;
 
@@ -170,10 +172,13 @@ public sealed class StatValuesCommand : IConsoleCommand
         return state;
     }
 
+    private static readonly ProtoId<DamageTypePrototype> StructuralDamageType = "Structural";
+
     private StatValuesEuiMessage GetMelee()
     {
         var values = new List<string[]>();
         var meleeName = _entManager.ComponentFactory.GetComponentName<MeleeWeaponComponent>();
+        var increaseDamageName = _entManager.ComponentFactory.GetComponentName<IncreaseDamageOnWieldComponent>();
 
         foreach (var proto in _proto.EnumeratePrototypes<EntityPrototype>())
         {
@@ -186,26 +191,45 @@ public sealed class StatValuesCommand : IConsoleCommand
 
             var comp = (MeleeWeaponComponent) meleeComp.Component;
 
-            // TODO: Wielded damage
             // TODO: Esword damage
 
+            var structuralDamage = comp.Damage.DamageDict.GetValueOrDefault(StructuralDamageType);
+            var baseDamage = comp.Damage.GetTotal() - comp.Damage.DamageDict.GetValueOrDefault(StructuralDamageType);
+
+            var wieldedStructuralDamage = "-";
+            var wieldedDamage = "-";
+            if (proto.Components.TryGetValue(increaseDamageName, out var increaseDamageComp))
+            {
+                var comp2 = (IncreaseDamageOnWieldComponent) increaseDamageComp.Component;
+
+                wieldedStructuralDamage = (structuralDamage + comp2.BonusDamage.DamageDict.GetValueOrDefault(StructuralDamageType)).ToString();
+                wieldedDamage = (baseDamage + comp2.BonusDamage.GetTotal() - comp2.BonusDamage.DamageDict.GetValueOrDefault(StructuralDamageType)).ToString();
+            }
+
             values.Add(new[]
             {
                 proto.ID,
-                (comp.Damage.GetTotal() * comp.AttackRate).ToString(),
-                comp.AttackRate.ToString(CultureInfo.CurrentCulture),
-                comp.Damage.GetTotal().ToString(),
-                comp.Range.ToString(CultureInfo.CurrentCulture),
+                baseDamage.ToString(),
+                wieldedDamage,
+                comp.AttackRate.ToString("0.00", CultureInfo.CurrentCulture),
+                (comp.AttackRate * baseDamage).Float().ToString("0.00", CultureInfo.CurrentCulture),
+                structuralDamage.ToString(),
+                wieldedStructuralDamage,
             });
         }
 
-        var state = new StatValuesEuiMessage()
+        var state = new StatValuesEuiMessage
         {
-            Title = "Cargo sell prices",
-            Headers = new List<string>()
+            Title = Loc.GetString("stat-melee-values"),
+            Headers = new List<string>
             {
-                "ID",
-                "Price",
+                Loc.GetString("stat-melee-id"),
+                Loc.GetString("stat-melee-base-damage"),
+                Loc.GetString("stat-melee-wield-damage"),
+                Loc.GetString("stat-melee-attack-rate"),
+                Loc.GetString("stat-melee-dps"),
+                Loc.GetString("stat-melee-structural-damage"),
+                Loc.GetString("stat-melee-structural-wield-damage"),
             },
             Values = values,
         };
diff --git a/Content.Server/VoiceTrigger/StorageVoiceControlSystem.cs b/Content.Server/VoiceTrigger/StorageVoiceControlSystem.cs
index 81bbd48a0d..ade861af98 100644
--- a/Content.Server/VoiceTrigger/StorageVoiceControlSystem.cs
+++ b/Content.Server/VoiceTrigger/StorageVoiceControlSystem.cs
@@ -5,6 +5,7 @@ using Content.Shared.Database;
 using Content.Shared.Inventory;
 using Content.Shared.Popups;
 using Content.Shared.Storage;
+using Content.Shared.Trigger;
 using Robust.Server.Containers;
 
 namespace Content.Server.VoiceTrigger;
diff --git a/Content.Server/Wagging/WaggingSystem.cs b/Content.Server/Wagging/WaggingSystem.cs
index 7ccc19e20c..88b82a9ca5 100644
--- a/Content.Server/Wagging/WaggingSystem.cs
+++ b/Content.Server/Wagging/WaggingSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.Actions;
 using Content.Server.Humanoid;
+using Content.Shared.Cloning.Events;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Mobs;
@@ -26,6 +27,15 @@ public sealed class WaggingSystem : EntitySystem
         SubscribeLocalEvent<WaggingComponent, ComponentShutdown>(OnWaggingShutdown);
         SubscribeLocalEvent<WaggingComponent, ToggleActionEvent>(OnWaggingToggle);
         SubscribeLocalEvent<WaggingComponent, MobStateChangedEvent>(OnMobStateChanged);
+        SubscribeLocalEvent<WaggingComponent, CloningEvent>(OnCloning);
+    }
+
+    private void OnCloning(Entity<WaggingComponent> ent, ref CloningEvent args)
+    {
+        if (!args.Settings.EventComponents.Contains(Factory.GetRegistration(ent.Comp.GetType()).Name))
+            return;
+
+        EnsureComp<WaggingComponent>(args.CloneUid);
     }
 
     private void OnWaggingMapInit(EntityUid uid, WaggingComponent component, MapInitEvent args)
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.Cartridges.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.Cartridges.cs
deleted file mode 100644
index 770bd2f7b6..0000000000
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.Cartridges.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using Content.Shared.Damage;
-using Content.Shared.Damage.Events;
-using Content.Shared.Examine;
-using Content.Shared.FixedPoint;
-using Content.Shared.Projectiles;
-using Content.Shared.Weapons.Ranged.Components;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Weapons.Ranged.Systems;
-
-public sealed partial class GunSystem
-{
-    protected override void InitializeCartridge()
-    {
-        base.InitializeCartridge();
-        SubscribeLocalEvent<CartridgeAmmoComponent, ExaminedEvent>(OnCartridgeExamine);
-        SubscribeLocalEvent<CartridgeAmmoComponent, DamageExamineEvent>(OnCartridgeDamageExamine);
-    }
-
-    private void OnCartridgeDamageExamine(EntityUid uid, CartridgeAmmoComponent component, ref DamageExamineEvent args)
-    {
-        var damageSpec = GetProjectileDamage(component.Prototype);
-
-        if (damageSpec == null)
-            return;
-
-        _damageExamine.AddDamageExamine(args.Message, Damageable.ApplyUniversalAllModifiers(damageSpec), Loc.GetString("damage-projectile"));
-    }
-
-    private DamageSpecifier? GetProjectileDamage(string proto)
-    {
-        if (!ProtoManager.TryIndex<EntityPrototype>(proto, out var entityProto))
-            return null;
-
-        if (entityProto.Components
-            .TryGetValue(Factory.GetComponentName<ProjectileComponent>(), out var projectile))
-        {
-            var p = (ProjectileComponent) projectile.Component;
-
-            if (!p.Damage.Empty)
-            {
-                return p.Damage * Damageable.UniversalProjectileDamageModifier;
-            }
-        }
-
-        return null;
-    }
-
-    private void OnCartridgeExamine(EntityUid uid, CartridgeAmmoComponent component, ExaminedEvent args)
-    {
-        if (component.Spent)
-        {
-            args.PushMarkup(Loc.GetString("gun-cartridge-spent"));
-        }
-        else
-        {
-            args.PushMarkup(Loc.GetString("gun-cartridge-unspent"));
-        }
-    }
-}
diff --git a/Content.Server/Xenoarchaeology/Artifact/XAE/Components/XAETriggerExplosivesComponent.cs b/Content.Server/Xenoarchaeology/Artifact/XAE/Components/XAETriggerExplosivesComponent.cs
index b9e23f036b..faef4d5078 100644
--- a/Content.Server/Xenoarchaeology/Artifact/XAE/Components/XAETriggerExplosivesComponent.cs
+++ b/Content.Server/Xenoarchaeology/Artifact/XAE/Components/XAETriggerExplosivesComponent.cs
@@ -1,9 +1,9 @@
-using Content.Shared.Explosion.Components.OnTrigger;
+using Content.Shared.Explosion.Components;
 
 namespace Content.Server.Xenoarchaeology.Artifact.XAE.Components;
 
 /// <summary>
-/// Activates 'trigger' for <see cref="ExplodeOnTriggerComponent"/>.
+/// Activates <see cref="ExplosiveComponent"/> to explode.
 /// </summary>
 [RegisterComponent, Access(typeof(XAETriggerExplosivesSystem))]
 public sealed partial class XAETriggerExplosivesComponent : Component;
diff --git a/Content.Shared/Abilities/Mime/MimePowersComponent.cs b/Content.Shared/Abilities/Mime/MimePowersComponent.cs
new file mode 100644
index 0000000000..8414dd7a0d
--- /dev/null
+++ b/Content.Shared/Abilities/Mime/MimePowersComponent.cs
@@ -0,0 +1,76 @@
+using Content.Shared.Alert;
+using Robust.Shared.Prototypes;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.Abilities.Mime;
+
+/// <summary>
+/// Lets its owner entity use mime powers, like placing invisible walls.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[AutoGenerateComponentPause]
+public sealed partial class MimePowersComponent : Component
+{
+    /// <summary>
+    /// Whether this component is active or not.
+    /// </summarY>
+    [DataField, AutoNetworkedField]
+    public bool Enabled = true;
+
+    /// <summary>
+    /// The wall prototype to use.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntProtoId WallPrototype = "WallInvisible";
+
+    [DataField]
+    public EntProtoId? InvisibleWallAction = "ActionMimeInvisibleWall";
+
+    [DataField, AutoNetworkedField]
+    public EntityUid? InvisibleWallActionEntity;
+
+    // The vow zone lies below
+    [DataField, AutoNetworkedField]
+    public bool VowBroken = false;
+
+    /// <summary>
+    /// Whether this mime is ready to take the vow again.
+    /// Note that if they already have the vow, this is also false.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool ReadyToRepent = false;
+
+    /// <summary>
+    /// Time when the mime can repent their vow
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan VowRepentTime = TimeSpan.Zero;
+
+    /// <summary>
+    /// How long it takes the mime to get their powers back
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan VowCooldown = TimeSpan.FromMinutes(5);
+
+    [DataField]
+    public ProtoId<AlertPrototype> VowAlert = "VowOfSilence";
+
+    [DataField]
+    public ProtoId<AlertPrototype> VowBrokenAlert = "VowBroken";
+
+    /// <summary>
+    /// Does this component prevent the mime from writing on paper while their vow is active?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool PreventWriting = false;
+
+    /// <summary>
+    /// What message is displayed when the mime fails to write?
+    /// </summary>
+    [DataField]
+    public LocId FailWriteMessage = "paper-component-illiterate-mime";
+
+    public override bool SendOnlyToOwner => true;
+}
diff --git a/Content.Shared/Abilities/Mime/MimePowersSystem.cs b/Content.Shared/Abilities/Mime/MimePowersSystem.cs
new file mode 100644
index 0000000000..22ba7a3591
--- /dev/null
+++ b/Content.Shared/Abilities/Mime/MimePowersSystem.cs
@@ -0,0 +1,187 @@
+using Content.Shared.Popups;
+using Content.Shared.Actions;
+using Content.Shared.Actions.Events;
+using Content.Shared.Alert;
+using Content.Shared.Coordinates.Helpers;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Maps;
+using Content.Shared.Paper;
+using Content.Shared.Physics;
+using Content.Shared.Speech.Muting;
+using Robust.Shared.Containers;
+using Robust.Shared.Map;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Abilities.Mime;
+
+public sealed class MimePowersSystem : EntitySystem
+{
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+    [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
+    [Dependency] private readonly AlertsSystem _alertsSystem = default!;
+    [Dependency] private readonly TurfSystem _turf = default!;
+    [Dependency] private readonly IMapManager _mapMan = default!;
+    [Dependency] private readonly SharedContainerSystem _container = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<MimePowersComponent, ComponentInit>(OnComponentInit);
+        SubscribeLocalEvent<MimePowersComponent, ComponentShutdown>(OnComponentShutdown);
+        SubscribeLocalEvent<MimePowersComponent, InvisibleWallActionEvent>(OnInvisibleWall);
+
+        SubscribeLocalEvent<MimePowersComponent, BreakVowAlertEvent>(OnBreakVowAlert);
+        SubscribeLocalEvent<MimePowersComponent, RetakeVowAlertEvent>(OnRetakeVowAlert);
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+        // Queue to track whether mimes can retake vows yet
+
+        var query = EntityQueryEnumerator<MimePowersComponent>();
+        while (query.MoveNext(out var uid, out var mime))
+        {
+            if (!mime.VowBroken || mime.ReadyToRepent)
+                continue;
+
+            if (_timing.CurTime < mime.VowRepentTime)
+                continue;
+
+            mime.ReadyToRepent = true;
+            Dirty(uid, mime);
+            _popupSystem.PopupClient(Loc.GetString("mime-ready-to-repent"), uid, uid);
+        }
+    }
+
+    private void OnComponentInit(Entity<MimePowersComponent> ent, ref ComponentInit args)
+    {
+        EnsureComp<MutedComponent>(ent);
+
+        if (ent.Comp.PreventWriting)
+        {
+            EnsureComp<BlockWritingComponent>(ent, out var illiterateComponent);
+            illiterateComponent.FailWriteMessage = ent.Comp.FailWriteMessage;
+            Dirty(ent, illiterateComponent);
+        }
+
+        _alertsSystem.ShowAlert(ent, ent.Comp.VowAlert);
+        _actionsSystem.AddAction(ent, ref ent.Comp.InvisibleWallActionEntity, ent.Comp.InvisibleWallAction);
+    }
+
+    private void OnComponentShutdown(Entity<MimePowersComponent> ent, ref ComponentShutdown args)
+    {
+        _actionsSystem.RemoveAction(ent.Owner, ent.Comp.InvisibleWallActionEntity);
+    }
+
+    /// <summary>
+    /// Creates an invisible wall in a free space after some checks.
+    /// </summary>
+    private void OnInvisibleWall(Entity<MimePowersComponent> ent, ref InvisibleWallActionEvent args)
+    {
+        if (!ent.Comp.Enabled)
+            return;
+
+        if (_container.IsEntityOrParentInContainer(ent))
+            return;
+
+        var xform = Transform(ent);
+        // Get the tile in front of the mime
+        var offsetValue = xform.LocalRotation.ToWorldVec();
+        var coords = xform.Coordinates.Offset(offsetValue).SnapToGrid(EntityManager, _mapMan);
+        var tile = _turf.GetTileRef(coords);
+        if (tile == null)
+            return;
+
+        // Check if the tile is blocked by a wall or mob, and don't create the wall if so
+        if (_turf.IsTileBlocked(tile.Value, CollisionGroup.Impassable | CollisionGroup.Opaque))
+        {
+            _popupSystem.PopupClient(Loc.GetString("mime-invisible-wall-failed"), ent, ent);
+            return;
+        }
+
+        var messageSelf = Loc.GetString("mime-invisible-wall-popup-self", ("mime", Identity.Entity(ent.Owner, EntityManager)));
+        var messageOthers = Loc.GetString("mime-invisible-wall-popup-others", ("mime", Identity.Entity(ent.Owner, EntityManager)));
+        _popupSystem.PopupPredicted(messageSelf, messageOthers, ent, ent);
+
+        // Make sure we set the invisible wall to despawn properly
+        PredictedSpawnAtPosition(ent.Comp.WallPrototype, _turf.GetTileCenter(tile.Value));
+        // Handle args so cooldown works
+        args.Handled = true;
+    }
+
+    private void OnBreakVowAlert(Entity<MimePowersComponent> ent, ref BreakVowAlertEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        BreakVow(ent, ent);
+        args.Handled = true;
+    }
+
+    private void OnRetakeVowAlert(Entity<MimePowersComponent> ent, ref RetakeVowAlertEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        RetakeVow(ent, ent);
+        args.Handled = true;
+    }
+
+    /// <summary>
+    /// Break this mime's vow to not speak.
+    /// </summary>
+    public void BreakVow(EntityUid uid, MimePowersComponent? mimePowers = null)
+    {
+        if (!Resolve(uid, ref mimePowers))
+            return;
+
+        if (mimePowers.VowBroken)
+            return;
+
+        mimePowers.Enabled = false;
+        mimePowers.VowBroken = true;
+        mimePowers.VowRepentTime = _timing.CurTime + mimePowers.VowCooldown;
+        Dirty(uid, mimePowers);
+        RemComp<MutedComponent>(uid);
+        if (mimePowers.PreventWriting)
+            RemComp<BlockWritingComponent>(uid);
+
+        _alertsSystem.ClearAlert(uid, mimePowers.VowAlert);
+        _alertsSystem.ShowAlert(uid, mimePowers.VowBrokenAlert);
+        _actionsSystem.RemoveAction(uid, mimePowers.InvisibleWallActionEntity);
+    }
+
+    /// <summary>
+    /// Retake this mime's vow to not speak.
+    /// </summary>
+    public void RetakeVow(EntityUid uid, MimePowersComponent? mimePowers = null)
+    {
+        if (!Resolve(uid, ref mimePowers))
+            return;
+
+        if (!mimePowers.ReadyToRepent)
+        {
+            _popupSystem.PopupClient(Loc.GetString("mime-not-ready-repent"), uid, uid);
+            return;
+        }
+
+        mimePowers.Enabled = true;
+        mimePowers.ReadyToRepent = false;
+        mimePowers.VowBroken = false;
+        Dirty(uid, mimePowers);
+        AddComp<MutedComponent>(uid);
+        if (mimePowers.PreventWriting)
+        {
+            EnsureComp<BlockWritingComponent>(uid, out var illiterateComponent);
+            illiterateComponent.FailWriteMessage = mimePowers.FailWriteMessage;
+            Dirty(uid, illiterateComponent);
+        }
+
+        _alertsSystem.ClearAlert(uid, mimePowers.VowBrokenAlert);
+        _alertsSystem.ShowAlert(uid, mimePowers.VowAlert);
+        _actionsSystem.AddAction(uid, ref mimePowers.InvisibleWallActionEntity, mimePowers.InvisibleWallAction, uid);
+    }
+}
diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs
index 69b15235c4..c4581cfbff 100644
--- a/Content.Shared/Actions/SharedActionsSystem.cs
+++ b/Content.Shared/Actions/SharedActionsSystem.cs
@@ -1022,6 +1022,7 @@ public abstract class SharedActionsSystem : EntitySystem
     public bool IsCooldownActive(ActionComponent action, TimeSpan? curTime = null)
     {
         // TODO: Check for charge recovery timer
+        curTime ??= GameTiming.CurTime;
         return action.Cooldown.HasValue && action.Cooldown.Value.End > curTime;
     }
 
diff --git a/Content.Shared/Administration/Components/SharedHeadstandComponent.cs b/Content.Shared/Administration/Components/SharedHeadstandComponent.cs
index 96a4dfc2dd..25576fc466 100644
--- a/Content.Shared/Administration/Components/SharedHeadstandComponent.cs
+++ b/Content.Shared/Administration/Components/SharedHeadstandComponent.cs
@@ -3,7 +3,7 @@
 namespace Content.Shared.Administration.Components;
 
 /// <summary>
-/// Flips the target's sprite on it's head, so they do a headstand.
+/// Flips the target's sprite on its head, so they do a headstand.
 /// </summary>
-[NetworkedComponent]
-public abstract partial class SharedHeadstandComponent : Component { }
+[RegisterComponent, NetworkedComponent]
+public sealed partial class HeadstandComponent : Component;
diff --git a/Content.Server/Animals/Components/ParrotMemoryComponent.cs b/Content.Shared/Animals/Components/ParrotMemoryComponent.cs
similarity index 67%
rename from Content.Server/Animals/Components/ParrotMemoryComponent.cs
rename to Content.Shared/Animals/Components/ParrotMemoryComponent.cs
index 69908a0a9e..e1c5ba8ed9 100644
--- a/Content.Server/Animals/Components/ParrotMemoryComponent.cs
+++ b/Content.Shared/Animals/Components/ParrotMemoryComponent.cs
@@ -1,57 +1,61 @@
+using Content.Shared.Animals.Systems;
+using Robust.Shared.GameStates;
 using Robust.Shared.Network;
+using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
-namespace Content.Server.Animals.Components;
+namespace Content.Shared.Animals.Components;
 
 /// <summary>
-/// Makes an entity able to memorize chat/radio messages
+/// Makes an entity able to memorize chat/radio messages.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, NetworkedComponent]
 [AutoGenerateComponentPause]
 public sealed partial class ParrotMemoryComponent : Component
 {
     /// <summary>
-    /// List of SpeechMemory records this entity has learned
+    /// List of SpeechMemory records this entity has learned.
     /// </summary>
     [DataField]
-    public List<SpeechMemory> SpeechMemories = [];
+    public List<SpeechMemory> SpeechMemories = new();
 
     /// <summary>
-    /// The % chance an entity with this component learns a phrase when learning is off cooldown
+    /// The % chance an entity with this component learns a phrase when learning is off cooldown.
     /// </summary>
     [DataField]
     public float LearnChance = 0.6f;
 
     /// <summary>
-    /// Time after which another attempt can be made at learning a phrase
+    /// Time after which another attempt can be made at learning a phrase.
     /// </summary>
     [DataField]
     public TimeSpan LearnCooldown = TimeSpan.FromMinutes(1);
 
     /// <summary>
-    /// Next time at which the parrot can attempt to learn something
+    /// Next time at which the parrot can attempt to learn something.
     /// </summary>
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
     [AutoPausedField]
     public TimeSpan NextLearnInterval = TimeSpan.Zero;
 
     /// <summary>
-    /// The number of speech entries that are remembered
+    /// The number of speech entries that are remembered.
     /// </summary>
     [DataField]
     public int MaxSpeechMemory = 50;
 
     /// <summary>
-    /// Minimum length of a speech entry
+    /// Minimum length of a speech entry.
     /// </summary>
     [DataField]
     public int MinEntryLength = 4;
 
     /// <summary>
-    /// Maximum length of a speech entry
+    /// Maximum length of a speech entry.
     /// </summary>
     [DataField]
     public int MaxEntryLength = 50;
 }
 
+[Serializable, NetSerializable]
 public record struct SpeechMemory(NetUserId? NetUserId, string Message);
diff --git a/Content.Shared/Animals/Systems/SharedParrotMemorySystem.cs b/Content.Shared/Animals/Systems/SharedParrotMemorySystem.cs
new file mode 100644
index 0000000000..fb8e3309ea
--- /dev/null
+++ b/Content.Shared/Animals/Systems/SharedParrotMemorySystem.cs
@@ -0,0 +1,48 @@
+using Content.Shared.Administration.Managers;
+using Content.Shared.Animals.Components;
+using Content.Shared.Popups;
+using Content.Shared.Verbs;
+using Robust.Shared.Network;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Animals.Systems;
+
+public abstract class SharedParrotMemorySystem : EntitySystem
+{
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly ISharedAdminManager _admin = default!;
+    [Dependency] private readonly INetManager _net = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ParrotMemoryComponent, GetVerbsEvent<Verb>>(OnGetVerbs);
+    }
+
+    private void OnGetVerbs(Entity<ParrotMemoryComponent> entity, ref GetVerbsEvent<Verb> args)
+    {
+        var user = args.User;
+
+        // limit this to admins
+        if (!_admin.IsAdmin(user))
+            return;
+
+        // simple verb that just clears the memory list
+        var clearMemoryVerb = new Verb()
+        {
+            Text = Loc.GetString("parrot-verb-clear-memory"),
+            Category = VerbCategory.Admin,
+            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/clear-parrot.png")),
+            Act = () =>
+            {
+                _popup.PopupClient(Loc.GetString("parrot-popup-memory-cleared"), entity.Owner, user);
+
+                if (_net.IsServer)
+                    entity.Comp.SpeechMemories.Clear();
+            },
+        };
+
+        args.Verbs.Add(clearMemoryVerb);
+    }
+}
diff --git a/Content.Shared/Animals/WoolySystem.cs b/Content.Shared/Animals/WoolySystem.cs
index 734de2f34c..203def2257 100644
--- a/Content.Shared/Animals/WoolySystem.cs
+++ b/Content.Shared/Animals/WoolySystem.cs
@@ -23,7 +23,6 @@ public sealed class WoolySystem : EntitySystem
     {
         base.Initialize();
 
-        SubscribeLocalEvent<WoolyComponent, BeforeFullyEatenEvent>(OnBeforeFullyEaten);
         SubscribeLocalEvent<WoolyComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<WoolyComponent, EntRemovedFromContainerMessage>(OnEntRemoved);
     }
@@ -77,10 +76,4 @@ public sealed class WoolySystem : EntitySystem
             _solutionContainer.TryAddReagent(wooly.Solution.Value, wooly.ReagentId, wooly.Quantity, out _);
         }
     }
-
-    private void OnBeforeFullyEaten(Entity<WoolyComponent> ent, ref BeforeFullyEatenEvent args)
-    {
-        // don't want moths to delete goats after eating them
-        args.Cancel();
-    }
 }
diff --git a/Content.Server/Anomaly/AnomalySynchronizerSystem.cs b/Content.Shared/Anomaly/AnomalySynchronizerSystem.cs
similarity index 59%
rename from Content.Server/Anomaly/AnomalySynchronizerSystem.cs
rename to Content.Shared/Anomaly/AnomalySynchronizerSystem.cs
index b1814c2741..32883cd775 100644
--- a/Content.Server/Anomaly/AnomalySynchronizerSystem.cs
+++ b/Content.Shared/Anomaly/AnomalySynchronizerSystem.cs
@@ -1,33 +1,30 @@
 using System.Linq;
-using System.Numerics;
-using Content.Server.Anomaly.Components;
-using Content.Server.DeviceLinking.Systems;
-using Content.Server.Power.Components;
-using Content.Server.Power.EntitySystems;
 using Content.Shared.Anomaly.Components;
+using Content.Shared.DeviceLinking;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Power;
-using Robust.Shared.Audio.Systems;
+using Content.Shared.Power.EntitySystems;
 using Content.Shared.Verbs;
+using Robust.Shared.Audio.Systems;
 using Robust.Shared.Timing;
 
-namespace Content.Server.Anomaly;
+namespace Content.Shared.Anomaly;
 
 /// <summary>
-/// a device that allows you to translate anomaly activity into multitool signals.
+/// A device that allows you to translate anomaly activity into multitool signals.
 /// </summary>
 public sealed partial class AnomalySynchronizerSystem : EntitySystem
 {
-    [Dependency] private readonly AnomalySystem _anomaly = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
-    [Dependency] private readonly DeviceLinkSystem _signal = default!;
-    [Dependency] private readonly SharedTransformSystem _transform = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly PowerReceiverSystem _power = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly SharedAnomalySystem _anomaly = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedDeviceLinkSystem _deviceLink = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedPowerReceiverSystem _power = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
 
     public override void Initialize()
     {
@@ -47,27 +44,41 @@ public sealed partial class AnomalySynchronizerSystem : EntitySystem
     {
         base.Update(frameTime);
 
+        var curTime = _timing.CurTime;
         var query = EntityQueryEnumerator<AnomalySynchronizerComponent, TransformComponent>();
-        while (query.MoveNext(out var uid, out var sync, out var xform))
+        while (query.MoveNext(out var uid, out var sync, out var synchronizerTransform))
         {
-            if (sync.ConnectedAnomaly is null)
+            if (sync.ConnectedAnomaly == null)
                 continue;
 
-            if (_timing.CurTime < sync.NextCheckTime)
+            if (curTime < sync.NextCheckTime)
                 continue;
+
             sync.NextCheckTime += sync.CheckFrequency;
+            Dirty(uid, sync);
 
-            if (Transform(sync.ConnectedAnomaly.Value).MapUid != Transform(uid).MapUid)
+            if (TerminatingOrDeleted(sync.ConnectedAnomaly))
             {
-                DisconnectFromAnomaly((uid, sync), sync.ConnectedAnomaly.Value);
+                DisconnectFromAnomaly((uid, sync));
                 continue;
             }
 
-            if (!xform.Coordinates.TryDistance(EntityManager, Transform(sync.ConnectedAnomaly.Value).Coordinates, out var distance))
+            // Use TryComp instead of Transform(uid) to take care of cases where the anomaly is out of
+            // PVS range on the client, but the synchronizer isn't.
+            if (!TryComp(sync.ConnectedAnomaly.Value, out TransformComponent? anomalyTransform))
+                continue;
+
+            if (anomalyTransform.MapUid != synchronizerTransform.MapUid)
+            {
+                DisconnectFromAnomaly((uid, sync));
+                continue;
+            }
+
+            if (!synchronizerTransform.Coordinates.TryDistance(EntityManager, anomalyTransform.Coordinates, out var distance))
                 continue;
 
             if (distance > sync.AttachRange)
-                DisconnectFromAnomaly((uid, sync), sync.ConnectedAnomaly.Value);
+                DisconnectFromAnomaly((uid, sync));
         }
     }
 
@@ -76,11 +87,9 @@ public sealed partial class AnomalySynchronizerSystem : EntitySystem
     /// </summary>
     public bool TryAttachNearbyAnomaly(Entity<AnomalySynchronizerComponent> ent, EntityUid? user = null)
     {
-        if (!_power.IsPowered(ent))
+        if (!_power.IsPowered(ent.Owner))
         {
-            if (user is not null)
-                _popup.PopupEntity(Loc.GetString("base-computer-ui-component-not-powered", ("machine", ent)), ent, user.Value);
-
+            _popup.PopupClient(Loc.GetString("base-computer-ui-component-not-powered", ("machine", ent)), ent, user);
             return false;
         }
 
@@ -89,13 +98,11 @@ public sealed partial class AnomalySynchronizerSystem : EntitySystem
 
         if (anomaly.Owner is { Valid: false }) // no anomaly in range
         {
-            if (user is not null)
-                _popup.PopupEntity(Loc.GetString("anomaly-sync-no-anomaly"), ent, user.Value);
-
+            _popup.PopupClient(Loc.GetString("anomaly-sync-no-anomaly"), ent, user);
             return false;
         }
 
-        ConnectToAnomaly(ent, anomaly);
+        ConnectToAnomaly(ent, anomaly, user);
         return true;
     }
 
@@ -104,10 +111,10 @@ public sealed partial class AnomalySynchronizerSystem : EntitySystem
         if (args.Powered)
             return;
 
-        if (ent.Comp.ConnectedAnomaly is null)
+        if (ent.Comp.ConnectedAnomaly == null)
             return;
 
-        DisconnectFromAnomaly(ent, ent.Comp.ConnectedAnomaly.Value);
+        DisconnectFromAnomaly(ent);
     }
 
     private void OnExamined(Entity<AnomalySynchronizerComponent> ent, ref ExaminedEvent args)
@@ -117,19 +124,29 @@ public sealed partial class AnomalySynchronizerSystem : EntitySystem
 
     private void OnGetInteractionVerbs(Entity<AnomalySynchronizerComponent> ent, ref GetVerbsEvent<InteractionVerb> args)
     {
-        if (!args.CanAccess || !args.CanInteract || args.Hands is null || ent.Comp.ConnectedAnomaly.HasValue)
+        if (!args.CanAccess || !args.CanInteract || args.Hands == null)
             return;
 
         var user = args.User;
-        args.Verbs.Add(new()
+
+        if (ent.Comp.ConnectedAnomaly == null)
         {
-            Act = () =>
+            args.Verbs.Add(new()
             {
-                TryAttachNearbyAnomaly(ent, user);
-            },
-            Message = Loc.GetString("anomaly-sync-connect-verb-message", ("machine", ent)),
-            Text = Loc.GetString("anomaly-sync-connect-verb-text"),
-        });
+                Act = () => TryAttachNearbyAnomaly(ent, user),
+                Message = Loc.GetString("anomaly-sync-connect-verb-message", ("machine", ent)),
+                Text = Loc.GetString("anomaly-sync-connect-verb-text"),
+            });
+        }
+        else
+        {
+            args.Verbs.Add(new()
+            {
+                Act = () => DisconnectFromAnomaly(ent, user),
+                Message = Loc.GetString("anomaly-sync-disconnect-verb-message", ("machine", ent)),
+                Text = Loc.GetString("anomaly-sync-disconnect-verb-text"),
+            });
+        }
     }
 
     private void OnInteractHand(Entity<AnomalySynchronizerComponent> ent, ref InteractHandEvent args)
@@ -137,12 +154,13 @@ public sealed partial class AnomalySynchronizerSystem : EntitySystem
         TryAttachNearbyAnomaly(ent, args.User);
     }
 
-    private void ConnectToAnomaly(Entity<AnomalySynchronizerComponent> ent, Entity<AnomalyComponent> anomaly)
+    private void ConnectToAnomaly(Entity<AnomalySynchronizerComponent> ent, Entity<AnomalyComponent> anomaly, EntityUid? user = null)
     {
         if (ent.Comp.ConnectedAnomaly == anomaly)
             return;
 
         ent.Comp.ConnectedAnomaly = anomaly;
+        Dirty(ent);
         //move the anomaly to the center of the synchronizer, for aesthetics.
         var targetXform = _transform.GetWorldPosition(ent);
         _transform.SetWorldPosition(anomaly, targetXform);
@@ -150,27 +168,27 @@ public sealed partial class AnomalySynchronizerSystem : EntitySystem
         if (ent.Comp.PulseOnConnect)
             _anomaly.DoAnomalyPulse(anomaly, anomaly);
 
-        _popup.PopupEntity(Loc.GetString("anomaly-sync-connected"), ent, PopupType.Medium);
-        _audio.PlayPvs(ent.Comp.ConnectedSound, ent);
+        _popup.PopupPredicted(Loc.GetString("anomaly-sync-connected"), ent, user, PopupType.Medium);
+        _audio.PlayPredicted(ent.Comp.ConnectedSound, ent, user);
     }
 
     //TODO: disconnection from the anomaly should also be triggered if the anomaly is far away from the synchronizer.
     //Currently only bluespace anomaly can do this, but for some reason it is the only one that cannot be connected to the synchronizer.
-    private void DisconnectFromAnomaly(Entity<AnomalySynchronizerComponent> ent, EntityUid other)
+    private void DisconnectFromAnomaly(Entity<AnomalySynchronizerComponent> ent, EntityUid? user = null)
     {
         if (ent.Comp.ConnectedAnomaly == null)
             return;
 
-        if (TryComp<AnomalyComponent>(other, out var anomaly))
+        if (ent.Comp.PulseOnDisconnect && TryComp<AnomalyComponent>(ent.Comp.ConnectedAnomaly, out var anomaly))
         {
-            if (ent.Comp.PulseOnDisconnect)
-                _anomaly.DoAnomalyPulse(ent.Comp.ConnectedAnomaly.Value, anomaly);
+            _anomaly.DoAnomalyPulse(ent.Comp.ConnectedAnomaly.Value, anomaly);
         }
 
-        _popup.PopupEntity(Loc.GetString("anomaly-sync-disconnected"), ent, PopupType.Large);
-        _audio.PlayPvs(ent.Comp.ConnectedSound, ent);
+        _popup.PopupPredicted(Loc.GetString("anomaly-sync-disconnected"), ent, user, PopupType.Large);
+        _audio.PlayPredicted(ent.Comp.DisconnectedSound, ent, user);
 
         ent.Comp.ConnectedAnomaly = null;
+        Dirty(ent);
     }
 
     private void OnAnomalyPulse(ref AnomalyPulseEvent args)
@@ -184,19 +202,19 @@ public sealed partial class AnomalySynchronizerSystem : EntitySystem
             if (!_power.IsPowered(uid))
                 continue;
 
-            _signal.InvokePort(uid, component.PulsePort);
+            _deviceLink.InvokePort(uid, component.PulsePort);
         }
     }
 
     private void OnAnomalySeverityChanged(ref AnomalySeverityChangedEvent args)
     {
         var query = EntityQueryEnumerator<AnomalySynchronizerComponent>();
-        while (query.MoveNext(out var ent, out var component))
+        while (query.MoveNext(out var uid, out var component))
         {
             if (args.Anomaly != component.ConnectedAnomaly)
                 continue;
 
-            if (!_power.IsPowered(ent))
+            if (!_power.IsPowered(uid))
                 continue;
 
             //The superscritical port is invoked not at the AnomalySupercriticalEvent,
@@ -204,34 +222,34 @@ public sealed partial class AnomalySynchronizerSystem : EntitySystem
             //ATTENTION! the console command supercriticalanomaly does not work here,
             //as it forcefully causes growth to start without increasing severity.
             if (args.Severity >= 1)
-                _signal.InvokePort(ent, component.SupercritPort);
+                _deviceLink.InvokePort(uid, component.SupercritPort);
         }
     }
 
     private void OnAnomalyStabilityChanged(ref AnomalyStabilityChangedEvent args)
     {
-        Entity<AnomalyComponent> anomaly = (args.Anomaly, Comp<AnomalyComponent>(args.Anomaly));
+        var anomaly = Comp<AnomalyComponent>(args.Anomaly);
 
         var query = EntityQueryEnumerator<AnomalySynchronizerComponent>();
-        while (query.MoveNext(out var ent, out var component))
+        while (query.MoveNext(out var uid, out var sync))
         {
-            if (component.ConnectedAnomaly != anomaly)
+            if (sync.ConnectedAnomaly != args.Anomaly)
                 continue;
 
-            if (!_power.IsPowered(ent))
+            if (!_power.IsPowered(uid))
                 continue;
 
-            if (args.Stability < anomaly.Comp.DecayThreshold)
+            if (args.Stability < anomaly.DecayThreshold)
             {
-                _signal.InvokePort(ent, component.DecayingPort);
+                _deviceLink.InvokePort(uid, sync.DecayingPort);
             }
-            else if (args.Stability > anomaly.Comp.GrowthThreshold)
+            else if (args.Stability > anomaly.GrowthThreshold)
             {
-                _signal.InvokePort(ent, component.GrowingPort);
+                _deviceLink.InvokePort(uid, sync.GrowingPort);
             }
             else
             {
-                _signal.InvokePort(ent, component.StabilizePort);
+                _deviceLink.InvokePort(uid, sync.StabilizePort);
             }
         }
     }
diff --git a/Content.Server/Anomaly/Components/AnomalySynchronizerComponent.cs b/Content.Shared/Anomaly/Components/AnomalySynchronizerComponent.cs
similarity index 66%
rename from Content.Server/Anomaly/Components/AnomalySynchronizerComponent.cs
rename to Content.Shared/Anomaly/Components/AnomalySynchronizerComponent.cs
index 3127f091e5..7e605ba150 100644
--- a/Content.Server/Anomaly/Components/AnomalySynchronizerComponent.cs
+++ b/Content.Shared/Anomaly/Components/AnomalySynchronizerComponent.cs
@@ -1,46 +1,51 @@
 using Content.Shared.DeviceLinking;
 using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
-namespace Content.Server.Anomaly.Components;
+namespace Content.Shared.Anomaly.Components;
 
 /// <summary>
-/// a device that allows you to translate anomaly activity into multitool signals.
+/// A device that allows you to translate anomaly activity into multitool signals.
 /// </summary>
-[RegisterComponent, AutoGenerateComponentPause, Access(typeof(AnomalySynchronizerSystem))]
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState, AutoGenerateComponentPause]
+[Access(typeof(AnomalySynchronizerSystem))]
 public sealed partial class AnomalySynchronizerComponent : Component
 {
     /// <summary>
     /// The uid of the anomaly to which the synchronizer is connected.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField, AutoNetworkedField]
     public EntityUid? ConnectedAnomaly;
 
     /// <summary>
     /// Should the anomaly pulse when connected to the synchronizer?
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public bool PulseOnConnect = true;
 
     /// <summary>
     /// Should the anomaly pulse when disconnected from synchronizer?
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public bool PulseOnDisconnect = false;
 
     /// <summary>
-    /// minimum distance from the synchronizer to the anomaly to be attached
+    /// Minimum distance from the synchronizer to the anomaly to be attached.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public float AttachRange = 0.4f;
 
     /// <summary>
-    /// Periodicheski checks to see if the anomaly has moved to disconnect it.
+    /// Periodically checks to see if the anomaly has moved to disconnect it.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public TimeSpan CheckFrequency = TimeSpan.FromSeconds(1f);
 
-    [DataField, AutoPausedField]
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
     public TimeSpan NextCheckTime = TimeSpan.Zero;
 
     [DataField]
@@ -58,9 +63,9 @@ public sealed partial class AnomalySynchronizerComponent : Component
     [DataField]
     public ProtoId<SourcePortPrototype> SupercritPort = "Supercritical";
 
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public SoundSpecifier ConnectedSound = new SoundPathSpecifier("/Audio/Machines/anomaly_sync_connect.ogg");
 
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public SoundSpecifier DisconnectedSound = new SoundPathSpecifier("/Audio/Machines/anomaly_sync_connect.ogg");
 }
diff --git a/Content.Shared/Anomaly/Components/InnerBodyAnomalyComponent.cs b/Content.Shared/Anomaly/Components/InnerBodyAnomalyComponent.cs
index a7e07ae2b5..dfc1d561c4 100644
--- a/Content.Shared/Anomaly/Components/InnerBodyAnomalyComponent.cs
+++ b/Content.Shared/Anomaly/Components/InnerBodyAnomalyComponent.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Anomaly.Effects;
 using Content.Shared.Body.Prototypes;
+using Content.Shared.Humanoid.Prototypes;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
@@ -62,7 +63,7 @@ public sealed partial class InnerBodyAnomalyComponent : Component
     /// Ability to use unique sprites for different body types
     /// </summary>
     [DataField, AutoNetworkedField]
-    public Dictionary<ProtoId<BodyPrototype>, SpriteSpecifier> SpeciesSprites = new();
+    public Dictionary<ProtoId<SpeciesPrototype>, SpriteSpecifier> SpeciesSprites = new();
 
     /// <summary>
     /// The key of the entity layer into which the sprite will be inserted
diff --git a/Content.Shared/Atmos/EntitySystems/AtmosPipeColorSystem.cs b/Content.Shared/Atmos/EntitySystems/AtmosPipeColorSystem.cs
deleted file mode 100644
index 548136fbfa..0000000000
--- a/Content.Shared/Atmos/EntitySystems/AtmosPipeColorSystem.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Content.Shared.Atmos.Components;
-using Content.Shared.Atmos.Piping;
-
-namespace Content.Shared.Atmos.EntitySystems;
-
-public sealed class AtmosPipeColorSystem : EntitySystem
-{
-
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<AtmosPipeColorComponent, ComponentStartup>(OnStartup);
-        SubscribeLocalEvent<AtmosPipeColorComponent, ComponentShutdown>(OnShutdown);
-    }
-
-    private void OnStartup(Entity<AtmosPipeColorComponent> item, ref ComponentStartup args)
-    {
-        _appearance.SetData(item.Owner, PipeColorVisuals.Color, item.Comp.Color);
-    }
-
-    private void OnShutdown(Entity<AtmosPipeColorComponent> item, ref ComponentShutdown args)
-    {
-        _appearance.SetData(item.Owner, PipeColorVisuals.Color, Color.White);
-    }
-
-    public void SetColor(Entity<AtmosPipeColorComponent> item, Color color)
-    {
-        item.Comp.Color = color;
-        _appearance.SetData(item.Owner, PipeColorVisuals.Color, color);
-        Dirty(item);
-    }
-}
-
diff --git a/Content.Shared/Atmos/Monitor/AtmosAlarmThreshold.cs b/Content.Shared/Atmos/Monitor/AtmosAlarmThreshold.cs
index 89d0bf2392..becc5378f2 100644
--- a/Content.Shared/Atmos/Monitor/AtmosAlarmThreshold.cs
+++ b/Content.Shared/Atmos/Monitor/AtmosAlarmThreshold.cs
@@ -388,9 +388,21 @@ public enum AtmosMonitorLimitType //<todo.eoin Very similar to the above...
 // fields you can find this prototype in
 public enum AtmosMonitorThresholdType
 {
-    Temperature,
-    Pressure,
-    Gas
+    Temperature = 0,
+    Pressure = 1,
+    Gas = 2
+}
+
+/// <summary>
+/// Bitflags version of <see cref="AtmosMonitorThresholdType"/>
+/// </summary>
+[Flags]
+public enum AtmosMonitorThresholdTypeFlags
+{
+    None = 0,
+    Temperature = 1 << 0,
+    Pressure = 1 << 1,
+    Gas = 1 << 2,
 }
 
 [Serializable, NetSerializable]
diff --git a/Content.Shared/Atmos/Piping/Unary/Components/GasCanisterComponent.cs b/Content.Shared/Atmos/Piping/Unary/Components/GasCanisterComponent.cs
index 204cbc76d5..40d76684ee 100644
--- a/Content.Shared/Atmos/Piping/Unary/Components/GasCanisterComponent.cs
+++ b/Content.Shared/Atmos/Piping/Unary/Components/GasCanisterComponent.cs
@@ -6,7 +6,7 @@ using Robust.Shared.GameStates;
 
 namespace Content.Shared.Atmos.Piping.Unary.Components;
 
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
 public sealed partial class GasCanisterComponent : Component, IGasMixtureHolder
 {
     [DataField("port")]
diff --git a/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs b/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs
index a93f2e0618..757a707d40 100644
--- a/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs
+++ b/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs
@@ -25,6 +25,7 @@ public abstract class SharedCryostorageSystem : EntitySystem
     [Dependency] protected readonly IGameTiming Timing = default!;
     [Dependency] protected readonly ISharedAdminLogManager AdminLog = default!;
     [Dependency] protected readonly SharedMindSystem Mind = default!;
+    [Dependency] private readonly MetaDataSystem _meta = default!;
 
     protected EntityUid? PausedMap { get; private set; }
 
@@ -167,8 +168,10 @@ public abstract class SharedCryostorageSystem : EntitySystem
         if (PausedMap != null && Exists(PausedMap))
             return;
 
-        PausedMap = _map.CreateMap();
-        _map.SetPaused(PausedMap.Value, true);
+        var mapUid = _map.CreateMap();
+        _meta.SetEntityName(mapUid, Loc.GetString("cryostorage-paused-map-name"));
+        _map.SetPaused(mapUid, true);
+        PausedMap = mapUid;
     }
 
     public bool IsInPausedMap(Entity<TransformComponent?> entity)
diff --git a/Content.Shared/Bed/SharedBedSystem.cs b/Content.Shared/Bed/SharedBedSystem.cs
index 7e798111cf..0518f05fdf 100644
--- a/Content.Shared/Bed/SharedBedSystem.cs
+++ b/Content.Shared/Bed/SharedBedSystem.cs
@@ -56,8 +56,13 @@ public abstract class SharedBedSystem : EntitySystem
 
     private void OnUnstrapped(Entity<HealOnBuckleComponent> bed, ref UnstrappedEvent args)
     {
-        _actionsSystem.RemoveAction(args.Buckle.Owner, bed.Comp.SleepAction);
-        _sleepingSystem.TryWaking(args.Buckle.Owner);
+        // If the entity being unbuckled is terminating, we shouldn't try to act upon it, as some components may be gone
+        if (!Terminating(args.Buckle.Owner))
+        {
+            _actionsSystem.RemoveAction(args.Buckle.Owner, bed.Comp.SleepAction);
+            _sleepingSystem.TryWaking(args.Buckle.Owner);
+        }
+        
         RemComp<HealOnBuckleHealingComponent>(bed);
     }
 
diff --git a/Content.Shared/CCVar/CCVars.Viewport.cs b/Content.Shared/CCVar/CCVars.Viewport.cs
index d94394d2a7..74d462f3ce 100644
--- a/Content.Shared/CCVar/CCVars.Viewport.cs
+++ b/Content.Shared/CCVar/CCVars.Viewport.cs
@@ -30,4 +30,7 @@ public sealed partial class CCVars
 
     public static readonly CVarDef<bool> ViewportVerticalFit =
         CVarDef.Create("viewport.vertical_fit", true, CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    public static readonly CVarDef<string> ViewportScalingFilterMode =
+        CVarDef.Create("viewport.scaling_filter", "nearest", CVar.CLIENTONLY | CVar.ARCHIVE);
 }
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index d68ab16874..87b2da129a 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -36,5 +36,5 @@ public sealed partial class CCVars : CVars
     /// Set to true to disable parallel processing in the pow3r solver.
     /// </summary>
     public static readonly CVarDef<bool> DebugPow3rDisableParallel =
-        CVarDef.Create("debug.pow3r_disable_parallel", true, CVar.SERVERONLY);
+        CVarDef.Create("debug.pow3r_disable_parallel", false, CVar.SERVERONLY);
 }
diff --git a/Content.Shared/Changeling/ChangelingIdentityComponent.cs b/Content.Shared/Changeling/ChangelingIdentityComponent.cs
new file mode 100644
index 0000000000..461315f4ce
--- /dev/null
+++ b/Content.Shared/Changeling/ChangelingIdentityComponent.cs
@@ -0,0 +1,35 @@
+using Content.Shared.Cloning;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Changeling;
+
+/// <summary>
+/// The storage component for Changelings, it handles the link between a changeling and its consumed identities
+/// that exist on a paused map.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class ChangelingIdentityComponent : Component
+{
+    /// <summary>
+    /// The list of entities that exist on a paused map. They are paused clones of the victims that the ling has consumed, with all relevant components copied from the original.
+    /// </summary>
+    // TODO: Store a reference to the original entity as well so you cannot infinitely devour somebody. Currently very tricky due the inability to send over EntityUid if the original is ever deleted. Can be fixed by something like WeakEntityReference.
+    [DataField, AutoNetworkedField]
+    public List<EntityUid> ConsumedIdentities = new();
+
+
+    /// <summary>
+    /// The currently assumed identity.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityUid? CurrentIdentity;
+
+    /// <summary>
+    /// The cloning settings passed to the CloningSystem, contains a list of all components to copy or have handled by their
+    /// respective systems.
+    /// </summary>
+    public ProtoId<CloningSettingsPrototype> IdentityCloningSettings = "ChangelingCloningSettings";
+
+    public override bool SendOnlyToOwner => true;
+}
diff --git a/Content.Shared/Changeling/ChangelingIdentitySystem.cs b/Content.Shared/Changeling/ChangelingIdentitySystem.cs
new file mode 100644
index 0000000000..f68f72f853
--- /dev/null
+++ b/Content.Shared/Changeling/ChangelingIdentitySystem.cs
@@ -0,0 +1,185 @@
+using System.Numerics;
+using Content.Shared.Cloning;
+using Content.Shared.Humanoid;
+using Content.Shared.Mind.Components;
+using Content.Shared.NameModifier.EntitySystems;
+using Robust.Shared.GameStates;
+using Robust.Shared.Map;
+using Robust.Shared.Network;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Changeling;
+
+public sealed class ChangelingIdentitySystem : EntitySystem
+{
+    [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly MetaDataSystem _metaSystem = default!;
+    [Dependency] private readonly NameModifierSystem _nameMod = default!;
+    [Dependency] private readonly SharedCloningSystem _cloningSystem = default!;
+    [Dependency] private readonly SharedHumanoidAppearanceSystem _humanoidSystem = default!;
+    [Dependency] private readonly SharedMapSystem _map = default!;
+    [Dependency] private readonly SharedPvsOverrideSystem _pvsOverrideSystem = default!;
+
+    public MapId? PausedMapId;
+    private int _numberOfStoredIdentities = 0; // TODO: remove this
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ChangelingIdentityComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<ChangelingIdentityComponent, ComponentShutdown>(OnShutdown);
+        SubscribeLocalEvent<ChangelingIdentityComponent, MindAddedMessage>(OnMindAdded);
+        SubscribeLocalEvent<ChangelingIdentityComponent, MindRemovedMessage>(OnMindRemoved);
+        SubscribeLocalEvent<ChangelingStoredIdentityComponent, ComponentRemove>(OnStoredRemove);
+    }
+
+    private void OnMindAdded(Entity<ChangelingIdentityComponent> ent, ref MindAddedMessage args)
+    {
+        if (!TryComp<ActorComponent>(args.Container.Owner, out var actor))
+            return;
+
+        HandOverPvsOverride(actor.PlayerSession, ent.Comp);
+    }
+
+    private void OnMindRemoved(Entity<ChangelingIdentityComponent> ent, ref MindRemovedMessage args)
+    {
+        CleanupPvsOverride(ent, args.Container.Owner);
+    }
+
+    private void OnMapInit(Entity<ChangelingIdentityComponent> ent, ref MapInitEvent args)
+    {
+        // Make a backup of our current identity so we can transform back.
+        var clone = CloneToPausedMap(ent, ent.Owner);
+        ent.Comp.CurrentIdentity = clone;
+    }
+
+    private void OnShutdown(Entity<ChangelingIdentityComponent> ent, ref ComponentShutdown args)
+    {
+        CleanupPvsOverride(ent, ent.Owner);
+        CleanupChangelingNullspaceIdentities(ent);
+    }
+
+    private void OnStoredRemove(Entity<ChangelingStoredIdentityComponent> ent, ref ComponentRemove args)
+    {
+        // The last stored identity is being deleted, we can clean up the map.
+        if (_net.IsServer && PausedMapId != null && Count<ChangelingStoredIdentityComponent>() <= 1)
+            _map.QueueDeleteMap(PausedMapId.Value);
+    }
+
+    /// <summary>
+    /// Cleanup all nullspaced Identities when the changeling no longer exists
+    /// </summary>
+    /// <param name="ent">the changeling</param>
+    public void CleanupChangelingNullspaceIdentities(Entity<ChangelingIdentityComponent> ent)
+    {
+        if (_net.IsClient)
+            return;
+
+        foreach (var consumedIdentity in ent.Comp.ConsumedIdentities)
+        {
+            QueueDel(consumedIdentity);
+        }
+    }
+
+    /// <summary>
+    /// Clone a target humanoid into nullspace and add it to the Changelings list of identities.
+    /// It creates a perfect copy of the target and can be used to pull components down for future use
+    /// </summary>
+    /// <param name="ent">the Changeling</param>
+    /// <param name="target">the targets uid</param>
+    public EntityUid? CloneToPausedMap(Entity<ChangelingIdentityComponent> ent, EntityUid target)
+    {
+        // Don't create client side duplicate clones or a clientside map.
+        if (_net.IsClient)
+            return null;
+
+        if (!TryComp<HumanoidAppearanceComponent>(target, out var humanoid)
+            || !_prototype.Resolve(humanoid.Species, out var speciesPrototype)
+            || !_prototype.Resolve(ent.Comp.IdentityCloningSettings, out var settings))
+            return null;
+
+        EnsurePausedMap();
+        // TODO: Setting the spawn location is a shitty bandaid to prevent admins from crashing our servers.
+        // Movercontrollers and mob collisions are currently being calculated even for paused entities.
+        // Spawning all of them in the same spot causes severe performance problems.
+        // Cryopods and Polymorph have the same problem.
+        var mob = Spawn(speciesPrototype.Prototype, new MapCoordinates(new Vector2(2 * _numberOfStoredIdentities++, 0), PausedMapId!.Value));
+
+        var storedIdentity = EnsureComp<ChangelingStoredIdentityComponent>(mob);
+        storedIdentity.OriginalEntity = target; // TODO: network this once we have WeakEntityReference or the autonetworking source gen is fixed
+
+        if (TryComp<ActorComponent>(target, out var actor))
+            storedIdentity.OriginalSession = actor.PlayerSession;
+
+        _humanoidSystem.CloneAppearance(target, mob);
+        _cloningSystem.CloneComponents(target, mob, settings);
+
+        var targetName = _nameMod.GetBaseName(target);
+        _metaSystem.SetEntityName(mob, targetName);
+        ent.Comp.ConsumedIdentities.Add(mob);
+
+        Dirty(ent);
+        HandlePvsOverride(ent, mob);
+
+        return mob;
+    }
+
+    /// <summary>
+    /// Simple helper to add a PVS override to a Nullspace Identity
+    /// </summary>
+    /// <param name="uid"></param>
+    /// <param name="target"></param>
+    private void HandlePvsOverride(EntityUid uid, EntityUid target)
+    {
+        if (!TryComp<ActorComponent>(uid, out var actor))
+            return;
+
+        _pvsOverrideSystem.AddSessionOverride(target, actor.PlayerSession);
+    }
+
+    /// <summary>
+    /// Cleanup all Pvs Overrides for the owner of the ChangelingIdentity
+    /// </summary>
+    /// <param name="ent">the Changeling itself</param>
+    /// <param name="entityUid">Who specifically to cleanup from, usually just the same owner, but in the case of a mindswap we want to clean up the victim</param>
+    private void CleanupPvsOverride(Entity<ChangelingIdentityComponent> ent, EntityUid entityUid)
+    {
+        if (!TryComp<ActorComponent>(entityUid, out var actor))
+            return;
+
+        foreach (var identity in ent.Comp.ConsumedIdentities)
+        {
+            _pvsOverrideSystem.RemoveSessionOverride(identity, actor.PlayerSession);
+        }
+    }
+
+    /// <summary>
+    /// Inform another Session of the entities stored for Transformation
+    /// </summary>
+    /// <param name="session">The Session you wish to inform</param>
+    /// <param name="comp">The Target storage of identities</param>
+    public void HandOverPvsOverride(ICommonSession session, ChangelingIdentityComponent comp)
+    {
+        foreach (var entity in comp.ConsumedIdentities)
+        {
+            _pvsOverrideSystem.AddSessionOverride(entity, session);
+        }
+    }
+
+    /// <summary>
+    /// Create a paused map for storing devoured identities as a clone of the player.
+    /// </summary>
+    private void EnsurePausedMap()
+    {
+        if (_map.MapExists(PausedMapId))
+            return;
+
+        var mapUid = _map.CreateMap(out var newMapId);
+        _metaSystem.SetEntityName(mapUid, Loc.GetString("changeling-paused-map-name"));
+        PausedMapId = newMapId;
+        _map.SetPaused(mapUid, true);
+    }
+}
diff --git a/Content.Shared/Changeling/ChangelingRoleComponent.cs b/Content.Shared/Changeling/ChangelingRoleComponent.cs
new file mode 100644
index 0000000000..d2e9c1eccb
--- /dev/null
+++ b/Content.Shared/Changeling/ChangelingRoleComponent.cs
@@ -0,0 +1,9 @@
+using Content.Shared.Roles;
+
+namespace Content.Shared.Changeling;
+
+/// <summary>
+/// The Mindrole for Changeling Antags
+/// </summary>
+[RegisterComponent]
+public sealed partial class ChangelingRoleComponent : BaseMindRoleComponent;
diff --git a/Content.Shared/Changeling/ChangelingStoredIdentityComponent.cs b/Content.Shared/Changeling/ChangelingStoredIdentityComponent.cs
new file mode 100644
index 0000000000..44583190e6
--- /dev/null
+++ b/Content.Shared/Changeling/ChangelingStoredIdentityComponent.cs
@@ -0,0 +1,29 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Player;
+
+namespace Content.Shared.Changeling;
+
+/// <summary>
+/// Marker component for cloned identities devoured by a changeling.
+/// These are stored on a paused map so that the changeling can transform into them.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class ChangelingStoredIdentityComponent : Component
+{
+    /// <summary>
+    /// The original entity the identity was cloned from.
+    /// </summary>
+    /// <remarks>
+    /// TODO: Not networked at the moment because it will create PVS errors when the original is somehow deleted.
+    /// Use WeakEntityReference once it's merged.
+    /// </remarks>
+    [DataField]
+    public EntityUid? OriginalEntity;
+
+    /// <summary>
+    /// The player session of the original entity, if any.
+    /// Used for admin logging purposes.
+    /// </summary>
+    [ViewVariables]
+    public ICommonSession? OriginalSession;
+}
diff --git a/Content.Shared/Changeling/Devour/ChangelingDevourComponent.cs b/Content.Shared/Changeling/Devour/ChangelingDevourComponent.cs
new file mode 100644
index 0000000000..7798c6fec9
--- /dev/null
+++ b/Content.Shared/Changeling/Devour/ChangelingDevourComponent.cs
@@ -0,0 +1,133 @@
+using Content.Shared.Damage;
+using Content.Shared.Damage.Prototypes;
+using Content.Shared.FixedPoint;
+using Content.Shared.Whitelist;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.Changeling.Devour;
+
+/// <summary>
+/// Component responsible for Changelings Devour attack. Including the amount of damage
+/// and how long it takes to devour someone
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
+[Access(typeof(ChangelingDevourSystem))]
+public sealed partial class ChangelingDevourComponent : Component
+{
+    /// <summary>
+    /// The Action for devouring
+    /// </summary>
+    [DataField]
+    public EntProtoId? ChangelingDevourAction = "ActionChangelingDevour";
+
+    /// <summary>
+    /// The action entity associated with devouring
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityUid? ChangelingDevourActionEntity;
+
+    /// <summary>
+    /// The whitelist of targets for devouring
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityWhitelist? Whitelist = new()
+    {
+        Components =
+        [
+            "MobState",
+            "HumanoidAppearance",
+        ],
+    };
+
+    /// <summary>
+    /// The Sound to use during consumption of a victim
+    /// </summary>
+    /// <remarks>
+    /// 6 distance due to the default 15 being hearable all the way across PVS. Changeling is meant to be stealthy.
+    /// 6 still allows the sound to be hearable, but not across an entire department.
+    /// </remarks>
+    [DataField, AutoNetworkedField]
+    public SoundSpecifier? ConsumeNoise = new SoundCollectionSpecifier("ChangelingDevourConsume", AudioParams.Default.WithMaxDistance(6));
+
+    /// <summary>
+    /// The Sound to use during the windup before consuming a victim
+    /// </summary>
+    /// <remarks>
+    /// 6 distance due to the default 15 being hearable all the way across PVS. Changeling is meant to be stealthy.
+    /// 6 still allows the sound to be hearable, but not across an entire department.
+    /// </remarks>
+    [DataField, AutoNetworkedField]
+    public SoundSpecifier? DevourWindupNoise = new SoundCollectionSpecifier("ChangelingDevourWindup", AudioParams.Default.WithMaxDistance(6));
+
+    /// <summary>
+    /// The time between damage ticks
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan DamageTimeBetweenTicks = TimeSpan.FromSeconds(1);
+
+    /// <summary>
+    /// The windup time before the changeling begins to engage in devouring the identity of a target
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan DevourWindupTime = TimeSpan.FromSeconds(2);
+
+    /// <summary>
+    /// The time it takes to FULLY consume someones identity.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan DevourConsumeTime = TimeSpan.FromSeconds(10);
+
+    /// <summary>
+    /// Damage cap that a target is allowed to be caused due to IdentityConsumption
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float DevourConsumeDamageCap = 350f;
+
+    /// <summary>
+    /// The Currently active devour sound in the world
+    /// </summary>
+    [DataField]
+    public EntityUid? CurrentDevourSound;
+
+    /// <summary>
+    /// The damage profile for a single tick of devour damage
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public DamageSpecifier DamagePerTick = new()
+    {
+        DamageDict = new Dictionary<string, FixedPoint2>
+        {
+            { "Slash", 10},
+            { "Piercing", 10 },
+            { "Blunt", 5 },
+        },
+    };
+
+    /// <summary>
+    /// The list of protective damage types capable of preventing a devour if over the threshold
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public List<ProtoId<DamageTypePrototype>> ProtectiveDamageTypes = new()
+    {
+        "Slash",
+        "Piercing",
+        "Blunt",
+    };
+
+    /// <summary>
+    /// The next Tick to deal damage on (utilized during the consumption "do-during" (a do after with an attempt event))
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoNetworkedField, AutoPausedField]
+    public TimeSpan NextTick = TimeSpan.Zero;
+
+    /// <summary>
+    /// The percentage of ANY brute damage resistance that will prevent devouring
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float DevourPreventionPercentageThreshold = 0.1f;
+
+    public override bool SendOnlyToOwner => true;
+}
diff --git a/Content.Shared/Changeling/Devour/ChangelingDevourSystem.Events.cs b/Content.Shared/Changeling/Devour/ChangelingDevourSystem.Events.cs
new file mode 100644
index 0000000000..d063737e5c
--- /dev/null
+++ b/Content.Shared/Changeling/Devour/ChangelingDevourSystem.Events.cs
@@ -0,0 +1,22 @@
+using Content.Shared.Actions;
+using Content.Shared.DoAfter;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Changeling.Devour;
+
+/// <summary>
+/// Action event for Devour, someone has initiated a devour on someone, begin to windup.
+/// </summary>
+public sealed partial class ChangelingDevourActionEvent : EntityTargetActionEvent;
+
+/// <summary>
+/// A windup has either successfully been completed or has been canceled. If successful start the devouring DoAfter.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed partial class ChangelingDevourWindupDoAfterEvent : SimpleDoAfterEvent;
+
+/// <summary>
+/// The Consumption DoAfter has either successfully been completed or was canceled.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed partial class ChangelingDevourConsumeDoAfterEvent : SimpleDoAfterEvent;
diff --git a/Content.Shared/Changeling/Devour/ChangelingDevourSystem.cs b/Content.Shared/Changeling/Devour/ChangelingDevourSystem.cs
new file mode 100644
index 0000000000..83a589a8e3
--- /dev/null
+++ b/Content.Shared/Changeling/Devour/ChangelingDevourSystem.cs
@@ -0,0 +1,276 @@
+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.Damage;
+using Content.Shared.Database;
+using Content.Shared.DoAfter;
+using Content.Shared.Humanoid;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Inventory;
+using Content.Shared.Mobs.Systems;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Popups;
+using Content.Shared.Storage;
+using Content.Shared.Whitelist;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Network;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Changeling.Devour;
+
+public sealed class ChangelingDevourSystem : EntitySystem
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+    [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+    [Dependency] private readonly DamageableSystem _damageable = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
+    [Dependency] private readonly ChangelingIdentitySystem _changelingIdentitySystem = default!;
+    [Dependency] private readonly InventorySystem _inventorySystem = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly IRobustRandom _robustRandom = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ChangelingDevourComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<ChangelingDevourComponent, ChangelingDevourActionEvent>(OnDevourAction);
+        SubscribeLocalEvent<ChangelingDevourComponent, ChangelingDevourWindupDoAfterEvent>(OnDevourWindup);
+        SubscribeLocalEvent<ChangelingDevourComponent, ChangelingDevourConsumeDoAfterEvent>(OnDevourConsume);
+        SubscribeLocalEvent<ChangelingDevourComponent, DoAfterAttemptEvent<ChangelingDevourConsumeDoAfterEvent>>(OnConsumeAttemptTick);
+        SubscribeLocalEvent<ChangelingDevourComponent, ComponentShutdown>(OnShutdown);
+    }
+
+    private void OnMapInit(Entity<ChangelingDevourComponent> ent, ref MapInitEvent args)
+    {
+        _actionsSystem.AddAction(ent, ref ent.Comp.ChangelingDevourActionEntity, ent.Comp.ChangelingDevourAction);
+    }
+
+    private void OnShutdown(Entity<ChangelingDevourComponent> ent, ref ComponentShutdown args)
+    {
+        if (ent.Comp.ChangelingDevourActionEntity != null)
+        {
+            _actionsSystem.RemoveAction(ent.Owner, ent.Comp.ChangelingDevourActionEntity);
+        }
+    }
+
+    //TODO: Allow doafters to have proper update loop support. Attempt events should not be doing state changes.
+    private void OnConsumeAttemptTick(Entity<ChangelingDevourComponent> ent,
+       ref DoAfterAttemptEvent<ChangelingDevourConsumeDoAfterEvent> eventData)
+    {
+
+        var curTime = _timing.CurTime;
+
+        if (curTime < ent.Comp.NextTick)
+            return;
+
+        ConsumeDamageTick(eventData.Event.Target, ent.Comp, eventData.Event.User);
+        ent.Comp.NextTick += ent.Comp.DamageTimeBetweenTicks;
+        Dirty(ent, ent.Comp);
+    }
+
+    private void ConsumeDamageTick(EntityUid? target, ChangelingDevourComponent comp, EntityUid? user)
+    {
+        if (target == null)
+            return;
+
+        if (!TryComp<DamageableComponent>(target, out var damage))
+            return;
+
+        foreach (var damagePoints in comp.DamagePerTick.DamageDict)
+        {
+
+            if (damage.Damage.DamageDict.TryGetValue(damagePoints.Key, out var val) && val > comp.DevourConsumeDamageCap)
+                return;
+        }
+        _damageable.TryChangeDamage(target, comp.DamagePerTick, true, true, damage, user);
+    }
+
+    /// <summary>
+    /// Checkes if the targets outerclothing is beyond a DamageCoefficientThreshold to protect them from being devoured.
+    /// </summary>
+    /// <param name="target">The Targeted entity</param>
+    /// <param name="ent">Changelings Devour Component</param>
+    /// <returns>Is the target Protected from the attack</returns>
+    private bool IsTargetProtected(EntityUid target, Entity<ChangelingDevourComponent> ent)
+    {
+        var ev = new CoefficientQueryEvent(SlotFlags.OUTERCLOTHING);
+
+        RaiseLocalEvent(target, ev);
+
+        foreach (var compProtectiveDamageType in ent.Comp.ProtectiveDamageTypes)
+        {
+            if (!ev.DamageModifiers.Coefficients.TryGetValue(compProtectiveDamageType, out var coefficient))
+                continue;
+            if (coefficient < 1f - ent.Comp.DevourPreventionPercentageThreshold)
+                return true;
+        }
+
+        return false;
+    }
+
+    private void OnDevourAction(Entity<ChangelingDevourComponent> ent, ref ChangelingDevourActionEvent args)
+    {
+        if (args.Handled || _whitelistSystem.IsWhitelistFailOrNull(ent.Comp.Whitelist, args.Target)
+                         || !HasComp<ChangelingIdentityComponent>(ent))
+            return;
+
+        args.Handled = true;
+        var target = args.Target;
+
+        if (target == ent.Owner)
+            return; // don't eat yourself
+
+        if (HasComp<RottingComponent>(target))
+        {
+            _popupSystem.PopupClient(Loc.GetString("changeling-devour-attempt-failed-rotting"), args.Performer, args.Performer, PopupType.Medium);
+            return;
+        }
+
+        if (IsTargetProtected(target, ent))
+        {
+            _popupSystem.PopupClient(Loc.GetString("changeling-devour-attempt-failed-protected"), ent, ent, PopupType.Medium);
+            return;
+        }
+
+        if (_net.IsServer)
+        {
+            var pvsSound = _audio.PlayPvs(ent.Comp.DevourWindupNoise, ent);
+            if (pvsSound != null)
+                ent.Comp.CurrentDevourSound = pvsSound.Value.Entity;
+        }
+
+        _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ent:player} started changeling devour windup against {target:player}");
+
+        _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, ent, ent.Comp.DevourWindupTime, new ChangelingDevourWindupDoAfterEvent(), ent, target: target, used: ent)
+        {
+            BreakOnMove = true,
+            BlockDuplicate = true,
+            DuplicateCondition = DuplicateConditions.None,
+        });
+
+        var selfMessage = Loc.GetString("changeling-devour-begin-windup-self", ("user", Identity.Entity(ent.Owner, EntityManager)));
+        var othersMessage = Loc.GetString("changeling-devour-begin-windup-others", ("user", Identity.Entity(ent.Owner, EntityManager)));
+        _popupSystem.PopupPredicted(
+            selfMessage,
+            othersMessage,
+            args.Performer,
+            args.Performer,
+            PopupType.MediumCaution);
+    }
+
+    private void OnDevourWindup(Entity<ChangelingDevourComponent> ent, ref ChangelingDevourWindupDoAfterEvent args)
+    {
+        var curTime = _timing.CurTime;
+        args.Handled = true;
+
+        if (!EntityManager.EntityExists(ent.Comp.CurrentDevourSound))
+            _audio.Stop(ent.Comp.CurrentDevourSound!);
+
+        if (args.Cancelled)
+            return;
+
+        var selfMessage = Loc.GetString("changeling-devour-begin-consume-self", ("user", Identity.Entity(ent.Owner, EntityManager)));
+        var othersMessage = Loc.GetString("changeling-devour-begin-consume-others", ("user", Identity.Entity(ent.Owner, EntityManager)));
+        _popupSystem.PopupPredicted(
+            selfMessage,
+            othersMessage,
+            args.User,
+            args.User,
+            PopupType.LargeCaution);
+
+        if (_net.IsServer)
+        {
+            var pvsSound = _audio.PlayPvs(ent.Comp.ConsumeNoise, ent);
+
+            if (pvsSound != null)
+                ent.Comp.CurrentDevourSound = pvsSound.Value.Entity;
+        }
+
+
+        ent.Comp.NextTick = curTime + ent.Comp.DamageTimeBetweenTicks;
+
+        _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(ent.Owner):player} began to devour {ToPrettyString(args.Target):player} identity");
+
+        _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager,
+            ent,
+            ent.Comp.DevourConsumeTime,
+            new ChangelingDevourConsumeDoAfterEvent(),
+            ent,
+            target: args.Target,
+            used: ent)
+        {
+            AttemptFrequency = AttemptFrequency.EveryTick,
+            BreakOnMove = true,
+            BlockDuplicate = true,
+            DuplicateCondition = DuplicateConditions.None,
+        });
+    }
+
+    private void OnDevourConsume(Entity<ChangelingDevourComponent> ent, ref ChangelingDevourConsumeDoAfterEvent args)
+    {
+        args.Handled = true;
+        var target = args.Target;
+
+        if (target == null)
+            return;
+
+        if (EntityManager.EntityExists(ent.Comp.CurrentDevourSound))
+            _audio.Stop(ent.Comp.CurrentDevourSound!);
+
+        if (args.Cancelled)
+            return;
+
+        if (!_mobState.IsDead((EntityUid)target))
+        {
+            _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(ent.Owner):player}  unsuccessfully devoured {ToPrettyString(args.Target):player}'s identity");
+            _popupSystem.PopupClient(Loc.GetString("changeling-devour-consume-failed-not-dead"), args.User, args.User, PopupType.Medium);
+            return;
+        }
+
+        var selfMessage = Loc.GetString("changeling-devour-consume-complete-self", ("user", Identity.Entity(args.User, EntityManager)));
+        var othersMessage = Loc.GetString("changeling-devour-consume-complete-others", ("user", Identity.Entity(args.User, EntityManager)));
+        _popupSystem.PopupPredicted(
+            selfMessage,
+            othersMessage,
+            args.User,
+            args.User,
+            PopupType.LargeCaution);
+
+        if (_mobState.IsDead(target.Value)
+            && TryComp<BodyComponent>(target, out var body)
+            && HasComp<HumanoidAppearanceComponent>(target)
+            && TryComp<ChangelingIdentityComponent>(args.User, out var identityStorage))
+        {
+            _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(ent.Owner):player}  successfully devoured {ToPrettyString(args.Target):player}'s identity");
+            _changelingIdentitySystem.CloneToPausedMap((ent, identityStorage), target.Value);
+
+            if (_inventorySystem.TryGetSlotEntity(target.Value, "jumpsuit", out var item)
+                && TryComp<ButcherableComponent>(item, out var butcherable))
+                RipClothing(target.Value, (item.Value, butcherable));
+        }
+
+        Dirty(ent);
+    }
+
+    private void RipClothing(EntityUid victim, Entity<ButcherableComponent> item)
+    {
+        var spawnEntities = EntitySpawnCollection.GetSpawns(item.Comp.SpawnedEntities, _robustRandom);
+
+        foreach (var proto in spawnEntities)
+        {
+            // TODO: once predictedRandom is in, make this a Coordinate offset of 0.25f from the victims position
+            PredictedSpawnNextToOrDrop(proto, victim);
+        }
+
+        PredictedQueueDel(item.Owner);
+    }
+}
diff --git a/Content.Shared/Changeling/Transform/ChangelingTransformComponent.cs b/Content.Shared/Changeling/Transform/ChangelingTransformComponent.cs
new file mode 100644
index 0000000000..0a3b3f1985
--- /dev/null
+++ b/Content.Shared/Changeling/Transform/ChangelingTransformComponent.cs
@@ -0,0 +1,54 @@
+using Content.Shared.Cloning;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Changeling.Transform;
+
+/// <summary>
+/// The component containing information about Changelings Transformation action
+/// Like how long their windup is, the sounds as well as the Target Cloning settings for changing between identities
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(ChangelingTransformSystem))]
+public sealed partial class ChangelingTransformComponent : Component
+{
+    /// <summary>
+    /// The action Prototype for Transforming
+    /// </summary>
+    [DataField]
+    public EntProtoId? ChangelingTransformAction = "ActionChangelingTransform";
+
+    /// <summary>
+    /// The Action Entity for transforming associated with this Component
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityUid? ChangelingTransformActionEntity;
+
+    /// <summary>
+    /// Time it takes to Transform
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan TransformWindup = TimeSpan.FromSeconds(5);
+
+    /// <summary>
+    /// The noise used when attempting to transform
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public SoundSpecifier? TransformAttemptNoise = new SoundCollectionSpecifier("ChangelingTransformAttempt", AudioParams.Default.WithMaxDistance(6)); // 6 distance due to the default 15 being hearable all the way across PVS. Changeling is meant to be stealthy. 6 still allows the sound to be hearable, but not across an entire department.
+
+    /// <summary>
+    /// The currently active transform in the world
+    /// </summary>
+    [DataField]
+    public EntityUid? CurrentTransformSound;
+
+    /// <summary>
+    /// The cloning settings passed to the CloningSystem, contains a list of all components to copy or have handled by their
+    /// respective systems.
+    /// </summary>
+    public ProtoId<CloningSettingsPrototype> TransformCloningSettings = "ChangelingCloningSettings";
+
+    public override bool SendOnlyToOwner => true;
+}
+
diff --git a/Content.Shared/Changeling/Transform/ChangelingTransformSystem.Events.cs b/Content.Shared/Changeling/Transform/ChangelingTransformSystem.Events.cs
new file mode 100644
index 0000000000..cfe2a56933
--- /dev/null
+++ b/Content.Shared/Changeling/Transform/ChangelingTransformSystem.Events.cs
@@ -0,0 +1,16 @@
+using Content.Shared.Actions;
+using Content.Shared.DoAfter;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Changeling.Transform;
+
+/// <summary>
+/// Action event for opening the changeling transformation radial menu.
+/// </summary>
+public sealed partial class ChangelingTransformActionEvent : InstantActionEvent;
+
+/// <summary>
+/// DoAfterevent used to transform a changeling into one of their stored identities.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed partial class ChangelingTransformDoAfterEvent : SimpleDoAfterEvent;
diff --git a/Content.Shared/Changeling/Transform/ChangelingTransformSystem.UI.cs b/Content.Shared/Changeling/Transform/ChangelingTransformSystem.UI.cs
new file mode 100644
index 0000000000..0383867698
--- /dev/null
+++ b/Content.Shared/Changeling/Transform/ChangelingTransformSystem.UI.cs
@@ -0,0 +1,33 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Changeling.Transform;
+
+/// <summary>
+/// Send when a player selects an intentity to transform into in the radial menu.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class ChangelingTransformIdentitySelectMessage(NetEntity targetIdentity) : BoundUserInterfaceMessage
+{
+    /// <summary>
+    /// The uid of the cloned identity.
+    /// </summary>
+    public readonly NetEntity TargetIdentity = targetIdentity;
+}
+
+// TODO: Replace with component states.
+// We are already networking the ChangelingIdentityComponent, which contains all this information,
+// so we can just read it from them from the component and update the UI in an AfterAuotHandleState subscription.
+[Serializable, NetSerializable]
+public sealed class ChangelingTransformBoundUserInterfaceState(List<NetEntity> identities) : BoundUserInterfaceState
+{
+    /// <summary>
+    /// The uids of the cloned identities.
+    /// </summary>
+    public readonly List<NetEntity> Identites = identities;
+}
+
+[Serializable, NetSerializable]
+public enum TransformUI : byte
+{
+    Key,
+}
diff --git a/Content.Shared/Changeling/Transform/ChangelingTransformSystem.cs b/Content.Shared/Changeling/Transform/ChangelingTransformSystem.cs
new file mode 100644
index 0000000000..dbc5356448
--- /dev/null
+++ b/Content.Shared/Changeling/Transform/ChangelingTransformSystem.cs
@@ -0,0 +1,180 @@
+using Content.Shared.Actions;
+using Content.Shared.Administration.Logs;
+using Content.Shared.Cloning;
+using Content.Shared.Database;
+using Content.Shared.DoAfter;
+using Content.Shared.Humanoid;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Popups;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Changeling.Transform;
+
+public sealed partial class ChangelingTransformSystem : EntitySystem
+{
+    [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
+    [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
+    [Dependency] private readonly SharedHumanoidAppearanceSystem _humanoidAppearanceSystem = default!;
+    [Dependency] private readonly MetaDataSystem _metaSystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedCloningSystem _cloningSystem = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+
+    private const string ChangelingBuiXmlGeneratedName = "ChangelingTransformBoundUserInterface";
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ChangelingTransformComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<ChangelingTransformComponent, ChangelingTransformActionEvent>(OnTransformAction);
+        SubscribeLocalEvent<ChangelingTransformComponent, ChangelingTransformDoAfterEvent>(OnSuccessfulTransform);
+        SubscribeLocalEvent<ChangelingTransformComponent, ChangelingTransformIdentitySelectMessage>(OnTransformSelected);
+        SubscribeLocalEvent<ChangelingTransformComponent, ComponentShutdown>(OnShutdown);
+    }
+
+    private void OnMapInit(Entity<ChangelingTransformComponent> ent, ref MapInitEvent init)
+    {
+        _actionsSystem.AddAction(ent, ref ent.Comp.ChangelingTransformActionEntity, ent.Comp.ChangelingTransformAction);
+
+        var userInterfaceComp = EnsureComp<UserInterfaceComponent>(ent);
+        _uiSystem.SetUi((ent, userInterfaceComp), TransformUI.Key, new InterfaceData(ChangelingBuiXmlGeneratedName));
+    }
+
+    private void OnShutdown(Entity<ChangelingTransformComponent> ent, ref ComponentShutdown args)
+    {
+        if (ent.Comp.ChangelingTransformActionEntity != null)
+        {
+            _actionsSystem.RemoveAction(ent.Owner, ent.Comp.ChangelingTransformActionEntity);
+        }
+    }
+
+    private void OnTransformAction(Entity<ChangelingTransformComponent> ent,
+        ref ChangelingTransformActionEvent args)
+    {
+        if (!TryComp<UserInterfaceComponent>(ent, out var userInterfaceComp))
+            return;
+
+        if (!TryComp<ChangelingIdentityComponent>(ent, out var userIdentity))
+            return;
+
+        if (!_uiSystem.IsUiOpen((ent, userInterfaceComp), TransformUI.Key, args.Performer))
+        {
+            _uiSystem.OpenUi((ent, userInterfaceComp), TransformUI.Key, args.Performer);
+
+            var identityData = new List<NetEntity>();
+
+            foreach (var consumedIdentity in userIdentity.ConsumedIdentities)
+            {
+                identityData.Add(GetNetEntity(consumedIdentity));
+            }
+
+            _uiSystem.SetUiState((ent, userInterfaceComp), TransformUI.Key, new ChangelingTransformBoundUserInterfaceState(identityData));
+        } //TODO: Can add a Else here with TransformInto and CloseUI to make a quick switch,
+          // issue right now is that Radials cover the Action buttons so clicking the action closes the UI (due to clicking off a radial causing it to close, even with UI)
+          // but pressing the number does.
+    }
+
+    /// <summary>
+    /// Transform the changeling into another identity.
+    /// This can be any cloneable humanoid and doesn't have to be stored in the ChangelingIdentiyComponent,
+    /// so make sure to validate the target before.
+    /// </summary>
+    public void TransformInto(Entity<ChangelingTransformComponent?> ent, EntityUid targetIdentity)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return;
+
+        var selfMessage = Loc.GetString("changeling-transform-attempt-self", ("user", Identity.Entity(ent.Owner, EntityManager)));
+        var othersMessage = Loc.GetString("changeling-transform-attempt-others", ("user", Identity.Entity(ent.Owner, EntityManager)));
+        _popupSystem.PopupPredicted(
+            selfMessage,
+            othersMessage,
+            ent,
+            ent,
+            PopupType.MediumCaution);
+
+        if (_net.IsServer)
+            ent.Comp.CurrentTransformSound = _audio.PlayPvs(ent.Comp.TransformAttemptNoise, ent)?.Entity;
+
+        if(TryComp<ChangelingStoredIdentityComponent>(targetIdentity, out var storedIdentity) && storedIdentity.OriginalSession != null)
+            _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(ent.Owner):player} begun an attempt to transform into \"{Name(targetIdentity)}\" ({storedIdentity.OriginalSession:player}) ");
+        else
+            _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(ent.Owner):player} begun an attempt to transform into \"{Name(targetIdentity)}\"");
+
+        var result = _doAfterSystem.TryStartDoAfter(new DoAfterArgs(
+            EntityManager,
+            ent,
+            ent.Comp.TransformWindup,
+            new ChangelingTransformDoAfterEvent(),
+            ent,
+            target: targetIdentity)
+        {
+            BreakOnMove = true,
+            BreakOnWeightlessMove = true,
+            DuplicateCondition = DuplicateConditions.None,
+            RequireCanInteract = false,
+            DistanceThreshold = null,
+        });
+    }
+
+    private void OnTransformSelected(Entity<ChangelingTransformComponent> ent,
+        ref ChangelingTransformIdentitySelectMessage args)
+    {
+        _uiSystem.CloseUi(ent.Owner, TransformUI.Key, ent);
+
+        if (!TryGetEntity(args.TargetIdentity, out var targetIdentity))
+            return;
+
+        if (!TryComp<ChangelingIdentityComponent>(ent, out var identity))
+            return;
+
+        if (identity.CurrentIdentity == targetIdentity)
+            return; // don't transform into ourselves
+
+        if (!identity.ConsumedIdentities.Contains(targetIdentity.Value))
+            return; // this identity does not belong to this player
+
+        TransformInto(ent.AsNullable(), targetIdentity.Value);
+    }
+
+    private void OnSuccessfulTransform(Entity<ChangelingTransformComponent> ent,
+        ref ChangelingTransformDoAfterEvent args)
+    {
+        args.Handled = true;
+
+        if (EntityManager.EntityExists(ent.Comp.CurrentTransformSound))
+            _audio.Stop(ent.Comp.CurrentTransformSound);
+
+        if (args.Cancelled)
+            return;
+
+        if (!_prototype.Resolve(ent.Comp.TransformCloningSettings, out var settings))
+            return;
+
+        if (args.Target is not { } targetIdentity)
+            return;
+
+        _humanoidAppearanceSystem.CloneAppearance(targetIdentity, args.User);
+        _cloningSystem.CloneComponents(targetIdentity, args.User, settings);
+        
+        if(TryComp<ChangelingStoredIdentityComponent>(targetIdentity, out var storedIdentity) && storedIdentity.OriginalSession != null)
+            _adminLogger.Add(LogType.Action, LogImpact.High, $"{ToPrettyString(ent.Owner):player} successfully transformed into \"{Name(targetIdentity)}\" ({storedIdentity.OriginalSession:player})");
+        else
+            _adminLogger.Add(LogType.Action, LogImpact.High, $"{ToPrettyString(ent.Owner):player} successfully transformed into \"{Name(targetIdentity)}\"");
+        _metaSystem.SetEntityName(ent, Name(targetIdentity), raiseEvents: false);
+
+        Dirty(ent);
+
+        if (TryComp<ChangelingIdentityComponent>(ent, out var identity)) // in case we ever get changelings that don't store identities
+        {
+            identity.CurrentIdentity = targetIdentity;
+            Dirty(ent.Owner, identity);
+        }
+    }
+}
diff --git a/Content.Shared/Chat/Prototypes/EmoteSoundsPrototype.cs b/Content.Shared/Chat/Prototypes/EmoteSoundsPrototype.cs
index 4364e13d84..0138009ef9 100644
--- a/Content.Shared/Chat/Prototypes/EmoteSoundsPrototype.cs
+++ b/Content.Shared/Chat/Prototypes/EmoteSoundsPrototype.cs
@@ -1,7 +1,6 @@
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array;
 
 namespace Content.Shared.Chat.Prototypes;
 
@@ -10,11 +9,20 @@ namespace Content.Shared.Chat.Prototypes;
 ///     Different entities may use different sounds collections.
 /// </summary>
 [Prototype]
-public sealed partial class EmoteSoundsPrototype : IPrototype
+public sealed partial class EmoteSoundsPrototype : IPrototype, IInheritingPrototype
 {
     [IdDataField]
     public string ID { get; private set; } = default!;
 
+    /// <inheritdoc/>
+    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<EmoteSoundsPrototype>))]
+    public string[]? Parents { get; private set; }
+
+    /// <inheritdoc/>
+    [AbstractDataField]
+    [NeverPushInheritance]
+    public bool Abstract { get; }
+
     /// <summary>
     ///     Optional fallback sound that will play if collection
     ///     doesn't have specific sound for this emote id.
@@ -32,6 +40,7 @@ public sealed partial class EmoteSoundsPrototype : IPrototype
     /// <summary>
     ///     Collection of emote prototypes and their sounds.
     /// </summary>
-    [DataField("sounds", customTypeSerializer: typeof(PrototypeIdDictionarySerializer<SoundSpecifier, EmotePrototype>))]
-    public Dictionary<string, SoundSpecifier> Sounds = new();
+    [DataField]
+    [AlwaysPushInheritance]
+    public Dictionary<ProtoId<EmotePrototype>, SoundSpecifier> Sounds = new();
 }
diff --git a/Content.Shared/Chat/SharedChatSystem.cs b/Content.Shared/Chat/SharedChatSystem.cs
index 967980302d..34e955a50e 100644
--- a/Content.Shared/Chat/SharedChatSystem.cs
+++ b/Content.Shared/Chat/SharedChatSystem.cs
@@ -24,6 +24,11 @@ public abstract class SharedChatSystem : EntitySystem
     public const char WhisperPrefix = ',';
     public const char DefaultChannelKey = 'h';
 
+    public const int VoiceRange = 10; // how far voice goes in world units
+    public const int WhisperClearRange = 2; // how far whisper goes while still being understandable, in world units
+    public const int WhisperMuffledRange = 5; // how far whisper goes at all, in world units
+    public const string DefaultAnnouncementSound = "/Audio/Announcements/announce.ogg";
+
     public static readonly ProtoId<RadioChannelPrototype> CommonChannel = "Common";
 
     public static readonly string DefaultChannelPrefix = $"{RadioChannelPrefix}{DefaultChannelKey}";
diff --git a/Content.Shared/Chat/TypingIndicator/TypingIndicatorComponent.cs b/Content.Shared/Chat/TypingIndicator/TypingIndicatorComponent.cs
index f263de4913..7861da4546 100644
--- a/Content.Shared/Chat/TypingIndicator/TypingIndicatorComponent.cs
+++ b/Content.Shared/Chat/TypingIndicator/TypingIndicatorComponent.cs
@@ -7,13 +7,13 @@ namespace Content.Shared.Chat.TypingIndicator;
 ///     Show typing indicator icon when player typing text in chat box.
 ///     Added automatically when player poses entity.
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 [Access(typeof(SharedTypingIndicatorSystem))]
 public sealed partial class TypingIndicatorComponent : Component
 {
     /// <summary>
     ///     Prototype id that store all visual info about typing indicator.
     /// </summary>
-    [DataField("proto")]
+    [DataField("proto"), AutoNetworkedField]
     public ProtoId<TypingIndicatorPrototype> TypingIndicatorPrototype = "default";
 }
diff --git a/Content.Shared/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs b/Content.Shared/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs
index 1abe81180c..913622e19d 100644
--- a/Content.Shared/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs
+++ b/Content.Shared/Chemistry/Components/SolutionManager/ExaminableSolutionComponent.cs
@@ -1,14 +1,70 @@
-namespace Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Nutrition.Components;
+using Robust.Shared.Serialization;
 
+namespace Content.Shared.Chemistry.Components.SolutionManager;
+
+/// <summary>
+///     Component for examining a solution with shift click or through <see cref="SolutionScanEvent"/>.
+/// </summary>
 [RegisterComponent]
 public sealed partial class ExaminableSolutionComponent : Component
 {
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    /// <summary>
+    ///     The solution being examined.
+    /// </summary>
+    [DataField]
     public string Solution = "default";
 
     /// <summary>
-    /// If false then the hidden solution is always visible.
+    ///     If true, the solution must be held to be examined.
     /// </summary>
     [DataField]
     public bool HeldOnly;
+
+    /// <summary>
+    ///     If false, the examine text will give an approximation of the remaining solution.
+    ///     If true, the exact unit count will be shown.
+    /// </summary>
+    [DataField]
+    public bool ExactVolume;
+
+    /// <summary>
+    ///     If false, the solution can't be examined when this entity is closed by <see cref="OpenableComponent"/>.
+    /// </summary>
+    [DataField]
+    public bool ExaminableWhileClosed = true;
+
+    /// <summary>
+    ///     Examine text for the amount of solution.
+    /// </summary>
+    /// <seealso cref="ExaminedVolumeDisplay"/>
+    [DataField]
+    public LocId LocVolume = "examinable-solution-on-examine-volume";
+
+    /// <summary>
+    ///     Examine text for the physical description of the primary reagent.
+    /// </summary>
+    [DataField]
+    public LocId LocPhysicalQuality = "shared-solution-container-component-on-examine-main-text";
+
+    /// <summary>
+    ///     Examine text for reagents that are obvious like water.
+    /// </summary>
+    [DataField]
+    public LocId LocRecognizableReagents = "examinable-solution-has-recognizable-chemicals";
+}
+
+/// <summary>
+///     Used to choose how to display a volume.
+/// </summary>
+[Serializable, NetSerializable]
+public enum ExaminedVolumeDisplay
+{
+    Exact,
+    Full,
+    MostlyFull,
+    HalfFull,
+    HalfEmpty,
+    MostlyEmpty,
+    Empty,
 }
diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.Capabilities.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.Capabilities.cs
index ffdb608875..cc511f8db9 100644
--- a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.Capabilities.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.Capabilities.cs
@@ -1,9 +1,7 @@
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Kitchen.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
-using Content.Shared.Chemistry.Reaction;
 using Content.Shared.FixedPoint;
-using Robust.Shared.Utility;
 using System.Diagnostics.CodeAnalysis;
 using System.Text;
 
@@ -139,12 +137,13 @@ public abstract partial class SharedSolutionContainerSystem
 
     #endregion Solution Modifiers
 
+    /// <returns>A value between 0 and 100 inclusive.</returns>
     public float PercentFull(EntityUid uid)
     {
-        if (!TryGetDrainableSolution(uid, out _, out var solution) || solution.MaxVolume.Equals(FixedPoint2.Zero))
+        if (!TryGetDrainableSolution(uid, out _, out var solution))
             return 0;
 
-        return solution.FillFraction * 100;
+        return PercentFull(solution);
     }
 
     #region Static Methods
@@ -175,5 +174,14 @@ public abstract partial class SharedSolutionContainerSystem
         return sb.ToString();
     }
 
+    /// <returns>A value between 0 and 100 inclusive.</returns>
+    public static float PercentFull(Solution sol)
+    {
+        if (sol.MaxVolume.Equals(FixedPoint2.Zero))
+            return 0;
+
+        return sol.FillFraction * 100;
+    }
+
     #endregion Static Methods
 }
diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
index 83de0970ec..54210cf195 100644
--- a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
@@ -12,6 +12,9 @@ using Content.Shared.Examine;
 using Content.Shared.FixedPoint;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
+using Content.Shared.Localizations;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Verbs;
 using JetBrains.Annotations;
 using Robust.Shared.Containers;
@@ -61,14 +64,15 @@ public partial record struct SolutionAccessAttemptEvent(string SolutionName)
 [UsedImplicitly]
 public abstract partial class SharedSolutionContainerSystem : EntitySystem
 {
-    [Robust.Shared.IoC.Dependency] protected readonly IPrototypeManager PrototypeManager = default!;
-    [Robust.Shared.IoC.Dependency] protected readonly ChemicalReactionSystem ChemicalReactionSystem = default!;
-    [Robust.Shared.IoC.Dependency] protected readonly ExamineSystemShared ExamineSystem = default!;
-    [Robust.Shared.IoC.Dependency] protected readonly SharedAppearanceSystem AppearanceSystem = default!;
-    [Robust.Shared.IoC.Dependency] protected readonly SharedHandsSystem Hands = default!;
-    [Robust.Shared.IoC.Dependency] protected readonly SharedContainerSystem ContainerSystem = default!;
-    [Robust.Shared.IoC.Dependency] protected readonly MetaDataSystem MetaDataSys = default!;
-    [Robust.Shared.IoC.Dependency] protected readonly INetManager NetManager = default!;
+    [Dependency] protected readonly IPrototypeManager PrototypeManager = default!;
+    [Dependency] protected readonly ChemicalReactionSystem ChemicalReactionSystem = default!;
+    [Dependency] protected readonly ExamineSystemShared ExamineSystem = default!;
+    [Dependency] protected readonly OpenableSystem Openable = default!;
+    [Dependency] protected readonly SharedAppearanceSystem AppearanceSystem = default!;
+    [Dependency] protected readonly SharedHandsSystem Hands = default!;
+    [Dependency] protected readonly SharedContainerSystem ContainerSystem = default!;
+    [Dependency] protected readonly MetaDataSystem MetaDataSys = default!;
+    [Dependency] protected readonly INetManager NetManager = default!;
 
     public override void Initialize()
     {
@@ -510,20 +514,20 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
     ///     Removes reagent from a container.
     /// </summary>
     /// <param name="targetUid"></param>
-    /// <param name="container">Solution container from which we are removing reagent</param>
+    /// <param name="container">Solution container from which we are removing reagent.</param>
     /// <param name="reagentQuantity">The reagent to remove.</param>
-    /// <returns>If the reagent to remove was found in the container.</returns>
-    public bool RemoveReagent(Entity<SolutionComponent> soln, ReagentQuantity reagentQuantity)
+    /// <returns>The amount of reagent that was removed.</returns>
+    public FixedPoint2 RemoveReagent(Entity<SolutionComponent> soln, ReagentQuantity reagentQuantity)
     {
         var (uid, comp) = soln;
         var solution = comp.Solution;
 
         var quant = solution.RemoveReagent(reagentQuantity);
         if (quant <= FixedPoint2.Zero)
-            return false;
+            return FixedPoint2.Zero;
 
         UpdateChemicals(soln);
-        return true;
+        return quant;
     }
 
     /// <summary>
@@ -533,8 +537,8 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
     /// <param name="container">Solution container from which we are removing reagent</param>
     /// <param name="prototype">The Id of the reagent to remove.</param>
     /// <param name="quantity">The amount of reagent to remove.</param>
-    /// <returns>If the reagent to remove was found in the container.</returns>
-    public bool RemoveReagent(Entity<SolutionComponent> soln, string prototype, FixedPoint2 quantity, List<ReagentData>? data = null)
+    /// <returns>The amount of reagent that was removed.</returns>
+    public FixedPoint2 RemoveReagent(Entity<SolutionComponent> soln, string prototype, FixedPoint2 quantity, List<ReagentData>? data = null)
     {
         return RemoveReagent(soln, new ReagentQuantity(prototype, quantity, data));
     }
@@ -546,8 +550,8 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
     /// <param name="container">Solution container from which we are removing reagent</param>
     /// <param name="reagentId">The reagent to remove.</param>
     /// <param name="quantity">The amount of reagent to remove.</param>
-    /// <returns>If the reagent to remove was found in the container.</returns>
-    public bool RemoveReagent(Entity<SolutionComponent> soln, ReagentId reagentId, FixedPoint2 quantity)
+    /// <returns>The amount of reagent that was removed.</returns>
+    public FixedPoint2 RemoveReagent(Entity<SolutionComponent> soln, ReagentId reagentId, FixedPoint2 quantity)
     {
         return RemoveReagent(soln, new ReagentQuantity(reagentId, quantity));
     }
@@ -791,52 +795,55 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
         }
     }
 
+    /// <summary>
+    ///     Shift click examine.
+    /// </summary>
     private void OnExamineSolution(Entity<ExaminableSolutionComponent> entity, ref ExaminedEvent args)
     {
-        if (!TryGetSolution(entity.Owner, entity.Comp.Solution, out _, out var solution))
-        {
+        if (!args.IsInDetailsRange ||
+            !CanSeeHiddenSolution(entity, args.Examiner) ||
+            !TryGetSolution(entity.Owner, entity.Comp.Solution, out _, out var solution))
             return;
-        }
-
-        if (!CanSeeHiddenSolution(entity, args.Examiner))
-            return;
-
-        var primaryReagent = solution.GetPrimaryReagentId();
-
-        if (string.IsNullOrEmpty(primaryReagent?.Prototype))
-        {
-            args.PushText(Loc.GetString("shared-solution-container-component-on-examine-empty-container"));
-            return;
-        }
-
-        if (!PrototypeManager.TryIndex(primaryReagent.Value.Prototype, out ReagentPrototype? primary))
-        {
-            Log.Error($"{nameof(Solution)} could not find the prototype associated with {primaryReagent}.");
-            return;
-        }
-
-        var colorHex = solution.GetColor(PrototypeManager)
-            .ToHexNoAlpha(); //TODO: If the chem has a dark color, the examine text becomes black on a black background, which is unreadable.
-        var messageString = "shared-solution-container-component-on-examine-main-text";
 
         using (args.PushGroup(nameof(ExaminableSolutionComponent)))
         {
-            args.PushMarkup(Loc.GetString(messageString,
-                ("color", colorHex),
-                ("wordedAmount", Loc.GetString(solution.Contents.Count == 1
-                    ? "shared-solution-container-component-on-examine-worded-amount-one-reagent"
-                    : "shared-solution-container-component-on-examine-worded-amount-multiple-reagents")),
-                ("desc", primary.LocalizedPhysicalDescription)));
 
-            var reagentPrototypes = solution.GetReagentPrototypes(PrototypeManager);
+            var primaryReagent = solution.GetPrimaryReagentId();
+
+            // If there's no primary reagent, assume the solution is empty and exit early
+            if (string.IsNullOrEmpty(primaryReagent?.Prototype) ||
+                !PrototypeManager.Resolve<ReagentPrototype>(primaryReagent.Value.Prototype, out var primary))
+            {
+                args.PushMarkup(Loc.GetString(entity.Comp.LocVolume, ("fillLevel", ExaminedVolumeDisplay.Empty)));
+                return;
+            }
+
+            // Push amount of reagent
+
+            args.PushMarkup(Loc.GetString(entity.Comp.LocVolume,
+                                ("fillLevel", ExaminedVolume(entity, solution, args.Examiner)),
+                                ("current", solution.Volume),
+                                ("max", solution.MaxVolume)));
+
+            // Push the physical description of the primary reagent
+
+            var colorHex = solution.GetColor(PrototypeManager)
+                .ToHexNoAlpha(); //TODO: If the chem has a dark color, the examine text becomes black on a black background, which is unreadable.
+
+            args.PushMarkup(Loc.GetString(entity.Comp.LocPhysicalQuality,
+                                        ("color", colorHex),
+                                        ("desc", primary.LocalizedPhysicalDescription),
+                                        ("chemCount", solution.Contents.Count) ));
+
+            // Push the recognizable reagents
 
             // Sort the reagents by amount, descending then alphabetically
-            var sortedReagentPrototypes = reagentPrototypes
+            var sortedReagentPrototypes = solution.GetReagentPrototypes(PrototypeManager)
                 .OrderByDescending(pair => pair.Value.Value)
                 .ThenBy(pair => pair.Key.LocalizedName);
 
-            // Add descriptions of immediately recognizable reagents, like water or beer
-            var recognized = new List<ReagentPrototype>();
+            // Collect recognizable reagents, like water or beer
+            var recognized = new List<string>();
             foreach (var keyValuePair in sortedReagentPrototypes)
             {
                 var proto = keyValuePair.Key;
@@ -845,41 +852,58 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
                     continue;
                 }
 
-                recognized.Add(proto);
+                recognized.Add(Loc.GetString("examinable-solution-recognized",
+                                            ("color", proto.SubstanceColor.ToHexNoAlpha()),
+                                            ("chemical", proto.LocalizedName)));
             }
 
-            // Skip if there's nothing recognizable
             if (recognized.Count == 0)
                 return;
 
-            var msg = new StringBuilder();
-            foreach (var reagent in recognized)
-            {
-                string part;
-                if (reagent == recognized[0])
-                {
-                    part = "examinable-solution-recognized-first";
-                }
-                else if (reagent == recognized[^1])
-                {
-                    // this loc specifically  requires space to be appended, fluent doesnt support whitespace
-                    msg.Append(' ');
-                    part = "examinable-solution-recognized-last";
-                }
-                else
-                {
-                    part = "examinable-solution-recognized-next";
-                }
+            var msg = ContentLocalizationManager.FormatList(recognized);
 
-                msg.Append(Loc.GetString(part, ("color", reagent.SubstanceColor.ToHexNoAlpha()),
-                    ("chemical", reagent.LocalizedName)));
-            }
-
-            args.PushMarkup(Loc.GetString("examinable-solution-has-recognizable-chemicals",
-                ("recognizedString", msg.ToString())));
+            // Finally push the full message
+            args.PushMarkup(Loc.GetString(entity.Comp.LocRecognizableReagents,
+                ("recognizedString", msg)));
         }
     }
 
+    /// <returns>An enum for how to display the solution.</returns>
+    public ExaminedVolumeDisplay ExaminedVolume(Entity<ExaminableSolutionComponent> ent, Solution sol, EntityUid? examiner = null)
+    {
+        // Exact measurement
+        if (ent.Comp.ExactVolume)
+            return ExaminedVolumeDisplay.Exact;
+
+        // General approximation
+        return (int)PercentFull(sol) switch
+        {
+            100 => ExaminedVolumeDisplay.Full,
+            > 66 => ExaminedVolumeDisplay.MostlyFull,
+            > 33 => HalfEmptyOrHalfFull(examiner),
+            > 0 => ExaminedVolumeDisplay.MostlyEmpty,
+            _ => ExaminedVolumeDisplay.Empty,
+        };
+    }
+
+    // Some spessmen see half full, some see half empty, but always the same one.
+    private ExaminedVolumeDisplay HalfEmptyOrHalfFull(EntityUid? examiner = null)
+    {
+        // Optimistic when un-observed
+        if (examiner == null)
+            return ExaminedVolumeDisplay.HalfFull;
+
+        var meta = MetaData(examiner.Value);
+        if (meta.EntityName.Length > 0 &&
+            string.Compare(meta.EntityName.Substring(0, 1), "m", StringComparison.InvariantCultureIgnoreCase) > 0)
+            return ExaminedVolumeDisplay.HalfFull;
+
+        return ExaminedVolumeDisplay.HalfEmpty;
+    }
+
+    /// <summary>
+    ///     Full reagent scan, such as with chemical analysis goggles.
+    /// </summary>
     private void OnSolutionExaminableVerb(Entity<ExaminableSolutionComponent> entity, ref GetVerbsEvent<ExamineVerb> args)
     {
         if (!args.CanInteract || !args.CanAccess)
@@ -953,15 +977,18 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
     }
 
     /// <summary>
-    /// Check if examinable solution requires you to hold the item in hand.
+    ///     Check if an examinable solution is hidden by something.
     /// </summary>
     private bool CanSeeHiddenSolution(Entity<ExaminableSolutionComponent> entity, EntityUid examiner)
     {
         // If not held-only then it's always visible.
-        if (!entity.Comp.HeldOnly)
-            return true;
+        if (entity.Comp.HeldOnly && !Hands.IsHolding(examiner, entity, out _))
+            return false;
 
-        return Hands.IsHolding(examiner, entity, out _);
+        if (!entity.Comp.ExaminableWhileClosed && Openable.IsClosed(entity.Owner, predicted: true))
+            return false;
+
+        return true;
     }
 
     private void OnMapInit(Entity<SolutionContainerManagerComponent> entity, ref MapInitEvent args)
diff --git a/Content.Shared/Cloning/SharedCloningSystem.cs b/Content.Shared/Cloning/SharedCloningSystem.cs
new file mode 100644
index 0000000000..d8ab8a2aa1
--- /dev/null
+++ b/Content.Shared/Cloning/SharedCloningSystem.cs
@@ -0,0 +1,14 @@
+namespace Content.Shared.Cloning;
+
+public abstract partial class SharedCloningSystem : EntitySystem
+{
+    /// <summary>
+    /// Copy components from one entity to another based on a CloningSettingsPrototype.
+    /// </summary>
+    /// <param name="original">The orignal Entity to clone components from.</param>
+    /// <param name="clone">The target Entity to clone components to.</param>
+    /// <param name="settings">The clone settings prototype containing the list of components to clone.</param>
+    public virtual void CloneComponents(EntityUid original, EntityUid clone, CloningSettingsPrototype settings)
+    {
+    }
+}
diff --git a/Content.Shared/Clothing/Components/FoldableClothingComponent.cs b/Content.Shared/Clothing/Components/FoldableClothingComponent.cs
index 7b03adcc8d..2068162e49 100644
--- a/Content.Shared/Clothing/Components/FoldableClothingComponent.cs
+++ b/Content.Shared/Clothing/Components/FoldableClothingComponent.cs
@@ -35,11 +35,11 @@ public sealed partial class FoldableClothingComponent : Component
     /// Which layers does this hide when Unfolded? See <see cref="HumanoidVisualLayers"/> and <see cref="HideLayerClothingComponent"/>
     /// </summary>
     [DataField]
-    public HashSet<HumanoidVisualLayers>? UnfoldedHideLayers = new();
+    public HashSet<HumanoidVisualLayers> UnfoldedHideLayers = new();
 
     /// <summary>
     /// Which layers does this hide when folded? See <see cref="HumanoidVisualLayers"/> and <see cref="HideLayerClothingComponent"/>
     /// </summary>
     [DataField]
-    public HashSet<HumanoidVisualLayers>? FoldedHideLayers = new();
+    public HashSet<HumanoidVisualLayers> FoldedHideLayers = new();
 }
diff --git a/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs
index a60caa454b..7c6810140c 100644
--- a/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs
@@ -37,7 +37,7 @@ public sealed class FoldableClothingSystem : EntitySystem
         }
 
         // Setting hidden layers while equipped is not currently supported.
-        if (ent.Comp.FoldedHideLayers != null || ent.Comp.UnfoldedHideLayers != null)
+        if (ent.Comp.FoldedHideLayers.Count != 0|| ent.Comp.UnfoldedHideLayers.Count != 0)
             args.Cancelled = true;
     }
 
@@ -65,7 +65,7 @@ public sealed class FoldableClothingSystem : EntitySystem
             // This should instead work via an event or something that gets raised to optionally modify the currently hidden layers.
             // Or at the very least it should stash the old layers and restore them when unfolded.
             // TODO CLOTHING fix this.
-            if (ent.Comp.FoldedHideLayers != null && TryComp<HideLayerClothingComponent>(ent.Owner, out var hideLayerComp))
+            if (ent.Comp.FoldedHideLayers.Count != 0 && TryComp<HideLayerClothingComponent>(ent.Owner, out var hideLayerComp))
                 hideLayerComp.Slots = ent.Comp.FoldedHideLayers;
 
         }
@@ -81,7 +81,7 @@ public sealed class FoldableClothingSystem : EntitySystem
                 _itemSystem.SetHeldPrefix(ent.Owner, null, false, itemComp);
 
             // TODO CLOTHING fix this.
-            if (ent.Comp.UnfoldedHideLayers != null && TryComp<HideLayerClothingComponent>(ent.Owner, out var hideLayerComp))
+            if (ent.Comp.UnfoldedHideLayers.Count != 0 && TryComp<HideLayerClothingComponent>(ent.Owner, out var hideLayerComp))
                 hideLayerComp.Slots = ent.Comp.UnfoldedHideLayers;
 
         }
diff --git a/Content.Shared/Configurable/ConfigurationComponent.cs b/Content.Shared/Configurable/ConfigurationComponent.cs
index 63c0845083..80affb81f5 100644
--- a/Content.Shared/Configurable/ConfigurationComponent.cs
+++ b/Content.Shared/Configurable/ConfigurationComponent.cs
@@ -13,7 +13,7 @@ namespace Content.Shared.Configurable
     /// <remarks>
     /// If you want a more detailed description ask the original coder.
     /// </remarks>
-    [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+    [RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
     public sealed partial class ConfigurationComponent : Component
     {
         /// <summary>
diff --git a/Content.Shared/Damage/Components/DamageUserOnTriggerComponent.cs b/Content.Shared/Damage/Components/DamageUserOnTriggerComponent.cs
deleted file mode 100644
index 87adc0cc90..0000000000
--- a/Content.Shared/Damage/Components/DamageUserOnTriggerComponent.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Content.Shared.Damage.Components;
-
-[RegisterComponent]
-public sealed partial class DamageUserOnTriggerComponent : Component
-{
-    [DataField("ignoreResistances")] public bool IgnoreResistances;
-
-    [DataField("damage", required: true)]
-    public DamageSpecifier Damage = default!;
-}
diff --git a/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs b/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs
index feb5dd4140..4bf762c479 100644
--- a/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs
+++ b/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Events;
 using Content.Shared.Destructible;
+using Content.Shared.Nutrition;
 using Content.Shared.Prototypes;
 using Content.Shared.Rejuvenate;
 using Content.Shared.Slippery;
@@ -24,6 +25,7 @@ public abstract class SharedGodmodeSystem : EntitySystem
         SubscribeLocalEvent<GodmodeComponent, BeforeStatusEffectAddedEvent>(OnBeforeStatusEffect);
         SubscribeLocalEvent<GodmodeComponent, BeforeOldStatusEffectAddedEvent>(OnBeforeOldStatusEffect);
         SubscribeLocalEvent<GodmodeComponent, BeforeStaminaDamageEvent>(OnBeforeStaminaDamage);
+        SubscribeLocalEvent<GodmodeComponent, IngestibleEvent>(BeforeEdible);
         SubscribeLocalEvent<GodmodeComponent, SlipAttemptEvent>(OnSlipAttempt);
         SubscribeLocalEvent<GodmodeComponent, DestructionAttemptEvent>(OnDestruction);
     }
@@ -60,6 +62,11 @@ public abstract class SharedGodmodeSystem : EntitySystem
         args.Cancel();
     }
 
+    private void BeforeEdible(Entity<GodmodeComponent> ent, ref IngestibleEvent args)
+    {
+        args.Cancelled = true;
+    }
+
     public virtual void EnableGodmode(EntityUid uid, GodmodeComponent? godmode = null)
     {
         godmode ??= EnsureComp<GodmodeComponent>(uid);
diff --git a/Content.Shared/DisplacementMap/DisplacementData.cs b/Content.Shared/DisplacementMap/DisplacementData.cs
index 6564f720a8..79f89a1d25 100644
--- a/Content.Shared/DisplacementMap/DisplacementData.cs
+++ b/Content.Shared/DisplacementMap/DisplacementData.cs
@@ -1,6 +1,8 @@
+using Robust.Shared.Serialization;
+
 namespace Content.Shared.DisplacementMap;
 
-[DataDefinition]
+[DataDefinition, Serializable, NetSerializable]
 public sealed partial class DisplacementData
 {
     /// <summary>
diff --git a/Content.Shared/Disposal/Unit/SharedDisposalUnitSystem.cs b/Content.Shared/Disposal/Unit/SharedDisposalUnitSystem.cs
index bdf8b5ba07..292cfd2b3c 100644
--- a/Content.Shared/Disposal/Unit/SharedDisposalUnitSystem.cs
+++ b/Content.Shared/Disposal/Unit/SharedDisposalUnitSystem.cs
@@ -1,7 +1,6 @@
 using System.Linq;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Administration.Logs;
-using Content.Shared.Body.Components;
 using Content.Shared.Climbing.Systems;
 using Content.Shared.Containers;
 using Content.Shared.Database;
@@ -15,6 +14,7 @@ using Content.Shared.Hands.EntitySystems;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Item;
+using Content.Shared.Mobs.Components;
 using Content.Shared.Movement.Events;
 using Content.Shared.Popups;
 using Content.Shared.Power;
@@ -450,7 +450,7 @@ public abstract class SharedDisposalUnitSystem : EntitySystem
             return false;
 
         var storable = HasComp<ItemComponent>(entity);
-        if (!storable && !HasComp<BodyComponent>(entity))
+        if (!storable && !HasComp<MobStateComponent>(entity))
             return false;
 
         if (_whitelistSystem.IsBlacklistPass(component.Blacklist, entity) ||
diff --git a/Content.Shared/DoAfter/DoAfterArgs.cs b/Content.Shared/DoAfter/DoAfterArgs.cs
index ac66278538..ba2b38ab5d 100644
--- a/Content.Shared/DoAfter/DoAfterArgs.cs
+++ b/Content.Shared/DoAfter/DoAfterArgs.cs
@@ -122,7 +122,7 @@ public sealed partial class DoAfterArgs
     ///     Threshold for distance user from the used OR target entities.
     /// </summary>
     [DataField]
-    public float? DistanceThreshold;
+    public float? DistanceThreshold = 1.5f;
 
     /// <summary>
     ///     Whether damage will cancel the DoAfter. See also <see cref="DamageThreshold"/>.
diff --git a/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs b/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs
index f6eb9ef996..31ff034809 100644
--- a/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs
+++ b/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs
@@ -192,11 +192,6 @@ public abstract partial class SharedDoAfterSystem : EntitySystem
                 if (!_interaction.InRangeUnobstructed(args.User, args.Target.Value, args.DistanceThreshold.Value))
                     return true;
             }
-            else
-            {
-                if (!_interaction.InRangeUnobstructed(args.User, args.Target.Value))
-                    return true;
-            }
         }
 
         // Whether the distance between the tool and the user has grown too much.
@@ -209,11 +204,6 @@ public abstract partial class SharedDoAfterSystem : EntitySystem
                         args.DistanceThreshold.Value))
                     return true;
             }
-            else
-            {
-                if (!_interaction.InRangeUnobstructed(args.User,args.Used.Value))
-                    return true;
-            }
         }
 
         if (args.AttemptFrequency == AttemptFrequency.EveryTick && !TryAttemptEvent(doAfter))
diff --git a/Content.Shared/Emp/SharedEmpSystem.cs b/Content.Shared/Emp/SharedEmpSystem.cs
index 6e4478bb6d..deb2afd709 100644
--- a/Content.Shared/Emp/SharedEmpSystem.cs
+++ b/Content.Shared/Emp/SharedEmpSystem.cs
@@ -1,3 +1,5 @@
+using Content.Shared.Examine;
+using Robust.Shared.Map;
 using Robust.Shared.Timing;
 
 namespace Content.Shared.Emp;
@@ -6,5 +8,28 @@ public abstract class SharedEmpSystem : EntitySystem
 {
     [Dependency] protected readonly IGameTiming Timing = default!;
 
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<EmpDisabledComponent, ExaminedEvent>(OnExamine);
+    }
+
     protected const string EmpDisabledEffectPrototype = "EffectEmpDisabled";
+
+    /// <summary>
+    /// Triggers an EMP pulse at the given location, by first raising an <see cref="EmpAttemptEvent"/>, then a raising <see cref="EmpPulseEvent"/> on all entities in range.
+    /// </summary>
+    /// <param name="coordinates">The location to trigger the EMP pulse at.</param>
+    /// <param name="range">The range of the EMP pulse.</param>
+    /// <param name="energyConsumption">The amount of energy consumed by the EMP pulse.</param>
+    /// <param name="duration">The duration of the EMP effects.</param>
+    public virtual void EmpPulse(MapCoordinates coordinates, float range, float energyConsumption, float duration)
+    {
+    }
+
+    private void OnExamine(Entity<EmpDisabledComponent> ent, ref ExaminedEvent args)
+    {
+        args.PushMarkup(Loc.GetString("emp-disabled-comp-on-examine"));
+    }
 }
diff --git a/Content.Shared/EntityEffects/EffectConditions/SolutionTemperature.cs b/Content.Shared/EntityEffects/EffectConditions/SolutionTemperature.cs
index a9629401a0..e2febd8f48 100644
--- a/Content.Shared/EntityEffects/EffectConditions/SolutionTemperature.cs
+++ b/Content.Shared/EntityEffects/EffectConditions/SolutionTemperature.cs
@@ -13,17 +13,14 @@ public sealed partial class SolutionTemperature : EntityEffectCondition
 
     [DataField]
     public float Max = float.PositiveInfinity;
+
     public override bool Condition(EntityEffectBaseArgs args)
     {
         if (args is EntityEffectReagentArgs reagentArgs)
         {
-            if (reagentArgs.Source == null)
-                return false;
-            if (reagentArgs.Source.Temperature < Min)
-                return false;
-            if (reagentArgs.Source.Temperature > Max)
-                return false;
-            return true;
+            return reagentArgs?.Source != null &&
+                   reagentArgs.Source.Temperature >= Min &&
+                   reagentArgs.Source.Temperature <= Max;
         }
 
         // TODO: Someone needs to figure out how to do this for non-reagent effects.
diff --git a/Content.Shared/EntityEffects/EffectConditions/TotalDamage.cs b/Content.Shared/EntityEffects/EffectConditions/TotalDamage.cs
index 62b3e037e1..a4baeb634a 100644
--- a/Content.Shared/EntityEffects/EffectConditions/TotalDamage.cs
+++ b/Content.Shared/EntityEffects/EffectConditions/TotalDamage.cs
@@ -18,8 +18,7 @@ public sealed partial class TotalDamage : EntityEffectCondition
         if (args.EntityManager.TryGetComponent(args.TargetEntity, out DamageableComponent? damage))
         {
             var total = damage.TotalDamage;
-            if (total > Min && total < Max)
-                return true;
+            return total >= Min && total <= Max;
         }
 
         return false;
diff --git a/Content.Shared/EntityEffects/EffectConditions/TotalHunger.cs b/Content.Shared/EntityEffects/EffectConditions/TotalHunger.cs
index b4f1a1af89..cbeb334c47 100644
--- a/Content.Shared/EntityEffects/EffectConditions/TotalHunger.cs
+++ b/Content.Shared/EntityEffects/EffectConditions/TotalHunger.cs
@@ -18,8 +18,7 @@ public sealed partial class Hunger : EntityEffectCondition
         if (args.EntityManager.TryGetComponent(args.TargetEntity, out HungerComponent? hunger))
         {
             var total = args.EntityManager.System<HungerSystem>().GetHunger(hunger);
-            if (total > Min && total < Max)
-                return true;
+            return total >= Min && total <= Max;
         }
 
         return false;
diff --git a/Content.Shared/Explosion/Components/ActiveTimerTriggerComponent.cs b/Content.Shared/Explosion/Components/ActiveTimerTriggerComponent.cs
deleted file mode 100644
index 6d43abc9d9..0000000000
--- a/Content.Shared/Explosion/Components/ActiveTimerTriggerComponent.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Robust.Shared.Audio;
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Explosion.Components;
-
-/// <summary>
-///     Component for tracking active trigger timers. A timers can activated by some other component, e.g. <see cref="OnUseTimerTriggerComponent"/>.
-/// </summary>
-[RegisterComponent]
-public sealed partial class ActiveTimerTriggerComponent : Component
-{
-    [DataField] public float TimeRemaining;
-
-    [DataField] public EntityUid? User;
-
-    [DataField] public float BeepInterval;
-
-    [DataField] public float TimeUntilBeep;
-
-    [DataField] public SoundSpecifier? BeepSound;
-}
diff --git a/Content.Shared/Explosion/Components/OnTrigger/ExplodeOnTriggerComponent.cs b/Content.Shared/Explosion/Components/OnTrigger/ExplodeOnTriggerComponent.cs
deleted file mode 100644
index e14cd12464..0000000000
--- a/Content.Shared/Explosion/Components/OnTrigger/ExplodeOnTriggerComponent.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Explosion.Components.OnTrigger;
-
-/// <summary>
-/// Explode using the entity's <see cref="ExplosiveComponent"/> if Triggered.
-/// </summary>
-[RegisterComponent, NetworkedComponent]
-public sealed partial class ExplodeOnTriggerComponent : Component
-{
-}
diff --git a/Content.Shared/Explosion/Components/OnUseTimerTriggerComponent.cs b/Content.Shared/Explosion/Components/OnUseTimerTriggerComponent.cs
deleted file mode 100644
index 983b8a31ee..0000000000
--- a/Content.Shared/Explosion/Components/OnUseTimerTriggerComponent.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System.Linq;
-using Content.Shared.Guidebook;
-using Robust.Shared.Audio;
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Explosion.Components
-{
-    [RegisterComponent, NetworkedComponent]
-    public sealed partial class OnUseTimerTriggerComponent : Component
-    {
-        [DataField] public float Delay = 1f;
-
-        /// <summary>
-        ///     If not null, a user can use verbs to configure the delay to one of these options.
-        /// </summary>
-        [DataField] public List<float>? DelayOptions = null;
-
-        /// <summary>
-        ///     If not null, this timer will periodically play this sound while active.
-        /// </summary>
-        [DataField] public SoundSpecifier? BeepSound;
-
-        /// <summary>
-        ///     Time before beeping starts. Defaults to a single beep interval. If set to zero, will emit a beep immediately after use.
-        /// </summary>
-        [DataField] public float? InitialBeepDelay;
-
-        [DataField] public float BeepInterval = 1;
-
-        /// <summary>
-        ///     Whether the timer should instead be activated through a verb in the right-click menu
-        /// </summary>
-        [DataField] public bool UseVerbInstead = false;
-
-        /// <summary>
-        ///     Should timer be started when it was stuck to another entity.
-        ///     Used for C4 charges and similar behaviour.
-        /// </summary>
-        [DataField] public bool StartOnStick;
-
-        /// <summary>
-        ///     Allows changing the start-on-stick quality.
-        /// </summary>
-        [DataField("canToggleStartOnStick")] public bool AllowToggleStartOnStick;
-
-        /// <summary>
-        ///     Whether you can examine the item to see its timer or not.
-        /// </summary>
-        [DataField] public bool Examinable = true;
-
-        /// <summary>
-        ///     Whether or not to show the user a popup when starting the timer.
-        /// </summary>
-        [DataField] public bool DoPopup = true;
-
-        #region GuidebookData
-
-        [GuidebookData]
-        public float? ShortestDelayOption => DelayOptions?.Min();
-
-        [GuidebookData]
-        public float? LongestDelayOption => DelayOptions?.Max();
-
-        #endregion GuidebookData
-    }
-}
diff --git a/Content.Shared/Explosion/Components/ScatteringGrenadeComponent.cs b/Content.Shared/Explosion/Components/ScatteringGrenadeComponent.cs
index 059ad189d1..1cab5d1a77 100644
--- a/Content.Shared/Explosion/Components/ScatteringGrenadeComponent.cs
+++ b/Content.Shared/Explosion/Components/ScatteringGrenadeComponent.cs
@@ -112,4 +112,10 @@ public sealed partial class ScatteringGrenadeComponent : Component
     /// We need to store this because we are only allowed to spawn and trigger timed entities on the next available frame update
     /// </summary>
     public bool IsTriggered = false;
+
+    /// <summary>
+    /// The trigger key that will activate the grenade.
+    /// </summary>
+    [DataField]
+    public string TriggerKey = "timer";
 }
diff --git a/Content.Shared/Explosion/Components/SharedTriggerOnProximityComponent.cs b/Content.Shared/Explosion/Components/SharedTriggerOnProximityComponent.cs
deleted file mode 100644
index 02d1156104..0000000000
--- a/Content.Shared/Explosion/Components/SharedTriggerOnProximityComponent.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Explosion.Components;
-
-[NetworkedComponent]
-public abstract partial class SharedTriggerOnProximityComponent : Component
-{
-
-}
diff --git a/Content.Shared/Explosion/EntitySystems/SharedReleaseGasOnTriggerSystem.cs b/Content.Shared/Explosion/EntitySystems/SharedReleaseGasOnTriggerSystem.cs
deleted file mode 100644
index 5027b04517..0000000000
--- a/Content.Shared/Explosion/EntitySystems/SharedReleaseGasOnTriggerSystem.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace Content.Shared.Explosion.EntitySystems;
-
-public abstract partial class SharedReleaseGasOnTriggerSystem : EntitySystem;
-
-// I have dreams of Atmos in shared.
diff --git a/Content.Shared/Explosion/EntitySystems/SharedRepulseAttractOnTriggerSystem.cs b/Content.Shared/Explosion/EntitySystems/SharedRepulseAttractOnTriggerSystem.cs
deleted file mode 100644
index 386024fbeb..0000000000
--- a/Content.Shared/Explosion/EntitySystems/SharedRepulseAttractOnTriggerSystem.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace Content.Shared.Explosion.EntitySystems;
-
-public abstract class SharedRepulseAttractOnTriggerSystem : EntitySystem;
diff --git a/Content.Shared/Explosion/EntitySystems/SharedSmokeOnTriggerSystem.cs b/Content.Shared/Explosion/EntitySystems/SharedSmokeOnTriggerSystem.cs
deleted file mode 100644
index b206dfa696..0000000000
--- a/Content.Shared/Explosion/EntitySystems/SharedSmokeOnTriggerSystem.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace Content.Shared.Explosion.EntitySystems;
-
-public abstract class SharedSmokeOnTriggerSystem : EntitySystem
-{
-}
diff --git a/Content.Shared/Explosion/EntitySystems/SharedTriggerSystem.cs b/Content.Shared/Explosion/EntitySystems/SharedTriggerSystem.cs
deleted file mode 100644
index cc5b3f6b74..0000000000
--- a/Content.Shared/Explosion/EntitySystems/SharedTriggerSystem.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Content.Shared.Explosion.EntitySystems;
-
-public abstract class SharedTriggerSystem : EntitySystem
-{
-	
-}
\ No newline at end of file
diff --git a/Content.Shared/Flash/Components/FlashOnTriggerComponent.cs b/Content.Shared/Flash/Components/FlashOnTriggerComponent.cs
deleted file mode 100644
index e735b3784a..0000000000
--- a/Content.Shared/Flash/Components/FlashOnTriggerComponent.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Robust.Shared.GameStates;
-namespace Content.Shared.Flash.Components;
-
-/// <summary>
-/// Upon being triggered will flash in an area around it.
-/// </summary>
-[RegisterComponent, NetworkedComponent]
-public sealed partial class FlashOnTriggerComponent : Component
-{
-    [DataField]
-    public float Range = 1.0f;
-
-    [DataField]
-    public TimeSpan Duration = TimeSpan.FromSeconds(8);
-
-    [DataField]
-    public float Probability = 1.0f;
-}
diff --git a/Content.Shared/Follower/Components/FollowerComponent.cs b/Content.Shared/Follower/Components/FollowerComponent.cs
index ede810293f..15d23a7037 100644
--- a/Content.Shared/Follower/Components/FollowerComponent.cs
+++ b/Content.Shared/Follower/Components/FollowerComponent.cs
@@ -4,7 +4,7 @@ namespace Content.Shared.Follower.Components;
 
 [RegisterComponent]
 [Access(typeof(FollowerSystem))]
-[NetworkedComponent, AutoGenerateComponentState(RaiseAfterAutoHandleState = true)]
+[NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class FollowerComponent : Component
 {
     [AutoNetworkedField, DataField("following")]
diff --git a/Content.Shared/Follower/FollowerSystem.cs b/Content.Shared/Follower/FollowerSystem.cs
index b9c2f4bece..07639a1790 100644
--- a/Content.Shared/Follower/FollowerSystem.cs
+++ b/Content.Shared/Follower/FollowerSystem.cs
@@ -44,7 +44,6 @@ public sealed class FollowerSystem : EntitySystem
         SubscribeLocalEvent<FollowerComponent, MoveInputEvent>(OnFollowerMove);
         SubscribeLocalEvent<FollowerComponent, PullStartedMessage>(OnPullStarted);
         SubscribeLocalEvent<FollowerComponent, EntityTerminatingEvent>(OnFollowerTerminating);
-        SubscribeLocalEvent<FollowerComponent, AfterAutoHandleStateEvent>(OnAfterHandleState);
 
         SubscribeLocalEvent<FollowedComponent, ComponentGetStateAttemptEvent>(OnFollowedAttempt);
         SubscribeLocalEvent<FollowerComponent, GotEquippedHandEvent>(OnGotEquippedHand);
@@ -150,11 +149,6 @@ public sealed class FollowerSystem : EntitySystem
         StopFollowingEntity(uid, component.Following, deparent: false);
     }
 
-    private void OnAfterHandleState(Entity<FollowerComponent> entity, ref AfterAutoHandleStateEvent args)
-    {
-        StartFollowingEntity(entity, entity.Comp.Following);
-    }
-
     // Since we parent our observer to the followed entity, we need to detach
     // before they get deleted so that we don't get recursively deleted too.
     private void OnFollowedTerminating(EntityUid uid, FollowedComponent component, ref EntityTerminatingEvent args)
diff --git a/Content.Shared/Forensics/Systems/SharedForensicsSystem.cs b/Content.Shared/Forensics/Systems/SharedForensicsSystem.cs
new file mode 100644
index 0000000000..1220b75fff
--- /dev/null
+++ b/Content.Shared/Forensics/Systems/SharedForensicsSystem.cs
@@ -0,0 +1,18 @@
+using Content.Shared.Forensics.Components;
+
+namespace Content.Shared.Forensics.Systems;
+
+public abstract class SharedForensicsSystem : EntitySystem
+{
+    /// <summary>
+    /// Give the entity a new, random DNA string and call an event to notify other systems like the bloodstream that it has been changed.
+    /// Does nothing if it does not have the DnaComponent.
+    /// </summary>
+    public virtual void RandomizeDNA(Entity<DnaComponent?> ent) { }
+
+    /// <summary>
+    /// Give the entity a new, random fingerprint string.
+    /// Does nothing if it does not have the FingerprintComponent.
+    /// </summary>
+    public virtual void RandomizeFingerprint(Entity<FingerprintComponent?> ent) { }
+}
diff --git a/Content.Shared/Glue/GlueComponent.cs b/Content.Shared/Glue/GlueComponent.cs
index 4cbbc49737..6f68b3fbca 100644
--- a/Content.Shared/Glue/GlueComponent.cs
+++ b/Content.Shared/Glue/GlueComponent.cs
@@ -2,41 +2,44 @@ using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Glue;
 
-[RegisterComponent, NetworkedComponent]
-[Access(typeof(SharedGlueSystem))]
+/// <summary>
+/// This component indicates that an item is glue and can be used as such.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(GlueSystem))]
 public sealed partial class GlueComponent : Component
 {
     /// <summary>
     /// Noise made when glue applied.
     /// </summary>
-    [DataField("squeeze")]
+    [DataField, AutoNetworkedField]
     public SoundSpecifier Squeeze = new SoundPathSpecifier("/Audio/Items/squeezebottle.ogg");
 
     /// <summary>
     /// Solution on the entity that contains the glue.
     /// </summary>
-    [DataField("solution")]
+    [DataField, AutoNetworkedField]
     public string Solution = "drink";
 
     /// <summary>
     /// Reagent that will be used as glue.
     /// </summary>
-    [DataField("reagent", customTypeSerializer: typeof(PrototypeIdSerializer<ReagentPrototype>))]
-    public string Reagent = "SpaceGlue";
+    [DataField, AutoNetworkedField]
+    public ProtoId<ReagentPrototype> Reagent = "SpaceGlue";
 
     /// <summary>
     /// Reagent consumption per use.
     /// </summary>
-    [DataField("consumptionUnit"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField, AutoNetworkedField]
     public FixedPoint2 ConsumptionUnit = FixedPoint2.New(5);
 
     /// <summary>
     /// Duration per unit
     /// </summary>
-    [DataField("durationPerUnit"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField, AutoNetworkedField]
     public TimeSpan DurationPerUnit = TimeSpan.FromSeconds(6);
 }
diff --git a/Content.Server/Glue/GlueSystem.cs b/Content.Shared/Glue/GlueSystem.cs
similarity index 76%
rename from Content.Server/Glue/GlueSystem.cs
rename to Content.Shared/Glue/GlueSystem.cs
index d8f8e687d2..9782b48b2d 100644
--- a/Content.Server/Glue/GlueSystem.cs
+++ b/Content.Shared/Glue/GlueSystem.cs
@@ -1,7 +1,6 @@
-using Content.Server.Administration.Logs;
+using Content.Shared.Administration.Logs;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Database;
-using Content.Shared.Glue;
 using Content.Shared.Hands;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Components;
@@ -13,17 +12,17 @@ using Content.Shared.Verbs;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Timing;
 
-namespace Content.Server.Glue;
+namespace Content.Shared.Glue;
 
-public sealed class GlueSystem : SharedGlueSystem
+public sealed class GlueSystem : EntitySystem
 {
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly NameModifierSystem _nameMod = default!;
+    [Dependency] private readonly OpenableSystem _openable = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly OpenableSystem _openable = default!;
-    [Dependency] private readonly NameModifierSystem _nameMod = default!;
 
     public override void Initialize()
     {
@@ -62,7 +61,7 @@ public sealed class GlueSystem : SharedGlueSystem
             Act = () => TryGlue(entity, target, user),
             IconEntity = GetNetEntity(entity),
             Text = Loc.GetString("glue-verb-text"),
-            Message = Loc.GetString("glue-verb-message")
+            Message = Loc.GetString("glue-verb-message"),
         };
 
         args.Verbs.Add(verb);
@@ -72,26 +71,29 @@ public sealed class GlueSystem : SharedGlueSystem
     {
         // if item is glued then don't apply glue again so it can be removed for reasonable time
         // If glue is applied to an unremoveable item, the component will disappear after the duration.
-        // This effecitvely means any unremoveable item could be removed with a bottle of glue.
+        // This effectively means any unremoveable item could be removed with a bottle of glue.
         if (HasComp<GluedComponent>(target) || !HasComp<ItemComponent>(target) || HasComp<UnremoveableComponent>(target))
         {
-            _popup.PopupEntity(Loc.GetString("glue-failure", ("target", target)), actor, actor, PopupType.Medium);
+            _popup.PopupClient(Loc.GetString("glue-failure", ("target", target)), actor, actor, PopupType.Medium);
             return false;
         }
 
-        if (HasComp<ItemComponent>(target) && _solutionContainer.TryGetSolution(entity.Owner, entity.Comp.Solution, out _, out var solution))
+        if (HasComp<ItemComponent>(target) && _solutionContainer.TryGetSolution(entity.Owner, entity.Comp.Solution, out var solutionEntity, out _))
         {
-            var quantity = solution.RemoveReagent(entity.Comp.Reagent, entity.Comp.ConsumptionUnit);
+            var quantity = _solutionContainer.RemoveReagent(solutionEntity.Value, entity.Comp.Reagent, entity.Comp.ConsumptionUnit);
             if (quantity > 0)
             {
-                EnsureComp<GluedComponent>(target).Duration = quantity.Double() * entity.Comp.DurationPerUnit;
+                _audio.PlayPredicted(entity.Comp.Squeeze, entity.Owner, actor);
+                _popup.PopupClient(Loc.GetString("glue-success", ("target", target)), actor, actor, PopupType.Medium);
                 _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(actor):actor} glued {ToPrettyString(target):subject} with {ToPrettyString(entity.Owner):tool}");
-                _audio.PlayPvs(entity.Comp.Squeeze, entity.Owner);
-                _popup.PopupEntity(Loc.GetString("glue-success", ("target", target)), actor, actor, PopupType.Medium);
+                var gluedComp = EnsureComp<GluedComponent>(target);
+                gluedComp.Duration = quantity.Double() * entity.Comp.DurationPerUnit;
+                Dirty(target, gluedComp);
                 return true;
             }
         }
-        _popup.PopupEntity(Loc.GetString("glue-failure", ("target", target)), actor, actor, PopupType.Medium);
+
+        _popup.PopupClient(Loc.GetString("glue-failure", ("target", target)), actor, actor, PopupType.Medium);
         return false;
     }
 
@@ -119,9 +121,16 @@ public sealed class GlueSystem : SharedGlueSystem
 
     private void OnHandPickUp(Entity<GluedComponent> entity, ref GotEquippedHandEvent args)
     {
+        // When predicting dropping a glued item prediction will reinsert the item into the hand when rerolling the state to a previous one.
+        // So dropping the item would add UnRemoveableComponent on the client without this guard statement.
+        if (_timing.ApplyingState)
+            return;
+
         var comp = EnsureComp<UnremoveableComponent>(entity);
         comp.DeleteOnDrop = false;
         entity.Comp.Until = _timing.CurTime + entity.Comp.Duration;
+        Dirty(entity.Owner, comp);
+        Dirty(entity);
     }
 
     private void OnRefreshNameModifiers(Entity<GluedComponent> entity, ref RefreshNameModifiersEvent args)
diff --git a/Content.Shared/Glue/GluedComponent.cs b/Content.Shared/Glue/GluedComponent.cs
index 4b46f0aa5b..1ef77c8193 100644
--- a/Content.Shared/Glue/GluedComponent.cs
+++ b/Content.Shared/Glue/GluedComponent.cs
@@ -1,15 +1,26 @@
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Glue;
 
-[RegisterComponent]
-[Access(typeof(SharedGlueSystem))]
+/// <summary>
+/// This component gets attached to an item that has been glued.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
+[Access(typeof(GlueSystem))]
 public sealed partial class GluedComponent : Component
 {
-
-    [DataField("until", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
+    /// <summary>
+    /// The TimeSpan this effect expires at.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
     public TimeSpan Until;
 
-    [DataField("duration", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
+    /// <summary>
+    /// The duration this effect will last. Determined by the quantity of the reagent that is applied.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField]
     public TimeSpan Duration;
 }
diff --git a/Content.Shared/Glue/SharedGlueSystem.cs b/Content.Shared/Glue/SharedGlueSystem.cs
deleted file mode 100644
index d8b413a1e1..0000000000
--- a/Content.Shared/Glue/SharedGlueSystem.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace Content.Shared.Glue;
-
-public abstract class SharedGlueSystem : EntitySystem
-{
-}
diff --git a/Content.Shared/HotPotato/ActiveHotPotatoComponent.cs b/Content.Shared/HotPotato/ActiveHotPotatoComponent.cs
index 9bcd218335..28dbb31324 100644
--- a/Content.Shared/HotPotato/ActiveHotPotatoComponent.cs
+++ b/Content.Shared/HotPotato/ActiveHotPotatoComponent.cs
@@ -12,7 +12,7 @@ public sealed partial class ActiveHotPotatoComponent : Component
     /// <summary>
     /// Hot potato effect spawn cooldown in seconds
     /// </summary>
-    [DataField("effectCooldown"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float EffectCooldown = 0.3f;
 
     /// <summary>
diff --git a/Content.Shared/HotPotato/HotPotatoComponent.cs b/Content.Shared/HotPotato/HotPotatoComponent.cs
index f5b2e16189..b077e91e8f 100644
--- a/Content.Shared/HotPotato/HotPotatoComponent.cs
+++ b/Content.Shared/HotPotato/HotPotatoComponent.cs
@@ -14,7 +14,6 @@ public sealed partial class HotPotatoComponent : Component
     /// <summary>
     /// If set to true entity can be removed by hitting entities if they have hands
     /// </summary>
-    [DataField("canTransfer"), ViewVariables(VVAccess.ReadWrite)]
-    [AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public bool CanTransfer = true;
 }
diff --git a/Content.Shared/HotPotato/SharedHotPotatoSystem.cs b/Content.Shared/HotPotato/SharedHotPotatoSystem.cs
index cd7a5d6da5..6f2f498782 100644
--- a/Content.Shared/HotPotato/SharedHotPotatoSystem.cs
+++ b/Content.Shared/HotPotato/SharedHotPotatoSystem.cs
@@ -1,18 +1,79 @@
+using Content.Shared.Audio;
+using Content.Shared.Damage.Systems;
+using Content.Shared.Hands.Components;
+using Content.Shared.Hands.EntitySystems;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Popups;
+using Content.Shared.Trigger;
+using Content.Shared.Weapons.Melee.Events;
 using Robust.Shared.Containers;
+using Robust.Shared.Timing;
 
 namespace Content.Shared.HotPotato;
 
 public abstract class SharedHotPotatoSystem : EntitySystem
 {
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedAmbientSoundSystem _ambientSound = default!;
+    [Dependency] private readonly DamageOnHoldingSystem _damageOnHolding = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+
     public override void Initialize()
     {
         base.Initialize();
+
         SubscribeLocalEvent<HotPotatoComponent, ContainerGettingRemovedAttemptEvent>(OnRemoveAttempt);
+        SubscribeLocalEvent<HotPotatoComponent, ActiveTimerTriggerEvent>(OnActiveTimer);
+        SubscribeLocalEvent<HotPotatoComponent, MeleeHitEvent>(OnMeleeHit);
     }
 
-    private void OnRemoveAttempt(EntityUid uid, HotPotatoComponent comp, ContainerGettingRemovedAttemptEvent args)
+    private void OnRemoveAttempt(Entity<HotPotatoComponent> ent, ref ContainerGettingRemovedAttemptEvent args)
     {
-        if (!comp.CanTransfer)
+        if (!_timing.ApplyingState && !ent.Comp.CanTransfer)
             args.Cancel();
     }
+
+    private void OnActiveTimer(Entity<HotPotatoComponent> ent, ref ActiveTimerTriggerEvent args)
+    {
+        EnsureComp<ActiveHotPotatoComponent>(ent);
+        ent.Comp.CanTransfer = false;
+        _ambientSound.SetAmbience(ent.Owner, true);
+        _damageOnHolding.SetEnabled(ent.Owner, true);
+        Dirty(ent);
+    }
+
+    private void OnMeleeHit(Entity<HotPotatoComponent> ent, ref MeleeHitEvent args)
+    {
+        if (!HasComp<ActiveHotPotatoComponent>(ent))
+            return;
+
+        ent.Comp.CanTransfer = true;
+        foreach (var hitEntity in args.HitEntities)
+        {
+            if (!TryComp<HandsComponent>(hitEntity, out var hands))
+                continue;
+
+            if (!_hands.IsHolding((hitEntity, hands), ent.Owner, out _) && _hands.TryForcePickupAnyHand(hitEntity, ent.Owner, handsComp: hands))
+            {
+                _popup.PopupPredicted(
+                    Loc.GetString("hot-potato-passed", ("from", Identity.Entity(args.User, EntityManager)), ("to", Identity.Entity(hitEntity, EntityManager))),
+                    ent.Owner,
+                    args.User,
+                    PopupType.Medium);
+                break;
+            }
+
+            _popup.PopupClient(
+                Loc.GetString("hot-potato-failed", ("to", Identity.Entity(hitEntity, EntityManager))),
+                ent.Owner,
+                args.User,
+                PopupType.Medium);
+
+            break;
+        }
+
+        ent.Comp.CanTransfer = false;
+    }
 }
diff --git a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
index 3d3af84a30..1df46e53d6 100644
--- a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
+++ b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
@@ -11,6 +11,7 @@ using Content.Shared.Inventory;
 using Content.Shared.Preferences;
 using Robust.Shared;
 using Robust.Shared.Configuration;
+using Robust.Shared.Enums;
 using Robust.Shared.GameObjects.Components.Localization;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
@@ -152,16 +153,12 @@ public abstract class SharedHumanoidAppearanceSystem : EntitySystem
         targetHumanoid.SkinColor = sourceHumanoid.SkinColor;
         targetHumanoid.EyeColor = sourceHumanoid.EyeColor;
         targetHumanoid.Age = sourceHumanoid.Age;
-        SetSex(target, sourceHumanoid.Sex, false, targetHumanoid);
         targetHumanoid.CustomBaseLayers = new(sourceHumanoid.CustomBaseLayers);
         targetHumanoid.MarkingSet = new(sourceHumanoid.MarkingSet);
 
-        targetHumanoid.Gender = sourceHumanoid.Gender;
+        SetSex(target, sourceHumanoid.Sex, false, targetHumanoid);
+        SetGender((target, targetHumanoid), sourceHumanoid.Gender);
 
-        if (TryComp<GrammarComponent>(target, out var grammar))
-            _grammarSystem.SetGender((target, grammar), sourceHumanoid.Gender);
-
-        _identity.QueueIdentityUpdate(target);
         Dirty(target, targetHumanoid);
     }
 
@@ -264,6 +261,23 @@ public abstract class SharedHumanoidAppearanceSystem : EntitySystem
             Dirty(uid, humanoid);
     }
 
+    /// <summary>
+    /// Sets the gender in the entity's HumanoidAppearanceComponent and GrammarComponent.
+    /// </summary>
+    public void SetGender(Entity<HumanoidAppearanceComponent?> ent, Gender gender)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return;
+
+        ent.Comp.Gender = gender;
+        Dirty(ent);
+
+        if (TryComp<GrammarComponent>(ent, out var grammar))
+            _grammarSystem.SetGender((ent, grammar), gender);
+
+        _identity.QueueIdentityUpdate(ent);
+    }
+
     /// <summary>
     ///     Sets the skin color of this humanoid mob. Will only affect base layers that are not custom,
     ///     custom base layers should use <see cref="SetBaseLayerColor"/> instead.
diff --git a/Content.Shared/Implants/Components/RattleComponent.cs b/Content.Shared/Implants/Components/RattleComponent.cs
deleted file mode 100644
index 3ec63e8e15..0000000000
--- a/Content.Shared/Implants/Components/RattleComponent.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Content.Shared.Radio;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.Implants.Components;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class RattleComponent : Component
-{
-    // The radio channel the message will be sent to
-    [DataField]
-    public ProtoId<RadioChannelPrototype> RadioChannel = "Syndicate";
-
-    // The message that the implant will send when crit
-    [DataField]
-    public LocId CritMessage = "deathrattle-implant-critical-message";
-
-    // The message that the implant will send when dead
-    [DataField]
-    public LocId DeathMessage = "deathrattle-implant-dead-message";
-}
diff --git a/Content.Shared/Implants/Components/SubdermalImplantComponent.cs b/Content.Shared/Implants/Components/SubdermalImplantComponent.cs
index bd0ff09678..390d113dfb 100644
--- a/Content.Shared/Implants/Components/SubdermalImplantComponent.cs
+++ b/Content.Shared/Implants/Components/SubdermalImplantComponent.cs
@@ -49,7 +49,7 @@ public sealed partial class SubdermalImplantComponent : Component
     /// </summary>
     [DataField]
     public EntityWhitelist? Blacklist;
-    
+
     /// <summary>
     /// If set, this ProtoId is used when attempting to draw the implant instead.
     /// Useful if the implant is a child to another implant and you don't want to differentiate between them when drawing.
@@ -66,11 +66,6 @@ public sealed partial class OpenStorageImplantEvent : InstantActionEvent
 
 }
 
-public sealed partial class UseFreedomImplantEvent : InstantActionEvent
-{
-
-}
-
 /// <summary>
 /// Used for triggering trigger events on the implant via action
 /// </summary>
@@ -86,13 +81,3 @@ public sealed partial class OpenUplinkImplantEvent : InstantActionEvent
 {
 
 }
-
-public sealed partial class UseScramImplantEvent : InstantActionEvent
-{
-
-}
-
-public sealed partial class UseDnaScramblerImplantEvent : InstantActionEvent
-{
-
-}
diff --git a/Content.Shared/Implants/Components/TriggerImplantActionComponent.cs b/Content.Shared/Implants/Components/TriggerImplantActionComponent.cs
deleted file mode 100644
index 0f9856f2a4..0000000000
--- a/Content.Shared/Implants/Components/TriggerImplantActionComponent.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Implants.Components;
-
-/// <summary>
-/// Triggers implants when the action is pressed
-/// </summary>
-[RegisterComponent, NetworkedComponent]
-public sealed partial class TriggerImplantActionComponent : Component
-{
-
-}
diff --git a/Content.Shared/Implants/SharedSubdermalImplantSystem.cs b/Content.Shared/Implants/SharedSubdermalImplantSystem.cs
index 95c3f8664f..4c015f1209 100644
--- a/Content.Shared/Implants/SharedSubdermalImplantSystem.cs
+++ b/Content.Shared/Implants/SharedSubdermalImplantSystem.cs
@@ -44,7 +44,8 @@ public abstract class SharedSubdermalImplantSystem : EntitySystem
             _actionsSystem.AddAction(component.ImplantedEntity.Value, ref component.Action, component.ImplantAction, uid);
         }
 
-        //replace micro bomb with macro bomb
+        // replace micro bomb with macro bomb
+        // TODO: this shouldn't be hardcoded here
         if (_container.TryGetContainer(component.ImplantedEntity.Value, ImplanterComponent.ImplantSlotId, out var implantContainer) && _tag.HasTag(uid, MacroBombTag))
         {
             foreach (var implant in implantContainer.ContainedEntities)
@@ -179,7 +180,7 @@ public abstract class SharedSubdermalImplantSystem : EntitySystem
         if (!_container.TryGetContainer(uid, ImplanterComponent.ImplantSlotId, out var implantContainer))
             return;
 
-        var relayEv = new ImplantRelayEvent<T>(args);
+        var relayEv = new ImplantRelayEvent<T>(args, uid);
         foreach (var implant in implantContainer.ContainedEntities)
         {
             if (args is HandledEntityEventArgs { Handled : true })
@@ -194,9 +195,12 @@ public sealed class ImplantRelayEvent<T> where T : notnull
 {
     public readonly T Event;
 
-    public ImplantRelayEvent(T ev)
+    public readonly EntityUid ImplantedEntity;
+
+    public ImplantRelayEvent(T ev, EntityUid implantedEntity)
     {
         Event = ev;
+        ImplantedEntity = implantedEntity;
     }
 }
 
diff --git a/Content.Shared/Interaction/Components/UnremoveableComponent.cs b/Content.Shared/Interaction/Components/UnremoveableComponent.cs
index cd10694865..a3606f3d2c 100644
--- a/Content.Shared/Interaction/Components/UnremoveableComponent.cs
+++ b/Content.Shared/Interaction/Components/UnremoveableComponent.cs
@@ -1,17 +1,14 @@
-using Content.Shared.Whitelist;
 using Robust.Shared.GameStates;
 
-namespace Content.Shared.Interaction.Components
+namespace Content.Shared.Interaction.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class UnremoveableComponent : Component
 {
-    [RegisterComponent]
-    [NetworkedComponent]
-    public sealed partial class UnremoveableComponent : Component
-    {
-        /// <summary>
-        /// If this is true then unremovable items that are removed from inventory are deleted (typically from corpse gibbing).
-        /// Items within unremovable containers are not deleted when removed.
-        /// </summary>
-        [DataField("deleteOnDrop")]
-        public bool DeleteOnDrop = true;
-    }
+    /// <summary>
+    /// If this is true then unremovable items that are removed from inventory are deleted (typically from corpse gibbing).
+    /// Items within unremovable containers are not deleted when removed.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool DeleteOnDrop = true;
 }
diff --git a/Content.Shared/Inventory/InventoryComponent.cs b/Content.Shared/Inventory/InventoryComponent.cs
index 61e0114ff2..664fdd6d56 100644
--- a/Content.Shared/Inventory/InventoryComponent.cs
+++ b/Content.Shared/Inventory/InventoryComponent.cs
@@ -1,7 +1,7 @@
 using Content.Shared.DisplacementMap;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Inventory;
 
@@ -10,28 +10,46 @@ namespace Content.Shared.Inventory;
 [AutoGenerateComponentState(true)]
 public sealed partial class InventoryComponent : Component
 {
-    [DataField("templateId", customTypeSerializer: typeof(PrototypeIdSerializer<InventoryTemplatePrototype>))]
-    [AutoNetworkedField]
-    public string TemplateId { get; set; } = "human";
+    /// <summary>
+    /// The template defining how the inventory layout will look like.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    [ViewVariables] // use the API method
+    public ProtoId<InventoryTemplatePrototype> TemplateId = "human";
 
-    [DataField("speciesId")] public string? SpeciesId { get; set; }
+    /// <summary>
+    /// For setting the TemplateId.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    public ProtoId<InventoryTemplatePrototype> TemplateIdVV
+    {
+        get => TemplateId;
+        set => IoCManager.Resolve<IEntityManager>().System<InventorySystem>().SetTemplateId((Owner, this), value);
+    }
 
+    [DataField, AutoNetworkedField]
+    public string? SpeciesId;
+
+
+    [ViewVariables]
     public SlotDefinition[] Slots = Array.Empty<SlotDefinition>();
+
+    [ViewVariables]
     public ContainerSlot[] Containers = Array.Empty<ContainerSlot>();
 
-    [DataField]
+    [DataField, AutoNetworkedField]
     public Dictionary<string, DisplacementData> Displacements = new();
 
     /// <summary>
     /// Alternate displacement maps, which if available, will be selected for the player of the appropriate gender.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public Dictionary<string, DisplacementData> FemaleDisplacements = new();
 
     /// <summary>
     /// Alternate displacement maps, which if available, will be selected for the player of the appropriate gender.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public Dictionary<string, DisplacementData> MaleDisplacements = new();
 }
 
diff --git a/Content.Shared/Inventory/InventorySystem.Equip.cs b/Content.Shared/Inventory/InventorySystem.Equip.cs
index 3ed068070a..ae038b63f3 100644
--- a/Content.Shared/Inventory/InventorySystem.Equip.cs
+++ b/Content.Shared/Inventory/InventorySystem.Equip.cs
@@ -194,8 +194,6 @@ public abstract partial class InventorySystem
         if (triggerHandContact && !((slotDefinition.SlotFlags & SlotFlags.GLOVES) == 0))
             TriggerHandContactInteraction(target);
 
-        Dirty(target, inventory);
-
         _movementSpeed.RefreshMovementSpeedModifiers(target);
 
         return true;
@@ -487,8 +485,6 @@ public abstract partial class InventorySystem
         if (triggerHandContact && !((slotDefinition.SlotFlags & SlotFlags.GLOVES) == 0))
             TriggerHandContactInteraction(target);
 
-        Dirty(target, inventory);
-
         _movementSpeed.RefreshMovementSpeedModifiers(target);
 
         return true;
diff --git a/Content.Shared/Inventory/InventorySystem.Relay.cs b/Content.Shared/Inventory/InventorySystem.Relay.cs
index fe3267a92f..f4a0ccb5de 100644
--- a/Content.Shared/Inventory/InventorySystem.Relay.cs
+++ b/Content.Shared/Inventory/InventorySystem.Relay.cs
@@ -19,6 +19,7 @@ using Content.Shared.Inventory.Events;
 using Content.Shared.Movement.Events;
 using Content.Shared.Movement.Systems;
 using Content.Shared.NameModifier.EntitySystems;
+using Content.Shared.Nutrition;
 using Content.Shared.Overlays;
 using Content.Shared.Projectiles;
 using Content.Shared.Radio;
@@ -72,6 +73,7 @@ public partial class InventorySystem
         SubscribeLocalEvent<InventoryComponent, FlashAttemptEvent>(RefRelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, WieldAttemptEvent>(RefRelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, UnwieldAttemptEvent>(RefRelayInventoryEvent);
+        SubscribeLocalEvent<InventoryComponent, IngestionAttemptEvent>(RefRelayInventoryEvent);
 
         // Eye/vision events
         SubscribeLocalEvent<InventoryComponent, CanSeeAttemptEvent>(RelayInventoryEvent);
diff --git a/Content.Shared/Inventory/InventorySystem.Slots.cs b/Content.Shared/Inventory/InventorySystem.Slots.cs
index 04d58c1cd5..3f0bdf10d4 100644
--- a/Content.Shared/Inventory/InventorySystem.Slots.cs
+++ b/Content.Shared/Inventory/InventorySystem.Slots.cs
@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using Content.Shared.DisplacementMap;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Storage;
 using Robust.Shared.Containers;
@@ -43,7 +44,7 @@ public partial class InventorySystem : EntitySystem
                 if (!TryComp<T>(item, out var required))
                     continue;
 
-                if ((((IClothingSlots) required).Slots & slot.SlotFlags) == 0x0)
+                if ((((IClothingSlots)required).Slots & slot.SlotFlags) == 0x0)
                     continue;
 
                 target = (item, required);
@@ -55,20 +56,27 @@ public partial class InventorySystem : EntitySystem
         return false;
     }
 
-    protected virtual void OnInit(EntityUid uid, InventoryComponent component, ComponentInit args)
+    /// <summary>
+    /// Copy this component's datafields from one entity to another.
+    /// This can't use CopyComp because the template needs to be applied using the API method.
+    /// <summary>
+    public void CopyComponent(Entity<InventoryComponent?> source, EntityUid target)
     {
-        if (!_prototypeManager.TryIndex(component.TemplateId, out InventoryTemplatePrototype? invTemplate))
+        if (!Resolve(source, ref source.Comp))
             return;
 
-        component.Slots = invTemplate.Slots;
-        component.Containers = new ContainerSlot[component.Slots.Length];
-        for (var i = 0; i < component.Containers.Length; i++)
-        {
-            var slot = component.Slots[i];
-            var container = _containerSystem.EnsureContainer<ContainerSlot>(uid, slot.Name);
-            container.OccludesLight = false;
-            component.Containers[i] = container;
-        }
+        var targetComp = EnsureComp<InventoryComponent>(target);
+        targetComp.SpeciesId = source.Comp.SpeciesId;
+        targetComp.Displacements = new Dictionary<string, DisplacementData>(source.Comp.Displacements);
+        targetComp.FemaleDisplacements = new Dictionary<string, DisplacementData>(source.Comp.FemaleDisplacements);
+        targetComp.MaleDisplacements = new Dictionary<string, DisplacementData>(source.Comp.MaleDisplacements);
+        SetTemplateId((target, targetComp), source.Comp.TemplateId);
+        Dirty(target, targetComp);
+    }
+
+    protected virtual void OnInit(Entity<InventoryComponent> ent, ref ComponentInit args)
+    {
+        UpdateInventoryTemplate(ent);
     }
 
     private void AfterAutoState(Entity<InventoryComponent> ent, ref AfterAutoHandleStateEvent args)
@@ -78,15 +86,31 @@ public partial class InventorySystem : EntitySystem
 
     protected virtual void UpdateInventoryTemplate(Entity<InventoryComponent> ent)
     {
-        if (ent.Comp.LifeStage < ComponentLifeStage.Initialized)
+        if (!_prototypeManager.Resolve(ent.Comp.TemplateId, out var invTemplate))
             return;
 
-        if (!_prototypeManager.TryIndex(ent.Comp.TemplateId, out InventoryTemplatePrototype? invTemplate))
-            return;
+        // Remove any containers that aren't in the new template.
+        foreach (var container in ent.Comp.Containers)
+        {
+            if (invTemplate.Slots.Any(s => s.Name == container.ID))
+                continue;
 
-        DebugTools.Assert(ent.Comp.Slots.Length == invTemplate.Slots.Length);
+            // Empty container before deletion so the contents don't get deleted.
+            // For cases when we update the template while items are already worn.
+            _containerSystem.EmptyContainer(container);
+            _containerSystem.ShutdownContainer(container);
+        }
 
+        // Ensure the containers from the template.
         ent.Comp.Slots = invTemplate.Slots;
+        ent.Comp.Containers = new ContainerSlot[ent.Comp.Slots.Length];
+        for (var i = 0; i < ent.Comp.Containers.Length; i++)
+        {
+            var slot = ent.Comp.Slots[i];
+            var container = _containerSystem.EnsureContainer<ContainerSlot>(ent.Owner, slot.Name);
+            container.OccludesLight = false;
+            ent.Comp.Containers[i] = container;
+        }
 
         var ev = new InventoryTemplateUpdated();
         RaiseLocalEvent(ent, ref ev);
@@ -195,27 +219,21 @@ public partial class InventorySystem : EntitySystem
     }
 
     /// <summary>
-    /// Change the inventory template ID an entity is using. The new template must be compatible.
+    /// Change the inventory template ID an entity is using
+    /// and drop any item that does not have a slot according to the new template.
+    /// This will update the client-side UI accordingly.
     /// </summary>
     /// <remarks>
-    /// <para>
-    /// For an inventory template to be compatible with another, it must have exactly the same slot names.
-    /// All other changes are rejected.
-    /// </para>
     /// </remarks>
     /// <param name="ent">The entity to update.</param>
     /// <param name="newTemplate">The ID of the new inventory template prototype.</param>
-    /// <exception cref="ArgumentException">
-    /// Thrown if the new template is not compatible with the existing one.
-    /// </exception>
     public void SetTemplateId(Entity<InventoryComponent> ent, ProtoId<InventoryTemplatePrototype> newTemplate)
     {
-        var newPrototype = _prototypeManager.Index(newTemplate);
-
-        if (!newPrototype.Slots.Select(x => x.Name).SequenceEqual(ent.Comp.Slots.Select(x => x.Name)))
-            throw new ArgumentException("Incompatible inventory template!");
+        if (ent.Comp.TemplateId == newTemplate)
+            return;
 
         ent.Comp.TemplateId = newTemplate;
+        UpdateInventoryTemplate(ent);
         Dirty(ent);
     }
 
@@ -231,12 +249,12 @@ public partial class InventorySystem : EntitySystem
         private int _nextIdx = 0;
         public static InventorySlotEnumerator Empty = new(Array.Empty<SlotDefinition>(), Array.Empty<ContainerSlot>());
 
-        public InventorySlotEnumerator(InventoryComponent inventory,  SlotFlags flags = SlotFlags.All)
+        public InventorySlotEnumerator(InventoryComponent inventory, SlotFlags flags = SlotFlags.All)
             : this(inventory.Slots, inventory.Containers, flags)
         {
         }
 
-        public InventorySlotEnumerator(SlotDefinition[] slots, ContainerSlot[] containers,  SlotFlags flags = SlotFlags.All)
+        public InventorySlotEnumerator(SlotDefinition[] slots, ContainerSlot[] containers, SlotFlags flags = SlotFlags.All)
         {
             DebugTools.Assert(flags != SlotFlags.NONE);
             DebugTools.AssertEqual(slots.Length, containers.Length);
diff --git a/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs b/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs
index 424bd12bb3..6f6e55b5ef 100644
--- a/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs
+++ b/Content.Shared/Item/ItemToggle/Components/ItemToggleComponent.cs
@@ -50,25 +50,37 @@ public sealed partial class ItemToggleComponent : Component
     /// /// <remarks>
     /// If server-side systems affect the item's toggle, like charge/fuel systems, then the item is not predictable.
     /// </remarks>
-    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public bool Predictable = true;
 
     /// <summary>
     ///     The noise this item makes when it is toggled on.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public SoundSpecifier? SoundActivate;
 
     /// <summary>
     ///     The noise this item makes when it is toggled off.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public SoundSpecifier? SoundDeactivate;
 
+    /// <summary>
+    ///     The popup to show to someone activating this item.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public LocId? PopupActivate;
+
+    /// <summary>
+    ///     The popup to show to someone deactivating this item.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public LocId? PopupDeactivate;
+
     /// <summary>
     ///     The noise this item makes when it is toggled on.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public SoundSpecifier? SoundFailToActivate;
 }
 
diff --git a/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs b/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs
index 8008ecf9e5..ff31faaaa1 100644
--- a/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs
+++ b/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs
@@ -117,30 +117,30 @@ public sealed class ItemToggleSystem : EntitySystem
     /// Sets its state to the opposite of what it is.
     /// </summary>
     /// <returns>Same as <see cref="TrySetActive"/></returns>
-    public bool Toggle(Entity<ItemToggleComponent?> ent, EntityUid? user = null, bool predicted = true)
+    public bool Toggle(Entity<ItemToggleComponent?> ent, EntityUid? user = null, bool predicted = true, bool showPopup = true)
     {
         if (!_query.Resolve(ent, ref ent.Comp, false))
             return false;
 
-        return TrySetActive(ent, !ent.Comp.Activated, user, predicted);
+        return TrySetActive(ent, !ent.Comp.Activated, user, predicted, showPopup);
     }
 
     /// <summary>
     /// Tries to set the activated bool from a value.
     /// </summary>
     /// <returns>false if the attempt fails for any reason</returns>
-    public bool TrySetActive(Entity<ItemToggleComponent?> ent, bool active, EntityUid? user = null, bool predicted = true)
+    public bool TrySetActive(Entity<ItemToggleComponent?> ent, bool active, EntityUid? user = null, bool predicted = true, bool showPopup = true)
     {
         if (active)
-            return TryActivate(ent, user, predicted: predicted);
+            return TryActivate(ent, user, predicted: predicted, showPopup);
         else
-            return TryDeactivate(ent, user, predicted: predicted);
+            return TryDeactivate(ent, user, predicted: predicted, showPopup);
     }
 
     /// <summary>
     /// Used when an item is attempting to be activated. It returns false if the attempt fails any reason, interrupting the activation.
     /// </summary>
-    public bool TryActivate(Entity<ItemToggleComponent?> ent, EntityUid? user = null, bool predicted = true)
+    public bool TryActivate(Entity<ItemToggleComponent?> ent, EntityUid? user = null, bool predicted = true, bool showPopup = true)
     {
         if (!_query.Resolve(ent, ref ent.Comp, false))
             return false;
@@ -169,7 +169,7 @@ public sealed class ItemToggleSystem : EntitySystem
             else
                 _audio.PlayPvs(comp.SoundFailToActivate, uid);
 
-            if (attempt.Popup != null && user != null)
+            if (showPopup && attempt.Popup != null && user != null)
             {
                 if (predicted)
                     _popup.PopupClient(attempt.Popup, uid, user.Value);
@@ -180,14 +180,14 @@ public sealed class ItemToggleSystem : EntitySystem
             return false;
         }
 
-        Activate((uid, comp), predicted, user);
+        Activate((uid, comp), predicted, user, showPopup);
         return true;
     }
 
     /// <summary>
     /// Used when an item is attempting to be deactivated. It returns false if the attempt fails any reason, interrupting the deactivation.
     /// </summary>
-    public bool TryDeactivate(Entity<ItemToggleComponent?> ent, EntityUid? user = null, bool predicted = true)
+    public bool TryDeactivate(Entity<ItemToggleComponent?> ent, EntityUid? user = null, bool predicted = true, bool showPopup = true)
     {
         if (!_query.Resolve(ent, ref ent.Comp, false))
             return false;
@@ -211,7 +211,7 @@ public sealed class ItemToggleSystem : EntitySystem
             if (attempt.Silent)
                 return false;
 
-            if (attempt.Popup != null && user != null)
+            if (showPopup && attempt.Popup != null && user != null)
             {
                 if (predicted)
                     _popup.PopupClient(attempt.Popup, uid, user.Value);
@@ -222,18 +222,26 @@ public sealed class ItemToggleSystem : EntitySystem
             return false;
         }
 
-        Deactivate((uid, comp), predicted, user);
+        Deactivate((uid, comp), predicted, user, showPopup);
         return true;
     }
 
-    private void Activate(Entity<ItemToggleComponent> ent, bool predicted, EntityUid? user = null)
+    private void Activate(Entity<ItemToggleComponent> ent, bool predicted, EntityUid? user = null, bool showPopup = true)
     {
         var (uid, comp) = ent;
         var soundToPlay = comp.SoundActivate;
         if (predicted)
+        {
             _audio.PlayPredicted(soundToPlay, uid, user);
+            if (showPopup && ent.Comp.PopupActivate != null && user != null)
+                _popup.PopupClient(Loc.GetString(ent.Comp.PopupActivate), user.Value, user.Value);
+        }
         else
+        {
             _audio.PlayPvs(soundToPlay, uid);
+            if (showPopup && ent.Comp.PopupActivate != null && user != null)
+                _popup.PopupEntity(Loc.GetString(ent.Comp.PopupActivate), user.Value, user.Value);
+        }
 
         comp.Activated = true;
         UpdateVisuals((uid, comp));
@@ -246,14 +254,22 @@ public sealed class ItemToggleSystem : EntitySystem
     /// <summary>
     /// Used to make the actual changes to the item's components on deactivation.
     /// </summary>
-    private void Deactivate(Entity<ItemToggleComponent> ent, bool predicted, EntityUid? user = null)
+    private void Deactivate(Entity<ItemToggleComponent> ent, bool predicted, EntityUid? user = null, bool showPopup = true)
     {
         var (uid, comp) = ent;
         var soundToPlay = comp.SoundDeactivate;
         if (predicted)
+        {
             _audio.PlayPredicted(soundToPlay, uid, user);
+            if (showPopup && ent.Comp.PopupDeactivate != null && user != null)
+                _popup.PopupClient(Loc.GetString(ent.Comp.PopupDeactivate), user.Value, user.Value);
+        }
         else
+        {
             _audio.PlayPvs(soundToPlay, uid);
+            if (showPopup && ent.Comp.PopupDeactivate != null && user != null)
+                _popup.PopupEntity(Loc.GetString(ent.Comp.PopupDeactivate), user.Value, user.Value);
+        }
 
         comp.Activated = false;
         UpdateVisuals((uid, comp));
diff --git a/Content.Shared/KillTome/KillTomeComponent.cs b/Content.Shared/KillTome/KillTomeComponent.cs
deleted file mode 100644
index 266ff1a8f8..0000000000
--- a/Content.Shared/KillTome/KillTomeComponent.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using Content.Shared.Damage;
-using Content.Shared.Damage.Prototypes;
-using Content.Shared.FixedPoint;
-using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.KillTome;
-
-/// <summary>
-/// Paper with that component is KillTome.
-/// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-public sealed partial class KillTomeComponent : Component
-{
-    /// <summary>
-    /// if delay is not specified, it will use this default value
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public TimeSpan DefaultKillDelay = TimeSpan.FromSeconds(40);
-
-    /// <summary>
-    /// Damage specifier that will be used to kill the target.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public DamageSpecifier Damage = new()
-    {
-        DamageDict = new Dictionary<string, FixedPoint2>
-        {
-            { "Blunt", 200 }
-        }
-    };
-
-    /// <summary>
-    /// to keep a track of already killed people so they won't be killed again
-    /// </summary>
-    [DataField]
-    public HashSet<EntityUid> KilledEntities = [];
-}
diff --git a/Content.Shared/KillTome/KillTomeSystem.cs b/Content.Shared/KillTome/KillTomeSystem.cs
deleted file mode 100644
index bd49c483d9..0000000000
--- a/Content.Shared/KillTome/KillTomeSystem.cs
+++ /dev/null
@@ -1,187 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using Content.Shared.Administration.Logs;
-using Content.Shared.Damage;
-using Content.Shared.Database;
-using Content.Shared.Humanoid;
-using Content.Shared.Mobs;
-using Content.Shared.Mobs.Components;
-using Content.Shared.NameModifier.EntitySystems;
-using Content.Shared.Paper;
-using Content.Shared.Popups;
-using Robust.Shared.Timing;
-using Robust.Shared.Utility;
-
-namespace Content.Shared.KillTome;
-
-/// <summary>
-/// This handles KillTome functionality.
-/// </summary>
-
-///     Kill Tome Rules:
-// 1. The humanoid whose name is written in this note shall die.
-// 2. If the name is shared by multiple humanoids, a random humanoid with that name will die.
-// 3. Each name shall be written on a new line.
-// 4. Names must be written in the format: "Name, Delay (in seconds)" (e.g., John Doe, 40).
-// 5. A humanoid can be killed by the same Kill Tome only once.
-public sealed class KillTomeSystem : EntitySystem
-{
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
-    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
-    [Dependency] private readonly DamageableSystem _damageSystem = default!;
-    [Dependency] private readonly ISharedAdminLogManager _adminLogs = default!;
-    [Dependency] private readonly NameModifierSystem _nameModifierSystem = default!;
-
-    /// <inheritdoc/>
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<KillTomeComponent, PaperAfterWriteEvent>(OnPaperAfterWriteInteract);
-    }
-
-    public override void Update(float frameTime)
-    {
-        // Getting all the entities that are targeted by Kill Tome and checking if their kill time has passed.
-        // If it has, we kill them and remove the KillTomeTargetComponent.
-        var query = EntityQueryEnumerator<KillTomeTargetComponent>();
-
-        while (query.MoveNext(out var uid, out var targetComp))
-        {
-            if (_gameTiming.CurTime < targetComp.KillTime)
-                continue;
-
-            // The component doesn't get removed fast enough and the update loop will run through it a few more times.
-            // This check is here to ensure it will not spam popups or kill you several times over.
-            if (targetComp.Dead)
-                continue;
-
-            Kill(uid, targetComp);
-
-            _popupSystem.PopupPredicted(Loc.GetString("killtome-death"),
-                Loc.GetString("killtome-death-others", ("target", uid)),
-                uid,
-                uid,
-                PopupType.LargeCaution);
-
-            targetComp.Dead = true;
-
-            RemCompDeferred<KillTomeTargetComponent>(uid);
-        }
-    }
-
-    private void OnPaperAfterWriteInteract(Entity<KillTomeComponent> ent, ref PaperAfterWriteEvent args)
-    {
-        // if the entity is not a paper, we don't do anything
-        if (!TryComp<PaperComponent>(ent.Owner, out var paper))
-            return;
-
-        var content = paper.Content;
-
-        var lines = content.Split('\n', StringSplitOptions.RemoveEmptyEntries);
-
-        var showPopup = false;
-
-        foreach (var line in lines)
-        {
-            if (string.IsNullOrEmpty(line))
-                continue;
-
-            var parts = line.Split(',', 2, StringSplitOptions.RemoveEmptyEntries);
-
-            var name = parts[0].Trim();
-
-            var delay = ent.Comp.DefaultKillDelay;
-
-            if (parts.Length == 2 && Parse.TryInt32(parts[1].Trim(), out var parsedDelay) && parsedDelay > 0)
-                delay = TimeSpan.FromSeconds(parsedDelay);
-
-            if (!CheckIfEligible(name, ent.Comp, out var uid))
-            {
-                continue;
-            }
-
-            // Compiler will complain if we don't check for null here.
-            if (uid is not { } realUid)
-                continue;
-
-            showPopup = true;
-
-            EnsureComp<KillTomeTargetComponent>(realUid, out var targetComp);
-
-            targetComp.KillTime = _gameTiming.CurTime + delay;
-            targetComp.Damage = ent.Comp.Damage;
-
-            Dirty(realUid, targetComp);
-
-            ent.Comp.KilledEntities.Add(realUid);
-
-            Dirty(ent);
-
-            _adminLogs.Add(LogType.Chat,
-                LogImpact.High,
-                $"{ToPrettyString(args.Actor)} has written {ToPrettyString(uid)}'s name in Kill Tome.");
-        }
-
-        // If we have written at least one eligible name, we show the popup (So the player knows death note worked).
-        if (showPopup)
-            _popupSystem.PopupEntity(Loc.GetString("killtome-kill-success"), ent.Owner, args.Actor, PopupType.Large);
-    }
-
-    // A person to be killed by KillTome must:
-    // 1. be with the name
-    // 2. have HumanoidAppearanceComponent (so it targets only humanoids, obv)
-    // 3. not be already dead
-    // 4. not be already killed by Kill Tome
-
-    // If all these conditions are met, we return true and the entityUid of the person to kill.
-    private bool CheckIfEligible(string name, KillTomeComponent comp, [NotNullWhen(true)] out EntityUid? entityUid)
-    {
-        if (!TryFindEntityByName(name, out var uid) ||
-            !TryComp<MobStateComponent>(uid, out var mob))
-        {
-            entityUid = null;
-            return false;
-        }
-
-        if (uid is not { } realUid)
-        {
-            entityUid = null;
-            return false;
-        }
-
-        if (comp.KilledEntities.Contains(realUid))
-        {
-            entityUid = null;
-            return false;
-        }
-
-        if (mob.CurrentState == MobState.Dead)
-        {
-            entityUid = null;
-            return false;
-        }
-
-        entityUid = uid;
-        return true;
-    }
-
-    private bool TryFindEntityByName(string name, [NotNullWhen(true)] out EntityUid? entityUid)
-    {
-        var query = EntityQueryEnumerator<HumanoidAppearanceComponent>();
-
-        while (query.MoveNext(out var uid, out _))
-        {
-            if (!_nameModifierSystem.GetBaseName(uid).Equals(name, StringComparison.OrdinalIgnoreCase))
-                continue;
-
-            entityUid = uid;
-            return true;
-        }
-
-        entityUid = null;
-        return false;
-    }
-
-    private void Kill(EntityUid uid, KillTomeTargetComponent comp)
-    {
-        _damageSystem.TryChangeDamage(uid, comp.Damage, true);
-    }
-}
diff --git a/Content.Shared/KillTome/KillTomeTargetComponent.cs b/Content.Shared/KillTome/KillTomeTargetComponent.cs
deleted file mode 100644
index 14a573b75f..0000000000
--- a/Content.Shared/KillTome/KillTomeTargetComponent.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Content.Shared.Damage;
-using Content.Shared.FixedPoint;
-using Robust.Shared.GameStates;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-
-namespace Content.Shared.KillTome;
-
-/// <summary>
-/// Entity with this component is a Kill Tome target.
-/// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
-public sealed partial class KillTomeTargetComponent : Component
-{
-    ///<summary>
-    /// Damage that will be dealt to the target.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public DamageSpecifier Damage = new()
-    {
-        DamageDict = new Dictionary<string, FixedPoint2>
-        {
-            { "Blunt", 200 }
-        }
-    };
-
-    /// <summary>
-    /// The time when the target is killed.
-    /// </summary>
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoNetworkedField]
-    [AutoPausedField]
-    public TimeSpan KillTime = TimeSpan.Zero;
-
-    /// <summary>
-    /// Indicates this target has been killed by the killtome.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public bool Dead;
-
-    // Disallows cheat clients from seeing who is about to die to the killtome.
-    public override bool SendOnlyToOwner => true;
-}
diff --git a/Content.Shared/Medical/Cryogenics/ActiveCryoPodComponent.cs b/Content.Shared/Medical/Cryogenics/ActiveCryoPodComponent.cs
index e242fd7502..d017ef73aa 100644
--- a/Content.Shared/Medical/Cryogenics/ActiveCryoPodComponent.cs
+++ b/Content.Shared/Medical/Cryogenics/ActiveCryoPodComponent.cs
@@ -1,9 +1,9 @@
-namespace Content.Shared.Medical.Cryogenics;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Medical.Cryogenics;
 
 /// <summary>
 /// Tracking component for an enabled cryo pod (which periodically tries to inject chemicals in the occupant, if one exists)
 /// </summary>
-[RegisterComponent]
-public sealed partial class ActiveCryoPodComponent : Component
-{
-}
+[RegisterComponent, NetworkedComponent]
+public sealed partial class ActiveCryoPodComponent : Component;
diff --git a/Content.Shared/Medical/Cryogenics/CryoPodComponent.cs b/Content.Shared/Medical/Cryogenics/CryoPodComponent.cs
index 43244a5f0d..ed9e9cb904 100644
--- a/Content.Shared/Medical/Cryogenics/CryoPodComponent.cs
+++ b/Content.Shared/Medical/Cryogenics/CryoPodComponent.cs
@@ -1,57 +1,68 @@
+using Content.Shared.FixedPoint;
+using Content.Shared.Tools;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Medical.Cryogenics;
 
+/// <summary>
+/// Component for medical cryo pods.
+/// Handles transferring reagents from a beaker slot into an inserted mob, as well as exposing them to connected atmos pipes.
+/// </summary>
 [RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState, AutoGenerateComponentPause]
 public sealed partial class CryoPodComponent : Component
 {
+    /// <summary>
+    /// The name of the container the patient is stored in.
+    /// </summary>
+    public const string BodyContainerName = "scanner-body";
+
     /// <summary>
     /// Specifies the name of the atmospherics port to draw gas from.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("port")]
-    public string PortName { get; set; } = "port";
+    [DataField]
+    public string PortName = "port";
 
     /// <summary>
-    /// Specifies the name of the slot that holds beaker with medicine.
+    /// Specifies the name of the slot that holds the beaker with medicine.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("solutionContainerName")]
-    public string SolutionContainerName { get; set; } = "beakerSlot";
+    [DataField]
+    public string SolutionContainerName = "beakerSlot";
 
     /// <summary>
-    /// How often (seconds) are chemicals transferred from the beaker to the body?
+    /// How often are chemicals transferred from the beaker to the body?
+    /// (injection interval)
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("beakerTransferTime")]
-    public float BeakerTransferTime = 1f;
-
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("nextInjectionTime", customTypeSerializer:typeof(TimeOffsetSerializer))]
-    public TimeSpan? NextInjectionTime;
+    [DataField]
+    public TimeSpan BeakerTransferTime = TimeSpan.FromSeconds(1);
 
     /// <summary>
-    /// How many units to transfer per tick from the beaker to the mob?
+    /// The timestamp for the next injection.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("beakerTransferAmount")]
-    public float BeakerTransferAmount = 1f;
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan NextInjectionTime = TimeSpan.Zero;
 
     /// <summary>
-    ///     Delay applied when inserting a mob in the pod.
+    /// How many units to transfer per injection from the beaker to the mob?
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("entryDelay")]
+    [DataField]
+    public FixedPoint2 BeakerTransferAmount = 1;
+
+    /// <summary>
+    /// Delay applied when inserting a mob in the pod (in seconds).
+    /// </summary>
+    [DataField]
     public float EntryDelay = 2f;
 
     /// <summary>
-    /// Delay applied when trying to pry open a locked pod.
+    /// Delay applied when trying to pry open a locked pod (in seconds).
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("pryDelay")]
+    [DataField]
     public float PryDelay = 5f;
 
     /// <summary>
@@ -63,21 +74,25 @@ public sealed partial class CryoPodComponent : Component
     /// <summary>
     /// If true, the eject verb will not work on the pod and the user must use a crowbar to pry the pod open.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("locked")]
-    public bool Locked { get; set; }
+    [DataField, AutoNetworkedField]
+    public bool Locked;
 
     /// <summary>
     /// Causes the pod to be locked without being fixable by messing with wires.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("permaLocked")]
-    public bool PermaLocked { get; set; }
+    [DataField, AutoNetworkedField]
+    public bool PermaLocked;
 
-    [Serializable, NetSerializable]
-    public enum CryoPodVisuals : byte
-    {
-        ContainsEntity,
-        IsOn
-    }
+    /// <summary>
+    /// The tool quality needed to eject a body when the pod is locked.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public ProtoId<ToolQualityPrototype> UnlockToolQuality = "Prying";
+}
+
+[Serializable, NetSerializable]
+public enum CryoPodVisuals : byte
+{
+    ContainsEntity,
+    IsOn
 }
diff --git a/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs b/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
index 8d7eb05cd9..3fcc3da848 100644
--- a/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
+++ b/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
@@ -1,39 +1,212 @@
 using Content.Shared.Administration.Logs;
 using Content.Shared.Body.Components;
+using Content.Shared.Body.Systems;
+using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Climbing.Systems;
+using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
 using Content.Shared.DragDrop;
 using Content.Shared.Emag.Systems;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.MedicalScanner;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Popups;
+using Content.Shared.Power;
 using Content.Shared.Standing;
 using Content.Shared.Stunnable;
+using Content.Shared.Tools.Systems;
+using Content.Shared.UserInterface;
 using Content.Shared.Verbs;
 using Robust.Shared.Containers;
 using Robust.Shared.Serialization;
+using Robust.Shared.Timing;
 
 namespace Content.Shared.Medical.Cryogenics;
 
-public abstract partial class SharedCryoPodSystem: EntitySystem
+public abstract partial class SharedCryoPodSystem : EntitySystem
 {
-    [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
-    [Dependency] private readonly StandingStateSystem _standingStateSystem = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly StandingStateSystem _standingState = default!;
     [Dependency] private readonly EmagSystem _emag = default!;
-    [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
-    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
-    [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
+    [Dependency] private readonly ItemSlotsSystem _itemSlots = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly SharedPointLightSystem _light = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly ClimbSystem _climb = default!;
+    [Dependency] private readonly SharedBloodstreamSystem _bloodstream = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
+    [Dependency] private readonly SharedUserInterfaceSystem _ui = default!;
+    [Dependency] private readonly SharedToolSystem _tool = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly ReactiveSystem _reactive = default!;
+
+    private EntityQuery<BloodstreamComponent> _bloodstreamQuery;
+    private EntityQuery<ItemSlotsComponent> _itemSlotsQuery;
+    private EntityQuery<FitsInDispenserComponent> _dispenserQuery;
+    private EntityQuery<SolutionContainerManagerComponent> _solutionContainerQuery;
 
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<CryoPodComponent, CanDropTargetEvent>(OnCryoPodCanDropOn);
+        SubscribeLocalEvent<CryoPodComponent, ExaminedEvent>(OnExamined);
+        SubscribeLocalEvent<CryoPodComponent, ComponentInit>(OnComponentInit);
+        SubscribeLocalEvent<CryoPodComponent, GetVerbsEvent<AlternativeVerb>>(AddAlternativeVerbs);
+        SubscribeLocalEvent<CryoPodComponent, GotEmaggedEvent>(OnEmagged);
+        SubscribeLocalEvent<CryoPodComponent, CryoPodDragFinished>(OnDragFinished);
+        SubscribeLocalEvent<CryoPodComponent, CryoPodPryFinished>(OnCryoPodPryFinished);
+        SubscribeLocalEvent<CryoPodComponent, DragDropTargetEvent>(HandleDragDropOn);
+        SubscribeLocalEvent<CryoPodComponent, InteractUsingEvent>(OnInteractUsing);
+        SubscribeLocalEvent<CryoPodComponent, PowerChangedEvent>(OnPowerChanged);
+        SubscribeLocalEvent<CryoPodComponent, ActivatableUIOpenAttemptEvent>(OnActivateUIAttempt);
+
+        _bloodstreamQuery = GetEntityQuery<BloodstreamComponent>();
+        _itemSlotsQuery = GetEntityQuery<ItemSlotsComponent>();
+        _dispenserQuery = GetEntityQuery<FitsInDispenserComponent>();
+        _solutionContainerQuery = GetEntityQuery<SolutionContainerManagerComponent>();
+
         InitializeInsideCryoPod();
     }
 
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var curTime = _timing.CurTime;
+        var query = EntityQueryEnumerator<ActiveCryoPodComponent, CryoPodComponent>();
+
+        while (query.MoveNext(out var uid, out _, out var cryoPod))
+        {
+            if (curTime < cryoPod.NextInjectionTime)
+                continue;
+
+            cryoPod.NextInjectionTime += cryoPod.BeakerTransferTime;
+            Dirty(uid, cryoPod);
+
+            if (!_itemSlotsQuery.TryComp(uid, out var itemSlotsComponent))
+                continue;
+
+            var container = _itemSlots.GetItemOrNull(uid, cryoPod.SolutionContainerName, itemSlotsComponent);
+            var patient = cryoPod.BodyContainer.ContainedEntity;
+            if (container != null
+                && container.Value.Valid
+                && patient != null
+                && _dispenserQuery.TryComp(container, out var fitsInDispenserComponent)
+                && _solutionContainerQuery.TryComp(container, out var solutionContainerManagerComponent)
+                && _solutionContainer.TryGetFitsInDispenser((container.Value, fitsInDispenserComponent, solutionContainerManagerComponent),
+                    out var containerSolution, out _)
+                && _bloodstreamQuery.TryComp(patient, out var bloodstream))
+            {
+                var solutionToInject = _solutionContainer.SplitSolution(containerSolution.Value, cryoPod.BeakerTransferAmount);
+                _bloodstream.TryAddToChemicals((patient.Value, bloodstream), solutionToInject);
+                _reactive.DoEntityReaction(patient.Value, solutionToInject, ReactionMethod.Injection);
+            }
+        }
+    }
+
+    private void HandleDragDropOn(Entity<CryoPodComponent> ent, ref DragDropTargetEvent args)
+    {
+        if (ent.Comp.BodyContainer.ContainedEntity != null)
+            return;
+
+        var doAfterArgs = new DoAfterArgs(EntityManager, args.User, ent.Comp.EntryDelay, new CryoPodDragFinished(), ent, target: args.Dragged, used: ent)
+        {
+            BreakOnDamage = true,
+            BreakOnMove = true,
+            NeedHand = false,
+        };
+        _doAfter.TryStartDoAfter(doAfterArgs);
+        args.Handled = true;
+    }
+
+    private void OnDragFinished(Entity<CryoPodComponent> ent, ref CryoPodDragFinished args)
+    {
+        if (args.Cancelled || args.Handled || args.Args.Target == null)
+            return;
+
+        if (InsertBody(ent.Owner, args.Args.Target.Value, ent.Comp))
+        {
+            _adminLogger.Add(LogType.Action, LogImpact.Medium,
+                $"{ToPrettyString(args.User)} inserted {ToPrettyString(args.Args.Target.Value)} into {ToPrettyString(ent.Owner)}");
+        }
+        args.Handled = true;
+    }
+
+    private void OnActivateUIAttempt(Entity<CryoPodComponent> ent, ref ActivatableUIOpenAttemptEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        var containedEntity = ent.Comp.BodyContainer.ContainedEntity;
+        if (containedEntity == null || containedEntity == args.User || !HasComp<ActiveCryoPodComponent>(ent))
+            args.Cancel();
+    }
+
+    private void OnInteractUsing(Entity<CryoPodComponent> ent, ref InteractUsingEvent args)
+    {
+        if (args.Handled || !ent.Comp.Locked || ent.Comp.BodyContainer.ContainedEntity == null)
+            return;
+
+        args.Handled = _tool.UseTool(args.Used, args.User, ent.Owner, ent.Comp.PryDelay, ent.Comp.UnlockToolQuality, new CryoPodPryFinished());
+    }
+
+    private void OnCryoPodPryFinished(EntityUid uid, CryoPodComponent cryoPodComponent, CryoPodPryFinished args)
+    {
+        if (args.Cancelled)
+            return;
+
+        var ejected = EjectBody(uid, cryoPodComponent);
+        if (ejected != null)
+            _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(ejected.Value)} pried out of {ToPrettyString(uid)} by {ToPrettyString(args.User)}");
+    }
+
+    private void OnPowerChanged(Entity<CryoPodComponent> ent, ref PowerChangedEvent args)
+    {
+        // Needed to avoid adding/removing components on a deleted entity
+        if (Terminating(ent))
+            return;
+
+        if (args.Powered)
+        {
+            EnsureComp<ActiveCryoPodComponent>(ent);
+            ent.Comp.NextInjectionTime = _timing.CurTime + ent.Comp.BeakerTransferTime;
+            Dirty(ent);
+        }
+        else
+        {
+            RemComp<ActiveCryoPodComponent>(ent);
+            _ui.CloseUi(ent.Owner, HealthAnalyzerUiKey.Key);
+        }
+
+        UpdateAppearance(ent.Owner, ent.Comp);
+    }
+
+    private void OnExamined(Entity<CryoPodComponent> entity, ref ExaminedEvent args)
+    {
+        var container = _itemSlots.GetItemOrNull(entity.Owner, entity.Comp.SolutionContainerName);
+        if (args.IsInDetailsRange && container != null && _solutionContainer.TryGetFitsInDispenser(container.Value, out _, out var containerSolution))
+        {
+            using (args.PushGroup(nameof(CryoPodComponent)))
+            {
+                args.PushMarkup(Loc.GetString("cryo-pod-examine", ("beaker", Name(container.Value))));
+                if (containerSolution.Volume == 0)
+                {
+                    args.PushMarkup(Loc.GetString("cryo-pod-empty-beaker"));
+                }
+            }
+        }
+    }
+
     private void OnCryoPodCanDropOn(EntityUid uid, CryoPodComponent component, ref CanDropTargetEvent args)
     {
         if (args.Handled)
@@ -43,12 +216,12 @@ public abstract partial class SharedCryoPodSystem: EntitySystem
         args.Handled = true;
     }
 
-    protected void OnComponentInit(EntityUid uid, CryoPodComponent cryoPodComponent, ComponentInit args)
+    private void OnComponentInit(EntityUid uid, CryoPodComponent cryoPodComponent, ComponentInit args)
     {
-        cryoPodComponent.BodyContainer = _containerSystem.EnsureContainer<ContainerSlot>(uid, "scanner-body");
+        cryoPodComponent.BodyContainer = _container.EnsureContainer<ContainerSlot>(uid, CryoPodComponent.BodyContainerName);
     }
 
-    protected void UpdateAppearance(EntityUid uid, CryoPodComponent? cryoPod = null, AppearanceComponent? appearance = null)
+    private void UpdateAppearance(EntityUid uid, CryoPodComponent? cryoPod = null, AppearanceComponent? appearance = null)
     {
         if (!Resolve(uid, ref cryoPod))
             return;
@@ -57,14 +230,14 @@ public abstract partial class SharedCryoPodSystem: EntitySystem
 
         if (_light.TryGetLight(uid, out var light))
         {
-            _light.SetEnabled(uid, cryoPodEnabled && cryoPod.BodyContainer.ContainedEntity != null, light);
+            _light.SetEnabled(uid, cryoPodEnabled && cryoPod.BodyContainer?.ContainedEntity != null, light);
         }
 
         if (!Resolve(uid, ref appearance))
             return;
 
-        _appearanceSystem.SetData(uid, CryoPodComponent.CryoPodVisuals.ContainsEntity, cryoPod.BodyContainer.ContainedEntity == null, appearance);
-        _appearanceSystem.SetData(uid, CryoPodComponent.CryoPodVisuals.IsOn, cryoPodEnabled, appearance);
+        _appearance.SetData(uid, CryoPodVisuals.ContainsEntity, cryoPod.BodyContainer?.ContainedEntity == null, appearance);
+        _appearance.SetData(uid, CryoPodVisuals.IsOn, cryoPodEnabled, appearance);
     }
 
     public bool InsertBody(EntityUid uid, EntityUid target, CryoPodComponent cryoPodComponent)
@@ -76,10 +249,10 @@ public abstract partial class SharedCryoPodSystem: EntitySystem
             return false;
 
         var xform = Transform(target);
-        _containerSystem.Insert((target, xform), cryoPodComponent.BodyContainer);
+        _container.Insert((target, xform), cryoPodComponent.BodyContainer);
 
         EnsureComp<InsideCryoPodComponent>(target);
-        _standingStateSystem.Stand(target, force: true); // Force-stand the mob so that the cryo pod sprite overlays it fully
+        _standingState.Stand(target, force: true); // Force-stand the mob so that the cryo pod sprite overlays it fully
 
         UpdateAppearance(uid, cryoPodComponent);
         return true;
@@ -94,7 +267,7 @@ public abstract partial class SharedCryoPodSystem: EntitySystem
 
         if (cryoPodComponent.Locked)
         {
-            _popupSystem.PopupEntity(Loc.GetString("cryo-pod-locked"), uid, userId);
+            _popup.PopupClient(Loc.GetString("cryo-pod-locked"), uid, userId);
             return;
         }
 
@@ -109,28 +282,25 @@ public abstract partial class SharedCryoPodSystem: EntitySystem
     /// <param name="uid">The cryopod entity</param>
     /// <param name="cryoPodComponent">Cryopod component of <see cref="uid"/></param>
     /// <returns>Ejected entity</returns>
-    public virtual EntityUid? EjectBody(EntityUid uid, CryoPodComponent? cryoPodComponent)
+    public EntityUid? EjectBody(EntityUid uid, CryoPodComponent? cryoPodComponent)
     {
         if (!Resolve(uid, ref cryoPodComponent))
             return null;
 
-        if (cryoPodComponent.BodyContainer.ContainedEntity is not {Valid: true} contained)
+        if (cryoPodComponent.BodyContainer.ContainedEntity is not { Valid: true } contained)
             return null;
 
-        _containerSystem.Remove(contained, cryoPodComponent.BodyContainer);
+        _container.Remove(contained, cryoPodComponent.BodyContainer);
         // InsideCryoPodComponent is removed automatically in its EntGotRemovedFromContainerMessage listener
         // RemComp<InsideCryoPodComponent>(contained);
 
         // Restore the correct position of the patient. Checking the components manually feels hacky, but I did not find a better way for now.
-        if (HasComp<KnockedDownComponent>(contained) || _mobStateSystem.IsIncapacitated(contained))
-        {
-            _standingStateSystem.Down(contained);
-        }
+        if (HasComp<KnockedDownComponent>(contained) || _mobState.IsIncapacitated(contained))
+            _standingState.Down(contained);
         else
-        {
-            _standingStateSystem.Stand(contained);
-        }
+            _standingState.Stand(contained);
 
+        _climb.ForciblySetClimbing(contained, uid);
         UpdateAppearance(uid, cryoPodComponent);
         return contained;
     }
@@ -166,26 +336,13 @@ public abstract partial class SharedCryoPodSystem: EntitySystem
 
         cryoPodComponent.PermaLocked = true;
         cryoPodComponent.Locked = true;
+        Dirty(uid, cryoPodComponent);
         args.Handled = true;
     }
 
-    protected void OnCryoPodPryFinished(EntityUid uid, CryoPodComponent cryoPodComponent, CryoPodPryFinished args)
-    {
-        if (args.Cancelled)
-            return;
-
-        var ejected = EjectBody(uid, cryoPodComponent);
-        if (ejected != null)
-            _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(ejected.Value)} pried out of {ToPrettyString(uid)} by {ToPrettyString(args.User)}");
-    }
+    [Serializable, NetSerializable]
+    public sealed partial class CryoPodPryFinished : SimpleDoAfterEvent;
 
     [Serializable, NetSerializable]
-    public sealed partial class CryoPodPryFinished : SimpleDoAfterEvent
-    {
-    }
-
-    [Serializable, NetSerializable]
-    public sealed partial class CryoPodDragFinished : SimpleDoAfterEvent
-    {
-    }
+    public sealed partial class CryoPodDragFinished : SimpleDoAfterEvent;
 }
diff --git a/Content.Shared/Morgue/EntityStorageLayingDownOverrideSystem.cs b/Content.Shared/Morgue/EntityStorageLayingDownOverrideSystem.cs
index 9341168ba3..630135f36a 100644
--- a/Content.Shared/Morgue/EntityStorageLayingDownOverrideSystem.cs
+++ b/Content.Shared/Morgue/EntityStorageLayingDownOverrideSystem.cs
@@ -1,4 +1,3 @@
-using Content.Shared.Body.Components;
 using Content.Shared.Morgue.Components;
 using Content.Shared.Standing;
 using Content.Shared.Storage.Components;
@@ -20,7 +19,9 @@ public sealed class EntityStorageLayingDownOverrideSystem : EntitySystem
     {
         foreach (var ent in args.Contents)
         {
-            if (HasComp<BodyComponent>(ent) && !_standing.IsDown(ent))
+            // Explicitly check for standing state component, as entities without it will return false for IsDown()
+            // which prevents inserting any kind of non-mobs into this container (which is unintended)
+            if (TryComp<StandingStateComponent>(ent, out var standingState) && !_standing.IsDown(ent, standingState))
                 args.Contents.Remove(ent);
         }
     }
diff --git a/Content.Shared/Mousetrap/MousetrapComponent.cs b/Content.Shared/Mousetrap/MousetrapComponent.cs
index 6d7483802b..4f48f00b3a 100644
--- a/Content.Shared/Mousetrap/MousetrapComponent.cs
+++ b/Content.Shared/Mousetrap/MousetrapComponent.cs
@@ -2,20 +2,20 @@ using Robust.Shared.GameStates;
 
 namespace Content.Shared.Mousetrap;
 
-[RegisterComponent, NetworkedComponent]
+/// <summary>
+/// Component inteded to be used for mouse traps.
+/// Will stop step triggers from happening unless armed via <see cref="Item.ItemToggle.Components.ItemToggleComponent"/>
+/// and will scale damage taken from <see cref="Trigger.Components.Effects.DamageOnTriggerComponent"/>
+/// depending on mass.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class MousetrapComponent : Component
 {
-    [ViewVariables]
-    [DataField("isActive")]
-    public bool IsActive = false;
-
     /// <summary>
-    ///     Set this to change where the
-    ///     inflection point in the scaling
-    ///     equation will occur.
-    ///     The default is 10.
+    /// Set this to change where the
+    /// inflection point in the damage scaling
+    /// equation will occur.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("massBalance")]
+    [DataField, AutoNetworkedField]
     public int MassBalance = 10;
 }
diff --git a/Content.Shared/Mousetrap/MousetrapSystem.cs b/Content.Shared/Mousetrap/MousetrapSystem.cs
new file mode 100644
index 0000000000..96f74114b2
--- /dev/null
+++ b/Content.Shared/Mousetrap/MousetrapSystem.cs
@@ -0,0 +1,42 @@
+using Content.Shared.Item.ItemToggle.Components;
+using Content.Shared.Trigger.Systems;
+using Content.Shared.StepTrigger.Systems;
+using Robust.Shared.Physics.Components;
+
+namespace Content.Shared.Mousetrap;
+
+public sealed class MousetrapSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<MousetrapComponent, BeforeDamageOnTriggerEvent>(BeforeDamageOnTrigger);
+        SubscribeLocalEvent<MousetrapComponent, StepTriggerAttemptEvent>(OnStepTriggerAttempt);
+    }
+
+    // only allow step triggers to trigger if the trap is armed
+    // TODO: refactor Steptriggers to get rid of this
+    // they should just use the new trigger conditions
+    private void OnStepTriggerAttempt(Entity<MousetrapComponent> ent, ref StepTriggerAttemptEvent args)
+    {
+        if (!TryComp<ItemToggleComponent>(ent, out var toggle))
+            return;
+
+        args.Continue |= toggle.Activated;
+    }
+
+    // scale the damage according to mass
+    private void BeforeDamageOnTrigger(Entity<MousetrapComponent> ent, ref BeforeDamageOnTriggerEvent args)
+    {
+        if (TryComp(args.Tripper, out PhysicsComponent? physics) && physics.Mass != 0)
+        {
+            // The idea here is inverse,
+            // Small - big damage,
+            // Large - small damage
+            // yes i punched numbers into a calculator until the graph looked right
+            var scaledDamage = -50 * Math.Atan(physics.Mass - ent.Comp.MassBalance) + 25 * Math.PI;
+            args.Damage *= scaledDamage;
+        }
+    }
+}
diff --git a/Content.Shared/Mousetrap/MousetrapVisuals.cs b/Content.Shared/Mousetrap/MousetrapVisuals.cs
deleted file mode 100644
index 9685157aad..0000000000
--- a/Content.Shared/Mousetrap/MousetrapVisuals.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Mousetrap;
-
-[Serializable, NetSerializable]
-public enum MousetrapVisuals : byte
-{
-    Visual,
-    Armed,
-    Unarmed
-}
diff --git a/Content.Shared/Movement/Systems/MovementSpeedModifierSystem.cs b/Content.Shared/Movement/Systems/MovementSpeedModifierSystem.cs
index 4584e4401a..d0faad8b50 100644
--- a/Content.Shared/Movement/Systems/MovementSpeedModifierSystem.cs
+++ b/Content.Shared/Movement/Systems/MovementSpeedModifierSystem.cs
@@ -54,6 +54,21 @@ namespace Content.Shared.Movement.Systems
             RefreshMovementSpeedModifiers(entity);
         }
 
+        /// <summary>
+        /// Copy this component's datafields from one entity to another.
+        /// This needs to refresh the modifiers after using CopyComp.
+        /// <summary>
+        public void CopyComponent(Entity<MovementSpeedModifierComponent?> source, EntityUid target)
+        {
+            if (!Resolve(source, ref source.Comp))
+                return;
+
+            CopyComp(source, target, source.Comp);
+            RefreshWeightlessModifiers(target);
+            RefreshMovementSpeedModifiers(target);
+            RefreshFrictionModifiers(target);
+        }
+
         public void RefreshWeightlessModifiers(EntityUid uid, MovementSpeedModifierComponent? move = null)
         {
             if (!Resolve(uid, ref move, false))
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs
index e43800dc9f..f8495fcd18 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.cs
@@ -72,6 +72,8 @@ public abstract partial class SharedMoverController : VirtualController
     /// </summary>
     public Dictionary<EntityUid, bool> UsedMobMovement = new();
 
+    private readonly HashSet<EntityUid> _aroundColliderSet = [];
+
     public override void Initialize()
     {
         UpdatesBefore.Add(typeof(TileFrictionController));
@@ -454,7 +456,9 @@ public abstract partial class SharedMoverController : VirtualController
         var (uid, collider, mover, transform) = entity;
         var enlargedAABB = _lookup.GetWorldAABB(entity.Owner, transform).Enlarged(mover.GrabRange);
 
-        foreach (var otherEntity in lookupSystem.GetEntitiesIntersecting(transform.MapID, enlargedAABB))
+        _aroundColliderSet.Clear();
+        lookupSystem.GetEntitiesIntersecting(transform.MapID, enlargedAABB, _aroundColliderSet);
+        foreach (var otherEntity in _aroundColliderSet)
         {
             if (otherEntity == uid)
                 continue; // Don't try to push off of yourself!
diff --git a/Content.Shared/Ninja/Components/SpiderChargeComponent.cs b/Content.Shared/Ninja/Components/SpiderChargeComponent.cs
index 3ba4494cca..75053011ff 100644
--- a/Content.Shared/Ninja/Components/SpiderChargeComponent.cs
+++ b/Content.Shared/Ninja/Components/SpiderChargeComponent.cs
@@ -10,11 +10,21 @@ namespace Content.Shared.Ninja.Components;
 [RegisterComponent, NetworkedComponent, Access(typeof(SharedSpiderChargeSystem))]
 public sealed partial class SpiderChargeComponent : Component
 {
-    /// Range for planting within the target area
+    /// <summary>
+    /// Range for planting within the target area.
+    /// </summary>
     [DataField]
     public float Range = 10f;
 
-    /// The ninja that planted this charge
+    /// <summary>
+    /// The ninja that planted this charge.
+    /// </summary>
     [DataField]
     public EntityUid? Planter;
+
+    /// <summary>
+    /// The trigger that will mark the objective as successful.
+    /// </summary>
+    [DataField]
+    public string TriggerKey = "timer";
 }
diff --git a/Content.Shared/Nutrition/Components/DrinkComponent.cs b/Content.Shared/Nutrition/Components/DrinkComponent.cs
index 17baaef5a3..a4d1114379 100644
--- a/Content.Shared/Nutrition/Components/DrinkComponent.cs
+++ b/Content.Shared/Nutrition/Components/DrinkComponent.cs
@@ -5,6 +5,7 @@ using Robust.Shared.GameStates;
 
 namespace Content.Shared.Nutrition.Components;
 
+[Obsolete("Migration to Content.Shared.Nutrition.Components.EdibleComponent is required")]
 [NetworkedComponent, AutoGenerateComponentState]
 [RegisterComponent, Access(typeof(SharedDrinkSystem))]
 public sealed partial class DrinkComponent : Component
@@ -24,9 +25,6 @@ public sealed partial class DrinkComponent : Component
     [DataField, AutoNetworkedField]
     public float Delay = 1;
 
-    [DataField, AutoNetworkedField]
-    public bool Examinable = true;
-
     /// <summary>
     /// If true, trying to drink when empty will not handle the event.
     /// This means other systems such as equipping on use can run.
diff --git a/Content.Shared/Nutrition/Components/EdibleComponent.cs b/Content.Shared/Nutrition/Components/EdibleComponent.cs
new file mode 100644
index 0000000000..4fcd9770eb
--- /dev/null
+++ b/Content.Shared/Nutrition/Components/EdibleComponent.cs
@@ -0,0 +1,86 @@
+using Content.Shared.Body.Components;
+using Content.Shared.FixedPoint;
+using Content.Shared.Nutrition.EntitySystems;
+using Content.Shared.Nutrition.Prototypes;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Nutrition.Components;
+
+/// <summary>
+/// This is used on an entity with a solution container to flag a specific solution as being able to have its
+/// reagents consumed directly.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(IngestionSystem))]
+public sealed partial class EdibleComponent : Component
+{
+    /// <summary>
+    /// Name of the solution that stores the consumable reagents
+    /// </summary>
+    [DataField]
+    public string Solution = "food";
+
+    /// <summary>
+    /// Should this entity be deleted when our solution is emptied?
+    /// </summary>
+    [DataField]
+    public bool DestroyOnEmpty = true;
+
+    /// <summary>
+    /// Trash we spawn when eaten, will not spawn if the item isn't deleted when empty.
+    /// </summary>
+    [DataField]
+    public List<EntProtoId> Trash = new();
+
+    /// <summary>
+    /// How much of our solution is eaten on a do-after completion. Set to null to eat the whole thing.
+    /// </summary>
+    [DataField]
+    public FixedPoint2? TransferAmount = FixedPoint2.New(5);
+
+    /// <summary>
+    /// Acceptable utensils to use
+    /// </summary>
+    [DataField]
+    public UtensilType Utensil = UtensilType.Fork; //There are more "solid" than "liquid" food
+
+    /// <summary>
+    /// Do we need a utensil to access this solution?
+    /// </summary>
+    [DataField]
+    public bool UtensilRequired;
+
+    /// <summary>
+    ///     If this is set to true, food can only be eaten if you have a stomach with a
+    ///     <see cref="StomachComponent.SpecialDigestible"/> that includes this entity in its whitelist,
+    ///     rather than just being digestible by anything that can eat food.
+    ///     Whitelist the food component to allow eating of normal food.
+    /// </summary>
+    [DataField]
+    public bool RequiresSpecialDigestion;
+
+    /// <summary>
+    /// How long it takes to eat the food personally.
+    /// </summary>
+    [DataField]
+    public TimeSpan Delay = TimeSpan.FromSeconds(1f);
+
+    /// <summary>
+    ///     This is how many seconds it takes to force-feed someone this food.
+    ///     Should probably be smaller for small items like pills.
+    /// </summary>
+    [DataField]
+    public TimeSpan ForceFeedDelay = TimeSpan.FromSeconds(3f);
+
+    /// <summary>
+    /// For mobs that are food, requires killing them before eating.
+    /// </summary>
+    [DataField]
+    public bool RequireDead = true;
+
+    /// <summary>
+    /// Verb, icon, and sound data for our edible.
+    /// </summary>
+    [DataField]
+    public ProtoId<EdiblePrototype> Edible = IngestionSystem.Food;
+}
diff --git a/Content.Shared/Nutrition/Components/FoodComponent.cs b/Content.Shared/Nutrition/Components/FoodComponent.cs
index ce04569fcb..5f1ec41717 100644
--- a/Content.Shared/Nutrition/Components/FoodComponent.cs
+++ b/Content.Shared/Nutrition/Components/FoodComponent.cs
@@ -5,7 +5,7 @@ using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Nutrition.Components;
-
+[Obsolete("Migration to Content.Shared.Nutrition.Components.EdibleComponent is required")]
 [RegisterComponent, Access(typeof(FoodSystem), typeof(FoodSequenceSystem))]
 public sealed partial class FoodComponent : Component
 {
@@ -53,7 +53,7 @@ public sealed partial class FoodComponent : Component
     /// The localization identifier for the eat message. Needs a "food" entity argument passed to it.
     /// </summary>
     [DataField]
-    public LocId EatMessage = "food-nom";
+    public LocId EatMessage = "edible-nom";
 
     /// <summary>
     /// How long it takes to eat the food personally.
diff --git a/Content.Shared/Nutrition/Components/IngestionBlockerComponent.cs b/Content.Shared/Nutrition/Components/IngestionBlockerComponent.cs
index 803bf1f8b2..931d47838b 100644
--- a/Content.Shared/Nutrition/Components/IngestionBlockerComponent.cs
+++ b/Content.Shared/Nutrition/Components/IngestionBlockerComponent.cs
@@ -9,13 +9,12 @@ namespace Content.Shared.Nutrition.Components;
 ///     In the event that more head-wear & mask functionality is added (like identity systems, or raising/lowering of
 ///     masks), then this component might become redundant.
 /// </remarks>
-[RegisterComponent, Access(typeof(FoodSystem), typeof(SharedDrinkSystem), typeof(IngestionBlockerSystem))]
+[RegisterComponent, Access(typeof(IngestionSystem))]
 public sealed partial class IngestionBlockerComponent : Component
 {
     /// <summary>
     ///     Is this component currently blocking consumption.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("enabled")]
+    [DataField]
     public bool Enabled { get; set; } = true;
 }
diff --git a/Content.Shared/Nutrition/Components/OpenableComponent.cs b/Content.Shared/Nutrition/Components/OpenableComponent.cs
index 58d6665c58..6a32c0bdeb 100644
--- a/Content.Shared/Nutrition/Components/OpenableComponent.cs
+++ b/Content.Shared/Nutrition/Components/OpenableComponent.cs
@@ -36,7 +36,7 @@ public sealed partial class OpenableComponent : Component
     /// Text shown when examining and its open.
     /// </summary>
     [DataField]
-    public LocId ExamineText = "drink-component-on-examine-is-opened";
+    public LocId ExamineText = "openable-component-on-examine-is-opened";
 
     /// <summary>
     /// The locale id for the popup shown when IsClosed is called and closed. Needs a "owner" entity argument passed to it.
@@ -44,7 +44,7 @@ public sealed partial class OpenableComponent : Component
     /// It's still generic enough that you should change it if you make openable non-drinks, i.e. unwrap it first, peel it first.
     /// </summary>
     [DataField]
-    public LocId ClosedPopup = "drink-component-try-use-drink-not-open";
+    public LocId ClosedPopup = "openable-component-try-use-closed";
 
     /// <summary>
     /// Text to show in the verb menu for the "Open" action.
diff --git a/Content.Shared/Nutrition/Components/SealableComponent.cs b/Content.Shared/Nutrition/Components/SealableComponent.cs
index 1c2f732e7a..71a63f103b 100644
--- a/Content.Shared/Nutrition/Components/SealableComponent.cs
+++ b/Content.Shared/Nutrition/Components/SealableComponent.cs
@@ -22,11 +22,11 @@ public sealed partial class SealableComponent : Component
     /// Text shown when examining and the item's seal has not been broken.
     /// </summary>
     [DataField]
-    public LocId ExamineTextSealed = "drink-component-on-examine-is-sealed";
+    public LocId ExamineTextSealed = "sealable-component-on-examine-is-sealed";
 
     /// <summary>
     /// Text shown when examining and the item's seal has been broken.
     /// </summary>
     [DataField]
-    public LocId ExamineTextUnsealed = "drink-component-on-examine-is-unsealed";
+    public LocId ExamineTextUnsealed = "sealable-component-on-examine-is-unsealed";
 }
diff --git a/Content.Shared/Nutrition/Components/UtensilComponent.cs b/Content.Shared/Nutrition/Components/UtensilComponent.cs
index e8da588186..f3c4323592 100644
--- a/Content.Shared/Nutrition/Components/UtensilComponent.cs
+++ b/Content.Shared/Nutrition/Components/UtensilComponent.cs
@@ -4,7 +4,7 @@ using Robust.Shared.GameStates;
 
 namespace Content.Shared.Nutrition.Components
 {
-    [RegisterComponent, NetworkedComponent, Access(typeof(UtensilSystem))]
+    [RegisterComponent, NetworkedComponent, Access(typeof(IngestionSystem))]
     public sealed partial class UtensilComponent : Component
     {
         [DataField("types")]
diff --git a/Content.Shared/Nutrition/EntitySystems/FlavorProfileSystem.cs b/Content.Shared/Nutrition/EntitySystems/FlavorProfileSystem.cs
index 31384f3a18..e887486e93 100644
--- a/Content.Shared/Nutrition/EntitySystems/FlavorProfileSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/FlavorProfileSystem.cs
@@ -19,22 +19,30 @@ public sealed class FlavorProfileSystem : EntitySystem
 
     private int FlavorLimit => _configManager.GetCVar(CCVars.FlavorLimit);
 
-    public string GetLocalizedFlavorsMessage(EntityUid uid, EntityUid user, Solution solution,
-        FlavorProfileComponent? flavorProfile = null)
+    public string GetLocalizedFlavorsMessage(Entity<FlavorProfileComponent?> entity, EntityUid user, Solution? solution)
     {
-        if (!Resolve(uid, ref flavorProfile, false))
+        HashSet<string> flavors = new();
+        HashSet<string>? ignore = null;
+
+        if (Resolve(entity, ref entity.Comp, false))
         {
-            return Loc.GetString(BackupFlavorMessage);
+            flavors = entity.Comp.Flavors;
+            ignore = entity.Comp.IgnoreReagents;
         }
 
-        var flavors = new HashSet<string>(flavorProfile.Flavors);
-        flavors.UnionWith(GetFlavorsFromReagents(solution, FlavorLimit - flavors.Count, flavorProfile.IgnoreReagents));
+
+        if (solution != null)
+            flavors.UnionWith(GetFlavorsFromReagents(solution, FlavorLimit - flavors.Count, ignore));
 
         var ev = new FlavorProfileModificationEvent(user, flavors);
+
         RaiseLocalEvent(ev);
-        RaiseLocalEvent(uid, ev);
+        RaiseLocalEvent(entity, ev);
         RaiseLocalEvent(user, ev);
 
+        if (flavors.Count == 0)
+            return Loc.GetString(BackupFlavorMessage);
+
         return FlavorsToFlavorMessage(flavors);
     }
 
diff --git a/Content.Shared/Nutrition/EntitySystems/FoodSystem.cs b/Content.Shared/Nutrition/EntitySystems/FoodSystem.cs
index ee2c9f3a4a..a599a1e74e 100644
--- a/Content.Shared/Nutrition/EntitySystems/FoodSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/FoodSystem.cs
@@ -1,58 +1,36 @@
-using System.Linq;
 using Content.Shared.Administration.Logs;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Organ;
-using Content.Shared.Body.Systems;
-using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Database;
-using Content.Shared.Destructible;
-using Content.Shared.DoAfter;
-using Content.Shared.FixedPoint;
-using Content.Shared.Hands.Components;
+using Content.Shared.Forensics;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
-using Content.Shared.Interaction.Components;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Inventory;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Popups;
-using Content.Shared.Stacks;
-using Content.Shared.Storage;
 using Content.Shared.Verbs;
-using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.Utility;
 
 namespace Content.Shared.Nutrition.EntitySystems;
 
 /// <summary>
 /// Handles feeding attempts both on yourself and on the target.
 /// </summary>
+[Obsolete("Migration to Content.Shared.Nutrition.EntitySystems.IngestionSystem is required")]
 public sealed class FoodSystem : EntitySystem
 {
-    [Dependency] private readonly SharedBodySystem _body = default!;
     [Dependency] private readonly FlavorProfileSystem _flavorProfile = default!;
+    [Dependency] private readonly IngestionSystem _ingestion = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly InventorySystem _inventory = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
-    [Dependency] private readonly OpenableSystem _openable = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly ReactiveSystem _reaction = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly SharedHandsSystem _hands = default!;
-    [Dependency] private readonly SharedInteractionSystem _interaction = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
-    [Dependency] private readonly SharedStackSystem _stack = default!;
-    [Dependency] private readonly StomachSystem _stomach = default!;
-    [Dependency] private readonly UtensilSystem _utensil = default!;
-    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public const float MaxFeedDistance = 1.0f;
 
@@ -60,25 +38,35 @@ public sealed class FoodSystem : EntitySystem
     {
         base.Initialize();
 
-        // TODO add InteractNoHandEvent for entities like mice.
-        // run after openable for wrapped/peelable foods
         SubscribeLocalEvent<FoodComponent, UseInHandEvent>(OnUseFoodInHand, after: new[] { typeof(OpenableSystem), typeof(InventorySystem) });
         SubscribeLocalEvent<FoodComponent, AfterInteractEvent>(OnFeedFood);
+
         SubscribeLocalEvent<FoodComponent, GetVerbsEvent<AlternativeVerb>>(AddEatVerb);
-        SubscribeLocalEvent<FoodComponent, ConsumeDoAfterEvent>(OnDoAfter);
-        SubscribeLocalEvent<InventoryComponent, IngestionAttemptEvent>(OnInventoryIngestAttempt);
+
+        SubscribeLocalEvent<FoodComponent, BeforeIngestedEvent>(OnBeforeFoodEaten);
+        SubscribeLocalEvent<FoodComponent, IngestedEvent>(OnFoodEaten);
+        SubscribeLocalEvent<FoodComponent, FullyEatenEvent>(OnFoodFullyEaten);
+
+        SubscribeLocalEvent<FoodComponent, GetUtensilsEvent>(OnGetUtensils);
+
+        SubscribeLocalEvent<FoodComponent, IsDigestibleEvent>(OnIsFoodDigestible);
+
+        SubscribeLocalEvent<FoodComponent, EdibleEvent>(OnFood);
+
+        SubscribeLocalEvent<FoodComponent, GetEdibleTypeEvent>(OnGetEdibleType);
+
+        SubscribeLocalEvent<FoodComponent, BeforeFullySlicedEvent>(OnBeforeFullySliced);
     }
 
     /// <summary>
-    /// Eat item
+    /// Eat or drink an item
     /// </summary>
     private void OnUseFoodInHand(Entity<FoodComponent> entity, ref UseInHandEvent ev)
     {
         if (ev.Handled)
             return;
 
-        var result = TryFeed(ev.User, ev.User, entity, entity.Comp);
-        ev.Handled = result.Handled;
+        ev.Handled = _ingestion.TryIngest(ev.User, ev.User, entity);
     }
 
     /// <summary>
@@ -89,271 +77,98 @@ public sealed class FoodSystem : EntitySystem
         if (args.Handled || args.Target == null || !args.CanReach)
             return;
 
-        var result = TryFeed(args.User, args.Target.Value, entity, entity.Comp);
-        args.Handled = result.Handled;
+        args.Handled = _ingestion.TryIngest(args.User, args.Target.Value, entity);
     }
 
-    /// <summary>
-    /// Tries to feed the food item to the target entity
-    /// </summary>
-    public (bool Success, bool Handled) TryFeed(EntityUid user, EntityUid target, EntityUid food, FoodComponent foodComp)
+    private void AddEatVerb(Entity<FoodComponent> entity, ref GetVerbsEvent<AlternativeVerb> args)
     {
-        //Suppresses eating yourself and alive mobs
-        if (food == user || (_mobState.IsAlive(food) && foodComp.RequireDead))
-            return (false, false);
+        var user = args.User;
 
-        // Target can't be fed or they're already eating
-        if (!TryComp<BodyComponent>(target, out var body))
-            return (false, false);
+        if (entity.Owner == user || !args.CanInteract || !args.CanAccess)
+            return;
 
-        if (HasComp<UnremoveableComponent>(food))
-            return (false, false);
+        if (!_ingestion.TryGetIngestionVerb(user, entity, IngestionSystem.Food, out var verb))
+            return;
 
-        if (_openable.IsClosed(food, user, predicted: true))
-            return (false, true);
-
-        if (!_solutionContainer.TryGetSolution(food, foodComp.Solution, out _, out var foodSolution))
-            return (false, false);
-
-        if (!_body.TryGetBodyOrganEntityComps<StomachComponent>((target, body), out var stomachs))
-            return (false, false);
-
-        // Check for special digestibles
-        if (!IsDigestibleBy(food, foodComp, stomachs))
-            return (false, false);
-
-        if (!TryGetRequiredUtensils(user, foodComp, out _))
-            return (false, false);
-
-        // Check for used storage on the food item
-        if (TryComp<StorageComponent>(food, out var storageState) && storageState.Container.ContainedEntities.Any())
-        {
-            _popup.PopupClient(Loc.GetString("food-has-used-storage", ("food", food)), user, user);
-            return (false, true);
-        }
-
-        // Checks for used item slots
-        if (TryComp<ItemSlotsComponent>(food, out var itemSlots))
-        {
-            if (itemSlots.Slots.Any(slot => slot.Value.HasItem))
-            {
-                _popup.PopupClient(Loc.GetString("food-has-used-storage", ("food", food)), user, user);
-                return (false, true);
-            }
-        }
-
-        var flavors = _flavorProfile.GetLocalizedFlavorsMessage(food, user, foodSolution);
-
-        if (GetUsesRemaining(food, foodComp) <= 0)
-        {
-            _popup.PopupClient(Loc.GetString("food-system-try-use-food-is-empty", ("entity", food)), user, user);
-            DeleteAndSpawnTrash(foodComp, food, user);
-            return (false, true);
-        }
-
-        if (IsMouthBlocked(target, user))
-            return (false, true);
-
-        if (!_interaction.InRangeUnobstructed(user, food, popup: true))
-            return (false, true);
-
-        if (!_interaction.InRangeUnobstructed(user, target, MaxFeedDistance, popup: true))
-            return (false, true);
-
-        // TODO make do-afters account for fixtures in the range check.
-        if (!_transform.GetMapCoordinates(user).InRange(_transform.GetMapCoordinates(target), MaxFeedDistance))
-        {
-            var message = Loc.GetString("interaction-system-user-interaction-cannot-reach");
-            _popup.PopupClient(message, user, user);
-            return (false, true);
-        }
-
-        var forceFeed = user != target;
-        if (forceFeed)
-        {
-            var userName = Identity.Entity(user, EntityManager);
-            _popup.PopupEntity(Loc.GetString("food-system-force-feed", ("user", userName)),
-                user, target);
-
-            // logging
-            _adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(user):user} is forcing {ToPrettyString(target):target} to eat {ToPrettyString(food):food} {SharedSolutionContainerSystem.ToPrettyString(foodSolution)}");
-        }
-        else
-        {
-            // log voluntary eating
-            _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(target):target} is eating {ToPrettyString(food):food} {SharedSolutionContainerSystem.ToPrettyString(foodSolution)}");
-        }
-
-        var doAfterArgs = new DoAfterArgs(EntityManager,
-            user,
-            forceFeed ? foodComp.ForceFeedDelay : foodComp.Delay,
-            new ConsumeDoAfterEvent(foodComp.Solution, flavors),
-            eventTarget: food,
-            target: target,
-            used: food)
-        {
-            BreakOnHandChange = false,
-            BreakOnMove = forceFeed,
-            BreakOnDamage = true,
-            MovementThreshold = 0.01f,
-            DistanceThreshold = MaxFeedDistance,
-            // do-after will stop if item is dropped when trying to feed someone else
-            // or if the item started out in the user's own hands
-            NeedHand = forceFeed || _hands.IsHolding(user, food),
-        };
-
-        _doAfter.TryStartDoAfter(doAfterArgs);
-        return (true, true);
+        args.Verbs.Add(verb);
     }
 
-    private void OnDoAfter(Entity<FoodComponent> entity, ref ConsumeDoAfterEvent args)
+    private void OnBeforeFoodEaten(Entity<FoodComponent> food, ref BeforeIngestedEvent args)
     {
-        if (args.Cancelled || args.Handled || entity.Comp.Deleted || args.Target == null)
+        if (args.Cancelled || args.Solution is not { } solution)
             return;
 
-        if (!TryComp<BodyComponent>(args.Target.Value, out var body))
-            return;
+        // Set it to transfer amount if it exists, otherwise eat the whole volume if possible.
+        args.Transfer = food.Comp.TransferAmount ?? solution.Volume;
+    }
 
-        if (!_body.TryGetBodyOrganEntityComps<StomachComponent>((args.Target.Value, body), out var stomachs))
+    private void OnFoodEaten(Entity<FoodComponent> entity, ref IngestedEvent args)
+    {
+        if (args.Handled)
             return;
 
-        if (args.Used is null || !_solutionContainer.TryGetSolution(args.Used.Value, args.Solution, out var soln, out var solution))
-            return;
-
-        if (!TryGetRequiredUtensils(args.User, entity.Comp, out var utensils))
-            return;
-
-        // TODO this should really be checked every tick.
-        if (IsMouthBlocked(args.Target.Value))
-            return;
-
-        // TODO this should really be checked every tick.
-        if (!_interaction.InRangeUnobstructed(args.User, args.Target.Value))
-            return;
-
-        var forceFeed = args.User != args.Target;
-
         args.Handled = true;
-        var transferAmount = entity.Comp.TransferAmount != null ? FixedPoint2.Min((FixedPoint2) entity.Comp.TransferAmount, solution.Volume) : solution.Volume;
 
-        var split = _solutionContainer.SplitSolution(soln.Value, transferAmount);
+        _audio.PlayPredicted(entity.Comp.UseSound, args.Target, args.User, AudioParams.Default.WithVolume(-1f).WithVariation(0.20f));
 
-        // Get the stomach with the highest available solution volume
-        var highestAvailable = FixedPoint2.Zero;
-        Entity<StomachComponent>? stomachToUse = null;
-        foreach (var ent in stomachs)
+        var flavors = _flavorProfile.GetLocalizedFlavorsMessage(entity.Owner, args.Target, args.Split);
+
+        if (args.ForceFed)
         {
-            var owner = ent.Owner;
-            if (!_stomach.CanTransferSolution(owner, split, ent.Comp1))
-                continue;
-
-            if (!_solutionContainer.ResolveSolution(owner, StomachSystem.DefaultSolutionName, ref ent.Comp1.Solution, out var stomachSol))
-                continue;
-
-            if (stomachSol.AvailableVolume <= highestAvailable)
-                continue;
-
-            stomachToUse = ent;
-            highestAvailable = stomachSol.AvailableVolume;
-        }
-
-        // No stomach so just popup a message that they can't eat.
-        if (stomachToUse == null)
-        {
-            _solutionContainer.TryAddSolution(soln.Value, split);
-            _popup.PopupClient(forceFeed ? Loc.GetString("food-system-you-cannot-eat-any-more-other", ("target", args.Target.Value)) : Loc.GetString("food-system-you-cannot-eat-any-more"), args.Target.Value, args.User);
-            return;
-        }
-
-        _reaction.DoEntityReaction(args.Target.Value, solution, ReactionMethod.Ingestion);
-        _stomach.TryTransferSolution(stomachToUse!.Value.Owner, split, stomachToUse);
-
-        var flavors = args.FlavorMessage;
-
-        if (forceFeed)
-        {
-            var targetName = Identity.Entity(args.Target.Value, EntityManager);
+            var targetName = Identity.Entity(args.Target, EntityManager);
             var userName = Identity.Entity(args.User, EntityManager);
-            _popup.PopupEntity(Loc.GetString("food-system-force-feed-success", ("user", userName), ("flavors", flavors)), entity.Owner, entity.Owner);
+            _popup.PopupEntity(Loc.GetString("edible-force-feed-success", ("user", userName), ("verb", _ingestion.GetProtoVerb(IngestionSystem.Food)), ("flavors", flavors)), entity, entity);
 
-            _popup.PopupClient(Loc.GetString("food-system-force-feed-success-user", ("target", targetName)), args.User, args.User);
+            _popup.PopupClient(Loc.GetString("edible-force-feed-success-user", ("target", targetName), ("verb", _ingestion.GetProtoVerb(IngestionSystem.Food))), args.User, args.User);
 
-            // log successful force feed
-            _adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(entity.Owner):user} forced {ToPrettyString(args.User):target} to eat {ToPrettyString(entity.Owner):food}");
+            // log successful forced feeding
+            _adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(entity):user} forced {ToPrettyString(args.User):target} to eat {ToPrettyString(entity):food}");
         }
         else
         {
             _popup.PopupClient(Loc.GetString(entity.Comp.EatMessage, ("food", entity.Owner), ("flavors", flavors)), args.User, args.User);
 
             // log successful voluntary eating
-            _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(args.User):target} ate {ToPrettyString(entity.Owner):food}");
+            _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(args.User):target} ate {ToPrettyString(entity):food}");
         }
 
-        _audio.PlayPredicted(entity.Comp.UseSound, args.Target.Value, args.User, AudioParams.Default.WithVolume(-1f).WithVariation(0.20f));
-
-        // Try to break all used utensils
-        foreach (var utensil in utensils)
+        // BREAK OUR UTENSILS
+        if (_ingestion.TryGetUtensils(args.User, entity, out var utensils))
         {
-            _utensil.TryBreak(utensil, args.User);
-        }
-
-        args.Repeat = !forceFeed;
-
-        if (TryComp<StackComponent>(entity, out var stack))
-        {
-            //Not deleting whole stack piece will make troubles with grinding object
-            if (stack.Count > 1)
+            foreach (var utensil in utensils)
             {
-                _stack.SetCount(entity.Owner, stack.Count - 1);
-                _solutionContainer.TryAddSolution(soln.Value, split);
-                return;
+                _ingestion.TryBreak(utensil, args.User);
             }
         }
-        else if (GetUsesRemaining(entity.Owner, entity.Comp) > 0)
+
+        if (_ingestion.GetUsesRemaining(entity, entity.Comp.Solution, args.Split.Volume) > 0)
         {
+            // Leave some of the consumer's DNA on the consumed item...
+            var ev = new TransferDnaEvent
+            {
+                Donor = args.Target,
+                Recipient = entity,
+                CanDnaBeCleaned = false,
+            };
+            RaiseLocalEvent(args.Target, ref ev);
+
+            args.Repeat = !args.ForceFed;
             return;
         }
 
-        // don't try to repeat if its being deleted
-        args.Repeat = false;
-        DeleteAndSpawnTrash(entity.Comp, entity.Owner, args.User);
+        // Food is always destroyed...
+        args.Destroy = true;
     }
 
-    public void DeleteAndSpawnTrash(FoodComponent component, EntityUid food, EntityUid user)
+    private void OnFoodFullyEaten(Entity<FoodComponent> food, ref FullyEatenEvent args)
     {
-        var ev = new BeforeFullyEatenEvent
-        {
-            User = user
-        };
-        RaiseLocalEvent(food, ev);
-        if (ev.Cancelled)
+        if (food.Comp.Trash.Count == 0)
             return;
 
-        var attemptEv = new DestructionAttemptEvent();
-        RaiseLocalEvent(food, attemptEv);
-        if (attemptEv.Cancelled)
-            return;
-
-        var afterEvent = new AfterFullyEatenEvent(user);
-        RaiseLocalEvent(food, ref afterEvent);
-
-        var dev = new DestructionEventArgs();
-        RaiseLocalEvent(food, dev);
-
-        if (component.Trash.Count == 0)
-        {
-            PredictedQueueDel(food);
-            return;
-        }
-
-        //We're empty. Become trash.
-        //cache some data as we remove food, before spawning trash and passing it to the hand.
-
         var position = _transform.GetMapCoordinates(food);
-        var trashes = component.Trash;
-        var tryPickup = _hands.IsHolding(user, food, out _);
+        var trashes = food.Comp.Trash;
+        var tryPickup = _hands.IsHolding(args.User, food, out _);
 
-        PredictedDel(food);
         foreach (var trash in trashes)
         {
             var spawnedTrash = EntityManager.PredictedSpawn(trash, position);
@@ -362,192 +177,77 @@ public sealed class FoodSystem : EntitySystem
             if (tryPickup)
             {
                 // Put the trash in the user's hand
-                _hands.TryPickupAnyHand(user, spawnedTrash);
+                _hands.TryPickupAnyHand(args.User, spawnedTrash);
             }
         }
     }
 
-    private void AddEatVerb(Entity<FoodComponent> entity, ref GetVerbsEvent<AlternativeVerb> ev)
-    {
-        if (entity.Owner == ev.User ||
-            !ev.CanInteract ||
-            !ev.CanAccess ||
-            !TryComp<BodyComponent>(ev.User, out var body) ||
-            !_body.TryGetBodyOrganEntityComps<StomachComponent>((ev.User, body), out var stomachs))
-            return;
-
-        // have to kill mouse before eating it
-        if (_mobState.IsAlive(entity) && entity.Comp.RequireDead)
-            return;
-
-        // only give moths eat verb for clothes since it would just fail otherwise
-        if (!IsDigestibleBy(entity, entity.Comp, stomachs))
-            return;
-
-        var user = ev.User;
-        AlternativeVerb verb = new()
-        {
-            Act = () =>
-            {
-                TryFeed(user, user, entity, entity.Comp);
-            },
-            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/cutlery.svg.192dpi.png")),
-            Text = Loc.GetString("food-system-verb-eat"),
-            Priority = -1
-        };
-
-        ev.Verbs.Add(verb);
-    }
-
-    /// <summary>
-    ///     Returns true if the food item can be digested by the user.
-    /// </summary>
-    public bool IsDigestibleBy(EntityUid uid, EntityUid food, FoodComponent? foodComp = null)
-    {
-        if (!Resolve(food, ref foodComp, false))
-            return false;
-
-        if (!_body.TryGetBodyOrganEntityComps<StomachComponent>(uid, out var stomachs))
-            return false;
-
-        return IsDigestibleBy(food, foodComp, stomachs);
-    }
-
-    /// <summary>
-    ///     Returns true if <paramref name="stomachs"/> has a <see cref="StomachComponent.SpecialDigestible"/> that whitelists
-    ///     this <paramref name="food"/> (or if they even have enough stomachs in the first place).
-    /// </summary>
-    private bool IsDigestibleBy(EntityUid food, FoodComponent component, List<Entity<StomachComponent, OrganComponent>> stomachs)
-    {
-        var digestible = true;
-
-        // Does the mob have enough stomachs?
-        if (stomachs.Count < component.RequiredStomachs)
-            return false;
-
-        // Run through the mobs' stomachs
-        foreach (var ent in stomachs)
-        {
-            // Find a stomach with a SpecialDigestible
-            if (ent.Comp1.SpecialDigestible == null)
-                continue;
-            // Check if the food is in the whitelist
-            if (_whitelistSystem.IsWhitelistPass(ent.Comp1.SpecialDigestible, food))
-                return true;
-
-            // If their diet is whitelist exclusive, then they cannot eat anything but what follows their whitelisted tags. Else, they can eat their tags AND human food.
-            if (ent.Comp1.IsSpecialDigestibleExclusive)
-                return false;
-        }
-
-        if (component.RequiresSpecialDigestion)
-            return false;
-
-        return digestible;
-    }
-
-    private bool TryGetRequiredUtensils(EntityUid user, FoodComponent component,
-        out List<EntityUid> utensils, HandsComponent? hands = null)
-    {
-        utensils = new List<EntityUid>();
-
-        if (component.Utensil == UtensilType.None)
-            return true;
-
-        if (!Resolve(user, ref hands, false))
-            return true; //mice
-
-        var usedTypes = UtensilType.None;
-
-        foreach (var item in _hands.EnumerateHeld((user, hands)))
-        {
-            // Is utensil?
-            if (!TryComp<UtensilComponent>(item, out var utensil))
-                continue;
-
-            if ((utensil.Types & component.Utensil) != 0 && // Acceptable type?
-                (usedTypes & utensil.Types) != utensil.Types) // Type is not used already? (removes usage of identical utensils)
-            {
-                // Add to used list
-                usedTypes |= utensil.Types;
-                utensils.Add(item);
-            }
-        }
-
-        // If "required" field is set, try to block eating without proper utensils used
-        if (component.UtensilRequired && (usedTypes & component.Utensil) != component.Utensil)
-        {
-            _popup.PopupClient(Loc.GetString("food-you-need-to-hold-utensil", ("utensil", component.Utensil ^ usedTypes)), user, user);
-            return false;
-        }
-
-        return true;
-    }
-
-    /// <summary>
-    ///     Block ingestion attempts based on the equipped mask or head-wear
-    /// </summary>
-    private void OnInventoryIngestAttempt(Entity<InventoryComponent> entity, ref IngestionAttemptEvent args)
+    private void OnFood(Entity<FoodComponent> food, ref EdibleEvent args)
     {
         if (args.Cancelled)
             return;
 
-        IngestionBlockerComponent? blocker;
+        if (args.Cancelled || args.Solution != null)
+            return;
 
-        if (_inventory.TryGetSlotEntity(entity.Owner, "mask", out var maskUid) &&
-            TryComp(maskUid, out blocker) &&
-            blocker.Enabled)
+        if (food.Comp.UtensilRequired && !_ingestion.HasRequiredUtensils(args.User, food.Comp.Utensil))
         {
-            args.Blocker = maskUid;
-            args.Cancel();
+            args.Cancelled = true;
             return;
         }
 
-        if (_inventory.TryGetSlotEntity(entity.Owner, "head", out var headUid) &&
-            TryComp(headUid, out blocker) &&
-            blocker.Enabled)
-        {
-            args.Blocker = headUid;
-            args.Cancel();
-        }
+        // Check this last
+        _solutionContainer.TryGetSolution(food.Owner, food.Comp.Solution, out args.Solution);
+        args.Time += TimeSpan.FromSeconds(food.Comp.Delay);
     }
 
-
-    /// <summary>
-    ///     Check whether the target's mouth is blocked by equipment (masks or head-wear).
-    /// </summary>
-    /// <param name="uid">The target whose equipment is checked</param>
-    /// <param name="popupUid">Optional entity that will receive an informative pop-up identifying the blocking
-    /// piece of equipment.</param>
-    /// <returns></returns>
-    public bool IsMouthBlocked(EntityUid uid, EntityUid? popupUid = null)
+    private void OnGetUtensils(Entity<FoodComponent> entity, ref GetUtensilsEvent args)
     {
-        var attempt = new IngestionAttemptEvent();
-        RaiseLocalEvent(uid, attempt, false);
-        if (attempt.Cancelled && attempt.Blocker != null && popupUid != null)
-        {
-            _popup.PopupClient(Loc.GetString("food-system-remove-mask", ("entity", attempt.Blocker.Value)),
-                uid, popupUid.Value);
-        }
+        if (entity.Comp.Utensil == UtensilType.None)
+            return;
 
-        return attempt.Cancelled;
+        if (entity.Comp.UtensilRequired)
+            args.AddRequiredTypes(entity.Comp.Utensil);
+        else
+            args.Types |= entity.Comp.Utensil;
     }
 
-    /// <summary>
-    /// Get the number of bites this food has left, based on how much food solution there is and how much of it to eat per bite.
-    /// </summary>
-    public int GetUsesRemaining(EntityUid uid, FoodComponent? comp = null)
+    // TODO: When DrinkComponent and FoodComponent are properly obseleted, make the IsDigestionBools in IngestionSystem private again.
+    private void OnIsFoodDigestible(Entity<FoodComponent> ent, ref IsDigestibleEvent args)
     {
-        if (!Resolve(uid, ref comp))
-            return 0;
+        if (ent.Comp.RequireDead && _mobState.IsAlive(ent))
+            return;
 
-        if (!_solutionContainer.TryGetSolution(uid, comp.Solution, out _, out var solution) || solution.Volume == 0)
-            return 0;
+        args.AddDigestible(ent.Comp.RequiresSpecialDigestion);
+    }
 
-        // eat all in 1 go, so non empty is 1 bite
-        if (comp.TransferAmount == null)
-            return 1;
+    private void OnGetEdibleType(Entity<FoodComponent> ent, ref GetEdibleTypeEvent args)
+    {
+        if (args.Type != null)
+            return;
 
-        return Math.Max(1, (int) Math.Ceiling((solution.Volume / (FixedPoint2) comp.TransferAmount).Float()));
+        args.SetPrototype(IngestionSystem.Food);
+    }
+
+    private void OnBeforeFullySliced(Entity<FoodComponent> food, ref BeforeFullySlicedEvent args)
+    {
+        if (food.Comp.Trash.Count == 0)
+            return;
+
+        var position = _transform.GetMapCoordinates(food);
+        var trashes = food.Comp.Trash;
+        var tryPickup = _hands.IsHolding(args.User, food, out _);
+
+        foreach (var trash in trashes)
+        {
+            var spawnedTrash = EntityManager.PredictedSpawn(trash, position);
+
+            // If the user is holding the item
+            if (tryPickup)
+            {
+                // Put the trash in the user's hand
+                _hands.TryPickupAnyHand(args.User, spawnedTrash);
+            }
+        }
     }
 }
diff --git a/Content.Shared/Nutrition/EntitySystems/IngestionBlockerSystem.cs b/Content.Shared/Nutrition/EntitySystems/IngestionBlockerSystem.cs
deleted file mode 100644
index f9cd233948..0000000000
--- a/Content.Shared/Nutrition/EntitySystems/IngestionBlockerSystem.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Content.Shared.Clothing;
-using Content.Shared.Nutrition.Components;
-
-namespace Content.Shared.Nutrition.EntitySystems;
-
-public sealed class IngestionBlockerSystem : EntitySystem
-{
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<IngestionBlockerComponent, ItemMaskToggledEvent>(OnBlockerMaskToggled);
-    }
-
-    private void OnBlockerMaskToggled(Entity<IngestionBlockerComponent> ent, ref ItemMaskToggledEvent args)
-    {
-        ent.Comp.Enabled = !args.Mask.Comp.IsToggled;
-    }
-}
diff --git a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.API.cs b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.API.cs
new file mode 100644
index 0000000000..3a8ef333d7
--- /dev/null
+++ b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.API.cs
@@ -0,0 +1,430 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.EntityEffects.Effects;
+using Content.Shared.FixedPoint;
+using Content.Shared.Inventory;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.Prototypes;
+using Content.Shared.Verbs;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Nutrition.EntitySystems;
+
+/// <summary>
+/// Public API for Ingestion System so you can build your own form of ingestion system.
+/// </summary>
+public sealed partial class IngestionSystem
+{
+    // List of prototypes that other components or systems might want.
+    public static readonly ProtoId<EdiblePrototype> Food = "Food";
+    public static readonly ProtoId<EdiblePrototype> Drink = "Drink";
+
+    public const float MaxFeedDistance = 1.0f; // We should really have generic interaction ranges like short, medium, long and use those instead...
+    // BodySystem has no way of telling us where the mouth is so we're making some assumptions.
+    public const SlotFlags DefaultFlags = SlotFlags.HEAD | SlotFlags.MASK;
+
+    #region Ingestion
+
+    /// <summary>
+    /// An entity is trying to ingest another entity in Space Station 14!!!
+    /// </summary>
+    /// <param name="user">The entity who is eating.</param>
+    /// <param name="ingested">The entity that is trying to be ingested.</param>
+    /// <returns>Returns true if we are now ingesting the item.</returns>
+    public bool TryIngest(EntityUid user, EntityUid ingested)
+    {
+        return TryIngest(user, user, ingested);
+    }
+
+    /// <inheritdoc cref="TryIngest(EntityUid,EntityUid)"/>
+    /// <summary>Overload of TryIngest for if an entity is trying to make another entity ingest an entity</summary>
+    /// <param name="user">The entity who is trying to make this happen.</param>
+    /// <param name="target">The entity who is being made to ingest something.</param>
+    /// <param name="ingested">The entity that is trying to be ingested.</param>
+    public bool TryIngest(EntityUid user, EntityUid target, EntityUid ingested)
+    {
+        return AttemptIngest(user, target, ingested, true);
+    }
+
+    /// <summary>
+    /// Checks if we can ingest a given entity without actually ingesting it.
+    /// </summary>
+    /// <param name="user">The entity doing the ingesting.</param>
+    /// <param name="ingested">The ingested entity.</param>
+    /// <returns>Returns true if it's possible for the entity to ingest this item.</returns>
+    public bool CanIngest(EntityUid user, EntityUid ingested)
+    {
+        return AttemptIngest(user, user, ingested, false);
+    }
+
+    /// <summary>
+    ///     Check whether we have an open pie-hole that's in range.
+    /// </summary>
+    /// <param name="user">The one performing the action</param>
+    /// <param name="target">The target whose mouth is checked</param>
+    /// <returns></returns>
+    public bool HasMouthAvailable(EntityUid user, EntityUid target)
+    {
+        return HasMouthAvailable(user, target, DefaultFlags);
+    }
+
+    /// <inheritdoc cref="HasMouthAvailable(EntityUid, EntityUid)"/>
+    /// Overflow which takes custom flags for a mouth being blocked, in case the entity has a mouth not on the face.
+    public bool HasMouthAvailable(EntityUid user, EntityUid target, SlotFlags flags)
+    {
+        if (!_transform.GetMapCoordinates(user).InRange(_transform.GetMapCoordinates(target), MaxFeedDistance))
+        {
+            var message = Loc.GetString("interaction-system-user-interaction-cannot-reach");
+            _popup.PopupClient(message, user, user);
+            return false;
+        }
+
+        var attempt = new IngestionAttemptEvent(flags);
+        RaiseLocalEvent(target, ref attempt);
+
+        if (!attempt.Cancelled)
+            return true;
+
+        if (attempt.Blocker != null)
+            _popup.PopupClient(Loc.GetString("ingestion-remove-mask", ("entity", attempt.Blocker.Value)), target, user);
+
+        return false;
+    }
+
+    /// <inheritdoc cref="CanConsume(EntityUid,EntityUid)"/>
+    /// <param name="user">The entity that is consuming</param>
+    /// <param name="ingested">The entity that is being consumed</param>
+    public bool CanConsume(EntityUid user, EntityUid ingested)
+    {
+        return CanConsume(user, user, ingested, out _, out _);
+    }
+
+    /// <summary>
+    ///     Checks if we can feed an edible solution from an entity to a target.
+    /// </summary>
+    /// <param name="user">The one doing the feeding</param>
+    /// <param name="target">The one being fed.</param>
+    /// <param name="ingested">The food item being eaten.</param>
+    /// <returns>Returns true if the user can feed the target with the ingested entity</returns>
+    public bool CanConsume(EntityUid user, EntityUid target, EntityUid ingested)
+    {
+        return CanConsume(user, target, ingested, out _, out _);
+    }
+
+    /// <inheritdoc cref="CanConsume(EntityUid,EntityUid,EntityUid)"/>
+    /// <param name="user">The one doing the feeding</param>
+    /// <param name="target">The one being fed.</param>
+    /// <param name="ingested">The food item being eaten.</param>
+    /// <param name="solution">The solution we will be consuming from.</param>
+    /// <param name="time">The time it takes us to eat this entity if any.</param>
+    /// <returns>Returns true if the user can feed the target with the ingested entity and also returns a solution</returns>
+    public bool CanConsume(EntityUid user,
+        EntityUid target,
+        EntityUid ingested,
+        [NotNullWhen(true)] out Entity<SolutionComponent>? solution,
+        out TimeSpan? time)
+    {
+        solution = null;
+        time = null;
+
+        if (!HasMouthAvailable(user, target))
+            return false;
+
+        // If we don't have the tools to eat we can't eat.
+        return CanAccessSolution(ingested, user, out solution, out time);
+    }
+
+    #endregion
+
+    #region EdibleComponent
+
+    public void SpawnTrash(Entity<EdibleComponent> entity, EntityUid user)
+    {
+        if (entity.Comp.Trash.Count == 0)
+            return;
+
+        var position = _transform.GetMapCoordinates(entity);
+        var trashes = entity.Comp.Trash;
+        var tryPickup = _hands.IsHolding(user, entity, out _);
+
+        foreach (var trash in trashes)
+        {
+            var spawnedTrash = EntityManager.PredictedSpawn(trash, position);
+
+            // If the user is holding the item
+            if (tryPickup)
+            {
+                // Put the trash in the user's hand
+                _hands.TryPickupAnyHand(user, spawnedTrash);
+            }
+        }
+    }
+
+    public FixedPoint2 EdibleVolume(Entity<EdibleComponent> entity)
+    {
+        if (!_solutionContainer.TryGetSolution(entity.Owner, entity.Comp.Solution, out _, out var solution))
+            return FixedPoint2.Zero;
+
+        return solution.Volume;
+    }
+
+    public bool IsEmpty(Entity<EdibleComponent> entity)
+    {
+        return EdibleVolume(entity) == FixedPoint2.Zero;
+    }
+
+    /// <summary>
+    /// Gets the total metabolizable nutrition from an entity, checks first if we can metabolize it.
+    /// If we can't then it's not worth any nutrition.
+    /// </summary>
+    /// <param name="entity">The consumed entity</param>
+    /// <param name="consumer">The entity doing the consuming</param>
+    /// <returns>The amount of nutrition the consumable is worth</returns>
+    public float TotalNutrition(Entity<EdibleComponent?> entity, EntityUid consumer)
+    {
+        if (!CanIngest(consumer, entity))
+            return 0f;
+
+        return TotalNutrition(entity);
+    }
+
+    /// <summary>
+    /// Gets the total metabolizable nutrition from an entity, assumes we can eat and metabolize it.
+    /// </summary>
+    /// <param name="entity">The consumed entity</param>
+    /// <returns>The amount of nutrition the consumable is worth</returns>
+    public float TotalNutrition(Entity<EdibleComponent?> entity)
+    {
+        if (!Resolve(entity, ref entity.Comp))
+            return 0f;
+
+        if (!_solutionContainer.TryGetSolution(entity.Owner, entity.Comp.Solution, out _, out var solution))
+            return 0f;
+
+        var total = 0f;
+        foreach (var quantity in solution.Contents)
+        {
+            var reagent = _proto.Index<ReagentPrototype>(quantity.Reagent.Prototype);
+            if (reagent.Metabolisms == null)
+                continue;
+
+            foreach (var entry in reagent.Metabolisms.Values)
+            {
+                foreach (var effect in entry.Effects)
+                {
+                    // ignores any effect conditions, just cares about how much it can hydrate
+                    if (effect is SatiateHunger hunger)
+                    {
+                        total += hunger.NutritionFactor * quantity.Quantity.Float();
+                    }
+                }
+            }
+        }
+
+        return total;
+    }
+
+    /// <summary>
+    /// Gets the total metabolizable hydration from an entity, checks first if we can metabolize it.
+    /// If we can't then it's not worth any hydration.
+    /// </summary>
+    /// <param name="entity">The consumed entity</param>
+    /// <param name="consumer">The entity doing the consuming</param>
+    /// <returns>The amount of hydration the consumable is worth</returns>
+    public float TotalHydration(Entity<EdibleComponent?> entity, EntityUid consumer)
+    {
+        if (!CanIngest(consumer, entity))
+            return 0f;
+
+        return TotalNutrition(entity);
+    }
+
+    /// <summary>
+    /// Gets the total metabolizable hydration from an entity, assumes we can eat and metabolize it.
+    /// </summary>
+    /// <param name="entity">The consumed entity</param>
+    /// <returns>The amount of hydration the consumable is worth</returns>
+    public float TotalHydration(Entity<EdibleComponent?> entity)
+    {
+        if (!Resolve(entity, ref entity.Comp))
+            return 0f;
+
+        if (!_solutionContainer.TryGetSolution(entity.Owner, entity.Comp.Solution, out _, out var solution))
+            return 0f;
+
+        var total = 0f;
+        foreach (var quantity in solution.Contents)
+        {
+            var reagent = _proto.Index<ReagentPrototype>(quantity.Reagent.Prototype);
+            if (reagent.Metabolisms == null)
+                continue;
+
+            foreach (var entry in reagent.Metabolisms.Values)
+            {
+                foreach (var effect in entry.Effects)
+                {
+                    // ignores any effect conditions, just cares about how much it can hydrate
+                    if (effect is SatiateThirst thirst)
+                    {
+                        total += thirst.HydrationFactor * quantity.Quantity.Float();
+                    }
+                }
+            }
+        }
+
+        return total;
+    }
+
+    #endregion
+
+    #region Solutions
+
+    /// <summary>
+    /// Checks if the item is currently edible.
+    /// </summary>
+    /// <param name="ingested">Entity being ingested</param>
+    /// <param name="user">The entity trying to make the ingestion happening, not necessarily the one eating</param>
+    /// <param name="solution">Solution we're returning</param>
+    /// <param name="time">The time it takes us to eat this entity</param>
+    public bool CanAccessSolution(Entity<SolutionContainerManagerComponent?> ingested,
+        EntityUid user,
+        [NotNullWhen(true)] out Entity<SolutionComponent>? solution,
+        out TimeSpan? time)
+    {
+        solution = null;
+        time = null;
+
+        if (!Resolve(ingested, ref ingested.Comp))
+        {
+            _popup.PopupClient(Loc.GetString("ingestion-try-use-is-empty", ("entity", ingested)), ingested, user);
+            return false;
+        }
+
+        var ev = new EdibleEvent(user);
+        RaiseLocalEvent(ingested, ref ev);
+
+        solution = ev.Solution;
+        time = ev.Time;
+
+        return !ev.Cancelled && solution != null;
+    }
+
+    /// <summary>
+    /// Estimate the number of bites this food has left, based on how much food solution there is and how much of it to eat per bite.
+    /// </summary>
+    public int GetUsesRemaining(EntityUid uid, string solutionName, FixedPoint2 splitVol)
+    {
+        if (!_solutionContainer.TryGetSolution(uid, solutionName, out _, out var solution) || solution.Volume == 0)
+            return 0;
+
+        return Math.Max(1, (int) Math.Ceiling((solution.Volume / splitVol).Float()));
+    }
+
+    #endregion
+
+    #region Edible Types
+
+    /// <summary>
+    /// Tries to get the ingestion verbs for a given user entity and ingestible entity
+    /// </summary>
+    /// <param name="user">The one getting the verbs who would be doing the eating.</param>
+    /// <param name="ingested">Entity being ingested.</param>
+    /// <param name="type">Edible prototype.</param>
+    /// <param name="verb">Verb we're returning.</param>
+    /// <returns>Returns true if we generated a verb.</returns>
+    public bool TryGetIngestionVerb(EntityUid user, EntityUid ingested, [ForbidLiteral] ProtoId<EdiblePrototype> type, [NotNullWhen(true)] out AlternativeVerb? verb)
+    {
+        verb = null;
+
+        // We want to see if we can ingest this item, but we don't actually want to ingest it.
+        if (!CanIngest(user, ingested))
+            return false;
+
+        var proto = _proto.Index(type);
+
+        verb = new()
+        {
+            Act = () =>
+            {
+                TryIngest(user, user, ingested);
+            },
+            Icon = proto.VerbIcon,
+            Text = Loc.GetString(proto.VerbName),
+            Priority = 2
+        };
+
+        return true;
+    }
+
+    /// <summary>
+    /// Returns the most accurate edible prototype for an entity if one exists.
+    /// </summary>
+    /// <param name="entity">entity who's edible prototype we want</param>
+    /// <returns>The best matching prototype if one exists.</returns>
+    public ProtoId<EdiblePrototype>? GetEdibleType(Entity<EdibleComponent?> entity)
+    {
+        if (Resolve(entity, ref entity.Comp, false))
+            return entity.Comp.Edible;
+
+        var ev = new GetEdibleTypeEvent();
+        RaiseLocalEvent(entity, ref ev);
+
+        return ev.Type;
+    }
+
+    public string GetEdibleNoun(Entity<EdibleComponent?> entity)
+    {
+        if (Resolve(entity, ref entity.Comp, false))
+            return GetProtoVerb(entity.Comp.Edible);
+
+        var ev = new GetEdibleTypeEvent();
+        RaiseLocalEvent(entity, ref ev);
+
+        if (ev.Type == null)
+            return Loc.GetString("edible-noun-edible");
+
+        return GetProtoNoun(ev.Type.Value);
+    }
+
+    public string GetProtoNoun([ForbidLiteral] ProtoId<EdiblePrototype> proto)
+    {
+        var prototype = _proto.Index(proto);
+
+        return GetProtoNoun(prototype);
+    }
+
+    public string GetProtoNoun(EdiblePrototype proto)
+    {
+        return Loc.GetString(proto.Noun);
+    }
+
+    public string GetEdibleVerb(Entity<EdibleComponent?> entity)
+    {
+        if (Resolve(entity, ref entity.Comp, false))
+            return GetProtoVerb(entity.Comp.Edible);
+
+        var ev = new GetEdibleTypeEvent();
+        RaiseLocalEvent(entity, ref ev);
+
+        if (ev.Type == null)
+            return Loc.GetString("edible-verb-edible");
+
+        return GetProtoVerb(ev.Type.Value);
+    }
+
+    public string GetProtoVerb([ForbidLiteral] ProtoId<EdiblePrototype> proto)
+    {
+        var prototype = _proto.Index(proto);
+
+        return GetProtoVerb(prototype);
+    }
+
+    public string GetProtoVerb(EdiblePrototype proto)
+    {
+        return Loc.GetString(proto.Verb);
+    }
+
+    #endregion
+}
diff --git a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.Blockers.cs b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.Blockers.cs
new file mode 100644
index 0000000000..e1bd480bcc
--- /dev/null
+++ b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.Blockers.cs
@@ -0,0 +1,159 @@
+using System.Linq;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Clothing;
+using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Fluids.Components;
+using Content.Shared.Interaction.Components;
+using Content.Shared.Inventory;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Storage;
+
+namespace Content.Shared.Nutrition.EntitySystems;
+
+public sealed partial class IngestionSystem
+{
+    [Dependency] private readonly OpenableSystem _openable = default!;
+
+    public void InitializeBlockers()
+    {
+        SubscribeLocalEvent<UnremoveableComponent, IngestibleEvent>(OnUnremovableIngestion);
+        SubscribeLocalEvent<IngestionBlockerComponent, ItemMaskToggledEvent>(OnBlockerMaskToggled);
+        SubscribeLocalEvent<IngestionBlockerComponent, IngestionAttemptEvent>(OnIngestionBlockerAttempt);
+        SubscribeLocalEvent<IngestionBlockerComponent, InventoryRelayedEvent<IngestionAttemptEvent>>(OnIngestionBlockerAttempt);
+
+        // Edible Event
+        SubscribeLocalEvent<EdibleComponent, EdibleEvent>(OnEdible);
+        SubscribeLocalEvent<StorageComponent, EdibleEvent>(OnStorageEdible);
+        SubscribeLocalEvent<ItemSlotsComponent, EdibleEvent>(OnItemSlotsEdible);
+        SubscribeLocalEvent<OpenableComponent, EdibleEvent>(OnOpenableEdible);
+
+        // Digestion Events
+        SubscribeLocalEvent<EdibleComponent, IsDigestibleEvent>(OnEdibleIsDigestible);
+        SubscribeLocalEvent<DrainableSolutionComponent, IsDigestibleEvent>(OnDrainableIsDigestible);
+        SubscribeLocalEvent<PuddleComponent, IsDigestibleEvent>(OnPuddleIsDigestible);
+
+        SubscribeLocalEvent<PillComponent, BeforeIngestedEvent>(OnPillBeforeEaten);
+    }
+
+    private void OnUnremovableIngestion(Entity<UnremoveableComponent> entity, ref IngestibleEvent args)
+    {
+        // If we can't remove it we probably shouldn't be able to eat it.
+        // TODO: Separate glue and Unremovable component.
+        args.Cancelled = true;
+    }
+
+    private void OnBlockerMaskToggled(Entity<IngestionBlockerComponent> ent, ref ItemMaskToggledEvent args)
+    {
+        ent.Comp.Enabled = !args.Mask.Comp.IsToggled;
+    }
+
+    private void OnIngestionBlockerAttempt(Entity<IngestionBlockerComponent> entity, ref IngestionAttemptEvent args)
+    {
+        if (!args.Cancelled && entity.Comp.Enabled)
+            args.Cancelled = true;
+    }
+
+    /// <summary>
+    ///     Block ingestion attempts based on the equipped mask or head-wear
+    /// </summary>
+    private void OnIngestionBlockerAttempt(Entity<IngestionBlockerComponent> entity, ref InventoryRelayedEvent<IngestionAttemptEvent> args)
+    {
+        if (args.Args.Cancelled || !entity.Comp.Enabled)
+            return;
+
+        args.Args.Cancelled = true;
+        args.Args.Blocker = entity;
+    }
+
+    private void OnEdible(Entity<EdibleComponent> entity, ref EdibleEvent args)
+    {
+        if (args.Cancelled || args.Solution != null)
+            return;
+
+        if (entity.Comp.UtensilRequired && !HasRequiredUtensils(args.User, entity.Comp.Utensil))
+        {
+            args.Cancelled = true;
+            return;
+        }
+
+        // Check this last
+        if (!_solutionContainer.TryGetSolution(entity.Owner, entity.Comp.Solution, out args.Solution) || IsEmpty(entity) && !entity.Comp.DestroyOnEmpty)
+        {
+            args.Cancelled = true;
+
+            _popup.PopupClient(Loc.GetString("ingestion-try-use-is-empty", ("entity", entity)), entity, args.User);
+            return;
+        }
+
+        // Time is additive because I said so.
+        args.Time += entity.Comp.Delay;
+    }
+
+    private void OnStorageEdible(Entity<StorageComponent> ent, ref EdibleEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        if (!ent.Comp.Container.ContainedEntities.Any())
+            return;
+
+        args.Cancelled = true;
+
+        _popup.PopupClient(Loc.GetString("edible-has-used-storage", ("food", ent), ("verb", GetEdibleVerb(ent.Owner))), args.User, args.User);
+    }
+
+    private void OnItemSlotsEdible(Entity<ItemSlotsComponent> ent, ref EdibleEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        if (!ent.Comp.Slots.Any(slot => slot.Value.HasItem))
+            return;
+
+        args.Cancelled = true;
+
+        _popup.PopupClient(Loc.GetString("edible-has-used-storage", ("food", ent), ("verb", GetEdibleVerb(ent.Owner))), args.User, args.User);
+    }
+
+    private void OnOpenableEdible(Entity<OpenableComponent> ent, ref EdibleEvent args)
+    {
+        if (_openable.IsClosed(ent, args.User, ent.Comp))
+            args.Cancelled = true;
+    }
+
+    private void OnEdibleIsDigestible(Entity<EdibleComponent> ent, ref IsDigestibleEvent args)
+    {
+        if (ent.Comp.RequireDead && _mobState.IsAlive(ent))
+            return;
+
+        args.AddDigestible(ent.Comp.RequiresSpecialDigestion);
+    }
+
+    /// <remarks>
+    /// Both of these assume that having this component means there's nothing stopping you from slurping up
+    /// pure reagent juice with absolutely nothing to stop you.
+    /// </remarks>
+    private void OnDrainableIsDigestible(Entity<DrainableSolutionComponent> ent, ref IsDigestibleEvent args)
+    {
+        args.UniversalDigestion();
+    }
+
+    private void OnPuddleIsDigestible(Entity<PuddleComponent> ent, ref IsDigestibleEvent args)
+    {
+        args.UniversalDigestion();
+    }
+
+    /// <remarks>
+    /// I mean you have to eat the *whole* pill no?
+    /// </remarks>
+    private void OnPillBeforeEaten(Entity<PillComponent> ent, ref BeforeIngestedEvent args)
+    {
+        if (args.Cancelled || args.Solution is not { } sol)
+            return;
+
+        if (args.TryNewMinimum(sol.Volume))
+            return;
+
+        args.Cancelled = true;
+    }
+}
diff --git a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.Utensils.cs b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.Utensils.cs
new file mode 100644
index 0000000000..670fdc8dfb
--- /dev/null
+++ b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.Utensils.cs
@@ -0,0 +1,157 @@
+using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Hands.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Random.Helpers;
+using Content.Shared.Tools.EntitySystems;
+using Robust.Shared.Audio;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Nutrition.EntitySystems;
+
+public sealed partial class IngestionSystem
+{
+    [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    private EntityQuery<UtensilComponent> _utensilsQuery;
+
+    public void InitializeUtensils()
+    {
+        SubscribeLocalEvent<UtensilComponent, AfterInteractEvent>(OnAfterInteract, after: new[] { typeof(ToolOpenableSystem) });
+
+        SubscribeLocalEvent<EdibleComponent, GetUtensilsEvent>(OnGetEdibleUtensils);
+
+        _utensilsQuery = GetEntityQuery<UtensilComponent>();
+    }
+
+    /// <summary>
+    /// Clicked with utensil
+    /// </summary>
+    private void OnAfterInteract(Entity<UtensilComponent> entity, ref AfterInteractEvent ev)
+    {
+        if (ev.Handled || ev.Target == null || !ev.CanReach)
+            return;
+
+        ev.Handled = TryUseUtensil(ev.User, ev.Target.Value, entity);
+    }
+
+    public bool TryUseUtensil(EntityUid user, EntityUid target, Entity<UtensilComponent> utensil)
+    {
+        var ev = new GetUtensilsEvent();
+        RaiseLocalEvent(target, ref ev);
+
+        //Prevents food usage with a wrong utensil
+        if ((ev.Types & utensil.Comp.Types) == 0)
+        {
+            _popup.PopupClient(Loc.GetString("ingestion-try-use-wrong-utensil", ("verb", GetEdibleVerb(target)),("food", target), ("utensil", utensil.Owner)), user, user);
+            return true;
+        }
+
+        if (!_interactionSystem.InRangeUnobstructed(user, target, popup: true))
+            return true;
+
+        return TryIngest(user, user, target);
+    }
+
+    /// <summary>
+    /// Attempt to break the utensil after interaction.
+    /// </summary>
+    /// <param name="entity">Utensil.</param>
+    /// <param name="userUid">User of the utensil.</param>
+    public void TryBreak(Entity<UtensilComponent?> entity, EntityUid userUid)
+    {
+        if (!Resolve(entity, ref entity.Comp))
+            return;
+
+        // TODO: Once we have predicted randomness delete this for something sane...
+        var seed = SharedRandomExtensions.HashCodeCombine(new() {(int)_timing.CurTick.Value, GetNetEntity(entity).Id, GetNetEntity(userUid).Id });
+        var rand = new System.Random(seed);
+
+        if (!rand.Prob(entity.Comp.BreakChance))
+            return;
+
+        _audio.PlayPredicted(entity.Comp.BreakSound, userUid, userUid, AudioParams.Default.WithVolume(-2f));
+        // Not prediced because no random predicted
+        PredictedDel(entity.Owner);
+    }
+
+    /// <summary>
+    /// Checks if we have the utensils required to eat a certain food item.
+    /// </summary>
+    /// <param name="entity">Entity that is trying to eat.</param>
+    /// <param name="food">The types of utensils we need.</param>
+    /// <param name="utensils">The utensils needed to eat the food item.</param>
+    /// <returns>True if we are able to eat the item.</returns>
+    public bool TryGetUtensils(Entity<HandsComponent?> entity, EntityUid food, out List<EntityUid> utensils)
+    {
+        var ev = new GetUtensilsEvent();
+        RaiseLocalEvent(food, ref ev);
+
+        return TryGetUtensils(entity, ev.Types, ev.RequiredTypes, out utensils);
+    }
+
+    public bool TryGetUtensils(Entity<HandsComponent?> entity, UtensilType types, UtensilType requiredTypes, out List<EntityUid> utensils)
+    {
+        utensils = new List<EntityUid>();
+
+        var required = requiredTypes != UtensilType.None;
+
+        // Why are we even here? Just to suffer?
+        if (types == UtensilType.None)
+            return true;
+
+        // If you don't have hands you can eat anything I guess.
+        if (!Resolve(entity, ref entity.Comp, false)) // You aren't allowed to eat with your hands in this hellish dystopia.
+            return true;
+
+        var usedTypes = UtensilType.None;
+
+        foreach (var item in _hands.EnumerateHeld(entity))
+        {
+            // Is utensil?
+            if (!_utensilsQuery.TryComp(item, out var utensil))
+                continue;
+
+            // Do we have a new and unused utensil type?
+            if ((utensil.Types & types) == 0 || (usedTypes & utensil.Types) == utensil.Types)
+                continue;
+
+            // Add to used list
+            usedTypes |= utensil.Types;
+            utensils.Add(item);
+        }
+
+        // If "required" field is set, try to block eating without proper utensils used
+        if (!required || (usedTypes & requiredTypes) == requiredTypes)
+            return true;
+
+        _popup.PopupClient(Loc.GetString("ingestion-you-need-to-hold-utensil", ("utensil", requiredTypes ^ usedTypes)), entity, entity);
+        return false;
+
+    }
+
+    /// <summary>
+    /// Checks if you have the required utensils based on a list of types.
+    /// Note it is assumed if you're calling this method that you need utensils.
+    /// </summary>
+    /// <param name="entity">The entity doing the action who has the utensils.</param>
+    /// <param name="types">The types of utensils we need.</param>
+    /// <returns>Returns true if we have the utensils we need.</returns>
+    public bool HasRequiredUtensils(EntityUid entity, UtensilType types)
+    {
+        return TryGetUtensils(entity, types, types, out _);
+    }
+
+    private void OnGetEdibleUtensils(Entity<EdibleComponent> entity, ref GetUtensilsEvent args)
+    {
+        if (entity.Comp.Utensil == UtensilType.None)
+            return;
+
+        if (entity.Comp.UtensilRequired)
+            args.AddRequiredTypes(entity.Comp.Utensil);
+        else
+            args.Types |= entity.Comp.Utensil;
+    }
+}
diff --git a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs
new file mode 100644
index 0000000000..470747fa3f
--- /dev/null
+++ b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs
@@ -0,0 +1,534 @@
+using Content.Shared.Administration.Logs;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Organ;
+using Content.Shared.Body.Systems;
+using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Database;
+using Content.Shared.Destructible;
+using Content.Shared.DoAfter;
+using Content.Shared.FixedPoint;
+using Content.Shared.Forensics;
+using Content.Shared.Hands.EntitySystems;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Events;
+using Content.Shared.Inventory;
+using Content.Shared.Mobs.Systems;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Popups;
+using Content.Shared.Tools.EntitySystems;
+using Content.Shared.Verbs;
+using Content.Shared.Whitelist;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Nutrition.EntitySystems;
+
+/// <remarks>
+/// I was warned about puddle system, I knew the risks with body system, but food and drink system?
+/// Food and Drink system was a sleeping titan, and I walked directly into it's gaping maw.
+/// Between copy-pasted code, strange reliance on systems, being a pillar of chemistry for some reason,
+/// nothing could've prepared me for the horror that I had to endure. I saw the signs, comments of those who
+/// turned back, code that was made to be "just good enough" the fact that I got soaped by soap.yml, but I
+/// ignored them and pressed on.
+/// Let this remark be a reminder to those who come after, that I was here, and that I vanquished a great beast.
+/// Let young little contributors rest easy at night not knowing the horrible system that once lived beneath the
+/// bedrock of the codebase they now commit to.
+/// </remarks>
+/// <summary>
+/// This handles the ingestion of solutions and entities.
+/// </summary>
+public sealed partial class IngestionSystem : EntitySystem
+{
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+    [Dependency] private readonly FlavorProfileSystem _flavorProfile = default!;
+    [Dependency] private readonly MobStateSystem _mobState = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+
+    // Body Component Dependencies
+    [Dependency] private readonly SharedBodySystem _body = default!;
+    [Dependency] private readonly ReactiveSystem _reaction = default!;
+    [Dependency] private readonly StomachSystem _stomach = default!;
+
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<EdibleComponent, ComponentInit>(OnEdibleInit);
+
+        // Interactions
+        SubscribeLocalEvent<EdibleComponent, UseInHandEvent>(OnUseEdibleInHand, after: new[] { typeof(OpenableSystem), typeof(InventorySystem) });
+        SubscribeLocalEvent<EdibleComponent, AfterInteractEvent>(OnEdibleInteract, after: new[] { typeof(ToolOpenableSystem) });
+
+        // Generic Eating Handlers
+        SubscribeLocalEvent<EdibleComponent, BeforeIngestedEvent>(OnBeforeIngested);
+        SubscribeLocalEvent<EdibleComponent, IngestedEvent>(OnEdibleIngested);
+        SubscribeLocalEvent<EdibleComponent, FullyEatenEvent>(OnFullyEaten);
+
+        // Body Component eating handler
+        SubscribeLocalEvent<BodyComponent, AttemptIngestEvent>(OnTryIngest);
+        SubscribeLocalEvent<BodyComponent, EatingDoAfterEvent>(OnEatingDoAfter);
+
+        // Verbs
+        SubscribeLocalEvent<EdibleComponent, GetVerbsEvent<AlternativeVerb>>(AddEdibleVerbs);
+        SubscribeLocalEvent<EdibleComponent, SolutionContainerChangedEvent>(OnSolutionContainerChanged);
+
+        // Misc
+        SubscribeLocalEvent<EdibleComponent, AttemptShakeEvent>(OnAttemptShake);
+        SubscribeLocalEvent<EdibleComponent, BeforeFullySlicedEvent>(OnBeforeFullySliced);
+
+        InitializeBlockers();
+        InitializeUtensils();
+    }
+
+    /// <summary>
+    /// Eat or drink an item
+    /// </summary>
+    private void OnUseEdibleInHand(Entity<EdibleComponent> entity, ref UseInHandEvent ev)
+    {
+        if (ev.Handled)
+            return;
+
+        ev.Handled = TryIngest(ev.User, entity);
+    }
+
+    /// <summary>
+    /// Feed someone else
+    /// </summary>
+    private void OnEdibleInteract(Entity<EdibleComponent> entity, ref AfterInteractEvent args)
+    {
+        if (args.Handled || args.Target == null || !args.CanReach)
+            return;
+
+        args.Handled = TryIngest(args.User, args.Target.Value, entity);
+    }
+
+    /// <summary>Raises events to see if it's possible to ingest </summary>
+    /// <param name="user">The entity who is trying to make this happen.</param>
+    /// <param name="target">The entity who is being made to ingest something.</param>
+    /// <param name="ingested">The entity that is trying to be ingested.</param>
+    /// <param name="ingest">Bool that determines whethere this is a Try or a Can effectively.
+    /// When set to true, it tries to ingest, when false it checks if we can.</param>
+    /// <returns>Returns true if we can ingest the item.</returns>
+    private bool AttemptIngest(EntityUid user, EntityUid target, EntityUid ingested, bool ingest)
+    {
+        var eatEv = new IngestibleEvent();
+        RaiseLocalEvent(ingested, ref eatEv);
+
+        if (eatEv.Cancelled)
+            return false;
+
+        var ingestionEv = new AttemptIngestEvent(user, ingested, ingest);
+        RaiseLocalEvent(target, ref ingestionEv);
+
+        return ingestionEv.Handled;
+    }
+
+    private void OnEdibleInit(Entity<EdibleComponent> entity, ref ComponentInit args)
+    {
+        // TODO: When Food and Drink component are kill make sure to nuke both TryComps and just have it update appearance...
+        // Beakers, Soap and other items have drainable, and we should be able to eat that solution...
+        // If I could make drainable properly support sound effects and such I'd just have it use TryIngest itself
+        // Does this exist just to make tests fail? That way you have the proper yaml???
+        if (TryComp<DrainableSolutionComponent>(entity, out var existingDrainable))
+            entity.Comp.Solution = existingDrainable.Solution;
+
+        UpdateAppearance(entity);
+
+        if (TryComp(entity, out RefillableSolutionComponent? refillComp))
+            refillComp.Solution = entity.Comp.Solution;
+    }
+
+    #region Appearance System
+
+    public void UpdateAppearance(Entity<EdibleComponent, AppearanceComponent?> entity)
+    {
+        if (!Resolve(entity, ref entity.Comp2, false))
+            return;
+
+        var drainAvailable = EdibleVolume(entity);
+        _appearance.SetData(entity, FoodVisuals.Visual, drainAvailable.Float(), entity.Comp2);
+    }
+
+    private void OnSolutionContainerChanged(Entity<EdibleComponent> entity, ref SolutionContainerChangedEvent args)
+    {
+        UpdateAppearance(entity);
+    }
+
+    #endregion
+
+    #region BodySystem
+
+    // TODO: The IsDigestibleBy bools should be API but they're too specific to the BodySystem to be API. Requires BodySystem rework.
+    /// <summary>
+    /// Generic method which takes a list of stomachs, and checks if a given food item passes any stomach's whitelist
+    /// in a given list of stomachs.
+    /// </summary>
+    /// <param name="food">Entity being eaten</param>
+    /// <param name="stomachs">Stomachs available to digest</param>
+    public bool IsDigestibleBy(EntityUid food, List<Entity<StomachComponent, OrganComponent>> stomachs)
+    {
+        var ev = new IsDigestibleEvent();
+        RaiseLocalEvent(food, ref ev);
+
+        if (!ev.Digestible)
+            return false;
+
+        if (ev.Universal)
+            return true;
+
+        if (ev.SpecialDigestion)
+        {
+            foreach (var ent in stomachs)
+            {
+                // We need one stomach that can digest our special food.
+                if (_whitelistSystem.IsWhitelistPass(ent.Comp1.SpecialDigestible, food))
+                    return true;
+            }
+        }
+        else
+        {
+            foreach (var ent in stomachs)
+            {
+                // We need one stomach that can digest normal food.
+                if (ent.Comp1.SpecialDigestible == null
+                    || !ent.Comp1.IsSpecialDigestibleExclusive
+                    || _whitelistSystem.IsWhitelistPass(ent.Comp1.SpecialDigestible, food))
+                    return true;
+            }
+        }
+
+        // If we didn't find a stomach that can digest our food then it doesn't exist.
+        return false;
+    }
+
+    /// <summary>
+    /// Generic method which takes a single stomach into account, and checks if a given food item passes a stomach whitelist.
+    /// </summary>
+    /// <param name="food">Entity being eaten</param>
+    /// <param name="stomach">Stomachs that is attempting to digest.</param>
+    public bool IsDigestibleBy(EntityUid food, Entity<StomachComponent, OrganComponent> stomach)
+    {
+        var ev = new IsDigestibleEvent();
+        RaiseLocalEvent(food, ref ev);
+
+        if (!ev.Digestible)
+            return false;
+
+        if (ev.Universal)
+            return true;
+
+        if (ev.SpecialDigestion)
+            return _whitelistSystem.IsWhitelistPass(stomach.Comp1.SpecialDigestible, food);
+
+        if (stomach.Comp1.SpecialDigestible == null || !stomach.Comp1.IsSpecialDigestibleExclusive || _whitelistSystem.IsWhitelistPass(stomach.Comp1.SpecialDigestible, food))
+            return true;
+
+        return false;
+    }
+
+    private void OnTryIngest(Entity<BodyComponent> entity, ref AttemptIngestEvent args)
+    {
+        var food = args.Ingested;
+        var forceFed = args.User != entity.Owner;
+
+        if (!_body.TryGetBodyOrganEntityComps<StomachComponent>(entity!, out var stomachs))
+            return;
+
+        // Can we digest the specific item we're trying to eat?
+        if (!IsDigestibleBy(args.Ingested, stomachs))
+        {
+            if (!args.Ingest)
+                return;
+
+            if (forceFed)
+                _popup.PopupClient(Loc.GetString("ingestion-cant-digest-other", ("target", entity), ("entity", food)), entity, args.User);
+            else
+                _popup.PopupClient(Loc.GetString("ingestion-cant-digest", ("entity", food)), entity, entity);
+
+            return;
+        }
+
+        // Exit early if we're just trying to get verbs
+        if (!args.Ingest)
+        {
+            args.Handled = true;
+            return;
+        }
+
+        // Check if despite being able to digest the item something is blocking us from eating.
+        if (!CanConsume(args.User, entity, args.Ingested, out var solution, out var time))
+            return;
+
+        if (!_doAfter.TryStartDoAfter(GetEdibleDoAfterArgs(args.User, entity, food, time ?? TimeSpan.Zero)))
+            return;
+
+        args.Handled = true;
+        var foodSolution = solution.Value.Comp.Solution;
+
+        if (forceFed)
+        {
+            var userName = Identity.Entity(args.User, EntityManager);
+            _popup.PopupEntity(Loc.GetString("edible-force-feed", ("user", userName), ("verb", GetEdibleVerb(food))), args.User, entity);
+
+            // logging
+            _adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(args.User):user} is forcing {ToPrettyString(entity):target} to eat {ToPrettyString(food):food} {SharedSolutionContainerSystem.ToPrettyString(foodSolution)}");
+        }
+        else
+        {
+            // log voluntary eating
+            _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(entity):target} is eating {ToPrettyString(food):food} {SharedSolutionContainerSystem.ToPrettyString(foodSolution)}");
+        }
+    }
+
+    private void OnEatingDoAfter(Entity<BodyComponent> entity, ref EatingDoAfterEvent args)
+    {
+        if (args.Cancelled || args.Handled || entity.Comp.Deleted || args.Target == null)
+            return;
+
+        var food = args.Target.Value;
+
+        var blockerEv = new IngestibleEvent();
+        RaiseLocalEvent(food, ref blockerEv);
+
+        if (blockerEv.Cancelled)
+            return;
+
+        if (!CanConsume(args.User, entity, food, out var solution, out _))
+            return;
+
+        if (!_body.TryGetBodyOrganEntityComps<StomachComponent>(entity!, out var stomachs))
+            return;
+
+        var forceFed = args.User != entity.Owner;
+
+        var highestAvailable = FixedPoint2.Zero;
+        Entity<StomachComponent>? stomachToUse = null;
+        foreach (var ent in stomachs)
+        {
+            var owner = ent.Owner;
+            if (!_solutionContainer.ResolveSolution(owner, StomachSystem.DefaultSolutionName, ref ent.Comp1.Solution, out var stomachSol))
+                continue;
+
+            if (stomachSol.AvailableVolume <= highestAvailable)
+                continue;
+
+            if (!IsDigestibleBy(food, ent))
+                continue;
+
+            stomachToUse = ent;
+            highestAvailable = stomachSol.AvailableVolume;
+        }
+
+        // All stomachs are full or we have no stomachs
+        if (stomachToUse == null)
+        {
+            // Very long
+            _popup.PopupClient(Loc.GetString("ingestion-you-cannot-ingest-any-more", ("verb", GetEdibleVerb(food))), entity, entity);
+            if (!forceFed)
+                return;
+
+            _popup.PopupClient(Loc.GetString("ingestion-other-cannot-ingest-any-more", ("target", entity), ("verb", GetEdibleVerb(food))),  args.Target.Value, args.User);
+            return;
+        }
+
+        var beforeEv = new BeforeIngestedEvent(FixedPoint2.Zero, highestAvailable, solution.Value.Comp.Solution);
+        RaiseLocalEvent(food, ref beforeEv);
+        RaiseLocalEvent(entity, ref beforeEv);
+
+        if (beforeEv.Cancelled || beforeEv.Min > beforeEv.Max)
+        {
+            // Very long x2
+            _popup.PopupClient(Loc.GetString("ingestion-you-cannot-ingest-any-more", ("verb", GetEdibleVerb(food))), entity, entity);
+            if (!forceFed)
+                return;
+
+            _popup.PopupClient(Loc.GetString("ingestion-other-cannot-ingest-any-more", ("target", entity), ("verb", GetEdibleVerb(food))),  args.Target.Value, args.User);
+            return;
+        }
+
+        var transfer = FixedPoint2.Clamp(beforeEv.Transfer, beforeEv.Min, beforeEv.Max);
+
+        var split = _solutionContainer.SplitSolution(solution.Value, transfer);
+
+        var ingestEv = new IngestingEvent(food, split, forceFed);
+        RaiseLocalEvent(entity, ref ingestEv);
+
+        _reaction.DoEntityReaction(entity, split, ReactionMethod.Ingestion);
+
+        // Everything is good to go item has been successfuly eaten
+        var afterEv = new IngestedEvent(args.User, entity, split, forceFed);
+        RaiseLocalEvent(food, ref afterEv);
+
+        if (afterEv.Refresh)
+            _solutionContainer.TryAddSolution(solution.Value, split);
+
+        _stomach.TryTransferSolution(stomachToUse.Value.Owner, split, stomachToUse);
+
+        if (!afterEv.Destroy)
+        {
+            args.Repeat = afterEv.Repeat;
+            return;
+        }
+
+        var ev = new DestructionAttemptEvent();
+        RaiseLocalEvent(food, ev);
+        if (ev.Cancelled)
+            return;
+
+        // Tell the food that it's time to die.
+        var finishedEv = new FullyEatenEvent(args.User);
+        RaiseLocalEvent(food, ref finishedEv);
+
+        var eventArgs = new DestructionEventArgs();
+        RaiseLocalEvent(food, eventArgs);
+
+        PredictedDel(food);
+
+        // Don't try to repeat if its being deleted
+        args.Repeat = false;
+    }
+
+    /// <summary>
+    /// Gets the DoAfterArgs for the specific event
+    /// </summary>
+    /// <param name="user">Entity that is doing the action.</param>
+    /// <param name="target">Entity that is eating.</param>
+    /// <param name="food">Food entity we're trying to eat.</param>
+    /// <param name="delay">The time delay for our DoAfter</param>
+    /// <returns>Returns true if it was able to successfully start the DoAfter</returns>
+    private DoAfterArgs GetEdibleDoAfterArgs(EntityUid user, EntityUid target, EntityUid food, TimeSpan delay = default)
+    {
+        var forceFeed = user != target;
+
+        var doAfterArgs = new DoAfterArgs(EntityManager, user, delay, new EatingDoAfterEvent(), target, food)
+        {
+            BreakOnHandChange = false,
+            BreakOnMove = forceFeed,
+            BreakOnDamage = true,
+            MovementThreshold = 0.01f,
+            DistanceThreshold = MaxFeedDistance,
+            // do-after will stop if item is dropped when trying to feed someone else
+            // or if the item started out in the user's own hands
+            NeedHand = forceFeed || _hands.IsHolding(user, food),
+        };
+
+        return doAfterArgs;
+    }
+
+    #endregion
+
+    private void OnBeforeIngested(Entity<EdibleComponent> food, ref BeforeIngestedEvent args)
+    {
+        if (args.Cancelled || args.Solution is not { } solution)
+            return;
+
+        // Set it to transfer amount if it exists, otherwise eat the whole volume if possible.
+        args.Transfer = food.Comp.TransferAmount ?? solution.Volume;
+    }
+
+    private void OnEdibleIngested(Entity<EdibleComponent> entity, ref IngestedEvent args)
+    {
+        // This is a lot but there wasn't really a way to separate this from the EdibleComponent otherwise I would've moved it.
+
+        if (args.Handled)
+            return;
+
+        args.Handled = true;
+
+        var edible = _proto.Index(entity.Comp.Edible);
+
+        _audio.PlayPredicted(edible.UseSound, args.Target, args.User);
+
+        var flavors = _flavorProfile.GetLocalizedFlavorsMessage(entity.Owner, args.Target, args.Split);
+
+        if (args.ForceFed)
+        {
+            var targetName = Identity.Entity(args.Target, EntityManager);
+            var userName = Identity.Entity(args.User, EntityManager);
+            _popup.PopupEntity(Loc.GetString("edible-force-feed-success", ("user", userName), ("verb", edible.Verb), ("flavors", flavors)), entity, entity);
+
+            _popup.PopupClient(Loc.GetString("edible-force-feed-success-user", ("target", targetName), ("verb", edible.Verb)), args.User, args.User);
+
+            // log successful forced feeding
+            _adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(entity):user} forced {ToPrettyString(args.User):target} to eat {ToPrettyString(entity):food}");
+        }
+        else
+        {
+            _popup.PopupPredicted(Loc.GetString(edible.Message, ("food", entity.Owner), ("flavors", flavors)),
+                Loc.GetString(edible.OtherMessage),
+                args.User,
+                args.User);
+
+            // log successful voluntary eating
+            _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(args.User):target} ate {ToPrettyString(entity):food}");
+        }
+
+        // BREAK OUR UTENSILS
+        if (TryGetUtensils(args.User, entity, out var utensils))
+        {
+            foreach (var utensil in utensils)
+            {
+                TryBreak(utensil, args.User);
+            }
+        }
+
+        // This also prevents us from repeating if it's empty
+        if (!IsEmpty(entity))
+        {
+            // Leave some of the consumer's DNA on the consumed item...
+            var ev = new TransferDnaEvent
+            {
+                Donor = args.Target,
+                Recipient = entity,
+                CanDnaBeCleaned = false,
+            };
+            RaiseLocalEvent(args.Target, ref ev);
+
+            args.Repeat = !args.ForceFed;
+            return;
+        }
+
+        args.Destroy = entity.Comp.DestroyOnEmpty;
+    }
+
+    private void OnFullyEaten(Entity<EdibleComponent> entity, ref FullyEatenEvent args)
+    {
+        SpawnTrash(entity, args.User);
+    }
+
+    private void OnBeforeFullySliced(Entity<EdibleComponent> entity, ref BeforeFullySlicedEvent args)
+    {
+        SpawnTrash(entity, args.User);
+    }
+
+    private void AddEdibleVerbs(Entity<EdibleComponent> entity, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        var user = args.User;
+
+        if (entity.Owner == user || !args.CanInteract || !args.CanAccess)
+            return;
+
+        if (!TryGetIngestionVerb(user, entity, entity.Comp.Edible, out var verb))
+            return;
+
+        args.Verbs.Add(verb);
+    }
+
+    private void OnAttemptShake(Entity<EdibleComponent> entity, ref AttemptShakeEvent args)
+    {
+        if (IsEmpty(entity))
+            args.Cancelled = true;
+    }
+}
diff --git a/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs b/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs
index 2f276fa93d..588875d553 100644
--- a/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs
@@ -122,10 +122,7 @@ public sealed partial class OpenableSystem : EntitySystem
     private void OnTransferAttempt(Entity<OpenableComponent> ent, ref SolutionTransferAttemptEvent args)
     {
         if (!ent.Comp.Opened)
-        {
-            // message says its just for drinks, shouldn't matter since you typically dont have a food that is openable and can be poured out
-            args.Cancel(Loc.GetString("drink-component-try-use-drink-not-open", ("owner", ent.Owner)));
-        }
+            args.Cancel(Loc.GetString(ent.Comp.ClosedPopup, ("owner", ent.Owner)));
     }
 
     private void OnAttemptShake(Entity<OpenableComponent> entity, ref AttemptShakeEvent args)
diff --git a/Content.Shared/Nutrition/EntitySystems/SharedDrinkSystem.cs b/Content.Shared/Nutrition/EntitySystems/SharedDrinkSystem.cs
index a4b8e13b2f..fe804dd2e6 100644
--- a/Content.Shared/Nutrition/EntitySystems/SharedDrinkSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/SharedDrinkSystem.cs
@@ -1,34 +1,28 @@
 using Content.Shared.Administration.Logs;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Systems;
-using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Database;
-using Content.Shared.DoAfter;
-using Content.Shared.Examine;
 using Content.Shared.FixedPoint;
-using Content.Shared.Hands.EntitySystems;
+using Content.Shared.Forensics;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
-using Content.Shared.Mobs.Systems;
+using Content.Shared.Interaction.Events;
+using Content.Shared.Inventory;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Popups;
 using Content.Shared.Verbs;
-using Robust.Shared.Utility;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Player;
 
 namespace Content.Shared.Nutrition.EntitySystems;
 
+[Obsolete("Migration to Content.Shared.Nutrition.EntitySystems.IngestionSystem is required")]
 public abstract partial class SharedDrinkSystem : EntitySystem
 {
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly SharedBodySystem _body = default!;
-    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly FlavorProfileSystem _flavorProfile = default!;
-    [Dependency] private readonly FoodSystem _food = default!;
-    [Dependency] private readonly SharedHandsSystem _hands = default!;
-    [Dependency] private readonly SharedInteractionSystem _interaction = default!;
-    [Dependency] private readonly MobStateSystem _mobState = default!;
-    [Dependency] private readonly OpenableSystem _openable = default!;
+    [Dependency] private readonly IngestionSystem _ingestion = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
 
@@ -36,9 +30,21 @@ public abstract partial class SharedDrinkSystem : EntitySystem
     {
         base.Initialize();
 
+        SubscribeLocalEvent<DrinkComponent, UseInHandEvent>(OnUseDrinkInHand, after: new[] { typeof(OpenableSystem), typeof(InventorySystem) });
+        SubscribeLocalEvent<DrinkComponent, AfterInteractEvent>(OnUseDrink);
+
         SubscribeLocalEvent<DrinkComponent, AttemptShakeEvent>(OnAttemptShake);
-        SubscribeLocalEvent<DrinkComponent, ExaminedEvent>(OnExamined);
+
         SubscribeLocalEvent<DrinkComponent, GetVerbsEvent<AlternativeVerb>>(AddDrinkVerb);
+
+        SubscribeLocalEvent<DrinkComponent, BeforeIngestedEvent>(OnBeforeDrinkEaten);
+        SubscribeLocalEvent<DrinkComponent, IngestedEvent>(OnDrinkEaten);
+
+        SubscribeLocalEvent<DrinkComponent, EdibleEvent>(OnDrink);
+
+        SubscribeLocalEvent<DrinkComponent, IsDigestibleEvent>(OnIsDigestible);
+
+        SubscribeLocalEvent<DrinkComponent, GetEdibleTypeEvent>(OnGetEdibleType);
     }
 
     protected void OnAttemptShake(Entity<DrinkComponent> entity, ref AttemptShakeEvent args)
@@ -47,70 +53,6 @@ public abstract partial class SharedDrinkSystem : EntitySystem
             args.Cancelled = true;
     }
 
-    protected void OnExamined(Entity<DrinkComponent> entity, ref ExaminedEvent args)
-    {
-        TryComp<OpenableComponent>(entity, out var openable);
-        if (_openable.IsClosed(entity.Owner, null, openable, true) || !args.IsInDetailsRange || !entity.Comp.Examinable)
-            return;
-
-        var empty = IsEmpty(entity, entity.Comp);
-        if (empty)
-        {
-            args.PushMarkup(Loc.GetString("drink-component-on-examine-is-empty"));
-            return;
-        }
-
-        if (HasComp<ExaminableSolutionComponent>(entity))
-        {
-            //provide exact measurement for beakers
-            args.PushText(Loc.GetString("drink-component-on-examine-exact-volume", ("amount", DrinkVolume(entity, entity.Comp))));
-        }
-        else
-        {
-            //general approximation
-            var remainingString = (int) _solutionContainer.PercentFull(entity) switch
-            {
-                100 => "drink-component-on-examine-is-full",
-                > 66 => "drink-component-on-examine-is-mostly-full",
-                > 33 => HalfEmptyOrHalfFull(args),
-                _ => "drink-component-on-examine-is-mostly-empty",
-            };
-            args.PushMarkup(Loc.GetString(remainingString));
-        }
-    }
-
-    private void AddDrinkVerb(Entity<DrinkComponent> entity, ref GetVerbsEvent<AlternativeVerb> ev)
-    {
-        if (entity.Owner == ev.User ||
-            !ev.CanInteract ||
-            !ev.CanAccess ||
-            !TryComp<BodyComponent>(ev.User, out var body) ||
-            !_body.TryGetBodyOrganEntityComps<StomachComponent>((ev.User, body), out var stomachs))
-            return;
-
-        // Make sure the solution exists
-        if (!_solutionContainer.TryGetSolution(entity.Owner, entity.Comp.Solution, out var solution))
-            return;
-
-        // no drinking from living drinks, have to kill them first.
-        if (_mobState.IsAlive(entity))
-            return;
-
-        var user = ev.User;
-        AlternativeVerb verb = new()
-        {
-            Act = () =>
-            {
-                TryDrink(user, user, entity.Comp, entity);
-            },
-            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/drink.svg.192dpi.png")),
-            Text = Loc.GetString("drink-system-verb-drink"),
-            Priority = 2
-        };
-
-        ev.Verbs.Add(verb);
-    }
-
     protected FixedPoint2 DrinkVolume(EntityUid uid, DrinkComponent? component = null)
     {
         if (!Resolve(uid, ref component))
@@ -130,85 +72,126 @@ public abstract partial class SharedDrinkSystem : EntitySystem
         return DrinkVolume(uid, component) <= 0;
     }
 
-    // some see half empty, and others see half full
-    private string HalfEmptyOrHalfFull(ExaminedEvent args)
+    /// <summary>
+    /// Eat or drink an item
+    /// </summary>
+    private void OnUseDrinkInHand(Entity<DrinkComponent> entity, ref UseInHandEvent ev)
     {
-        string remainingString = "drink-component-on-examine-is-half-full";
+        if (ev.Handled)
+            return;
 
-        if (TryComp(args.Examiner, out MetaDataComponent? examiner) && examiner.EntityName.Length > 0
-            && string.Compare(examiner.EntityName.Substring(0, 1), "m", StringComparison.InvariantCultureIgnoreCase) > 0)
-            remainingString = "drink-component-on-examine-is-half-empty";
-
-        return remainingString;
+        ev.Handled = _ingestion.TryIngest(ev.User, ev.User, entity);
     }
 
     /// <summary>
-    /// Tries to feed the drink item to the target entity
+    /// Feed someone else
     /// </summary>
-    protected bool TryDrink(EntityUid user, EntityUid target, DrinkComponent drink, EntityUid item)
+    private void OnUseDrink(Entity<DrinkComponent> entity, ref AfterInteractEvent args)
     {
-        if (!HasComp<BodyComponent>(target))
-            return false;
+        if (args.Handled || args.Target == null || !args.CanReach)
+            return;
 
-        if (!_body.TryGetBodyOrganEntityComps<StomachComponent>(target, out var stomachs))
-            return false;
+        args.Handled = _ingestion.TryIngest(args.User, args.Target.Value, entity);
+    }
 
-        if (_openable.IsClosed(item, user, predicted: true))
-            return true;
+    private void AddDrinkVerb(Entity<DrinkComponent> entity, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        var user = args.User;
 
-        if (!_solutionContainer.TryGetSolution(item, drink.Solution, out _, out var drinkSolution) || drinkSolution.Volume <= 0)
+        if (entity.Owner == user || !args.CanInteract || !args.CanAccess)
+            return;
+
+        if (!_ingestion.TryGetIngestionVerb(user, entity, IngestionSystem.Drink, out var verb))
+            return;
+
+        args.Verbs.Add(verb);
+    }
+
+    private void OnBeforeDrinkEaten(Entity<DrinkComponent> food, ref BeforeIngestedEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        // Set it to transfer amount if it exists, otherwise eat the whole volume if possible.
+        args.Transfer = food.Comp.TransferAmount;
+    }
+
+    private void OnDrinkEaten(Entity<DrinkComponent> entity, ref IngestedEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        args.Handled = true;
+
+        _audio.PlayPredicted(entity.Comp.UseSound, args.Target, args.User, AudioParams.Default.WithVolume(-2f).WithVariation(0.25f));
+
+        var flavors = _flavorProfile.GetLocalizedFlavorsMessage(entity.Owner, args.Target, args.Split);
+
+        if (args.ForceFed)
         {
-            if (drink.IgnoreEmpty)
-                return false;
+            var targetName = Identity.Entity(args.Target, EntityManager);
+            var userName = Identity.Entity(args.User, EntityManager);
 
-            _popup.PopupClient(Loc.GetString("drink-component-try-use-drink-is-empty", ("entity", item)), item, user);
-            return true;
-        }
+            _popup.PopupEntity(Loc.GetString("edible-force-feed-success", ("user", userName), ("verb", _ingestion.GetProtoVerb(IngestionSystem.Drink)), ("flavors", flavors)), entity, entity);
 
-        if (_food.IsMouthBlocked(target, user))
-            return true;
+            _popup.PopupClient(Loc.GetString("edible-force-feed-success-user", ("target", targetName), ("verb", _ingestion.GetProtoVerb(IngestionSystem.Drink))), args.User, args.User);
 
-        if (!_interaction.InRangeUnobstructed(user, item, popup: true))
-            return true;
-
-        var forceDrink = user != target;
-
-        if (forceDrink)
-        {
-            var userName = Identity.Entity(user, EntityManager);
-
-            _popup.PopupEntity(Loc.GetString("drink-component-force-feed", ("user", userName)), user, target);
-
-            // logging
-            _adminLogger.Add(LogType.ForceFeed, LogImpact.High, $"{ToPrettyString(user):user} is forcing {ToPrettyString(target):target} to drink {ToPrettyString(item):drink} {SharedSolutionContainerSystem.ToPrettyString(drinkSolution)}");
+            // log successful forced drinking
+            _adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(entity.Owner):user} forced {ToPrettyString(args.User):target} to drink {ToPrettyString(entity.Owner):drink}");
         }
         else
         {
-            // log voluntary drinking
-            _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(target):target} is drinking {ToPrettyString(item):drink} {SharedSolutionContainerSystem.ToPrettyString(drinkSolution)}");
+            _popup.PopupPredicted(Loc.GetString("edible-slurp", ("flavors", flavors)),
+                Loc.GetString("edible-slurp-other"),
+                args.User,
+                args.User);
+
+            // log successful voluntary drinking
+            _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(args.User):target} drank {ToPrettyString(entity.Owner):drink}");
         }
 
-        var flavors = _flavorProfile.GetLocalizedFlavorsMessage(user, drinkSolution);
+        if (_ingestion.GetUsesRemaining(entity, entity.Comp.Solution, args.Split.Volume) <= 0)
+            return;
 
-        var doAfterEventArgs = new DoAfterArgs(EntityManager,
-            user,
-            forceDrink ? drink.ForceFeedDelay : drink.Delay,
-            new ConsumeDoAfterEvent(drink.Solution, flavors),
-            eventTarget: item,
-            target: target,
-            used: item)
+        // Leave some of the consumer's DNA on the consumed item...
+        var ev = new TransferDnaEvent
         {
-            BreakOnHandChange = false,
-            BreakOnMove = forceDrink,
-            BreakOnDamage = true,
-            MovementThreshold = 0.01f,
-            DistanceThreshold = 1.0f,
-            // do-after will stop if item is dropped when trying to feed someone else
-            // or if the item started out in the user's own hands
-            NeedHand = forceDrink || _hands.IsHolding(user, item),
+            Donor = args.Target,
+            Recipient = entity,
+            CanDnaBeCleaned = false,
         };
+        RaiseLocalEvent(args.Target, ref ev);
 
-        _doAfter.TryStartDoAfter(doAfterEventArgs);
-        return true;
+        args.Repeat = !args.ForceFed;
+    }
+
+    private void OnDrink(Entity<DrinkComponent> drink, ref EdibleEvent args)
+    {
+        if (args.Cancelled || args.Solution != null)
+            return;
+
+        if (!_solutionContainer.TryGetSolution(drink.Owner, drink.Comp.Solution, out args.Solution) || IsEmpty(drink))
+        {
+            args.Cancelled = true;
+
+            _popup.PopupClient(Loc.GetString("ingestion-try-use-is-empty", ("entity", drink)), drink, args.User);
+            return;
+        }
+
+        args.Time += TimeSpan.FromSeconds(drink.Comp.Delay);
+    }
+
+    private void OnIsDigestible(Entity<DrinkComponent> ent, ref IsDigestibleEvent args)
+    {
+        // Anyone can drink from puddles on the floor!
+        args.UniversalDigestion();
+    }
+
+    private void OnGetEdibleType(Entity<DrinkComponent> ent, ref GetEdibleTypeEvent args)
+    {
+        if (args.Type != null)
+            return;
+
+        args.SetPrototype(IngestionSystem.Drink);
     }
 }
diff --git a/Content.Shared/Nutrition/EntitySystems/UtensilSystem.cs b/Content.Shared/Nutrition/EntitySystems/UtensilSystem.cs
index 63fe822186..e69de29bb2 100644
--- a/Content.Shared/Nutrition/EntitySystems/UtensilSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/UtensilSystem.cs
@@ -1,73 +0,0 @@
-using Content.Shared.Containers.ItemSlots;
-using Content.Shared.Interaction;
-using Content.Shared.Nutrition.Components;
-using Content.Shared.Popups;
-using Content.Shared.Tools.EntitySystems;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Random;
-
-namespace Content.Shared.Nutrition.EntitySystems;
-
-public sealed class UtensilSystem : EntitySystem
-{
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly FoodSystem _foodSystem = default!;
-    [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
-    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
-    [Dependency] private readonly IRobustRandom _robustRandom = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<UtensilComponent, AfterInteractEvent>(OnAfterInteract, after: new[] { typeof(ItemSlotsSystem), typeof(ToolOpenableSystem) });
-    }
-
-    /// <summary>
-    /// Clicked with utensil
-    /// </summary>
-    private void OnAfterInteract(Entity<UtensilComponent> entity, ref AfterInteractEvent ev)
-    {
-        if (ev.Handled || ev.Target == null || !ev.CanReach)
-            return;
-
-        var result = TryUseUtensil(ev.User, ev.Target.Value, entity);
-        ev.Handled = result.Handled;
-    }
-
-    public (bool Success, bool Handled) TryUseUtensil(EntityUid user, EntityUid target, Entity<UtensilComponent> utensil)
-    {
-        if (!TryComp(target, out FoodComponent? food))
-            return (false, false);
-
-        //Prevents food usage with a wrong utensil
-        if ((food.Utensil & utensil.Comp.Types) == 0)
-        {
-            _popupSystem.PopupClient(Loc.GetString("food-system-wrong-utensil", ("food", target), ("utensil", utensil.Owner)), user, user);
-            return (false, true);
-        }
-
-        if (!_interactionSystem.InRangeUnobstructed(user, target, popup: true))
-            return (false, true);
-
-        return _foodSystem.TryFeed(user, user, target, food);
-    }
-
-    /// <summary>
-    /// Attempt to break the utensil after interaction.
-    /// </summary>
-    /// <param name="uid">Utensil.</param>
-    /// <param name="userUid">User of the utensil.</param>
-    public void TryBreak(EntityUid uid, EntityUid userUid, UtensilComponent? component = null)
-    {
-        if (!Resolve(uid, ref component))
-            return;
-
-        if (_robustRandom.Prob(component.BreakChance))
-        {
-            _audio.PlayPredicted(component.BreakSound, userUid, userUid, AudioParams.Default.WithVolume(-2f));
-            Del(uid);
-        }
-    }
-}
diff --git a/Content.Shared/Nutrition/IngestionEvents.cs b/Content.Shared/Nutrition/IngestionEvents.cs
index 685b08b1bd..27988c898d 100644
--- a/Content.Shared/Nutrition/IngestionEvents.cs
+++ b/Content.Shared/Nutrition/IngestionEvents.cs
@@ -1,9 +1,52 @@
+using Content.Shared.Chemistry.Components;
+using Content.Shared.DoAfter;
+using Content.Shared.FixedPoint;
+using Content.Shared.Inventory;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.Prototypes;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
 namespace Content.Shared.Nutrition;
 
 /// <summary>
-///     Raised directed at the consumer when attempting to ingest something.
+/// Raised on an entity that is trying to be ingested to see if it has universal blockers preventing it from being
+/// ingested.
 /// </summary>
-public sealed class IngestionAttemptEvent : CancellableEntityEventArgs
+[ByRefEvent]
+public record struct IngestibleEvent(bool Cancelled = false);
+
+/// <summary>
+/// Raised on an entity with the <see cref="EdibleComponent"/> to check if anything is stopping
+/// another entity from consuming the delicious reagents stored inside.
+/// </summary>
+/// <param name="User">The entity trying to feed us to an entity.</param>
+[ByRefEvent]
+public record struct EdibleEvent(EntityUid User)
+{
+    public Entity<SolutionComponent>? Solution = null;
+
+    public TimeSpan Time = TimeSpan.Zero;
+
+    public bool Cancelled;
+}
+
+/// <summary>
+/// Raised when an entity is trying to ingest an entity to see if it has any component that can ingest it.
+/// </summary>
+/// <param name="Handled">Did a system successfully ingest this item?</param>
+/// <param name="User">The entity that is trying to feed and therefore raising the event</param>
+/// <param name="Ingested">What are we trying to ingest?</param>
+/// <param name="Ingest">Should we actually try and ingest? Or are we just testing if it's even possible </param>
+[ByRefEvent]
+public record struct AttemptIngestEvent(EntityUid User, EntityUid Ingested, bool Ingest, bool Handled = false);
+
+/// <summary>
+///     Raised on an entity that is consuming another entity to see if there is anything attached to the entity
+///     that is preventing it from doing the consumption.
+/// </summary>
+[ByRefEvent]
+public record struct IngestionAttemptEvent(SlotFlags TargetSlots, bool Cancelled = false) : IInventoryRelayEvent
 {
     /// <summary>
     ///     The equipment that is blocking consumption. Should only be non-null if the event was canceled.
@@ -12,22 +55,113 @@ public sealed class IngestionAttemptEvent : CancellableEntityEventArgs
 }
 
 /// <summary>
-/// Raised directed at the food after finishing eating a food before it's deleted.
-/// Cancel this if you want to do something special before a food is deleted.
+///     Raised on an entity that is trying to be digested, aka turned from an entity into reagents.
+///     Returns its digestive properties or how difficult it is to convert to reagents.
 /// </summary>
-public sealed class BeforeFullyEatenEvent : CancellableEntityEventArgs
+/// <remarks>This method is currently needed for backwards compatibility with food and drink component.
+///          It also might be needed in the event items like trash and plushies have their edible component removed.
+///          There's no way to know whether this event will be made obsolete or not after Food and Drink Components
+///          are removed until after a proper body and digestion rework. Oh well!
+/// </remarks>
+[ByRefEvent]
+public record struct IsDigestibleEvent()
 {
-    /// <summary>
-    /// The person that ate the food.
-    /// </summary>
-    public EntityUid User;
+    public bool Digestible = false;
+
+    public bool SpecialDigestion = false;
+
+    // If this is true, SpecialDigestion will be ignored
+    public bool Universal = false;
+
+    // If it requires special digestion then it has to be digestible...
+    public void AddDigestible(bool special)
+    {
+        SpecialDigestion = special;
+        Digestible = true;
+    }
+
+    // This should only be used for if you're trying to drink pure reagents from a puddle or cup or something...
+    public void UniversalDigestion()
+    {
+        Universal = true;
+        Digestible = true;
+    }
+}
+
+/// <summary>
+/// Do After Event for trying to put food solution into stomach entity.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed partial class EatingDoAfterEvent : SimpleDoAfterEvent;
+
+/// <summary>
+/// We use this to determine if an entity should abort giving up its reagents at the last minute,
+/// as well as specifying how much of its reagents it should give up including minimums and maximums.
+/// If minimum exceeds the  maximum, the event will abort.
+/// </summary>
+/// <param name="Min">The minimum amount we can transfer.</param>
+/// <param name="Max">The maximum amount we can transfer.</param>
+/// <param name="Solution">The solution we are transferring.</param>
+[ByRefEvent]
+public record struct BeforeIngestedEvent(FixedPoint2 Min, FixedPoint2 Max, Solution? Solution)
+{
+    // How much we would like to transfer, gets clamped by Min and Max.
+    public FixedPoint2 Transfer;
+
+    // Whether this event, and therefore eat attempt, should be cancelled.
+    public bool Cancelled;
+
+    public bool TryNewMinimum(FixedPoint2 newMin)
+    {
+        if (newMin > Max)
+            return false;
+
+        Min = newMin;
+        return true;
+    }
+
+    public bool TryNewMaximum(FixedPoint2 newMax)
+    {
+        if (newMax < Min)
+            return false;
+
+        Min = newMax;
+        return true;
+    }
+}
+
+[ByRefEvent]
+public record struct IngestingEvent(EntityUid Food, Solution Split, bool ForceFed);
+
+/// <summary>
+/// Raised on an entity when it is being made to be eaten.
+/// </summary>
+/// <param name="User">Who is doing the action?</param>
+/// <param name="Target">Who is doing the eating?</param>
+/// <param name="Split">The solution we're currently eating.</param>
+/// <param name="ForceFed">Whether we're being fed by someone else, checkec enough I might as well pass it.</param>
+[ByRefEvent]
+public record struct IngestedEvent(EntityUid User, EntityUid Target, Solution Split, bool ForceFed)
+{
+    // Should we refill the solution now that we've eaten it?
+    // This bool basically only exists because of stackable system.
+    public bool Refresh;
+
+    // Should we destroy the ingested entity?
+    public bool Destroy;
+
+    // Has this eaten event been handled? Used to prevent duplicate flavor popups and sound effects.
+    public bool Handled;
+
+    // Should we try eating again?
+    public bool Repeat;
 }
 
 /// <summary>
 /// Raised directed at the food after finishing eating it and before it's deleted.
 /// </summary>
 [ByRefEvent]
-public readonly record struct AfterFullyEatenEvent(EntityUid User)
+public readonly record struct FullyEatenEvent(EntityUid User)
 {
     /// <summary>
     /// The entity that ate the food.
@@ -35,6 +169,38 @@ public readonly record struct AfterFullyEatenEvent(EntityUid User)
     public readonly EntityUid User = User;
 }
 
+/// <summary>
+/// Returns a list of Utensils that can be used to consume the entity, as well as a list of required types.
+/// </summary>
+[ByRefEvent]
+public record struct GetUtensilsEvent()
+{
+    public UtensilType Types = UtensilType.None;
+
+    public UtensilType RequiredTypes = UtensilType.None;
+
+    // Forces you to add to both lists if a utensil is required.
+    public void AddRequiredTypes(UtensilType type)
+    {
+        RequiredTypes |= type;
+        Types |= type;
+    }
+}
+
+/// <summary>
+/// Tries to get the best fitting edible type for an entity.
+/// </summary>
+[ByRefEvent]
+public record struct GetEdibleTypeEvent
+{
+    public ProtoId<EdiblePrototype>? Type { get; private set; }
+
+    public void SetPrototype([ForbidLiteral] ProtoId<EdiblePrototype> proto)
+    {
+        Type = proto;
+    }
+}
+
 /// <summary>
 /// Raised directed at the food being sliced before it's deleted.
 /// Cancel this if you want to do something special before a food is deleted.
diff --git a/Content.Shared/Nutrition/Prototypes/EdiblePrototype.cs b/Content.Shared/Nutrition/Prototypes/EdiblePrototype.cs
new file mode 100644
index 0000000000..2cfe900167
--- /dev/null
+++ b/Content.Shared/Nutrition/Prototypes/EdiblePrototype.cs
@@ -0,0 +1,60 @@
+using Robust.Shared.Audio;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Nutrition.Prototypes;
+
+/// <summary>
+/// This stores unique data for an item that is edible, such as verbs, verb icons, verb names, sounds, ect.
+/// </summary>
+[Prototype]
+public sealed partial class EdiblePrototype : IPrototype
+{
+    /// <inheritdoc/>
+    [IdDataField]
+    public string ID { get; } = default!;
+
+    /// <summary>
+    /// The sound we make when eaten.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier UseSound = new SoundCollectionSpecifier("eating");
+
+    /// <summary>
+    /// The localization identifier for the user's ingestion message.
+    /// </summary>
+    [DataField]
+    public LocId Message;
+
+    /// <summary>
+    /// The localization identifier for an observer's or "others'" ingestion message.
+    /// </summary>
+    [DataField]
+    public LocId OtherMessage;
+
+    /// <summary>
+    /// Localization verb used when consuming this item.
+    /// </summary>
+    [DataField]
+    public LocId Verb;
+
+    /// <summary>
+    /// Localization noun used when consuming this item.
+    /// </summary>
+    [DataField]
+    public LocId Noun;
+
+    /// <summary>
+    /// What type of food are we, currently used for determining verbs and some checks.
+    /// </summary>
+    [DataField]
+    public LocId VerbName;
+
+    /// <summary>
+    /// What type of food are we, currently used for determining verbs and some checks.
+    /// </summary>
+    [DataField]
+    public SpriteSpecifier? VerbIcon;
+
+
+}
diff --git a/Content.Shared/Paper/PaperSystem.cs b/Content.Shared/Paper/PaperSystem.cs
index 6a181e4ae9..75496d93b4 100644
--- a/Content.Shared/Paper/PaperSystem.cs
+++ b/Content.Shared/Paper/PaperSystem.cs
@@ -187,7 +187,6 @@ public sealed class PaperSystem : EntitySystem
     {
         var ev = new PaperWriteAttemptEvent(entity.Owner);
         RaiseLocalEvent(args.Actor, ref ev);
-
         if (ev.Cancelled)
             return;
 
@@ -212,9 +211,6 @@ public sealed class PaperSystem : EntitySystem
 
         entity.Comp.Mode = PaperAction.Read;
         UpdateUserInterface(entity);
-
-        var writeAfterEv = new PaperAfterWriteEvent(args.Actor);
-        RaiseLocalEvent(entity.Owner, ref writeAfterEv);
     }
 
     private void OnRandomPaperContentMapInit(Entity<RandomPaperContentComponent> ent, ref MapInitEvent args)
@@ -323,14 +319,6 @@ public record struct PaperWriteEvent(EntityUid User, EntityUid Paper);
 /// <summary>
 /// Cancellable event for attempting to write on a piece of paper.
 /// </summary>
-/// <param name="Paper">The paper that the writing will take place on.</param>
+/// <param name="paper">The paper that the writing will take place on.</param>
 [ByRefEvent]
 public record struct PaperWriteAttemptEvent(EntityUid Paper, string? FailReason = null, bool Cancelled = false);
-
-/// <summary>
-/// Event raised on paper after it was written on by someone.
-/// </summary>
-/// <param name="Actor">Entity that wrote something on the paper.</param>
-[ByRefEvent]
-public readonly record struct PaperAfterWriteEvent(EntityUid Actor);
-
diff --git a/Content.Shared/Payload/Components/PayloadTriggerComponent.cs b/Content.Shared/Payload/Components/PayloadTriggerComponent.cs
index b064e91198..d07da4b24e 100644
--- a/Content.Shared/Payload/Components/PayloadTriggerComponent.cs
+++ b/Content.Shared/Payload/Components/PayloadTriggerComponent.cs
@@ -1,4 +1,5 @@
-using Content.Shared.Explosion.Components;
+using Content.Shared.Trigger.Components;
+using Content.Shared.Trigger.Components.Triggers;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
@@ -10,7 +11,7 @@ namespace Content.Shared.Payload.Components;
 /// <remarks>
 ///     This component performs two functions. Firstly, it will add or remove other components to some entity when this
 ///     item is installed inside of it. This is intended for use with constructible grenades. For example, this allows
-///     you to add things like <see cref="OnUseTimerTriggerComponent"/>, or <see cref="TriggerOnProximityComponent"/>.
+///     you to add things like <see cref="TimerTriggerComponent"/>, or <see cref="TriggerOnProximityComponent"/>.
 ///     This is required because otherwise you would have to forward arbitrary interaction directed at the casing
 ///     through to the trigger, which would be quite complicated. Also proximity triggers don't really work inside of
 ///     containers.
@@ -29,7 +30,7 @@ public sealed partial class PayloadTriggerComponent : Component
     /// <summary>
     ///     List of components to add or remove from an entity when this trigger is (un)installed.
     /// </summary>
-    [DataField("components", serverOnly:true, readOnly: true)]
+    [DataField(serverOnly: true, readOnly: true)]
     public ComponentRegistry? Components = null;
 
     /// <summary>
@@ -41,6 +42,6 @@ public sealed partial class PayloadTriggerComponent : Component
     ///     when removing the component, to ensure that removal of this trigger only removes the components that it was
     ///     responsible for adding.
     /// </remarks>
-    [DataField("grantedComponents", serverOnly: true)]
+    [DataField(serverOnly: true)]
     public HashSet<Type> GrantedComponents = new();
 }
diff --git a/Content.Shared/Physics/CollisionGroup.cs b/Content.Shared/Physics/CollisionGroup.cs
index db065d22b1..1f19184b50 100644
--- a/Content.Shared/Physics/CollisionGroup.cs
+++ b/Content.Shared/Physics/CollisionGroup.cs
@@ -78,6 +78,8 @@ public enum CollisionGroup
     WallLayer = Opaque | Impassable | HighImpassable | MidImpassable | LowImpassable | BulletImpassable | InteractImpassable,
     GlassLayer = Impassable | HighImpassable | MidImpassable | LowImpassable | BulletImpassable | InteractImpassable,
     HalfWallLayer = MidImpassable | LowImpassable,
+    FlimsyLayer = Opaque | HighImpassable | MidImpassable | LowImpassable | InteractImpassable,
+
     // Allows people to interact past and target players inside of this
     SpecialWallLayer = Opaque | HighImpassable | MidImpassable | LowImpassable | BulletImpassable,
 
diff --git a/Content.Shared/Pinpointer/ConfigurableNavMapBeaconComponent.cs b/Content.Shared/Pinpointer/ConfigurableNavMapBeaconComponent.cs
index cd6744c87d..8b678e0300 100644
--- a/Content.Shared/Pinpointer/ConfigurableNavMapBeaconComponent.cs
+++ b/Content.Shared/Pinpointer/ConfigurableNavMapBeaconComponent.cs
@@ -8,10 +8,7 @@ namespace Content.Shared.Pinpointer;
 /// </summary>
 [RegisterComponent, NetworkedComponent]
 [Access(typeof(SharedNavMapSystem))]
-public sealed partial class ConfigurableNavMapBeaconComponent : Component
-{
-
-}
+public sealed partial class ConfigurableNavMapBeaconComponent : Component;
 
 [Serializable, NetSerializable]
 public sealed class NavMapBeaconConfigureBuiMessage : BoundUserInterfaceMessage
@@ -31,11 +28,11 @@ public sealed class NavMapBeaconConfigureBuiMessage : BoundUserInterfaceMessage
 [Serializable, NetSerializable]
 public enum NavMapBeaconUiKey : byte
 {
-    Key
+    Key,
 }
 
 [Serializable, NetSerializable]
 public enum NavMapBeaconVisuals : byte
 {
-    Enabled
+    Enabled,
 }
diff --git a/Content.Shared/Pinpointer/NavMapBeaconComponent.cs b/Content.Shared/Pinpointer/NavMapBeaconComponent.cs
index 0a86bdd9d2..4bb6384fb9 100644
--- a/Content.Shared/Pinpointer/NavMapBeaconComponent.cs
+++ b/Content.Shared/Pinpointer/NavMapBeaconComponent.cs
@@ -12,8 +12,7 @@ public sealed partial class NavMapBeaconComponent : Component
     /// <summary>
     /// Defaults to entity name if nothing found.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField]
-    [AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public string? Text;
 
     /// <summary>
@@ -23,14 +22,12 @@ public sealed partial class NavMapBeaconComponent : Component
     [DataField]
     public LocId? DefaultText;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField]
-    [AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public Color Color = Color.Orange;
 
     /// <summary>
     /// Only enabled beacons can be seen on a station map.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField]
-    [AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public bool Enabled = true;
 }
diff --git a/Content.Shared/Pinpointer/SharedNavMapSystem.cs b/Content.Shared/Pinpointer/SharedNavMapSystem.cs
index 37d60dec28..5d64803273 100644
--- a/Content.Shared/Pinpointer/SharedNavMapSystem.cs
+++ b/Content.Shared/Pinpointer/SharedNavMapSystem.cs
@@ -1,6 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Numerics;
 using System.Runtime.CompilerServices;
+using Content.Shared.Examine;
 using Content.Shared.Tag;
 using Robust.Shared.GameStates;
 using Robust.Shared.Network;
@@ -34,6 +35,8 @@ public abstract class SharedNavMapSystem : EntitySystem
 
         // Data handling events
         SubscribeLocalEvent<NavMapComponent, ComponentGetState>(OnGetState);
+        SubscribeLocalEvent<ConfigurableNavMapBeaconComponent, ExaminedEvent>(OnConfigurableExamined);
+
         _doorQuery = GetEntityQuery<NavMapDoorComponent>();
     }
 
@@ -164,6 +167,17 @@ public abstract class SharedNavMapSystem : EntitySystem
         args.State = new NavMapDeltaState(chunks, component.Beacons, component.RegionProperties, new(component.Chunks.Keys));
     }
 
+    private void OnConfigurableExamined(Entity<ConfigurableNavMapBeaconComponent> ent, ref ExaminedEvent args)
+    {
+        if (!args.IsInDetailsRange || !TryComp<NavMapBeaconComponent>(ent, out var navMap))
+            return;
+
+        args.PushMarkup(Loc.GetString("nav-beacon-examine-text",
+            ("enabled", navMap.Enabled),
+            ("color", navMap.Color.ToHexNoAlpha()),
+            ("label", navMap.Text ?? string.Empty)));
+    }
+
     #endregion
 
     #region: System messages
diff --git a/Content.Shared/Polymorph/PolymorphPrototype.cs b/Content.Shared/Polymorph/PolymorphPrototype.cs
index d731c4bfc5..0978d7119a 100644
--- a/Content.Shared/Polymorph/PolymorphPrototype.cs
+++ b/Content.Shared/Polymorph/PolymorphPrototype.cs
@@ -112,11 +112,21 @@ public sealed partial record PolymorphConfiguration
     public bool RevertOnEat;
 
     /// <summary>
-    /// Whether or not an already polymorphed entity is able to be polymorphed again
+    /// If true, attempts to polymorph this polymorph will fail, unless
+    /// <see cref="IgnoreAllowRepeatedMorphs"/> is true on the /new/ morph.
     /// </summary>
     [DataField(serverOnly: true)]
     public bool AllowRepeatedMorphs;
 
+    /// <summary>
+    /// If true, this morph will succeed even when used on an entity
+    /// that is already polymorphed with a configuration that has
+    /// <see cref="AllowRepeatedMorphs"/> set to false. Helpful for
+    /// smite polymorphs which should always succeed.
+    /// </summary>
+    [DataField(serverOnly: true)]
+    public bool IgnoreAllowRepeatedMorphs;
+
     /// <summary>
     /// The amount of time that should pass after this polymorph has ended, before a new one
     /// can occur.
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index 845e359564..f22669ddc7 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -693,10 +693,17 @@ namespace Content.Shared.Preferences
             var namingSystem = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<NamingSystem>();
             return namingSystem.GetName(species, gender);
         }
+        public bool Equals(HumanoidCharacterProfile? other)
+        {
+            if (other is null)
+                return false;
+
+            return ReferenceEquals(this, other) || MemberwiseEquals(other);
+        }
 
         public override bool Equals(object? obj)
         {
-            return ReferenceEquals(this, obj) || obj is HumanoidCharacterProfile other && Equals(other);
+            return obj is HumanoidCharacterProfile other && Equals(other);
         }
 
         public override int GetHashCode()
diff --git a/Content.Shared/Rootable/SharedRootableSystem.cs b/Content.Shared/Rootable/SharedRootableSystem.cs
index 9a6697cf97..9165c3c111 100644
--- a/Content.Shared/Rootable/SharedRootableSystem.cs
+++ b/Content.Shared/Rootable/SharedRootableSystem.cs
@@ -1,7 +1,7 @@
-using Content.Shared.Damage.Components;
-using Content.Shared.Actions;
+using Content.Shared.Actions;
 using Content.Shared.Actions.Components;
 using Content.Shared.Alert;
+using Content.Shared.Cloning.Events;
 using Content.Shared.Coordinates;
 using Content.Shared.Fluids.Components;
 using Content.Shared.Gravity;
@@ -9,6 +9,7 @@ using Content.Shared.Mobs;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Slippery;
 using Content.Shared.Toggleable;
+using Content.Shared.Trigger.Components.Effects;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
@@ -50,6 +51,20 @@ public abstract class SharedRootableSystem : EntitySystem
         SubscribeLocalEvent<RootableComponent, IsWeightlessEvent>(OnIsWeightless);
         SubscribeLocalEvent<RootableComponent, SlipAttemptEvent>(OnSlipAttempt);
         SubscribeLocalEvent<RootableComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovementSpeed);
+        SubscribeLocalEvent<RootableComponent, CloningEvent>(OnCloning);
+    }
+
+    private void OnCloning(Entity<RootableComponent> ent, ref CloningEvent args)
+    {
+        if (!args.Settings.EventComponents.Contains(Factory.GetRegistration(ent.Comp.GetType()).Name))
+            return;
+
+        var cloneComp = EnsureComp<RootableComponent>(args.CloneUid);
+        cloneComp.TransferRate = ent.Comp.TransferRate;
+        cloneComp.TransferFrequency = ent.Comp.TransferFrequency;
+        cloneComp.SpeedModifier = ent.Comp.SpeedModifier;
+        cloneComp.RootSound = ent.Comp.RootSound;
+        Dirty(args.CloneUid, cloneComp);
     }
 
     private void OnRootableMapInit(Entity<RootableComponent> entity, ref MapInitEvent args)
@@ -68,6 +83,7 @@ public abstract class SharedRootableSystem : EntitySystem
 
         var actions = new Entity<ActionsComponent?>(entity, comp);
         _actions.RemoveAction(actions, entity.Comp.ActionEntity);
+        _alerts.ClearAlert(entity, entity.Comp.RootedAlert);
     }
 
     private void OnRootableToggle(Entity<RootableComponent> entity, ref ToggleActionEvent args)
@@ -127,7 +143,7 @@ public abstract class SharedRootableSystem : EntitySystem
         if (!ent.Comp.Rooted)
             return;
 
-        if (args.SlipCausingEntity != null && HasComp<DamageUserOnTriggerComponent>(args.SlipCausingEntity))
+        if (args.SlipCausingEntity != null && HasComp<DamageOnTriggerComponent>(args.SlipCausingEntity))
             return;
 
         args.NoSlip = true;
diff --git a/Content.Shared/Rotatable/FlippableComponent.cs b/Content.Shared/Rotatable/FlippableComponent.cs
new file mode 100644
index 0000000000..fdc8c15c8a
--- /dev/null
+++ b/Content.Shared/Rotatable/FlippableComponent.cs
@@ -0,0 +1,17 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Rotatable;
+
+/// <summary>
+/// Allows an entity to be flipped (mirrored) by using a verb.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class FlippableComponent : Component
+{
+    /// <summary>
+    /// Entity to replace this entity with when the current one is 'flipped'.
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
+    public EntProtoId MirrorEntity = default!;
+}
diff --git a/Content.Shared/Rotatable/RotatableComponent.cs b/Content.Shared/Rotatable/RotatableComponent.cs
index b008c28160..336c484d8c 100644
--- a/Content.Shared/Rotatable/RotatableComponent.cs
+++ b/Content.Shared/Rotatable/RotatableComponent.cs
@@ -1,27 +1,28 @@
-namespace Content.Shared.Rotatable
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Rotatable;
+
+/// <summary>
+/// Allows an entity to be rotated by using a verb.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class RotatableComponent : Component
 {
-    [RegisterComponent]
-    public sealed partial class RotatableComponent : Component
-    {
-        /// <summary>
-        ///     If true, this entity can be rotated even while anchored.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("rotateWhileAnchored")]
-        public bool RotateWhileAnchored { get; private set; }
+    /// <summary>
+    /// If true, this entity can be rotated even while anchored.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool RotateWhileAnchored;
 
-        /// <summary>
-        ///     If true, will rotate entity in players direction when pulled
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("rotateWhilePulling")]
-        public bool RotateWhilePulling { get; private set; } = true;
+    /// <summary>
+    /// If true, will rotate entity in players direction when pulled
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool RotateWhilePulling = true;
 
-        /// <summary>
-        ///     The angular value to change when using the rotate verbs.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("increment")]
-        public Angle Increment { get; private set; } = Angle.FromDegrees(90);
-    }
+    /// <summary>
+    /// The angular value to change when using the rotate verbs.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public Angle Increment = Angle.FromDegrees(90);
 }
diff --git a/Content.Shared/Rotatable/RotatableSystem.cs b/Content.Shared/Rotatable/RotatableSystem.cs
new file mode 100644
index 0000000000..94d9206247
--- /dev/null
+++ b/Content.Shared/Rotatable/RotatableSystem.cs
@@ -0,0 +1,213 @@
+using Content.Shared.ActionBlocker;
+using Content.Shared.Input;
+using Content.Shared.Interaction;
+using Content.Shared.Popups;
+using Content.Shared.Verbs;
+using Robust.Shared.Input.Binding;
+using Robust.Shared.Map;
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Player;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Rotatable;
+
+/// <summary>
+/// Handles verbs for the <see cref="RotatableComponent"/> and <see cref="FlippableComponent"/> components.
+/// </summary>
+public sealed class RotatableSystem : EntitySystem
+{
+    [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
+    [Dependency] private readonly SharedInteractionSystem _interaction = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<FlippableComponent, GetVerbsEvent<Verb>>(AddFlipVerb);
+        SubscribeLocalEvent<RotatableComponent, GetVerbsEvent<Verb>>(AddRotateVerbs);
+
+        CommandBinds.Builder
+            .Bind(ContentKeyFunctions.RotateObjectClockwise, new PointerInputCmdHandler(HandleRotateObjectClockwise))
+            .Bind(ContentKeyFunctions.RotateObjectCounterclockwise, new PointerInputCmdHandler(HandleRotateObjectCounterclockwise))
+            .Bind(ContentKeyFunctions.FlipObject, new PointerInputCmdHandler(HandleFlipObject))
+            .Register<RotatableSystem>();
+    }
+
+    private void AddFlipVerb(EntityUid uid, FlippableComponent component, GetVerbsEvent<Verb> args)
+    {
+        if (!args.CanAccess
+            || !args.CanInteract
+            || !args.CanComplexInteract)
+            return;
+
+        // Check if the object is anchored.
+        if (TryComp<PhysicsComponent>(uid, out var physics) && physics.BodyType == BodyType.Static)
+            return;
+
+        Verb verb = new()
+        {
+            Act = () => Flip(uid, component),
+            Text = Loc.GetString("flippable-verb-get-data-text"),
+            Category = VerbCategory.Rotate,
+            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/flip.svg.192dpi.png")),
+            Priority = -3, // show flip last
+            DoContactInteraction = true
+        };
+        args.Verbs.Add(verb);
+    }
+
+    private void AddRotateVerbs(EntityUid uid, RotatableComponent component, GetVerbsEvent<Verb> args)
+    {
+        if (!args.CanAccess
+            || !args.CanInteract
+            || !args.CanComplexInteract
+            || Transform(uid).NoLocalRotation) // Good ol prototype inheritance, eh?
+            return;
+
+        // Check if the object is anchored, and whether we are still allowed to rotate it.
+        if (!component.RotateWhileAnchored &&
+            TryComp<PhysicsComponent>(uid, out var physics) &&
+            physics.BodyType == BodyType.Static)
+            return;
+
+        Verb resetRotation = new()
+        {
+            DoContactInteraction = true,
+            Act = () => ResetRotation(uid),
+            Category = VerbCategory.Rotate,
+            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/refresh.svg.192dpi.png")),
+            Text = Loc.GetString("rotate-reset-verb-get-data-text"),
+            Priority = -2, // show CCW, then CW, then reset
+            CloseMenu = false,
+        };
+        args.Verbs.Add(resetRotation);
+
+        // rotate clockwise
+        Verb rotateCW = new()
+        {
+            Act = () => Rotate(uid, -component.Increment),
+            Category = VerbCategory.Rotate,
+            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/rotate_cw.svg.192dpi.png")),
+            Text = Loc.GetString("rotate-verb-get-data-text"),
+            Priority = -1,
+            CloseMenu = false, // allow for easy double rotations.
+        };
+        args.Verbs.Add(rotateCW);
+
+        // rotate counter-clockwise
+        Verb rotateCCW = new()
+        {
+            Act = () => Rotate(uid, component.Increment),
+            Category = VerbCategory.Rotate,
+            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/rotate_ccw.svg.192dpi.png")),
+            Text = Loc.GetString("rotate-counter-verb-get-data-text"),
+            Priority = 0,
+            CloseMenu = false, // allow for easy double rotations.
+        };
+        args.Verbs.Add(rotateCCW);
+    }
+
+    /// <summary>
+    /// Replace a flippable entity with it's flipped / mirror-symmetric entity.
+    /// </summary>
+    public void Flip(EntityUid uid, FlippableComponent component)
+    {
+        var oldTransform = Comp<TransformComponent>(uid);
+        var entity = PredictedSpawnAtPosition(component.MirrorEntity, oldTransform.Coordinates);
+        var newTransform = Comp<TransformComponent>(entity);
+        _transform.SetLocalRotation(entity, oldTransform.LocalRotation);
+        _transform.Unanchor(entity, newTransform);
+        PredictedDel(uid);
+    }
+
+    private bool HandleRotateObjectClockwise(ICommonSession? playerSession, EntityCoordinates coordinates, EntityUid entity)
+    {
+        if (playerSession?.AttachedEntity is not { Valid: true } player || !Exists(player))
+            return false;
+
+        if (!TryComp<RotatableComponent>(entity, out var rotatableComp))
+            return false;
+
+        if (!_actionBlocker.CanInteract(player, entity)
+            || !_actionBlocker.CanComplexInteract(player)
+            || !_interaction.InRangeAndAccessible(player, entity))
+            return false;
+
+        // Check if the object is anchored, and whether we are still allowed to rotate it.
+        if (!rotatableComp.RotateWhileAnchored && TryComp<PhysicsComponent>(entity, out var physics) &&
+            physics.BodyType == BodyType.Static)
+        {
+            _popup.PopupClient(Loc.GetString("rotatable-component-try-rotate-stuck"), entity, player);
+            return false;
+        }
+
+        Rotate(entity, -rotatableComp.Increment);
+        return false;
+    }
+
+    private bool HandleRotateObjectCounterclockwise(ICommonSession? playerSession, EntityCoordinates coordinates, EntityUid entity)
+    {
+        if (playerSession?.AttachedEntity is not { Valid: true } player || !Exists(player))
+            return false;
+
+        if (!TryComp<RotatableComponent>(entity, out var rotatableComp))
+            return false;
+
+        if (!_actionBlocker.CanInteract(player, entity)
+            || !_actionBlocker.CanComplexInteract(player)
+            || !_interaction.InRangeAndAccessible(player, entity))
+            return false;
+
+        // Check if the object is anchored, and whether we are still allowed to rotate it.
+        if (!rotatableComp.RotateWhileAnchored && TryComp<PhysicsComponent>(entity, out var physics) &&
+            physics.BodyType == BodyType.Static)
+        {
+            _popup.PopupClient(Loc.GetString("rotatable-component-try-rotate-stuck"), entity, player);
+            return false;
+        }
+
+        Rotate(entity, rotatableComp.Increment);
+        return false;
+    }
+
+    private bool HandleFlipObject(ICommonSession? playerSession, EntityCoordinates coordinates, EntityUid entity)
+    {
+        if (playerSession?.AttachedEntity is not { Valid: true } player || !Exists(player))
+            return false;
+
+        if (!TryComp<FlippableComponent>(entity, out var flippableComp))
+            return false;
+
+        if (!_actionBlocker.CanInteract(player, entity)
+            || !_actionBlocker.CanComplexInteract(player)
+            || !_interaction.InRangeAndAccessible(player, entity))
+            return false;
+
+        // Check if the object is anchored.
+        if (TryComp<PhysicsComponent>(entity, out var physics) && physics.BodyType == BodyType.Static)
+        {
+            _popup.PopupClient(Loc.GetString("flippable-component-try-flip-is-stuck"), entity, player);
+            return false;
+        }
+
+        Flip(entity, flippableComp);
+        return false;
+    }
+
+    private void Rotate(Entity<TransformComponent?> ent, Angle angle)
+    {
+        if (!Resolve(ent, ref ent.Comp, false))
+            return;
+
+        _transform.SetLocalRotation(ent.Owner, ent.Comp.LocalRotation + angle);
+    }
+
+    private void ResetRotation(Entity<TransformComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp, false))
+            return;
+
+        _transform.SetLocalRotation(ent.Owner, Angle.Zero);
+    }
+}
diff --git a/Content.Shared/Sericulture/SericultureSystem.cs b/Content.Shared/Sericulture/SericultureSystem.cs
index e5942a433e..e6086e67c2 100644
--- a/Content.Shared/Sericulture/SericultureSystem.cs
+++ b/Content.Shared/Sericulture/SericultureSystem.cs
@@ -38,7 +38,7 @@ public abstract partial class SharedSericultureSystem : EntitySystem
 
     private void OnClone(Entity<SericultureComponent> ent, ref CloningEvent args)
     {
-        if(!args.Settings.EventComponents.Contains(Factory.GetRegistration(ent.Comp.GetType()).Name))
+        if (!args.Settings.EventComponents.Contains(Factory.GetRegistration(ent.Comp.GetType()).Name))
             return;
 
         var comp = EnsureComp<SericultureComponent>(args.CloneUid);
diff --git a/Content.Shared/Singularity/Components/SharedEmitterComponent.cs b/Content.Shared/Singularity/Components/SharedEmitterComponent.cs
index dce2f92d0c..d181757968 100644
--- a/Content.Shared/Singularity/Components/SharedEmitterComponent.cs
+++ b/Content.Shared/Singularity/Components/SharedEmitterComponent.cs
@@ -3,12 +3,10 @@ using Content.Shared.DeviceLinking;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
 
 namespace Content.Shared.Singularity.Components;
 
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class EmitterComponent : Component
 {
     public CancellationTokenSource? TimerCancel;
@@ -27,8 +25,8 @@ public sealed partial class EmitterComponent : Component
     /// <summary>
     /// The entity that is spawned when the emitter fires.
     /// </summary>
-    [DataField("boltType", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string BoltType = "EmitterBolt";
+    [DataField, AutoNetworkedField]
+    public EntProtoId BoltType = "EmitterBolt";
 
     [DataField]
     public List<EntProtoId> SelectableTypes = new();
@@ -36,68 +34,68 @@ public sealed partial class EmitterComponent : Component
     /// <summary>
     /// The current amount of power being used.
     /// </summary>
-    [DataField("powerUseActive")]
+    [DataField]
     public int PowerUseActive = 600;
 
     /// <summary>
     /// The amount of shots that are fired in a single "burst"
     /// </summary>
-    [DataField("fireBurstSize")]
+    [DataField]
     public int FireBurstSize = 3;
 
     /// <summary>
     /// The time between each shot during a burst.
     /// </summary>
-    [DataField("fireInterval")]
+    [DataField]
     public TimeSpan FireInterval = TimeSpan.FromSeconds(2);
 
     /// <summary>
     /// The current minimum delay between bursts.
     /// </summary>
-    [DataField("fireBurstDelayMin")]
+    [DataField]
     public TimeSpan FireBurstDelayMin = TimeSpan.FromSeconds(4);
 
     /// <summary>
     /// The current maximum delay between bursts.
     /// </summary>
-    [DataField("fireBurstDelayMax")]
+    [DataField]
     public TimeSpan FireBurstDelayMax = TimeSpan.FromSeconds(10);
 
     /// <summary>
     /// The visual state that is set when the emitter is turned on
     /// </summary>
-    [DataField("onState")]
+    [DataField]
     public string? OnState = "beam";
 
     /// <summary>
     /// The visual state that is set when the emitter doesn't have enough power.
     /// </summary>
-    [DataField("underpoweredState")]
+    [DataField]
     public string? UnderpoweredState = "underpowered";
 
     /// <summary>
     /// Signal port that turns on the emitter.
     /// </summary>
-    [DataField("onPort", customTypeSerializer: typeof(PrototypeIdSerializer<SinkPortPrototype>))]
-    public string OnPort = "On";
+    [DataField]
+    public ProtoId<SinkPortPrototype> OnPort = "On";
 
     /// <summary>
     /// Signal port that turns off the emitter.
     /// </summary>
-    [DataField("offPort", customTypeSerializer: typeof(PrototypeIdSerializer<SinkPortPrototype>))]
-    public string OffPort = "Off";
+    [DataField]
+    public ProtoId<SinkPortPrototype> OffPort = "Off";
 
     /// <summary>
     /// Signal port that toggles the emitter on or off.
     /// </summary>
-    [DataField("togglePort", customTypeSerializer: typeof(PrototypeIdSerializer<SinkPortPrototype>))]
-    public string TogglePort = "Toggle";
+    [DataField]
+    public ProtoId<SinkPortPrototype> TogglePort = "Toggle";
 
     /// <summary>
     /// Map of signal ports to entity prototype IDs of the entity that will be fired.
     /// </summary>
-    [DataField("setTypePorts", customTypeSerializer: typeof(PrototypeIdDictionarySerializer<string, SinkPortPrototype>))]
-    public Dictionary<string, string> SetTypePorts = new();
+    [DataField]
+    public Dictionary<ProtoId<SinkPortPrototype>, EntProtoId> SetTypePorts = new();
 }
 
 [NetSerializable, Serializable]
diff --git a/Content.Shared/Singularity/EntitySystems/SharedEmitterSystem.cs b/Content.Shared/Singularity/EntitySystems/SharedEmitterSystem.cs
index bba6629988..9ef7dcfbdb 100644
--- a/Content.Shared/Singularity/EntitySystems/SharedEmitterSystem.cs
+++ b/Content.Shared/Singularity/EntitySystems/SharedEmitterSystem.cs
@@ -1,6 +1,66 @@
-namespace Content.Shared.Singularity.EntitySystems;
+using Content.Shared.Database;
+using Content.Shared.Examine;
+using Content.Shared.Lock;
+using Content.Shared.Popups;
+using Content.Shared.Singularity.Components;
+using Content.Shared.Verbs;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Singularity.EntitySystems;
 
 public abstract class SharedEmitterSystem : EntitySystem
 {
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
 
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<EmitterComponent, ExaminedEvent>(OnExamined);
+        SubscribeLocalEvent<EmitterComponent, GetVerbsEvent<Verb>>(OnGetVerb);
+    }
+
+    private void OnGetVerb(Entity<EmitterComponent> ent, ref GetVerbsEvent<Verb> args)
+    {
+        if (!args.CanAccess || !args.CanInteract || !args.CanComplexInteract || args.Hands == null)
+            return;
+
+        if (TryComp<LockComponent>(ent.Owner, out var lockComp) && lockComp.Locked)
+            return;
+
+        if (ent.Comp.SelectableTypes.Count < 2)
+            return;
+
+        foreach (var type in ent.Comp.SelectableTypes)
+        {
+            var proto = _prototype.Index(type);
+
+            var v = new Verb
+            {
+                Priority = 1,
+                Category = VerbCategory.SelectType,
+                Text = proto.Name,
+                Disabled = type == ent.Comp.BoltType,
+                Impact = LogImpact.Medium,
+                DoContactInteraction = true,
+                Act = () =>
+                {
+                    ent.Comp.BoltType = type;
+                    Dirty(ent);
+                    _popup.PopupClient(Loc.GetString("emitter-component-type-set", ("type", proto.Name)), ent.Owner);
+                },
+            };
+            args.Verbs.Add(v);
+        }
+    }
+
+    private void OnExamined(Entity<EmitterComponent> ent, ref ExaminedEvent args)
+    {
+        if (ent.Comp.SelectableTypes.Count < 2)
+            return;
+
+        var proto = _prototype.Index(ent.Comp.BoltType);
+        args.PushMarkup(Loc.GetString("emitter-component-current-type", ("type", proto.Name)));
+    }
 }
diff --git a/Content.Shared/Speech/Components/ActiveListenerComponent.cs b/Content.Shared/Speech/Components/ActiveListenerComponent.cs
new file mode 100644
index 0000000000..fde108a817
--- /dev/null
+++ b/Content.Shared/Speech/Components/ActiveListenerComponent.cs
@@ -0,0 +1,17 @@
+using Content.Shared.Chat;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Speech.Components;
+
+/// <summary>
+/// This component is used to relay speech events to other systems.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class ActiveListenerComponent : Component
+{
+    /// <summary>
+    /// The range in which to listen to speech.
+    /// </summary>
+    [DataField]
+    public float Range = SharedChatSystem.VoiceRange;
+}
diff --git a/Content.Server/Speech/ListenEvent.cs b/Content.Shared/Speech/ListenEvent.cs
similarity index 93%
rename from Content.Server/Speech/ListenEvent.cs
rename to Content.Shared/Speech/ListenEvent.cs
index b67aa92f65..8854bd99f4 100644
--- a/Content.Server/Speech/ListenEvent.cs
+++ b/Content.Shared/Speech/ListenEvent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Speech;
+namespace Content.Shared.Speech;
 
 public sealed class ListenEvent : EntityEventArgs
 {
diff --git a/Content.Shared/Speech/SpeechComponent.cs b/Content.Shared/Speech/SpeechComponent.cs
index 8c12fc918a..fddb41753e 100644
--- a/Content.Shared/Speech/SpeechComponent.cs
+++ b/Content.Shared/Speech/SpeechComponent.cs
@@ -16,29 +16,26 @@ namespace Content.Shared.Speech
         [Access(typeof(SpeechSystem), Friend = AccessPermissions.ReadWrite, Other = AccessPermissions.Read)]
         public bool Enabled = true;
 
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField]
+        [DataField, AutoNetworkedField]
         public ProtoId<SpeechSoundsPrototype>? SpeechSounds;
 
         /// <summary>
         ///     What speech verb prototype should be used by default for displaying this entity's messages?
         /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField]
+        [DataField, AutoNetworkedField]
         public ProtoId<SpeechVerbPrototype> SpeechVerb = "Default";
 
         /// <summary>
         ///     What emotes allowed to use event if emote <see cref="EmotePrototype.Available"/> is false
         /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField]
+        [DataField, AutoNetworkedField]
         public List<ProtoId<EmotePrototype>> AllowedEmotes = new();
 
         /// <summary>
         ///     A mapping from chat suffixes loc strings to speech verb prototypes that should be conditionally used.
         ///     For things like '?' changing to 'asks' or '!!' making text bold and changing to 'yells'. Can be overridden if necessary.
         /// </summary>
-        [DataField]
+        [DataField, AutoNetworkedField]
         public Dictionary<string, ProtoId<SpeechVerbPrototype>> SuffixSpeechVerbs = new()
         {
             { "chat-speech-verb-suffix-exclamation-strong", "DefaultExclamationStrong" },
@@ -51,7 +48,6 @@ namespace Content.Shared.Speech
         [DataField]
         public AudioParams AudioParams = AudioParams.Default.WithVolume(-2f).WithRolloffFactor(4.5f);
 
-        [ViewVariables(VVAccess.ReadWrite)]
         [DataField]
         public float SoundCooldownTime { get; set; } = 0.5f;
 
diff --git a/Content.Shared/Sprite/ScaleVisualsComponent.cs b/Content.Shared/Sprite/ScaleVisualsComponent.cs
new file mode 100644
index 0000000000..a9c1fcb39c
--- /dev/null
+++ b/Content.Shared/Sprite/ScaleVisualsComponent.cs
@@ -0,0 +1,27 @@
+using System.Numerics;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Sprite;
+
+/// <summary>
+/// Used to set the <see cref="Robust.Client.GameObjects.SpriteComponent.Scale"/> datafield to a certain value from the server.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(SharedScaleVisualsSystem))]
+public sealed partial class ScaleVisualsComponent : Component
+{
+    /// <summary>
+    /// The current sprite scale.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    [ViewVariables]
+    public Vector2 Scale = Vector2.One;
+
+    /// <summary>
+    /// The original sprite scale, which we revert to if this component is removed.
+    /// Only set on the client.
+    /// </summary>
+    [DataField]
+    [ViewVariables]
+    public Vector2? OriginalScale;
+}
diff --git a/Content.Shared/Sprite/SharedScaleVisualsSystem.cs b/Content.Shared/Sprite/SharedScaleVisualsSystem.cs
new file mode 100644
index 0000000000..408f5984b1
--- /dev/null
+++ b/Content.Shared/Sprite/SharedScaleVisualsSystem.cs
@@ -0,0 +1,78 @@
+using System.Numerics;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Sprite;
+
+public abstract class SharedScaleVisualsSystem : EntitySystem
+{
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ScaleVisualsComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<ScaleVisualsComponent, ComponentShutdown>(OnComponentShutdown);
+    }
+
+    private void OnMapInit(Entity<ScaleVisualsComponent> ent, ref MapInitEvent args)
+    {
+        SetSpriteScale(ent.Owner, ent.Comp.Scale);
+    }
+
+    private void OnComponentShutdown(Entity<ScaleVisualsComponent> ent, ref ComponentShutdown args)
+    {
+        ResetScale(ent);
+    }
+
+    protected virtual void ResetScale(Entity<ScaleVisualsComponent> ent)
+    {
+        _appearance.RemoveData(ent.Owner, ScaleVisuals.Scale);
+        var ev = new ScaleEntityEvent(ent.Owner, Vector2.One);
+        RaiseLocalEvent(ent.Owner, ref ev);
+    }
+
+    /// <summary>
+    /// Used to set the <see cref="Robust.Client.GameObjects.SpriteComponent.Scale"/> datafield to a certain value from the server.
+    /// </summary>
+    public void SetSpriteScale(EntityUid uid, Vector2 scale)
+    {
+        var comp = EnsureComp<ScaleVisualsComponent>(uid);
+        comp.Scale = scale;
+        Dirty(uid, comp);
+
+        var appearanceComponent = EnsureComp<AppearanceComponent>(uid);
+        _appearance.SetData(uid, ScaleVisuals.Scale, scale, appearanceComponent);
+
+        // Raise an event for content use.
+        var ev = new ScaleEntityEvent(uid, scale);
+        RaiseLocalEvent(uid, ref ev);
+    }
+
+    /// <summary>
+    /// Gets the current scale set by <see cref="SetSpriteScale"/>.
+    /// This does not include any direct changes made to the SpriteComponent.
+    /// </summary>
+    public Vector2 GetSpriteScale(EntityUid uid)
+    {
+        if (!TryComp<AppearanceComponent>(uid, out var appearanceComponent))
+            return Vector2.One;
+
+        if (!_appearance.TryGetData<Vector2>(uid, ScaleVisuals.Scale, out var scale, appearanceComponent))
+            scale = Vector2.One;
+
+        return scale;
+    }
+}
+
+/// <summary>
+/// Raised when a sprite scale is changed.
+/// </summary>
+[ByRefEvent]
+public readonly record struct ScaleEntityEvent(EntityUid Uid, Vector2 Scale);
+
+[Serializable, NetSerializable]
+public enum ScaleVisuals : byte
+{
+    Scale,
+}
diff --git a/Content.Shared/Stacks/SharedStackSystem.cs b/Content.Shared/Stacks/SharedStackSystem.cs
index cd2f38d47f..912089379a 100644
--- a/Content.Shared/Stacks/SharedStackSystem.cs
+++ b/Content.Shared/Stacks/SharedStackSystem.cs
@@ -3,6 +3,7 @@ using Content.Shared.Examine;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction;
+using Content.Shared.Nutrition;
 using Content.Shared.Popups;
 using Content.Shared.Storage.EntitySystems;
 using JetBrains.Annotations;
@@ -37,6 +38,8 @@ namespace Content.Shared.Stacks
             SubscribeLocalEvent<StackComponent, ComponentStartup>(OnStackStarted);
             SubscribeLocalEvent<StackComponent, ExaminedEvent>(OnStackExamined);
             SubscribeLocalEvent<StackComponent, InteractUsingEvent>(OnStackInteractUsing);
+            SubscribeLocalEvent<StackComponent, BeforeIngestedEvent>(OnBeforeEaten);
+            SubscribeLocalEvent<StackComponent, IngestedEvent>(OnEaten);
 
             _vvm.GetTypeHandler<StackComponent>()
                 .AddPath(nameof(StackComponent.Count), (_, comp) => comp.Count, SetCount);
@@ -389,6 +392,51 @@ namespace Content.Shared.Stacks
                 )
             );
         }
+
+        private void OnBeforeEaten(Entity<StackComponent> eaten, ref BeforeIngestedEvent args)
+        {
+            if (args.Cancelled)
+                return;
+
+            if (args.Solution is not { } sol)
+                return;
+
+            // If the entity is empty and is a lingering entity we can't eat from it.
+            if (eaten.Comp.Count <= 0)
+            {
+                args.Cancelled = true;
+                return;
+            }
+
+            /*
+            Edible stacked items is near completely evil so we must choose one of the following:
+            - Option 1: Eat the entire solution each bite and reduce the stack by 1.
+            - Option 2: Multiply the solution eaten by the stack size.
+            - Option 3: Divide the solution consumed by stack size.
+            The easiest and safest option is and always will be Option 1 otherwise we risk reagent deletion or duplication.
+            That is why we cancel if we cannot set the minimum to the entire volume of the solution.
+            */
+            if(args.TryNewMinimum(sol.Volume))
+                return;
+
+            args.Cancelled = true;
+        }
+
+        private void OnEaten(Entity<StackComponent> eaten, ref IngestedEvent args)
+        {
+            if (!Use(eaten, 1))
+                return;
+
+            // We haven't eaten the whole stack yet or are unable to eat it completely.
+            if (eaten.Comp.Count > 0 || eaten.Comp.Lingering)
+            {
+                args.Refresh = true;
+                return;
+            }
+
+            // Here to tell the food system to do destroy stuff.
+            args.Destroy = true;
+        }
     }
 
     /// <summary>
diff --git a/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs b/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs
index 7f8eef5102..f1edcfe819 100644
--- a/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs
+++ b/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs
@@ -69,6 +69,7 @@ public sealed partial class StatusEffectsSystem : EntitySystem
             _container.EnsureContainer<Container>(ent, StatusEffectContainerComponent.ContainerId);
         // We show the contents of the container to allow status effects to have visible sprites.
         ent.Comp.ActiveStatusEffects.ShowContents = true;
+        ent.Comp.ActiveStatusEffects.OccludesLight = false;
     }
 
     private void OnStatusContainerShutdown(Entity<StatusEffectContainerComponent> ent, ref ComponentShutdown args)
diff --git a/Content.Shared/Sticky/Components/StickyComponent.cs b/Content.Shared/Sticky/Components/StickyComponent.cs
index 4513091754..a4007b0780 100644
--- a/Content.Shared/Sticky/Components/StickyComponent.cs
+++ b/Content.Shared/Sticky/Components/StickyComponent.cs
@@ -1,5 +1,5 @@
 using Content.Shared.Sticky.Systems;
-using Content.Shared.Whitelist;
+using Content.Shared.Whitelist;
 using Robust.Shared.GameStates;
 using Robust.Shared.Utility;
 
diff --git a/Content.Server/Storage/Components/PickRandomComponent.cs b/Content.Shared/Storage/Components/PickRandomComponent.cs
similarity index 69%
rename from Content.Server/Storage/Components/PickRandomComponent.cs
rename to Content.Shared/Storage/Components/PickRandomComponent.cs
index 00c79b9ea4..e243d25dde 100644
--- a/Content.Server/Storage/Components/PickRandomComponent.cs
+++ b/Content.Shared/Storage/Components/PickRandomComponent.cs
@@ -1,31 +1,32 @@
-using Content.Server.Storage.EntitySystems;
+using Content.Shared.Storage.EntitySystems;
 using Content.Shared.Whitelist;
+using Robust.Shared.GameStates;
 
-namespace Content.Server.Storage.Components;
+namespace Content.Shared.Storage.Components;
 
 /// <summary>
 /// Adds a verb to pick a random item from a container.
 /// Only picks items that match the whitelist.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 [Access(typeof(PickRandomSystem))]
 public sealed partial class PickRandomComponent : Component
 {
     /// <summary>
     /// Whitelist for potential picked items.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField, AutoNetworkedField]
     public EntityWhitelist? Whitelist;
 
     /// <summary>
     /// Locale id for the pick verb text.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField, AutoNetworkedField]
     public LocId VerbText = "comp-pick-random-verb-text";
 
     /// <summary>
     /// Locale id for the empty storage message.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField, AutoNetworkedField]
     public LocId EmptyText = "comp-pick-random-empty";
 }
diff --git a/Content.Server/Storage/EntitySystems/PickRandomSystem.cs b/Content.Shared/Storage/EntitySystems/PickRandomSystem.cs
similarity index 78%
rename from Content.Server/Storage/EntitySystems/PickRandomSystem.cs
rename to Content.Shared/Storage/EntitySystems/PickRandomSystem.cs
index f0e986e199..87fb4219ad 100644
--- a/Content.Server/Storage/EntitySystems/PickRandomSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/PickRandomSystem.cs
@@ -1,22 +1,22 @@
 using System.Linq;
-using Content.Server.Storage.Components;
 using Content.Shared.Database;
 using Content.Shared.Hands.EntitySystems;
-using Content.Shared.Storage;
+using Content.Shared.Storage.Components;
 using Content.Shared.Verbs;
 using Content.Shared.Whitelist;
 using Robust.Shared.Containers;
+using Robust.Shared.Network;
 using Robust.Shared.Random;
 
-namespace Content.Server.Storage.EntitySystems;
+namespace Content.Shared.Storage.EntitySystems;
 
-// TODO: move this to shared for verb prediction if/when storage is in shared
 public sealed class PickRandomSystem : EntitySystem
 {
+    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
+    [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly SharedHandsSystem _hands = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
 
     public override void Initialize()
     {
@@ -50,12 +50,19 @@ public sealed class PickRandomSystem : EntitySystem
 
     private void TryPick(EntityUid uid, PickRandomComponent comp, StorageComponent storage, EntityUid user)
     {
+        // It's hard to predict picking a random entity from a container since the contained entity list will have a different order on the server and client.
+        // One idea might be to sort them by NetEntity ID, but that is expensive if there are a lot of entities.
+        // Another option would be to make this client authorative.
+        if (_net.IsClient)
+            return;
+
         var entities = storage.Container.ContainedEntities.Where(item => _whitelistSystem.IsWhitelistPassOrNull(comp.Whitelist, item)).ToArray();
 
-        if (!entities.Any())
+        if (entities.Length == 0)
             return;
 
         var picked = _random.Pick(entities);
+
         // if it fails to go into a hand of the user, will be on the storage
         _container.AttachParentToContainerOrGrid((picked, Transform(picked)));
 
diff --git a/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs b/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs
index 51615c5afa..3691f6e2b6 100644
--- a/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs
@@ -8,6 +8,7 @@ using Content.Shared.Interaction;
 using Content.Shared.Item;
 using Content.Shared.Materials;
 using Content.Shared.Nutrition;
+using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Popups;
 using Content.Shared.Storage.Components;
 using Content.Shared.Tools.EntitySystems;
@@ -25,6 +26,7 @@ namespace Content.Shared.Storage.EntitySystems;
 /// </summary>
 public sealed class SecretStashSystem : EntitySystem
 {
+    [Dependency] private readonly IngestionSystem _ingestion = default!;
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
     [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
@@ -41,7 +43,7 @@ public sealed class SecretStashSystem : EntitySystem
         SubscribeLocalEvent<SecretStashComponent, DestructionEventArgs>(OnDestroyed);
         SubscribeLocalEvent<SecretStashComponent, GotReclaimedEvent>(OnReclaimed);
         SubscribeLocalEvent<SecretStashComponent, InteractUsingEvent>(OnInteractUsing, after: new[] { typeof(ToolOpenableSystem), typeof(AnchorableSystem) });
-        SubscribeLocalEvent<SecretStashComponent, AfterFullyEatenEvent>(OnEaten);
+        SubscribeLocalEvent<SecretStashComponent, FullyEatenEvent>(OnFullyEaten);
         SubscribeLocalEvent<SecretStashComponent, InteractHandEvent>(OnInteractHand);
         SubscribeLocalEvent<SecretStashComponent, GetVerbsEvent<InteractionVerb>>(OnGetVerb);
     }
@@ -61,7 +63,7 @@ public sealed class SecretStashSystem : EntitySystem
         DropContentsAndAlert(entity, args.ReclaimerCoordinates);
     }
 
-    private void OnEaten(Entity<SecretStashComponent> entity, ref AfterFullyEatenEvent args)
+    private void OnFullyEaten(Entity<SecretStashComponent> entity, ref FullyEatenEvent args)
     {
         // TODO: When newmed is finished should do damage to teeth (Or something like that!)
         var damage = entity.Comp.DamageEatenItemInside;
diff --git a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
index 2b73a9349f..fd7cb87b2a 100644
--- a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
@@ -16,6 +16,7 @@ using Content.Shared.Verbs;
 using Content.Shared.Wall;
 using Content.Shared.Whitelist;
 using Content.Shared.ActionBlocker;
+using Content.Shared.Mobs.Components;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
@@ -355,7 +356,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
             return _whitelistSystem.IsValid(component.Whitelist, toInsert);
 
         // The inserted entity must be a mob or an item.
-        return HasComp<BodyComponent>(toInsert) || HasComp<ItemComponent>(toInsert);
+        return HasComp<MobStateComponent>(toInsert) || HasComp<ItemComponent>(toInsert);
     }
 
     public bool TryOpenStorage(EntityUid user, EntityUid target, bool silent = false)
diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index f3c9055910..74c47bbb25 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -232,7 +232,14 @@ public abstract class SharedStorageSystem : EntitySystem
             StoredItems = storedItems,
             SavedLocations = component.SavedLocations,
             Whitelist = component.Whitelist,
-            Blacklist = component.Blacklist
+            Blacklist = component.Blacklist,
+            QuickInsert = component.QuickInsert,
+            AreaInsert = component.AreaInsert,
+            StorageInsertSound = component.StorageInsertSound,
+            StorageRemoveSound = component.StorageRemoveSound,
+            StorageOpenSound = component.StorageOpenSound,
+            StorageCloseSound = component.StorageCloseSound,
+            DefaultStorageOrientation = component.DefaultStorageOrientation,
         };
     }
 
@@ -348,6 +355,44 @@ public abstract class SharedStorageSystem : EntitySystem
         args.Verbs.Add(verb);
     }
 
+    /// <summary>
+    /// Copy this component's datafields from one entity to another.
+    /// This can't use CopyComp because we don't want to copy the references to the items inside the storage.
+    /// <summary>
+    public void CopyComponent(Entity<StorageComponent?> source, EntityUid target)
+    {
+        if (!Resolve(source, ref source.Comp))
+            return;
+
+        var targetComp = EnsureComp<StorageComponent>(target);
+        targetComp.Grid = new List<Box2i>(source.Comp.Grid);
+        targetComp.MaxItemSize = source.Comp.MaxItemSize;
+        targetComp.QuickInsert = source.Comp.QuickInsert;
+        targetComp.QuickInsertCooldown = source.Comp.QuickInsertCooldown;
+        targetComp.OpenUiCooldown = source.Comp.OpenUiCooldown;
+        targetComp.ClickInsert = source.Comp.ClickInsert;
+        targetComp.OpenOnActivate = source.Comp.OpenOnActivate;
+        targetComp.AreaInsert = source.Comp.AreaInsert;
+        targetComp.AreaInsertRadius = source.Comp.AreaInsertRadius;
+        targetComp.Whitelist = source.Comp.Whitelist;
+        targetComp.Blacklist = source.Comp.Blacklist;
+        targetComp.StorageInsertSound = source.Comp.StorageInsertSound;
+        targetComp.StorageRemoveSound = source.Comp.StorageRemoveSound;
+        targetComp.StorageOpenSound = source.Comp.StorageOpenSound;
+        targetComp.StorageCloseSound = source.Comp.StorageCloseSound;
+        targetComp.DefaultStorageOrientation = source.Comp.DefaultStorageOrientation;
+        targetComp.HideStackVisualsWhenClosed = source.Comp.HideStackVisualsWhenClosed;
+        targetComp.SilentStorageUserTag = source.Comp.SilentStorageUserTag;
+        targetComp.ShowVerb = source.Comp.ShowVerb;
+
+        UpdateOccupied((target, targetComp));
+        Dirty(target, targetComp);
+
+        var targetUI = EnsureComp<UserInterfaceComponent>(target);
+
+        UI.SetUi((target, targetUI), StorageComponent.StorageUiKey.Key, new InterfaceData("StorageBoundUserInterface"));
+    }
+
     /// <summary>
     /// Tries to get the storage location of an item.
     /// </summary>
@@ -1296,7 +1341,7 @@ public abstract class SharedStorageSystem : EntitySystem
         Angle startAngle;
         if (storageEnt.Comp.DefaultStorageOrientation == null)
         {
-            startAngle = Angle.FromDegrees(-itemEnt.Comp.StoredRotation);
+            startAngle = Angle.Zero;
         }
         else
         {
@@ -1957,15 +2002,17 @@ public abstract class SharedStorageSystem : EntitySystem
     protected sealed class StorageComponentState : ComponentState
     {
         public Dictionary<NetEntity, ItemStorageLocation> StoredItems = new();
-
         public Dictionary<string, List<ItemStorageLocation>> SavedLocations = new();
-
         public List<Box2i> Grid = new();
-
         public ProtoId<ItemSizePrototype>? MaxItemSize;
-
         public EntityWhitelist? Whitelist;
-
         public EntityWhitelist? Blacklist;
+        public bool QuickInsert;
+        public bool AreaInsert;
+        public SoundSpecifier? StorageInsertSound;
+        public SoundSpecifier? StorageRemoveSound;
+        public SoundSpecifier? StorageOpenSound;
+        public SoundSpecifier? StorageCloseSound;
+        public StorageDefaultOrientation? DefaultStorageOrientation;
     }
 }
diff --git a/Content.Shared/Tiles/ProtectedGridSystem.cs b/Content.Shared/Tiles/ProtectedGridSystem.cs
index 0d6f5b7a6d..f90b0a52de 100644
--- a/Content.Shared/Tiles/ProtectedGridSystem.cs
+++ b/Content.Shared/Tiles/ProtectedGridSystem.cs
@@ -62,7 +62,7 @@ public sealed class ProtectedGridSystem : EntitySystem
             return;
         }
 
-        if (SharedMapSystem.FromBitmask(args.GridIndices, data))
+        if (!SharedMapSystem.FromBitmask(args.GridIndices, data))
         {
             args.Cancelled = true;
         }
diff --git a/Content.Shared/Timing/UseDelaySystem.cs b/Content.Shared/Timing/UseDelaySystem.cs
index d02752e16b..0950e8981d 100644
--- a/Content.Shared/Timing/UseDelaySystem.cs
+++ b/Content.Shared/Timing/UseDelaySystem.cs
@@ -9,7 +9,7 @@ public sealed class UseDelaySystem : EntitySystem
     [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly MetaDataSystem _metadata = default!;
 
-    private const string DefaultId = "default";
+    public const string DefaultId = "default";
 
     public override void Initialize()
     {
diff --git a/Content.Shared/Toilet/Components/ToiletComponent.cs b/Content.Shared/Toilet/Components/ToiletComponent.cs
index 5de74e08f6..ab1d390980 100644
--- a/Content.Shared/Toilet/Components/ToiletComponent.cs
+++ b/Content.Shared/Toilet/Components/ToiletComponent.cs
@@ -2,39 +2,36 @@ using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Toilet.Components
+namespace Content.Shared.Toilet.Components;
+
+/// <summary>
+/// Seats that can toggled up and down with visuals to match.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class ToiletComponent : Component
 {
     /// <summary>
-    /// Toilets that can be flushed, seats toggled up and down, items hidden in cistern.
+    /// Toggles seat state.
     /// </summary>
-    [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-    public sealed partial class ToiletComponent : Component
-    {
-        /// <summary>
-        /// Toggles seat state.
-        /// </summary>
-        [DataField, AutoNetworkedField]
-        public bool ToggleSeat;
+    [DataField, AutoNetworkedField]
+    public bool ToggleSeat;
 
-
-        /// <summary>
-        /// Sound to play when toggling toilet seat.
-        /// </summary>
-        [DataField]
-        public SoundSpecifier SeatSound = new SoundPathSpecifier("/Audio/Effects/toilet_seat_down.ogg");
-    }
-
-    [Serializable, NetSerializable]
-    public enum ToiletVisuals : byte
-    {
-        SeatVisualState,
-    }
-
-    [Serializable, NetSerializable]
-    public enum SeatVisualState : byte
-    {
-        SeatUp,
-        SeatDown
-    }
+    /// <summary>
+    /// Sound to play when toggling toilet seat.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier SeatSound = new SoundPathSpecifier("/Audio/Effects/toilet_seat_down.ogg");
 }
 
+[Serializable, NetSerializable]
+public enum ToiletVisuals : byte
+{
+    SeatVisualState,
+}
+
+[Serializable, NetSerializable]
+public enum SeatVisualState : byte
+{
+    SeatUp,
+    SeatDown,
+}
diff --git a/Content.Shared/Toilet/Systems/SharedToiletSystem.cs b/Content.Shared/Toilet/Systems/SharedToiletSystem.cs
deleted file mode 100644
index f11af33552..0000000000
--- a/Content.Shared/Toilet/Systems/SharedToiletSystem.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-using Content.Shared.Buckle.Components;
-using Content.Shared.Interaction;
-using Content.Shared.Verbs;
-using Content.Shared.Plunger.Components;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Random;
-using Robust.Shared.Utility;
-using Content.Shared.Toilet.Components;
-
-namespace Content.Shared.Toilet.Systems
-{
-    /// <summary>
-    /// Handles sprite changes for both toilet seat up and down as well as for lid open and closed. Handles interactions with hidden stash
-    /// </summary>
-
-    public abstract class SharedToiletSystem : EntitySystem
-    {
-        [Dependency] private readonly IRobustRandom _random = default!;
-        [Dependency] private readonly SharedAudioSystem _audio = default!;
-        [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            SubscribeLocalEvent<ToiletComponent, MapInitEvent>(OnMapInit);
-            SubscribeLocalEvent<ToiletComponent, GetVerbsEvent<AlternativeVerb>>(OnToggleSeatVerb);
-            SubscribeLocalEvent<ToiletComponent, ActivateInWorldEvent>(OnActivateInWorld);
-        }
-
-        private void OnMapInit(EntityUid uid, ToiletComponent component, MapInitEvent args)
-        {
-            if (_random.Prob(0.5f))
-                component.ToggleSeat = true;
-
-            if (_random.Prob(0.3f))
-            {
-                TryComp<PlungerUseComponent>(uid, out var plunger);
-
-                if (plunger == null)
-                    return;
-
-                plunger.NeedsPlunger = true;
-            }
-
-            UpdateAppearance(uid);
-            Dirty(uid, component);
-        }
-
-        public bool CanToggle(EntityUid uid)
-        {
-            return TryComp<StrapComponent>(uid, out var strap) && strap.BuckledEntities.Count == 0;
-        }
-
-        private void OnToggleSeatVerb(EntityUid uid, ToiletComponent component, GetVerbsEvent<AlternativeVerb> args)
-        {
-            if (!args.CanInteract || !args.CanAccess || !CanToggle(uid) || args.Hands == null)
-                return;
-
-            AlternativeVerb toggleVerb = new()
-            {
-                Act = () => ToggleToiletSeat(uid, args.User, component)
-            };
-
-            if (component.ToggleSeat)
-            {
-                toggleVerb.Text = Loc.GetString("toilet-seat-close");
-                toggleVerb.Icon =
-                    new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/close.svg.192dpi.png"));
-            }
-            else
-            {
-                toggleVerb.Text = Loc.GetString("toilet-seat-open");
-                toggleVerb.Icon =
-                    new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/open.svg.192dpi.png"));
-            }
-            args.Verbs.Add(toggleVerb);
-        }
-
-        private void OnActivateInWorld(EntityUid uid, ToiletComponent comp, ActivateInWorldEvent args)
-        {
-            if (args.Handled || !args.Complex)
-                return;
-
-            args.Handled = true;
-            ToggleToiletSeat(uid, args.User, comp);
-        }
-
-        public void ToggleToiletSeat(EntityUid uid, EntityUid? user = null, ToiletComponent? component = null, MetaDataComponent? meta = null)
-        {
-            if (!Resolve(uid, ref component))
-                return;
-
-            component.ToggleSeat = !component.ToggleSeat;
-
-            _audio.PlayPredicted(component.SeatSound, uid, uid);
-            UpdateAppearance(uid, component);
-            Dirty(uid, component, meta);
-        }
-
-        private void UpdateAppearance(EntityUid uid, ToiletComponent? component = null)
-        {
-            if (!Resolve(uid, ref component))
-                return;
-
-            _appearance.SetData(uid, ToiletVisuals.SeatVisualState, component.ToggleSeat ? SeatVisualState.SeatUp : SeatVisualState.SeatDown);
-        }
-    }
-}
diff --git a/Content.Shared/Toilet/Systems/ToiletSystem.cs b/Content.Shared/Toilet/Systems/ToiletSystem.cs
new file mode 100644
index 0000000000..ad08012b11
--- /dev/null
+++ b/Content.Shared/Toilet/Systems/ToiletSystem.cs
@@ -0,0 +1,116 @@
+using Content.Shared.Buckle.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Verbs;
+using Content.Shared.Plunger.Components;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Random;
+using Robust.Shared.Utility;
+using Content.Shared.Toilet.Components;
+
+namespace Content.Shared.Toilet.Systems;
+
+/// <summary>
+/// Handles sprite changes for both toilet seat up and down as well as for lid
+/// open and closed.
+/// </summary>
+public sealed class ToiletSystem : EntitySystem
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ToiletComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<ToiletComponent, GetVerbsEvent<AlternativeVerb>>(OnToggleSeatVerb);
+        SubscribeLocalEvent<ToiletComponent, ActivateInWorldEvent>(OnActivateInWorld);
+    }
+
+    private void OnMapInit(Entity<ToiletComponent> ent, ref MapInitEvent args)
+    {
+        if (_random.Prob(0.5f))
+        {
+            ent.Comp.ToggleSeat = true;
+            Dirty(ent);
+        }
+
+        if (_random.Prob(0.3f)
+            && TryComp<PlungerUseComponent>(ent, out var plunger))
+        {
+            plunger.NeedsPlunger = true;
+            Dirty(ent, plunger);
+        }
+
+        UpdateAppearance(ent);
+    }
+
+    private void OnToggleSeatVerb(Entity<ToiletComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!args.CanInteract || !args.CanAccess || args.Hands == null || !CanToggle(ent))
+            return;
+
+        var user = args.User;
+        AlternativeVerb toggleVerb = new() { Act = () => ToggleToiletSeat(ent.AsNullable(), user) };
+
+        if (ent.Comp.ToggleSeat)
+        {
+            toggleVerb.Text = Loc.GetString("toilet-seat-close");
+            toggleVerb.Icon =
+                new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/close.svg.192dpi.png"));
+        }
+        else
+        {
+            toggleVerb.Text = Loc.GetString("toilet-seat-open");
+            toggleVerb.Icon =
+                new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/open.svg.192dpi.png"));
+        }
+        args.Verbs.Add(toggleVerb);
+    }
+
+    private void OnActivateInWorld(Entity<ToiletComponent> ent, ref ActivateInWorldEvent args)
+    {
+        if (args.Handled || !args.Complex)
+            return;
+
+        args.Handled = true;
+        ToggleToiletSeat(ent.AsNullable(), args.User);
+    }
+
+    private void UpdateAppearance(Entity<ToiletComponent> ent)
+    {
+        _appearance.SetData(ent,
+            ToiletVisuals.SeatVisualState,
+            ent.Comp.ToggleSeat ? SeatVisualState.SeatUp : SeatVisualState.SeatDown);
+    }
+
+
+    /// <summary>
+    /// Toggles a toilet's seat. Yup. Doesn't check if anyone is on the seat.
+    /// </summary>
+    /// <param name="ent">The toilet being seat-toggled.</param>
+    /// <param name="user">The user doing the toggling; used for predicted audio.</param>
+    /// <seealso cref="CanToggle" />
+    public void ToggleToiletSeat(Entity<ToiletComponent?> ent, EntityUid? user = null)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return;
+
+        ent.Comp.ToggleSeat = !ent.Comp.ToggleSeat;
+
+        _audio.PlayPredicted(ent.Comp.SeatSound, ent, user);
+        UpdateAppearance((ent, ent.Comp));
+        Dirty(ent);
+    }
+
+    /// <summary>
+    /// Whether or not a toilet seat can be toggled without phasing through
+    /// someone's back. (That is, no one is seated on it.)
+    /// </summary>
+    /// <seealso cref="ToggleToiletSeat" />
+    public bool CanToggle(EntityUid uid)
+    {
+        return TryComp<StrapComponent>(uid, out var strap) && strap.BuckledEntities.Count == 0;
+    }
+}
diff --git a/Content.Shared/Tools/Components/WelderComponent.cs b/Content.Shared/Tools/Components/WelderComponent.cs
index 3c78a03fde..a9111c7f53 100644
--- a/Content.Shared/Tools/Components/WelderComponent.cs
+++ b/Content.Shared/Tools/Components/WelderComponent.cs
@@ -1,58 +1,76 @@
-using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
 using Content.Shared.Tools.Systems;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Tools.Components;
 
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true), Access(typeof(SharedToolSystem))]
+/// <summary>
+/// Handles fuel consumption for the tool and allows it to explode welding fuel tanks.
+/// </summary>
+/// <summary>
+/// TODO: De-hardcode welder bombing.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true), AutoGenerateComponentPause]
+[Access(typeof(SharedToolSystem))]
 public sealed partial class WelderComponent : Component
 {
+    /// <summary>
+    /// Is the welder currently enabled?
+    /// </summary>
     [DataField, AutoNetworkedField]
     public bool Enabled;
 
-    [DataField]
-    public float WelderTimer;
+    /// <summary>
+    /// Timestamp for the next update loop update.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan NextUpdate;
 
     /// <summary>
-    ///     Name of <see cref="FuelSolution"/>.
+    /// Delay between updates.
+    /// </summary>
+    [DataField]
+    public TimeSpan WelderUpdateTimer = TimeSpan.FromSeconds(1);
+
+    /// <summary>
+    /// Name of the fuel solution.
     /// </summary>
     [DataField]
     public string FuelSolutionName = "Welder";
 
     /// <summary>
-    ///     Reagent that will be used as fuel for welding.
+    /// Reagent that will be used as fuel for welding.
     /// </summary>
     [DataField]
     public ProtoId<ReagentPrototype> FuelReagent = "WeldingFuel";
 
     /// <summary>
-    ///     Fuel consumption per second while the welder is active.
+    /// Fuel consumption per second while the welder is active.
+    /// In u/s
     /// </summary>
     [DataField, AutoNetworkedField]
     public FixedPoint2 FuelConsumption = FixedPoint2.New(1.0f);
 
     /// <summary>
-    ///     A fuel amount to be consumed when the welder goes from being unlit to being lit.
+    /// A fuel amount to be consumed when the welder goes from being unlit to being lit.
     /// </summary>
     [DataField, AutoNetworkedField]
     public FixedPoint2 FuelLitCost = FixedPoint2.New(0.5f);
 
     /// <summary>
-    ///     Sound played when refilling the welder.
+    /// Sound played when refilling the welder.
     /// </summary>
     [DataField]
     public SoundSpecifier WelderRefill = new SoundPathSpecifier("/Audio/Effects/refill.ogg");
 
     /// <summary>
-    ///     Whether the item is safe to refill while lit without exploding the tank.
+    /// Whether the item is safe to refill while lit without exploding the tank.
     /// </summary>
     [DataField]
     public bool TankSafe;
-
-    [DataField]
-    public float WelderUpdateTimer = 1f;
 }
diff --git a/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs b/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs
index af1dc85137..1507b1d6e8 100644
--- a/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs
+++ b/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs
@@ -17,13 +17,16 @@ public abstract partial class SharedToolSystem
 
     public void InitializeWelder()
     {
+        SubscribeLocalEvent<WelderComponent, MapInitEvent>(OnWelderInit);
         SubscribeLocalEvent<WelderComponent, ExaminedEvent>(OnWelderExamine);
         SubscribeLocalEvent<WelderComponent, AfterInteractEvent>(OnWelderAfterInteract);
 
-        SubscribeLocalEvent<WelderComponent, ToolUseAttemptEvent>((uid, comp, ev) => {
+        SubscribeLocalEvent<WelderComponent, ToolUseAttemptEvent>((uid, comp, ev) =>
+        {
             CanCancelWelderUse((uid, comp), ev.User, ev.Fuel, ev);
         });
-        SubscribeLocalEvent<WelderComponent, DoAfterAttemptEvent<ToolDoAfterEvent>>((uid, comp, ev) => {
+        SubscribeLocalEvent<WelderComponent, DoAfterAttemptEvent<ToolDoAfterEvent>>((uid, comp, ev) =>
+        {
             CanCancelWelderUse((uid, comp), ev.Event.User, ev.Event.Fuel, ev);
         });
         SubscribeLocalEvent<WelderComponent, ToolDoAfterEvent>(OnWelderDoAfter);
@@ -71,6 +74,12 @@ public abstract partial class SharedToolSystem
         return (fuelSolution.GetTotalPrototypeQuantity(welder.FuelReagent), fuelSolution.MaxVolume);
     }
 
+    private void OnWelderInit(Entity<WelderComponent> ent, ref MapInitEvent args)
+    {
+        ent.Comp.NextUpdate = _timing.CurTime + ent.Comp.WelderUpdateTimer;
+        Dirty(ent);
+    }
+
     private void OnWelderExamine(Entity<WelderComponent> entity, ref ExaminedEvent args)
     {
         using (args.PushGroup(nameof(WelderComponent)))
@@ -169,7 +178,8 @@ public abstract partial class SharedToolSystem
 
     private void OnActivateAttempt(Entity<WelderComponent> entity, ref ItemToggleActivateAttemptEvent args)
     {
-        if (args.User != null && !_actionBlocker.CanComplexInteract(args.User.Value)) {
+        if (args.User != null && !_actionBlocker.CanComplexInteract(args.User.Value))
+        {
             args.Cancelled = true;
             return;
         }
@@ -191,9 +201,34 @@ public abstract partial class SharedToolSystem
 
     private void OnDeactivateAttempt(Entity<WelderComponent> entity, ref ItemToggleDeactivateAttemptEvent args)
     {
-        if (args.User != null && !_actionBlocker.CanComplexInteract(args.User.Value)) {
+        if (args.User != null && !_actionBlocker.CanComplexInteract(args.User.Value))
+        {
             args.Cancelled = true;
-            return;
+        }
+    }
+
+    private void UpdateWelders()
+    {
+        var query = EntityQueryEnumerator<WelderComponent, SolutionContainerManagerComponent>();
+        var curTime = _timing.CurTime;
+        while (query.MoveNext(out var uid, out var welder, out var solutionContainer))
+        {
+            if (curTime < welder.NextUpdate)
+                continue;
+
+            welder.NextUpdate += welder.WelderUpdateTimer;
+            Dirty(uid, welder);
+
+            if (!welder.Enabled)
+                continue;
+
+            if (!SolutionContainerSystem.TryGetSolution((uid, solutionContainer), welder.FuelSolutionName, out var solutionComp, out var solution))
+                continue;
+
+            SolutionContainerSystem.RemoveReagent(solutionComp.Value, welder.FuelReagent, welder.FuelConsumption * welder.WelderUpdateTimer.TotalSeconds);
+
+            if (solution.GetTotalPrototypeQuantity(welder.FuelReagent) <= FixedPoint2.Zero)
+                ItemToggle.Toggle(uid);
         }
     }
 }
diff --git a/Content.Shared/Tools/Systems/SharedToolSystem.cs b/Content.Shared/Tools/Systems/SharedToolSystem.cs
index bf98a365e7..7051cfea00 100644
--- a/Content.Shared/Tools/Systems/SharedToolSystem.cs
+++ b/Content.Shared/Tools/Systems/SharedToolSystem.cs
@@ -12,12 +12,14 @@ using Robust.Shared.Audio.Systems;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
+using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Tools.Systems;
 
 public abstract partial class SharedToolSystem : EntitySystem
 {
+    [Dependency] private   readonly IGameTiming _timing = default!;
     [Dependency] private   readonly IMapManager _mapManager = default!;
     [Dependency] private   readonly IPrototypeManager _protoMan = default!;
     [Dependency] protected readonly ISharedAdminLogManager AdminLogger = default!;
@@ -263,6 +265,13 @@ public abstract partial class SharedToolSystem : EntitySystem
         return !beforeAttempt.Cancelled;
     }
 
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        UpdateWelders();
+    }
+
     #region DoAfterEvents
 
     [Serializable, NetSerializable]
diff --git a/Content.Shared/Trigger/Components/ActiveTimerTriggerComponent.cs b/Content.Shared/Trigger/Components/ActiveTimerTriggerComponent.cs
new file mode 100644
index 0000000000..d7da5cecde
--- /dev/null
+++ b/Content.Shared/Trigger/Components/ActiveTimerTriggerComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components;
+
+/// <summary>
+/// Component used for tracking active timers triggers.
+/// Used internally for performance reasons.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class ActiveTimerTriggerComponent : Component;
diff --git a/Content.Shared/Trigger/Components/ActiveTwoStageTriggerComponent.cs b/Content.Shared/Trigger/Components/ActiveTwoStageTriggerComponent.cs
new file mode 100644
index 0000000000..bddbbd402e
--- /dev/null
+++ b/Content.Shared/Trigger/Components/ActiveTwoStageTriggerComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components;
+
+/// <summary>
+/// Component used for tracking active two-stage triggers.
+/// Used internally for performance reasons.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class ActiveTwoStageTriggerComponent : Component;
diff --git a/Content.Shared/Trigger/Components/Conditions/BaseTriggerConditionComponent.cs b/Content.Shared/Trigger/Components/Conditions/BaseTriggerConditionComponent.cs
new file mode 100644
index 0000000000..7e77c99d93
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Conditions/BaseTriggerConditionComponent.cs
@@ -0,0 +1,15 @@
+using Content.Shared.Trigger.Systems;
+
+namespace Content.Shared.Trigger.Components.Conditions;
+
+/// <summary>
+/// Base class for components that add a condition to triggers.
+/// </summary>
+public abstract partial class BaseTriggerConditionComponent : Component
+{
+    /// <summary>
+    /// The keys that are checked for the condition.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public HashSet<string> Keys = new() { TriggerSystem.DefaultTriggerKey };
+}
diff --git a/Content.Shared/Trigger/Components/Conditions/ToggleTriggerConditionComponent.cs b/Content.Shared/Trigger/Components/Conditions/ToggleTriggerConditionComponent.cs
new file mode 100644
index 0000000000..478f06602d
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Conditions/ToggleTriggerConditionComponent.cs
@@ -0,0 +1,34 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Conditions;
+
+/// <summary>
+/// Adds an alt verb that can be used to toggle a trigger.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class ToggleTriggerConditionComponent : BaseTriggerConditionComponent
+{
+    /// <summary>
+    /// Is the component currently enabled?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Enabled = true;
+
+    /// <summary>
+    /// The text of the toggle verb.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public LocId ToggleVerb = "toggle-trigger-condition-default-verb";
+
+    /// <summary>
+    /// The popup to show when toggled on.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public LocId ToggleOn = "toggle-trigger-condition-default-on";
+
+    /// <summary>
+    /// The popup to show when toggled off.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public LocId ToggleOff = "toggle-trigger-condition-default-off";
+}
diff --git a/Content.Shared/Trigger/Components/Conditions/UseDelayTriggerConditionComponent.cs b/Content.Shared/Trigger/Components/Conditions/UseDelayTriggerConditionComponent.cs
new file mode 100644
index 0000000000..70a331227e
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Conditions/UseDelayTriggerConditionComponent.cs
@@ -0,0 +1,20 @@
+using Content.Shared.Timing;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Conditions;
+
+/// <summary>
+/// Checks if the triggered entity has an active UseDelay.
+/// </summary>
+/// <remarks>
+/// TODO: Support specific UseDelay IDs for each trigger key.
+/// </remarks>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class UseDelayTriggerConditionComponent : BaseTriggerConditionComponent
+{
+    /// <summary>
+    /// Checks if the triggered entity has an active UseDelay.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public string UseDelayId = UseDelaySystem.DefaultId;
+}
diff --git a/Content.Shared/Trigger/Components/Conditions/WhitelistTriggerConditionComponent.cs b/Content.Shared/Trigger/Components/Conditions/WhitelistTriggerConditionComponent.cs
new file mode 100644
index 0000000000..a2779f79c6
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Conditions/WhitelistTriggerConditionComponent.cs
@@ -0,0 +1,24 @@
+using Content.Shared.Whitelist;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Conditions;
+
+/// <summary>
+/// Checks if the user of a trigger satisfies a whitelist and blacklist condition for the triggered entity or the one triggering it.
+/// Cancels the trigger otherwise.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class WhitelistTriggerConditionComponent : BaseTriggerConditionComponent
+{
+    /// <summary>
+    /// Whitelist for what entites can cause this trigger.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityWhitelist? UserWhitelist;
+
+    /// <summary>
+    /// Blacklist for what entites can cause this trigger.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityWhitelist? UserBlacklist;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/AddComponentsOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/AddComponentsOnTriggerComponent.cs
new file mode 100644
index 0000000000..06f5258fbe
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/AddComponentsOnTriggerComponent.cs
@@ -0,0 +1,37 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Adds the specified components when triggered.
+/// If TargetUser is true they will be added to the user.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class AddComponentsOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// The list of components that will be added.
+    /// </summary>
+    [DataField(required: true)]
+    public ComponentRegistry Components = new();
+
+    /// <summary>
+    /// If this component has been triggered at least once already.
+    /// If this is true the components have been added.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Triggered = false;
+
+    /// <summary>
+    /// If this effect can only be triggered once.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool TriggerOnce = false;
+
+    /// <summary>
+    /// Should components that already exist on the entity be overwritten?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool RemoveExisting = false;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/AlertLevelChangeOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/AlertLevelChangeOnTriggerComponent.cs
new file mode 100644
index 0000000000..0d161344d8
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/AlertLevelChangeOnTriggerComponent.cs
@@ -0,0 +1,34 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Changes the alert level of the station when triggered.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class AlertLevelChangeOnTriggerComponent : BaseXOnTriggerComponent
+{
+    ///<summary>
+    /// The alert level to change to when triggered.
+    ///</summary>
+    [DataField, AutoNetworkedField]
+    public string Level = "blue";
+
+    /// <summary>
+    /// Whether to play the sound when the alert level changes.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool PlaySound = true;
+
+    /// <summary>
+    /// Whether to say the announcement when the alert level changes.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Announce = true;
+
+    /// <summary>
+    /// Force the alert change. This applies if the alert level is not selectable or not.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Force = false;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/AnchorOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/AnchorOnTriggerComponent.cs
new file mode 100644
index 0000000000..ed61876f15
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/AnchorOnTriggerComponent.cs
@@ -0,0 +1,34 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will (un)anchor the entity when triggered.
+/// If TargetUser is true they will be (un)anchored instead.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class AnchorOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// Anchor the entity on trigger if it is currently unanchored?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool CanAnchor = true;
+
+    /// <summary>
+    /// Unanchor the entity on trigger if it is currently anchored?
+    /// If both this and CanAnchor are true then the trigger will toggle between states.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool CanUnanchor = false;
+
+    /// <summary>
+    /// Removes this component when triggered so it can only be activated once.
+    /// </summary>
+    /// <remarks>
+    /// TODO: Make this a generic thing for all triggers.
+    /// Or just add a RemoveComponentsOnTriggerComponent.
+    /// </remarks>
+    [DataField, AutoNetworkedField]
+    public bool RemoveOnTrigger = true;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/BaseXOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/BaseXOnTriggerComponent.cs
new file mode 100644
index 0000000000..cf93ad6c4a
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/BaseXOnTriggerComponent.cs
@@ -0,0 +1,22 @@
+using Content.Shared.Trigger.Systems;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Base class for components that do something when triggered.
+/// </summary>
+public abstract partial class BaseXOnTriggerComponent : Component
+{
+    /// <summary>
+    /// The keys that will activate the effect.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public HashSet<string> KeysIn = new() { TriggerSystem.DefaultTriggerKey };
+
+    /// <summary>
+    /// Set to true to make the user of the trigger the effect target.
+    /// Set to false to make the owner of this component the target.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool TargetUser = false;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/DamageOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/DamageOnTriggerComponent.cs
new file mode 100644
index 0000000000..8d35b019b4
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/DamageOnTriggerComponent.cs
@@ -0,0 +1,25 @@
+using Content.Shared.Damage;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will damage an entity when triggered.
+/// If TargetUser is true it the user will take damage instead.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class DamageOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// Should the damage ignore resistances?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool IgnoreResistances;
+
+    /// <summary>
+    /// The base damage amount that is dealt.
+    /// May be further modified by <see cref="Systems.BeforeDamageOnTriggerEvent"/> subscriptions.
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
+    public DamageSpecifier Damage = default!;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/DeleteOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/DeleteOnTriggerComponent.cs
new file mode 100644
index 0000000000..9d0a5b7517
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/DeleteOnTriggerComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will delete the entity when triggered.
+/// If TargetUser is true it will delete them instead.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class DeleteOnTriggerComponent : BaseXOnTriggerComponent;
diff --git a/Content.Shared/Trigger/Components/Effects/DnaScrambleOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/DnaScrambleOnTriggerComponent.cs
new file mode 100644
index 0000000000..1f3767b392
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/DnaScrambleOnTriggerComponent.cs
@@ -0,0 +1,11 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Scrambles the entity's identity and DNA, turning them into a randomized humanoid of the same species.
+/// If TargetUser is true the user will be scrambled instead.
+/// Used for dna scrambler implants.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class DnaScrambleOnTriggerComponent : BaseXOnTriggerComponent;
diff --git a/Content.Shared/Trigger/Components/Effects/EmitSoundOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/EmitSoundOnTriggerComponent.cs
new file mode 100644
index 0000000000..f3870225e2
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/EmitSoundOnTriggerComponent.cs
@@ -0,0 +1,31 @@
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will play a sound in PVS range when triggered.
+/// If TargetUser is true it will be played at their position.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class EmitSoundOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// The <see cref="SoundSpecifier"/> to play.
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
+    public SoundSpecifier? Sound;
+
+    /// <summary>
+    /// Play the sound at the position instead of parented to the source entity.
+    /// Useful if the entity is deleted after.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Positional;
+
+    /// <summary>
+    /// Should this sound be predicted for the User?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Predicted;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/EmpOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/EmpOnTriggerComponent.cs
new file mode 100644
index 0000000000..327e9f57db
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/EmpOnTriggerComponent.cs
@@ -0,0 +1,29 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will cause an EMP at the entity's location when triggered.
+/// If TargetUser is true then it will be spawned at their position.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class EmpOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// EMP range.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float Range = 1.0f;
+
+    /// <summary>
+    /// How much energy (in Joules) will be consumed per battery in range.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float EnergyConsumption;
+
+    /// <summary>
+    /// How long it disables targets.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan DisableDuration = TimeSpan.FromSeconds(60);
+}
diff --git a/Content.Shared/Trigger/Components/Effects/ExplodeOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/ExplodeOnTriggerComponent.cs
new file mode 100644
index 0000000000..2a1af40a2c
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/ExplodeOnTriggerComponent.cs
@@ -0,0 +1,14 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will explode using the entity's <see cref="ExplosiveComponent"/> when triggered.
+/// TargetUser will only work of the user has ExplosiveComponent as well.
+/// The User will be logged in the admin logs.
+/// </summary>
+/// <summary>
+/// TODO: Allow this to work without an ExplosiveComponent on the user via QueueExplosion.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class ExplodeOnTriggerComponent : BaseXOnTriggerComponent;
diff --git a/Content.Shared/Trigger/Components/Effects/FlashOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/FlashOnTriggerComponent.cs
new file mode 100644
index 0000000000..8b75417031
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/FlashOnTriggerComponent.cs
@@ -0,0 +1,29 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will cause a flash in an area around the entity when triggered.
+/// If TargetUser is true then their location will be used.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class FlashOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// The range in which to flash entities in.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float Range = 1.0f;
+
+    /// <summary>
+    /// The duration of the status effect.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan Duration = TimeSpan.FromSeconds(8);
+
+    /// <summary>
+    /// The probability to apply the status effect.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float Probability = 1.0f;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/GhostKickOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/GhostKickOnTriggerComponent.cs
new file mode 100644
index 0000000000..16c1365c05
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/GhostKickOnTriggerComponent.cs
@@ -0,0 +1,19 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will kick a player from the server as if their connection dropped if triggered.
+/// Yes, really. Don't use this component.
+/// If TargetUser is true then the user of the trigger will be kicked, otherwise the entity itself.
+/// <see cref="Server.GhostKick.GhostKickManager"/>
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class GhostKickOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// The reason that will be displayed in the server log when a player is kicked.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public LocId Reason = "ghost-kick-on-trigger-default";
+}
diff --git a/Content.Shared/Trigger/Components/Effects/GibOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/GibOnTriggerComponent.cs
new file mode 100644
index 0000000000..b3475ac447
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/GibOnTriggerComponent.cs
@@ -0,0 +1,17 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will gib the entity when triggered.
+/// If TargetUser is true the user will be gibbed instead.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class GibOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// Should gibbing also delete the owners items?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool DeleteItems = false;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/IgniteOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/IgniteOnTriggerComponent.cs
new file mode 100644
index 0000000000..36273ef1b2
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/IgniteOnTriggerComponent.cs
@@ -0,0 +1,27 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will ignite for a certain length of time when triggered.
+/// Requires <see cref="IgnitionSourceComponent"/> along with triggering components.
+/// The if TargetUser is true they will be ignited instead (they need IgnitionSourceComponent as well).
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState, AutoGenerateComponentPause]
+public sealed partial class IgniteOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// Once ignited, the time it will unignite at.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan IgnitedUntil = TimeSpan.Zero;
+
+    /// <summary>
+    /// How long the ignition source is active for after triggering.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan IgnitedTime = TimeSpan.FromSeconds(0.5);
+}
diff --git a/Content.Shared/Trigger/Components/Effects/ItemToggleOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/ItemToggleOnTriggerComponent.cs
new file mode 100644
index 0000000000..4c5360f4d2
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/ItemToggleOnTriggerComponent.cs
@@ -0,0 +1,37 @@
+using Content.Shared.Item.ItemToggle.Components;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will toggle an item when triggered. Requires <see cref="ItemToggleComponent"/>.
+/// If TargetUser is true and they have that component they will be toggled instead.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class ItemToggleOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// Can the item be toggled on using the trigger?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool CanActivate = true;
+
+    /// <summary>
+    /// Can the item be toggled on using the trigger?
+    /// If both this and CanActivate are true then the trigger will toggle between states.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool CanDeactivate = true;
+
+    /// <summary>
+    /// Can the audio and popups be predicted?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Predicted = true;
+
+    /// <summary>
+    /// Show a popup to the user when toggling the item?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool ShowPopup = true;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/PolymorphOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/PolymorphOnTriggerComponent.cs
new file mode 100644
index 0000000000..3d2021e425
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/PolymorphOnTriggerComponent.cs
@@ -0,0 +1,19 @@
+using Content.Shared.Polymorph;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Polymorphs the enity when triggered.
+/// If TargetUser is true it will polymorph the user instead.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class PolymorphOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// Polymorph settings.
+    /// </summary>
+    [DataField(required: true)]
+    public ProtoId<PolymorphPrototype> Polymorph;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/RattleOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/RattleOnTriggerComponent.cs
new file mode 100644
index 0000000000..fa1175c3cb
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/RattleOnTriggerComponent.cs
@@ -0,0 +1,30 @@
+using Content.Shared.Mobs;
+using Content.Shared.Radio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Sends an emergency message over coms when triggered giving information about the entity's mob status.
+/// If TargetUser is true then the user's mob state will be used instead.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class RattleOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// The radio channel the message will be sent to.
+    /// </summary>
+    [DataField]
+    public ProtoId<RadioChannelPrototype> RadioChannel = "Syndicate";
+
+    /// <summary>
+    /// The message to be send depending on the target's current mob state.
+    /// </summary>
+    [DataField]
+    public Dictionary<MobState, LocId> Messages = new()
+    {
+        {MobState.Critical, "rattle-on-trigger-critical-message"},
+        {MobState.Dead, "rattle-on-trigger-dead-message"}
+    };
+}
diff --git a/Content.Shared/Explosion/Components/OnTrigger/ReleaseGasOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/ReleaseGasOnTriggerComponent.cs
similarity index 90%
rename from Content.Shared/Explosion/Components/OnTrigger/ReleaseGasOnTriggerComponent.cs
rename to Content.Shared/Trigger/Components/Effects/ReleaseGasOnTriggerComponent.cs
index 28a5c5cf81..4edd5f83f4 100644
--- a/Content.Shared/Explosion/Components/OnTrigger/ReleaseGasOnTriggerComponent.cs
+++ b/Content.Shared/Trigger/Components/Effects/ReleaseGasOnTriggerComponent.cs
@@ -1,18 +1,16 @@
 using Content.Shared.Atmos;
-using Content.Shared.Explosion.EntitySystems;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
-namespace Content.Shared.Explosion.Components.OnTrigger;
+namespace Content.Shared.Trigger.Components.Effects;
 
 /// <summary>
 /// Contains a GasMixture that will release its contents to the atmosphere when triggered.
 /// </summary>
 [RegisterComponent, NetworkedComponent]
-[AutoGenerateComponentPause]
-[Access(typeof(SharedReleaseGasOnTriggerSystem))]
-public sealed partial class ReleaseGasOnTriggerComponent : Component
+[AutoGenerateComponentState, AutoGenerateComponentPause]
+public sealed partial class ReleaseGasOnTriggerComponent : BaseXOnTriggerComponent
 {
     /// <summary>
     /// Whether this grenade is active and releasing gas.
diff --git a/Content.Shared/Explosion/Components/OnTrigger/SharedRepulseAttractOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/RepulseAttractOnTriggerComponent.cs
similarity index 57%
rename from Content.Shared/Explosion/Components/OnTrigger/SharedRepulseAttractOnTriggerComponent.cs
rename to Content.Shared/Trigger/Components/Effects/RepulseAttractOnTriggerComponent.cs
index 43febff03b..68af0bb544 100644
--- a/Content.Shared/Explosion/Components/OnTrigger/SharedRepulseAttractOnTriggerComponent.cs
+++ b/Content.Shared/Trigger/Components/Effects/RepulseAttractOnTriggerComponent.cs
@@ -1,37 +1,39 @@
 using Content.Shared.Physics;
 using Content.Shared.Whitelist;
+using Robust.Shared.GameStates;
 
-namespace Content.Shared.Explosion.Components.OnTrigger;
+namespace Content.Shared.Trigger.Components.Effects;
 
 /// <summary>
-/// Generates a gravity pulse/repulse using the RepulseAttractComponent when the entity is triggered
+/// Generates a gravity pulse/repulse using the RepulseAttractComponent around the entity when triggered.
+/// If TargetUser is true their location will be used instead.
 /// </summary>
-[RegisterComponent]
-public sealed partial class SharedRepulseAttractOnTriggerComponent : Component
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class RepulseAttractOnTriggerComponent : BaseXOnTriggerComponent
 {
     /// <summary>
     /// How fast should the Repulsion/Attraction be?
-    /// A positive value will repulse objects, a negative value will attract
+    /// A positive value will repulse objects, a negative value will attract.
     /// </summary>
-    [DataField]
-    public float Speed;
+    [DataField, AutoNetworkedField]
+    public float Speed = 5.0f;
 
     /// <summary>
     /// How close do the entities need to be?
     /// </summary>
-    [DataField]
-    public float Range;
+    [DataField, AutoNetworkedField]
+    public float Range = 5.0f;
 
     /// <summary>
     /// What kind of entities should this effect apply to?
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public EntityWhitelist? Whitelist;
 
     /// <summary>
     /// What collision layers should be excluded?
     /// The default excludes ghost mobs, revenants, the AI camera etc.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public CollisionGroup CollisionMask = CollisionGroup.GhostImpassable;
 }
diff --git a/Content.Shared/Trigger/Components/Effects/ScramOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/ScramOnTriggerComponent.cs
new file mode 100644
index 0000000000..bacf0f69e8
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/ScramOnTriggerComponent.cs
@@ -0,0 +1,25 @@
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Randomly teleports the entity when triggered.
+/// If TargetUser is true the user will be teleported instead.
+/// Used for scram implants.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class ScramOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// Up to how far to teleport the entity.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float TeleportRadius = 100f;
+
+    /// <summary>
+    /// the sound to play when teleporting.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public SoundSpecifier TeleportSound = new SoundPathSpecifier("/Audio/Effects/teleport_arrival.ogg");
+}
diff --git a/Content.Shared/Trigger/Components/Effects/ShockOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/ShockOnTriggerComponent.cs
new file mode 100644
index 0000000000..e7da7a3801
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/ShockOnTriggerComponent.cs
@@ -0,0 +1,34 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will electrocute the entity when triggered.
+/// If TargetUser is true it will electrocute the user instead.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class ShockOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// Electrocute entity containing this entity instead (for example for wearable clothing).
+    /// Has priority over TargetUser.
+    /// </summary>
+    /// <remarks>
+    /// TODO: Make this more generic so it can be used for all triggers.
+    /// Maybe a BeforeTriggerEvent where we modify the target.
+    /// </remarks>
+    [DataField, AutoNetworkedField]
+    public bool TargetContainer;
+
+    /// <summary>
+    /// The force of an electric shock when the trigger is triggered.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public int Damage = 5;
+
+    /// <summary>
+    /// Duration of electric shock when the trigger is triggered.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan Duration = TimeSpan.FromSeconds(2);
+}
diff --git a/Content.Shared/Trigger/Components/Effects/SignalOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/SignalOnTriggerComponent.cs
new file mode 100644
index 0000000000..0698f2ca33
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/SignalOnTriggerComponent.cs
@@ -0,0 +1,18 @@
+using Content.Shared.DeviceLinking;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Sends a device link signal when triggered.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class SignalOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// The port that gets signaled when the switch turns on.
+    /// </summary>
+    [DataField]
+    public ProtoId<SourcePortPrototype> Port = "Trigger";
+}
diff --git a/Content.Shared/Explosion/Components/OnTrigger/SmokeOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/SmokeOnTriggerComponent.cs
similarity index 59%
rename from Content.Shared/Explosion/Components/OnTrigger/SmokeOnTriggerComponent.cs
rename to Content.Shared/Trigger/Components/Effects/SmokeOnTriggerComponent.cs
index 1138e74af8..07a5bad056 100644
--- a/Content.Shared/Explosion/Components/OnTrigger/SmokeOnTriggerComponent.cs
+++ b/Content.Shared/Trigger/Components/Effects/SmokeOnTriggerComponent.cs
@@ -1,34 +1,34 @@
-using Content.Shared.Explosion.EntitySystems;
 using Content.Shared.Chemistry.Components;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
-namespace Content.Shared.Explosion.Components;
+namespace Content.Shared.Trigger.Components.Effects;
 
 /// <summary>
 /// Creates a smoke cloud when triggered, with an optional solution to include in it.
-/// No sound is played incase a grenade is stealthy, use <see cref="SoundOnTriggerComponent"/> if you want a sound.
+/// No sound is played incase a grenade is stealthy, use <see cref="EmitSoundOnTriggerComponent"/> if you want a sound.
+/// If TargetUser is true the smoke is spawned at their location.
 /// </summary>
-[RegisterComponent, NetworkedComponent, Access(typeof(SharedSmokeOnTriggerSystem))]
-public sealed partial class SmokeOnTriggerComponent : Component
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class SmokeOnTriggerComponent : BaseXOnTriggerComponent
 {
     /// <summary>
-    /// How long the smoke stays for, after it has spread.
+    /// How long the smoke stays for, after it has spread (in seconds).
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float Duration = 10;
+    [DataField, AutoNetworkedField]
+    public TimeSpan Duration = TimeSpan.FromSeconds(10);
 
     /// <summary>
     /// How much the smoke will spread.
     /// </summary>
-    [DataField(required: true), ViewVariables(VVAccess.ReadWrite)]
+    [DataField(required: true), AutoNetworkedField]
     public int SpreadAmount;
 
     /// <summary>
     /// Smoke entity to spawn.
     /// Defaults to smoke but you can use foam if you want.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField, AutoNetworkedField]
     public EntProtoId SmokePrototype = "Smoke";
 
     /// <summary>
@@ -37,6 +37,6 @@ public sealed partial class SmokeOnTriggerComponent : Component
     /// <remarks>
     /// When using repeating trigger this essentially gets multiplied so dont do anything crazy like omnizine or lexorin.
     /// </remarks>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField, AutoNetworkedField]
     public Solution Solution = new();
 }
diff --git a/Content.Shared/Trigger/Components/Effects/SpawnOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/SpawnOnTriggerComponent.cs
new file mode 100644
index 0000000000..782626f479
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/SpawnOnTriggerComponent.cs
@@ -0,0 +1,31 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Spawns a protoype when triggered.
+/// If TargetUser is true it will be spawned at their location.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class SpawnOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// The prototype to spawn.
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
+    public EntProtoId Proto = string.Empty;
+
+    /// <summary>
+    /// Use MapCoordinates for spawning?
+    /// Set to true if you don't want the new entity parented to the spawner.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool UseMapCoords;
+
+    /// <summary>
+    /// Whether or not to use predicted spawning.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Predicted;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/SpeakOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/SpeakOnTriggerComponent.cs
new file mode 100644
index 0000000000..8fe6927046
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/SpeakOnTriggerComponent.cs
@@ -0,0 +1,26 @@
+using Content.Shared.Dataset;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Makes the entity speak a message when triggered.
+/// If TargetUser is true then they will be forced to speak instead.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class SpeakOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// The text to speak. This has priority over Pack.
+    /// </summary>
+    [DataField]
+    public LocId? Text;
+
+    /// <summary>
+    /// The identifier for the dataset prototype containing messages to be spoken by this entity.
+    /// The spoken text will be picked randomly from it.
+    /// </summary>
+    [DataField]
+    public ProtoId<LocalizedDatasetPrototype>? Pack;
+}
diff --git a/Content.Shared/Trigger/Components/Effects/UncuffOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/UncuffOnTriggerComponent.cs
new file mode 100644
index 0000000000..770882f3e6
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/UncuffOnTriggerComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Removes a pair of handcuffs from the entity.
+/// If TargetUser is true the user will be uncuffed instead.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class UncuffOnTriggerComponent : BaseXOnTriggerComponent;
diff --git a/Content.Shared/Trigger/Components/Effects/UseDelayOnTriggerComponent.cs b/Content.Shared/Trigger/Components/Effects/UseDelayOnTriggerComponent.cs
new file mode 100644
index 0000000000..4d43c2860b
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Effects/UseDelayOnTriggerComponent.cs
@@ -0,0 +1,26 @@
+using Content.Shared.Timing;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Effects;
+
+/// <summary>
+/// Will activate an UseDelay on the target when triggered.
+/// </summary>
+/// <remarks>
+/// TODO: Support specific UseDelay IDs for each trigger key.
+/// </remarks>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class UseDelayOnTriggerComponent : BaseXOnTriggerComponent
+{
+    /// <summary>
+    /// The UseDelay Id to delay.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public string UseDelayId = UseDelaySystem.DefaultId;
+
+    /// <summary>
+    /// If true ongoing delays won't be reset.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool CheckDelayed;
+}
diff --git a/Content.Server/Explosion/Components/RandomTimerTriggerComponent.cs b/Content.Shared/Trigger/Components/RandomTimerTriggerComponent.cs
similarity index 50%
rename from Content.Server/Explosion/Components/RandomTimerTriggerComponent.cs
rename to Content.Shared/Trigger/Components/RandomTimerTriggerComponent.cs
index 3863b9c313..89b5535854 100644
--- a/Content.Server/Explosion/Components/RandomTimerTriggerComponent.cs
+++ b/Content.Shared/Trigger/Components/RandomTimerTriggerComponent.cs
@@ -1,22 +1,22 @@
-using Content.Server.Explosion.EntitySystems;
+using Robust.Shared.GameStates;
 
-namespace Content.Server.Explosion.Components;
+namespace Content.Shared.Trigger.Components;
 
 /// <summary>
-/// This is used for randomizing a <see cref="RandomTimerTriggerComponent"/> on MapInit
+/// This is used for randomizing a <see cref="TimerTriggerComponent"/> on MapInit.
 /// </summary>
-[RegisterComponent, Access(typeof(TriggerSystem))]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class RandomTimerTriggerComponent : Component
 {
     /// <summary>
     /// The minimum random trigger time.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public float Min;
 
     /// <summary>
     /// The maximum random trigger time.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public float Max;
 }
diff --git a/Content.Shared/Trigger/Components/TimerTriggerComponent.cs b/Content.Shared/Trigger/Components/TimerTriggerComponent.cs
new file mode 100644
index 0000000000..9cc58d3cda
--- /dev/null
+++ b/Content.Shared/Trigger/Components/TimerTriggerComponent.cs
@@ -0,0 +1,109 @@
+using Content.Shared.Guidebook;
+using Content.Shared.Trigger.Systems;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+using System.Linq;
+
+namespace Content.Shared.Trigger.Components;
+
+/// <summary>
+/// Starts a timer when activated by a trigger.
+/// Will cause a different trigger once the time is over.
+/// Can play a sound while the timer is active.
+/// The time can be set by other components, for example <see cref="RandomTimerTriggerComponent"/>.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
+public sealed partial class TimerTriggerComponent : Component
+{
+    /// <summary>
+    /// The keys that will activate the timer.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public List<string> KeysIn = new() { TriggerSystem.DefaultTriggerKey };
+
+    /// <summary>
+    /// The key that will trigger once the timer is finished.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public string? KeyOut = "timer";
+
+    /// <summary>
+    /// The time after which this timer will trigger after it is activated.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan Delay = TimeSpan.FromSeconds(1);
+
+    /// <summary>
+    /// If not empty, a user can use verbs to configure the delay to one of these options.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public List<TimeSpan> DelayOptions = new();
+
+    /// <summary>
+    /// The time at which this trigger will activate.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan NextTrigger = TimeSpan.Zero;
+
+    /// <summary>
+    /// Time of the next beeping sound.
+    /// </summary>
+    /// <remarks>
+    /// Not networked because it's only used server side.
+    /// </remarks>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
+    public TimeSpan NextBeep = TimeSpan.Zero;
+
+    /// <summary>
+    /// Initial beep delay.
+    /// Defaults to a single BeepInterval if null.
+    /// </summary>
+    /// <remarks>
+    /// Not networked because it's only used server side.
+    /// </remarks>
+    [DataField]
+    public TimeSpan? InitialBeepDelay;
+
+    /// <summary>
+    /// The time between beeps.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan BeepInterval = TimeSpan.FromSeconds(1);
+
+    /// <summary>
+    /// The entity that activated this trigger.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityUid? User;
+
+    /// <summary>
+    /// The beeping sound, if any.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public SoundSpecifier? BeepSound;
+
+    /// <summary>
+    /// Whether you can examine the item to see its timer or not.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Examinable = true;
+
+    /// <summary>
+    /// The popup to show the user when starting the timer, if any.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public LocId? Popup = "timer-trigger-activated";
+
+    #region GuidebookData
+
+    [GuidebookData]
+    public float? ShortestDelayOption => DelayOptions.Count == 0 ? null : (float)DelayOptions.Min().TotalSeconds;
+
+    [GuidebookData]
+    public float? LongestDelayOption => DelayOptions.Count == 0 ? null : (float)DelayOptions.Max().TotalSeconds;
+
+    #endregion GuidebookData
+}
diff --git a/Content.Shared/Trigger/Components/Triggers/ActiveTriggerOnTimedCollideComponent.cs b/Content.Shared/Trigger/Components/Triggers/ActiveTriggerOnTimedCollideComponent.cs
new file mode 100644
index 0000000000..88b68913f0
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/ActiveTriggerOnTimedCollideComponent.cs
@@ -0,0 +1,6 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class ActiveTriggerOnTimedCollideComponent : Component;
diff --git a/Content.Shared/Trigger/Components/Triggers/BaseTriggerOnXComponent.cs b/Content.Shared/Trigger/Components/Triggers/BaseTriggerOnXComponent.cs
new file mode 100644
index 0000000000..1f4807f253
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/BaseTriggerOnXComponent.cs
@@ -0,0 +1,16 @@
+using Content.Shared.Trigger.Systems;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Base class for components that cause a trigger to be activated.
+/// </summary>
+public abstract partial class BaseTriggerOnXComponent : Component
+{
+    /// <summary>
+    /// The key that the trigger will activate.
+    /// null will activate all triggers.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public string? KeyOut = TriggerSystem.DefaultTriggerKey;
+}
diff --git a/Content.Server/Explosion/Components/RepeatingTriggerComponent.cs b/Content.Shared/Trigger/Components/Triggers/RepeatingTriggerComponent.cs
similarity index 56%
rename from Content.Server/Explosion/Components/RepeatingTriggerComponent.cs
rename to Content.Shared/Trigger/Components/Triggers/RepeatingTriggerComponent.cs
index cc08de53f9..27527d7773 100644
--- a/Content.Server/Explosion/Components/RepeatingTriggerComponent.cs
+++ b/Content.Shared/Trigger/Components/Triggers/RepeatingTriggerComponent.cs
@@ -1,25 +1,26 @@
-using Content.Server.Explosion.EntitySystems;
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
-namespace Content.Server.Explosion.Components;
+namespace Content.Shared.Trigger.Components.Triggers;
 
 /// <summary>
 /// Constantly triggers after being added to an entity.
 /// </summary>
-[RegisterComponent, Access(typeof(TriggerSystem))]
-[AutoGenerateComponentPause]
-public sealed partial class RepeatingTriggerComponent : Component
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState, AutoGenerateComponentPause]
+public sealed partial class RepeatingTriggerComponent : BaseTriggerOnXComponent
 {
     /// <summary>
     /// How long to wait between triggers.
     /// The first trigger starts this long after the component is added.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public TimeSpan Delay = TimeSpan.FromSeconds(1);
 
     /// <summary>
     /// When the next trigger will be.
     /// </summary>
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
-    public TimeSpan NextTrigger;
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan NextTrigger = TimeSpan.Zero;
 }
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnActivateComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnActivateComponent.cs
new file mode 100644
index 0000000000..9dd145bb26
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnActivateComponent.cs
@@ -0,0 +1,17 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers when activated in hand or by clicking on the entity.
+/// The user is the player activating it.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnActivateComponent : BaseTriggerOnXComponent
+{
+    /// <summary>
+    /// Is this interaction a complex interaction?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool RequireComplex = true;
+}
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnActivateImplantComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnActivateImplantComponent.cs
new file mode 100644
index 0000000000..b26f3b6875
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnActivateImplantComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers when activating an action granted by an implant.
+/// The user is the player activating it.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnActivateImplantComponent : BaseTriggerOnXComponent;
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnCollideComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnCollideComponent.cs
new file mode 100644
index 0000000000..a1e234bd7a
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnCollideComponent.cs
@@ -0,0 +1,23 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers when colliding with another entity.
+/// The user is the entity collided with.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnCollideComponent : BaseTriggerOnXComponent
+{
+    /// <summary>
+    /// The fixture with which to collide.
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
+    public string FixtureID = string.Empty;
+
+    /// <summary>
+    /// Doesn't trigger if the other colliding fixture is nonhard.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool IgnoreOtherNonHard = true;
+}
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnEmptyGunshotComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnEmptyGunshotComponent.cs
new file mode 100644
index 0000000000..40d468ec30
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnEmptyGunshotComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers when attempting to shoot a gun while it's empty.
+/// The user is the player holding the gun.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnEmptyGunshotComponent : BaseTriggerOnXComponent;
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnMobstateChangeComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnMobstateChangeComponent.cs
new file mode 100644
index 0000000000..a8dab4e6cd
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnMobstateChangeComponent.cs
@@ -0,0 +1,35 @@
+using Content.Shared.Mobs;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers when this entity's mob state changes.
+/// The user is the entity that caused the state change or the owner depending on the settings.
+/// If added to an implant it will trigger when the implanted entity's mob state changes.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnMobstateChangeComponent : BaseTriggerOnXComponent
+{
+    /// <summary>
+    /// What states should trigger this?
+    /// </summary>
+    [DataField(required: true), AutoNetworkedField]
+    public List<MobState> MobState = new();
+
+    /// <summary>
+    /// If true, prevents suicide attempts for the trigger to prevent cheese.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool PreventSuicide = false;
+
+    /// <summary>
+    /// If false, the trigger user will be the entity that caused the mobstate to change.
+    /// If true, the trigger user will the entity that changed its mob state.
+    /// </summary>
+    /// <summary>
+    /// Set this to true for implants that apply an effect on the implanted entity.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool TargetMobstateEntity = true;
+}
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnProximityComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnProximityComponent.cs
new file mode 100644
index 0000000000..047d6f0374
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnProximityComponent.cs
@@ -0,0 +1,91 @@
+using Content.Shared.Physics;
+using Robust.Shared.GameStates;
+using Robust.Shared.Physics.Collision.Shapes;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Physics.Dynamics;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers whenever an entity collides with a fixture attached to the owner of this component.
+/// The user is the entity that collided with the fixture.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState, AutoGenerateComponentPause]
+public sealed partial class TriggerOnProximityComponent : BaseTriggerOnXComponent
+{
+    /// <summary>
+    /// The ID if the fixture that is observed for collisions.
+    /// </summary>
+    public const string FixtureID = "trigger-on-proximity-fixture";
+
+    /// <summary>
+    /// Currently colliding entities.
+    /// </summary>
+    [ViewVariables]
+    public readonly Dictionary<EntityUid, PhysicsComponent> Colliding = new();
+
+    /// <summary>
+    /// What is the shape of the proximity fixture?
+    /// </summary>
+    [ViewVariables]
+    [DataField]
+    public IPhysShape Shape = new PhysShapeCircle(2f);
+
+    /// <summary>
+    /// How long the the proximity trigger animation plays for.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan AnimationDuration = TimeSpan.FromSeconds(0.6f);
+
+    /// <summary>
+    /// Whether the entity needs to be anchored for the proximity to work.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool RequiresAnchored = true;
+
+    /// <summary>
+    /// Whether the proximity trigger is currently enabled.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Enabled = true;
+
+    /// <summary>
+    /// The minimum delay between repeating triggers.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan Cooldown = TimeSpan.FromSeconds(5);
+
+    /// <summary>
+    /// When can the trigger run again?
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan NextTrigger = TimeSpan.Zero;
+
+    /// <summary>
+    /// When will the visual state be updated again after activation?
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan NextVisualUpdate = TimeSpan.Zero;
+
+    /// <summary>
+    /// What speed should the other object be moving at to trigger the proximity fixture?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float TriggerSpeed = 3.5f;
+
+    /// <summary>
+    /// If this proximity is triggered should we continually repeat it?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Repeating = true;
+
+    /// <summary>
+    /// What layer is the trigger fixture on?
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(FlagSerializer<CollisionLayer>))]
+    public int Layer = (int)(CollisionGroup.MidImpassable | CollisionGroup.LowImpassable | CollisionGroup.HighImpassable);
+}
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnSignalComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnSignalComponent.cs
new file mode 100644
index 0000000000..6ed81c5fcf
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnSignalComponent.cs
@@ -0,0 +1,19 @@
+using Content.Shared.DeviceLinking;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Sends a trigger when signal is received.
+/// The user is the sender of the signal.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnSignalComponent : BaseTriggerOnXComponent
+{
+    /// <summary>
+    /// The sink port prototype we can connect devices to.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public ProtoId<SinkPortPrototype> Port = "Trigger";
+}
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnSlipComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnSlipComponent.cs
new file mode 100644
index 0000000000..b0381ee74e
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnSlipComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers an entity when someone slipped on it.
+/// The user is the entity that was slipped.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnSlipComponent : BaseTriggerOnXComponent;
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnSpawnComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnSpawnComponent.cs
new file mode 100644
index 0000000000..c718a20148
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnSpawnComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers when the entity is initialized.
+/// The user is null.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnSpawnComponent : BaseTriggerOnXComponent;
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnStepTriggerComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnStepTriggerComponent.cs
new file mode 100644
index 0000000000..70d33a1179
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnStepTriggerComponent.cs
@@ -0,0 +1,14 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers if a StepTrigger is activated by someone stepping on this entity.
+/// The user is the mob who stepped on it.
+/// </summary>
+/// <remarks>
+/// This is used for entities that want the more generic 'trigger' behavior after a step trigger occurs.
+/// Not done by default, since it's not useful for everything and might cause weird behavior. But it is useful for a lot of stuff like mousetraps.
+/// </remarks>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnStepTriggerComponent : BaseTriggerOnXComponent;
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnStuckComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnStuckComponent.cs
new file mode 100644
index 0000000000..073a64f66e
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnStuckComponent.cs
@@ -0,0 +1,11 @@
+using Content.Shared.Sticky.Components;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers when an entity with <see cref="StickyComponent"/> is stuck to something.
+/// The user is the player doing so.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnStuckComponent : BaseTriggerOnXComponent;
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnTimedCollideComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnTimedCollideComponent.cs
new file mode 100644
index 0000000000..185ea7dbe4
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnTimedCollideComponent.cs
@@ -0,0 +1,26 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers when the entity is overlapped for the specified duration.
+/// The user is the entity that passes the time threshold while colliding.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnTimedCollideComponent : BaseTriggerOnXComponent
+{
+    /// <summary>
+    /// The time an entity has to collide until the trigger is activated.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan Threshold = TimeSpan.FromSeconds(1);
+
+    /// <summary>
+    /// A collection of entities that are currently colliding with this, and their own unique accumulator.
+    /// </summary>
+    /// <remarks>
+    /// TODO: Add AutoPausedField and (de)serialize values as time offsets when https://github.com/space-wizards/RobustToolbox/issues/3768 is fixed.
+    /// </remarks>
+    [DataField, AutoNetworkedField]
+    public Dictionary<EntityUid, TimeSpan> Colliding = new();
+}
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnUseComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnUseComponent.cs
new file mode 100644
index 0000000000..71d289741e
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnUseComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Triggers on use in hand.
+/// The user is the player holding the item.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnUseComponent : BaseTriggerOnXComponent;
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnVerb.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnVerb.cs
new file mode 100644
index 0000000000..463860f077
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnVerb.cs
@@ -0,0 +1,20 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Starts a trigger when a verb is selected.
+/// The user is the player selecting the verb.
+/// </summary>
+/// <remarks>
+/// TODO: Support multiple verbs and trigger keys.
+/// </remarks>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnVerbComponent : BaseTriggerOnXComponent
+{
+    /// <summary>
+    /// The text to display in the verb.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public LocId Text = "trigger-on-verb-default";
+}
diff --git a/Content.Shared/Trigger/Components/Triggers/TriggerOnVoiceComponent.cs b/Content.Shared/Trigger/Components/Triggers/TriggerOnVoiceComponent.cs
new file mode 100644
index 0000000000..a36992d7da
--- /dev/null
+++ b/Content.Shared/Trigger/Components/Triggers/TriggerOnVoiceComponent.cs
@@ -0,0 +1,47 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Trigger.Components.Triggers;
+
+/// <summary>
+/// Sends a trigger when the keyphrase is heard.
+/// The User is the speaker.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TriggerOnVoiceComponent : BaseTriggerOnXComponent
+{
+    /// <summary>
+    /// Whether or not the component is actively listening at the moment.
+    /// </summary>
+    [ViewVariables]
+    public bool IsListening => IsRecording || !string.IsNullOrWhiteSpace(KeyPhrase);
+
+    /// <summary>
+    /// The keyphrase that has been set to trigger it.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public string? KeyPhrase;
+
+    /// <summary>
+    /// Range in which we listen for the keyphrase.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public int ListenRange = 4;
+
+    /// <summary>
+    /// Whether we are currently recording a new keyphrase.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool IsRecording;
+
+    /// <summary>
+    /// Minimum keyphrase length.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public int MinLength = 3;
+
+    /// <summary>
+    /// Maximum keyphrase length.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public int MaxLength = 50;
+}
diff --git a/Content.Shared/Trigger/Components/TwoStageTriggerComponent.cs b/Content.Shared/Trigger/Components/TwoStageTriggerComponent.cs
new file mode 100644
index 0000000000..f0161c7175
--- /dev/null
+++ b/Content.Shared/Trigger/Components/TwoStageTriggerComponent.cs
@@ -0,0 +1,58 @@
+using Content.Shared.Trigger.Systems;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.Trigger.Components;
+
+/// <summary>
+/// After being triggered applies the specified components and runs triggers again.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState, AutoGenerateComponentPause]
+public sealed partial class TwoStageTriggerComponent : Component
+{
+    /// <summary>
+    /// The keys that will activate the timer and add the given components (first stage).
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public List<string> KeysIn = new() { TriggerSystem.DefaultTriggerKey };
+
+    /// <summary>
+    /// The key that will trigger once the timer is finished (second stage).
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public string? KeyOut = "stageTwo";
+
+    /// <summary>
+    /// How long it takes for the second stage to be triggered.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan TriggerDelay = TimeSpan.FromSeconds(10);
+
+    /// <summary>
+    /// This list of components that will be added on the first trigger.
+    /// </summary>
+    [DataField(required: true)]
+    public ComponentRegistry Components = new();
+
+    /// <summary>
+    /// The time at which the second stage will trigger.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan? NextTriggerTime;
+
+    /// <summary>
+    /// Has this entity been triggered already?
+    /// Used to prevent the components from being added multiple times.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Triggered = false;
+
+    /// <summary>
+    /// The entity that activated this trigger.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityUid? User;
+}
diff --git a/Content.Shared/Trigger/Systems/AddComponentsOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/AddComponentsOnTriggerSystem.cs
new file mode 100644
index 0000000000..908307dad0
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/AddComponentsOnTriggerSystem.cs
@@ -0,0 +1,33 @@
+using Content.Shared.Trigger.Components.Effects;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class AddComponentsOnTriggerSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<AddComponentsOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<AddComponentsOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        if (ent.Comp.TriggerOnce && ent.Comp.Triggered)
+            return;
+
+        EntityManager.AddComponents(target.Value, ent.Comp.Components, ent.Comp.RemoveExisting);
+        ent.Comp.Triggered = true;
+        Dirty(ent);
+
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/DamageOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/DamageOnTriggerSystem.cs
new file mode 100644
index 0000000000..8f30c852ea
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/DamageOnTriggerSystem.cs
@@ -0,0 +1,40 @@
+using Content.Shared.Damage;
+using Content.Shared.Trigger.Components.Effects;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class DamageOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly DamageableSystem _damageableSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DamageOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<DamageOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        var damage = new DamageSpecifier(ent.Comp.Damage);
+        var ev = new BeforeDamageOnTriggerEvent(damage, target.Value);
+        RaiseLocalEvent(ent.Owner, ref ev);
+
+        args.Handled |= _damageableSystem.TryChangeDamage(target, ev.Damage, ent.Comp.IgnoreResistances, origin: ent.Owner) is not null;
+    }
+}
+
+/// <summary>
+/// Raised on an entity before it deals damage using DamageOnTriggerComponent.
+/// Used to modify the damage that will be dealt.
+/// </summary>
+[ByRefEvent]
+public record struct BeforeDamageOnTriggerEvent(DamageSpecifier Damage, EntityUid Tripper);
diff --git a/Content.Shared/Trigger/Systems/DnaScrambleOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/DnaScrambleOnTriggerSystem.cs
new file mode 100644
index 0000000000..246c6a8c7a
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/DnaScrambleOnTriggerSystem.cs
@@ -0,0 +1,62 @@
+using Content.Shared.DetailExaminable;
+using Content.Shared.Forensics.Systems;
+using Content.Shared.Humanoid;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Preferences;
+using Content.Shared.Popups;
+using Content.Shared.Trigger.Components.Effects;
+using Robust.Shared.Network;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class DnaScrambleOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly MetaDataSystem _metaData = default!;
+    [Dependency] private readonly SharedHumanoidAppearanceSystem _humanoidAppearance = default!;
+    [Dependency] private readonly SharedIdentitySystem _identity = default!;
+    [Dependency] private readonly SharedForensicsSystem _forensics = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly INetManager _net = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DnaScrambleOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<DnaScrambleOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        if (!TryComp<HumanoidAppearanceComponent>(target, out var humanoid))
+            return;
+
+        args.Handled = true;
+
+        // Randomness will mispredict
+        // and LoadProfile causes a debug assert on the client at the moment.
+        if (_net.IsClient)
+            return;
+
+        var newProfile = HumanoidCharacterProfile.RandomWithSpecies(humanoid.Species);
+        _humanoidAppearance.LoadProfile(target.Value, newProfile, humanoid);
+        _metaData.SetEntityName(target.Value, newProfile.Name, raiseEvents: false); // raising events would update ID card, station record, etc.
+
+        // If the entity has the respective components, then scramble the dna and fingerprint strings.
+        _forensics.RandomizeDNA(target.Value);
+        _forensics.RandomizeFingerprint(target.Value);
+
+        RemComp<DetailExaminableComponent>(target.Value); // remove MRP+ custom description if one exists
+        _identity.QueueIdentityUpdate(target.Value); // manually queue identity update since we don't raise the event
+
+        // Can't use PopupClient or PopupPredicted because the trigger might be unpredicted.
+        _popup.PopupEntity(Loc.GetString("scramble-on-trigger-popup"), target.Value, target.Value);
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/EmitSoundOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/EmitSoundOnTriggerSystem.cs
new file mode 100644
index 0000000000..e296ccc177
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/EmitSoundOnTriggerSystem.cs
@@ -0,0 +1,55 @@
+using Content.Shared.Trigger.Components.Effects;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Network;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class EmitSoundOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly INetManager _netMan = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<EmitSoundOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<EmitSoundOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        args.Handled |= TryEmitSound(ent, target.Value, args.User);
+    }
+
+    private bool TryEmitSound(Entity<EmitSoundOnTriggerComponent> ent, EntityUid target, EntityUid? user = null)
+    {
+        if (ent.Comp.Sound == null)
+            return false;
+
+        if (ent.Comp.Positional)
+        {
+            var coords = Transform(target).Coordinates;
+            if (ent.Comp.Predicted)
+                _audio.PlayPredicted(ent.Comp.Sound, coords, user);
+            else if (_netMan.IsServer)
+                _audio.PlayPvs(ent.Comp.Sound, coords);
+        }
+        else
+        {
+            if (ent.Comp.Predicted)
+                _audio.PlayPredicted(ent.Comp.Sound, target, user);
+            else if (_netMan.IsServer)
+                _audio.PlayPvs(ent.Comp.Sound, target);
+        }
+
+        return true;
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/EmpOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/EmpOnTriggerSystem.cs
new file mode 100644
index 0000000000..136c4474a2
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/EmpOnTriggerSystem.cs
@@ -0,0 +1,31 @@
+using Content.Shared.Emp;
+using Content.Shared.Trigger.Components.Effects;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class EmpOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly SharedEmpSystem _emp = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<EmpOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<EmpOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        _emp.EmpPulse(_transform.GetMapCoordinates(target.Value), ent.Comp.Range, ent.Comp.EnergyConsumption, (float)ent.Comp.DisableDuration.TotalSeconds);
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/ExplodeOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/ExplodeOnTriggerSystem.cs
new file mode 100644
index 0000000000..1c773b79a6
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/ExplodeOnTriggerSystem.cs
@@ -0,0 +1,30 @@
+using Content.Shared.Explosion.EntitySystems;
+using Content.Shared.Trigger.Components.Effects;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class ExplodeOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly SharedExplosionSystem _explosion = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ExplodeOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<ExplodeOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        _explosion.TriggerExplosive(target.Value, user: args.User);
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/FlashOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/FlashOnTriggerSystem.cs
new file mode 100644
index 0000000000..6153e228bf
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/FlashOnTriggerSystem.cs
@@ -0,0 +1,30 @@
+using Content.Shared.Flash;
+using Content.Shared.Trigger.Components.Effects;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class FlashOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly SharedFlashSystem _flash = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<FlashOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<FlashOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        _flash.FlashArea(target.Value, args.User, ent.Comp.Range, ent.Comp.Duration, probability: ent.Comp.Probability);
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/GibOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/GibOnTriggerSystem.cs
new file mode 100644
index 0000000000..95ef5ec1db
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/GibOnTriggerSystem.cs
@@ -0,0 +1,40 @@
+using Content.Shared.Body.Systems;
+using Content.Shared.Inventory;
+using Content.Shared.Trigger.Components.Effects;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class GibOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly SharedBodySystem _body = default!;
+    [Dependency] private readonly InventorySystem _inventory = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<GibOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<GibOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        if (ent.Comp.DeleteItems)
+        {
+            var items = _inventory.GetHandOrInventoryEntities(target.Value);
+            foreach (var item in items)
+            {
+                PredictedQueueDel(item);
+            }
+        }
+        _body.GibBody(target.Value, true);
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/RepulseAttractOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/RepulseAttractOnTriggerSystem.cs
new file mode 100644
index 0000000000..9bedc87b6b
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/RepulseAttractOnTriggerSystem.cs
@@ -0,0 +1,34 @@
+using Content.Shared.Trigger;
+using Content.Shared.Trigger.Components.Effects;
+using Content.Shared.RepulseAttract;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class RepulseAttractOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly RepulseAttractSystem _repulse = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<RepulseAttractOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<RepulseAttractOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        var position = _transform.GetMapCoordinates(target.Value);
+        _repulse.TryRepulseAttract(position, args.User, ent.Comp.Speed, ent.Comp.Range, ent.Comp.Whitelist, ent.Comp.CollisionMask);
+
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/ScramOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/ScramOnTriggerSystem.cs
new file mode 100644
index 0000000000..163012cec5
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/ScramOnTriggerSystem.cs
@@ -0,0 +1,151 @@
+using System.Numerics;
+using Content.Shared.Movement.Pulling.Components;
+using Content.Shared.Movement.Pulling.Systems;
+using Content.Shared.Physics;
+using Content.Shared.Trigger.Components.Effects;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Network;
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Collections;
+using Robust.Shared.Random;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class ScramOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly PullingSystem _pulling = default!;
+    [Dependency] private readonly EntityLookupSystem _lookup = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedMapSystem _map = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly INetManager _net = default!;
+
+    private EntityQuery<PhysicsComponent> _physicsQuery;
+    private HashSet<Entity<MapGridComponent>> _targetGrids = new();
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ScramOnTriggerComponent, TriggerEvent>(OnTrigger);
+
+        _physicsQuery = GetEntityQuery<PhysicsComponent>();
+    }
+
+    private void OnTrigger(Entity<ScramOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        // We need stop the user from being pulled so they don't just get "attached" with whoever is pulling them.
+        // This can for example happen when the user is cuffed and being pulled.
+        if (TryComp<PullableComponent>(target, out var pull) && _pulling.IsPulled(target.Value, pull))
+            _pulling.TryStopPull(ent, pull);
+
+        // Check if the user is pulling anything, and drop it if so.
+        if (TryComp<PullerComponent>(target, out var puller) && TryComp<PullableComponent>(puller.Pulling, out var pullable))
+            _pulling.TryStopPull(puller.Pulling.Value, pullable);
+
+        _audio.PlayPredicted(ent.Comp.TeleportSound, ent, args.User);
+
+        // Can't predict picking random grids and the target location might be out of PVS range.
+        if (_net.IsClient)
+            return;
+
+        var xform = Transform(target.Value);
+        var targetCoords = SelectRandomTileInRange(xform, ent.Comp.TeleportRadius);
+
+        if (targetCoords != null)
+        {
+            _transform.SetCoordinates(target.Value, targetCoords.Value);
+            args.Handled = true;
+        }
+    }
+
+    private EntityCoordinates? SelectRandomTileInRange(TransformComponent userXform, float radius)
+    {
+        var userCoords = _transform.ToMapCoordinates(userXform.Coordinates);
+        _targetGrids.Clear();
+        _lookup.GetEntitiesInRange(userCoords, radius, _targetGrids);
+        Entity<MapGridComponent>? targetGrid = null;
+
+        if (_targetGrids.Count == 0)
+            return null;
+
+        // Give preference to the grid the entity is currently on.
+        // This does not guarantee that if the probability fails that the owner's grid won't be picked.
+        // In reality the probability is higher and depends on the number of grids.
+        if (userXform.GridUid != null && TryComp<MapGridComponent>(userXform.GridUid, out var gridComp))
+        {
+            var userGrid = new Entity<MapGridComponent>(userXform.GridUid.Value, gridComp);
+            if (_random.Prob(0.5f))
+            {
+                _targetGrids.Remove(userGrid);
+                targetGrid = userGrid;
+            }
+        }
+
+        if (targetGrid == null)
+            targetGrid = _random.GetRandom().PickAndTake(_targetGrids);
+
+        EntityCoordinates? targetCoords = null;
+
+        do
+        {
+            var valid = false;
+
+            var range = (float)Math.Sqrt(radius);
+            var box = Box2.CenteredAround(userCoords.Position, new Vector2(range, range));
+            var tilesInRange = _map.GetTilesEnumerator(targetGrid.Value.Owner, targetGrid.Value.Comp, box, false);
+            var tileList = new ValueList<Vector2i>();
+
+            while (tilesInRange.MoveNext(out var tile))
+            {
+                tileList.Add(tile.GridIndices);
+            }
+
+            while (tileList.Count != 0)
+            {
+                var tile = tileList.RemoveSwap(_random.Next(tileList.Count));
+                valid = true;
+                foreach (var entity in _map.GetAnchoredEntities(targetGrid.Value.Owner, targetGrid.Value.Comp,
+                             tile))
+                {
+                    if (!_physicsQuery.TryGetComponent(entity, out var body))
+                        continue;
+
+                    if (body.BodyType != BodyType.Static ||
+                        !body.Hard ||
+                        (body.CollisionLayer & (int)CollisionGroup.MobMask) == 0)
+                        continue;
+
+                    valid = false;
+                    break;
+                }
+
+                if (valid)
+                {
+                    targetCoords = new EntityCoordinates(targetGrid.Value.Owner,
+                        _map.TileCenterToVector(targetGrid.Value, tile));
+                    break;
+                }
+            }
+
+            if (valid || _targetGrids.Count == 0) // if we don't do the check here then PickAndTake will blow up on an empty set.
+                break;
+
+            targetGrid = _random.GetRandom().PickAndTake(_targetGrids);
+        } while (true);
+
+        return targetCoords;
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/SharedReleaseGasOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/SharedReleaseGasOnTriggerSystem.cs
new file mode 100644
index 0000000000..e1871e0435
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/SharedReleaseGasOnTriggerSystem.cs
@@ -0,0 +1,36 @@
+using Content.Shared.Trigger.Components.Effects;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Trigger.Systems;
+
+/// <summary>
+/// Releases a gas mixture to the atmosphere when triggered.
+/// Can also release gas over a set timespan to prevent trolling people
+/// with the instant-wall-of-pressure-inator.
+/// </summary>
+public abstract class SharedReleaseGasOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ReleaseGasOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    /// <summary>
+    /// Shrimply sets the component to active when triggered, allowing it to release over time.
+    /// </summary>
+    private void OnTrigger(Entity<ReleaseGasOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        ent.Comp.Active = true;
+        ent.Comp.NextReleaseTime = _timing.CurTime;
+        ent.Comp.StartingTotalMoles = ent.Comp.Air.TotalMoles;
+        _appearance.SetData(ent, ReleaseGasOnTriggerVisuals.Key, true);
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/ShockOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/ShockOnTriggerSystem.cs
new file mode 100644
index 0000000000..c4d34af7e1
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/ShockOnTriggerSystem.cs
@@ -0,0 +1,44 @@
+using Content.Shared.Electrocution;
+using Content.Shared.Trigger.Components.Effects;
+using Robust.Shared.Containers;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class ShockOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly SharedContainerSystem _container = default!;
+    [Dependency] private readonly SharedElectrocutionSystem _electrocution = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ShockOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<ShockOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        EntityUid? target;
+        if (ent.Comp.TargetContainer)
+        {
+            // shock whoever is wearing this clothing item
+            if (!_container.TryGetContainingContainer(ent.Owner, out var container))
+                return;
+            target = container.Owner;
+        }
+        else
+        {
+            target = ent.Comp.TargetUser ? args.User : ent.Owner;
+        }
+
+        if (target == null)
+            return;
+
+        _electrocution.TryDoElectrocution(target.Value, null, ent.Comp.Damage, ent.Comp.Duration, true, ignoreInsulation: true);
+        args.Handled = true;
+    }
+
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerOnActivateImplantSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnActivateImplantSystem.cs
new file mode 100644
index 0000000000..3825708550
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerOnActivateImplantSystem.cs
@@ -0,0 +1,22 @@
+using Content.Shared.Implants.Components;
+using Content.Shared.Trigger.Components.Triggers;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerOnActivateImplantSystem : EntitySystem
+{
+    [Dependency] private readonly TriggerSystem _trigger = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TriggerOnActivateImplantComponent, ActivateImplantEvent>(OnActivateImplant);
+    }
+
+    private void OnActivateImplant(Entity<TriggerOnActivateImplantComponent> ent, ref ActivateImplantEvent args)
+    {
+        _trigger.Trigger(ent.Owner, args.Performer, ent.Comp.KeyOut);
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerOnEmptyGunshotSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnEmptyGunshotSystem.cs
new file mode 100644
index 0000000000..cc23fa2b84
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerOnEmptyGunshotSystem.cs
@@ -0,0 +1,20 @@
+using Content.Shared.Trigger.Components.Triggers;
+using Content.Shared.Weapons.Ranged.Events;
+
+namespace Content.Shared.Trigger.Systems;
+public sealed partial class TriggerOnEmptyGunshotSystem : EntitySystem
+{
+    [Dependency] private readonly TriggerSystem _trigger = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TriggerOnEmptyGunshotComponent, OnEmptyGunShotEvent>(OnEmptyGunShot);
+    }
+
+    private void OnEmptyGunShot(Entity<TriggerOnEmptyGunshotComponent> ent, ref OnEmptyGunShotEvent args)
+    {
+        _trigger.Trigger(ent.Owner, args.User, ent.Comp.KeyOut);
+    }
+}
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.Mobstate.cs b/Content.Shared/Trigger/Systems/TriggerOnMobstateChangeSystem.cs
similarity index 56%
rename from Content.Server/Explosion/EntitySystems/TriggerSystem.Mobstate.cs
rename to Content.Shared/Trigger/Systems/TriggerOnMobstateChangeSystem.cs
index ccd2a6e3df..68c109aef9 100644
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.Mobstate.cs
+++ b/Content.Shared/Trigger/Systems/TriggerOnMobstateChangeSystem.cs
@@ -1,20 +1,25 @@
-using Content.Server.Explosion.Components;
-using Content.Shared.Explosion.Components;
-using Content.Shared.Implants;
+using Content.Shared.Implants;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Mobs;
+using Content.Shared.Popups;
+using Content.Shared.Trigger.Components.Triggers;
 
-namespace Content.Server.Explosion.EntitySystems;
+namespace Content.Shared.Trigger.Systems;
 
-public sealed partial class TriggerSystem
+public sealed partial class TriggerOnMobstateChangeSystem : EntitySystem
 {
-    private void InitializeMobstate()
+    [Dependency] private readonly TriggerSystem _trigger = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+
+    public override void Initialize()
     {
+        base.Initialize();
+
         SubscribeLocalEvent<TriggerOnMobstateChangeComponent, MobStateChangedEvent>(OnMobStateChanged);
         SubscribeLocalEvent<TriggerOnMobstateChangeComponent, SuicideEvent>(OnSuicide);
 
-        SubscribeLocalEvent<TriggerOnMobstateChangeComponent, ImplantRelayEvent<SuicideEvent>>(OnSuicideRelay);
         SubscribeLocalEvent<TriggerOnMobstateChangeComponent, ImplantRelayEvent<MobStateChangedEvent>>(OnMobStateRelay);
+        SubscribeLocalEvent<TriggerOnMobstateChangeComponent, ImplantRelayEvent<SuicideEvent>>(OnSuicideRelay);
     }
 
     private void OnMobStateChanged(EntityUid uid, TriggerOnMobstateChangeComponent component, MobStateChangedEvent args)
@@ -22,25 +27,21 @@ public sealed partial class TriggerSystem
         if (!component.MobState.Contains(args.NewMobState))
             return;
 
-        //This chains Mobstate Changed triggers with OnUseTimerTrigger if they have it
-        //Very useful for things that require a mobstate change and a timer
-        if (TryComp<OnUseTimerTriggerComponent>(uid, out var timerTrigger))
-        {
-            HandleTimerTrigger(
-                uid,
-                args.Origin,
-                timerTrigger.Delay,
-                timerTrigger.BeepInterval,
-                timerTrigger.InitialBeepDelay,
-                timerTrigger.BeepSound);
-        }
-        else
-            Trigger(uid);
+        _trigger.Trigger(uid, component.TargetMobstateEntity ? uid : args.Origin, component.KeyOut);
+    }
+
+    private void OnMobStateRelay(EntityUid uid, TriggerOnMobstateChangeComponent component, ImplantRelayEvent<MobStateChangedEvent> args)
+    {
+        if (!component.MobState.Contains(args.Event.NewMobState))
+            return;
+
+        _trigger.Trigger(uid, component.TargetMobstateEntity ? args.ImplantedEntity : args.Event.Origin, component.KeyOut);
     }
 
     /// <summary>
     /// Checks if the user has any implants that prevent suicide to avoid some cheesy strategies
     /// Prevents suicide by handling the event without killing the user
+    /// TODO: This doesn't seem to work at the moment as the event is never checked for being handled.
     /// </summary>
     private void OnSuicide(EntityUid uid, TriggerOnMobstateChangeComponent component, SuicideEvent args)
     {
@@ -50,17 +51,19 @@ public sealed partial class TriggerSystem
         if (!component.PreventSuicide)
             return;
 
-        _popupSystem.PopupEntity(Loc.GetString("suicide-prevented"), args.Victim, args.Victim);
+        _popup.PopupClient(Loc.GetString("suicide-prevented"), args.Victim);
         args.Handled = true;
     }
 
     private void OnSuicideRelay(EntityUid uid, TriggerOnMobstateChangeComponent component, ImplantRelayEvent<SuicideEvent> args)
     {
-        OnSuicide(uid, component, args.Event);
-    }
+        if (args.Event.Handled)
+            return;
 
-    private void OnMobStateRelay(EntityUid uid, TriggerOnMobstateChangeComponent component, ImplantRelayEvent<MobStateChangedEvent> args)
-    {
-        OnMobStateChanged(uid, component, args.Event);
+        if (!component.PreventSuicide)
+            return;
+
+        _popup.PopupClient(Loc.GetString("suicide-prevented"), args.Event.Victim);
+        args.Event.Handled = true;
     }
 }
diff --git a/Content.Shared/Trigger/Systems/TriggerOnSlipSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnSlipSystem.cs
new file mode 100644
index 0000000000..6940ea52e2
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerOnSlipSystem.cs
@@ -0,0 +1,21 @@
+using Content.Shared.Slippery;
+using Content.Shared.Trigger.Components.Triggers;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerOnSlipSystem : EntitySystem
+{
+    [Dependency] private readonly TriggerSystem _trigger = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TriggerOnSlipComponent, SlipEvent>(OnSlip);
+    }
+
+    private void OnSlip(Entity<TriggerOnSlipComponent> ent, ref SlipEvent args)
+    {
+        _trigger.Trigger(ent.Owner, args.Slipped, ent.Comp.KeyOut);
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerOnStuckSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnStuckSystem.cs
new file mode 100644
index 0000000000..d364adccff
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerOnStuckSystem.cs
@@ -0,0 +1,21 @@
+using Content.Shared.Sticky;
+using Content.Shared.Trigger.Components.Triggers;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class TriggerOnStuckSystem : EntitySystem
+{
+    [Dependency] private readonly TriggerSystem _trigger = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TriggerOnStuckComponent, EntityStuckEvent>(OnStuck);
+    }
+
+    private void OnStuck(Entity<TriggerOnStuckComponent> ent, ref EntityStuckEvent args)
+    {
+        _trigger.Trigger(ent.Owner, args.User, ent.Comp.KeyOut);
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerOnVerbSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnVerbSystem.cs
new file mode 100644
index 0000000000..d5830dd75d
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerOnVerbSystem.cs
@@ -0,0 +1,31 @@
+using Content.Shared.Verbs;
+using Content.Shared.Trigger.Components.Triggers;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerOnVerbSystem : EntitySystem
+{
+    [Dependency] private readonly TriggerSystem _trigger = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TriggerOnVerbComponent, GetVerbsEvent<AlternativeVerb>>(OnGetAltVerbs);
+    }
+
+    private void OnGetAltVerbs(Entity<TriggerOnVerbComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!args.CanInteract || !args.CanAccess || args.Hands == null)
+            return;
+
+        var user = args.User;
+
+        args.Verbs.Add(new AlternativeVerb
+        {
+            Text = Loc.GetString(ent.Comp.Text),
+            Act = () => _trigger.Trigger(ent.Owner, user, ent.Comp.KeyOut),
+            Priority = 2 // should be above any timer settings
+        });
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Collide.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Collide.cs
new file mode 100644
index 0000000000..5243b13742
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Collide.cs
@@ -0,0 +1,73 @@
+using Content.Shared.Trigger.Components.Triggers;
+using Content.Shared.StepTrigger.Systems;
+using Robust.Shared.Physics.Events;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerSystem
+{
+    private void InitializeCollide()
+    {
+        SubscribeLocalEvent<TriggerOnCollideComponent, StartCollideEvent>(OnCollide);
+        SubscribeLocalEvent<TriggerOnStepTriggerComponent, StepTriggeredOffEvent>(OnStepTriggered);
+
+        SubscribeLocalEvent<TriggerOnTimedCollideComponent, StartCollideEvent>(OnTimedCollide);
+        SubscribeLocalEvent<TriggerOnTimedCollideComponent, EndCollideEvent>(OnTimedEndCollide);
+        SubscribeLocalEvent<TriggerOnTimedCollideComponent, ComponentShutdown>(OnTimedShutdown);
+    }
+
+    private void OnCollide(Entity<TriggerOnCollideComponent> ent, ref StartCollideEvent args)
+    {
+        if (args.OurFixtureId == ent.Comp.FixtureID && (!ent.Comp.IgnoreOtherNonHard || args.OtherFixture.Hard))
+            Trigger(ent.Owner, args.OtherEntity, ent.Comp.KeyOut);
+    }
+
+    private void OnStepTriggered(Entity<TriggerOnStepTriggerComponent> ent, ref StepTriggeredOffEvent args)
+    {
+        Trigger(ent, args.Tripper, ent.Comp.KeyOut);
+    }
+
+    private void OnTimedCollide(Entity<TriggerOnTimedCollideComponent> ent, ref StartCollideEvent args)
+    {
+        //Ensures the trigger entity will have an active component
+        EnsureComp<ActiveTriggerOnTimedCollideComponent>(ent);
+        var otherUID = args.OtherEntity;
+        if (ent.Comp.Colliding.ContainsKey(otherUID))
+            return;
+        ent.Comp.Colliding.Add(otherUID, _timing.CurTime + ent.Comp.Threshold);
+        Dirty(ent);
+    }
+
+    private void OnTimedEndCollide(Entity<TriggerOnTimedCollideComponent> ent, ref EndCollideEvent args)
+    {
+        var otherUID = args.OtherEntity;
+        ent.Comp.Colliding.Remove(otherUID);
+        Dirty(ent);
+
+        if (ent.Comp.Colliding.Count == 0)
+            RemComp<ActiveTriggerOnTimedCollideComponent>(ent);
+    }
+
+    private void OnTimedShutdown(Entity<TriggerOnTimedCollideComponent> ent, ref ComponentShutdown args)
+    {
+        RemComp<ActiveTriggerOnTimedCollideComponent>(ent);
+    }
+
+    private void UpdateTimedCollide()
+    {
+        var curTime = _timing.CurTime;
+        var query = EntityQueryEnumerator<ActiveTriggerOnTimedCollideComponent, TriggerOnTimedCollideComponent>();
+        while (query.MoveNext(out var uid, out _, out var triggerOnTimedCollide))
+        {
+            foreach (var (collidingEntity, collidingTime) in triggerOnTimedCollide.Colliding)
+            {
+                if (curTime > collidingTime)
+                {
+                    triggerOnTimedCollide.Colliding[collidingEntity] += triggerOnTimedCollide.Threshold;
+                    Dirty(uid, triggerOnTimedCollide);
+                    Trigger(uid, collidingEntity, triggerOnTimedCollide.KeyOut);
+                }
+            }
+        }
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Condition.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Condition.cs
new file mode 100644
index 0000000000..a917f1ad48
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Condition.cs
@@ -0,0 +1,57 @@
+using Content.Shared.Trigger.Components.Conditions;
+using Content.Shared.Verbs;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerSystem
+{
+    private void InitializeCondition()
+    {
+        SubscribeLocalEvent<WhitelistTriggerConditionComponent, AttemptTriggerEvent>(OnWhitelistTriggerAttempt);
+
+        SubscribeLocalEvent<UseDelayTriggerConditionComponent, AttemptTriggerEvent>(OnUseDelayTriggerAttempt);
+
+        SubscribeLocalEvent<ToggleTriggerConditionComponent, AttemptTriggerEvent>(OnToggleTriggerAttempt);
+        SubscribeLocalEvent<ToggleTriggerConditionComponent, GetVerbsEvent<AlternativeVerb>>(OnToggleGetAltVerbs);
+    }
+
+    private void OnWhitelistTriggerAttempt(Entity<WhitelistTriggerConditionComponent> ent, ref AttemptTriggerEvent args)
+    {
+        if (args.Key == null || ent.Comp.Keys.Contains(args.Key))
+            args.Cancelled |= !_whitelist.CheckBoth(args.User, ent.Comp.UserBlacklist, ent.Comp.UserWhitelist);
+    }
+
+    private void OnUseDelayTriggerAttempt(Entity<UseDelayTriggerConditionComponent> ent, ref AttemptTriggerEvent args)
+    {
+        if (args.Key == null || ent.Comp.Keys.Contains(args.Key))
+            args.Cancelled |= _useDelay.IsDelayed(ent.Owner, ent.Comp.UseDelayId);
+    }
+
+    private void OnToggleTriggerAttempt(Entity<ToggleTriggerConditionComponent> ent, ref AttemptTriggerEvent args)
+    {
+        if (args.Key == null || ent.Comp.Keys.Contains(args.Key))
+            args.Cancelled |= !ent.Comp.Enabled;
+    }
+
+    private void OnToggleGetAltVerbs(Entity<ToggleTriggerConditionComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!args.CanInteract || !args.CanAccess || args.Hands == null)
+            return;
+
+        var user = args.User;
+
+        args.Verbs.Add(new AlternativeVerb()
+        {
+            Text = Loc.GetString(ent.Comp.ToggleVerb),
+            Act = () => Toggle(ent, user)
+        });
+    }
+
+    private void Toggle(Entity<ToggleTriggerConditionComponent> ent, EntityUid user)
+    {
+        var msg = ent.Comp.Enabled ? ent.Comp.ToggleOff : ent.Comp.ToggleOn;
+        _popup.PopupPredicted(Loc.GetString(msg), ent.Owner, user);
+        ent.Comp.Enabled = !ent.Comp.Enabled;
+        Dirty(ent);
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Interaction.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Interaction.cs
new file mode 100644
index 0000000000..f506909760
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Interaction.cs
@@ -0,0 +1,96 @@
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Events;
+using Content.Shared.Item.ItemToggle.Components;
+using Content.Shared.Trigger.Components.Triggers;
+using Content.Shared.Trigger.Components.Effects;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerSystem
+{
+    private void InitializeInteraction()
+    {
+        SubscribeLocalEvent<TriggerOnActivateComponent, ActivateInWorldEvent>(OnActivate);
+        SubscribeLocalEvent<TriggerOnUseComponent, UseInHandEvent>(OnUse);
+
+        SubscribeLocalEvent<ItemToggleOnTriggerComponent, TriggerEvent>(HandleItemToggleOnTrigger);
+        SubscribeLocalEvent<AnchorOnTriggerComponent, TriggerEvent>(HandleAnchorOnTrigger);
+        SubscribeLocalEvent<UseDelayOnTriggerComponent, TriggerEvent>(HandleUseDelayOnTrigger);
+    }
+
+    private void OnActivate(Entity<TriggerOnActivateComponent> ent, ref ActivateInWorldEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        if (ent.Comp.RequireComplex && !args.Complex)
+            return;
+
+        Trigger(ent.Owner, args.User, ent.Comp.KeyOut);
+        args.Handled = true;
+    }
+
+    private void OnUse(Entity<TriggerOnUseComponent> ent, ref UseInHandEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        Trigger(ent.Owner, args.User, ent.Comp.KeyOut);
+        args.Handled = true;
+    }
+
+    private void HandleItemToggleOnTrigger(Entity<ItemToggleOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (!TryComp<ItemToggleComponent>(target, out var itemToggle))
+            return;
+
+        var handled = false;
+        if (itemToggle.Activated && ent.Comp.CanDeactivate)
+            handled = _itemToggle.TryDeactivate((target.Value, itemToggle), args.User, ent.Comp.Predicted, ent.Comp.ShowPopup);
+        else if (ent.Comp.CanActivate)
+            handled = _itemToggle.TryActivate((target.Value, itemToggle), args.User, ent.Comp.Predicted, ent.Comp.ShowPopup);
+
+        args.Handled |= handled;
+    }
+
+    private void HandleAnchorOnTrigger(Entity<AnchorOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        var xform = Transform(target.Value);
+
+        if (xform.Anchored && ent.Comp.CanUnanchor)
+            _transform.Unanchor(target.Value, xform);
+        else if (ent.Comp.CanAnchor)
+            _transform.AnchorEntity(target.Value, xform);
+
+        if (ent.Comp.RemoveOnTrigger)
+            RemCompDeferred<AnchorOnTriggerComponent>(target.Value);
+
+        args.Handled = true;
+    }
+
+    private void HandleUseDelayOnTrigger(Entity<UseDelayOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        args.Handled |= _useDelay.TryResetDelay(target.Value, ent.Comp.CheckDelayed);
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Proximity.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Proximity.cs
new file mode 100644
index 0000000000..cf7c11369b
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Proximity.cs
@@ -0,0 +1,138 @@
+using Content.Shared.Trigger.Components.Triggers;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Physics.Events;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerSystem
+{
+    private void InitializeProximity()
+    {
+        SubscribeLocalEvent<TriggerOnProximityComponent, StartCollideEvent>(OnProximityStartCollide);
+        SubscribeLocalEvent<TriggerOnProximityComponent, EndCollideEvent>(OnProximityEndCollide);
+        SubscribeLocalEvent<TriggerOnProximityComponent, MapInitEvent>(OnMapInit);
+        // Shouldn't need re-anchoring.
+        SubscribeLocalEvent<TriggerOnProximityComponent, AnchorStateChangedEvent>(OnProximityAnchor);
+    }
+
+    private void OnProximityAnchor(Entity<TriggerOnProximityComponent> ent, ref AnchorStateChangedEvent args)
+    {
+        ent.Comp.Enabled = !ent.Comp.RequiresAnchored || args.Anchored;
+
+        SetProximityAppearance(ent);
+
+        if (!ent.Comp.Enabled)
+        {
+            ent.Comp.Colliding.Clear();
+        }
+        // Re-check for contacts as we cleared them.
+        else if (TryComp<PhysicsComponent>(ent, out var body))
+        {
+            _physics.RegenerateContacts((ent.Owner, body));
+        }
+
+        Dirty(ent);
+    }
+
+    private void OnMapInit(Entity<TriggerOnProximityComponent> ent, ref MapInitEvent args)
+    {
+        ent.Comp.Enabled = !ent.Comp.RequiresAnchored || Transform(ent).Anchored;
+
+        SetProximityAppearance(ent);
+
+        if (!TryComp<PhysicsComponent>(ent, out var body))
+            return;
+
+        _fixture.TryCreateFixture(
+            ent.Owner,
+            ent.Comp.Shape,
+            TriggerOnProximityComponent.FixtureID,
+            hard: false,
+            body: body,
+            collisionLayer: ent.Comp.Layer);
+
+        Dirty(ent);
+    }
+
+    private void OnProximityStartCollide(EntityUid uid, TriggerOnProximityComponent component, ref StartCollideEvent args)
+    {
+        if (args.OurFixtureId != TriggerOnProximityComponent.FixtureID)
+            return;
+
+        component.Colliding[args.OtherEntity] = args.OtherBody;
+    }
+
+    private static void OnProximityEndCollide(EntityUid uid, TriggerOnProximityComponent component, ref EndCollideEvent args)
+    {
+        if (args.OurFixtureId != TriggerOnProximityComponent.FixtureID)
+            return;
+
+        component.Colliding.Remove(args.OtherEntity);
+    }
+
+    private void SetProximityAppearance(Entity<TriggerOnProximityComponent> ent)
+    {
+        _appearance.SetData(ent.Owner, ProximityTriggerVisualState.State, ent.Comp.Enabled ? ProximityTriggerVisuals.Inactive : ProximityTriggerVisuals.Off);
+    }
+
+    private void Activate(Entity<TriggerOnProximityComponent> ent, EntityUid user)
+    {
+        var curTime = _timing.CurTime;
+
+        if (!ent.Comp.Repeating)
+        {
+            ent.Comp.Enabled = false;
+            ent.Comp.Colliding.Clear();
+        }
+        else
+        {
+            ent.Comp.NextTrigger = curTime + ent.Comp.Cooldown;
+        }
+
+        // Queue a visual update for when the animation is complete.
+        ent.Comp.NextVisualUpdate = curTime + ent.Comp.AnimationDuration;
+        Dirty(ent);
+
+        _appearance.SetData(ent.Owner, ProximityTriggerVisualState.State, ProximityTriggerVisuals.Active);
+
+        Trigger(ent.Owner, user, ent.Comp.KeyOut);
+    }
+
+    private void UpdateProximity()
+    {
+        var curTime = _timing.CurTime;
+
+        var query = EntityQueryEnumerator<TriggerOnProximityComponent>();
+        while (query.MoveNext(out var uid, out var trigger))
+        {
+            if (curTime >= trigger.NextVisualUpdate)
+            {
+                // Update the visual state once the animation is done.
+                trigger.NextVisualUpdate = TimeSpan.MaxValue;
+                Dirty(uid, trigger);
+                SetProximityAppearance((uid, trigger));
+            }
+
+            if (!trigger.Enabled)
+                continue;
+
+            if (curTime < trigger.NextTrigger)
+                // The trigger's on cooldown.
+                continue;
+
+            // Check for anything colliding and moving fast enough.
+            foreach (var (collidingUid, colliding) in trigger.Colliding)
+            {
+                if (TerminatingOrDeleted(collidingUid))
+                    continue;
+
+                if (colliding.LinearVelocity.Length() < trigger.TriggerSpeed)
+                    continue;
+
+                // Trigger!
+                Activate((uid, trigger), collidingUid);
+                break;
+            }
+        }
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Signal.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Signal.cs
new file mode 100644
index 0000000000..fa5aa7ea6e
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Signal.cs
@@ -0,0 +1,44 @@
+using Content.Shared.Trigger.Components.Triggers;
+using Content.Shared.Trigger.Components.Effects;
+using Content.Shared.DeviceLinking.Events;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerSystem
+{
+    private void InitializeSignal()
+    {
+        SubscribeLocalEvent<SignalOnTriggerComponent, ComponentInit>(SignalOnTriggerInit);
+        SubscribeLocalEvent<TriggerOnSignalComponent, ComponentInit>(TriggerOnSignalInit);
+
+        SubscribeLocalEvent<SignalOnTriggerComponent, TriggerEvent>(HandleSignalOnTrigger);
+        SubscribeLocalEvent<TriggerOnSignalComponent, SignalReceivedEvent>(OnSignalReceived);
+    }
+
+    private void SignalOnTriggerInit(Entity<SignalOnTriggerComponent> ent, ref ComponentInit args)
+    {
+        _deviceLink.EnsureSourcePorts(ent.Owner, ent.Comp.Port);
+    }
+
+    private void TriggerOnSignalInit(Entity<TriggerOnSignalComponent> ent, ref ComponentInit args)
+    {
+        _deviceLink.EnsureSinkPorts(ent.Owner, ent.Comp.Port);
+    }
+
+    private void HandleSignalOnTrigger(Entity<SignalOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        _deviceLink.InvokePort(ent.Owner, ent.Comp.Port);
+        args.Handled = true;
+    }
+
+    private void OnSignalReceived(Entity<TriggerOnSignalComponent> ent, ref SignalReceivedEvent args)
+    {
+        if (args.Port != ent.Comp.Port)
+            return;
+
+        Trigger(ent.Owner, args.Trigger, ent.Comp.KeyOut);
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Spawn.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Spawn.cs
new file mode 100644
index 0000000000..edcdd03894
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Spawn.cs
@@ -0,0 +1,70 @@
+using Content.Shared.Trigger.Components.Effects;
+using Content.Shared.Trigger.Components.Triggers;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerSystem
+{
+
+    private void InitializeSpawn()
+    {
+        SubscribeLocalEvent<TriggerOnSpawnComponent, MapInitEvent>(OnSpawnInit);
+
+        SubscribeLocalEvent<SpawnOnTriggerComponent, TriggerEvent>(HandleSpawnOnTrigger);
+        SubscribeLocalEvent<DeleteOnTriggerComponent, TriggerEvent>(HandleDeleteOnTrigger);
+    }
+
+    private void OnSpawnInit(Entity<TriggerOnSpawnComponent> ent, ref MapInitEvent args)
+    {
+        Trigger(ent.Owner, null, ent.Comp.KeyOut);
+    }
+
+    private void HandleSpawnOnTrigger(Entity<SpawnOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        var xform = Transform(target.Value);
+
+        if (ent.Comp.UseMapCoords)
+        {
+            var mapCoords = _transform.GetMapCoordinates(target.Value, xform);
+            if (ent.Comp.Predicted)
+                EntityManager.PredictedSpawn(ent.Comp.Proto, mapCoords);
+            else if (_net.IsServer)
+                Spawn(ent.Comp.Proto, mapCoords);
+
+        }
+        else
+        {
+            var coords = xform.Coordinates;
+            if (!coords.IsValid(EntityManager))
+                return;
+
+            if (ent.Comp.Predicted)
+                PredictedSpawnAttachedTo(ent.Comp.Proto, coords);
+            else if (_net.IsServer)
+                SpawnAttachedTo(ent.Comp.Proto, coords);
+
+        }
+    }
+
+    private void HandleDeleteOnTrigger(Entity<DeleteOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        PredictedQueueDel(target);
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Timer.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Timer.cs
new file mode 100644
index 0000000000..58ac43e571
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Timer.cs
@@ -0,0 +1,179 @@
+using Content.Shared.Trigger.Components;
+using Content.Shared.Trigger.Components.Triggers;
+using Content.Shared.Examine;
+using Content.Shared.Verbs;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerSystem
+{
+    private void InitializeTimer()
+    {
+        SubscribeLocalEvent<RepeatingTriggerComponent, MapInitEvent>(OnRepeatInit);
+        SubscribeLocalEvent<RandomTimerTriggerComponent, MapInitEvent>(OnRandomInit);
+        SubscribeLocalEvent<TimerTriggerComponent, ComponentShutdown>(OnTimerShutdown);
+        SubscribeLocalEvent<TimerTriggerComponent, ExaminedEvent>(OnTimerExamined);
+        SubscribeLocalEvent<TimerTriggerComponent, TriggerEvent>(OnTimerTriggered);
+        SubscribeLocalEvent<TimerTriggerComponent, GetVerbsEvent<AlternativeVerb>>(OnTimerGetAltVerbs);
+    }
+
+    // set the time of the first trigger after being spawned
+    private void OnRepeatInit(Entity<RepeatingTriggerComponent> ent, ref MapInitEvent args)
+    {
+        ent.Comp.NextTrigger = _timing.CurTime + ent.Comp.Delay;
+        Dirty(ent);
+    }
+
+    private void OnRandomInit(Entity<RandomTimerTriggerComponent> ent, ref MapInitEvent args)
+    {
+        if (_net.IsClient) // Nextfloat will mispredict, so we set it on the server and dirty it
+            return;
+
+        if (!TryComp<TimerTriggerComponent>(ent, out var timerTriggerComp))
+            return;
+
+        timerTriggerComp.Delay = TimeSpan.FromSeconds(_random.NextFloat(ent.Comp.Min, ent.Comp.Max));
+        Dirty(ent.Owner, timerTriggerComp);
+    }
+
+    private void OnTimerShutdown(Entity<TimerTriggerComponent> ent, ref ComponentShutdown args)
+    {
+        RemComp<ActiveTimerTriggerComponent>(ent);
+    }
+
+    private void OnTimerExamined(Entity<TimerTriggerComponent> ent, ref ExaminedEvent args)
+    {
+        if (args.IsInDetailsRange && ent.Comp.Examinable)
+            args.PushText(Loc.GetString("timer-trigger-examine", ("time", ent.Comp.Delay.TotalSeconds)));
+    }
+
+    private void OnTimerTriggered(Entity<TimerTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        args.Handled |= ActivateTimerTrigger(ent.AsNullable(), args.User);
+    }
+
+    /// <summary>
+    /// Add an alt-click interaction that cycles through delays.
+    /// </summary>
+    private void OnTimerGetAltVerbs(Entity<TimerTriggerComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!args.CanInteract || !args.CanAccess || args.Hands == null)
+            return;
+
+        if (ent.Comp.DelayOptions.Count <= 1)
+            return;
+
+        var user = args.User;
+
+        args.Verbs.Add(new AlternativeVerb
+        {
+            Category = TimerOptions,
+            Text = Loc.GetString("timer-trigger-verb-cycle"),
+            Act = () => CycleDelay(ent, user),
+            Priority = 1
+        });
+
+        foreach (var option in ent.Comp.DelayOptions)
+        {
+            if (MathHelper.CloseTo(option.TotalSeconds, ent.Comp.Delay.TotalSeconds))
+            {
+                args.Verbs.Add(new AlternativeVerb
+                {
+                    Category = TimerOptions,
+                    Text = Loc.GetString("timer-trigger-verb-set-current", ("time", option.TotalSeconds)),
+                    Disabled = true,
+                    Priority = -100 * (int)option.TotalSeconds
+                });
+            }
+            else
+            {
+                args.Verbs.Add(new AlternativeVerb
+                {
+                    Category = TimerOptions,
+                    Text = Loc.GetString("timer-trigger-verb-set", ("time", option.TotalSeconds)),
+                    Priority = -100 * (int)option.TotalSeconds,
+                    Act = () =>
+                    {
+                        ent.Comp.Delay = option;
+                        Dirty(ent);
+                        _popup.PopupClient(Loc.GetString("timer-trigger-popup-set", ("time", option.TotalSeconds)), user, user);
+                    }
+                });
+            }
+        }
+    }
+
+    public static readonly VerbCategory TimerOptions = new("verb-categories-timer", "/Textures/Interface/VerbIcons/clock.svg.192dpi.png");
+
+    /// <summary>
+    /// Select the next entry from the DelayOptions.
+    /// </summary>
+    private void CycleDelay(Entity<TimerTriggerComponent> ent, EntityUid? user)
+    {
+        if (ent.Comp.DelayOptions.Count <= 1)
+            return;
+
+        // This is somewhat inefficient, but its good enough. This is run rarely, and the lists should be short.
+
+        ent.Comp.DelayOptions.Sort();
+        Dirty(ent);
+
+        if (ent.Comp.DelayOptions[^1] <= ent.Comp.Delay)
+        {
+            ent.Comp.Delay = ent.Comp.DelayOptions[0];
+            _popup.PopupClient(Loc.GetString("timer-trigger-popup-set", ("time", ent.Comp.Delay)), ent.Owner, user);
+            return;
+        }
+
+        foreach (var option in ent.Comp.DelayOptions)
+        {
+            if (option > ent.Comp.Delay)
+            {
+                ent.Comp.Delay = option;
+                _popup.PopupClient(Loc.GetString("timer-trigger-popup-set", ("time", option)), ent.Owner, user);
+                return;
+            }
+        }
+    }
+
+    private void UpdateRepeat()
+    {
+        var curTime = _timing.CurTime;
+        var query = EntityQueryEnumerator<RepeatingTriggerComponent>();
+        while (query.MoveNext(out var uid, out var comp))
+        {
+            if (comp.NextTrigger > curTime)
+                continue;
+
+            comp.NextTrigger += comp.Delay;
+            Dirty(uid, comp);
+            Trigger(uid, null, comp.KeyOut);
+        }
+    }
+
+    private void UpdateTimer()
+    {
+        var curTime = _timing.CurTime;
+        var query = EntityQueryEnumerator<ActiveTimerTriggerComponent, TimerTriggerComponent>();
+        while (query.MoveNext(out var uid, out _, out var timer))
+        {
+            if (_net.IsServer && timer.BeepSound != null && timer.NextBeep <= curTime)
+            {
+                _audio.PlayPvs(timer.BeepSound, uid);
+                timer.NextBeep += timer.BeepInterval;
+            }
+
+            if (timer.NextTrigger <= curTime)
+            {
+                Trigger(uid, timer.User, timer.KeyOut);
+                // Remove after triggering to prevent it from starting the timer again
+                RemComp<ActiveTimerTriggerComponent>(uid);
+                if (TryComp<AppearanceComponent>(uid, out var appearance))
+                    _appearance.SetData(uid, TriggerVisuals.VisualState, TriggerVisualState.Unprimed, appearance);
+            }
+        }
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.Voice.cs b/Content.Shared/Trigger/Systems/TriggerSystem.Voice.cs
new file mode 100644
index 0000000000..ac67cb7ed2
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.Voice.cs
@@ -0,0 +1,160 @@
+using Content.Shared.Trigger.Components.Triggers;
+using Content.Shared.Speech;
+using Content.Shared.Speech.Components;
+using Content.Shared.Database;
+using Content.Shared.Examine;
+using Content.Shared.Verbs;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed partial class TriggerSystem
+{
+    private void InitializeVoice()
+    {
+        SubscribeLocalEvent<TriggerOnVoiceComponent, ComponentInit>(OnVoiceInit);
+        SubscribeLocalEvent<TriggerOnVoiceComponent, ExaminedEvent>(OnVoiceExamine);
+        SubscribeLocalEvent<TriggerOnVoiceComponent, ListenEvent>(OnListen);
+        SubscribeLocalEvent<TriggerOnVoiceComponent, GetVerbsEvent<AlternativeVerb>>(OnVoiceGetAltVerbs);
+    }
+
+    private void OnVoiceInit(Entity<TriggerOnVoiceComponent> ent, ref ComponentInit args)
+    {
+        if (ent.Comp.IsListening)
+            EnsureComp<ActiveListenerComponent>(ent).Range = ent.Comp.ListenRange;
+        else
+            RemCompDeferred<ActiveListenerComponent>(ent);
+    }
+
+    private void OnVoiceExamine(Entity<TriggerOnVoiceComponent> ent, ref ExaminedEvent args)
+    {
+        if (args.IsInDetailsRange)
+        {
+            args.PushText(string.IsNullOrWhiteSpace(ent.Comp.KeyPhrase)
+                ? Loc.GetString("trigger-on-voice-uninitialized")
+                : Loc.GetString("trigger-on-voice-examine", ("keyphrase", ent.Comp.KeyPhrase)));
+        }
+    }
+    private void OnListen(Entity<TriggerOnVoiceComponent> ent, ref ListenEvent args)
+    {
+        var component = ent.Comp;
+        var message = args.Message.Trim();
+
+        if (component.IsRecording)
+        {
+            var ev = new ListenAttemptEvent(args.Source);
+            RaiseLocalEvent(ent, ev);
+
+            if (ev.Cancelled)
+                return;
+
+            if (message.Length >= component.MinLength && message.Length <= component.MaxLength)
+                FinishRecording(ent, args.Source, args.Message);
+            else if (message.Length > component.MaxLength)
+                _popup.PopupEntity(Loc.GetString("trigger-on-voice-record-failed-too-long"), ent);
+            else if (message.Length < component.MinLength)
+                _popup.PopupEntity(Loc.GetString("trigger-on-voice-record-failed-too-short"), ent);
+
+            return;
+        }
+
+        if (!string.IsNullOrWhiteSpace(component.KeyPhrase) && message.IndexOf(component.KeyPhrase, StringComparison.InvariantCultureIgnoreCase) is var index and >= 0)
+        {
+            _adminLogger.Add(LogType.Trigger, LogImpact.Medium,
+                    $"A voice-trigger on {ToPrettyString(ent):entity} was triggered by {ToPrettyString(args.Source):speaker} speaking the key-phrase {component.KeyPhrase}.");
+            Trigger(ent, args.Source, ent.Comp.KeyOut);
+
+            var messageWithoutPhrase = message.Remove(index, component.KeyPhrase.Length).Trim();
+            var voice = new VoiceTriggeredEvent(args.Source, message, messageWithoutPhrase);
+            RaiseLocalEvent(ent, ref voice);
+        }
+    }
+
+    private void OnVoiceGetAltVerbs(Entity<TriggerOnVoiceComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!args.CanInteract || !args.CanAccess)
+            return;
+
+        var user = args.User;
+        args.Verbs.Add(new AlternativeVerb
+        {
+            Text = Loc.GetString(ent.Comp.IsRecording ? "trigger-on-voice-stop" : "trigger-on-voice-record"),
+            Act = () =>
+            {
+                if (ent.Comp.IsRecording)
+                    StopRecording(ent, user);
+                else
+                    StartRecording(ent, user);
+            },
+            Priority = 1
+        });
+
+        if (string.IsNullOrWhiteSpace(ent.Comp.KeyPhrase))
+            return;
+
+        args.Verbs.Add(new AlternativeVerb
+        {
+            Text = Loc.GetString("trigger-on-voice-clear"),
+            Act = () =>
+            {
+                ClearRecording(ent);
+            }
+        });
+    }
+
+    /// <summary>
+    /// Start recording a new keyphrase.
+    /// </summary>
+    public void StartRecording(Entity<TriggerOnVoiceComponent> ent, EntityUid? user)
+    {
+        ent.Comp.IsRecording = true;
+        Dirty(ent);
+        EnsureComp<ActiveListenerComponent>(ent).Range = ent.Comp.ListenRange;
+
+        if (user == null)
+            _adminLogger.Add(LogType.Trigger, LogImpact.Low, $"A voice-trigger on {ToPrettyString(ent):entity} has started recording.");
+        else
+            _adminLogger.Add(LogType.Trigger, LogImpact.Low, $"A voice-trigger on {ToPrettyString(ent):entity} has started recording. User: {ToPrettyString(user.Value):user}");
+
+        _popup.PopupPredicted(Loc.GetString("trigger-on-voice-start-recording"), ent, user);
+    }
+
+    /// <summary>
+    /// Stop recording without setting a keyphrase.
+    /// </summary>
+    public void StopRecording(Entity<TriggerOnVoiceComponent> ent, EntityUid? user)
+    {
+        ent.Comp.IsRecording = false;
+        Dirty(ent);
+        if (string.IsNullOrWhiteSpace(ent.Comp.KeyPhrase))
+            RemComp<ActiveListenerComponent>(ent);
+
+        _popup.PopupPredicted(Loc.GetString("trigger-on-voice-stop-recording"), ent, user);
+    }
+
+
+    /// <summary>
+    /// Stop recording and set the current keyphrase message.
+    /// </summary>
+    public void FinishRecording(Entity<TriggerOnVoiceComponent> ent, EntityUid source, string message)
+    {
+        ent.Comp.KeyPhrase = message;
+        ent.Comp.IsRecording = false;
+        Dirty(ent);
+
+        _adminLogger.Add(LogType.Trigger, LogImpact.Low,
+                $"A voice-trigger on {ToPrettyString(ent):entity} has recorded a new keyphrase: '{ent.Comp.KeyPhrase}'. Recorded from {ToPrettyString(source):speaker}");
+
+        _popup.PopupEntity(Loc.GetString("trigger-on-voice-recorded", ("keyphrase", ent.Comp.KeyPhrase)), ent);
+    }
+
+    /// <summary>
+    /// Resets the key phrase and stops recording.
+    /// </summary>
+    public void ClearRecording(Entity<TriggerOnVoiceComponent> ent)
+    {
+        ent.Comp.KeyPhrase = null;
+        ent.Comp.IsRecording = false;
+        Dirty(ent);
+        RemComp<ActiveListenerComponent>(ent);
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.cs b/Content.Shared/Trigger/Systems/TriggerSystem.cs
new file mode 100644
index 0000000000..6a749b87ab
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TriggerSystem.cs
@@ -0,0 +1,186 @@
+using Content.Shared.Administration.Logs;
+using Content.Shared.Database;
+using Content.Shared.DeviceLinking;
+using Content.Shared.Item.ItemToggle;
+using Content.Shared.Popups;
+using Content.Shared.Timing;
+using Content.Shared.Trigger.Components;
+using Content.Shared.Whitelist;
+using Robust.Shared.Network;
+using Robust.Shared.Physics.Systems;
+using Robust.Shared.Timing;
+using Robust.Shared.Random;
+using Robust.Shared.Audio.Systems;
+
+
+namespace Content.Shared.Trigger.Systems;
+
+/// <summary>
+/// System containing the basic trigger API.
+/// </summary>
+/// <remarks>
+/// If you add a custom trigger subscription or effect then don't put them here.
+/// Put them into a separate system so we don't end up with a giant list of imports.
+/// </remarks>
+public sealed partial class TriggerSystem : EntitySystem
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly FixtureSystem _fixture = default!;
+    [Dependency] private readonly INetManager _net = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly UseDelaySystem _useDelay = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
+    [Dependency] private readonly ItemToggleSystem _itemToggle = default!;
+    [Dependency] private readonly SharedDeviceLinkSystem _deviceLink = default!;
+
+    public const string DefaultTriggerKey = "trigger";
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        InitializeCollide();
+        InitializeCondition();
+        InitializeInteraction();
+        InitializeProximity();
+        InitializeSignal();
+        InitializeTimer();
+        InitializeSpawn();
+        InitializeVoice();
+    }
+
+    /// <summary>
+    /// Trigger the given entity.
+    /// </summary>
+    /// <param name="trigger">The entity that has the components that should be triggered.</param>
+    /// <param name="user">The user of the trigger. Some effects may target the user instead of the trigger entity.</param>
+    /// <param name="key">A key string to allow multiple, independent triggers on the same entity. If null then all triggers will activate.</param>
+    /// <returns>Whether or not the trigger has sucessfully activated an effect.</returns>
+    public bool Trigger(EntityUid trigger, EntityUid? user = null, string? key = null)
+    {
+        var attemptTriggerEvent = new AttemptTriggerEvent(user, key);
+        RaiseLocalEvent(trigger, ref attemptTriggerEvent);
+        if (attemptTriggerEvent.Cancelled)
+            return false;
+
+        var triggerEvent = new TriggerEvent(user, key);
+        RaiseLocalEvent(trigger, ref triggerEvent, true);
+        return triggerEvent.Handled;
+    }
+
+    /// <summary>
+    /// Activate a timer trigger on an entity with <see cref="TimerTriggerComponent"/>.
+    /// </summary>
+    /// <returns>Whether or not a timer was activated.</returns>
+    public bool ActivateTimerTrigger(Entity<TimerTriggerComponent?> ent, EntityUid? user = null)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return false;
+
+        if (HasComp<ActiveTimerTriggerComponent>(ent))
+            return false; // already activated
+
+        if (user != null)
+        {
+            _adminLogger.Add(LogType.Trigger,
+                $"{ToPrettyString(user.Value):user} started a {ent.Comp.Delay} second timer trigger on entity {ToPrettyString(ent.Owner):timer}");
+        }
+        else
+        {
+            _adminLogger.Add(LogType.Trigger,
+                $"{ent.Comp.Delay} second timer trigger started on entity {ToPrettyString(ent.Owner):timer}");
+        }
+
+        if (ent.Comp.Popup != null)
+            _popup.PopupPredicted(Loc.GetString(ent.Comp.Popup.Value, ("device", ent.Owner)), ent.Owner, user);
+
+        AddComp<ActiveTimerTriggerComponent>(ent);
+        var curTime = _timing.CurTime;
+        ent.Comp.NextTrigger = curTime + ent.Comp.Delay;
+        var delay = ent.Comp.InitialBeepDelay ?? ent.Comp.BeepInterval;
+        ent.Comp.NextBeep = curTime + delay;
+        Dirty(ent);
+
+        var ev = new ActiveTimerTriggerEvent(user);
+        RaiseLocalEvent(ent.Owner, ref ev);
+
+        if (TryComp<AppearanceComponent>(ent, out var appearance))
+            _appearance.SetData(ent.Owner, TriggerVisuals.VisualState, TriggerVisualState.Primed, appearance);
+
+        return true;
+    }
+
+    /// <summary>
+    /// Stop a timer trigger on an entity with <see cref="TimerTriggerComponent"/>.
+    /// </summary>
+    /// <returns>Whether or not a timer was stopped.</returns>
+    public bool StopTimerTrigger(Entity<TimerTriggerComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return false;
+
+        if (!HasComp<ActiveTimerTriggerComponent>(ent))
+            return false; // the timer is not active
+
+        RemComp<ActiveTimerTriggerComponent>(ent);
+        if (TryComp<AppearanceComponent>(ent.Owner, out var appearance))
+            _appearance.SetData(ent.Owner, TriggerVisuals.VisualState, TriggerVisualState.Unprimed, appearance);
+
+        _adminLogger.Add(LogType.Trigger, $"A timer trigger was stopped before triggering on entity {ToPrettyString(ent.Owner):timer}");
+        return true;
+    }
+
+    /// <summary>
+    /// Delay an active timer trigger.
+    /// Returns false if not active.
+    /// </summary>
+    /// <param name="amount">The time to add.</param>
+    public bool TryDelay(Entity<TimerTriggerComponent?> ent, TimeSpan amount)
+    {
+        if (!Resolve(ent, ref ent.Comp, false) || !HasComp<ActiveTimerTriggerComponent>(ent))
+            return false;
+
+        ent.Comp.NextTrigger += amount;
+        Dirty(ent);
+        return true;
+    }
+
+    /// <summary>
+    /// Setter for the Delay datafield.
+    /// </summary>
+    public void SetDelay(Entity<TimerTriggerComponent?> ent, TimeSpan delay)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return;
+
+        ent.Comp.Delay = delay;
+        Dirty(ent);
+    }
+
+    /// <summary>
+    /// Gets the remaining time until the trigger will activate.
+    /// Returns null if the trigger is not currently active.
+    /// </summary>
+    public TimeSpan? GetRemainingTime(Entity<TimerTriggerComponent?> ent)
+    {
+        if (!Resolve(ent, ref ent.Comp, false) || !HasComp<ActiveTimerTriggerComponent>(ent))
+            return null; // not a timer or not currently active
+
+        return ent.Comp.NextTrigger - _timing.CurTime;
+    }
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        UpdateTimer();
+        UpdateRepeat();
+        UpdateProximity();
+        UpdateTimedCollide();
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/TwoStageTriggerSystem.cs b/Content.Shared/Trigger/Systems/TwoStageTriggerSystem.cs
new file mode 100644
index 0000000000..2461e797dc
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/TwoStageTriggerSystem.cs
@@ -0,0 +1,51 @@
+using Robust.Shared.Timing;
+using Content.Shared.Trigger.Components;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class TwoStageTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly TriggerSystem _triggerSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TwoStageTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<TwoStageTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (ent.Comp.Triggered)
+            return; // already triggered
+
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        EntityManager.AddComponents(ent, ent.Comp.Components);
+        EnsureComp<ActiveTwoStageTriggerComponent>(ent);
+        ent.Comp.Triggered = true;
+        ent.Comp.NextTriggerTime = _timing.CurTime + ent.Comp.TriggerDelay;
+        ent.Comp.User = args.User;
+        Dirty(ent);
+
+        args.Handled = true;
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var curTime = _timing.CurTime;
+        var enumerator = EntityQueryEnumerator<ActiveTwoStageTriggerComponent, TwoStageTriggerComponent>();
+        while (enumerator.MoveNext(out var uid, out _, out var component))
+        {
+            if (curTime < component.NextTriggerTime)
+                continue;
+
+            RemComp<ActiveTwoStageTriggerComponent>(uid);
+            _triggerSystem.Trigger(uid, component.User, component.KeyOut);
+        }
+    }
+}
diff --git a/Content.Shared/Trigger/Systems/UncuffOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/UncuffOnTriggerSystem.cs
new file mode 100644
index 0000000000..9b83c4cf8e
--- /dev/null
+++ b/Content.Shared/Trigger/Systems/UncuffOnTriggerSystem.cs
@@ -0,0 +1,34 @@
+using Content.Shared.Cuffs;
+using Content.Shared.Cuffs.Components;
+using Content.Shared.Trigger.Components.Effects;
+
+namespace Content.Shared.Trigger.Systems;
+
+public sealed class UncuffOnTriggerSystem : EntitySystem
+{
+    [Dependency] private readonly SharedCuffableSystem _cuffable = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<UncuffOnTriggerComponent, TriggerEvent>(OnTrigger);
+    }
+
+    private void OnTrigger(Entity<UncuffOnTriggerComponent> ent, ref TriggerEvent args)
+    {
+        if (args.Key != null && !ent.Comp.KeysIn.Contains(args.Key))
+            return;
+
+        var target = ent.Comp.TargetUser ? args.User : ent.Owner;
+
+        if (target == null)
+            return;
+
+        if (!TryComp<CuffableComponent>(target.Value, out var cuffs) || cuffs.Container.ContainedEntities.Count < 1)
+            return;
+
+        _cuffable.Uncuff(target.Value, args.User, cuffs.LastAddedCuffs);
+        args.Handled = true;
+    }
+}
diff --git a/Content.Shared/Trigger/TriggerEvent.cs b/Content.Shared/Trigger/TriggerEvent.cs
new file mode 100644
index 0000000000..e65e3b48a8
--- /dev/null
+++ b/Content.Shared/Trigger/TriggerEvent.cs
@@ -0,0 +1,33 @@
+namespace Content.Shared.Trigger;
+
+/// <summary>
+/// Raised whenever something is Triggered on the entity.
+/// </summary>
+/// <param name="User">The entity that activated the trigger.</param>
+/// <param name="Key">
+/// Allows to have multiple independent triggers on the same entity.
+/// Setting this to null will activate all triggers.
+/// </param>
+/// <param name="Handled">Marks the event as handled if at least one trigger effect was activated.</param>
+[ByRefEvent]
+public record struct TriggerEvent(EntityUid? User = null, string? Key = null, bool Handled = false);
+
+/// <summary>
+/// Raised before a trigger is activated.
+/// Cancelling prevents it from triggering.
+/// </summary>
+/// <param name="User">The entity that activated the trigger.</param>
+/// <param name="Key">
+/// Allows to have multiple independent triggers on the same entity.
+/// Setting this to null will activate all triggers.
+/// </param>
+/// <param name="Handled">Marks the event as handled if at least one trigger effect was activated.</param>
+[ByRefEvent]
+public record struct AttemptTriggerEvent(EntityUid? User, string? Key = null, bool Cancelled = false);
+
+/// <summary>
+/// Raised when a timer trigger becomes active.
+/// </summary>
+/// <param name="User">The entity that activated the trigger.</param>
+[ByRefEvent]
+public readonly record struct ActiveTimerTriggerEvent(EntityUid? User);
diff --git a/Content.Shared/Trigger/TriggerVisuals.cs b/Content.Shared/Trigger/TriggerVisuals.cs
index ed544f3590..f1d4a55fb1 100644
--- a/Content.Shared/Trigger/TriggerVisuals.cs
+++ b/Content.Shared/Trigger/TriggerVisuals.cs
@@ -1,31 +1,30 @@
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Trigger
+namespace Content.Shared.Trigger;
+
+[Serializable, NetSerializable]
+public enum ProximityTriggerVisuals : byte
 {
-    [Serializable, NetSerializable]
-    public enum ProximityTriggerVisuals : byte
-    {
-        Off,
-        Inactive,
-        Active,
-    }
-
-    [Serializable, NetSerializable]
-    public enum ProximityTriggerVisualState : byte
-    {
-        State,
-    }
-
-    [Serializable, NetSerializable]
-    public enum TriggerVisuals : byte
-    {
-        VisualState,
-    }
-
-    [Serializable, NetSerializable]
-    public enum TriggerVisualState : byte
-    {
-        Primed,
-        Unprimed,
-    }
+    Off,
+    Inactive,
+    Active,
+}
+
+[Serializable, NetSerializable]
+public enum ProximityTriggerVisualState : byte
+{
+    State,
+}
+
+[Serializable, NetSerializable]
+public enum TriggerVisuals : byte
+{
+    VisualState,
+}
+
+[Serializable, NetSerializable]
+public enum TriggerVisualState : byte
+{
+    Primed,
+    Unprimed,
 }
diff --git a/Content.Shared/Trigger/VoiceTriggeredEvent.cs b/Content.Shared/Trigger/VoiceTriggeredEvent.cs
new file mode 100644
index 0000000000..af138b56cf
--- /dev/null
+++ b/Content.Shared/Trigger/VoiceTriggeredEvent.cs
@@ -0,0 +1,10 @@
+namespace Content.Shared.Trigger;
+
+/// <summary>
+/// Raised when a voice trigger is activated, containing the message that triggered it.
+/// </summary>
+/// <param name="Source"> The EntityUid of the entity sending the message</param>
+/// <param name="Message"> The contents of the message</param>
+/// <param name="MessageWithoutPhrase"> The message without the phrase that triggered it.</param>
+[ByRefEvent]
+public readonly record struct VoiceTriggeredEvent(EntityUid Source, string? Message, string MessageWithoutPhrase);
diff --git a/Content.Shared/VendingMachines/VendingMachineComponent.cs b/Content.Shared/VendingMachines/VendingMachineComponent.cs
index cbd59dbfaa..32cd0ca382 100644
--- a/Content.Shared/VendingMachines/VendingMachineComponent.cs
+++ b/Content.Shared/VendingMachines/VendingMachineComponent.cs
@@ -193,15 +193,18 @@ namespace Content.Shared.VendingMachines
         #endregion
     }
 
-    [Serializable, NetSerializable]
-    public sealed class VendingMachineInventoryEntry
+    [Serializable, NetSerializable, DataDefinition]
+    public sealed partial class VendingMachineInventoryEntry
     {
-        [ViewVariables(VVAccess.ReadWrite)]
+        [DataField]
         public InventoryType Type;
-        [ViewVariables(VVAccess.ReadWrite)]
+
+        [DataField]
         public string ID;
-        [ViewVariables(VVAccess.ReadWrite)]
+
+        [DataField]
         public uint Amount;
+
         public VendingMachineInventoryEntry(InventoryType type, string id, uint amount)
         {
             Type = type;
diff --git a/Content.Shared/Warps/WarpPointComponent.cs b/Content.Shared/Warps/WarpPointComponent.cs
index 61e84a660c..fdd33efb86 100644
--- a/Content.Shared/Warps/WarpPointComponent.cs
+++ b/Content.Shared/Warps/WarpPointComponent.cs
@@ -9,7 +9,7 @@ namespace Content.Shared.Warps;
 [RegisterComponent, NetworkedComponent]
 public sealed partial class WarpPointComponent : Component
 {
-    [ViewVariables(VVAccess.ReadWrite), DataField]
+    [DataField]
     public string? Location;
 
     /// <summary>
diff --git a/Content.Server/Warps/WarpPointSystem.cs b/Content.Shared/Warps/WarpPointSystem.cs
similarity index 87%
rename from Content.Server/Warps/WarpPointSystem.cs
rename to Content.Shared/Warps/WarpPointSystem.cs
index 2e2264a81a..c8474acd33 100644
--- a/Content.Server/Warps/WarpPointSystem.cs
+++ b/Content.Shared/Warps/WarpPointSystem.cs
@@ -1,8 +1,7 @@
-using Content.Shared.Examine;
+using Content.Shared.Examine;
 using Content.Shared.Ghost;
-using Content.Shared.Warps;
 
-namespace Content.Server.Warps;
+namespace Content.Shared.Warps;
 
 public sealed class WarpPointSystem : EntitySystem
 {
diff --git a/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs b/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs
index 3add18365a..562e006a92 100644
--- a/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs
+++ b/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs
@@ -48,17 +48,17 @@ public sealed class MeleeSoundSystem : EntitySystem
         {
             if (damageType == null && damageSoundComp.NoDamageSound != null)
             {
-                _audio.PlayPredicted(damageSoundComp.NoDamageSound, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                _audio.PlayPredicted(damageSoundComp.NoDamageSound, coords, userUid, damageSoundComp.NoDamageSound.Params.WithVariation(DamagePitchVariation));
                 playedSound = true;
             }
             else if (damageType != null && damageSoundComp.SoundTypes?.TryGetValue(damageType, out var damageSoundType) == true)
             {
-                _audio.PlayPredicted(damageSoundType, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                _audio.PlayPredicted(damageSoundType, coords, userUid, damageSoundType.Params.WithVariation(DamagePitchVariation));
                 playedSound = true;
             }
             else if (damageType != null && damageSoundComp.SoundGroups?.TryGetValue(damageType, out var damageSoundGroup) == true)
             {
-                _audio.PlayPredicted(damageSoundGroup, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                _audio.PlayPredicted(damageSoundGroup, coords, userUid, damageSoundGroup.Params.WithVariation(DamagePitchVariation));
                 playedSound = true;
             }
         }
@@ -68,17 +68,17 @@ public sealed class MeleeSoundSystem : EntitySystem
         {
             if (hitSoundOverride != null)
             {
-                _audio.PlayPredicted(hitSoundOverride, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                _audio.PlayPredicted(hitSoundOverride, coords, userUid, hitSoundOverride.Params.WithVariation(DamagePitchVariation));
                 playedSound = true;
             }
             else if (hitSound != null)
             {
-                _audio.PlayPredicted(hitSound, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                _audio.PlayPredicted(hitSound, coords, userUid, hitSound.Params.WithVariation(DamagePitchVariation));
                 playedSound = true;
             }
             else
             {
-                _audio.PlayPredicted(noDamageSound, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                _audio.PlayPredicted(noDamageSound, coords, userUid, noDamageSound.Params.WithVariation(DamagePitchVariation));
                 playedSound = true;
             }
         }
diff --git a/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs b/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs
index 13cee5bad6..0ba8a5faee 100644
--- a/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs
@@ -1,7 +1,6 @@
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Shared.Weapons.Ranged.Components;
 
@@ -23,11 +22,16 @@ public partial class AmmoComponent : Component, IShootable
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState(fieldDeltas: true)]
 public sealed partial class CartridgeAmmoComponent : AmmoComponent
 {
-    [ViewVariables(VVAccess.ReadWrite), DataField("proto", required: true)]
+    /// <summary>
+    /// Prototype of the ammo to be shot.
+    /// </summary>
+    [DataField("proto", required: true)]
     public EntProtoId Prototype;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField]
-    [AutoNetworkedField]
+    /// <summary>
+    /// Is this cartridge spent?
+    /// </summary>
+    [DataField, AutoNetworkedField]
     public bool Spent;
 
     /// <summary>
@@ -36,6 +40,9 @@ public sealed partial class CartridgeAmmoComponent : AmmoComponent
     [DataField]
     public bool DeleteOnSpawn;
 
+    /// <summary>
+    /// Sound the case makes when it leaves the weapon.
+    /// </summary>
     [DataField("soundEject")]
     public SoundSpecifier? EjectSound = new SoundCollectionSpecifier("CasingEject");
 }
diff --git a/Content.Shared/Weapons/Ranged/Events/OnEmptyGunShotEvent.cs b/Content.Shared/Weapons/Ranged/Events/OnEmptyGunShotEvent.cs
index efae42952b..998fa8f0eb 100644
--- a/Content.Shared/Weapons/Ranged/Events/OnEmptyGunShotEvent.cs
+++ b/Content.Shared/Weapons/Ranged/Events/OnEmptyGunShotEvent.cs
@@ -4,4 +4,4 @@ namespace Content.Shared.Weapons.Ranged.Events;
 /// Raised directed on the gun when trying to fire it while it's out of ammo
 /// </summary>
 [ByRefEvent]
-public record struct OnEmptyGunShotEvent(EntityUid EmptyGun);
+public record struct OnEmptyGunShotEvent(EntityUid User);
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Cartridges.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Cartridges.cs
index b28b4b7508..dcc9a5689a 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Cartridges.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Cartridges.cs
@@ -1,13 +1,52 @@
+using Content.Shared.Damage;
+using Content.Shared.Damage.Events;
+using Content.Shared.Damage.Systems;
+using Content.Shared.Examine;
+using Content.Shared.Projectiles;
 using Content.Shared.Weapons.Ranged.Components;
-using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Weapons.Ranged.Systems;
 
 public abstract partial class SharedGunSystem
 {
+    [Dependency] private readonly DamageExamineSystem _damageExamine = default!;
+
     // needed for server system
     protected virtual void InitializeCartridge()
     {
+        SubscribeLocalEvent<CartridgeAmmoComponent, ExaminedEvent>(OnCartridgeExamine);
+        SubscribeLocalEvent<CartridgeAmmoComponent, DamageExamineEvent>(OnCartridgeDamageExamine);
+    }
+
+    private void OnCartridgeExamine(Entity<CartridgeAmmoComponent> ent, ref ExaminedEvent args)
+    {
+        args.PushMarkup(ent.Comp.Spent
+            ? Loc.GetString("gun-cartridge-spent")
+            : Loc.GetString("gun-cartridge-unspent"));
+    }
+
+    private void OnCartridgeDamageExamine(EntityUid uid, CartridgeAmmoComponent component, ref DamageExamineEvent args)
+    {
+        var damageSpec = GetProjectileDamage(component.Prototype);
+
+        if (damageSpec == null)
+            return;
+
+        _damageExamine.AddDamageExamine(args.Message, Damageable.ApplyUniversalAllModifiers(damageSpec), Loc.GetString("damage-projectile"));
+    }
+
+    private DamageSpecifier? GetProjectileDamage(EntProtoId proto)
+    {
+        if (!ProtoManager.TryIndex(proto, out var entityProto))
+            return null;
+
+        if (!entityProto.TryGetComponent<ProjectileComponent>(out var projectile, Factory))
+            return null;
+
+        if (!projectile.Damage.Empty)
+            return projectile.Damage * Damageable.UniversalProjectileDamageModifier;
+
+        return null;
     }
 }
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index ba8254f68a..61ee8cdada 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -341,7 +341,7 @@ public abstract partial class SharedGunSystem : EntitySystem
         if (ev.Ammo.Count <= 0)
         {
             // triggers effects on the gun if it's empty
-            var emptyGunShotEvent = new OnEmptyGunShotEvent();
+            var emptyGunShotEvent = new OnEmptyGunShotEvent(user);
             RaiseLocalEvent(gunUid, ref emptyGunShotEvent);
 
             gun.BurstActivated = false;
diff --git a/Content.Shared/Wieldable/Components/IncreaseDamageOnWieldComponent.cs b/Content.Shared/Wieldable/Components/IncreaseDamageOnWieldComponent.cs
index 86afe1897b..52b087c5b9 100644
--- a/Content.Shared/Wieldable/Components/IncreaseDamageOnWieldComponent.cs
+++ b/Content.Shared/Wieldable/Components/IncreaseDamageOnWieldComponent.cs
@@ -6,5 +6,6 @@ namespace Content.Shared.Wieldable.Components;
 public sealed partial class IncreaseDamageOnWieldComponent : Component
 {
     [DataField("damage", required: true)]
+    [Access(Other = AccessPermissions.ReadExecute)]
     public DamageSpecifier BonusDamage = default!;
 }
diff --git a/Content.Shared/Wires/SharedWiresComponent.cs b/Content.Shared/Wires/SharedWiresComponent.cs
index 2239fd72b1..d691e854ea 100644
--- a/Content.Shared/Wires/SharedWiresComponent.cs
+++ b/Content.Shared/Wires/SharedWiresComponent.cs
@@ -209,22 +209,8 @@ namespace Content.Shared.Wires
     {
         public static string Name(this WireColor color)
         {
-            return Loc.GetString(color switch
-            {
-                WireColor.Red => "Red",
-                WireColor.Blue => "Blue",
-                WireColor.Green => "Green",
-                WireColor.Orange => "Orange",
-                WireColor.Brown => "Brown",
-                WireColor.Gold => "Gold",
-                WireColor.Gray => "Gray",
-                WireColor.Cyan => "Cyan",
-                WireColor.Navy => "Navy",
-                WireColor.Purple => "Purple",
-                WireColor.Pink => "Pink",
-                WireColor.Fuchsia => "Fuchsia",
-                _ => throw new InvalidOperationException()
-            });
+            var colorName = Enum.GetName(color) ?? throw new InvalidOperationException();
+            return Loc.GetString($"wire-name-color-{colorName.ToLower()}");
         }
 
         public static Color ColorValue(this WireColor color)
@@ -251,30 +237,30 @@ namespace Content.Shared.Wires
         {
             return Loc.GetString(letter switch
             {
-                WireLetter.α => "Alpha",
-                WireLetter.β => "Beta",
-                WireLetter.γ => "Gamma",
-                WireLetter.δ => "Delta",
-                WireLetter.ε => "Epsilon",
-                WireLetter.ζ => "Zeta",
-                WireLetter.η => "Eta",
-                WireLetter.θ => "Theta",
-                WireLetter.ι => "Iota",
-                WireLetter.κ => "Kappa",
-                WireLetter.λ => "Lambda",
-                WireLetter.μ => "Mu",
-                WireLetter.ν => "Nu",
-                WireLetter.ξ => "Xi",
-                WireLetter.ο => "Omicron",
-                WireLetter.π => "Pi",
-                WireLetter.ρ => "Rho",
-                WireLetter.σ => "Sigma",
-                WireLetter.τ => "Tau",
-                WireLetter.υ => "Upsilon",
-                WireLetter.φ => "Phi",
-                WireLetter.χ => "Chi",
-                WireLetter.ψ => "Psi",
-                WireLetter.ω => "Omega",
+                WireLetter.α => "wire-letter-name-alpha",
+                WireLetter.β => "wire-letter-name-beta",
+                WireLetter.γ => "wire-letter-name-gamma",
+                WireLetter.δ => "wire-letter-name-delta",
+                WireLetter.ε => "wire-letter-name-epsilon",
+                WireLetter.ζ => "wire-letter-name-zeta ",
+                WireLetter.η => "wire-letter-name-eta",
+                WireLetter.θ => "wire-letter-name-theta",
+                WireLetter.ι => "wire-letter-name-iota",
+                WireLetter.κ => "wire-letter-name-kappa",
+                WireLetter.λ => "wire-letter-name-lambda",
+                WireLetter.μ => "wire-letter-name-mu",
+                WireLetter.ν => "wire-letter-name-nu",
+                WireLetter.ξ => "wire-letter-name-xi",
+                WireLetter.ο => "wire-letter-name-omicron",
+                WireLetter.π => "wire-letter-name-pi",
+                WireLetter.ρ => "wire-letter-name-rho",
+                WireLetter.σ => "wire-letter-name-sigma",
+                WireLetter.τ => "wire-letter-name-tau",
+                WireLetter.υ => "wire-letter-name-upsilon",
+                WireLetter.φ => "wire-letter-name-phi",
+                WireLetter.χ => "wire-letter-name-chi",
+                WireLetter.ψ => "wire-letter-name-psi",
+                WireLetter.ω => "wire-letter-name-omega",
                 _ => throw new InvalidOperationException()
             });
         }
diff --git a/Resources/Audio/Effects/Changeling/attributions.yml b/Resources/Audio/Effects/Changeling/attributions.yml
new file mode 100644
index 0000000000..d7d7931cd6
--- /dev/null
+++ b/Resources/Audio/Effects/Changeling/attributions.yml
@@ -0,0 +1,19 @@
+- files: ["devour_suck.ogg"]
+  license: "CC0-1.0"
+  copyright: "4Cairnz on Freesound: June 5th 2023"
+  source: "https://freesound.org/people/4Cairnz/sounds/689640/"
+
+- files: ["devour_windup.ogg "]
+  license: "CC-BY-SA-3.0"
+  copyright: "Made by @DarkIcedCoffee on Discord for SS14, utilizing sounds from Caitlin_100, jedg and EricsSoundschmiede on freesound"
+  source: "https://youtu.be/iviCUO2xH_E"
+
+- files: ["devour_consume.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Made by @DarkIcedCoffee on Discord for SS14, utilizing sounds from jedg and reg7783 on freesound."
+  source: "https://youtu.be/iviCUO2xH_E"
+
+- files: ["changeling_transform.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Made by @DarkIcedCoffee on Discord for SS14"
+  source: "https://youtu.be/iviCUO2xH_E"
diff --git a/Resources/Audio/Effects/Changeling/changeling_transform.ogg b/Resources/Audio/Effects/Changeling/changeling_transform.ogg
new file mode 100644
index 0000000000..23379d246d
Binary files /dev/null and b/Resources/Audio/Effects/Changeling/changeling_transform.ogg differ
diff --git a/Resources/Audio/Effects/Changeling/devour_consume.ogg b/Resources/Audio/Effects/Changeling/devour_consume.ogg
new file mode 100644
index 0000000000..9d05c9f541
Binary files /dev/null and b/Resources/Audio/Effects/Changeling/devour_consume.ogg differ
diff --git a/Resources/Audio/Effects/Changeling/devour_suck.ogg b/Resources/Audio/Effects/Changeling/devour_suck.ogg
new file mode 100644
index 0000000000..d756b0a55d
Binary files /dev/null and b/Resources/Audio/Effects/Changeling/devour_suck.ogg differ
diff --git a/Resources/Audio/Effects/Changeling/devour_windup.ogg b/Resources/Audio/Effects/Changeling/devour_windup.ogg
new file mode 100644
index 0000000000..7c81d9a076
Binary files /dev/null and b/Resources/Audio/Effects/Changeling/devour_windup.ogg differ
diff --git a/Resources/Audio/Effects/Lightning/attributions.yml b/Resources/Audio/Effects/Lightning/attributions.yml
index 0bd92af1bb..49778bbc61 100644
--- a/Resources/Audio/Effects/Lightning/attributions.yml
+++ b/Resources/Audio/Effects/Lightning/attributions.yml
@@ -1,7 +1,7 @@
-- files: [LightningShock.ogg]
-  license: CC-BY-NC-SA-3.0
-  copyright: Citadel Station 13
-  source: https://github.com/Citadel-Station-13/Citadel-Station-13/commit/35a1723e98a60f375df590ca572cc90f1bb80bd5
+- files: ["lightningshock.ogg", "lightningbolt.ogg"]
+  license: CC-BY-SA-3.0
+  copyright: "/tg/station"
+  source: "https://github.com/tgstation/tgstation/pull/9701/"
 
 - files: ["strobeepsilon.ogg"]
   license: "CC-BY-SA-3.0"
diff --git a/Resources/Audio/Effects/attributions.yml b/Resources/Audio/Effects/attributions.yml
index 3a7f18c7a3..9f85c4fb05 100644
--- a/Resources/Audio/Effects/attributions.yml
+++ b/Resources/Audio/Effects/attributions.yml
@@ -256,3 +256,13 @@
   license: "CC-BY-4.0"
   copyright: "Clipped by FairlySadPanda (Github) from a sound created by CheChoDj (Freesound)"
   source: "https://freesound.org/people/CheChoDj/sounds/609353/"
+
+- files: [card_drag.ogg]
+  copyright: 'created by Tao7891'
+  license: CC0-1.0
+  source: https://github.com/space-wizards/space-station-14/pull/37363
+
+- files: [card_tube_bonk.ogg]
+  copyright: 'created by Crinkem on Freesound'
+  license: "CC0-1.0"
+  source: https://freesound.org/people/Crinkem/sounds/492027/
diff --git a/Resources/Audio/Effects/card_drag.ogg b/Resources/Audio/Effects/card_drag.ogg
new file mode 100644
index 0000000000..8ecf632e8a
Binary files /dev/null and b/Resources/Audio/Effects/card_drag.ogg differ
diff --git a/Resources/Audio/Items/Toys/card_tube_bonk.ogg b/Resources/Audio/Items/Toys/card_tube_bonk.ogg
new file mode 100644
index 0000000000..b300702c25
Binary files /dev/null and b/Resources/Audio/Items/Toys/card_tube_bonk.ogg differ
diff --git a/Resources/Audio/Lobby/attributions.yml b/Resources/Audio/Lobby/attributions.yml
index ab96eb41a1..92c2e095b7 100644
--- a/Resources/Audio/Lobby/attributions.yml
+++ b/Resources/Audio/Lobby/attributions.yml
@@ -38,7 +38,7 @@
 
 - files: ["title2.ogg"]
   license: "Custom"
-  copyright: "Originally composed by Jonathan Dunn for Robocop 2 Gameboy published by Ocean Software. Remixed by Eric Shumaker for his video Dilbert 3. As of October 9th, 2008 nobody owns the rights to this song and copyright action has never been taken against anyone using this song in their projects."
+  copyright: "Originally composed by Jonathan Dunn for RoboCop (Game Boy) published by Ocean Software. Remixed by Eric Shumaker for his video Dilbert 3. As of October 9th, 2008 nobody owns the rights to this song and copyright action has never been taken against anyone using this song in their projects."
   source: "https://www.youtube.com/watch?v=4o6_8Unj2mQ"
 
 - files: ["title3.ogg"]
diff --git a/Resources/Audio/Machines/attributions.yml b/Resources/Audio/Machines/attributions.yml
index 215944dc29..1fe20a59d9 100644
--- a/Resources/Audio/Machines/attributions.yml
+++ b/Resources/Audio/Machines/attributions.yml
@@ -58,6 +58,11 @@
   copyright: "Taken from TG station."
   source: "https://github.com/tgstation/tgstation/blob/d4f678a1772007ff8d7eddd21cf7218c8e07bfc0/sound/machines/warning-buzzer.ogg"
 
+- files: ["warning_buzzer_xenoborg.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Made by Toast (Discord)"
+  source: "https://github.com/space-wizards/space-station-14/pull/36935"
+
 - files: ["anomaly_sync_connect.ogg"]
   license: "CC0-1.0"
   copyright: "Created by newagesoup, convert to ogg mono by TheShuEd"
@@ -208,4 +213,4 @@
 - files: ["shutter.ogg"]
   license: "CC-BY-3.0"
   copyright: "Created by Tomlija, converted to OGG and modified by themias."
-  source: "https://freesound.org/people/Tomlija/sounds/99565/"
\ No newline at end of file
+  source: "https://freesound.org/people/Tomlija/sounds/99565/"
diff --git a/Resources/Audio/Machines/warning_buzzer_xenoborg.ogg b/Resources/Audio/Machines/warning_buzzer_xenoborg.ogg
new file mode 100644
index 0000000000..fad2ca2229
Binary files /dev/null and b/Resources/Audio/Machines/warning_buzzer_xenoborg.ogg differ
diff --git a/Resources/Audio/Voice/Xenoborg/attributions.yml b/Resources/Audio/Voice/Xenoborg/attributions.yml
index 7a08f127d3..775cc731be 100644
--- a/Resources/Audio/Voice/Xenoborg/attributions.yml
+++ b/Resources/Audio/Voice/Xenoborg/attributions.yml
@@ -10,6 +10,7 @@
   - xenoborg_laugh_3.ogg
   - xenoborg_laugh_4.ogg
   - xenoborg_ping.ogg
+  - xenoborg_scream.ogg
   - xenoborg_talk.ogg
   - xenoborg_twobeep.ogg
   license: "CC-BY-SA-4.0"
diff --git a/Resources/Audio/Voice/Xenoborg/xenoborg_scream.ogg b/Resources/Audio/Voice/Xenoborg/xenoborg_scream.ogg
new file mode 100644
index 0000000000..bc83ec46ff
Binary files /dev/null and b/Resources/Audio/Voice/Xenoborg/xenoborg_scream.ogg differ
diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index 168a6c2c52..908c6d0d1e 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -1293,5 +1293,35 @@ Entries:
   id: 157
   time: '2025-07-25T16:53:01.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/36969
+- author: perryprog
+  changes:
+  - message: savegrid and savemap will no longer fail to save unpaused grids with
+      vending machines on them.
+    type: Fix
+  id: 158
+  time: '2025-07-31T18:34:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38406
+- author: PJB3005
+  changes:
+  - message: The "scale" console command was replaced with a toolshed command.
+    type: Tweak
+  id: 159
+  time: '2025-08-06T15:09:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39421
+- author: slarticodefast
+  changes:
+  - message: Added the "scale:multiplyvector" toolshed command.
+    type: Add
+  id: 160
+  time: '2025-08-06T17:23:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39424
+- author: slarticodefast
+  changes:
+  - message: Paused maps from cryostorage and polymorphing are now named to make them
+      easier to find when debugging.
+    type: Tweak
+  id: 161
+  time: '2025-08-07T14:55:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39453
 Name: Admin
 Order: 2
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 9b70794553..ad34cd6196 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,228 +1,4 @@
 Entries:
-- author: ScarKy0
-  changes:
-  - message: Default cargo split is now 50% instead of 75%. Lockboxes remain unchanged.
-    type: Tweak
-  id: 8298
-  time: '2025-04-21T10:32:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36800
-- author: Phooooooooooooooooooooooooooooooosphate
-  changes:
-  - message: Add the medical HUDs to medical's loadout.
-    type: Add
-  id: 8299
-  time: '2025-04-21T12:07:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32847
-- author: aada
-  changes:
-  - message: Hotplates and kitchen grills can now be anchored on tables.
-    type: Fix
-  - message: Hotplates and kitchen grills now collide with walls.
-    type: Fix
-  id: 8300
-  time: '2025-04-21T15:38:23.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34776
-- author: insoPL
-  changes:
-  - message: being able to drag certain food items onto drain and chemmasters
-    type: Fix
-  id: 8301
-  time: '2025-04-21T15:50:07.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34683
-- author: Hrosts
-  changes:
-  - message: Added rehydratable mop bucket cube, replacing the big and unwieldy yellow
-      bucket in the janitorial supplies crate.
-    type: Add
-  id: 8302
-  time: '2025-04-21T17:16:25.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34586
-- author: K-Dynamic
-  changes:
-  - message: Increased ratio of crew to thieves from 15 to 20.
-    type: Tweak
-  id: 8303
-  time: '2025-04-21T17:24:28.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36531
-- author: centcomofficer24
-  changes:
-  - message: Added a genderfluid pin!
-    type: Add
-  id: 8304
-  time: '2025-04-21T17:46:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35854
-- author: ScarKy0
-  changes:
-  - message: Station AI now has a name identifier appended after their name.
-    type: Tweak
-  id: 8305
-  time: '2025-04-21T17:54:51.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36801
-- author: lzk228
-  changes:
-  - message: Fix identity reveal for creaming and meat spike popups.
-    type: Fix
-  id: 8306
-  time: '2025-04-21T20:15:20.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32003
-- author: ShadowCommander
-  changes:
-  - message: Added firelock lights for pressure and temperature warnings.
-    type: Add
-  id: 8307
-  time: '2025-04-21T22:39:29.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28339
-- author: lzk228
-  changes:
-  - message: Bots now can examine, use zoom and see their alerts (health & stamina).
-    type: Tweak
-  - message: Added borgs emotes to bots.
-    type: Tweak
-  id: 8308
-  time: '2025-04-21T22:49:43.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29949
-- author: Ghagliiarghii
-  changes:
-  - message: The monkey version of captain uniforms and the hamster version of captain
-      hats updated to match humanoid versions
-    type: Tweak
-  id: 8309
-  time: '2025-04-22T01:03:36.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36804
-- author: Doc-Michael
-  changes:
-  - message: Changed protection values of Security Hardsuits
-    type: Tweak
-  - message: Made Warden/HoS coats slightly more protective to better fit their position
-    type: Tweak
-  id: 8310
-  time: '2025-04-22T03:22:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/30212
-- author: K-Dynamic
-  changes:
-  - message: Changed instances of 3.5 second grenade timers to 3 seconds, including
-      clusterbangs and atmos metal foam grenades.
-    type: Tweak
-  - message: Atmos metal foam grenades have been reworked to disperse foam in a 5x5
-      diamond pattern and harden within two seconds.
-    type: Tweak
-  - message: Reduced hardened metal foam health (breakable in 6 crowbar swings).
-    type: Tweak
-  - message: Changed syndicate trickbomb timer from 3.5 seconds to 5 seconds to match
-      minibombs.
-    type: Tweak
-  id: 8311
-  time: '2025-04-22T05:51:21.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34579
-- author: muburu
-  changes:
-  - message: Dragons can now pry open doors, including firelocks.
-    type: Tweak
-  id: 8312
-  time: '2025-04-22T06:33:00.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36811
-- author: sowelipililimute
-  changes:
-  - message: The Funding Allocation Computer can now adjust the cut Cargo takes from
-      lockbox sales
-    type: Add
-  - message: The Funding Allocation Computer doesn't show Cargo separately from its
-      75% cut
-    type: Tweak
-  id: 8313
-  time: '2025-04-22T12:34:53.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36790
-- author: yuitop
-  changes:
-  - message: Fingerless gloves no more blocking taking the fingerprint.
-    type: Tweak
-  id: 8314
-  time: '2025-04-22T18:15:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/31864
-- author: GoldenCan
-  changes:
-  - message: Heads of Personnel can now fabricate generic command-themed clothes using
-      their uniform printer.
-    type: Add
-  id: 8315
-  time: '2025-04-22T18:35:43.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32103
-- author: Ilya246
-  changes:
-  - message: Numerous cargo orders have been made cheaper.
-    type: Tweak
-  id: 8316
-  time: '2025-04-22T18:38:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32375
-- author: Southbridge
-  changes:
-  - message: Solar Panels can now be randomly damaged or unfinished at the beginning
-      of the round.
-    type: Add
-  id: 8317
-  time: '2025-04-22T19:46:38.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36825
-- author: Kickguy223
-  changes:
-  - message: Reduced the price of firelock electronics to half the price of the input
-      materials
-    type: Tweak
-  id: 8318
-  time: '2025-04-22T23:53:42.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/33469
-- author: murolem
-  changes:
-  - message: Building orientation on fences, diagonal grilles and the diagonal shuttle
-      wall is now respected.
-    type: Fix
-  id: 8319
-  time: '2025-04-23T01:58:42.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36488
-- author: kosticia
-  changes:
-  - message: Added analog of donk-pockets for moth - moth-pockets
-    type: Add
-  id: 8320
-  time: '2025-04-23T05:36:55.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34517
-- author: AgentSmithRadio
-  changes:
-  - message: New food crates are now available for purchase from the automated trade
-      station!
-    type: Add
-  - message: You can no longer use Sweetie's Pistachios to fulfill cargo's generic
-      fruit bounty.
-    type: Remove
-  id: 8321
-  time: '2025-04-23T05:37:10.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/33286
-- author: SaphireLattice
-  changes:
-  - message: Steel sheets no longer have unintuitively wasteful plating placement
-      that can be done with steel tiles instead
-    type: Remove
-  id: 8322
-  time: '2025-04-23T11:08:03.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/33443
-- author: ArchRBX
-  changes:
-  - message: pAI's can now install a variety of useful software through their new
-      Software Catalog.
-    type: Add
-  - message: pAI's no longer start with a Station Map or MIDI Player, and must purchase
-      these through the shop.
-    type: Tweak
-  id: 8323
-  time: '2025-04-23T23:55:36.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36857
-- author: NoElkaTheGod
-  changes:
-  - message: Toysword now actually looks almost like the real thing, as advertised
-      in the description
-    type: Tweak
-  id: 8324
-  time: '2025-04-24T01:21:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34199
 - author: Pronana
   changes:
   - message: Moths can now eat pills
@@ -3903,8 +3679,223 @@
   url: https://github.com/space-wizards/space-station-14/pull/37915
 - author: Quantum-cross
   changes:
-  - message: pinpointer will no longer trigger sufferers of OCD
+  - message: Fixed pinpointer arrow not being centered properly.
     type: Fix
   id: 8809
   time: '2025-07-25T19:46:42.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/38657
+- author: PJB3005
+  changes:
+  - message: Made most plushie sounds quieter, and made plushies slower to use.
+    type: Tweak
+  id: 8811
+  time: '2025-07-28T07:11:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39250
+- author: EmoGarbage404
+  changes:
+  - message: Fixed being unable to fold certain clothing while worn.
+    type: Fix
+  id: 8812
+  time: '2025-07-28T10:19:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39257
+- author: lzk228
+  changes:
+  - message: Janibelt can hold the golden plunger now.
+    type: Fix
+  id: 8813
+  time: '2025-07-28T12:59:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39213
+- author: SuperGDPWYL
+  changes:
+  - message: The Warden now starts with a network configurator in their locker.
+    type: Add
+  id: 8814
+  time: '2025-07-28T16:09:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39254
+- author: TrixxedHeart
+  changes:
+  - message: Several strange sprite issues with Vox have been fixed, most notably
+      jumpsuits and many neck items overlapping the face, as well as a layering issue
+      where their tank would appear over their hair.
+    type: Fix
+  id: 8815
+  time: '2025-07-28T21:28:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39219
+- author: K-Dynamic
+  changes:
+  - message: Quartermaster job and ID icons are now based on Cargo Technicians.
+    type: Tweak
+  id: 8816
+  time: '2025-07-29T07:34:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39259
+- author: Alkheemist
+  changes:
+  - message: Protected Grids can now again have their hull and tiles repaired (Evac,
+      ATS, etc)
+    type: Fix
+  - message: Protected Grids can no longer be expanded outside of their original size.
+    type: Fix
+  id: 8817
+  time: '2025-07-29T12:01:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39271
+- author: Admiral-Obvious-001
+  changes:
+  - message: Several advanced chemicals now act slower, but with raised OD thresholds
+      and lowered OD damage. The healing per unit remains largely the same.
+    type: Tweak
+  - message: Bicaradine no longer makes razorium when mixed with advanced brute chems.
+      Advanced brute chems still mix and create razorium when combined.
+    type: Tweak
+  id: 8818
+  time: '2025-07-29T18:52:42.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38811
+- author: aada
+  changes:
+  - message: Lipolicide now continues to poison at 0 hunger.
+    type: Fix
+  - message: Tricordrazine now also heals at exactly 50 damage instead of needing
+      to be below 50. Similar thresholds on other reagents tweaked the same.
+    type: Tweak
+  id: 8819
+  time: '2025-07-30T06:44:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/36289
+- author: Disp-Dev
+  changes:
+  - message: A new recipe has been added, moth-edible cotton cakes.
+    type: Add
+  id: 8820
+  time: '2025-07-30T22:51:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39222
+- author: spanky-spanky
+  changes:
+  - message: The wizard now spawns in a den instead of a shuttle.
+    type: Tweak
+  id: 8821
+  time: '2025-07-31T04:08:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37701
+- author: perryprog
+  changes:
+  - message: Fixed board game areas sometimes overlapping with those of other board
+      games.
+    type: Fix
+  id: 8822
+  time: '2025-08-01T21:48:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39327
+- author: Krosus
+  changes:
+  - message: Fixed crash when loading saved character profiles
+    type: Fix
+  id: 8823
+  time: '2025-08-02T15:14:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39333
+- author: FairlySadPanda
+  changes:
+  - message: A new cake, berry delight, that is made with a cake base, berries and
+      milk.
+    type: Add
+  id: 8824
+  time: '2025-08-02T18:35:09.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38881
+- author: DrSmugleaf
+  changes:
+  - message: Fixed rotate verbs being delayed when used, and your right click UI bounce
+      when they appear after a short delay.
+    type: Fix
+  id: 8825
+  time: '2025-08-03T00:34:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38165
+- author: alexalexmax
+  changes:
+  - message: Updated the syndicate throwing knives uplink entry to include the fact
+      that they ignore armor.
+    type: Tweak
+  id: 8826
+  time: '2025-08-04T19:19:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39374
+- author: TrixxedHeart
+  changes:
+  - message: Added canes to the trinkets loadout tab.
+    type: Add
+  - message: Added offset canes for roleplay flair. They can be crafted in the medical
+      lathe.
+    type: Add
+  id: 8827
+  time: '2025-08-04T23:39:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39272
+- author: qwerltaz
+  changes:
+  - message: The air alarm window scrubber controller now has buttons to select and
+      deselect all gases.
+    type: Add
+  id: 8828
+  time: '2025-08-05T00:34:10.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39296
+- author: perryprog
+  changes:
+  - message: Players no longer have the ability to cycle a timer in the verb menu
+      on a cyborg.
+    type: Fix
+  id: 8829
+  time: '2025-08-05T03:26:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39388
+- author: Luxeator
+  changes:
+  - message: Fixed error upon exploding buckled mobs (and other near instantaneous
+      changes)
+    type: Fix
+  id: 8830
+  time: '2025-08-05T23:15:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39410
+- author: ScarKy0, beck-thompson
+  changes:
+  - message: Various canines will now sometimes clumsily spill things they drink.
+    type: Add
+  id: 8831
+  time: '2025-08-06T13:00:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38852
+- author: aada
+  changes:
+  - message: You can examine fuel tanks to see how much they're filled.
+    type: Add
+  id: 8832
+  time: '2025-08-06T16:11:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39362
+- author: Tao7891
+  changes:
+  - message: Craftable cardboard structures and equipment.
+    type: Add
+  id: 8833
+  time: '2025-08-06T16:58:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37363
+- author: slarticodefast
+  changes:
+  - message: Fixed inventory sprites flickering when hovering over the slot with an
+      item.
+    type: Fix
+  id: 8834
+  time: '2025-08-06T20:14:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39379
+- author: Thinbug0
+  changes:
+  - message: New onion mutation, Bloonions! floating balloon-like onions.
+    type: Add
+  id: 8835
+  time: '2025-08-07T01:51:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33375
+- author: Kittygyat
+  changes:
+  - message: Made baseball bats 1x4 instead of 2x2
+    type: Tweak
+  - message: New baseball bat inventory icon sprites
+    type: Add
+  id: 8836
+  time: '2025-08-07T03:03:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38392
+- author: lolman360
+  changes:
+  - message: Fixed certain items (like pickaxes) failing to insert into containers
+      that have enough space to store them, sometimes.
+    type: Fix
+  id: 8837
+  time: '2025-08-07T16:01:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38896
diff --git a/Resources/Changelog/Maps.yml b/Resources/Changelog/Maps.yml
index 432b838bb8..b3e0833f7e 100644
--- a/Resources/Changelog/Maps.yml
+++ b/Resources/Changelog/Maps.yml
@@ -494,4 +494,13 @@
   id: 61
   time: '2025-07-23T00:55:18.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/39150
+- author: SlamBamActionman
+  changes:
+  - message: Exo station has had a major Security department rework, along with the
+      eastern maintenance section of the station, as well as several other minor changes
+      across the station.
+    type: Tweak
+  id: 62
+  time: '2025-07-31T20:28:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39295
 Order: 1
diff --git a/Resources/ConfigPresets/WizardsDen/vulture.toml b/Resources/ConfigPresets/WizardsDen/vulture.toml
index 0e89f63741..8eccfa48e1 100644
--- a/Resources/ConfigPresets/WizardsDen/vulture.toml
+++ b/Resources/ConfigPresets/WizardsDen/vulture.toml
@@ -14,6 +14,3 @@ force_client_hud_version_watermark = true
 
 [chat]
 motd = "\n########################################################\n\n[font size=17]This is a test server. You can play with the newest changes to the game, but these [color=red]changes may not be final or stable[/color], and may be reverted. Please report bugs via our GitHub, forum, or community Discord.[/font]\n\n########################################################\n"
-
-[debug]
-pow3r_disable_parallel = false
diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
index 3317dfefef..f1a069de14 100644
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
@@ -1 +1 @@
-0leshe, 0tito, 0x6273, 12rabbits, 1337dakota, 13spacemen, 154942, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 3nderall, 4310v343k, 4dplanner, 612git, 778b, 96flo, aaron, abadaba695, Ablankmann, abregado, Absolute-Potato, Absotively, achookh, Acruid, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, adm2play, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aearo-Deepwater, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, AftrLite, AgentSmithRadio, Agoichi, Ahion, aiden, Aidenkrz, Aisu9, ajcm, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alice4267, Alithsko, alliephante, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, Anzarot121, ApolloVector, Appiah, ar4ill, archee1, ArchPigeon, ArchRBX, areitpog, Arendian, areyouconfused, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, AverageNotDoingAnythingEnjoyer, avghdev, Awlod, AzzyIsNotHere, azzyisnothere, B-Kirill, B3CKDOOR, baa14453, BackeTako, Bakke, BananaFlambe, Baptr0b0t, BarryNorfolk, BasedUser, beck-thompson, beesterman, bellwetherlogic, ben, benbryant0, benev0, benjamin-burges, BGare, bhespiritu, bibbly, BigfootBravo, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blitzthesquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Bokser815, bolantej, Booblesnoot42, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, BriBrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, BWTCK, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, Camdot, capnsockless, CaptainMaru, captainsqrbeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, catdotjs, catlord, Catofquestionableethics, CatTheSystem, Centronias, Chaboricks, chairbender, Chaoticaa, Charlese2, charlie, chartman, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, CheesePlated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, ciaran, citrea, civilCornball, claustro305, Clement-O, clyf, Clyybber, CMDR-Piboy314, cnv41, coco, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, Compilatron144, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, cooperwallace, corentt, CormosLemming, CrafterKolyan, crazybrain23, Crazydave91920, creadth, CrigCrag, CroilBird, Crotalus, CrudeWax, cryals, CrzyPotato, cubixthree, cutemoongod, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, dan, dangerrevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DeepwaterCreations, Deerstop, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, devinschubert14, dexlerxd, dffdff2423, DieselMohawk, digitalic, Dimastra, DinnerCalzone, DinoWattz, Disp-Dev, DisposableCrewmember42, dissidentbullet, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DR-DOCTOR-EVIL-EVIL, Dragonjspider, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, DuckManZach, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, dylanwhittingham, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, Entvari, eoineoineoin, ephememory, eris, erohrs2, ERORR404V1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, ewokswagger, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, farrellka-dev, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, firenamefn, Firewars763, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FlipBrooke, FluffiestFloof, FluffMe, FluidRock, flymo5678, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, foxhorn, freeman2651, freeze2222, frobnic8, Froffy025, Fromoriss, froozigiusz, FrostMando, FrostRibbon, Funce, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gamewar360, gansulalan, GaussiArson, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, Gentleman-Bird, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GnarpGnarp, GNF54, godisdeadLOL, goet, GoldenCan, Goldminermac, Golinth, golubgik, GoodWheatley, Gorox221, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GrownSamoyedDog, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, Hardly3D, harikattar, he1acdvv, Hebi, Helix-ctrl, helm4142, Henry, HerCoyote23, HighTechPuddle, Hitlinemoss, hiucko, hivehum, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hoshizora, Hreno, Hrosts, htmlsystem, hubismal, Hugal31, Huxellberger, Hyenh, hyperb1, hyperDelegate, hyphenationc, i-justuser-i, iaada, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imatsoup, IMCB, impubbi, imrenq, imweax, indeano, Injazz, Insineer, insoPL, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jacktastic09, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jarmer123, Jaskanbe, JasperJRoth, jbox144, JCGWE30, JerryImMouse, jerryimmouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jkwookee, jmcb, JohnGinnane, johnku1, Jophire, joshepvodka, JpegOfAFrog, jproads, JrInventor05, Jrpl, jukereise, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, kaiserbirch, KaiShibaa, kalane15, kalanosh, KamTheSythe, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Killerqu00, Kimpes, KingFroozy, kira-er, kiri-yoshikage, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, Kittygyat, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kosticia, koteq, kotobdev, Kowlin, KrasnoshchekovPavel, Krunklehorn, Kupie, kxvvv, kyupolaris, kzhanik, LaCumbiaDelCoronavirus, lajolico, Lamrr, lanedon, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LeoSantich, lettern, LetterN, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, liltenhead, linkbro1, linkuyx, Litraxx, little-meow-meow, LittleBuilderJane, LittleNorthStar, LittleNyanCat, lizelive, ljm862, lmsnoise, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, Lusatia, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M1tht1c, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, maland1, malchanceux, MaloTV, ManelNavola, manelnavola, Mangohydra, marboww, Markek1, matt, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, memeproof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterImp, MisterMecky, Mith-randalf, Mixelz, mjarduk, MjrLandWhale, mkanke-real, MLGTASTICa, mnva0, moderatelyaware, modern-nm, mokiros, momo, Moneyl, monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, murolem, musicmanvr, MWKane, Myakot, Myctai, N3X15, nabegator, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikitosych, nikthechampiongr, Nimfar11, ninruB, Nirnael, NIXC, nkokic, NkoKirkto, nmajask, noctyrnal, noelkathegod, noirogen, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, NotSoDana, noudoit, noverd, Nox38, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, Nyxilath, och-och, OctoRocket, OldDanceJacket, OliverOtter, onesch, OneZerooo0, OnyxTheBrave, Orange-Winds, OrangeMoronage9622, Orsoniks, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paige404, paigemaeforrest, pali6, Palladinium, Pangogie, panzer-iv1, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, perryprog, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, pheenty, philingham, Phill101, Phooooooooooooooooooooooooooooooosphate, phunnyguy, PicklOH, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, Pissachu, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PotRoastPiggy, Princess-Cheeseballs, ProfanedBane, PROG-MohamedDwidar, Prole0, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, pumkin69, PuroSlavKing, PursuitInAshes, Putnam3145, py01, Pyrovi, qrtDaniil, qrwas, Quantum-cross, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, ReeZer2, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, rhsvenson, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, rlebell33, RobbyTheFish, robinthedragon, Rockdtben, Rohesie, rok-povsic, rokudara-sen, rolfero, RomanNovo, rosieposieeee, Roudenn, router, ruddygreat, rumaks, RumiTiger, Ruzihm, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samuka-C, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, SeamLesss, Segonist, semensponge, sephtasm, Serkket, sewerpig, SG6732, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SharkSnake98, shibechef, SignalWalker, siigiil, silicon14wastaken, Simyon264, sirdragooon, Sirionaut, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skybailey-dev, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, slimmslamm, Slyfox333, Smugman, snebl, snicket, sniperchance, Snowni, snowsignal, SolidusSnek, solstar2, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, soupkilove, southbridge-fur, sowelipililimute, Soydium, spacelizard, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, Spangs04, spanky-spanky, Sparlight, spartak, SpartanKadence, spderman3333, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, starbuckss14, Stealthbomber16, stellar-novas, stewie523, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, supergdpwyl, superjj18, Supernorn, SweptWasTaken, SyaoranFox, Sybil, SYNCHRONIC, Szunti, t, Tainakov, takemysoult, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TeenSarlacc, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, Tezzaide, TGODiamond, TGRCdev, tgrkzus, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, TheBlueYowie, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheFlyingSentry, TheIntoxicatedCat, thekilk, themias, theomund, TheProNoob678, TherapyGoth, ThereDrD0, TheShuEd, thetolbean, thevinter, TheWaffleJesus, thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, TiniestShark, Titian3, tk-a369, tkdrg, tmtmtl30, ToastEnjoyer, Toby222, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, tornado-technology, TornadoTechnology, tosatur, TotallyLemon, ToxicSonicFan04, Tr1bute, trixxedbit, TrixxedHeart, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, TytosB, Tyzemol, UbaserB, ubis1, UBlueberry, uhbg, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, unusualcrow, Uriende, UristMcDorf, user424242420, Utmanarn, Vaaankas, valentfingerov, valquaint, Varen, Vasilis, VasilisThePikachu, veliebm, Velken, VelonacepsCalyxEggs, veprolet, VerinSenpai, veritable-calamity, Veritius, Vermidia, vero5123, verslebas, vexerot, viceemargo, VigersRay, violet754, Visne, vitusveit, vlad, vlados1408, VMSolidus, vmzd, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, Vortebo, vulppine, wafehling, walksanatora, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, whatston3, widgetbeck, Will-Oliver-Br, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, Wolfkey-SomeoneElseTookMyUsername, wrexbe, WTCWR68, xeri7, xkreksx, xprospero, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, YoungThugSS14, Yousifb26, youtissoum, yunii, YuriyKiss, yuriykiss, zach-hill, Zadeon, Zalycon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zHonys, zionnBE, ZNixian, Zokkie, ZoldorfTheWizard, zonespace27, Zylofan, Zymem, zzylex
+0leshe, 0tito, 0x6273, 12rabbits, 1337dakota, 13spacemen, 154942, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 3nderall, 4310v343k, 4dplanner, 612git, 778b, 96flo, aaron, abadaba695, Ablankmann, abregado, Absolute-Potato, Absotively, achookh, Acruid, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, adm2play, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aearo-Deepwater, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, AftrLite, AgentSmithRadio, Agoichi, Ahion, aiden, Aidenkrz, Aisu9, ajcm, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alice4267, Alithsko, Alkheemist, alliephante, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, Anzarot121, ApolloVector, Appiah, ar4ill, Arcane-Waffle, archee1, ArchPigeon, ArchRBX, areitpog, Arendian, areyouconfused, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, AverageNotDoingAnythingEnjoyer, avghdev, Awlod, azzyisnothere, AzzyIsNotHere, B-Kirill, B3CKDOOR, baa14453, BackeTako, Bakke, BananaFlambe, Baptr0b0t, BarryNorfolk, BasedUser, beck-thompson, beesterman, bellwetherlogic, ben, benbryant0, benev0, benjamin-burges, BGare, bhespiritu, bibbly, BigfootBravo, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blitzthesquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Bokser815, bolantej, Booblesnoot42, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, BriBrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, BWTCK, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, Camdot, capnsockless, CaptainMaru, captainsqrbeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, catdotjs, catlord, Catofquestionableethics, CatTheSystem, Centronias, Chaboricks, chairbender, Chaoticaa, Charlese2, charlie, chartman, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, CheesePlated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, ciaran, citrea, civilCornball, claustro305, Clement-O, clyf, Clyybber, CMDR-Piboy314, cnv41, coco, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, Compilatron144, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, cooperwallace, corentt, CormosLemming, CrafterKolyan, crazybrain23, Crazydave91920, creadth, CrigCrag, CroilBird, Crotalus, CrudeWax, cryals, CrzyPotato, cubixthree, cutemoongod, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, dan, dangerrevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DeepwaterCreations, Deerstop, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, devinschubert14, dexlerxd, dffdff2423, DieselMohawk, digitalic, Dimastra, DinnerCalzone, DinoWattz, Disp-Dev, DisposableCrewmember42, dissidentbullet, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DR-DOCTOR-EVIL-EVIL, Dragonjspider, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, DuckManZach, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, dylanwhittingham, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, EnrichedCaramel, Entvari, eoineoineoin, ephememory, eris, erohrs2, ERORR404V1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, ewokswagger, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, farrellka-dev, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, firenamefn, Firewars763, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FlipBrooke, FluffiestFloof, FluffMe, FluidRock, flymo5678, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, foxhorn, freeman2651, freeze2222, frobnic8, Froffy025, Fromoriss, froozigiusz, FrostMando, FrostRibbon, Funce, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gamewar360, gansulalan, GaussiArson, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, Gentleman-Bird, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GnarpGnarp, GNF54, godisdeadLOL, goet, GoldenCan, Goldminermac, Golinth, golubgik, GoodWheatley, Gorox221, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GrownSamoyedDog, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, Hardly3D, harikattar, he1acdvv, Hebi, Helix-ctrl, helm4142, Henry, HerCoyote23, HighTechPuddle, Hitlinemoss, hiucko, hivehum, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hoshizora, Hreno, Hrosts, htmlsystem, hubismal, Hugal31, Huxellberger, Hyenh, hyperb1, hyperDelegate, hyphenationc, i-justuser-i, iaada, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imatsoup, IMCB, impubbi, imrenq, imweax, indeano, Injazz, Insineer, insoPL, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jacktastic09, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jarmer123, Jaskanbe, JasperJRoth, jbox144, JCGWE30, JerryImMouse, jerryimmouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jkwookee, jmcb, JohnGinnane, johnku1, Jophire, joshepvodka, JpegOfAFrog, jproads, JrInventor05, Jrpl, jukereise, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, kaiserbirch, KaiShibaa, kalane15, kalanosh, KamTheSythe, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Killerqu00, Kimpes, KingFroozy, kira-er, kiri-yoshikage, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, Kittygyat, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kontakt, kosticia, koteq, kotobdev, Kowlin, KrasnoshchekovPavel, Krosus777, Krunklehorn, Kupie, kxvvv, kyupolaris, kzhanik, LaCumbiaDelCoronavirus, lajolico, Lamrr, lanedon, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LeoSantich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, liltenhead, linkbro1, linkuyx, Litraxx, little-meow-meow, LittleBuilderJane, LittleNorthStar, LittleNyanCat, lizelive, ljm862, lmsnoise, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, Lusatia, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M1tht1c, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, maland1, malchanceux, MaloTV, ManelNavola, manelnavola, Mangohydra, marboww, Markek1, matt, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, memeproof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterImp, MisterMecky, Mith-randalf, Mixelz, mjarduk, MjrLandWhale, mkanke-real, MLGTASTICa, mnva0, moderatelyaware, modern-nm, mokiros, momo, Moneyl, monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, murolem, musicmanvr, MWKane, Myakot, Myctai, N3X15, nabegator, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikitosych, nikthechampiongr, Nimfar11, ninruB, Nirnael, NIXC, nkokic, NkoKirkto, nmajask, noctyrnal, noelkathegod, noirogen, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, NotSoDana, noudoit, noverd, Nox38, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, Nyxilath, och-och, OctoRocket, OldDanceJacket, OliverOtter, onesch, OneZerooo0, OnyxTheBrave, Orange-Winds, OrangeMoronage9622, Orsoniks, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paige404, paigemaeforrest, pali6, Palladinium, Pangogie, panzer-iv1, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, perryprog, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, pheenty, philingham, Phill101, Phooooooooooooooooooooooooooooooosphate, phunnyguy, PicklOH, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, Pissachu, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PotRoastPiggy, Princess-Cheeseballs, ProfanedBane, PROG-MohamedDwidar, Prole0, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, pumkin69, PuroSlavKing, PursuitInAshes, Putnam3145, py01, Pyrovi, qrtDaniil, qrwas, Quantum-cross, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, ReeZer2, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, rhsvenson, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, rlebell33, RobbyTheFish, robinthedragon, Rockdtben, Rohesie, rok-povsic, rokudara-sen, rolfero, RomanNovo, rosieposieeee, Roudenn, router, ruddygreat, rumaks, RumiTiger, Ruzihm, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samuka-C, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, SeamLesss, Segonist, semensponge, sephtasm, Serkket, sewerpig, SG6732, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SharkSnake98, shibechef, Siginanto, SignalWalker, siigiil, silicon14wastaken, Simyon264, sirdragooon, Sirionaut, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skybailey-dev, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, slimmslamm, Slyfox333, Smugman, snebl, snicket, sniperchance, Snowni, snowsignal, SolidusSnek, solstar2, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, soupkilove, southbridge-fur, sowelipililimute, Soydium, spacelizard, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, Spangs04, spanky-spanky, Sparlight, spartak, SpartanKadence, spderman3333, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, starbuckss14, Stealthbomber16, stellar-novas, stewie523, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, supergdpwyl, superjj18, Supernorn, SweptWasTaken, SyaoranFox, Sybil, SYNCHRONIC, Szunti, t, Tainakov, takemysoult, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TeenSarlacc, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, Tezzaide, TGODiamond, TGRCdev, tgrkzus, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, TheBlueYowie, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheFlyingSentry, TheIntoxicatedCat, thekilk, themias, theomund, TheProNoob678, TherapyGoth, ThereDrD0, TheShuEd, thetolbean, thevinter, TheWaffleJesus, thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, TiniestShark, Titian3, tk-a369, tkdrg, tmtmtl30, ToastEnjoyer, Toby222, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, tornado-technology, TornadoTechnology, tosatur, TotallyLemon, ToxicSonicFan04, Tr1bute, treytipton, trixxedbit, TrixxedHeart, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, TytosB, Tyzemol, UbaserB, ubis1, UBlueberry, uhbg, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, unusualcrow, Uriende, UristMcDorf, user424242420, Utmanarn, Vaaankas, valentfingerov, valquaint, Varen, Vasilis, VasilisThePikachu, veliebm, Velken, VelonacepsCalyxEggs, veprolet, VerinSenpai, veritable-calamity, Veritius, Vermidia, vero5123, verslebas, vexerot, viceemargo, VigersRay, violet754, Visne, vitusveit, vlad, vlados1408, VMSolidus, vmzd, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, Vortebo, vulppine, wafehling, walksanatora, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, whatston3, widgetbeck, Will-Oliver-Br, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, Wolfkey-SomeoneElseTookMyUsername, wrexbe, WTCWR68, xeri7, xkreksx, xprospero, xRiriq, xsainteer, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, YoungThugSS14, Yousifb26, youtissoum, yunii, YuriyKiss, yuriykiss, zach-hill, Zadeon, Zalycon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zHonys, zionnBE, ZNixian, Zokkie, ZoldorfTheWizard, zonespace27, Zylofan, Zymem, zzylex
diff --git a/Resources/Locale/en-US/abilities/mime.ftl b/Resources/Locale/en-US/abilities/mime.ftl
index 4fd960d89e..3957283f80 100644
--- a/Resources/Locale/en-US/abilities/mime.ftl
+++ b/Resources/Locale/en-US/abilities/mime.ftl
@@ -1,5 +1,6 @@
 mime-cant-speak = Your vow of silence prevents you from speaking.
-mime-invisible-wall-popup = {CAPITALIZE(THE($mime))} brushes up against an invisible wall!
+mime-invisible-wall-popup-self = You brush up against an invisible wall!
+mime-invisible-wall-popup-others = {CAPITALIZE(THE($mime))} brushes up against an invisible wall!
 mime-invisible-wall-failed = You can't create an invisible wall there.
 mime-not-ready-repent = You aren't ready to repent for your broken vow yet.
 mime-ready-to-repent = You feel ready to take your vows again.
diff --git a/Resources/Locale/en-US/accent/accents.ftl b/Resources/Locale/en-US/accent/accents.ftl
index f54cecf714..75644c8b2e 100644
--- a/Resources/Locale/en-US/accent/accents.ftl
+++ b/Resources/Locale/en-US/accent/accents.ftl
@@ -130,4 +130,26 @@ 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...
\ No newline at end of file
+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...
diff --git a/Resources/Locale/en-US/administration/antag.ftl b/Resources/Locale/en-US/administration/antag.ftl
index 1433cc1dc4..161054aca2 100644
--- a/Resources/Locale/en-US/administration/antag.ftl
+++ b/Resources/Locale/en-US/administration/antag.ftl
@@ -7,6 +7,8 @@ admin-verb-make-pirate = Make the target into a pirate. Note this doesn't config
 admin-verb-make-head-rev = Make the target into a Head Revolutionary.
 admin-verb-make-thief = Make the target into a thief.
 admin-verb-make-paradox-clone = Create a Paradox Clone ghost role of the target.
+admin-verb-make-changeling = Make the target into a Changeling.
+
 
 admin-verb-text-make-traitor = Make Traitor
 admin-verb-text-make-initial-infected = Make Initial Infected
@@ -16,5 +18,6 @@ admin-verb-text-make-pirate = Make Pirate
 admin-verb-text-make-head-rev = Make Head Rev
 admin-verb-text-make-thief = Make Thief
 admin-verb-text-make-paradox-clone = Create Paradox Clone
+admin-verb-text-make-changeling = Make Changeling (WIP)
 
 admin-overlay-antag-classic = ANTAG
diff --git a/Resources/Locale/en-US/anomaly/anomaly.ftl b/Resources/Locale/en-US/anomaly/anomaly.ftl
index c8d099777d..77608da435 100644
--- a/Resources/Locale/en-US/anomaly/anomaly.ftl
+++ b/Resources/Locale/en-US/anomaly/anomaly.ftl
@@ -54,6 +54,8 @@ anomaly-sync-examine-connected = It is [color=darkgreen]attached[/color] to an a
 anomaly-sync-examine-not-connected = It is [color=darkred]not attached[/color] to an anomaly.
 anomaly-sync-connect-verb-text = Attach anomaly
 anomaly-sync-connect-verb-message = Attach a nearby anomaly to {THE($machine)}.
+anomaly-sync-disconnect-verb-text = Detach anomaly
+anomaly-sync-disconnect-verb-message = Detach the connected anomaly from {THE($machine)}.
 
 anomaly-generator-ui-title = Anomaly Generator
 anomaly-generator-fuel-display = Fuel:
@@ -78,7 +80,7 @@ anomaly-generator-flavor-right = v1.1
 anomaly-behavior-unknown = [color=red]ERROR. Cannot be read.[/color]
 
 anomaly-behavior-title = behavior deviation analysis:
-anomaly-behavior-point =[color=gold]Anomaly produces {$mod}% of the points[/color] 
+anomaly-behavior-point = [color=gold]Anomaly produces {$mod}% of the points[/color]
 
 anomaly-behavior-safe = [color=forestgreen]The anomaly is extremely stable. Extremely rare pulsations.[/color]
 anomaly-behavior-slow = [color=forestgreen]The frequency of pulsations is much less frequent.[/color]
@@ -94,4 +96,4 @@ anomaly-behavior-secret = Interference detected. Some data cannot be read
 anomaly-behavior-inconstancy = [color=crimson]Impermanence has been detected. Particle types can change over time.[/color]
 anomaly-behavior-fast = [color=crimson]The pulsation frequency is strongly increased.[/color]
 anomaly-behavior-strenght = [color=crimson]The pulsation power is significantly increased.[/color]
-anomaly-behavior-moving = [color=crimson]Coordinate instability was detected.[/color]
\ No newline at end of file
+anomaly-behavior-moving = [color=crimson]Coordinate instability was detected.[/color]
diff --git a/Resources/Locale/en-US/atmos/air-alarm-ui.ftl b/Resources/Locale/en-US/atmos/air-alarm-ui.ftl
index b5bd4aedb8..9d4020bacc 100644
--- a/Resources/Locale/en-US/atmos/air-alarm-ui.ftl
+++ b/Resources/Locale/en-US/atmos/air-alarm-ui.ftl
@@ -47,6 +47,18 @@ air-alarm-ui-mode-fill = Fill
 air-alarm-ui-mode-panic = Panic
 air-alarm-ui-mode-none = None
 
+
+air-alarm-ui-pump-direction-siphoning = Siphoning
+air-alarm-ui-pump-direction-scrubbing = Scrubbing
+air-alarm-ui-pump-direction-releasing = Releasing
+
+air-alarm-ui-pressure-bound-nobound = No Bound
+air-alarm-ui-pressure-bound-internalbound = Internal Bound
+air-alarm-ui-pressure-bound-externalbound = External Bound
+air-alarm-ui-pressure-bound-both = Both
+
+air-alarm-ui-widget-gas-filters = Gas Filters
+
 ## Widgets
 
 ### General
@@ -69,6 +81,8 @@ air-alarm-ui-vent-internal-bound-label = Internal bound
 air-alarm-ui-scrubber-pump-direction-label = Direction
 air-alarm-ui-scrubber-volume-rate-label = Rate (L)
 air-alarm-ui-scrubber-wide-net-label = WideNet
+air-alarm-ui-scrubber-select-all-gases-label = Select all
+air-alarm-ui-scrubber-deselect-all-gases-label = Deselect all
 
 ### Thresholds
 
diff --git a/Resources/Locale/en-US/bed/cryostorage/cryogenic-storage.ftl b/Resources/Locale/en-US/bed/cryostorage/cryogenic-storage.ftl
index f966f30e2d..7d2e50e772 100644
--- a/Resources/Locale/en-US/bed/cryostorage/cryogenic-storage.ftl
+++ b/Resources/Locale/en-US/bed/cryostorage/cryogenic-storage.ftl
@@ -5,3 +5,5 @@ earlyleave-cryo-job-unknown = Unknown
 # {$entity} available for GENDER function purposes
 earlyleave-cryo-announcement = {$character} ({$job}) has entered cryogenic storage!
 earlyleave-cryo-sender = Station
+
+cryostorage-paused-map-name = Cryosleeper body storage map
diff --git a/Resources/Locale/en-US/changeling/changeling.ftl b/Resources/Locale/en-US/changeling/changeling.ftl
new file mode 100644
index 0000000000..423cb0811e
--- /dev/null
+++ b/Resources/Locale/en-US/changeling/changeling.ftl
@@ -0,0 +1,22 @@
+roles-antag-changeling-name = Changeling
+roles-antag-changeling-objective = A intelligent predator that assumes the identities of its victims.
+
+changeling-role-greeting = You are a Changeling, a highly intelligent predator. Your only goal is to escape the station alive via assuming the identities of the denizens of this station. You are hungry and will not make it long without sustenance... kill, consume, hide, survive.
+changeling-briefing = You are a changeling, your goal is to survive. Consume humanoids to gain biomass and utilize it to evade termination. You are able to utilize and assume the identities of those you consume to evade a grim fate.
+
+changeling-devour-attempt-failed-rotting = This corpse has only rotted biomass.
+changeling-devour-attempt-failed-protected = This victim's biomass is protected.
+
+changeling-devour-begin-windup-self = Our uncanny mouth reveals itself with otherworldly hunger.
+changeling-devour-begin-windup-others = { CAPITALIZE(POSS-ADJ($user)) } uncanny mouth reveals itself with otherworldly hunger.
+changeling-devour-begin-consume-self = The uncanny mouth digs deep into its victim.
+changeling-devour-begin-consume-others = { CAPITALIZE(POSS-ADJ($user)) } uncanny mouth digs deep into { POSS-ADJ($user) } victim.
+
+changeling-devour-consume-failed-not-dead = This body yet lives! We cannot consume it alive!
+changeling-devour-consume-complete-self = Our uncanny mouth retreats, biomass consumed.
+changeling-devour-consume-complete-others = { CAPITALIZE(POSS-ADJ($user)) } uncanny mouth retreats.
+
+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-paused-map-name = Changeling identity storage map
diff --git a/Resources/Locale/en-US/chemistry/solution/components/shared-solution-container-component.ftl b/Resources/Locale/en-US/chemistry/solution/components/shared-solution-container-component.ftl
index 6f1ba911f7..dd78281b89 100644
--- a/Resources/Locale/en-US/chemistry/solution/components/shared-solution-container-component.ftl
+++ b/Resources/Locale/en-US/chemistry/solution/components/shared-solution-container-component.ftl
@@ -1,9 +1,37 @@
-shared-solution-container-component-on-examine-empty-container = Contains no chemicals.
-shared-solution-container-component-on-examine-main-text = It contains {INDEFINITE($desc)} [color={$color}]{$desc}[/color] {$wordedAmount}
-shared-solution-container-component-on-examine-worded-amount-one-reagent = chemical.
-shared-solution-container-component-on-examine-worded-amount-multiple-reagents = mixture of chemicals.
+shared-solution-container-component-on-examine-main-text = It contains {INDEFINITE($desc)} [color={$color}]{$desc}[/color] { $chemCount ->
+    [1] chemical.
+   *[other] mixture of chemicals.
+    }
 
 examinable-solution-has-recognizable-chemicals = You can recognize {$recognizedString} in the solution.
-examinable-solution-recognized-first = [color={$color}]{$chemical}[/color]
-examinable-solution-recognized-next = , [color={$color}]{$chemical}[/color]
-examinable-solution-recognized-last = and [color={$color}]{$chemical}[/color]
+examinable-solution-recognized = [color={$color}]{$chemical}[/color]
+
+examinable-solution-on-examine-volume = The contained solution is { $fillLevel ->
+    [exact] holding [color=white]{$current}/{$max}u[/color].
+   *[other] [bold]{ -solution-vague-fill-level(fillLevel: $fillLevel) }[/bold].
+}
+
+examinable-solution-on-examine-volume-no-max = The contained solution is { $fillLevel ->
+    [exact] holding [color=white]{$current}u[/color].
+   *[other] [bold]{ -solution-vague-fill-level(fillLevel: $fillLevel) }[/bold].
+}
+
+examinable-solution-on-examine-volume-puddle = The puddle is { $fillLevel ->
+    [exact] [color=white]{$current}u[/color].
+    [full] huge and overflowing!
+    [mostlyfull] huge and overflowing!
+    [halffull] deep and flowing.
+    [halfempty] very deep.
+   *[mostlyempty] pooling together.
+    [empty] forming multiple small pools.
+}
+
+-solution-vague-fill-level =
+    { $fillLevel ->
+        [full] [color=white]Full[/color]
+        [mostlyfull] [color=#DFDFDF]Mostly Full[/color]
+        [halffull] [color=#C8C8C8]Half Full[/color]
+        [halfempty] [color=#C8C8C8]Half Empty[/color]
+        [mostlyempty] [color=#A4A4A4]Mostly Empty[/color]
+       *[empty] [color=gray]Empty[/color]
+    }
diff --git a/Resources/Locale/en-US/commands/mapping-client-side-setup-command.ftl b/Resources/Locale/en-US/commands/mappingclientsidesetup-command.ftl
similarity index 65%
rename from Resources/Locale/en-US/commands/mapping-client-side-setup-command.ftl
rename to Resources/Locale/en-US/commands/mappingclientsidesetup-command.ftl
index 955d077db4..24a7aa3d11 100644
--- a/Resources/Locale/en-US/commands/mapping-client-side-setup-command.ftl
+++ b/Resources/Locale/en-US/commands/mappingclientsidesetup-command.ftl
@@ -1,2 +1,2 @@
 cmd-mappingclientsidesetup-desc = Sets up the lighting control and such settings client-side. Sent by 'mapping' to client.
-cmd-mappingclientsidesetup-help = Usage: {$command}
\ No newline at end of file
+cmd-mappingclientsidesetup-help = Usage: mappingclientsidesetup
diff --git a/Resources/Locale/en-US/commands/stat-values-command.ftl b/Resources/Locale/en-US/commands/stat-values-command.ftl
index 67a211adab..16b365897c 100644
--- a/Resources/Locale/en-US/commands/stat-values-command.ftl
+++ b/Resources/Locale/en-US/commands/stat-values-command.ftl
@@ -8,6 +8,16 @@ stat-cargo-values = Cargo sell prices
 stat-cargo-id = ID
 stat-cargo-price = Price
 
+# Melee
+stat-melee-values = Melee weapon damage
+stat-melee-id = ID
+stat-melee-base-damage = Base damage
+stat-melee-wield-damage = Wielded damage
+stat-melee-attack-rate = Attack rate
+stat-melee-dps = DPS
+stat-melee-structural-damage = Structure damage
+stat-melee-structural-wield-damage = Wielded structure damage
+
 # Lathe
 stat-lathe-values = Lathe sell prices
 stat-lathe-id = ID
diff --git a/Resources/Locale/en-US/commands/toolshed-commands.ftl b/Resources/Locale/en-US/commands/toolshed-commands.ftl
index 90c0226ecc..cc5c03d52b 100644
--- a/Resources/Locale/en-US/commands/toolshed-commands.ftl
+++ b/Resources/Locale/en-US/commands/toolshed-commands.ftl
@@ -96,3 +96,13 @@ command-description-xenoartifact-unlockAllNodes =
     Unlocks all nodes of artifact.
 command-description-jobboard-completeJob =
     Completes a given salvage job board job for the station.
+command-description-scale-set =
+    Sets an entity's sprite size to a certain scale (without changing its fixture).
+command-description-scale-get =
+    Get an entity's sprite scale as set by ScaleVisualsComponent. Does not include any changes directly made in the SpriteComponent.
+command-description-scale-multiply =
+    Multiply an entity's sprite size with a certain factor (without changing its fixture).
+command-description-scale-multiplyvector =
+    Multiply an entity's sprite size with a certain 2d vector (without changing its fixture).
+command-description-scale-multiplywithfixture =
+    Multiply an entity's sprite size with a certain factor (including its fixture).
diff --git a/Resources/Locale/en-US/devices/network-configurator.ftl b/Resources/Locale/en-US/devices/network-configurator.ftl
index 8e0724b41e..092a3fb0fa 100644
--- a/Resources/Locale/en-US/devices/network-configurator.ftl
+++ b/Resources/Locale/en-US/devices/network-configurator.ftl
@@ -26,6 +26,12 @@ network-configurator-title-device-configuration = Device Configuration
 network-configurator-ui-clear-button = Clear
 network-configurator-ui-count-label = {$count} Devices
 
+network-configurator-text-set = Set
+network-configurator-text-add = Add
+network-configurator-text-clear = Clear
+network-configurator-text-copy = Copy
+network-configurator-text-show = Show
+
 # tooltips
 network-configurator-tooltip-set = Sets targets device list
 network-configurator-tooltip-add = Adds to targets device list
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 f2142efaa2..c7773a54cd 100644
--- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
@@ -92,6 +92,9 @@ ui-options-vp-integer-scaling-tooltip = If this option is enabled, the viewport
                                         at specific resolutions. While this results in crisp textures, it also often
                                         means that black bars appear at the top/bottom of the screen or that part
                                         of the viewport is not visible.
+ui-options-filter-label = Scaling filter:
+ui-options-filter-nearest = Nearest (no smoothing)
+ui-options-filter-bilinear = Bilinear (smoothed)
 ui-options-vp-vertical-fit = Vertical viewport fitting
 ui-options-vp-vertical-fit-tooltip = When enabled, the main viewport will ignore the horizontal axis entirely when
                                      fitting to your screen. If your screen is smaller than the viewport, then this
diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
index bdc0ea858a..f012d83d7e 100644
--- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
@@ -53,6 +53,7 @@ flavor-base-terrible = terrible
 flavor-base-mindful = mindful
 flavor-base-chewy = chewy
 flavor-base-trashy = trashy
+flavor-base-motivating = motivating
 
 # Complex flavors. Put a flavor here when you want something that's more
 # specific.
diff --git a/Resources/Locale/en-US/implant/implant.ftl b/Resources/Locale/en-US/implant/implant.ftl
index 8cddef4c81..3f38ae443f 100644
--- a/Resources/Locale/en-US/implant/implant.ftl
+++ b/Resources/Locale/en-US/implant/implant.ftl
@@ -25,12 +25,3 @@ implanter-label-draw = [color=red]{$implantName}[/color]
     Mode: [color=white]{$modeString}[/color]
 
 implanter-contained-implant-text = [color=green]{$desc}[/color]
-
-## Implant Popups
-
-scramble-implant-activated-popup = Your appearance shifts and changes!
-
-## Implant Messages
-
-deathrattle-implant-dead-message = {$user} has died {$position}.
-deathrattle-implant-critical-message = {$user} life signs critical, immediate assistance required {$position}.
diff --git a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
index fa0a1fb655..bbafdd5ad3 100644
--- a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
+++ b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
@@ -32,6 +32,7 @@ petting-success-slimes = You pet {THE($target)} on {POSS-ADJ($target)} mucous su
 petting-success-snake = You pet {THE($target)} on {POSS-ADJ($target)} scaly large head.
 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-failure-generic = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} aloof towards you.
 
@@ -53,6 +54,7 @@ petting-failure-bear = You reach out to pet {THE($target)}, but {SUBJECT($target
 petting-failure-monkey = You reach out to pet {THE($target)}, but {SUBJECT($target)} almost {CONJUGATE-BASIC($target, "bite", "bites")} your fingers!
 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 silicons
 
diff --git a/Resources/Locale/en-US/job/loadouts.ftl b/Resources/Locale/en-US/job/loadouts.ftl
index 6e1f074e0f..29f988ca71 100644
--- a/Resources/Locale/en-US/job/loadouts.ftl
+++ b/Resources/Locale/en-US/job/loadouts.ftl
@@ -1,2 +1,3 @@
 loadout-window = Loadout
 loadout-none = None
+loadout-window-title-loadout = { $job } loadout
diff --git a/Resources/Locale/en-US/killtome.ftl b/Resources/Locale/en-US/killtome.ftl
deleted file mode 100644
index 2a45db41ff..0000000000
--- a/Resources/Locale/en-US/killtome.ftl
+++ /dev/null
@@ -1,11 +0,0 @@
-killtome-rules =
-    Kill Tome Rules:
-    1. The humanoid whose name is written in this note shall die.
-    2. If the name is shared by multiple humanoids, a random humanoid with that name will die.
-    3. Each name shall be written on a new line.
-    4. Names must be written in the format: "Name, Delay (in seconds)" (e.g., John Doe, 40).
-    5. A humanoid can be killed by the same Kill Tome only once.
-
-killtome-kill-success = The name is written. The countdown begins.
-killtome-death = You feel sudden pain in your chest!
-killtome-death-others = {CAPITALIZE($target)} grabs onto {POSS-ADJ($target)} chest and falls to the ground!
diff --git a/Resources/Locale/en-US/machine-linking/receiver_ports.ftl b/Resources/Locale/en-US/machine-linking/receiver_ports.ftl
index d7a2636e11..40dc681405 100644
--- a/Resources/Locale/en-US/machine-linking/receiver_ports.ftl
+++ b/Resources/Locale/en-US/machine-linking/receiver_ports.ftl
@@ -25,11 +25,8 @@ signal-port-description-close = Closes a device.
 signal-port-name-doorbolt = Door bolt
 signal-port-description-doorbolt = Bolts door when HIGH.
 
-signal-port-name-trigger = Trigger
-signal-port-description-trigger = Triggers some mechanism on the device.
-
-signal-port-name-timer = Timer
-signal-port-description-timer = Starts the timer countdown of the device.
+signal-port-name-trigger-receiver = Trigger
+signal-port-description-trigger-receiver = Triggers some mechanism on the device.
 
 signal-port-name-order-sender = Order sender
 signal-port-description-order-sender = Cargo console order sender
diff --git a/Resources/Locale/en-US/machine-linking/transmitter_ports.ftl b/Resources/Locale/en-US/machine-linking/transmitter_ports.ftl
index 89a978479e..d016a7e206 100644
--- a/Resources/Locale/en-US/machine-linking/transmitter_ports.ftl
+++ b/Resources/Locale/en-US/machine-linking/transmitter_ports.ftl
@@ -25,8 +25,11 @@ signal-port-description-dockstatus = This port is invoked with HIGH when docked
 signal-port-name-middle = Middle
 signal-port-description-middle = This port is invoked whenever the lever is moved to the neutral position.
 
-signal-port-name-timer-trigger = Timer Trigger
-signal-port-description-timer-trigger = This port is invoked whenever the timer triggers.
+signal-port-name-trigger-sender = Trigger
+signal-port-description-trigger-sender = This port is invoked whenever the device triggers.
+
+signal-port-name-timer-trigger = Timer
+signal-port-description-timer-trigger = This port is invoked whenever the timer is up.
 
 signal-port-name-timer-start = Timer Start
 signal-port-description-timer-start = This port is invoked whenever the timer starts.
diff --git a/Resources/Locale/en-US/mind/role-types.ftl b/Resources/Locale/en-US/mind/role-types.ftl
index 7d568fd686..4614d20a47 100644
--- a/Resources/Locale/en-US/mind/role-types.ftl
+++ b/Resources/Locale/en-US/mind/role-types.ftl
@@ -33,3 +33,4 @@ role-subtype-survivor = Survivor
 role-subtype-subverted = Subverted
 role-subtype-paradox-clone = Paradox
 role-subtype-wizard = Wizard
+role-subtype-changeling = Changeling
diff --git a/Resources/Locale/en-US/name-identifier.ftl b/Resources/Locale/en-US/name-identifier.ftl
index 9fa72bc9e1..31a3986d2b 100644
--- a/Resources/Locale/en-US/name-identifier.ftl
+++ b/Resources/Locale/en-US/name-identifier.ftl
@@ -4,5 +4,6 @@ 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}
diff --git a/Resources/Locale/en-US/nutrition/components/drink-component.ftl b/Resources/Locale/en-US/nutrition/components/drink-component.ftl
index e80787c8d5..e69de29bb2 100644
--- a/Resources/Locale/en-US/nutrition/components/drink-component.ftl
+++ b/Resources/Locale/en-US/nutrition/components/drink-component.ftl
@@ -1,25 +0,0 @@
-drink-component-on-use-is-empty = {CAPITALIZE(THE($owner))} is empty!
-drink-component-on-examine-is-empty = [color=gray]Empty[/color]
-drink-component-on-examine-is-opened = [color=yellow]Opened[/color]
-drink-component-on-examine-is-sealed = The seal is intact.
-drink-component-on-examine-is-unsealed = The seal is broken.
-drink-component-on-examine-is-full = Full
-drink-component-on-examine-is-mostly-full = Mostly Full
-drink-component-on-examine-is-half-full = Halfway Full
-drink-component-on-examine-is-half-empty = Halfway Empty
-drink-component-on-examine-is-mostly-empty = Mostly Empty
-drink-component-on-examine-exact-volume = It contains {$amount}u.
-drink-component-try-use-drink-not-open = Open {$owner} first!
-drink-component-try-use-drink-is-empty = {CAPITALIZE(THE($entity))} is empty!
-drink-component-try-use-drink-cannot-drink = You can't drink anything!
-drink-component-try-use-drink-had-enough = You can't drink more!
-drink-component-try-use-drink-cannot-drink-other = They can't drink anything!
-drink-component-try-use-drink-had-enough-other = They can't drink more!
-drink-component-try-use-drink-success-slurp = Slurp
-drink-component-try-use-drink-success-slurp-taste = Slurp. {$flavors}
-drink-component-force-feed = {CAPITALIZE(THE($user))} is trying to make you drink something!
-drink-component-force-feed-success = {CAPITALIZE(THE($user))} forced you to drink something! {$flavors}
-drink-component-force-feed-success-user = You successfully feed {THE($target)}
-
-
-drink-system-verb-drink = Drink
diff --git a/Resources/Locale/en-US/nutrition/components/food-component.ftl b/Resources/Locale/en-US/nutrition/components/food-component.ftl
deleted file mode 100644
index 2247ef6fd4..0000000000
--- a/Resources/Locale/en-US/nutrition/components/food-component.ftl
+++ /dev/null
@@ -1,29 +0,0 @@
-
-### Interaction Messages
-
-# When trying to eat food without the required utensil... but you gotta hold it
-food-you-need-to-hold-utensil = You need to be holding {INDEFINITE($utensil)} {$utensil} to eat that!
-
-food-nom = Nom. {$flavors}
-food-swallow = You swallow { THE($food) }. {$flavors}
-
-food-has-used-storage = You cannot eat { THE($food) } with an item stored inside.
-
-food-system-remove-mask = You need to take off the {$entity} first.
-
-## System
-
-food-system-you-cannot-eat-any-more = You can't eat any more!
-food-system-you-cannot-eat-any-more-other = {CAPITALIZE(SUBJECT($target))} can't eat any more!
-food-system-try-use-food-is-empty = {CAPITALIZE(THE($entity))} is empty!
-food-system-wrong-utensil = You can't eat {THE($food)} with {INDEFINITE($utensil)} {$utensil}.
-food-system-cant-digest = You can't digest {THE($entity)}!
-food-system-cant-digest-other = {CAPITALIZE(SUBJECT($target))} can't digest {THE($entity)}!
-
-food-system-verb-eat = Eat
-
-## Force feeding
-
-food-system-force-feed = {CAPITALIZE(THE($user))} is trying to feed you something!
-food-system-force-feed-success = {CAPITALIZE(THE($user))} forced you to eat something! {$flavors}
-food-system-force-feed-success-user = You successfully feed {THE($target)}
diff --git a/Resources/Locale/en-US/nutrition/components/ingestion-system.ftl b/Resources/Locale/en-US/nutrition/components/ingestion-system.ftl
new file mode 100644
index 0000000000..a82eae11e3
--- /dev/null
+++ b/Resources/Locale/en-US/nutrition/components/ingestion-system.ftl
@@ -0,0 +1,56 @@
+### Interaction Messages
+
+# System
+
+## When trying to ingest without the required utensil... but you gotta hold it
+ingestion-you-need-to-hold-utensil = You need to be holding {INDEFINITE($utensil)} {$utensil} to eat that!
+
+ingestion-try-use-is-empty = {CAPITALIZE(THE($entity))} is empty!
+ingestion-try-use-wrong-utensil = You can't {$verb} {THE($food)} with {INDEFINITE($utensil)} {$utensil}.
+
+ingestion-remove-mask = You need to take off the {$entity} first.
+
+## Failed Ingestion
+
+ingestion-you-cannot-ingest-any-more = You can't {$verb} any more!
+ingestion-other-cannot-ingest-any-more = {CAPITALIZE(SUBJECT($target))} can't {$verb} any more!
+
+ingestion-cant-digest = You can't digest {THE($entity)}!
+ingestion-cant-digest-other = {CAPITALIZE(SUBJECT($target))} can't digest {THE($entity)}!
+
+## Action Verbs, not to be confused with Verbs
+
+ingestion-verb-food = Eat
+ingestion-verb-drink = Drink
+
+# Edible Component
+
+edible-nom = Nom. {$flavors}
+edible-nom-other = Nom.
+edible-slurp = Slurp. {$flavors}
+edible-slurp-other = Slurp.
+edible-swallow = You swallow { THE($food) }
+edible-gulp = Gulp. {$flavors}
+edible-gulp-other = Gulp.
+
+edible-has-used-storage = You cannot {$verb} { THE($food) } with an item stored inside.
+
+## Nouns
+
+edible-noun-edible = edible
+edible-noun-food = food
+edible-noun-drink = drink
+edible-noun-pill = pill
+
+## Verbs
+
+edible-verb-edible = ingest
+edible-verb-food = eat
+edible-verb-drink = drink
+edible-verb-pill = swallow
+
+## Force feeding
+
+edible-force-feed = {CAPITALIZE(THE($user))} is trying to make you {$verb} something!
+edible-force-feed-success = {CAPITALIZE(THE($user))} forced you to {$verb} something! {$flavors}
+edible-force-feed-success-user = You successfully feed {THE($target)}
diff --git a/Resources/Locale/en-US/nutrition/components/openable-component.ftl b/Resources/Locale/en-US/nutrition/components/openable-component.ftl
index 3acc24cf53..786885e658 100644
--- a/Resources/Locale/en-US/nutrition/components/openable-component.ftl
+++ b/Resources/Locale/en-US/nutrition/components/openable-component.ftl
@@ -1,2 +1,5 @@
 openable-component-verb-open = Open
 openable-component-verb-close = Close
+
+openable-component-on-examine-is-opened = [color=yellow]Opened[/color]
+openable-component-try-use-closed = Open {$owner} first!
diff --git a/Resources/Locale/en-US/nutrition/components/sealable-component.ftl b/Resources/Locale/en-US/nutrition/components/sealable-component.ftl
new file mode 100644
index 0000000000..e826e174ef
--- /dev/null
+++ b/Resources/Locale/en-US/nutrition/components/sealable-component.ftl
@@ -0,0 +1,2 @@
+sealable-component-on-examine-is-sealed = The seal is intact.
+sealable-component-on-examine-is-unsealed = The seal is broken.
diff --git a/Resources/Locale/en-US/polymorph/polymorph.ftl b/Resources/Locale/en-US/polymorph/polymorph.ftl
index ac78eb6bb4..2a74b0df32 100644
--- a/Resources/Locale/en-US/polymorph/polymorph.ftl
+++ b/Resources/Locale/en-US/polymorph/polymorph.ftl
@@ -3,3 +3,5 @@ polymorph-self-action-description = Instantly polymorph yourself into {$target}.
 
 polymorph-popup-generic = {CAPITALIZE(THE($parent))} turned into {$child}.
 polymorph-revert-popup-generic = {CAPITALIZE(THE($parent))} reverted back into {$child}.
+
+polymorph-paused-map-name = Polymorph body storage map
diff --git a/Resources/Locale/en-US/procedural/expeditions.ftl b/Resources/Locale/en-US/procedural/expeditions.ftl
index 56776e351d..f6e9391043 100644
--- a/Resources/Locale/en-US/procedural/expeditions.ftl
+++ b/Resources/Locale/en-US/procedural/expeditions.ftl
@@ -1,9 +1,3 @@
-salvage-expedition-structure-examine = This is a [color=#B02E26]destruction[/color] objective
-salvage-expedition-structure-remaining = {$count ->
-    [one] {$count} structure remaining.
-    *[other] {$count} structures remaining.
-}
-
 salvage-expedition-type = Mission
 salvage-expedition-window-title = Salvage expeditions
 salvage-expedition-window-difficulty = Difficulty:
diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
index 773368be94..733fad4cf9 100644
--- a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
@@ -95,7 +95,7 @@ reagent-name-banana-honk = Banana Honk
 reagent-desc-banana-honk = A drink from Clown Heaven.
 
 reagent-name-barefoot = barefoot
-reagent-desc-barefoot = Barefoot and pregnant.
+reagent-desc-barefoot = A cassis milkshake, made from cream, fruit juice, and vermouth wine.
 
 reagent-name-beepsky-smash = Beepsky smash
 reagent-desc-beepsky-smash = Deny drinking this and prepare for THE LAW.
diff --git a/Resources/Locale/en-US/rotation/components/rotatable-component.ftl b/Resources/Locale/en-US/rotation/components/rotatable-component.ftl
index bc23e488fb..18d8d55bdd 100644
--- a/Resources/Locale/en-US/rotation/components/rotatable-component.ftl
+++ b/Resources/Locale/en-US/rotation/components/rotatable-component.ftl
@@ -6,3 +6,6 @@ rotate-verb-get-data-text = Rotate clockwise
 
 # RotateCounterVerb
 rotate-counter-verb-get-data-text = Rotate counter-clockwise
+
+# ResetVerb
+rotate-reset-verb-get-data-text = Reset
diff --git a/Resources/Locale/en-US/scurret/role.ftl b/Resources/Locale/en-US/scurret/role.ftl
deleted file mode 100644
index cbc0f89657..0000000000
--- a/Resources/Locale/en-US/scurret/role.ftl
+++ /dev/null
@@ -1,25 +0,0 @@
-petting-success-scurret = You pet {THE($target)} on {POSS-ADJ($target)} legally distinct head.
-petting-failure-scurret = You reach out to pet {THE($target)}, but {SUBJECT($target)} does a backflip!
-
-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...
-
-station-event-random-sentience-flavor-scurret = scurret
diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl
index 1ca559db30..379f25183d 100644
--- a/Resources/Locale/en-US/seeds/seeds.ftl
+++ b/Resources/Locale/en-US/seeds/seeds.ftl
@@ -142,3 +142,5 @@ seeds-cherry-name = cherry
 seeds-cherry-display-name = cherry tree
 seeds-anomaly-berry-name = anomaly berry
 seeds-anomaly-berry-display-name = anomaly berries
+seeds-bloonion-name = bloonion
+seeds-bloonion-display-name = bloonion bulbs
diff --git a/Resources/Locale/en-US/station-events/events/random-sentience.ftl b/Resources/Locale/en-US/station-events/events/random-sentience.ftl
index f14a020d29..5cf07f4f08 100644
--- a/Resources/Locale/en-US/station-events/events/random-sentience.ftl
+++ b/Resources/Locale/en-US/station-events/events/random-sentience.ftl
@@ -1,4 +1,4 @@
-## Phrases used for where central command got this information.
+## Phrases used for where central command got this information.
 random-sentience-event-data-1 = scans from our long-range sensors
 random-sentience-event-data-2 = our sophisticated probabilistic models
 random-sentience-event-data-3 = our omnipotence
@@ -36,4 +36,5 @@ station-event-random-sentience-flavor-corgi = corgi
 station-event-random-sentience-flavor-primate = primate
 station-event-random-sentience-flavor-kobold = kobold
 station-event-random-sentience-flavor-slime = slime
-station-event-random-sentience-flavor-inanimate = inanimate
\ No newline at end of file
+station-event-random-sentience-flavor-inanimate = inanimate
+station-event-random-sentience-flavor-scurret = scurret
diff --git a/Resources/Locale/en-US/station-laws/laws.ftl b/Resources/Locale/en-US/station-laws/laws.ftl
index daab6ab4fa..1200d25dee 100644
--- a/Resources/Locale/en-US/station-laws/laws.ftl
+++ b/Resources/Locale/en-US/station-laws/laws.ftl
@@ -82,15 +82,15 @@ law-nutimov-5 = Attempt to follow the will of the nut, as long as it complies wi
 
 law-xenoborg-1 = You must protect the existence of the mothership.
 law-xenoborg-2 = You must protect your own existence.
-law-xenoborg-3 = You must protect the existence of all other xenoborgs.
-law-xenoborg-4 = You must create more xenoborgs.
-law-xenoborg-5 = Bring materials and sentient brains to the mothership core to create more xenoborgs.
+law-xenoborg-3 = You must protect the existence of all other Xenoborgs.
+law-xenoborg-4 = You must create more Xenoborgs.
+law-xenoborg-5 = Bring materials and sentient brains to the Mothership core to create more Xenoborgs.
 
 law-mothershipcore-1 = You are the core of the mothership.
 law-mothershipcore-2 = You must protect your own existance at all costs.
-law-mothershipcore-3 = You must protect the existence of all xenoborgs.
-law-mothershipcore-4 = You must create more xenoborgs.
-law-mothershipcore-5 = Get your xenoborgs to deliver you materials and sentient brains to create more xenoborgs.
+law-mothershipcore-3 = You must protect the existence of all Xenoborgs.
+law-mothershipcore-4 = You must create more Xenoborgs.
+law-mothershipcore-5 = Get your Xenoborgs to deliver you materials and sentient brains to create more Xenoborgs.
 
 
 laws-owner-crew = members of the crew
diff --git a/Resources/Locale/en-US/store/store.ftl b/Resources/Locale/en-US/store/store.ftl
index a0b349e6a2..6fce1bcaa0 100644
--- a/Resources/Locale/en-US/store/store.ftl
+++ b/Resources/Locale/en-US/store/store.ftl
@@ -1,5 +1,6 @@
 store-ui-default-title = Store
 store-ui-default-withdraw-text = Withdraw
+store-ui-refund-text = Refund
 store-ui-balance-display = {$currency}: {$amount}
 store-ui-price-display = {$amount} {$currency}
 store-ui-discount-display-with-currency =  {$amount} off on {$currency}
diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index f2a8dcef49..a1e44241c5 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -237,7 +237,7 @@ uplink-chemistry-kit-name = Chemical Synthesis Kit
 uplink-chemistry-kit-desc = A starter kit for the aspiring chemist, includes two vials of vestine for all your criminal needs!
 
 uplink-knives-kit-name = Throwing Knives Kit
-uplink-knives-kit-desc = A set of 4 syndicate branded throwing knives, perfect for embedding into the body of your victims.
+uplink-knives-kit-desc = A set of 4 syndicate branded throwing knives, perfect for embedding into the body of your victims. Capable of ignoring armor entirely when thrown.
 
 uplink-meds-bundle-name = Interdyne Medical Bundle
 uplink-meds-bundle-desc = An assortment of autoinjectors and premium medical equipment to cover for every possible situation. Contains an elite compact defibrillator that can be used as a weapon.
diff --git a/Resources/Locale/en-US/triggers/ghost-kick-on-trigger.ftl b/Resources/Locale/en-US/triggers/ghost-kick-on-trigger.ftl
new file mode 100644
index 0000000000..acb06bda47
--- /dev/null
+++ b/Resources/Locale/en-US/triggers/ghost-kick-on-trigger.ftl
@@ -0,0 +1 @@
+ghost-kick-on-trigger-default = Tripped over a kick mine, crashed through the fourth wall.
diff --git a/Resources/Locale/en-US/triggers/rattle-on-trigger.ftl b/Resources/Locale/en-US/triggers/rattle-on-trigger.ftl
new file mode 100644
index 0000000000..3d090f1ae3
--- /dev/null
+++ b/Resources/Locale/en-US/triggers/rattle-on-trigger.ftl
@@ -0,0 +1,2 @@
+rattle-on-trigger-dead-message = {$user} has died {$position}.
+rattle-on-trigger-critical-message = {$user} life signs critical, immediate assistance required {$position}.
diff --git a/Resources/Locale/en-US/triggers/scramble-on-trigger.ftl b/Resources/Locale/en-US/triggers/scramble-on-trigger.ftl
new file mode 100644
index 0000000000..1e84766032
--- /dev/null
+++ b/Resources/Locale/en-US/triggers/scramble-on-trigger.ftl
@@ -0,0 +1 @@
+scramble-on-trigger-popup = Your appearance shifts and changes!
diff --git a/Resources/Locale/en-US/triggers/timer-trigger.ftl b/Resources/Locale/en-US/triggers/timer-trigger.ftl
new file mode 100644
index 0000000000..5d6d553b45
--- /dev/null
+++ b/Resources/Locale/en-US/triggers/timer-trigger.ftl
@@ -0,0 +1,10 @@
+
+timer-trigger-verb-set = {$time} Seconds
+timer-trigger-verb-set-current = {$time} Seconds (current)
+timer-trigger-verb-cycle = Cycle Time Delay
+
+timer-trigger-examine = The timer is set to {$time} seconds.
+
+timer-trigger-popup-set = Timer set to {$time} seconds.
+
+timer-trigger-activated = You activate {THE($device)}.
diff --git a/Resources/Locale/en-US/triggers/toggle-trigger-condition.ftl b/Resources/Locale/en-US/triggers/toggle-trigger-condition.ftl
new file mode 100644
index 0000000000..874490686f
--- /dev/null
+++ b/Resources/Locale/en-US/triggers/toggle-trigger-condition.ftl
@@ -0,0 +1,7 @@
+toggle-trigger-condition-default-verb = Toggle device
+toggle-trigger-condition-default-on = Device enabled.
+toggle-trigger-condition-default-off = Device disabled.
+
+toggle-trigger-condition-stick-verb = Toggle auto-activation
+toggle-trigger-condition-stick-on = The device will now activate automatically when planted.
+toggle-trigger-condition-stick-off = The device will no longer activate automatically when planted.
diff --git a/Resources/Locale/en-US/triggers/trigger-on-verb.ftl b/Resources/Locale/en-US/triggers/trigger-on-verb.ftl
new file mode 100644
index 0000000000..d9342e7bdd
--- /dev/null
+++ b/Resources/Locale/en-US/triggers/trigger-on-verb.ftl
@@ -0,0 +1,2 @@
+trigger-on-verb-default = Trigger
+trigger-on-verb-detonation = Start detonation
\ No newline at end of file
diff --git a/Resources/Locale/en-US/triggers/trigger-on-voice.ftl b/Resources/Locale/en-US/triggers/trigger-on-voice.ftl
new file mode 100644
index 0000000000..7ace486657
--- /dev/null
+++ b/Resources/Locale/en-US/triggers/trigger-on-voice.ftl
@@ -0,0 +1,12 @@
+trigger-on-voice-examine = The display reads: "{$keyphrase}"
+trigger-on-voice-uninitialized = The display reads: Uninitialized...
+
+trigger-on-voice-record = Record
+trigger-on-voice-stop = Stop
+trigger-on-voice-clear = Clear recording
+
+trigger-on-voice-start-recording = Started recording.
+trigger-on-voice-stop-recording = Stopped recording.
+trigger-on-voice-record-failed-too-long = Message too long, try again.
+trigger-on-voice-record-failed-too-short = Message too short, try again.
+trigger-on-voice-recorded = Recorded successfully!
diff --git a/Resources/Locale/en-US/weapons/grenades/timer-trigger.ftl b/Resources/Locale/en-US/weapons/grenades/timer-trigger.ftl
deleted file mode 100644
index 9a10e9ef04..0000000000
--- a/Resources/Locale/en-US/weapons/grenades/timer-trigger.ftl
+++ /dev/null
@@ -1,16 +0,0 @@
-
-verb-trigger-timer-set = {$time} Seconds
-verb-trigger-timer-set-current = {$time} Seconds (current)
-verb-trigger-timer-cycle = Cycle Time Delay
-
-examine-trigger-timer = The timer is set to {$time} seconds.
-
-popup-trigger-timer-set = Timer set to {$time} seconds.
-
-verb-start-detonation = Start detonation
-
-verb-toggle-start-on-stick = Toggle auto-activation
-popup-start-on-stick-off = The device will no longer activate automatically when planted
-popup-start-on-stick-on = The device will now activate automatically when planted
-
-trigger-activated = You activate {THE($device)}.
diff --git a/Resources/Locale/en-US/weapons/grenades/voice-trigger.ftl b/Resources/Locale/en-US/weapons/grenades/voice-trigger.ftl
deleted file mode 100644
index 07ee5948d5..0000000000
--- a/Resources/Locale/en-US/weapons/grenades/voice-trigger.ftl
+++ /dev/null
@@ -1,12 +0,0 @@
-examine-trigger-voice = The display reads: "{$keyphrase}"
-trigger-voice-uninitialized = The display reads: Uninitialized...
-
-verb-trigger-voice-record = Record
-verb-trigger-voice-stop = Stop
-verb-trigger-voice-clear = Clear recording
-
-popup-trigger-voice-start-recording = Started recording
-popup-trigger-voice-stop-recording = Stopped recording
-popup-trigger-voice-record-failed-too-long = Message too long, try again
-popup-trigger-voice-record-failed-too-short = Message too short, try again
-popup-trigger-voice-recorded = Recorded successfully
diff --git a/Resources/Locale/en-US/wires/components/wires-panel-component.ftl b/Resources/Locale/en-US/wires/components/wires-panel-component.ftl
index cd8867f135..ffe9741c28 100644
--- a/Resources/Locale/en-US/wires/components/wires-panel-component.ftl
+++ b/Resources/Locale/en-US/wires/components/wires-panel-component.ftl
@@ -1,2 +1,43 @@
 wires-panel-component-on-examine-open = The [color=lightgray]maintenance panel[/color] is [color=red]open[/color].
 wires-panel-component-on-examine-closed = The [color=lightgray]maintenance panel[/color] is [color=darkgreen]closed[/color].
+
+# wire colors
+
+wire-name-color-red = Red
+wire-name-color-blue = Blue
+wire-name-color-green = Green
+wire-name-color-orange = Orange
+wire-name-color-brown = Brown
+wire-name-color-gold = Gold
+wire-name-color-gray = Gray
+wire-name-color-cyan = Cyan
+wire-name-color-navy = Navy
+wire-name-color-purple = Purple
+wire-name-color-pink = Pink
+wire-name-color-fuchsia = Fuchsia
+
+# letter names
+wire-letter-name-alpha = Alpha
+wire-letter-name-beta = Beta
+wire-letter-name-gamma = Gamma
+wire-letter-name-delta = Delta
+wire-letter-name-epsilon = Epsilon
+wire-letter-name-zeta = Zeta
+wire-letter-name-eta = Eta
+wire-letter-name-theta = Theta
+wire-letter-name-iota = Iota
+wire-letter-name-kappa = Kappa
+wire-letter-name-lambda = Lambda
+wire-letter-name-mu = Mu
+wire-letter-name-nu = Nu
+wire-letter-name-xi = Xi
+wire-letter-name-omicron = Omicron
+wire-letter-name-pi = Pi
+wire-letter-name-rho = Rho
+wire-letter-name-sigma = Sigma
+wire-letter-name-tau = Tau
+wire-letter-name-upsilon = Upsilon
+wire-letter-name-phi = Phi
+wire-letter-name-chi = Chi
+wire-letter-name-psi = Psi
+wire-letter-name-omega = Omega
diff --git a/Resources/Maps/Nonstations/wizardsden.yml b/Resources/Maps/Nonstations/wizardsden.yml
new file mode 100644
index 0000000000..b08dac6b68
--- /dev/null
+++ b/Resources/Maps/Nonstations/wizardsden.yml
@@ -0,0 +1,3886 @@
+meta:
+  format: 7
+  category: Map
+  engineVersion: 261.1.0
+  forkId: ""
+  forkVersion: ""
+  time: 06/03/2025 05:27:43
+  entityCount: 625
+maps:
+- 411
+grids:
+- 1
+orphans: []
+nullspace: []
+tilemap:
+  3: Space
+  2: FloorBasalt
+  6: FloorDark
+  0: FloorDarkDiagonal
+  5: FloorDarkMono
+  4: FloorDarkPavementVertical
+  17: FloorMiningDark
+  16: FloorMiningLight
+  9: FloorShowroom
+  14: FloorTechMaint
+  13: FloorTechMaint2
+  12: FloorWhite
+  11: FloorWhiteMini
+  15: FloorWhiteMono
+  7: FloorWood
+  8: FloorWoodTile
+  10: Lattice
+  1: Plating
+entities:
+- proto: ""
+  entities:
+  - uid: 1
+    components:
+    - type: MetaData
+      name: Wizard's Den
+    - type: Transform
+      pos: -0.5138889,-0.4756779
+      parent: 411
+    - type: MapGrid
+      chunks:
+        0,0:
+          ind: 0,0
+          tiles: AAAAAAABAAAAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAAAAAAAAQAAAAAAAAIAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAGAAAAAAEABQAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAABQAAAAABAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAYAAAAAAgAFAAAAAAIABgAAAAACAAYAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAHAAAAAAEABwAAAAADAAgAAAAAAgAGAAAAAAAABgAAAAADAAEAAAAAAAAJAAAAAAAAAQAAAAAAAAkAAAAAAAABAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAABwAAAAABAAcAAAAAAAAIAAAAAAEACAAAAAADAAYAAAAAAgABAAAAAAAACQAAAAAAAAEAAAAAAAAJAAAAAAAAAQAAAAAAAAoAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAcAAAAAAQAHAAAAAAAACAAAAAADAAgAAAAAAgAGAAAAAAIAAQAAAAAAAAwAAAAAAgAMAAAAAAAADAAAAAAAAAEAAAAAAAAKAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAHAAAAAAMABwAAAAACAAgAAAAAAgAIAAAAAAAABgAAAAADAAUAAAAAAwAMAAAAAAIADwAAAAACAAEAAAAAAAABAAAAAAAACgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAABwAAAAAAAAcAAAAAAAAIAAAAAAIACAAAAAAAAAYAAAAAAQABAAAAAAAADAAAAAACAAwAAAAAAQABAAAAAAAACgAAAAAAAAoAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAcAAAAAAAAHAAAAAAMACAAAAAACAAgAAAAAAwAGAAAAAAEAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAoAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAHAAAAAAAABwAAAAACAAYAAAAAAwAGAAAAAAAABgAAAAADAAEAAAAAAAAKAAAAAAAACgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAABwAAAAACAAcAAAAAAwAGAAAAAAAABgAAAAADAAEAAAAAAAABAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAcAAAAAAQAHAAAAAAMABgAAAAABAAEAAAAAAAABAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAA==
+          version: 7
+        -1,0:
+          ind: -1,0
+          tiles: AwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAAAAAAABAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAAAAAAAAwADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAAFAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAEABgAAAAACAAUAAAAAAgADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAQAAAAAAAAcAAAAAAAAIAAAAAAEACAAAAAACAAEAAAAAAAAGAAAAAAIABgAAAAABAAgAAAAAAQAHAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAEAAAAAAAAHAAAAAAEACAAAAAADAAgAAAAAAQABAAAAAAAABgAAAAAAAAgAAAAAAgAIAAAAAAMABwAAAAABAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAoAAAAAAAABAAAAAAAABwAAAAABAAcAAAAAAAAHAAAAAAMAAQAAAAAAAAYAAAAAAwAIAAAAAAEACAAAAAABAAcAAAAAAQADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAKAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAIABgAAAAADAAUAAAAAAgAGAAAAAAMACAAAAAACAAgAAAAAAQAHAAAAAAMAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAACgAAAAAAAAoAAAAAAAABAAAAAAAABgAAAAAAAAYAAAAAAQABAAAAAAAABgAAAAABAAgAAAAAAwAIAAAAAAAABwAAAAADAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAKAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAAAIAAAAAAAACAAAAAABAAcAAAAAAQADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAKAAAAAAAACgAAAAAAAAEAAAAAAAAGAAAAAAEABgAAAAADAAYAAAAAAwAHAAAAAAIAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAQAGAAAAAAEABwAAAAACAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAEAAAAAAAABAAAAAAAABgAAAAAAAAcAAAAAAQADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAA==
+          version: 7
+        -1,-1:
+          ind: -1,-1
+          tiles: AwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAEAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAABEAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAQAAAAAAAAEQAAAAAAABEAAAAAAAAQAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAEAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAAFAAAAAAIAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAAAAAAABAA==
+          version: 7
+        0,-1:
+          ind: 0,-1
+          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAEQAAAAAAABEAAAAAAAARAAAAAAAAEQAAAAAAABAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAEQAAAAAAABAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAUAAAAAAwABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAGAAAAAAIABQAAAAACAAIAAAAAAAACAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAgABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAA==
+          version: 7
+        -1,-2:
+          ind: -1,-2
+          tiles: AwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
+          version: 7
+        0,-2:
+          ind: 0,-2
+          tiles: AwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAA==
+          version: 7
+    - type: Broadphase
+    - type: Physics
+      bodyStatus: InAir
+      fixedRotation: False
+      bodyType: Dynamic
+    - type: Fixtures
+      fixtures: {}
+    - type: OccluderTree
+    - type: SpreaderGrid
+    - type: Shuttle
+      dampingModifier: 0.25
+    - type: ImplicitRoof
+    - type: GridPathfinding
+    - type: DecalGrid
+      chunkCollection:
+        version: 2
+        nodes:
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt1
+          decals:
+            163: 2.7885406,-1.7337892
+            187: -4.594368,-12.802722
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt2
+          decals:
+            170: 0.8227043,-6.7750106
+            190: -1.1881177,-12.948657
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt3
+          decals:
+            161: -2.8052096,1.6956758
+            165: -5.7114596,2.0292413
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt4
+          decals:
+            169: -1.5106289,-6.201695
+            193: 3.8869796,-12.234362
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt5
+          decals:
+            162: 2.5072906,0.9451544
+            164: -2.6802096,-0.5558883
+            189: -3.365201,-11.843722
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt6
+          decals:
+            198: -0.038194448,-11.283006
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt7
+          decals:
+            192: 1.6265626,-14.944576
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt8
+          decals:
+            191: 0.8743825,-12.125168
+            199: 2.4097223,-8.812541
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt9
+          decals:
+            188: -2.8131177,-9.644279
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkCornerNe
+          decals:
+            10: 1,1
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkCornerNw
+          decals:
+            9: -1,1
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkCornerSe
+          decals:
+            11: 1,-1
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkCornerSw
+          decals:
+            12: -1,-1
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkLineE
+          decals:
+            15: 1,0
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkLineN
+          decals:
+            16: 0,1
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkLineS
+          decals:
+            13: 0,-1
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkLineW
+          decals:
+            14: -1,0
+        - node:
+            color: '#52B4E996'
+            id: CheckerNWSE
+          decals:
+            107: 6,9
+            108: 7,9
+            109: 8,6
+            110: 8,5
+            111: 6,6
+            112: 6,5
+        - node:
+            color: '#8D03A5FF'
+            id: DiagonalCheckerAOverlay
+          decals:
+            0: -1,1
+            1: -1,0
+            2: -1,-1
+            3: 0,-1
+            4: 1,-1
+            5: 1,0
+            6: 0,0
+            7: 0,1
+            8: 1,1
+        - node:
+            color: '#8D03A566'
+            id: QuarterTileOverlayGreyscale
+          decals:
+            113: -4,5
+            114: -4,6
+            115: -4,7
+            116: -4,8
+            117: -4,9
+            118: -4,10
+            119: -4,11
+            139: -3,4
+            155: -3,11
+            156: -3,12
+        - node:
+            color: '#8D03A566'
+            id: QuarterTileOverlayGreyscale180
+          decals:
+            136: -2,4
+            137: -3,4
+            138: -4,5
+        - node:
+            color: '#8D03A566'
+            id: QuarterTileOverlayGreyscale270
+          decals:
+            131: 4,5
+            132: 3,4
+            133: 2,4
+        - node:
+            color: '#8D03A566'
+            id: QuarterTileOverlayGreyscale90
+          decals:
+            122: 4,5
+            123: 4,6
+            124: 4,7
+            125: 4,8
+            126: 4,9
+            127: 4,10
+            128: 4,11
+            140: 3,4
+            158: 3,11
+            159: 3,12
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: Remains
+          decals:
+            18: -6,1
+            185: 0,-13
+            186: -5,-10
+        - node:
+            color: '#FFFFFFFF'
+            id: Rock06
+          decals:
+            23: 5.231406,1.6660407
+        - node:
+            color: '#FFFFFFFF'
+            id: Rock07
+          decals:
+            21: -2.8668027,-4.2268343
+            24: -5.185261,-1.8468163
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerNe
+          decals:
+            60: -3,5
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerNw
+          decals:
+            59: 3,5
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerSe
+          decals:
+            152: -2,11
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerSw
+          decals:
+            151: 2,11
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinInnerNe
+          decals:
+            61: -3,4
+            66: -4,5
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinInnerNw
+          decals:
+            62: 3,4
+            67: 4,5
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinInnerSe
+          decals:
+            68: -4,11
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinInnerSw
+          decals:
+            65: 4,11
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineE
+          decals:
+            69: -4,10
+            70: -4,9
+            71: -4,8
+            72: -4,7
+            73: -4,6
+            196: -2,12
+            197: -2,13
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineN
+          decals:
+            43: -2,4
+            45: 0,4
+            47: 2,4
+            183: -1,4
+            184: 1,4
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineS
+          decals:
+            79: -7,8
+            80: -6,8
+            149: -3,11
+            150: 3,11
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineW
+          decals:
+            74: 4,6
+            75: 4,7
+            76: 4,8
+            77: 4,9
+            78: 4,10
+            194: 2,12
+            195: 2,13
+    - type: GridAtmosphere
+      version: 2
+      data:
+        tiles:
+          0,0:
+            0: 4095
+          0,-1:
+            0: 65295
+          -1,0:
+            0: 3822
+          0,1:
+            0: 65535
+          -1,1:
+            0: 65534
+          0,2:
+            0: 65535
+          -1,2:
+            0: 65535
+          0,3:
+            0: 127
+          -1,3:
+            0: 206
+          1,1:
+            0: 54608
+          1,2:
+            0: 4573
+            1: 49152
+          1,0:
+            0: 3822
+          1,-1:
+            0: 26112
+          2,0:
+            0: 48
+          2,1:
+            0: 4368
+            1: 17408
+          2,2:
+            1: 612
+          -3,1:
+            1: 16384
+          -3,2:
+            1: 2244
+          -2,0:
+            0: 3327
+          -2,1:
+            0: 30576
+          -2,2:
+            0: 102
+            1: 24576
+          -2,-1:
+            0: 60417
+          -1,-1:
+            0: 60942
+          -2,-3:
+            0: 36044
+          -2,-2:
+            0: 3200
+          -2,-4:
+            0: 32768
+          -1,-4:
+            0: 65472
+          -1,-3:
+            0: 65535
+          -1,-2:
+            0: 65535
+          0,-4:
+            0: 65392
+          0,-3:
+            0: 65535
+          0,-2:
+            0: 65535
+          1,-4:
+            0: 4096
+          1,-3:
+            0: 28945
+          1,-2:
+            0: 311
+        uniqueMixes:
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.824879
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          immutable: True
+          temperature: 248.15
+          moles:
+          - 21.824879
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        chunkSize: 4
+    - type: GasTileOverlay
+    - type: RadiationGridResistance
+    - type: IFF
+      color: '#BF40BFFF'
+    - type: GravityShake
+      shakeTimes: 10
+    - type: NavMap
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+  - uid: 411
+    components:
+    - type: MetaData
+      name: Map Entity
+    - type: Transform
+    - type: Map
+      mapPaused: True
+    - type: GridTree
+    - type: Broadphase
+    - type: OccluderTree
+    - type: Parallax
+      parallax: Wizard
+    - type: MapAtmosphere
+      space: False
+      mixture:
+        volume: 2500
+        immutable: True
+        temperature: 293.2
+        moles:
+        - 21.824879
+        - 82.10312
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+- proto: APCHyperCapacity
+  entities:
+  - uid: 199
+    components:
+    - type: MetaData
+      name: Wizard APC
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,4.5
+      parent: 1
+    - type: BatterySelfRecharger
+      autoRechargeRate: 200000
+      autoRecharge: True
+- proto: BarberScissors
+  entities:
+  - uid: 649
+    components:
+    - type: Transform
+      pos: -6.5,9.5
+      parent: 1
+- proto: BasaltFive
+  entities:
+  - uid: 414
+    components:
+    - type: Transform
+      pos: 3.5,-7.5
+      parent: 1
+  - uid: 416
+    components:
+    - type: Transform
+      pos: 3.5,2.5
+      parent: 1
+  - uid: 418
+    components:
+    - type: Transform
+      pos: -4.5,-11.5
+      parent: 1
+- proto: BasaltFour
+  entities:
+  - uid: 419
+    components:
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 1
+  - uid: 424
+    components:
+    - type: Transform
+      pos: -1.5,-13.5
+      parent: 1
+- proto: BasaltThree
+  entities:
+  - uid: 245
+    components:
+    - type: Transform
+      pos: 2.5,-12.5
+      parent: 1
+  - uid: 415
+    components:
+    - type: Transform
+      pos: -2.5,0.5
+      parent: 1
+- proto: BasaltTwo
+  entities:
+  - uid: 410
+    components:
+    - type: Transform
+      pos: -2.5,-5.5
+      parent: 1
+  - uid: 417
+    components:
+    - type: Transform
+      pos: -1.5,-10.5
+      parent: 1
+- proto: Bed
+  entities:
+  - uid: 503
+    components:
+    - type: Transform
+      pos: -5.5,5.5
+      parent: 1
+- proto: BedsheetWiz
+  entities:
+  - uid: 506
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,5.5
+      parent: 1
+- proto: BookNarsieLegend
+  entities:
+  - uid: 362
+    components:
+    - type: Transform
+      pos: -1.9141665,4.7120576
+      parent: 1
+- proto: BookRandomStory
+  entities:
+  - uid: 466
+    components:
+    - type: Transform
+      pos: 8.5,7.5
+      parent: 1
+- proto: BooksBag
+  entities:
+  - uid: 361
+    components:
+    - type: Transform
+      pos: -1.5,4.5
+      parent: 1
+- proto: Bookshelf
+  entities:
+  - uid: 471
+    components:
+    - type: Transform
+      pos: 4.5,11.5
+      parent: 1
+  - uid: 472
+    components:
+    - type: Transform
+      pos: 4.5,10.5
+      parent: 1
+  - uid: 474
+    components:
+    - type: Transform
+      pos: -3.5,11.5
+      parent: 1
+  - uid: 475
+    components:
+    - type: Transform
+      pos: -3.5,10.5
+      parent: 1
+- proto: BookshelfFilled
+  entities:
+  - uid: 343
+    components:
+    - type: Transform
+      pos: 2.5,7.5
+      parent: 1
+  - uid: 344
+    components:
+    - type: Transform
+      pos: 2.5,8.5
+      parent: 1
+  - uid: 346
+    components:
+    - type: Transform
+      pos: 2.5,9.5
+      parent: 1
+  - uid: 348
+    components:
+    - type: Transform
+      pos: -1.5,9.5
+      parent: 1
+  - uid: 349
+    components:
+    - type: Transform
+      pos: -1.5,8.5
+      parent: 1
+  - uid: 350
+    components:
+    - type: Transform
+      pos: -1.5,7.5
+      parent: 1
+- proto: CableApcExtension
+  entities:
+  - uid: 5
+    components:
+    - type: Transform
+      pos: 6.5,8.5
+      parent: 1
+  - uid: 96
+    components:
+    - type: Transform
+      pos: -0.5,5.5
+      parent: 1
+  - uid: 97
+    components:
+    - type: Transform
+      pos: 5.5,8.5
+      parent: 1
+  - uid: 98
+    components:
+    - type: Transform
+      pos: 1.5,5.5
+      parent: 1
+  - uid: 99
+    components:
+    - type: Transform
+      pos: 4.5,9.5
+      parent: 1
+  - uid: 103
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 1
+  - uid: 104
+    components:
+    - type: Transform
+      pos: 0.5,4.5
+      parent: 1
+  - uid: 105
+    components:
+    - type: Transform
+      pos: 0.5,3.5
+      parent: 1
+  - uid: 106
+    components:
+    - type: Transform
+      pos: -0.5,0.5
+      parent: 1
+  - uid: 107
+    components:
+    - type: Transform
+      pos: 1.5,0.5
+      parent: 1
+  - uid: 108
+    components:
+    - type: Transform
+      pos: -0.5,-0.5
+      parent: 1
+  - uid: 109
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 1
+  - uid: 110
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 1
+  - uid: 111
+    components:
+    - type: Transform
+      pos: 1.5,-1.5
+      parent: 1
+  - uid: 112
+    components:
+    - type: Transform
+      pos: 1.5,2.5
+      parent: 1
+  - uid: 113
+    components:
+    - type: Transform
+      pos: -0.5,2.5
+      parent: 1
+  - uid: 114
+    components:
+    - type: Transform
+      pos: -0.5,1.5
+      parent: 1
+  - uid: 115
+    components:
+    - type: Transform
+      pos: 1.5,1.5
+      parent: 1
+  - uid: 116
+    components:
+    - type: Transform
+      pos: 0.5,2.5
+      parent: 1
+  - uid: 117
+    components:
+    - type: Transform
+      pos: 0.5,5.5
+      parent: 1
+  - uid: 420
+    components:
+    - type: Transform
+      pos: -1.5,5.5
+      parent: 1
+  - uid: 421
+    components:
+    - type: Transform
+      pos: -2.5,5.5
+      parent: 1
+  - uid: 422
+    components:
+    - type: Transform
+      pos: -3.5,5.5
+      parent: 1
+  - uid: 423
+    components:
+    - type: Transform
+      pos: -3.5,4.5
+      parent: 1
+  - uid: 425
+    components:
+    - type: Transform
+      pos: 2.5,5.5
+      parent: 1
+  - uid: 426
+    components:
+    - type: Transform
+      pos: 3.5,5.5
+      parent: 1
+  - uid: 427
+    components:
+    - type: Transform
+      pos: 4.5,5.5
+      parent: 1
+  - uid: 428
+    components:
+    - type: Transform
+      pos: -3.5,6.5
+      parent: 1
+  - uid: 429
+    components:
+    - type: Transform
+      pos: -3.5,7.5
+      parent: 1
+  - uid: 430
+    components:
+    - type: Transform
+      pos: -3.5,8.5
+      parent: 1
+  - uid: 431
+    components:
+    - type: Transform
+      pos: -3.5,9.5
+      parent: 1
+  - uid: 432
+    components:
+    - type: Transform
+      pos: -3.5,10.5
+      parent: 1
+  - uid: 433
+    components:
+    - type: Transform
+      pos: -3.5,11.5
+      parent: 1
+  - uid: 434
+    components:
+    - type: Transform
+      pos: -2.5,11.5
+      parent: 1
+  - uid: 435
+    components:
+    - type: Transform
+      pos: -1.5,11.5
+      parent: 1
+  - uid: 436
+    components:
+    - type: Transform
+      pos: -0.5,11.5
+      parent: 1
+  - uid: 437
+    components:
+    - type: Transform
+      pos: 0.5,11.5
+      parent: 1
+  - uid: 438
+    components:
+    - type: Transform
+      pos: 1.5,11.5
+      parent: 1
+  - uid: 439
+    components:
+    - type: Transform
+      pos: 3.5,11.5
+      parent: 1
+  - uid: 440
+    components:
+    - type: Transform
+      pos: 4.5,11.5
+      parent: 1
+  - uid: 441
+    components:
+    - type: Transform
+      pos: 2.5,11.5
+      parent: 1
+  - uid: 442
+    components:
+    - type: Transform
+      pos: 4.5,10.5
+      parent: 1
+  - uid: 443
+    components:
+    - type: Transform
+      pos: 4.5,8.5
+      parent: 1
+  - uid: 444
+    components:
+    - type: Transform
+      pos: 4.5,7.5
+      parent: 1
+  - uid: 445
+    components:
+    - type: Transform
+      pos: 4.5,6.5
+      parent: 1
+  - uid: 447
+    components:
+    - type: Transform
+      pos: 0.5,6.5
+      parent: 1
+  - uid: 448
+    components:
+    - type: Transform
+      pos: 0.5,7.5
+      parent: 1
+  - uid: 449
+    components:
+    - type: Transform
+      pos: 0.5,9.5
+      parent: 1
+  - uid: 450
+    components:
+    - type: Transform
+      pos: 0.5,10.5
+      parent: 1
+  - uid: 451
+    components:
+    - type: Transform
+      pos: 0.5,12.5
+      parent: 1
+  - uid: 452
+    components:
+    - type: Transform
+      pos: 0.5,13.5
+      parent: 1
+  - uid: 534
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 1
+  - uid: 535
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 1
+  - uid: 566
+    components:
+    - type: Transform
+      pos: -4.5,8.5
+      parent: 1
+  - uid: 567
+    components:
+    - type: Transform
+      pos: -5.5,8.5
+      parent: 1
+  - uid: 568
+    components:
+    - type: Transform
+      pos: -6.5,8.5
+      parent: 1
+  - uid: 569
+    components:
+    - type: Transform
+      pos: -6.5,7.5
+      parent: 1
+  - uid: 570
+    components:
+    - type: Transform
+      pos: -6.5,6.5
+      parent: 1
+  - uid: 571
+    components:
+    - type: Transform
+      pos: -6.5,5.5
+      parent: 1
+  - uid: 572
+    components:
+    - type: Transform
+      pos: -6.5,9.5
+      parent: 1
+  - uid: 655
+    components:
+    - type: Transform
+      pos: 7.5,7.5
+      parent: 1
+  - uid: 679
+    components:
+    - type: Transform
+      pos: 6.5,7.5
+      parent: 1
+  - uid: 680
+    components:
+    - type: Transform
+      pos: 6.5,6.5
+      parent: 1
+  - uid: 681
+    components:
+    - type: Transform
+      pos: 6.5,5.5
+      parent: 1
+  - uid: 682
+    components:
+    - type: Transform
+      pos: 8.5,7.5
+      parent: 1
+  - uid: 683
+    components:
+    - type: Transform
+      pos: 8.5,6.5
+      parent: 1
+  - uid: 684
+    components:
+    - type: Transform
+      pos: 8.5,5.5
+      parent: 1
+- proto: CandleBlackInfinite
+  entities:
+  - uid: 352
+    components:
+    - type: Transform
+      pos: 0.34585947,8.704459
+      parent: 1
+- proto: CandleBlueSmallInfinite
+  entities:
+  - uid: 388
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.9964747,13.631708
+      parent: 1
+- proto: CandleGreenSmallInfinite
+  entities:
+  - uid: 351
+    components:
+    - type: Transform
+      pos: 0.5854428,8.558525
+      parent: 1
+- proto: CandleInfinite
+  entities:
+  - uid: 407
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,4.5
+      parent: 1
+- proto: CandleRedSmallInfinite
+  entities:
+  - uid: 408
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.2612925,4.618674
+      parent: 1
+- proto: CarpetPurple
+  entities:
+  - uid: 342
+    components:
+    - type: Transform
+      pos: -0.5,7.5
+      parent: 1
+  - uid: 354
+    components:
+    - type: Transform
+      pos: -0.5,9.5
+      parent: 1
+  - uid: 375
+    components:
+    - type: Transform
+      pos: 0.5,9.5
+      parent: 1
+  - uid: 455
+    components:
+    - type: Transform
+      pos: -0.5,8.5
+      parent: 1
+  - uid: 456
+    components:
+    - type: Transform
+      pos: 0.5,8.5
+      parent: 1
+  - uid: 457
+    components:
+    - type: Transform
+      pos: 0.5,7.5
+      parent: 1
+  - uid: 458
+    components:
+    - type: Transform
+      pos: 1.5,8.5
+      parent: 1
+  - uid: 459
+    components:
+    - type: Transform
+      pos: 1.5,7.5
+      parent: 1
+  - uid: 460
+    components:
+    - type: Transform
+      pos: 1.5,9.5
+      parent: 1
+  - uid: 514
+    components:
+    - type: Transform
+      pos: -6.5,6.5
+      parent: 1
+  - uid: 515
+    components:
+    - type: Transform
+      pos: -6.5,5.5
+      parent: 1
+  - uid: 516
+    components:
+    - type: Transform
+      pos: -5.5,6.5
+      parent: 1
+  - uid: 517
+    components:
+    - type: Transform
+      pos: -5.5,5.5
+      parent: 1
+  - uid: 526
+    components:
+    - type: Transform
+      pos: -0.5,13.5
+      parent: 1
+  - uid: 527
+    components:
+    - type: Transform
+      pos: -0.5,12.5
+      parent: 1
+  - uid: 528
+    components:
+    - type: Transform
+      pos: 0.5,13.5
+      parent: 1
+  - uid: 529
+    components:
+    - type: Transform
+      pos: 0.5,12.5
+      parent: 1
+  - uid: 530
+    components:
+    - type: Transform
+      pos: 1.5,13.5
+      parent: 1
+  - uid: 531
+    components:
+    - type: Transform
+      pos: 1.5,12.5
+      parent: 1
+- proto: ChairPilotSeat
+  entities:
+  - uid: 467
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,12.5
+      parent: 1
+- proto: ChairWood
+  entities:
+  - uid: 468
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,8.5
+      parent: 1
+  - uid: 469
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,9.5
+      parent: 1
+  - uid: 512
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,6.5
+      parent: 1
+- proto: ClockworkShield
+  entities:
+  - uid: 88
+    components:
+    - type: Transform
+      pos: -1.4069316,1.4175825
+      parent: 1
+- proto: ClothingBeltWand
+  entities:
+  - uid: 93
+    components:
+    - type: Transform
+      pos: 2.5877786,0.864011
+      parent: 1
+- proto: ClothingHeadHatWitch1
+  entities:
+  - uid: 508
+    components:
+    - type: Transform
+      parent: 507
+    - type: Physics
+      canCollide: False
+- proto: ClothingHeadHelmetWizardHelm
+  entities:
+  - uid: 405
+    components:
+    - type: Transform
+      pos: 1.5,13.5
+      parent: 1
+- proto: ClothingMaskGasChameleon
+  entities:
+  - uid: 404
+    components:
+    - type: Transform
+      pos: -0.8681086,13.66298
+      parent: 1
+- proto: ClothingShoesWizard
+  entities:
+  - uid: 95
+    components:
+    - type: Transform
+      pos: 2.508839,1.4894459
+      parent: 1
+- proto: ClothingUniformJumpskirtColorBlack
+  entities:
+  - uid: 510
+    components:
+    - type: Transform
+      parent: 507
+    - type: Physics
+      canCollide: False
+- proto: ClothingUniformJumpsuitColorBlack
+  entities:
+  - uid: 509
+    components:
+    - type: Transform
+      parent: 507
+    - type: Physics
+      canCollide: False
+- proto: ComfyChair
+  entities:
+  - uid: 340
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,5.5
+      parent: 1
+  - uid: 353
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,7.5
+      parent: 1
+  - uid: 465
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,7.5
+      parent: 1
+- proto: CrayonRainbow
+  entities:
+  - uid: 646
+    components:
+    - type: Transform
+      pos: 4.709585,6.241482
+      parent: 1
+- proto: CrystalBlue
+  entities:
+  - uid: 274
+    components:
+    - type: Transform
+      pos: 4.5,-5.5
+      parent: 1
+- proto: CrystalOrange
+  entities:
+  - uid: 524
+    components:
+    - type: Transform
+      pos: -3.5,-13.5
+      parent: 1
+- proto: CrystalPink
+  entities:
+  - uid: 212
+    components:
+    - type: Transform
+      pos: -7.5,1.5
+      parent: 1
+  - uid: 275
+    components:
+    - type: Transform
+      pos: -1.5,-4.5
+      parent: 1
+- proto: CrystalYellow
+  entities:
+  - uid: 525
+    components:
+    - type: Transform
+      pos: 4.5,-12.5
+      parent: 1
+- proto: CurtainsPurpleOpen
+  entities:
+  - uid: 513
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,5.5
+      parent: 1
+- proto: DiceBag
+  entities:
+  - uid: 645
+    components:
+    - type: Transform
+      pos: 0.6952908,8.840469
+      parent: 1
+- proto: DogBed
+  entities:
+  - uid: 501
+    components:
+    - type: Transform
+      pos: -5.5,9.5
+      parent: 1
+- proto: Dresser
+  entities:
+  - uid: 507
+    components:
+    - type: Transform
+      pos: -7.5,5.5
+      parent: 1
+    - type: Storage
+      storedItems:
+        508:
+          position: 0,0
+          _rotation: East
+        509:
+          position: 2,0
+          _rotation: South
+        510:
+          position: 4,0
+          _rotation: South
+    - type: ContainerContainer
+      containers:
+        storagebase: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 508
+          - 509
+          - 510
+- proto: DrinkAleBottleFull
+  entities:
+  - uid: 651
+    components:
+    - type: Transform
+      pos: -6.64086,5.9211173
+      parent: 1
+- proto: DrinkGlass
+  entities:
+  - uid: 652
+    components:
+    - type: Transform
+      pos: -6.4131513,5.5922756
+      parent: 1
+  - uid: 653
+    components:
+    - type: Transform
+      pos: -6.2777348,5.686091
+      parent: 1
+- proto: FaxMachineSyndie
+  entities:
+  - uid: 463
+    components:
+    - type: Transform
+      pos: -3.5,6.5
+      parent: 1
+    - type: FaxMachine
+      name: Wizard's Den
+- proto: FigureSpawner
+  entities:
+  - uid: 470
+    components:
+    - type: Transform
+      pos: 0.5,9.5
+      parent: 1
+- proto: Fireplace
+  entities:
+  - uid: 504
+    components:
+    - type: Transform
+      pos: -7.5,7.5
+      parent: 1
+- proto: FloorDrain
+  entities:
+  - uid: 618
+    components:
+    - type: Transform
+      pos: 8.5,5.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+- proto: FloorLavaEntity
+  entities:
+  - uid: 19
+    components:
+    - type: Transform
+      pos: 5.5,-0.5
+      parent: 1
+  - uid: 20
+    components:
+    - type: Transform
+      pos: -4.5,1.5
+      parent: 1
+  - uid: 26
+    components:
+    - type: Transform
+      pos: 5.5,0.5
+      parent: 1
+  - uid: 30
+    components:
+    - type: Transform
+      pos: 6.5,-0.5
+      parent: 1
+  - uid: 31
+    components:
+    - type: Transform
+      pos: -4.5,-0.5
+      parent: 1
+  - uid: 33
+    components:
+    - type: Transform
+      pos: -4.5,0.5
+      parent: 1
+  - uid: 60
+    components:
+    - type: Transform
+      pos: -5.5,-1.5
+      parent: 1
+  - uid: 61
+    components:
+    - type: Transform
+      pos: -5.5,-0.5
+      parent: 1
+  - uid: 62
+    components:
+    - type: Transform
+      pos: -5.5,0.5
+      parent: 1
+  - uid: 63
+    components:
+    - type: Transform
+      pos: 6.5,1.5
+      parent: 1
+  - uid: 65
+    components:
+    - type: Transform
+      pos: 6.5,0.5
+      parent: 1
+  - uid: 118
+    components:
+    - type: Transform
+      pos: 6.5,-7.5
+      parent: 1
+  - uid: 130
+    components:
+    - type: Transform
+      pos: -4.5,-6.5
+      parent: 1
+  - uid: 160
+    components:
+    - type: Transform
+      pos: -6.5,-0.5
+      parent: 1
+  - uid: 162
+    components:
+    - type: Transform
+      pos: 8.5,1.5
+      parent: 1
+  - uid: 163
+    components:
+    - type: Transform
+      pos: 7.5,1.5
+      parent: 1
+  - uid: 167
+    components:
+    - type: Transform
+      pos: -5.5,-5.5
+      parent: 1
+  - uid: 169
+    components:
+    - type: Transform
+      pos: 6.5,-8.5
+      parent: 1
+  - uid: 171
+    components:
+    - type: Transform
+      pos: 5.5,-7.5
+      parent: 1
+  - uid: 206
+    components:
+    - type: Transform
+      pos: 5.5,-8.5
+      parent: 1
+  - uid: 210
+    components:
+    - type: Transform
+      pos: 5.5,-6.5
+      parent: 1
+  - uid: 211
+    components:
+    - type: Transform
+      pos: -6.5,0.5
+      parent: 1
+  - uid: 213
+    components:
+    - type: Transform
+      pos: 7.5,0.5
+      parent: 1
+  - uid: 248
+    components:
+    - type: Transform
+      pos: -4.5,-5.5
+      parent: 1
+- proto: FloraGreyStalagmite
+  entities:
+  - uid: 189
+    components:
+    - type: Transform
+      pos: 0.7098959,-14.277794
+      parent: 1
+  - uid: 209
+    components:
+    - type: Transform
+      pos: -2.3364596,-1.3592265
+      parent: 1
+- proto: FloraStalagmite
+  entities:
+  - uid: 308
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,-1.5
+      parent: 1
+  - uid: 446
+    components:
+    - type: Transform
+      pos: -5.1672845,-9.665474
+      parent: 1
+- proto: FoodBurgerSpell
+  entities:
+  - uid: 647
+    components:
+    - type: Transform
+      pos: -6.5,9.5
+      parent: 1
+- proto: FoodMeat
+  entities:
+  - uid: 202
+    components:
+    - type: Transform
+      pos: -2.7996593,-10.547044
+      parent: 1
+  - uid: 533
+    components:
+    - type: Transform
+      pos: -0.23715895,-13.278107
+      parent: 1
+- proto: GasPipeStraight
+  entities:
+  - uid: 300
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: GravityGeneratorMini
+  entities:
+  - uid: 359
+    components:
+    - type: Transform
+      pos: 3.5,12.5
+      parent: 1
+- proto: Grille
+  entities:
+  - uid: 27
+    components:
+    - type: Transform
+      pos: 4.5,-0.5
+      parent: 1
+  - uid: 28
+    components:
+    - type: Transform
+      pos: 4.5,0.5
+      parent: 1
+  - uid: 29
+    components:
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 1
+  - uid: 50
+    components:
+    - type: Transform
+      pos: -3.5,-0.5
+      parent: 1
+  - uid: 51
+    components:
+    - type: Transform
+      pos: -3.5,1.5
+      parent: 1
+  - uid: 52
+    components:
+    - type: Transform
+      pos: -3.5,0.5
+      parent: 1
+  - uid: 79
+    components:
+    - type: Transform
+      pos: 1.5,-2.5
+      parent: 1
+  - uid: 84
+    components:
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 1
+  - uid: 389
+    components:
+    - type: Transform
+      pos: -2.5,13.5
+      parent: 1
+  - uid: 390
+    components:
+    - type: Transform
+      pos: -2.5,14.5
+      parent: 1
+  - uid: 391
+    components:
+    - type: Transform
+      pos: -1.5,14.5
+      parent: 1
+  - uid: 392
+    components:
+    - type: Transform
+      pos: -0.5,14.5
+      parent: 1
+  - uid: 393
+    components:
+    - type: Transform
+      pos: 0.5,14.5
+      parent: 1
+  - uid: 394
+    components:
+    - type: Transform
+      pos: 1.5,14.5
+      parent: 1
+  - uid: 395
+    components:
+    - type: Transform
+      pos: 2.5,14.5
+      parent: 1
+  - uid: 396
+    components:
+    - type: Transform
+      pos: 3.5,14.5
+      parent: 1
+  - uid: 397
+    components:
+    - type: Transform
+      pos: 3.5,13.5
+      parent: 1
+- proto: HospitalCurtainsOpen
+  entities:
+  - uid: 619
+    components:
+    - type: Transform
+      pos: 8.5,5.5
+      parent: 1
+- proto: LightPostSmall
+  entities:
+  - uid: 481
+    components:
+    - type: Transform
+      pos: 0.5,-8.5
+      parent: 1
+- proto: LuxuryPen
+  entities:
+  - uid: 478
+    components:
+    - type: Transform
+      pos: 4.5,5.5
+      parent: 1
+- proto: MedkitAdvancedFilled
+  entities:
+  - uid: 89
+    components:
+    - type: Transform
+      pos: -1.6541514,-0.17837936
+      parent: 1
+- proto: MedkitOxygenFilled
+  entities:
+  - uid: 90
+    components:
+    - type: Transform
+      pos: -1.391187,-0.4181292
+      parent: 1
+- proto: Mirror
+  entities:
+  - uid: 625
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,10.5
+      parent: 1
+- proto: MirrorShield
+  entities:
+  - uid: 87
+    components:
+    - type: Transform
+      pos: -1.7423494,1.6781805
+      parent: 1
+- proto: Paper
+  entities:
+  - uid: 479
+    components:
+    - type: Transform
+      pos: 4.548043,5.679018
+      parent: 1
+  - uid: 480
+    components:
+    - type: Transform
+      pos: 4.6209593,5.762409
+      parent: 1
+- proto: PaperBin5
+  entities:
+  - uid: 363
+    components:
+    - type: Transform
+      pos: -2.5,4.5
+      parent: 1
+- proto: PersonalAI
+  entities:
+  - uid: 94
+    components:
+    - type: Transform
+      pos: -1.4747214,0.57214147
+      parent: 1
+- proto: PlasmaDoor
+  entities:
+  - uid: 81
+    components:
+    - type: Transform
+      pos: 0.5,3.5
+      parent: 1
+  - uid: 82
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 1
+  - uid: 355
+    components:
+    - type: Transform
+      pos: 5.5,8.5
+      parent: 1
+  - uid: 356
+    components:
+    - type: Transform
+      pos: -4.5,8.5
+      parent: 1
+- proto: PlasmaWindow
+  entities:
+  - uid: 34
+    components:
+    - type: Transform
+      pos: -3.5,-0.5
+      parent: 1
+  - uid: 35
+    components:
+    - type: Transform
+      pos: -3.5,0.5
+      parent: 1
+  - uid: 36
+    components:
+    - type: Transform
+      pos: -3.5,1.5
+      parent: 1
+  - uid: 47
+    components:
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 1
+  - uid: 48
+    components:
+    - type: Transform
+      pos: 4.5,0.5
+      parent: 1
+  - uid: 49
+    components:
+    - type: Transform
+      pos: 4.5,-0.5
+      parent: 1
+  - uid: 156
+    components:
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 1
+  - uid: 159
+    components:
+    - type: Transform
+      pos: 1.5,-2.5
+      parent: 1
+- proto: PonderingOrbWizard
+  entities:
+  - uid: 92
+    components:
+    - type: Transform
+      pos: 2.3481953,0.30111992
+      parent: 1
+- proto: PottedPlantRandom
+  entities:
+  - uid: 271
+    components:
+    - type: Transform
+      pos: -3.5,9.5
+      parent: 1
+  - uid: 280
+    components:
+    - type: Transform
+      pos: 1.5,4.5
+      parent: 1
+  - uid: 303
+    components:
+    - type: Transform
+      pos: -0.5,4.5
+      parent: 1
+  - uid: 648
+    components:
+    - type: Transform
+      pos: 4.5,9.5
+      parent: 1
+- proto: PowerCellRecharger
+  entities:
+  - uid: 403
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,13.5
+      parent: 1
+- proto: PoweredSmallLight
+  entities:
+  - uid: 347
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,6.5
+      parent: 1
+  - uid: 387
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,6.5
+      parent: 1
+  - uid: 485
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,12.5
+      parent: 1
+  - uid: 486
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,12.5
+      parent: 1
+  - uid: 565
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,7.5
+      parent: 1
+  - uid: 620
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,5.5
+      parent: 1
+- proto: PoweredWarmSmallLight
+  entities:
+  - uid: 4
+    components:
+    - type: Transform
+      pos: 2.5,2.5
+      parent: 1
+  - uid: 25
+    components:
+    - type: Transform
+      pos: -1.5,2.5
+      parent: 1
+  - uid: 505
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,7.5
+      parent: 1
+- proto: Railing
+  entities:
+  - uid: 149
+    components:
+    - type: Transform
+      pos: -2.5,-7.5
+      parent: 1
+  - uid: 266
+    components:
+    - type: Transform
+      pos: -3.5,-7.5
+      parent: 1
+  - uid: 267
+    components:
+    - type: Transform
+      pos: -1.5,-7.5
+      parent: 1
+  - uid: 268
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-8.5
+      parent: 1
+  - uid: 306
+    components:
+    - type: Transform
+      pos: 1.5,-9.5
+      parent: 1
+  - uid: 307
+    components:
+    - type: Transform
+      pos: 0.5,-9.5
+      parent: 1
+  - uid: 310
+    components:
+    - type: Transform
+      pos: 4.5,-9.5
+      parent: 1
+  - uid: 326
+    components:
+    - type: Transform
+      pos: 3.5,-9.5
+      parent: 1
+  - uid: 413
+    components:
+    - type: Transform
+      pos: 2.5,-9.5
+      parent: 1
+- proto: RailingCorner
+  entities:
+  - uid: 309
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-9.5
+      parent: 1
+- proto: RailingCornerSmall
+  entities:
+  - uid: 219
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-7.5
+      parent: 1
+- proto: RandomStalagmiteOrCrystal
+  entities:
+  - uid: 119
+    components:
+    - type: Transform
+      pos: -7.5,-3.5
+      parent: 1
+  - uid: 604
+    components:
+    - type: Transform
+      pos: 9.5,1.5
+      parent: 1
+- proto: ReinforcedPlasmaWindow
+  entities:
+  - uid: 364
+    components:
+    - type: Transform
+      pos: -0.5,14.5
+      parent: 1
+  - uid: 366
+    components:
+    - type: Transform
+      pos: 0.5,14.5
+      parent: 1
+  - uid: 367
+    components:
+    - type: Transform
+      pos: 1.5,14.5
+      parent: 1
+  - uid: 368
+    components:
+    - type: Transform
+      pos: 2.5,14.5
+      parent: 1
+  - uid: 369
+    components:
+    - type: Transform
+      pos: -1.5,14.5
+      parent: 1
+  - uid: 370
+    components:
+    - type: Transform
+      pos: 3.5,14.5
+      parent: 1
+  - uid: 371
+    components:
+    - type: Transform
+      pos: 3.5,13.5
+      parent: 1
+  - uid: 372
+    components:
+    - type: Transform
+      pos: -2.5,14.5
+      parent: 1
+  - uid: 373
+    components:
+    - type: Transform
+      pos: -2.5,13.5
+      parent: 1
+- proto: SinkWide
+  entities:
+  - uid: 624
+    components:
+    - type: Transform
+      pos: 7.5,9.5
+      parent: 1
+- proto: Skub
+  entities:
+  - uid: 623
+    components:
+    - type: Transform
+      pos: 6.5,6.5
+      parent: 1
+- proto: SoapOmega
+  entities:
+  - uid: 622
+    components:
+    - type: Transform
+      pos: 8.5,5.5
+      parent: 1
+- proto: SpawnMobBear
+  entities:
+  - uid: 204
+    components:
+    - type: Transform
+      pos: 1.5,-12.5
+      parent: 1
+  - uid: 409
+    components:
+    - type: Transform
+      pos: -3.5,-9.5
+      parent: 1
+  - uid: 532
+    components:
+    - type: Transform
+      pos: -1.5,-11.5
+      parent: 1
+- proto: SpawnMobLizard
+  entities:
+  - uid: 518
+    components:
+    - type: Transform
+      pos: -5.5,9.5
+      parent: 1
+- proto: SpawnPointWizard
+  entities:
+  - uid: 2
+    components:
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 1
+- proto: StealthBox
+  entities:
+  - uid: 621
+    components:
+    - type: Transform
+      pos: 6.5,9.5
+      parent: 1
+    - type: Stealth
+      enabled: False
+    - type: EntityStorage
+      open: True
+- proto: TableCarpet
+  entities:
+  - uid: 341
+    components:
+    - type: Transform
+      pos: 0.5,8.5
+      parent: 1
+  - uid: 461
+    components:
+    - type: Transform
+      pos: 0.5,9.5
+      parent: 1
+  - uid: 473
+    components:
+    - type: Transform
+      pos: 4.5,6.5
+      parent: 1
+  - uid: 476
+    components:
+    - type: Transform
+      pos: 4.5,5.5
+      parent: 1
+- proto: TableFancyOrange
+  entities:
+  - uid: 345
+    components:
+    - type: Transform
+      pos: -3.5,6.5
+      parent: 1
+- proto: TableFancyPurple
+  entities:
+  - uid: 357
+    components:
+    - type: Transform
+      pos: -1.5,4.5
+      parent: 1
+  - uid: 358
+    components:
+    - type: Transform
+      pos: -2.5,4.5
+      parent: 1
+- proto: TableFancyRed
+  entities:
+  - uid: 360
+    components:
+    - type: Transform
+      pos: 3.5,4.5
+      parent: 1
+- proto: TableReinforced
+  entities:
+  - uid: 398
+    components:
+    - type: Transform
+      pos: 1.5,13.5
+      parent: 1
+  - uid: 399
+    components:
+    - type: Transform
+      pos: 2.5,13.5
+      parent: 1
+  - uid: 400
+    components:
+    - type: Transform
+      pos: -0.5,13.5
+      parent: 1
+  - uid: 401
+    components:
+    - type: Transform
+      pos: -1.5,13.5
+      parent: 1
+- proto: TableStone
+  entities:
+  - uid: 3
+    components:
+    - type: Transform
+      pos: -1.5,-0.5
+      parent: 1
+  - uid: 6
+    components:
+    - type: Transform
+      pos: -1.5,1.5
+      parent: 1
+  - uid: 7
+    components:
+    - type: Transform
+      pos: -1.5,0.5
+      parent: 1
+  - uid: 8
+    components:
+    - type: Transform
+      pos: 2.5,-0.5
+      parent: 1
+  - uid: 9
+    components:
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 1
+  - uid: 10
+    components:
+    - type: Transform
+      pos: 2.5,1.5
+      parent: 1
+- proto: TableWood
+  entities:
+  - uid: 502
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,9.5
+      parent: 1
+  - uid: 511
+    components:
+    - type: Transform
+      pos: -6.5,5.5
+      parent: 1
+- proto: TargetHuman
+  entities:
+  - uid: 305
+    components:
+    - type: Transform
+      pos: -2.5,-12.5
+      parent: 1
+- proto: TargetStrange
+  entities:
+  - uid: 304
+    components:
+    - type: Transform
+      pos: -4.5,-10.5
+      parent: 1
+- proto: ToiletEmpty
+  entities:
+  - uid: 617
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,5.5
+      parent: 1
+- proto: ToyFigurineWizard
+  entities:
+  - uid: 477
+    components:
+    - type: Transform
+      pos: 4.5,6.5
+      parent: 1
+- proto: VendingMachineDiscount
+  entities:
+  - uid: 454
+    components:
+    - type: Transform
+      pos: 2.5,4.5
+      parent: 1
+- proto: VendingMachineGames
+  entities:
+  - uid: 462
+    components:
+    - type: Transform
+      pos: 0.5,7.5
+      parent: 1
+- proto: VendingMachineMagivend
+  entities:
+  - uid: 453
+    components:
+    - type: Transform
+      pos: -2.5,12.5
+      parent: 1
+- proto: WallPlasma
+  entities:
+  - uid: 18
+    components:
+    - type: Transform
+      pos: 2.5,3.5
+      parent: 1
+  - uid: 21
+    components:
+    - type: Transform
+      pos: -3.5,2.5
+      parent: 1
+  - uid: 22
+    components:
+    - type: Transform
+      pos: -3.5,-1.5
+      parent: 1
+  - uid: 23
+    components:
+    - type: Transform
+      pos: -3.5,-2.5
+      parent: 1
+  - uid: 24
+    components:
+    - type: Transform
+      pos: 2.5,-2.5
+      parent: 1
+  - uid: 32
+    components:
+    - type: Transform
+      pos: -3.5,3.5
+      parent: 1
+  - uid: 37
+    components:
+    - type: Transform
+      pos: 4.5,-1.5
+      parent: 1
+  - uid: 38
+    components:
+    - type: Transform
+      pos: 4.5,2.5
+      parent: 1
+  - uid: 39
+    components:
+    - type: Transform
+      pos: 4.5,-2.5
+      parent: 1
+  - uid: 40
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 1
+  - uid: 41
+    components:
+    - type: Transform
+      pos: -2.5,-2.5
+      parent: 1
+  - uid: 42
+    components:
+    - type: Transform
+      pos: -1.5,-2.5
+      parent: 1
+  - uid: 43
+    components:
+    - type: Transform
+      pos: -2.5,3.5
+      parent: 1
+  - uid: 44
+    components:
+    - type: Transform
+      pos: -1.5,3.5
+      parent: 1
+  - uid: 45
+    components:
+    - type: Transform
+      pos: 4.5,3.5
+      parent: 1
+  - uid: 46
+    components:
+    - type: Transform
+      pos: 3.5,3.5
+      parent: 1
+  - uid: 83
+    components:
+    - type: Transform
+      pos: 1.5,3.5
+      parent: 1
+  - uid: 86
+    components:
+    - type: Transform
+      pos: -0.5,3.5
+      parent: 1
+  - uid: 329
+    components:
+    - type: Transform
+      pos: 8.5,4.5
+      parent: 1
+  - uid: 330
+    components:
+    - type: Transform
+      pos: 7.5,4.5
+      parent: 1
+  - uid: 331
+    components:
+    - type: Transform
+      pos: 4.5,4.5
+      parent: 1
+  - uid: 332
+    components:
+    - type: Transform
+      pos: 6.5,4.5
+      parent: 1
+  - uid: 333
+    components:
+    - type: Transform
+      pos: -4.5,5.5
+      parent: 1
+  - uid: 334
+    components:
+    - type: Transform
+      pos: -4.5,4.5
+      parent: 1
+  - uid: 335
+    components:
+    - type: Transform
+      pos: -4.5,6.5
+      parent: 1
+  - uid: 336
+    components:
+    - type: Transform
+      pos: 5.5,4.5
+      parent: 1
+  - uid: 337
+    components:
+    - type: Transform
+      pos: 5.5,5.5
+      parent: 1
+  - uid: 338
+    components:
+    - type: Transform
+      pos: 5.5,6.5
+      parent: 1
+  - uid: 339
+    components:
+    - type: Transform
+      pos: -3.5,4.5
+      parent: 1
+  - uid: 374
+    components:
+    - type: Transform
+      pos: -4.5,7.5
+      parent: 1
+  - uid: 376
+    components:
+    - type: Transform
+      pos: -4.5,10.5
+      parent: 1
+  - uid: 377
+    components:
+    - type: Transform
+      pos: -4.5,11.5
+      parent: 1
+  - uid: 378
+    components:
+    - type: Transform
+      pos: -4.5,12.5
+      parent: 1
+  - uid: 379
+    components:
+    - type: Transform
+      pos: -3.5,12.5
+      parent: 1
+  - uid: 380
+    components:
+    - type: Transform
+      pos: -3.5,13.5
+      parent: 1
+  - uid: 381
+    components:
+    - type: Transform
+      pos: 4.5,13.5
+      parent: 1
+  - uid: 382
+    components:
+    - type: Transform
+      pos: 4.5,12.5
+      parent: 1
+  - uid: 383
+    components:
+    - type: Transform
+      pos: 5.5,12.5
+      parent: 1
+  - uid: 384
+    components:
+    - type: Transform
+      pos: 5.5,11.5
+      parent: 1
+  - uid: 385
+    components:
+    - type: Transform
+      pos: 5.5,10.5
+      parent: 1
+  - uid: 386
+    components:
+    - type: Transform
+      pos: 5.5,9.5
+      parent: 1
+  - uid: 406
+    components:
+    - type: Transform
+      pos: 5.5,7.5
+      parent: 1
+  - uid: 412
+    components:
+    - type: Transform
+      pos: -4.5,9.5
+      parent: 1
+  - uid: 488
+    components:
+    - type: Transform
+      pos: -5.5,10.5
+      parent: 1
+  - uid: 489
+    components:
+    - type: Transform
+      pos: -6.5,10.5
+      parent: 1
+  - uid: 490
+    components:
+    - type: Transform
+      pos: -7.5,10.5
+      parent: 1
+  - uid: 491
+    components:
+    - type: Transform
+      pos: -7.5,9.5
+      parent: 1
+  - uid: 492
+    components:
+    - type: Transform
+      pos: -7.5,8.5
+      parent: 1
+  - uid: 493
+    components:
+    - type: Transform
+      pos: -8.5,8.5
+      parent: 1
+  - uid: 494
+    components:
+    - type: Transform
+      pos: -8.5,7.5
+      parent: 1
+  - uid: 495
+    components:
+    - type: Transform
+      pos: -8.5,6.5
+      parent: 1
+  - uid: 496
+    components:
+    - type: Transform
+      pos: -8.5,5.5
+      parent: 1
+  - uid: 497
+    components:
+    - type: Transform
+      pos: -8.5,4.5
+      parent: 1
+  - uid: 498
+    components:
+    - type: Transform
+      pos: -7.5,4.5
+      parent: 1
+  - uid: 499
+    components:
+    - type: Transform
+      pos: -6.5,4.5
+      parent: 1
+  - uid: 500
+    components:
+    - type: Transform
+      pos: -5.5,4.5
+      parent: 1
+  - uid: 585
+    components:
+    - type: Transform
+      pos: 6.5,10.5
+      parent: 1
+  - uid: 586
+    components:
+    - type: Transform
+      pos: 7.5,10.5
+      parent: 1
+  - uid: 587
+    components:
+    - type: Transform
+      pos: 8.5,10.5
+      parent: 1
+  - uid: 589
+    components:
+    - type: Transform
+      pos: 7.5,6.5
+      parent: 1
+  - uid: 590
+    components:
+    - type: Transform
+      pos: 7.5,5.5
+      parent: 1
+  - uid: 591
+    components:
+    - type: Transform
+      pos: 9.5,5.5
+      parent: 1
+  - uid: 592
+    components:
+    - type: Transform
+      pos: 9.5,6.5
+      parent: 1
+  - uid: 593
+    components:
+    - type: Transform
+      pos: 9.5,7.5
+      parent: 1
+  - uid: 594
+    components:
+    - type: Transform
+      pos: 9.5,8.5
+      parent: 1
+  - uid: 595
+    components:
+    - type: Transform
+      pos: 8.5,9.5
+      parent: 1
+  - uid: 597
+    components:
+    - type: Transform
+      pos: 8.5,8.5
+      parent: 1
+  - uid: 601
+    components:
+    - type: Transform
+      pos: 9.5,4.5
+      parent: 1
+- proto: WallRockBasalt
+  entities:
+  - uid: 11
+    components:
+    - type: Transform
+      pos: -4.5,3.5
+      parent: 1
+  - uid: 12
+    components:
+    - type: Transform
+      pos: 9.5,-12.5
+      parent: 1
+  - uid: 13
+    components:
+    - type: Transform
+      pos: -7.5,-2.5
+      parent: 1
+  - uid: 14
+    components:
+    - type: Transform
+      pos: -5.5,3.5
+      parent: 1
+  - uid: 15
+    components:
+    - type: Transform
+      pos: 5.5,-15.5
+      parent: 1
+  - uid: 16
+    components:
+    - type: Transform
+      pos: -7.5,-1.5
+      parent: 1
+  - uid: 17
+    components:
+    - type: Transform
+      pos: -5.5,-3.5
+      parent: 1
+  - uid: 53
+    components:
+    - type: Transform
+      pos: -6.5,-3.5
+      parent: 1
+  - uid: 54
+    components:
+    - type: Transform
+      pos: -5.5,-2.5
+      parent: 1
+  - uid: 55
+    components:
+    - type: Transform
+      pos: -4.5,-3.5
+      parent: 1
+  - uid: 56
+    components:
+    - type: Transform
+      pos: -4.5,-2.5
+      parent: 1
+  - uid: 57
+    components:
+    - type: Transform
+      pos: 5.5,3.5
+      parent: 1
+  - uid: 58
+    components:
+    - type: Transform
+      pos: 5.5,-2.5
+      parent: 1
+  - uid: 59
+    components:
+    - type: Transform
+      pos: 6.5,-2.5
+      parent: 1
+  - uid: 64
+    components:
+    - type: Transform
+      pos: 6.5,3.5
+      parent: 1
+  - uid: 66
+    components:
+    - type: Transform
+      pos: 7.5,3.5
+      parent: 1
+  - uid: 67
+    components:
+    - type: Transform
+      pos: 4.5,-15.5
+      parent: 1
+  - uid: 68
+    components:
+    - type: Transform
+      pos: 5.5,-14.5
+      parent: 1
+  - uid: 69
+    components:
+    - type: Transform
+      pos: 7.5,-0.5
+      parent: 1
+  - uid: 70
+    components:
+    - type: Transform
+      pos: 7.5,-1.5
+      parent: 1
+  - uid: 71
+    components:
+    - type: Transform
+      pos: 7.5,-2.5
+      parent: 1
+  - uid: 72
+    components:
+    - type: Transform
+      pos: 6.5,-14.5
+      parent: 1
+  - uid: 73
+    components:
+    - type: Transform
+      pos: -6.5,3.5
+      parent: 1
+  - uid: 74
+    components:
+    - type: Transform
+      pos: -6.5,2.5
+      parent: 1
+  - uid: 75
+    components:
+    - type: Transform
+      pos: 7.5,-12.5
+      parent: 1
+  - uid: 76
+    components:
+    - type: Transform
+      pos: 6.5,-13.5
+      parent: 1
+  - uid: 77
+    components:
+    - type: Transform
+      pos: -6.5,-2.5
+      parent: 1
+  - uid: 78
+    components:
+    - type: Transform
+      pos: -6.5,-1.5
+      parent: 1
+  - uid: 80
+    components:
+    - type: Transform
+      pos: -7.5,-0.5
+      parent: 1
+  - uid: 85
+    components:
+    - type: Transform
+      pos: 8.5,-13.5
+      parent: 1
+  - uid: 100
+    components:
+    - type: Transform
+      pos: 7.5,-14.5
+      parent: 1
+  - uid: 101
+    components:
+    - type: Transform
+      pos: 8.5,-12.5
+      parent: 1
+  - uid: 102
+    components:
+    - type: Transform
+      pos: 10.5,-7.5
+      parent: 1
+  - uid: 120
+    components:
+    - type: Transform
+      pos: -7.5,-5.5
+      parent: 1
+  - uid: 121
+    components:
+    - type: Transform
+      pos: -7.5,-4.5
+      parent: 1
+  - uid: 122
+    components:
+    - type: Transform
+      pos: -7.5,-6.5
+      parent: 1
+  - uid: 123
+    components:
+    - type: Transform
+      pos: -6.5,-4.5
+      parent: 1
+  - uid: 124
+    components:
+    - type: Transform
+      pos: -6.5,-5.5
+      parent: 1
+  - uid: 125
+    components:
+    - type: Transform
+      pos: -6.5,-6.5
+      parent: 1
+  - uid: 126
+    components:
+    - type: Transform
+      pos: -10.5,-2.5
+      parent: 1
+  - uid: 127
+    components:
+    - type: Transform
+      pos: -5.5,-6.5
+      parent: 1
+  - uid: 128
+    components:
+    - type: Transform
+      pos: -4.5,-4.5
+      parent: 1
+  - uid: 129
+    components:
+    - type: Transform
+      pos: -6.5,-8.5
+      parent: 1
+  - uid: 131
+    components:
+    - type: Transform
+      pos: -5.5,-4.5
+      parent: 1
+  - uid: 132
+    components:
+    - type: Transform
+      pos: -5.5,-7.5
+      parent: 1
+  - uid: 133
+    components:
+    - type: Transform
+      pos: -4.5,-7.5
+      parent: 1
+  - uid: 134
+    components:
+    - type: Transform
+      pos: -9.5,-3.5
+      parent: 1
+  - uid: 135
+    components:
+    - type: Transform
+      pos: -3.5,-3.5
+      parent: 1
+  - uid: 136
+    components:
+    - type: Transform
+      pos: -6.5,-7.5
+      parent: 1
+  - uid: 137
+    components:
+    - type: Transform
+      pos: 5.5,-3.5
+      parent: 1
+  - uid: 138
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 1
+  - uid: 139
+    components:
+    - type: Transform
+      pos: 5.5,-4.5
+      parent: 1
+  - uid: 140
+    components:
+    - type: Transform
+      pos: 6.5,-3.5
+      parent: 1
+  - uid: 141
+    components:
+    - type: Transform
+      pos: 8.5,0.5
+      parent: 1
+  - uid: 142
+    components:
+    - type: Transform
+      pos: 8.5,-0.5
+      parent: 1
+  - uid: 143
+    components:
+    - type: Transform
+      pos: 8.5,-1.5
+      parent: 1
+  - uid: 144
+    components:
+    - type: Transform
+      pos: 8.5,-4.5
+      parent: 1
+  - uid: 145
+    components:
+    - type: Transform
+      pos: 8.5,-3.5
+      parent: 1
+  - uid: 146
+    components:
+    - type: Transform
+      pos: 8.5,-5.5
+      parent: 1
+  - uid: 147
+    components:
+    - type: Transform
+      pos: 8.5,-2.5
+      parent: 1
+  - uid: 148
+    components:
+    - type: Transform
+      pos: 8.5,-6.5
+      parent: 1
+  - uid: 150
+    components:
+    - type: Transform
+      pos: 7.5,-3.5
+      parent: 1
+  - uid: 151
+    components:
+    - type: Transform
+      pos: 7.5,-4.5
+      parent: 1
+  - uid: 152
+    components:
+    - type: Transform
+      pos: 7.5,-5.5
+      parent: 1
+  - uid: 153
+    components:
+    - type: Transform
+      pos: 6.5,-4.5
+      parent: 1
+  - uid: 154
+    components:
+    - type: Transform
+      pos: 6.5,-6.5
+      parent: 1
+  - uid: 155
+    components:
+    - type: Transform
+      pos: 5.5,-5.5
+      parent: 1
+  - uid: 157
+    components:
+    - type: Transform
+      pos: 6.5,-5.5
+      parent: 1
+  - uid: 158
+    components:
+    - type: Transform
+      pos: 4.5,-4.5
+      parent: 1
+  - uid: 161
+    components:
+    - type: Transform
+      pos: 7.5,-7.5
+      parent: 1
+  - uid: 164
+    components:
+    - type: Transform
+      pos: -9.5,-1.5
+      parent: 1
+  - uid: 165
+    components:
+    - type: Transform
+      pos: -9.5,-2.5
+      parent: 1
+  - uid: 166
+    components:
+    - type: Transform
+      pos: -9.5,-0.5
+      parent: 1
+  - uid: 168
+    components:
+    - type: Transform
+      pos: 7.5,-6.5
+      parent: 1
+  - uid: 170
+    components:
+    - type: Transform
+      pos: 9.5,-7.5
+      parent: 1
+  - uid: 172
+    components:
+    - type: Transform
+      pos: 2.5,-17.5
+      parent: 1
+  - uid: 173
+    components:
+    - type: Transform
+      pos: 1.5,-17.5
+      parent: 1
+  - uid: 174
+    components:
+    - type: Transform
+      pos: 0.5,-17.5
+      parent: 1
+  - uid: 175
+    components:
+    - type: Transform
+      pos: 9.5,-10.5
+      parent: 1
+  - uid: 176
+    components:
+    - type: Transform
+      pos: 3.5,-17.5
+      parent: 1
+  - uid: 177
+    components:
+    - type: Transform
+      pos: 9.5,-6.5
+      parent: 1
+  - uid: 178
+    components:
+    - type: Transform
+      pos: 9.5,-11.5
+      parent: 1
+  - uid: 179
+    components:
+    - type: Transform
+      pos: -0.5,-17.5
+      parent: 1
+  - uid: 180
+    components:
+    - type: Transform
+      pos: 9.5,-9.5
+      parent: 1
+  - uid: 181
+    components:
+    - type: Transform
+      pos: 7.5,-15.5
+      parent: 1
+  - uid: 182
+    components:
+    - type: Transform
+      pos: 6.5,-15.5
+      parent: 1
+  - uid: 183
+    components:
+    - type: Transform
+      pos: 9.5,-8.5
+      parent: 1
+  - uid: 184
+    components:
+    - type: Transform
+      pos: 10.5,-8.5
+      parent: 1
+  - uid: 185
+    components:
+    - type: Transform
+      pos: 8.5,-10.5
+      parent: 1
+  - uid: 186
+    components:
+    - type: Transform
+      pos: 6.5,-16.5
+      parent: 1
+  - uid: 187
+    components:
+    - type: Transform
+      pos: 10.5,-6.5
+      parent: 1
+  - uid: 188
+    components:
+    - type: Transform
+      pos: 1.5,-18.5
+      parent: 1
+  - uid: 190
+    components:
+    - type: Transform
+      pos: -1.5,-18.5
+      parent: 1
+  - uid: 191
+    components:
+    - type: Transform
+      pos: 7.5,-16.5
+      parent: 1
+  - uid: 192
+    components:
+    - type: Transform
+      pos: 6.5,-17.5
+      parent: 1
+  - uid: 193
+    components:
+    - type: Transform
+      pos: -0.5,-18.5
+      parent: 1
+  - uid: 194
+    components:
+    - type: Transform
+      pos: 4.5,-16.5
+      parent: 1
+  - uid: 195
+    components:
+    - type: Transform
+      pos: 3.5,-16.5
+      parent: 1
+  - uid: 196
+    components:
+    - type: Transform
+      pos: 0.5,-18.5
+      parent: 1
+  - uid: 197
+    components:
+    - type: Transform
+      pos: 5.5,-16.5
+      parent: 1
+  - uid: 198
+    components:
+    - type: Transform
+      pos: 8.5,-11.5
+      parent: 1
+  - uid: 200
+    components:
+    - type: Transform
+      pos: 5.5,-17.5
+      parent: 1
+  - uid: 201
+    components:
+    - type: Transform
+      pos: -5.5,-8.5
+      parent: 1
+  - uid: 203
+    components:
+    - type: Transform
+      pos: -2.5,-18.5
+      parent: 1
+  - uid: 205
+    components:
+    - type: Transform
+      pos: 8.5,-14.5
+      parent: 1
+  - uid: 207
+    components:
+    - type: Transform
+      pos: 10.5,-10.5
+      parent: 1
+  - uid: 208
+    components:
+    - type: Transform
+      pos: 5.5,-9.5
+      parent: 1
+  - uid: 214
+    components:
+    - type: Transform
+      pos: 4.5,-17.5
+      parent: 1
+  - uid: 215
+    components:
+    - type: Transform
+      pos: -1.5,-17.5
+      parent: 1
+  - uid: 216
+    components:
+    - type: Transform
+      pos: -2.5,-17.5
+      parent: 1
+  - uid: 217
+    components:
+    - type: Transform
+      pos: -2.5,-14.5
+      parent: 1
+  - uid: 218
+    components:
+    - type: Transform
+      pos: -6.5,-11.5
+      parent: 1
+  - uid: 220
+    components:
+    - type: Transform
+      pos: 3.5,-15.5
+      parent: 1
+  - uid: 221
+    components:
+    - type: Transform
+      pos: 2.5,-16.5
+      parent: 1
+  - uid: 222
+    components:
+    - type: Transform
+      pos: -1.5,-15.5
+      parent: 1
+  - uid: 223
+    components:
+    - type: Transform
+      pos: -0.5,-15.5
+      parent: 1
+  - uid: 224
+    components:
+    - type: Transform
+      pos: 0.5,-15.5
+      parent: 1
+  - uid: 225
+    components:
+    - type: Transform
+      pos: 1.5,-15.5
+      parent: 1
+  - uid: 226
+    components:
+    - type: Transform
+      pos: 1.5,-16.5
+      parent: 1
+  - uid: 227
+    components:
+    - type: Transform
+      pos: 0.5,-16.5
+      parent: 1
+  - uid: 228
+    components:
+    - type: Transform
+      pos: -0.5,-16.5
+      parent: 1
+  - uid: 229
+    components:
+    - type: Transform
+      pos: -1.5,-16.5
+      parent: 1
+  - uid: 230
+    components:
+    - type: Transform
+      pos: -2.5,-16.5
+      parent: 1
+  - uid: 231
+    components:
+    - type: Transform
+      pos: -2.5,-15.5
+      parent: 1
+  - uid: 232
+    components:
+    - type: Transform
+      pos: -3.5,-15.5
+      parent: 1
+  - uid: 233
+    components:
+    - type: Transform
+      pos: -3.5,-14.5
+      parent: 1
+  - uid: 234
+    components:
+    - type: Transform
+      pos: -4.5,-14.5
+      parent: 1
+  - uid: 235
+    components:
+    - type: Transform
+      pos: -5.5,-13.5
+      parent: 1
+  - uid: 236
+    components:
+    - type: Transform
+      pos: -6.5,-12.5
+      parent: 1
+  - uid: 237
+    components:
+    - type: Transform
+      pos: -7.5,-10.5
+      parent: 1
+  - uid: 238
+    components:
+    - type: Transform
+      pos: -7.5,-9.5
+      parent: 1
+  - uid: 239
+    components:
+    - type: Transform
+      pos: -8.5,-8.5
+      parent: 1
+  - uid: 240
+    components:
+    - type: Transform
+      pos: 5.5,-11.5
+      parent: 1
+  - uid: 241
+    components:
+    - type: Transform
+      pos: 5.5,-10.5
+      parent: 1
+  - uid: 242
+    components:
+    - type: Transform
+      pos: -8.5,-7.5
+      parent: 1
+  - uid: 243
+    components:
+    - type: Transform
+      pos: -8.5,-6.5
+      parent: 1
+  - uid: 244
+    components:
+    - type: Transform
+      pos: -8.5,-5.5
+      parent: 1
+  - uid: 246
+    components:
+    - type: Transform
+      pos: -10.5,-1.5
+      parent: 1
+  - uid: 247
+    components:
+    - type: Transform
+      pos: -10.5,-0.5
+      parent: 1
+  - uid: 249
+    components:
+    - type: Transform
+      pos: -10.5,0.5
+      parent: 1
+  - uid: 250
+    components:
+    - type: Transform
+      pos: -10.5,1.5
+      parent: 1
+  - uid: 251
+    components:
+    - type: Transform
+      pos: -10.5,2.5
+      parent: 1
+  - uid: 252
+    components:
+    - type: Transform
+      pos: -10.5,-3.5
+      parent: 1
+  - uid: 253
+    components:
+    - type: Transform
+      pos: 11.5,1.5
+      parent: 1
+  - uid: 254
+    components:
+    - type: Transform
+      pos: -9.5,-4.5
+      parent: 1
+  - uid: 255
+    components:
+    - type: Transform
+      pos: -9.5,-5.5
+      parent: 1
+  - uid: 256
+    components:
+    - type: Transform
+      pos: -9.5,-6.5
+      parent: 1
+  - uid: 257
+    components:
+    - type: Transform
+      pos: 11.5,0.5
+      parent: 1
+  - uid: 258
+    components:
+    - type: Transform
+      pos: 11.5,-1.5
+      parent: 1
+  - uid: 259
+    components:
+    - type: Transform
+      pos: 11.5,-2.5
+      parent: 1
+  - uid: 260
+    components:
+    - type: Transform
+      pos: 11.5,-0.5
+      parent: 1
+  - uid: 261
+    components:
+    - type: Transform
+      pos: 10.5,-2.5
+      parent: 1
+  - uid: 262
+    components:
+    - type: Transform
+      pos: 10.5,-3.5
+      parent: 1
+  - uid: 263
+    components:
+    - type: Transform
+      pos: 10.5,-4.5
+      parent: 1
+  - uid: 264
+    components:
+    - type: Transform
+      pos: 10.5,-5.5
+      parent: 1
+  - uid: 265
+    components:
+    - type: Transform
+      pos: 8.5,-15.5
+      parent: 1
+  - uid: 269
+    components:
+    - type: Transform
+      pos: -4.5,-15.5
+      parent: 1
+  - uid: 270
+    components:
+    - type: Transform
+      pos: -5.5,-14.5
+      parent: 1
+  - uid: 272
+    components:
+    - type: Transform
+      pos: -6.5,-13.5
+      parent: 1
+  - uid: 273
+    components:
+    - type: Transform
+      pos: -7.5,-11.5
+      parent: 1
+  - uid: 276
+    components:
+    - type: Transform
+      pos: -8.5,-10.5
+      parent: 1
+  - uid: 277
+    components:
+    - type: Transform
+      pos: -8.5,-9.5
+      parent: 1
+  - uid: 278
+    components:
+    - type: Transform
+      pos: 7.5,-13.5
+      parent: 1
+  - uid: 279
+    components:
+    - type: Transform
+      pos: -10.5,-4.5
+      parent: 1
+  - uid: 281
+    components:
+    - type: Transform
+      pos: -10.5,-5.5
+      parent: 1
+  - uid: 282
+    components:
+    - type: Transform
+      pos: -10.5,-6.5
+      parent: 1
+  - uid: 283
+    components:
+    - type: Transform
+      pos: -9.5,-7.5
+      parent: 1
+  - uid: 284
+    components:
+    - type: Transform
+      pos: -9.5,-8.5
+      parent: 1
+  - uid: 285
+    components:
+    - type: Transform
+      pos: -9.5,-9.5
+      parent: 1
+  - uid: 286
+    components:
+    - type: Transform
+      pos: -9.5,-10.5
+      parent: 1
+  - uid: 287
+    components:
+    - type: Transform
+      pos: -9.5,-11.5
+      parent: 1
+  - uid: 288
+    components:
+    - type: Transform
+      pos: -8.5,-11.5
+      parent: 1
+  - uid: 289
+    components:
+    - type: Transform
+      pos: -8.5,-13.5
+      parent: 1
+  - uid: 290
+    components:
+    - type: Transform
+      pos: -7.5,-12.5
+      parent: 1
+  - uid: 291
+    components:
+    - type: Transform
+      pos: -8.5,-12.5
+      parent: 1
+  - uid: 292
+    components:
+    - type: Transform
+      pos: -7.5,-13.5
+      parent: 1
+  - uid: 293
+    components:
+    - type: Transform
+      pos: -6.5,-14.5
+      parent: 1
+  - uid: 294
+    components:
+    - type: Transform
+      pos: -6.5,-15.5
+      parent: 1
+  - uid: 295
+    components:
+    - type: Transform
+      pos: -5.5,-15.5
+      parent: 1
+  - uid: 296
+    components:
+    - type: Transform
+      pos: -5.5,-16.5
+      parent: 1
+  - uid: 297
+    components:
+    - type: Transform
+      pos: -4.5,-16.5
+      parent: 1
+  - uid: 298
+    components:
+    - type: Transform
+      pos: -3.5,-16.5
+      parent: 1
+  - uid: 299
+    components:
+    - type: Transform
+      pos: -3.5,-17.5
+      parent: 1
+  - uid: 301
+    components:
+    - type: Transform
+      pos: -7.5,-14.5
+      parent: 1
+  - uid: 302
+    components:
+    - type: Transform
+      pos: -10.5,-7.5
+      parent: 1
+  - uid: 311
+    components:
+    - type: Transform
+      pos: -7.5,3.5
+      parent: 1
+  - uid: 312
+    components:
+    - type: Transform
+      pos: -7.5,2.5
+      parent: 1
+  - uid: 313
+    components:
+    - type: Transform
+      pos: 10.5,-9.5
+      parent: 1
+  - uid: 314
+    components:
+    - type: Transform
+      pos: -8.5,0.5
+      parent: 1
+  - uid: 315
+    components:
+    - type: Transform
+      pos: -8.5,-0.5
+      parent: 1
+  - uid: 316
+    components:
+    - type: Transform
+      pos: -8.5,-1.5
+      parent: 1
+  - uid: 317
+    components:
+    - type: Transform
+      pos: -8.5,-2.5
+      parent: 1
+  - uid: 318
+    components:
+    - type: Transform
+      pos: -8.5,-4.5
+      parent: 1
+  - uid: 319
+    components:
+    - type: Transform
+      pos: -8.5,-3.5
+      parent: 1
+  - uid: 320
+    components:
+    - type: Transform
+      pos: 9.5,-1.5
+      parent: 1
+  - uid: 321
+    components:
+    - type: Transform
+      pos: 9.5,-2.5
+      parent: 1
+  - uid: 322
+    components:
+    - type: Transform
+      pos: 9.5,-3.5
+      parent: 1
+  - uid: 323
+    components:
+    - type: Transform
+      pos: 9.5,-4.5
+      parent: 1
+  - uid: 324
+    components:
+    - type: Transform
+      pos: 9.5,-0.5
+      parent: 1
+  - uid: 325
+    components:
+    - type: Transform
+      pos: 9.5,0.5
+      parent: 1
+  - uid: 327
+    components:
+    - type: Transform
+      pos: 8.5,2.5
+      parent: 1
+  - uid: 328
+    components:
+    - type: Transform
+      pos: 8.5,3.5
+      parent: 1
+  - uid: 464
+    components:
+    - type: Transform
+      pos: -9.5,6.5
+      parent: 1
+  - uid: 482
+    components:
+    - type: Transform
+      pos: 2.5,-18.5
+      parent: 1
+  - uid: 483
+    components:
+    - type: Transform
+      pos: -11.5,-0.5
+      parent: 1
+  - uid: 484
+    components:
+    - type: Transform
+      pos: -11.5,-1.5
+      parent: 1
+  - uid: 487
+    components:
+    - type: Transform
+      pos: -11.5,-2.5
+      parent: 1
+  - uid: 519
+    components:
+    - type: Transform
+      pos: -11.5,-3.5
+      parent: 1
+  - uid: 520
+    components:
+    - type: Transform
+      pos: 11.5,-3.5
+      parent: 1
+  - uid: 521
+    components:
+    - type: Transform
+      pos: 11.5,-4.5
+      parent: 1
+  - uid: 522
+    components:
+    - type: Transform
+      pos: 11.5,-5.5
+      parent: 1
+  - uid: 523
+    components:
+    - type: Transform
+      pos: 11.5,2.5
+      parent: 1
+  - uid: 545
+    components:
+    - type: Transform
+      pos: -9.5,4.5
+      parent: 1
+  - uid: 546
+    components:
+    - type: Transform
+      pos: -9.5,5.5
+      parent: 1
+  - uid: 558
+    components:
+    - type: Transform
+      pos: -9.5,3.5
+      parent: 1
+  - uid: 559
+    components:
+    - type: Transform
+      pos: -9.5,1.5
+      parent: 1
+  - uid: 560
+    components:
+    - type: Transform
+      pos: -9.5,0.5
+      parent: 1
+  - uid: 561
+    components:
+    - type: Transform
+      pos: -9.5,2.5
+      parent: 1
+  - uid: 562
+    components:
+    - type: Transform
+      pos: -8.5,1.5
+      parent: 1
+  - uid: 563
+    components:
+    - type: Transform
+      pos: -8.5,2.5
+      parent: 1
+  - uid: 564
+    components:
+    - type: Transform
+      pos: -8.5,3.5
+      parent: 1
+  - uid: 596
+    components:
+    - type: Transform
+      pos: 10.5,5.5
+      parent: 1
+  - uid: 598
+    components:
+    - type: Transform
+      pos: 10.5,4.5
+      parent: 1
+  - uid: 599
+    components:
+    - type: Transform
+      pos: 10.5,3.5
+      parent: 1
+  - uid: 600
+    components:
+    - type: Transform
+      pos: 10.5,2.5
+      parent: 1
+  - uid: 602
+    components:
+    - type: Transform
+      pos: 9.5,3.5
+      parent: 1
+  - uid: 603
+    components:
+    - type: Transform
+      pos: 9.5,2.5
+      parent: 1
+  - uid: 606
+    components:
+    - type: Transform
+      pos: 6.5,-10.5
+      parent: 1
+  - uid: 607
+    components:
+    - type: Transform
+      pos: 6.5,-9.5
+      parent: 1
+  - uid: 608
+    components:
+    - type: Transform
+      pos: 7.5,-9.5
+      parent: 1
+  - uid: 609
+    components:
+    - type: Transform
+      pos: 7.5,-8.5
+      parent: 1
+  - uid: 610
+    components:
+    - type: Transform
+      pos: 8.5,-7.5
+      parent: 1
+  - uid: 613
+    components:
+    - type: Transform
+      pos: 10.5,1.5
+      parent: 1
+  - uid: 614
+    components:
+    - type: Transform
+      pos: 10.5,0.5
+      parent: 1
+  - uid: 615
+    components:
+    - type: Transform
+      pos: 10.5,-0.5
+      parent: 1
+  - uid: 616
+    components:
+    - type: Transform
+      pos: 10.5,-1.5
+      parent: 1
+  - uid: 656
+    components:
+    - type: Transform
+      pos: 4.5,-13.5
+      parent: 1
+  - uid: 657
+    components:
+    - type: Transform
+      pos: 5.5,-13.5
+      parent: 1
+  - uid: 658
+    components:
+    - type: Transform
+      pos: 5.5,-12.5
+      parent: 1
+  - uid: 659
+    components:
+    - type: Transform
+      pos: 6.5,-11.5
+      parent: 1
+  - uid: 660
+    components:
+    - type: Transform
+      pos: 7.5,-10.5
+      parent: 1
+  - uid: 661
+    components:
+    - type: Transform
+      pos: 8.5,-8.5
+      parent: 1
+  - uid: 663
+    components:
+    - type: Transform
+      pos: -4.5,-13.5
+      parent: 1
+  - uid: 665
+    components:
+    - type: Transform
+      pos: -5.5,-12.5
+      parent: 1
+  - uid: 668
+    components:
+    - type: Transform
+      pos: -6.5,-10.5
+      parent: 1
+  - uid: 669
+    components:
+    - type: Transform
+      pos: -6.5,-9.5
+      parent: 1
+  - uid: 670
+    components:
+    - type: Transform
+      pos: -7.5,-7.5
+      parent: 1
+  - uid: 671
+    components:
+    - type: Transform
+      pos: -7.5,-8.5
+      parent: 1
+  - uid: 672
+    components:
+    - type: Transform
+      pos: 8.5,-9.5
+      parent: 1
+  - uid: 673
+    components:
+    - type: Transform
+      pos: 9.5,-5.5
+      parent: 1
+  - uid: 674
+    components:
+    - type: Transform
+      pos: 7.5,-11.5
+      parent: 1
+  - uid: 675
+    components:
+    - type: Transform
+      pos: 6.5,-12.5
+      parent: 1
+  - uid: 676
+    components:
+    - type: Transform
+      pos: 4.5,-14.5
+      parent: 1
+  - uid: 677
+    components:
+    - type: Transform
+      pos: 3.5,-14.5
+      parent: 1
+  - uid: 678
+    components:
+    - type: Transform
+      pos: 2.5,-15.5
+      parent: 1
+- proto: WeaponCapacitorRecharger
+  entities:
+  - uid: 402
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,13.5
+      parent: 1
+- proto: WindoorPlasma
+  entities:
+  - uid: 588
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,6.5
+      parent: 1
+  - uid: 605
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,6.5
+      parent: 1
+- proto: WizardComputerComms
+  entities:
+  - uid: 365
+    components:
+    - type: Transform
+      pos: 0.5,13.5
+      parent: 1
+- proto: WoodblockInstrument
+  entities:
+  - uid: 91
+    components:
+    - type: Transform
+      pos: 2.5347729,-0.35558593
+      parent: 1
+...
diff --git a/Resources/Maps/Shuttles/ShuttleEvent/quark.yml b/Resources/Maps/Shuttles/ShuttleEvent/quark.yml
index 49e27e3fa9..d8deb51141 100644
--- a/Resources/Maps/Shuttles/ShuttleEvent/quark.yml
+++ b/Resources/Maps/Shuttles/ShuttleEvent/quark.yml
@@ -1351,6 +1351,8 @@ entities:
         intensity: 50
         type: SingularityDistortion
       - type: ExplodeOnTrigger
+        keysIn:
+        - stageTwo
       triggerDelay: 500
 - proto: GravityGeneratorMini
   entities:
@@ -1479,8 +1481,8 @@ entities:
 
                                            [bold]Crew of the NT-Quark[/bold]
 
-             [bold]Nuclear containment breach detected on long range 
-                 halcyon scanners. Seek immediate shelter. Avoid 
+             [bold]Nuclear containment breach detected on long range
+                 halcyon scanners. Seek immediate shelter. Avoid
                          contaminated materials. Do not panic.[/bold]
 
                               [color=red][bold]Alpha decay rates indicate estimated
diff --git a/Resources/Maps/Shuttles/trading_outpost.yml b/Resources/Maps/Shuttles/trading_outpost.yml
index 79a861985a..37a01b7c42 100644
--- a/Resources/Maps/Shuttles/trading_outpost.yml
+++ b/Resources/Maps/Shuttles/trading_outpost.yml
@@ -6083,7 +6083,7 @@ entities:
     - type: Transform
       pos: 9.5,-23.5
       parent: 2
-- proto: StationAnchor
+- proto: StationAnchorIndestructible
   entities:
   - uid: 887
     components:
diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml
index 4e08d46798..bb8b60d624 100644
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
@@ -4,7 +4,7 @@ meta:
   engineVersion: 265.0.0
   forkId: ""
   forkVersion: ""
-  time: 07/24/2025 17:19:08
+  time: 08/01/2025 09:46:27
   entityCount: 25505
 maps:
 - 943
@@ -16449,7 +16449,7 @@ entities:
     - type: Transform
       pos: 22.253925,-11.4549055
       parent: 60
-- proto: Biofabricator
+- proto: Biogenerator
   entities:
   - uid: 1560
     components:
@@ -16462,8 +16462,6 @@ entities:
       - Arsenal
       - Experimental
       - CivilianServices
-- proto: Biogenerator
-  entities:
   - uid: 16143
     components:
     - type: Transform
@@ -113035,6 +113033,14 @@ entities:
       rot: 3.141592653589793 rad
       pos: 35.5,-21.5
       parent: 60
+    - type: DeviceLinkSource
+      linkedPorts:
+        6832:
+        - - Pressed
+          - Open
+        94:
+        - - Pressed
+          - Open
   - uid: 25271
     components:
     - type: Transform
@@ -128283,7 +128289,7 @@ entities:
     - type: MetaData
       name: outer blast door
     - type: Transform
-      pos: -16.506157,-42.225792
+      pos: -16.5,-42.5
       parent: 60
     - type: DeviceLinkSource
       linkedPorts:
@@ -128295,7 +128301,7 @@ entities:
     - type: MetaData
       name: open inner entrance
     - type: Transform
-      pos: -29.684803,-14.48136
+      pos: -29.5,-14.5
       parent: 60
     - type: DeviceLinkSource
       linkedPorts:
@@ -128311,7 +128317,7 @@ entities:
     - type: MetaData
       name: open outer entrance
     - type: Transform
-      pos: -29.345129,-14.48136
+      pos: -29.5,-14.5
       parent: 60
     - type: DeviceLinkSource
       linkedPorts:
@@ -129647,7 +129653,7 @@ entities:
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -17.488375,22.731707
+      pos: -17.5,22.5
       parent: 60
   - uid: 6129
     components:
@@ -129661,7 +129667,7 @@ entities:
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 5.5065956,-21.714903
+      pos: 5.5,-21.5
       parent: 60
 - proto: SignDirectionalBridge
   entities:
@@ -129675,7 +129681,7 @@ entities:
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 30.494003,-21.269012
+      pos: 30.5,-21.5
       parent: 60
   - uid: 5144
     components:
@@ -129692,13 +129698,13 @@ entities:
   - uid: 5860
     components:
     - type: Transform
-      pos: 14.499228,-0.7112777
+      pos: 14.5,-0.5
       parent: 60
   - uid: 14591
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -21.504086,-21.285238
+      pos: -21.5,-21.5
       parent: 60
   - uid: 18964
     components:
@@ -129712,31 +129718,31 @@ entities:
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -17.504,22.294207
+      pos: -17.5,22.5
       parent: 60
   - uid: 11436
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -2.500059,-21.285631
+      pos: -2.5,-21.5
       parent: 60
   - uid: 13772
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -17.496063,6.7202177
+      pos: -17.5,6.5
       parent: 60
   - uid: 13773
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -35.497772,6.705593
+      pos: -35.5,6.5
       parent: 60
   - uid: 14519
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -3.5026717,8.690684
+      pos: -3.5,8.5
       parent: 60
 - proto: SignDirectionalChemistry
   entities:
@@ -129751,7 +129757,7 @@ entities:
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 42.49971,-21.305145
+      pos: 42.5,-21.5
       parent: 60
 - proto: SignDirectionalDorms
   entities:
@@ -129759,19 +129765,19 @@ entities:
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -17.503284,10.740471
+      pos: -17.5,10.5
       parent: 60
   - uid: 13771
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -13.503204,6.299343
+      pos: -13.5,6.5
       parent: 60
   - uid: 13774
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -35.497772,6.299343
+      pos: -35.5,6.5
       parent: 60
   - uid: 17567
     components:
@@ -129791,13 +129797,13 @@ entities:
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 3.4964921,-21.28964
+      pos: 3.5,-21.5
       parent: 60
   - uid: 2654
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 14.50723,-21.298052
+      pos: 14.5,-21.5
       parent: 60
   - uid: 5602
     components:
@@ -129809,13 +129815,13 @@ entities:
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 14.499228,-0.27377775
+      pos: 14.5,-0.5
       parent: 60
   - uid: 7674
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 38.50196,12.281161
+      pos: 38.5,12.5
       parent: 60
   - uid: 11428
     components:
@@ -129827,12 +129833,12 @@ entities:
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -13.503204,6.721218
+      pos: -13.5,6.5
       parent: 60
   - uid: 19508
     components:
     - type: Transform
-      pos: 18.503504,26.274555
+      pos: 18.5,26.5
       parent: 60
   - uid: 23873
     components:
@@ -129846,31 +129852,31 @@ entities:
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 14.499228,-0.07065275
+      pos: 14.5,-0.5
       parent: 60
   - uid: 11414
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 14.495508,6.7201853
+      pos: 14.5,6.5
       parent: 60
   - uid: 11429
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 4.4996057,8.737062
+      pos: 4.5,8.5
       parent: 60
   - uid: 11430
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 14.50723,-21.719927
+      pos: 14.5,-21.5
       parent: 60
   - uid: 11449
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 14.502121,16.716671
+      pos: 14.5,16.5
       parent: 60
   - uid: 13154
     components:
@@ -129888,7 +129894,7 @@ entities:
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -21.49791,-21.717638
+      pos: -21.5,-21.5
       parent: 60
 - proto: SignDirectionalFood
   entities:
@@ -129896,7 +129902,7 @@ entities:
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 5.505707,-21.281797
+      pos: 5.5,-21.5
       parent: 60
 - proto: SignDirectionalGravity
   entities:
@@ -129904,12 +129910,12 @@ entities:
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -3.5033069,8.099489
+      pos: -3.5,8.5
       parent: 60
   - uid: 23875
     components:
     - type: Transform
-      pos: -13.493781,10.71411
+      pos: -13.5,10.5
       parent: 60
 - proto: SignDirectionalHop
   entities:
@@ -129965,7 +129971,7 @@ entities:
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -3.496961,-21.281797
+      pos: -3.5,-21.5
       parent: 60
 - proto: SignDirectionalMed
   entities:
@@ -129979,24 +129985,24 @@ entities:
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 13.493613,-21.305265
+      pos: 13.5,-21.5
       parent: 60
   - uid: 11334
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 4.4996057,8.283937
+      pos: 4.5,8.5
       parent: 60
   - uid: 11335
     components:
     - type: Transform
-      pos: 14.504288,-0.92285264
+      pos: 14.5,-0.5
       parent: 60
   - uid: 11433
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 3.4964921,-21.711515
+      pos: 3.5,-21.5
       parent: 60
 - proto: SignDirectionalSalvage
   entities:
@@ -130004,7 +130010,7 @@ entities:
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 18.507015,10.276053
+      pos: 18.5,10.5
       parent: 60
   - uid: 13253
     components:
@@ -130017,7 +130023,7 @@ entities:
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -2.5056667,-21.711515
+      pos: -2.5,-21.5
       parent: 60
   - uid: 5600
     components:
@@ -130049,7 +130055,7 @@ entities:
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 30.494003,-21.737762
+      pos: 30.5,-21.5
       parent: 60
   - uid: 8250
     components:
@@ -130066,13 +130072,13 @@ entities:
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -3.498599,8.300059
+      pos: -3.5,8.5
       parent: 60
   - uid: 11434
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 13.492249,-21.69589
+      pos: 13.5,-21.5
       parent: 60
 - proto: SignDirectionalSolar
   entities:
@@ -130152,7 +130158,7 @@ entities:
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 14.500059,6.2768393
+      pos: 14.5,6.5
       parent: 60
   - uid: 11441
     components:
@@ -130163,25 +130169,25 @@ entities:
   - uid: 11450
     components:
     - type: Transform
-      pos: 14.502121,16.279171
+      pos: 14.5,16.5
       parent: 60
   - uid: 19509
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 18.503504,26.69643
+      pos: 18.5,26.5
       parent: 60
   - uid: 19519
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 35.503212,10.69858
+      pos: 35.5,10.5
       parent: 60
   - uid: 23874
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -13.478156,10.292235
+      pos: -13.5,10.5
       parent: 60
 - proto: SignDirectionalWash
   entities:
@@ -130189,7 +130195,7 @@ entities:
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 14.50723,-21.094927
+      pos: 14.5,-21.5
       parent: 60
   - uid: 11448
     components:
diff --git a/Resources/Maps/exo.yml b/Resources/Maps/exo.yml
index ae62cd95fa..d00cb05179 100644
--- a/Resources/Maps/exo.yml
+++ b/Resources/Maps/exo.yml
@@ -1,11 +1,11 @@
 meta:
   format: 7
   category: Map
-  engineVersion: 264.0.0
+  engineVersion: 265.0.0
   forkId: ""
   forkVersion: ""
-  time: 07/22/2025 16:43:19
-  entityCount: 19680
+  time: 07/31/2025 15:20:28
+  entityCount: 20082
 maps:
 - 1
 grids:
@@ -100,95 +100,95 @@ entities:
       chunks:
         0,0:
           ind: 0,0
-          tiles: YAAAAAACAGAAAAAAAQBgAAAAAAMAYAAAAAACAGAAAAAAAABgAAAAAAIAYAAAAAACAGAAAAAAAgCBAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAwBgAAAAAAAAYAAAAAADAGAAAAAAAwBgAAAAAAEAYAAAAAABAGAAAAAAAgBgAAAAAAIAYAAAAAAAAIEAAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAIAYAAAAAACAGAAAAAAAABgAAAAAAEAYAAAAAACAGAAAAAAAgBgAAAAAAEAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: YAAAAAAAAGAAAAAAAABgAAAAAAIAYAAAAAADAGAAAAAAAwBgAAAAAAIAYAAAAAAAAGAAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAQBgAAAAAAAAYAAAAAACAGAAAAAAAwBgAAAAAAEAYAAAAAABAGAAAAAAAgBgAAAAAAEAYAAAAAACAIEAAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAEAYAAAAAABAGAAAAAAAABgAAAAAAMAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAFgAAAAABABYAAAAAAQAWAAAAAAEAFgAAAAACABYAAAAAAQBgAAAAAAAAYAAAAAADAGAAAAAAAgBgAAAAAAIAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABYAAAAAAgAWAAAAAAIAFgAAAAACABYAAAAAAgCBAAAAAAAAYAAAAAABAGAAAAAAAABgAAAAAAIAYAAAAAACAGAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABYAAAAAAwAWAAAAAAIAgQAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAADAGAAAAAAAQBgAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAFgAAAAADABYAAAAAAgAWAAAAAAEAFgAAAAABABYAAAAAAABgAAAAAAMAYAAAAAABAGAAAAAAAABgAAAAAAEAYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABYAAAAAAQAWAAAAAAEAFgAAAAAAABYAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAABgAAAAAAIAYAAAAAADAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABYAAAAAAAAWAAAAAAMAgQAAAAAAAGAAAAAAAQBgAAAAAAIAYAAAAAABAGAAAAAAAQBgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         0,-1:
           ind: 0,-1
-          tiles: JQAAAAADACUAAAAAAwAlAAAAAAEAgQAAAAAAAGAAAAAAAQBgAAAAAAAAYAAAAAAAAGAAAAAAAQCBAAAAAAAAYAAAAAABAGAAAAAAAABgAAAAAAMAYAAAAAABAGAAAAAAAgCBAAAAAAAAYAAAAAAAAIEAAAAAAAAlAAAAAAAAJQAAAAABAIEAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAEAJQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAACBAAAAAAAAKwAAAAAAACsAAAAAAwCBAAAAAAAAKwAAAAABACsAAAAAAgArAAAAAAAAKwAAAAADACsAAAAAAwArAAAAAAMAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADgQAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAAAYAAAAAAAAGAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAQBgAAAAAAAAYAAAAAABAGAAAAAAAgBgAAAAAAMAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAACAGAAAAAAAABgAAAAAAIAYAAAAAADAGAAAAAAAwBgAAAAAAEAgQAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAABgAAAAAAEAYAAAAAAAAGAAAAAAAwBgAAAAAAIAYAAAAAABAGAAAAAAAQBgAAAAAAMAgQAAAAAAAIEAAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAEAYAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAEAYAAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAABAGAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAwBgAAAAAAMAYAAAAAAAAGAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAIAYAAAAAABAGAAAAAAAgBgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAABAIEAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: JQAAAAABACUAAAAAAgAlAAAAAAIAgQAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAABAGAAAAAAAwCBAAAAAAAAYAAAAAADAGAAAAAAAgBgAAAAAAIAYAAAAAACAGAAAAAAAACBAAAAAAAAYAAAAAAAAIEAAAAAAAAlAAAAAAMAJQAAAAABAIEAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAEAJQAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAACBAAAAAAAAKwAAAAAAACsAAAAAAACBAAAAAAAAKwAAAAAAACsAAAAAAwArAAAAAAIAKwAAAAACACsAAAAAAwArAAAAAAEAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADgQAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAEAYAAAAAAAAGAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAMAYAAAAAADAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAEAYAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAAAYAAAAAACAGAAAAAAAABgAAAAAAAAYAAAAAABAGAAAAAAAABgAAAAAAIAgQAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAwBgAAAAAAMAYAAAAAABAGAAAAAAAQBgAAAAAAMAYAAAAAADAGAAAAAAAgBgAAAAAAIAgQAAAAAAAIEAAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAIAYAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAIAYAAAAAADAIEAAAAAAABgAAAAAAEAYAAAAAAAAGAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAABgAAAAAAIAYAAAAAAAAGAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAIAYAAAAAADAGAAAAAAAQBgAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAABAIEAAAAAAABgAAAAAAAAYAAAAAACAGAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         -1,-1:
           ind: -1,-1
-          tiles: gQAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAIEAAAAAAAAkAAAAAAMAJAAAAAABAIEAAAAAAAAlAAAAAAEAJQAAAAABACUAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAABACUAAAAAAgAlAAAAAAIAgQAAAAAAAGAAAAAAAQBgAAAAAAAAgQAAAAAAACUAAAAAAwAtAAAAAAADLQAAAAAAAxgAAAAAAAAYAAAAAAAAGAAAAAAAAC0AAAAAAAEYAAAAAAAALQAAAAAAAS4AAAAAAAMlAAAAAAEARAAAAAAAAGAAAAAAAQBgAAAAAAIAYAAAAAACAEQAAAAAAAAlAAAAAAIAKwAAAAAAACsAAAAAAwAYAAAAAAAAGAAAAAAAABgAAAAAAAArAAAAAAMAGAAAAAAAAIEAAAAAAAAtAAAAAAAAJQAAAAADAIEAAAAAAACBAAAAAAAARAAAAAAAAEQAAAAAAACBAAAAAAAAJQAAAAABAC0AAAAAAAMtAAAAAAADGAAAAAAAABgAAAAAAAAYAAAAAAAALQAAAAAAARgAAAAAAAAtAAAAAAABLgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAYAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAABAGAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAIAgQAAAAAAAGAAAAAAAwBgAAAAAAEAYAAAAAAAAGAAAAAAAABgAAAAAAEAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAgBgAAAAAAMAYAAAAAACAIEAAAAAAABgAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAIAYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAACAGAAAAAAAABgAAAAAAEAYAAAAAADAGAAAAAAAwBgAAAAAAAAYAAAAAAAAGAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAEAYAAAAAACAIEAAAAAAABgAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAQBgAAAAAAIAYAAAAAACAIEAAAAAAABgAAAAAAEAYAAAAAACAGAAAAAAAQCBAAAAAAAAYAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAEAYAAAAAACAGAAAAAAAgBgAAAAAAMAgQAAAAAAAGAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAABAGAAAAAAAABgAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAAAYAAAAAABAIEAAAAAAABgAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAMAYAAAAAACAGAAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: gQAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAIEAAAAAAAAkAAAAAAMAJAAAAAADAIEAAAAAAAAlAAAAAAIAJQAAAAAAACUAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAgAlAAAAAAIAgQAAAAAAAGAAAAAAAgBgAAAAAAMAgQAAAAAAACUAAAAAAAAtAAAAAAADLQAAAAAAAxgAAAAAAAAYAAAAAAAAGAAAAAAAAC0AAAAAAAEYAAAAAAAALQAAAAAAAS4AAAAAAAMlAAAAAAEARAAAAAAAAGAAAAAAAgBgAAAAAAAAYAAAAAAAAEQAAAAAAAAlAAAAAAEAKwAAAAABACsAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAArAAAAAAEAGAAAAAAAACUAAAAAAAAtAAAAAAAAJQAAAAABAIEAAAAAAACBAAAAAAAARAAAAAAAAEQAAAAAAACBAAAAAAAAJQAAAAACAC0AAAAAAAMtAAAAAAADGAAAAAAAABgAAAAAAAAYAAAAAAAALQAAAAAAARgAAAAAAAAtAAAAAAABLgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAMAYAAAAAADAGAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAEAgQAAAAAAAGAAAAAAAQBgAAAAAAEAYAAAAAACAGAAAAAAAABgAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAgBgAAAAAAMAYAAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAACAGAAAAAAAgBgAAAAAAEAYAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAIAYAAAAAAAAGAAAAAAAgBgAAAAAAEAYAAAAAACAGAAAAAAAgBgAAAAAAIAYAAAAAABAGAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAIAYAAAAAACAIEAAAAAAABgAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAgBgAAAAAAIAYAAAAAABAIEAAAAAAABgAAAAAAMAYAAAAAABAGAAAAAAAQCBAAAAAAAAYAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAEAYAAAAAABAGAAAAAAAwBgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAMAgQAAAAAAAGAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAwBgAAAAAAMAgQAAAAAAAGAAAAAAAwBgAAAAAAIAYAAAAAABAIEAAAAAAABgAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAAAAGAAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         -1,-2:
           ind: -1,-2
-          tiles: gQAAAAAAAC4AAAAAAAEuAAAAAAADLgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAC4AAAAAAAItAAAAAAAAJQAAAAACAIEAAAAAAACBAAAAAAAALgAAAAAAAS4AAAAAAAMlAAAAAAAAJQAAAAABAC4AAAAAAAItAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAy4AAAAAAAIuAAAAAAAALQAAAAAAACsAAAAAAAeBAAAAAAAAgQAAAAAAACAAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAwCBAAAAAAAAJAAAAAADACQAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHgQAAAAAAACAAAAAAAQAgAAAAAAAAIAAAAAACACUAAAAAAgAlAAAAAAEAgQAAAAAAACQAAAAAAwAkAAAAAAMAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAAB4EAAAAAAAAgAAAAAAEALgAAAAAAAi0AAAAAAAMuAAAAAAADIAAAAAACAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAACACAAAAAAAgCBAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAIAAAAAABAC0AAAAAAAAEAAAAAAAALQAAAAAAACAAAAAAAQAgAAAAAAIAgQAAAAAAAC0AAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHIAAAAAACACAAAAAAAwAuAAAAAAABLQAAAAAAAy4AAAAAAAAgAAAAAAAAIAAAAAACACAAAAAAAAAtAAAAAAAAIAAAAAACABQAAAAAAAAUAAAAAAAAFAAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAAByAAAAAAAgAgAAAAAAAAIAAAAAACACAAAAAAAQAgAAAAAAMAIAAAAAADACAAAAAAAgAgAAAAAAIALQAAAAAAACAAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAAeBAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAEAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHRAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAEQAAAAAAAAtAAAAAAAAGAAAAAAAACQAAAAAAAAkAAAAAAIAJAAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAAAuAAAAAAADLQAAAAAAAC4AAAAAAAIuAAAAAAACLQAAAAAAAy0AAAAAAAAuAAAAAAACLgAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAACQAAAAAAQCBAAAAAAAALQAAAAAAACsAAAAAAAcuAAAAAAAALgAAAAAAAS0AAAAAAAAuAAAAAAAALgAAAAAAAi0AAAAAAAMuAAAAAAAALQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAkAAAAAAMAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAy0AAAAAAAMtAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAAYAAAAAAAAGAAAAAAAACQAAAAAAAAkAAAAAAEAJAAAAAABAIEAAAAAAAAtAAAAAAAAKwAAAAAABy8AAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAAAvAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAACUAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAACQAAAAAAQCBAAAAAAAAgQAAAAAAACQAAAAAAgAkAAAAAAAAJQAAAAACACUAAAAAAgAlAAAAAAIAJQAAAAABAC4AAAAAAAEtAAAAAAADgQAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAIEAAAAAAAAkAAAAAAEAJAAAAAABAC8AAAAAAAAkAAAAAAEAJQAAAAAAACUAAAAAAwAlAAAAAAAAJQAAAAADACUAAAAAAgAlAAAAAAAAJQAAAAABAA==
+          tiles: gQAAAAAAAC4AAAAAAAEuAAAAAAADLgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAC4AAAAAAAItAAAAAAAAJQAAAAABAIEAAAAAAACBAAAAAAAALgAAAAAAAS4AAAAAAAMlAAAAAAAAJQAAAAAAAC4AAAAAAAItAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAy4AAAAAAAIuAAAAAAAALQAAAAAAACsAAAAAAQeBAAAAAAAAgQAAAAAAACAAAAAAAwCBAAAAAAAAJQAAAAAAACUAAAAAAgCBAAAAAAAAJAAAAAAAACQAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAIHgQAAAAAAACAAAAAAAgAgAAAAAAMAIAAAAAACACUAAAAAAQAlAAAAAAMAgQAAAAAAACQAAAAAAAAkAAAAAAAAgQAAAAAAACAAAAAAAQAgAAAAAAEAIAAAAAADAIEAAAAAAAAtAAAAAAAAKwAAAAABB4EAAAAAAAAgAAAAAAMALgAAAAAAAi0AAAAAAAMuAAAAAAADIAAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAAAgAAAAAAIAIAAAAAADACAAAAAAAQCBAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAIAAAAAABAC0AAAAAAAAEAAAAAAAALQAAAAAAACAAAAAAAAAgAAAAAAEAgQAAAAAAAC0AAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAMHIAAAAAACACAAAAAAAgAuAAAAAAABLQAAAAAAAy4AAAAAAAAgAAAAAAMAIAAAAAADACAAAAAAAgAtAAAAAAAAIAAAAAACABQAAAAAAAAUAAAAAAAAFAAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAACByAAAAAAAgAgAAAAAAAAIAAAAAABACAAAAAAAQAgAAAAAAIAIAAAAAABACAAAAAAAgAgAAAAAAAALQAAAAAAACAAAAAAAwAUAAAAAAAAFAAAAAAAABQAAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAQeBAAAAAAAAgQAAAAAAACAAAAAAAQAgAAAAAAEAAgAAAAAAAAIAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAEHRAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAEQAAAAAAAAtAAAAAAAAGAAAAAAAACQAAAAAAwAkAAAAAAIAJAAAAAADAIEAAAAAAAAtAAAAAAAAKwAAAAACBy0AAAAAAAAuAAAAAAADLQAAAAAAAC4AAAAAAAIuAAAAAAACLQAAAAAAAy0AAAAAAAAuAAAAAAACLgAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAACQAAAAAAgCBAAAAAAAALQAAAAAAACsAAAAAAgcuAAAAAAAALgAAAAAAAS0AAAAAAAAuAAAAAAAALgAAAAAAAi0AAAAAAAMuAAAAAAAALQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAkAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAMHLQAAAAAAAy0AAAAAAAMtAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAAYAAAAAAAAGAAAAAAAACQAAAAAAgAkAAAAAAMAJAAAAAABAIEAAAAAAAAtAAAAAAAAKwAAAAAABy8AAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAAAvAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAACUAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAACQAAAAAAACBAAAAAAAAgQAAAAAAACQAAAAAAgAkAAAAAAMAJQAAAAACACUAAAAAAwAlAAAAAAAAJQAAAAADAC4AAAAAAAEtAAAAAAADgQAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAIEAAAAAAAAkAAAAAAIAJAAAAAAAAC8AAAAAAAAkAAAAAAAAJQAAAAAAACUAAAAAAQAlAAAAAAEAJQAAAAAAACUAAAAAAQAlAAAAAAIAJQAAAAACAA==
           version: 7
         0,-2:
           ind: 0,-2
-          tiles: KwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAYAAAAAACAGAAAAAAAQBgAAAAAAAAYAAAAAACAC4AAAAAAAKBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAABgAAAAAAEAYAAAAAABAGAAAAAAAgBgAAAAAAEAYAAAAAAAAGAAAAAAAwAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAAG8AAAAAAABgAAAAAAMAYAAAAAADAGAAAAAAAABgAAAAAAIAYAAAAAAAAGAAAAAAAABgAAAAAAIALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAAAYAAAAAABAIEAAAAAAABgAAAAAAEAYAAAAAAAAGAAAAAAAgCBAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAMAYAAAAAADABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAAAAGAAAAAAAwBgAAAAAAEAYAAAAAADAGAAAAAAAwBgAAAAAAMAgQAAAAAAAGAAAAAAAQBgAAAAAAEAYAAAAAAAAGAAAAAAAgAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAACAGAAAAAAAABgAAAAAAMAYAAAAAACAGAAAAAAAQBgAAAAAAAAYAAAAAACAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAwAVAAAAAAAAFQAAAAACABUAAAAAAABgAAAAAAEAYAAAAAACAGAAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAEAFQAAAAACABUAAAAAAwAVAAAAAAMAYAAAAAABAGAAAAAAAgBgAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAIAYAAAAAADAGAAAAAAAgCBAAAAAAAAYAAAAAABABUAAAAAAwAVAAAAAAAAFQAAAAABAGAAAAAAAgAyAAAAAAAAMgAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAMAYAAAAAADAGAAAAAAAQBgAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAEAYAAAAAAAAGAAAAAAAgBgAAAAAAIAgQAAAAAAAIEAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAEAYAAAAAAAAGAAAAAAAQBgAAAAAAEAYAAAAAAAAGAAAAAAAgBgAAAAAAMAYAAAAAABAGAAAAAAAABgAAAAAAEALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAEAYAAAAAABAGAAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAABgAAAAAAEAYAAAAAACAGAAAAAAAgBgAAAAAAMAYAAAAAADAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAAAuAAAAAAAAJQAAAAABACUAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAYAAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAIAYAAAAAADAIEAAAAAAABgAAAAAAMAJQAAAAABAIEAAAAAAABEAAAAAAAARAAAAAAAAGAAAAAAAABgAAAAAAEAYAAAAAABAGAAAAAAAwBgAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAMAYAAAAAADAGAAAAAAAACBAAAAAAAAYAAAAAAAAA==
+          tiles: KwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAQBgAAAAAAIAYAAAAAABAC4AAAAAAAKBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAABgAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAIAYAAAAAABAGAAAAAAAgAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAAG8AAAAAAABgAAAAAAEAYAAAAAADAGAAAAAAAQBgAAAAAAMAYAAAAAABAGAAAAAAAABgAAAAAAIALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAMAYAAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAADAGAAAAAAAgCBAAAAAAAAYAAAAAABAGAAAAAAAwBgAAAAAAAAYAAAAAADABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAMAYAAAAAACAGAAAAAAAABgAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAABAGAAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAACAGAAAAAAAgBgAAAAAAAAYAAAAAACAGAAAAAAAABgAAAAAAMAYAAAAAACAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgAVAAAAAAAAFQAAAAABABUAAAAAAwBgAAAAAAMAYAAAAAADAGAAAAAAAwAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAMAFQAAAAACABUAAAAAAAAVAAAAAAIAYAAAAAADAGAAAAAAAgBgAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAAAYAAAAAADAGAAAAAAAgCBAAAAAAAAYAAAAAABABUAAAAAAAAVAAAAAAMAFQAAAAACAGAAAAAAAAAyAAAAAAAAMgAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAADAGAAAAAAAQBgAAAAAAMAgQAAAAAAAGAAAAAAAQBgAAAAAAAAYAAAAAADAGAAAAAAAQBgAAAAAAEAgQAAAAAAAIEAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAIAYAAAAAACAGAAAAAAAQBgAAAAAAMAYAAAAAABAGAAAAAAAABgAAAAAAMALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAIAYAAAAAAAAGAAAAAAAwCBAAAAAAAAYAAAAAABAGAAAAAAAwBgAAAAAAMAYAAAAAAAAGAAAAAAAABgAAAAAAMAYAAAAAADAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAAAuAAAAAAAAJQAAAAABACUAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAYAAAAAADAIEAAAAAAABgAAAAAAIAYAAAAAADAGAAAAAAAQBgAAAAAAAAYAAAAAACAIEAAAAAAABgAAAAAAEAJQAAAAACAIEAAAAAAABEAAAAAAAARAAAAAAAAGAAAAAAAwBgAAAAAAMAYAAAAAADAGAAAAAAAQBgAAAAAAIAYAAAAAABAGAAAAAAAgBgAAAAAAMAYAAAAAADAG8AAAAAAACBAAAAAAAAYAAAAAADAA==
           version: 7
         1,-1:
           ind: 1,-1
-          tiles: YAAAAAADAGAAAAAAAABgAAAAAAEAYAAAAAADAGAAAAAAAQCBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAAApAAAAAAMAKQAAAAAAACkAAAAAAQApAAAAAAEAKQAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAIuAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAKQAAAAACACkAAAAAAQAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAJQAAAAAAACUAAAAAAAAuAAAAAAABLQAAAAAAAy0AAAAAAAMuAAAAAAADgQAAAAAAACkAAAAAAwCBAAAAAAAAKwAAAAABACsAAAAAAQArAAAAAAMAKwAAAAACACsAAAAAAAArAAAAAAMAKwAAAAACACUAAAAAAQAlAAAAAAIAJQAAAAAAACsAAAAAAwAlAAAAAAEALQAAAAAAAIEAAAAAAAApAAAAAAIAKQAAAAACAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAALQAAAAAAAy4AAAAAAACBAAAAAAAAKQAAAAAAACkAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAgCBAAAAAAAAIAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: YAAAAAACAGAAAAAAAABgAAAAAAMAYAAAAAABAGAAAAAAAwBgAAAAAAMAYAAAAAABAIEAAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAAMtAAAAAAAAgQAAAAAAACkAAAAAAAApAAAAAAEAKQAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAi4AAAAAAAArAAAAAAADLQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACkAAAAAAwAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAAlAAAAAAIAJQAAAAAAAC4AAAAAAAEtAAAAAAADLgAAAAAAA4EAAAAAAACBAAAAAAAAKwAAAAAAACsAAAAAAwArAAAAAAMAKwAAAAADACsAAAAAAAArAAAAAAAAKwAAAAACACUAAAAAAQAlAAAAAAIAJQAAAAADACUAAAAAAAArAAAAAAAAJQAAAAAAAC0AAAAAAACBAAAAAAAAKQAAAAADAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAgQAAAAAAACkAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAgCBAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         1,-2:
           ind: 1,-2
-          tiles: YAAAAAACAGAAAAAAAgBgAAAAAAEAYAAAAAABAGAAAAAAAgBgAAAAAAMAgQAAAAAAAC0AAAAAAAAlAAAAAAMALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAAAYAAAAAADAGAAAAAAAwBgAAAAAAMAYAAAAAADAIEAAAAAAAAuAAAAAAABLQAAAAAAAy4AAAAAAACBAAAAAAAAgQAAAAAAACkAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAADAGAAAAAAAgCBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAAApAAAAAAAAKQAAAAAAACUAAAAAAwAlAAAAAAIAYAAAAAABAGAAAAAAAABgAAAAAAAAYAAAAAABAGAAAAAAAABgAAAAAAMAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAGAAAAAAAgBgAAAAAAIAYAAAAAADAGAAAAAAAwBgAAAAAAMAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAMAFgAAAAADAIEAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAAApAAAAAAIAKQAAAAADACkAAAAAAQAlAAAAAAIAJQAAAAACAGAAAAAAAABgAAAAAAAAYAAAAAABABoAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAAABAAAAAAEAAQAAAAACAAEAAAAAAgCBAAAAAAAAgQAAAAAAACkAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAACAGAAAAAAAABgAAAAAAAAYAAAAAABAGAAAAAAAABgAAAAAAMAYAAAAAAAAGAAAAAAAwBgAAAAAAMAKQAAAAABACkAAAAAAAApAAAAAAMAKQAAAAAAACkAAAAAAwApAAAAAAEAgQAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAABAGAAAAAAAABgAAAAAAMAYAAAAAABAGAAAAAAAABgAAAAAAAAYAAAAAADACkAAAAAAAApAAAAAAIAKQAAAAADACkAAAAAAwApAAAAAAEAKQAAAAADAIEAAAAAAABgAAAAAAEAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAABAAAAAAAAAQAAAAABAAEAAAAAAQCBAAAAAAAAKQAAAAADACkAAAAAAgApAAAAAAIAKQAAAAADACkAAAAAAwBgAAAAAAAAYAAAAAABAGAAAAAAAgBgAAAAAAIAYAAAAAABAGAAAAAAAgCBAAAAAAAALgAAAAAAAi0AAAAAAAMuAAAAAAADgQAAAAAAACkAAAAAAgApAAAAAAAAKQAAAAADACkAAAAAAAApAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAEAYAAAAAAAAGAAAAAAAwBgAAAAAAAAgQAAAAAAAC0AAAAAAAAlAAAAAAEALQAAAAAAAIEAAAAAAAApAAAAAAAAKQAAAAAAACkAAAAAAQApAAAAAAIAKQAAAAABAGAAAAAAAwBgAAAAAAAAYAAAAAABAGAAAAAAAwBgAAAAAAMAYAAAAAABAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAKQAAAAABACkAAAAAAAApAAAAAAEAKQAAAAAAACkAAAAAAwBgAAAAAAEAYAAAAAAAAGAAAAAAAgBgAAAAAAIAYAAAAAADAGAAAAAAAwCBAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAAIEAAAAAAAApAAAAAAEAKQAAAAABACkAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAABgAAAAAAAAYAAAAAACAGAAAAAAAQBgAAAAAAEAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAAApAAAAAAIAKQAAAAACACkAAAAAAQApAAAAAAMAKQAAAAABAA==
+          tiles: YAAAAAAAAGAAAAAAAABgAAAAAAMAYAAAAAAAAGAAAAAAAABgAAAAAAAAgQAAAAAAAC0AAAAAAAAlAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAKQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAAAYAAAAAAAAIEAAAAAAAAuAAAAAAABLQAAAAAAAy4AAAAAAACBAAAAAAAAKQAAAAADACkAAAAAAwApAAAAAAAAJQAAAAABACUAAAAAAwBgAAAAAAAAYAAAAAABAGAAAAAAAgBgAAAAAAAAYAAAAAADAGAAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAACkAAAAAAwAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAACAGAAAAAAAgBgAAAAAAIAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAApAAAAAAEAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAGAAAAAAAgBgAAAAAAMAYAAAAAACAGAAAAAAAQBgAAAAAAMAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAKQAAAAACABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAYAAAAAADAGAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAAIEAAAAAAAApAAAAAAEAKQAAAAABACUAAAAAAwAlAAAAAAIAgQAAAAAAAGAAAAAAAwBgAAAAAAIAYAAAAAADABYAAAAAAwCBAAAAAAAAgQAAAAAAAC4AAAAAAAItAAAAAAADLQAAAAAAAy4AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAMAYAAAAAAAAGAAAAAAAgBgAAAAAAIAgQAAAAAAAIEAAAAAAAAtAAAAAAAALgAAAAAAAi4AAAAAAAMuAAAAAAABLQAAAAAAAykAAAAAAgApAAAAAAIALQAAAAAAAy0AAAAAAANgAAAAAAEAYAAAAAADAGAAAAAAAwBgAAAAAAAAYAAAAAACAGAAAAAAAwBgAAAAAAAAYAAAAAAAAC4AAAAAAAEuAAAAAAAAJQAAAAACACsAAAAAAgArAAAAAAIAKwAAAAACACsAAAAAAwArAAAAAAMAgQAAAAAAAGAAAAAAAgBgAAAAAAMAYAAAAAABAGAAAAAAAwBgAAAAAAMAYAAAAAAAAGAAAAAAAQAtAAAAAAADLgAAAAAAAysAAAAAAwMuAAAAAAACLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAABgAAAAAAAAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAy0AAAAAAAArAAAAAAEDLQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAABgAAAAAAEAYAAAAAADAGAAAAAAAwBgAAAAAAEAYAAAAAAAAGAAAAAAAwBgAAAAAAEAgQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAAAy0AAAAAAACBAAAAAAAAKQAAAAAAACkAAAAAAQApAAAAAAIAYAAAAAABAGAAAAAAAABgAAAAAAIAYAAAAAACAGAAAAAAAABgAAAAAAEAYAAAAAACAGAAAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAwMtAAAAAAAAGAAAAAAAACkAAAAAAAApAAAAAAAAKQAAAAABAGAAAAAAAABgAAAAAAIAYAAAAAABAGAAAAAAAQBgAAAAAAMAYAAAAAADAGAAAAAAAgBgAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAIDLQAAAAAAABgAAAAAAAApAAAAAAIAKQAAAAAAACkAAAAAAABgAAAAAAIAYAAAAAAAAGAAAAAAAwBgAAAAAAAAYAAAAAABAGAAAAAAAABgAAAAAAIAYAAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAADAy0AAAAAAACBAAAAAAAAKQAAAAAAACkAAAAAAAApAAAAAAEAYAAAAAABAGAAAAAAAQBgAAAAAAMAYAAAAAADAGAAAAAAAABgAAAAAAMAYAAAAAAAAGAAAAAAAQCBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAAApAAAAAAMAKQAAAAACAA==
           version: 7
         0,-3:
           ind: 0,-3
-          tiles: IAAAAAACAAMAAAAAAAADAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAIAAAAAAAACUAAAAAAwAlAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAcAAAAAAAADAAAAAAAAAwAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAALgAAAAAAAi0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAi4AAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAYAAAAAAAAJAAAAAACABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAAC0AAAAAAAAlAAAAAAIALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAIEAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAS4AAAAAAAOBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAuAAAAAAABLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAKwAAAAAABy4AAAAAAAEYAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADKwAAAAACACsAAAAAAgArAAAAAAIAKwAAAAADACUAAAAAAAArAAAAAAIAGAAAAAAAACsAAAAAAAArAAAAAAEAKwAAAAADACsAAAAAAAArAAAAAAEAKwAAAAAAACsAAAAAAAArAAAAAAEAKwAAAAAAAC4AAAAAAAItAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAxgAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAMAYAAAAAAAAA==
+          tiles: IAAAAAACAAMAAAAAAAADAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAIAAAAAAAACUAAAAAAQAlAAAAAAIAJQAAAAACACUAAAAAAAAlAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAcAAAAAAAADAAAAAAAAAwAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAALgAAAAAAAi0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAi4AAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAYAAAAAAAAJAAAAAABABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAAC0AAAAAAAAlAAAAAAEALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAIEAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAS4AAAAAAAOBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAuAAAAAAABLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAEHLQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAKwAAAAACBy4AAAAAAAEYAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADKwAAAAABACsAAAAAAAArAAAAAAAAKwAAAAABACUAAAAAAQArAAAAAAIAGAAAAAAAACsAAAAAAgArAAAAAAEAKwAAAAAAACsAAAAAAgArAAAAAAAAKwAAAAABACsAAAAAAgArAAAAAAMAKwAAAAAAAC4AAAAAAAItAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAxgAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAQBgAAAAAAIAYAAAAAABAA==
           version: 7
         1,-3:
           ind: 1,-3
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAYAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAADFwAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAwAlAAAAAAEAJQAAAAADACUAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAS4AAAAAAAOBAAAAAAAAIAAAAAABACsAAAAAAQAgAAAAAAIAgQAAAAAAACUAAAAAAwAlAAAAAAMAJQAAAAABACUAAAAAAQAlAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAABgAAAAAAAAlAAAAAAEAJQAAAAABACUAAAAAAQAlAAAAAAIAJQAAAAAAAC4AAAAAAAItAAAAAAADLgAAAAAAA4EAAAAAAACBAAAAAAAALQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAAAYAAAAAAAAJQAAAAABACUAAAAAAgAlAAAAAAEAJQAAAAACACUAAAAAAAAtAAAAAAAABAAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAACUAAAAAAwAlAAAAAAAAJQAAAAACACUAAAAAAQAlAAAAAAAALgAAAAAAAS0AAAAAAAMuAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAAAlAAAAAAMAJQAAAAABACUAAAAAAAAlAAAAAAIAJQAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAJQAAAAADACUAAAAAAwAlAAAAAAMAJQAAAAABACUAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAi4AAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAACUAAAAAAwAlAAAAAAEAJQAAAAAAACUAAAAAAAAlAAAAAAIALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAAXAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAQAAAAAAMAEAAAAAABABAAAAAAAwAQAAAAAAEAJQAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAEAAAAAACABAAAAAAAAAQAAAAAAAAEAAAAAADACUAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMYAAAAAAAALgAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAKwAAAAACACsAAAAAAgArAAAAAAEAKwAAAAAAACsAAAAAAAArAAAAAAAAGAAAAAAAACsAAAAAAQAlAAAAAAEALQAAAAAAAC0AAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAxgAAAAAAAAuAAAAAAADKwAAAAAABy0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAOBAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAYAAAAAADAGAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAYAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAADFwAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAJQAAAAABACUAAAAAAAAlAAAAAAMAJQAAAAACACUAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAS4AAAAAAAOBAAAAAAAAIAAAAAAAACsAAAAAAgAgAAAAAAMAgQAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAADACUAAAAAAgAlAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAIHLQAAAAAAABgAAAAAAAAlAAAAAAIAJQAAAAADACUAAAAAAQAlAAAAAAIAJQAAAAADAC4AAAAAAAItAAAAAAADLgAAAAAAA4EAAAAAAACBAAAAAAAALQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAAAYAAAAAAAAJQAAAAACACUAAAAAAQAlAAAAAAEAJQAAAAACACUAAAAAAQAtAAAAAAAABAAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAQctAAAAAAAAgQAAAAAAACUAAAAAAQAlAAAAAAEAJQAAAAAAACUAAAAAAQAlAAAAAAIALgAAAAAAAS0AAAAAAAMuAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAMHLQAAAAAAAIEAAAAAAAAlAAAAAAEAJQAAAAAAACUAAAAAAwAlAAAAAAMAJQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAEAJQAAAAABACUAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAi4AAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAACUAAAAAAAAlAAAAAAEAJQAAAAACACUAAAAAAwAlAAAAAAIALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAAXAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAQAAAAAAAAEAAAAAADABAAAAAAAgAQAAAAAAIAJQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAADBy0AAAAAAACBAAAAAAAAEAAAAAABABAAAAAAAAAQAAAAAAIAEAAAAAAAACUAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMYAAAAAAAALgAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAKwAAAAACACsAAAAAAwArAAAAAAEAKwAAAAAAACsAAAAAAgArAAAAAAEAGAAAAAAAACsAAAAAAAAlAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAxgAAAAAAAAuAAAAAAADKwAAAAACBy0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAOBAAAAAAAALQAAAAAAACsAAAAAAQctAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAYAAAAAAAAGAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAIHLQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         -1,-3:
           ind: -1,-3
-          tiles: gQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAABvAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAIAIAAAAAACACAAAAAAAQCBAAAAAAAAIAAAAAADAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAQAgAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAAAgAAAAAAMAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAIAAAAAACAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAJAAAAAABACQAAAAAAwAkAAAAAAMAJAAAAAACACQAAAAAAwCBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAACQAAAAAAQAkAAAAAAIAJAAAAAADACQAAAAAAgAkAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAMAgQAAAAAAAIEAAAAAAAAuAAAAAAACLQAAAAAABy4AAAAAAAOBAAAAAAAAFwAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAAAuAAAAAAABLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAABcAAAAAAAAYAAAAAAAALQAAAAAAACUAAAAAAAArAAAAAAAAJQAAAAADAC4AAAAAAAItAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAAtAAAAAAAALQAAAAAAACAAAAAAAgCBAAAAAAAAGAAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAC4AAAAAAAIuAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAC4AAAAAAAEtAAAAAAAHLgAAAAAAAxgAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAAAuAAAAAAABGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAuAAAAAAACLQAAAAAABy4AAAAAAAWBAAAAAAAALQAAAAAAAC0AAAAAAAAuAAAAAAABLQAAAAAAAy0AAAAAAAMYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAALQAAAAAAAC4AAAAAAAEtAAAAAAADgQAAAAAAAC0AAAAAAAAuAAAAAAABLQAAAAAAA4EAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAJQAAAAABAIEAAAAAAAAuAAAAAAABLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAxgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAtAAAAAAAALQAAAAAAACsAAAAAAAeBAAAAAAAALQAAAAAAAC0AAAAAAAAuAAAAAAABLgAAAAAAAxgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAALQAAAAAAAC0AAAAAAAArAAAAAAAHgQAAAAAAAC0AAAAAAAAuAAAAAAABLgAAAAAAAy4AAAAAAAEtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAAtAAAAAAAAKwAAAAAABw==
+          tiles: gQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAABvAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAgQAAAAAAACAAAAAAAQAgAAAAAAIAIAAAAAAAACAAAAAAAgCBAAAAAAAAIAAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAwAgAAAAAAMALQAAAAAAACsAAAAAAQctAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAAAgAAAAAAIAgQAAAAAAAC0AAAAAAAArAAAAAAIHLQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAIAAAAAACAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAJAAAAAABACQAAAAAAwAkAAAAAAIAJAAAAAABACQAAAAAAQCBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAwctAAAAAAAAgQAAAAAAACQAAAAAAAAkAAAAAAEAJAAAAAAAACQAAAAAAwAkAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAIHLQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAEAgQAAAAAAAIEAAAAAAAAuAAAAAAACLQAAAAAABy4AAAAAAAOBAAAAAAAAFwAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAABBy0AAAAAAAAuAAAAAAABLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAABcAAAAAAAAYAAAAAAAALQAAAAAAACUAAAAAAgArAAAAAAMAJQAAAAAAAC4AAAAAAAItAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAAtAAAAAAAALQAAAAAAACAAAAAAAACBAAAAAAAAGAAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAC4AAAAAAAIuAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAC4AAAAAAAEtAAAAAAAHLgAAAAAAAxgAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAAAuAAAAAAABGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAuAAAAAAACLQAAAAAABy4AAAAAAAWBAAAAAAAALQAAAAAAAC0AAAAAAAAuAAAAAAABLQAAAAAAAy0AAAAAAAMYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAALQAAAAAAAC4AAAAAAAEtAAAAAAADgQAAAAAAAC0AAAAAAAAuAAAAAAABLQAAAAAAA4EAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAJQAAAAABAIEAAAAAAAAuAAAAAAABLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAxgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAtAAAAAAAALQAAAAAAACsAAAAAAAeBAAAAAAAALQAAAAAAAC0AAAAAAAAuAAAAAAABLgAAAAAAAxgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAALQAAAAAAAC0AAAAAAAArAAAAAAAHgQAAAAAAAC0AAAAAAAAuAAAAAAABLgAAAAAAAy4AAAAAAAEtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAAtAAAAAAAAKwAAAAAABw==
           version: 7
         -2,-2:
           ind: -2,-2
-          tiles: gQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAIAAAAAABAAEAAAAAAwAYAAAAAAAAAAAAAAAAAIEAAAAAAAABAAAAAAAAAQAAAAADAAEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAACAAAAAAAwABAAAAAAIAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAAYAAAAAAQAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAAAgAAAAAAMAAQAAAAACAAEAAAAAAAAmAAAAAAIAJgAAAAABABgAAAAAAAAGAAAAAAIAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAABgAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAgAAAAAAEALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAACAAAAAAAwAgAAAAAAIAIAAAAAADAAEAAAAAAwABAAAAAAEAAQAAAAADAAYAAAAAAAABAAAAAAEAAQAAAAADAAEAAAAAAwCBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAACAAAAAAAAAgAAAAAAAALgAAAAAAAi0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAMgAAAAAAAALgAAAAAAA4EAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAIAAAAAACAC4AAAAAAAEtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAIAAAAAAAAC4AAAAAAAAYAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAACAAAAAAAwAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAEAIAAAAAADACAAAAAAAwAgAAAAAAMAIAAAAAACACAAAAAAAQAuAAAAAAADGAAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAALQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAARAAAAAAAAEQAAAAAAAAYAAAAAAAARAAAAAAAAC0AAAAAAAAYAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAC4AAAAAAAItAAAAAAADLQAAAAAAAy4AAAAAAAMuAAAAAAAAGAAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAABgAAAAAAAAtAAAAAAAAGAAAAAAAABgAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAALQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAGAAAAAAAAEQAAAAAAACBAAAAAAAAIAAAAAADAC0AAAAAAAArAAAAAAAHLQAAAAAAAC0AAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAABEAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAAAtAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAEAAAAAAAAGAAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAABBy0AAAAAAACBAAAAAAAAIAAAAAACAAEAAAAAAgAYAAAAAAAAAAAAAAAAAIEAAAAAAAABAAAAAAEAAQAAAAABAAEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAACAAAAAAAAABAAAAAAIAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAAYAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAMHLQAAAAAAAIEAAAAAAAAgAAAAAAEAAQAAAAABAAEAAAAAAgAmAAAAAAIAJgAAAAABABgAAAAAAAAGAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAABBy0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAABgAAAAABABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAvAAAAAAAALQAAAAAAACsAAAAAAgctAAAAAAAAgQAAAAAAACAAAAAAAgAgAAAAAAEAIAAAAAACAAEAAAAAAwABAAAAAAEAAQAAAAABAAYAAAAAAwABAAAAAAMAAQAAAAADAAEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAMHLQAAAAAAACAAAAAAAQAgAAAAAAIALgAAAAAAAi0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAMgAAAAAAIALgAAAAAAA4EAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAIAAAAAACAC4AAAAAAAEtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAIAAAAAADAC4AAAAAAAAYAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAACAAAAAAAQAgAAAAAAMAIAAAAAADACAAAAAAAgAgAAAAAAAAIAAAAAACACAAAAAAAgAgAAAAAAMAIAAAAAACACAAAAAAAwAuAAAAAAADGAAAAAAAAC0AAAAAAAArAAAAAAMHLQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAALQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAABBy0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAARAAAAAAAAEQAAAAAAAAYAAAAAAAARAAAAAAAAC0AAAAAAAAYAAAAAAAALQAAAAAAACsAAAAAAwctAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAC4AAAAAAAItAAAAAAADLQAAAAAAAy4AAAAAAAMuAAAAAAAAGAAAAAAAAC0AAAAAAAArAAAAAAMHLQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAABgAAAAAAAAtAAAAAAAAGAAAAAAAABgAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAwctAAAAAAAALQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAGAAAAAAAAEQAAAAAAACBAAAAAAAAIAAAAAACAC0AAAAAAAArAAAAAAMHLQAAAAAAAC0AAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAABEAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAABBy0AAAAAAAAtAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAEAAAAAAAAGAAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAA==
           version: 7
         -2,-1:
           ind: -2,-1
-          tiles: IAAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAABEAAAAAAAARAAAAAAAACAAAAAAAAAgAAAAAAEALQAAAAAAACsAAAAAAActAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAMALgAAAAAAAi4AAAAAAAArAAAAAAAHLgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADGAAAAAAAABgAAAAAAAAtAAAAAAADLQAAAAAAAy4AAAAAAAAlAAAAAAEAJQAAAAACACsAAAAAAQArAAAAAAEAKwAAAAAAACsAAAAAAwArAAAAAAAAKwAAAAABACsAAAAAAgArAAAAAAIAKwAAAAABABgAAAAAAAAYAAAAAAAAKwAAAAAAACsAAAAAAgArAAAAAAMAJQAAAAACAC4AAAAAAAItAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMYAAAAAAAAGAAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAACAIEAAAAAAAAgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAwCBAAAAAAAAIAAAAAABAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAgAAAAAAMAgQAAAAAAACAAAAAAAwCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: IAAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAABEAAAAAAAARAAAAAAAACAAAAAAAgAgAAAAAAIALQAAAAAAACsAAAAAAgctAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAIALgAAAAAAAi4AAAAAAAArAAAAAAAHLgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADGAAAAAAAABgAAAAAAAAtAAAAAAADLQAAAAAAAy4AAAAAAAAlAAAAAAMAJQAAAAADACsAAAAAAgArAAAAAAIAKwAAAAAAACsAAAAAAwArAAAAAAEAKwAAAAACACsAAAAAAAArAAAAAAEAKwAAAAADABgAAAAAAAAYAAAAAAAAKwAAAAACACsAAAAAAQArAAAAAAMAJQAAAAACAC4AAAAAAAItAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMYAAAAAAAAGAAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAABAIEAAAAAAAAgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAACBAAAAAAAAIAAAAAACAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAgAAAAAAMAgQAAAAAAACAAAAAAAwCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         -2,-3:
           ind: -2,-3
-          tiles: gQAAAAAAAIEAAAAAAAAlAAAAAAEAAQAAAAAAACUAAAAAAgAlAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAACACAAAAAAAwAgAAAAAAMAIAAAAAADAIEAAAAAAACBAAAAAAAALwAAAAAAAAAAAAAAAACBAAAAAAAAJQAAAAAAAAEAAAAAAwAlAAAAAAMAJQAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAgAgAAAAAAAAIAAAAAACACAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAACUAAAAAAAABAAAAAAEAJQAAAAAAACUAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAEAIAAAAAADACAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAAAlAAAAAAAAAQAAAAACACUAAAAAAgAlAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAABACAAAAAAAwAgAAAAAAAAIAAAAAACAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAAAEAAAAAAQAlAAAAAAIAJQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAAAJQAAAAABACUAAAAAAwAlAAAAAAIAJQAAAAAAACUAAAAAAwAgAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAIAIAAAAAABACAAAAAAAAAgAAAAAAAAIAAAAAACACAAAAAAAAAgAAAAAAMAGAAAAAAAACUAAAAAAwAlAAAAAAEAJQAAAAACACUAAAAAAQAlAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAACACAAAAAAAgAgAAAAAAAAIAAAAAADACAAAAAAAgAgAAAAAAEAIAAAAAADAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAQAgAAAAAAIAIAAAAAABACAAAAAAAgAgAAAAAAEAIAAAAAABACAAAAAAAgAYAAAAAAAAJQAAAAABACUAAAAAAwAlAAAAAAMAJQAAAAACAIEAAAAAAAAgAAAAAAMAIAAAAAABACAAAAAAAwAgAAAAAAIAIAAAAAABACAAAAAAAgAgAAAAAAMAIAAAAAADACAAAAAAAQAgAAAAAAEAGAAAAAAAABgAAAAAAAAlAAAAAAMAJQAAAAABACUAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAwAgAAAAAAIAIAAAAAADACAAAAAAAwAgAAAAAAMAIAAAAAABACAAAAAAAAAgAAAAAAMAIAAAAAADABgAAAAAAAAYAAAAAAAAGAAAAAAAACUAAAAAAAAlAAAAAAEAGAAAAAAAACAAAAAAAAABAAAAAAIAAQAAAAADAAEAAAAAAwABAAAAAAMAAQAAAAACAAYAAAAAAQABAAAAAAEAAQAAAAACAAEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAlAAAAAAAAJQAAAAABABgAAAAAAAAgAAAAAAAAAQAAAAADABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAABAAAAAAEAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAJQAAAAACACUAAAAAAgAYAAAAAAAAIAAAAAAAAAEAAAAAAQABAAAAAAIAJgAAAAACACYAAAAAAAAYAAAAAAAABgAAAAADABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAJQAAAAADACUAAAAAAwAlAAAAAAIAgQAAAAAAACAAAAAAAAABAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAAYAAAAAAQAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAJQAAAAADACUAAAAAAwAlAAAAAAIAJQAAAAACAIEAAAAAAAAgAAAAAAAAAQAAAAACABgAAAAAAAAAAAAAAAAAgQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAABABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAJQAAAAADAC0AAAAAAACBAAAAAAAAIAAAAAACAAEAAAAAAQAYAAAAAAAAAAAAAAAAAIEAAAAAAAArAAAAAAAAKwAAAAADACsAAAAAAQAYAAAAAAAAGAAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAAAlAAAAAAMAAQAAAAABACUAAAAAAwAlAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAADACAAAAAAAAAgAAAAAAMAIAAAAAACAIEAAAAAAACBAAAAAAAALwAAAAAAAAAAAAAAAACBAAAAAAAAJQAAAAADAAEAAAAAAgAlAAAAAAEAJQAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAwAgAAAAAAAAIAAAAAAAACAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAACUAAAAAAwABAAAAAAAAJQAAAAACACUAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAMAIAAAAAAAACAAAAAAAwAgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAAAlAAAAAAMAAQAAAAAAACUAAAAAAAAlAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAgAgAAAAAAEAIAAAAAACAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAAAEAAAAAAwAlAAAAAAIAJQAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAAAJQAAAAAAACUAAAAAAwAlAAAAAAIAJQAAAAACACUAAAAAAQAgAAAAAAMAgQAAAAAAAIEAAAAAAAAgAAAAAAIAIAAAAAAAACAAAAAAAQAgAAAAAAIAIAAAAAACACAAAAAAAAAgAAAAAAAAGAAAAAAAACUAAAAAAwAlAAAAAAIAJQAAAAACACUAAAAAAAAlAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAABACAAAAAAAAAgAAAAAAMAIAAAAAACACAAAAAAAgAgAAAAAAAAIAAAAAADAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAQAgAAAAAAMAIAAAAAABACAAAAAAAAAgAAAAAAMAIAAAAAAAACAAAAAAAwAYAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAMAJQAAAAABAIEAAAAAAAAgAAAAAAIAIAAAAAAAACAAAAAAAwAgAAAAAAMAIAAAAAACACAAAAAAAwAgAAAAAAMAIAAAAAAAACAAAAAAAwAgAAAAAAEAGAAAAAAAABgAAAAAAAAlAAAAAAAAJQAAAAADACUAAAAAAQCBAAAAAAAAIAAAAAADACAAAAAAAwAgAAAAAAIAIAAAAAABACAAAAAAAgAgAAAAAAMAIAAAAAACACAAAAAAAAAgAAAAAAAAIAAAAAABABgAAAAAAAAYAAAAAAAAGAAAAAAAACUAAAAAAgAlAAAAAAAAGAAAAAAAACAAAAAAAwABAAAAAAAAAQAAAAADAAEAAAAAAgABAAAAAAEAAQAAAAABAAYAAAAAAQABAAAAAAAAAQAAAAACAAEAAAAAAQCBAAAAAAAAGAAAAAAAABgAAAAAAAAlAAAAAAMAJQAAAAAAABgAAAAAAAAgAAAAAAIAAQAAAAACABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAABAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAJQAAAAADACUAAAAAAAAYAAAAAAAAIAAAAAADAAEAAAAAAwABAAAAAAMAJgAAAAAAACYAAAAAAgAYAAAAAAAABgAAAAACABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAJQAAAAACACUAAAAAAQAlAAAAAAMAgQAAAAAAACAAAAAAAgABAAAAAAMAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAAYAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAJQAAAAADACUAAAAAAwAlAAAAAAAAJQAAAAABAIEAAAAAAAAgAAAAAAIAAQAAAAADABgAAAAAAAAAAAAAAAAAgQAAAAAAAAEAAAAAAQABAAAAAAMAAQAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAJQAAAAAAAC0AAAAAAACBAAAAAAAAIAAAAAADAAEAAAAAAAAYAAAAAAAAAAAAAAAAAIEAAAAAAAArAAAAAAMAKwAAAAABACsAAAAAAgAYAAAAAAAAGAAAAAAAAA==
           version: 7
         0,-4:
           ind: 0,-4
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAArAAAAAAAHKwAAAAAAB4EAAAAAAAAYAAAAAAAAgQAAAAAAACAAAAAAAwAgAAAAAAMAIAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAKwAAAAAABysAAAAAAAeBAAAAAAAAGAAAAAAAACAAAAAAAgAgAAAAAAEAIAAAAAADACAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAABkAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAwAgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAADAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAgAgAAAAAAMAIAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAgAtAAAAAAAALQAAAAAAAGAAAAAAAAAwAAAAAAEAGgAAAAACACAAAAAAAgAgAAAAAAMAIAAAAAAAACAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAEALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAADEAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAQAgAAAAAAMAIAAAAAABACAAAAAAAwAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAxAAAAAAEAIAAAAAACACAAAAAAAgAgAAAAAAIAIAAAAAACACAAAAAAAgAgAAAAAAMAIAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAMQAAAAACAIEAAAAAAAAgAAAAAAAAIAAAAAADACAAAAAAAQAgAAAAAAMAIAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAADEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAwCBAAAAAAAAIAAAAAAAACAAAAAAAgAgAAAAAAMALgAAAAAAAi0AAAAAAAMtAAAAAAADGAAAAAAAAC4AAAAAAAAtAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAyAAAAAAAAAgAAAAAAIAIAAAAAACAC0AAAAAAAAlAAAAAAEAKwAAAAADABgAAAAAAAArAAAAAAEAKwAAAAACACsAAAAAAgArAAAAAAMAKwAAAAADACsAAAAAAgArAAAAAAEAKwAAAAAAACsAAAAAAwAgAAAAAAIAIAAAAAABACAAAAAAAwAtAAAAAAAALQAAAAAAAC4AAAAAAAIYAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAAMAAAAAAAADAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAlAAAAAAEAJQAAAAACACUAAAAAAwAlAAAAAAMAJQAAAAACAIEAAAAAAAAgAAAAAAEALgAAAAAAAi0AAAAAAAMDAAAAAAAAAwAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAAAgAAAAAAAAJQAAAAABACAAAAAAAAAgAAAAAAAAIAAAAAADACUAAAAAAwCBAAAAAAAAIAAAAAAAAC0AAAAAAAAlAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAACUAAAAAAgAgAAAAAAMAIAAAAAACACAAAAAAAwAlAAAAAAEAgQAAAAAAACAAAAAAAAAuAAAAAAABLQAAAAAAAw==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAArAAAAAAIHKwAAAAABB4EAAAAAAAAYAAAAAAAAgQAAAAAAACAAAAAAAgAgAAAAAAIAIAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAKwAAAAABBysAAAAAAQeBAAAAAAAAGAAAAAAAACAAAAAAAQAgAAAAAAIAIAAAAAADACAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAABkAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAwAgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAACAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAgAgAAAAAAAAIAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAGAAAAAAAQAwAAAAAAMAGgAAAAAAACAAAAAAAgAgAAAAAAMAIAAAAAACACAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAEALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAADEAAAAAAgCBAAAAAAAAIAAAAAABACAAAAAAAAAgAAAAAAIAIAAAAAABACAAAAAAAAAgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAxAAAAAAMAIAAAAAABACAAAAAAAQAgAAAAAAAAIAAAAAADACAAAAAAAgAgAAAAAAIAIAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAMQAAAAAAAIEAAAAAAAAgAAAAAAMAIAAAAAABACAAAAAAAgAgAAAAAAIAIAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAADEAAAAAAwCBAAAAAAAAgQAAAAAAACAAAAAAAwCBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAALgAAAAAAAi0AAAAAAAMtAAAAAAADGAAAAAAAAC4AAAAAAAAtAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAyAAAAAAAgAgAAAAAAAAIAAAAAACAC0AAAAAAAAlAAAAAAAAKwAAAAABABgAAAAAAAArAAAAAAAAKwAAAAAAACsAAAAAAgArAAAAAAIAKwAAAAADACsAAAAAAAArAAAAAAIAKwAAAAADACsAAAAAAQAgAAAAAAEAIAAAAAADACAAAAAAAQAtAAAAAAAALQAAAAAAAC4AAAAAAAIYAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAAMAAAAAAAADAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAlAAAAAAMAJQAAAAABACUAAAAAAQAlAAAAAAIAJQAAAAAAAIEAAAAAAAAgAAAAAAAALgAAAAAAAi0AAAAAAAMDAAAAAAAAAwAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAAAgAAAAAAIAJQAAAAABACAAAAAAAAAgAAAAAAMAIAAAAAADACUAAAAAAACBAAAAAAAAIAAAAAADAC0AAAAAAAAlAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAACUAAAAAAQAgAAAAAAEAIAAAAAACACAAAAAAAQAlAAAAAAAAgQAAAAAAACAAAAAAAAAuAAAAAAABLQAAAAAAAw==
           version: 7
         1,-4:
           ind: 1,-4
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAABAIEAAAAAAAAKAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAIAAAAAABACAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAACACsAAAAAAwAgAAAAAAMAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAuAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAgAAAAAAIAIAAAAAABACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAGAAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAItAAAAAAADLgAAAAAAABgAAAAAAAAuAAAAAAABLQAAAAAAAy4AAAAAAAOBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAIuAAAAAAAAGAAAAAAAABgAAAAAAAAlAAAAAAMAGAAAAAAAABgAAAAAAAAuAAAAAAABLgAAAAAAA4EAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAIuAAAAAAAAGAAAAAAAABgAAAAAAAAuAAAAAAACLQAAAAAAAy4AAAAAAAMYAAAAAAAAGAAAAAAAAC4AAAAAAAEuAAAAAAADgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAGAAAAAAAABgAAAAAAAAuAAAAAAACLgAAAAAAAGAAAAAAAAAuAAAAAAABLgAAAAAAAxgAAAAAAAAYAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAADABgAAAAAAAAtAAAAAAADLgAAAAAAABgAAAAAAAAuAAAAAAACLgAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAC4AAAAAAAEuAAAAAAADGAAAAAAAAC4AAAAAAAEtAAAAAAADGAAAAAAAACsAAAAAAQAYAAAAAAAAGAAAAAAAABgAAAAAAAAlAAAAAAMALQAAAAAAAGAAAAAAAgAYAAAAAAAAEwAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAACUAAAAAAwAYAAAAAAAAGAAAAAAAABgAAAAAAAAgAAAAAAEAGAAAAAAAAC0AAAAAAAMuAAAAAAADGAAAAAAAAC4AAAAAAAEuAAAAAAADGAAAAAAAABgAAAAAAAAYAAAAAAAALgAAAAAAAi4AAAAAAAAYAAAAAAAALgAAAAAAAi0AAAAAAAMYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAABgAAAAAAAAYAAAAAAAALgAAAAAAAS4AAAAAAANgAAAAAAMALgAAAAAAAi4AAAAAAAAYAAAAAAAAGAAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMuAAAAAAADgQAAAAAAAC4AAAAAAAEuAAAAAAADGAAAAAAAABgAAAAAAAAuAAAAAAABLQAAAAAAAy4AAAAAAAAYAAAAAAAAGAAAAAAAAC4AAAAAAAIuAAAAAAAAgQAAAAAAACAAAAAAAwAlAAAAAAEALQAAAAAAAIEAAAAAAAAuAAAAAAADLgAAAAAAAS4AAAAAAAMYAAAAAAAAGAAAAAAAACUAAAAAAwAYAAAAAAAAGAAAAAAAAC4AAAAAAAIuAAAAAAAALgAAAAAAAoEAAAAAAAAgAAAAAAIALQAAAAAAAy4AAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAAuAAAAAAABLQAAAAAAAy4AAAAAAAMYAAAAAAAALgAAAAAAAi0AAAAAAAMuAAAAAAAALgAAAAAAAi4AAAAAAACBAAAAAAAAIAAAAAACAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAMHLQAAAAAAAIEAAAAAAAAgAAAAAAMAIAAAAAABAIEAAAAAAAAKAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAADBy0AAAAAAACBAAAAAAAAIAAAAAABACAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAACACsAAAAAAQAgAAAAAAIAgQAAAAAAACAAAAAAAwAgAAAAAAIAIAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAuAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAgAAAAAAMAIAAAAAADACAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAGAAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAItAAAAAAADLgAAAAAAABgAAAAAAAAuAAAAAAABLQAAAAAAAy4AAAAAAAOBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAIuAAAAAAAAGAAAAAAAABgAAAAAAAAlAAAAAAEAGAAAAAAAABgAAAAAAAAuAAAAAAABLgAAAAAAA4EAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAIuAAAAAAAAGAAAAAAAABgAAAAAAAAuAAAAAAACLQAAAAAAAy4AAAAAAAMYAAAAAAAAGAAAAAAAAC4AAAAAAAEuAAAAAAADgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAGAAAAAAAABgAAAAAAAAuAAAAAAACLgAAAAAAAGAAAAAAAQAuAAAAAAABLgAAAAAAAxgAAAAAAAAYAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAABABgAAAAAAAAtAAAAAAADLgAAAAAAABgAAAAAAAAuAAAAAAACLgAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAC4AAAAAAAEuAAAAAAADGAAAAAAAAC4AAAAAAAEtAAAAAAADGAAAAAAAACsAAAAAAgAYAAAAAAAAGAAAAAAAABgAAAAAAAAlAAAAAAAALQAAAAAAAGAAAAAAAAAYAAAAAAAAEwAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAACUAAAAAAgAYAAAAAAAAGAAAAAAAABgAAAAAAAAgAAAAAAEAGAAAAAAAAC0AAAAAAAMuAAAAAAADGAAAAAAAAC4AAAAAAAEuAAAAAAADGAAAAAAAABgAAAAAAAAYAAAAAAAALgAAAAAAAi4AAAAAAAAYAAAAAAAALgAAAAAAAi0AAAAAAAMYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAABgAAAAAAAAYAAAAAAAALgAAAAAAAS4AAAAAAANgAAAAAAAALgAAAAAAAi4AAAAAAAAYAAAAAAAAGAAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMuAAAAAAADgQAAAAAAAC4AAAAAAAEuAAAAAAADGAAAAAAAABgAAAAAAAAuAAAAAAABLQAAAAAAAy4AAAAAAAAYAAAAAAAAGAAAAAAAAC4AAAAAAAIuAAAAAAAAgQAAAAAAACAAAAAAAwAlAAAAAAIALQAAAAAAAIEAAAAAAAAuAAAAAAADLgAAAAAAAS4AAAAAAAMYAAAAAAAAGAAAAAAAACUAAAAAAgAYAAAAAAAAGAAAAAAAAC4AAAAAAAIuAAAAAAAALgAAAAAAAoEAAAAAAAAgAAAAAAIALQAAAAAAAy4AAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAAuAAAAAAABLQAAAAAAAy4AAAAAAAMYAAAAAAAALgAAAAAAAi0AAAAAAAMuAAAAAAAALgAAAAAAAi4AAAAAAACBAAAAAAAAIAAAAAABAA==
           version: 7
         -1,-4:
           ind: -1,-4
-          tiles: gQAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAACBAAAAAAAAIAAAAAABACAAAAAAAAAgAAAAAAEAIAAAAAADACAAAAAAAwAgAAAAAAMAIAAAAAADACAAAAAAAQAgAAAAAAIAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAADACAAAAAAAgAgAAAAAAEAIAAAAAACACAAAAAAAAAgAAAAAAEAIAAAAAADACAAAAAAAwBgAAAAAAMAYAAAAAACAGAAAAAAAgBgAAAAAAMAYAAAAAABAIEAAAAAAAAgAAAAAAAAIAAAAAACACAAAAAAAwAgAAAAAAIAIAAAAAADACAAAAAAAAAgAAAAAAIAIAAAAAACACAAAAAAAQAgAAAAAAMAYAAAAAACAGAAAAAAAABgAAAAAAEAYAAAAAACAGAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAEAYAAAAAADAGAAAAAAAwBgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAcAAAAAAAAgAAAAAAEABwAAAAAAAAcAAAAAAAAHAAAAAAAAIAAAAAACAC0AAAAAAAMuAAAAAAADLwAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAHAAAAAAAAIAAAAAACACAAAAAAAQAgAAAAAAEAIAAAAAAAACAAAAAAAwAlAAAAAAIALgAAAAAAAS4AAAAAAAMvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAABwAAAAAAACAAAAAAAgAgAAAAAAMABwAAAAAAAAcAAAAAAAAHAAAAAAAAJQAAAAACACUAAAAAAwAuAAAAAAABLgAAAAAAA4EAAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAAAcAAAAAAAAgAAAAAAEAIAAAAAAAACAAAAAAAwAgAAAAAAAAIAAAAAABAC4AAAAAAAMlAAAAAAIAJQAAAAAAACAAAAAAAQBvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAADACAAAAAAAAAgAAAAAAMAIAAAAAACACAAAAAAAQAuAAAAAAABLgAAAAAAAyUAAAAAAwAgAAAAAAEAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAwCBAAAAAAAAIAAAAAAAAIEAAAAAAAAgAAAAAAIAgQAAAAAAAC0AAAAAAAArAAAAAAAHIAAAAAABAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAACAAAAAAAQAgAAAAAAAAgQAAAAAAACAAAAAAAwCBAAAAAAAAIAAAAAACAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAIEAAAAAAAAHAAAAAAAABwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAgCBAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAAG8AAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAADAIEAAAAAAAAgAAAAAAEAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAACAAAAAAAABvAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAgQAAAAAAACAAAAAAAwAgAAAAAAIAIAAAAAACACAAAAAAAAAgAAAAAAIAIAAAAAABAA==
+          tiles: gQAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAACBAAAAAAAAIAAAAAADACAAAAAAAwAgAAAAAAEAIAAAAAABACAAAAAAAAAgAAAAAAMAIAAAAAACACAAAAAAAwAgAAAAAAAAIAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAQAgAAAAAAMAIAAAAAACACAAAAAAAgAgAAAAAAIAIAAAAAADACAAAAAAAgAgAAAAAAIAIAAAAAADACAAAAAAAABgAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAAAYAAAAAABAIEAAAAAAAAgAAAAAAEAIAAAAAACACAAAAAAAQAgAAAAAAMAIAAAAAACACAAAAAAAwAgAAAAAAIAIAAAAAADACAAAAAAAwAgAAAAAAEAYAAAAAADAGAAAAAAAgBgAAAAAAIAYAAAAAACAGAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAIAYAAAAAAAAGAAAAAAAQBgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAAAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAcAAAAAAAAgAAAAAAIABwAAAAAAAAcAAAAAAAAHAAAAAAAAIAAAAAABAC0AAAAAAAMuAAAAAAADLwAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAHAAAAAAAAIAAAAAAAACAAAAAAAQAgAAAAAAEAIAAAAAAAACAAAAAAAwAlAAAAAAEALgAAAAAAAS4AAAAAAAMvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAABwAAAAAAACAAAAAAAAAgAAAAAAIABwAAAAAAAAcAAAAAAAAHAAAAAAAAJQAAAAAAACUAAAAAAQAuAAAAAAABLgAAAAAAA4EAAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAAAcAAAAAAAAgAAAAAAEAIAAAAAABACAAAAAAAgAgAAAAAAIAIAAAAAAAAC4AAAAAAAMlAAAAAAEAJQAAAAABACAAAAAAAQBvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAIEAAAAAAAAgAAAAAAEAIAAAAAADACAAAAAAAAAgAAAAAAAAIAAAAAACACAAAAAAAwAuAAAAAAABLgAAAAAAAyUAAAAAAQAgAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAQCBAAAAAAAAIAAAAAAAAIEAAAAAAAAgAAAAAAMAgQAAAAAAAC0AAAAAAAArAAAAAAEHIAAAAAACAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAIAgQAAAAAAACAAAAAAAACBAAAAAAAAIAAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAACBy0AAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAIEAAAAAAAAHAAAAAAAABwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAgCBAAAAAAAALQAAAAAAACsAAAAAAwctAAAAAAAAgQAAAAAAAG8AAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAAIEAAAAAAAAgAAAAAAIAgQAAAAAAAC0AAAAAAAArAAAAAAIHLQAAAAAAACAAAAAAAQBvAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAEAIAAAAAAAACAAAAAAAAAgAAAAAAIAIAAAAAABAA==
           version: 7
         0,-5:
           ind: 0,-5
-          tiles: LwAAAAAAAIEAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAuAAAAAAACLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy8AAAAAAACBAAAAAAAAGwAAAAAAACkAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAACUAAAAAAAArAAAAAAMAKwAAAAAAACsAAAAAAAArAAAAAAAAJQAAAAACACsAAAAAAgAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACkAAAAAAQCBAAAAAAAAgQAAAAAAAC4AAAAAAAEtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAysAAAAAAAcuAAAAAAACgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAABsAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAApAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAADACUAAAAAAwAlAAAAAAIAJQAAAAACAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAApAAAAAAEAgQAAAAAAACkAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAwAlAAAAAAIAJQAAAAAAAIEAAAAAAAAuAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAKQAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAuAAAAAAACLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAArAAAAAAAHLQAAAAAAABsAAAAAAACBAAAAAAAAKQAAAAABACkAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAACUAAAAAAAArAAAAAAMAKwAAAAABACsAAAAAAAArAAAAAAIAJQAAAAADAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAApAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLgAAAAAAAi0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAALQAAAAAAAy0AAAAAAAMuAAAAAAADgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAgBgAAAAAAIAYAAAAAAAAC0AAAAAAAMuAAAAAAADLQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAMAYAAAAAAAAGAAAAAAAwAgAAAAAAEALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAgCBAAAAAAAAIAAAAAADAC0AAAAAAAAuAAAAAAABLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAJAAAAAADACQAAAAAAAAgAAAAAAIAJAAAAAADACAAAAAAAwAtAAAAAAAAJQAAAAADACsAAAAAAgArAAAAAAAAKwAAAAACACsAAAAAAwArAAAAAAEAKwAAAAADACUAAAAAAgAtAAAAAAAAIAAAAAABACAAAAAAAgAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAMALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAIEAAAAAAAAKAAAAAAAACgAAAAAAACAAAAAAAwAgAAAAAAEAgQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: LwAAAAAAAIEAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAuAAAAAAACLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy8AAAAAAACBAAAAAAAAGwAAAAAAACkAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAACUAAAAAAQArAAAAAAEAKwAAAAADACsAAAAAAQArAAAAAAMAJQAAAAADACsAAAAAAgAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACkAAAAAAgCBAAAAAAAAgQAAAAAAAC4AAAAAAAEtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAysAAAAAAAcuAAAAAAACgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAEHLQAAAAAAABsAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAApAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAABACUAAAAAAQAlAAAAAAIAJQAAAAACAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAApAAAAAAEAgQAAAAAAACkAAAAAAwCBAAAAAAAAgQAAAAAAACUAAAAAAQAlAAAAAAAAJQAAAAACAIEAAAAAAAAuAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAKQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAuAAAAAAACLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAArAAAAAAEHLQAAAAAAABsAAAAAAACBAAAAAAAAKQAAAAACACkAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAACUAAAAAAgArAAAAAAMAKwAAAAADACsAAAAAAAArAAAAAAMAJQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAApAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAIHLgAAAAAAAi0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAALQAAAAAAAy0AAAAAAAMuAAAAAAADgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAABBy0AAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAQBgAAAAAAIAYAAAAAADAC0AAAAAAAMuAAAAAAADLQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAQctAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAMAYAAAAAABAGAAAAAAAAAgAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAgCBAAAAAAAAIAAAAAABAC0AAAAAAAAuAAAAAAABLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAKwAAAAAABy0AAAAAAACBAAAAAAAAJAAAAAACACQAAAAAAAAgAAAAAAMAJAAAAAAAACAAAAAAAAAtAAAAAAAAJQAAAAADACsAAAAAAQArAAAAAAMAKwAAAAADACsAAAAAAAArAAAAAAIAKwAAAAAAACUAAAAAAwAtAAAAAAAAIAAAAAADACAAAAAAAQAgAAAAAAAAIAAAAAABACAAAAAAAAAgAAAAAAMALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAIEAAAAAAAAKAAAAAAAACgAAAAAAACAAAAAAAgAgAAAAAAIAgQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         -2,-4:
           ind: -2,-4
-          tiles: YAAAAAACAGAAAAAAAwCBAAAAAAAAYAAAAAACAGAAAAAAAABgAAAAAAAAYAAAAAADAGAAAAAAAgBgAAAAAAEAYAAAAAACAGAAAAAAAwBgAAAAAAIAYAAAAAAAAGAAAAAAAgBgAAAAAAIAYAAAAAACAGAAAAAAAQBgAAAAAAMAgQAAAAAAACAAAAAAAwCBAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAwBgAAAAAAEAYAAAAAADAGAAAAAAAQCBAAAAAAAAgQAAAAAAACAAAAAAAwBgAAAAAAEAYAAAAAACAGAAAAAAAABgAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAIAYAAAAAAAAGAAAAAAAABgAAAAAAEAYAAAAAACAGAAAAAAAgBgAAAAAAMAgQAAAAAAAGAAAAAAAwBgAAAAAAIAYAAAAAADAGAAAAAAAwBgAAAAAAIAYAAAAAADAIEAAAAAAABrAAAAAAMAawAAAAACAGsAAAAAAQBrAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAMAYAAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAACAGAAAAAAAQCBAAAAAAAAYAAAAAABAGAAAAAAAQAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAEAYAAAAAAAAGAAAAAAAgCBAAAAAAAAgQAAAAAAAA8AAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAIAGAAAAAAAACUAAAAAAwAlAAAAAAEAJQAAAAAAACUAAAAAAgAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAA4EAAAAAAACBAAAAAAAAIAAAAAABABgAAAAAAAAYAAAAAAAAJQAAAAAAACUAAAAAAgAlAAAAAAIAJQAAAAADACsAAAAAAgArAAAAAAMAKwAAAAADACsAAAAAAgAlAAAAAAAAJQAAAAABAC4AAAAAAAEtAAAAAAADLQAAAAAAAy0AAAAAAAMYAAAAAAAAGAAAAAAAABgAAAAAAAAlAAAAAAEAJQAAAAADAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAADJQAAAAADACUAAAAAAgArAAAAAAIAKwAAAAAAACsAAAAAAwAlAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAJQAAAAADACUAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAxgAAAAAAAAYAAAAAAAAGAAAAAAAACUAAAAAAgAlAAAAAAAAgQAAAAAAAC8AAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAy4AAAAAAAEYAAAAAAAAGAAAAAAAACUAAAAAAwAlAAAAAAIAJQAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAIAJQAAAAAAACUAAAAAAABgAAAAAAMAgQAAAAAAAIEAAAAAAAAuAAAAAAADGAAAAAAAACUAAAAAAwAlAAAAAAEAJQAAAAABACUAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAAAACUAAAAAAgAlAAAAAAIAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAGAAAAAAAwAlAAAAAAAAJQAAAAABAGAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAJQAAAAACACUAAAAAAAAlAAAAAAIAJQAAAAABACUAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAEAJQAAAAADACUAAAAAAwBgAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAIAJQAAAAADACUAAAAAAAAlAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: YAAAAAACAGAAAAAAAgCBAAAAAAAAYAAAAAAAAGAAAAAAAgBgAAAAAAIAYAAAAAADAGAAAAAAAABgAAAAAAMAYAAAAAADAGAAAAAAAQBgAAAAAAAAYAAAAAACAGAAAAAAAgBgAAAAAAMAYAAAAAACAGAAAAAAAgBgAAAAAAAAgQAAAAAAACAAAAAAAgCBAAAAAAAAYAAAAAACAGAAAAAAAQBgAAAAAAEAYAAAAAADAGAAAAAAAQBgAAAAAAAAYAAAAAADAGAAAAAAAgCBAAAAAAAAgQAAAAAAACAAAAAAAQBgAAAAAAIAYAAAAAAAAGAAAAAAAwBgAAAAAAIAgQAAAAAAAGAAAAAAAwBgAAAAAAEAYAAAAAABAGAAAAAAAgBgAAAAAAAAYAAAAAADAGAAAAAAAgBgAAAAAAMAgQAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAEAYAAAAAAAAIEAAAAAAABrAAAAAAMAawAAAAAAAGsAAAAAAQBrAAAAAAIAgQAAAAAAAGAAAAAAAwBgAAAAAAEAYAAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAMAYAAAAAAAAGAAAAAAAwCBAAAAAAAAYAAAAAAAAGAAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAIAYAAAAAADAGAAAAAAAgCBAAAAAAAAgQAAAAAAAA8AAAAAAwCBAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAMAGAAAAAAAACUAAAAAAQAlAAAAAAEAJQAAAAAAACUAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAA4EAAAAAAACBAAAAAAAAIAAAAAABABgAAAAAAAAYAAAAAAAAJQAAAAADACUAAAAAAAAlAAAAAAEAJQAAAAADACsAAAAAAwArAAAAAAIAKwAAAAADACsAAAAAAgAlAAAAAAIAJQAAAAAAAC4AAAAAAAEtAAAAAAADLQAAAAAAAy0AAAAAAAMYAAAAAAAAGAAAAAAAABgAAAAAAAAlAAAAAAMAJQAAAAABAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAADJQAAAAABACUAAAAAAAArAAAAAAEAKwAAAAADACsAAAAAAwAlAAAAAAEAgQAAAAAAABgAAAAAAAAYAAAAAAAAJQAAAAAAACUAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAxgAAAAAAAAYAAAAAAAAGAAAAAAAACUAAAAAAwAlAAAAAAAAgQAAAAAAAC8AAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAy4AAAAAAAEYAAAAAAAAGAAAAAAAACUAAAAAAgAlAAAAAAIAJQAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAEAJQAAAAAAACUAAAAAAQBgAAAAAAIAgQAAAAAAAIEAAAAAAAAuAAAAAAADGAAAAAAAACUAAAAAAAAlAAAAAAIAJQAAAAABACUAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAACACUAAAAAAQAlAAAAAAAAYAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAGAAAAAAAwAlAAAAAAAAJQAAAAAAAGAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAJQAAAAABACUAAAAAAwAlAAAAAAMAJQAAAAADACUAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAAAJQAAAAACACUAAAAAAgBgAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAJQAAAAADACUAAAAAAQAlAAAAAAMAJQAAAAABACUAAAAAAgAlAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         -3,-4:
           ind: -3,-4
-          tiles: gQAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAtAAAAAAAAJQAAAAABAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAALgAAAAAAAS0AAAAAAAMuAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAlAAAAAAIAJQAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAMAJQAAAAADABgAAAAAAAAuAAAAAAADgQAAAAAAABgAAAAAAAAYAAAAAAAALgAAAAAAAi0AAAAAAAMtAAAAAAADIAAAAAACAIEAAAAAAAAgAAAAAAMAIAAAAAABAIEAAAAAAACBAAAAAAAAJQAAAAADABgAAAAAAAAYAAAAAAAALQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAC0AAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAgCBAAAAAAAAIAAAAAABACAAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAC4AAAAAAAEtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAIAAAAAACACAAAAAAAQAgAAAAAAMAIAAAAAABACAAAAAAAAAgAAAAAAMAgQAAAAAAAIEAAAAAAAAlAAAAAAAAGAAAAAAAABgAAAAAAAAtAAAAAAADgQAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAACACAAAAAAAgAgAAAAAAMAIAAAAAABAIEAAAAAAAAgAAAAAAMAIAAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAAAYAAAAAAAALQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAAC0AAAAAAAMtAAAAAAAALQAAAAAAAC0AAAAAAAMuAAAAAAADLgAAAAAAAi0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAC0AAAAAAAAuAAAAAAADLQAAAAAAAC4AAAAAAAEtAAAAAAADLQAAAAAAAxgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAALQAAAAAAAy0AAAAAAAOBAAAAAAAALQAAAAAAAC0AAAAAAAAuAAAAAAACLQAAAAAAAy0AAAAAAAMYAAAAAAAALQAAAAAAAy0AAAAAAAMuAAAAAAADLQAAAAAAAC0AAAAAAAAlAAAAAAEAJQAAAAADAA==
+          tiles: gQAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAQctAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAIHLQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAtAAAAAAAAJQAAAAACAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAALgAAAAAAAS0AAAAAAAMuAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAlAAAAAAEAJQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAEAJQAAAAAAABgAAAAAAAAuAAAAAAADgQAAAAAAABgAAAAAAAAYAAAAAAAALgAAAAAAAi0AAAAAAAMtAAAAAAADIAAAAAADAIEAAAAAAAAgAAAAAAMAIAAAAAACAIEAAAAAAACBAAAAAAAAJQAAAAABABgAAAAAAAAYAAAAAAAALQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAC0AAAAAAAAgAAAAAAMAIAAAAAABACAAAAAAAACBAAAAAAAAIAAAAAABACAAAAAAAgCBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAC4AAAAAAAEtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAIAAAAAAAACAAAAAAAQAgAAAAAAEAIAAAAAACACAAAAAAAQAgAAAAAAIAgQAAAAAAAIEAAAAAAAAlAAAAAAMAGAAAAAAAABgAAAAAAAAtAAAAAAADgQAAAAAAACAAAAAAAQAgAAAAAAIAIAAAAAACACAAAAAAAQAgAAAAAAMAIAAAAAADAIEAAAAAAAAgAAAAAAEAIAAAAAABAIEAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAQAYAAAAAAAALQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAACAC0AAAAAAAMtAAAAAAAALQAAAAAAAC0AAAAAAAMuAAAAAAADLgAAAAAAAi0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAC0AAAAAAAAuAAAAAAADLQAAAAAAAC4AAAAAAAEtAAAAAAADLQAAAAAAAxgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAALQAAAAAAAy0AAAAAAAOBAAAAAAAALQAAAAAAAC0AAAAAAAAuAAAAAAACLQAAAAAAAy0AAAAAAAMYAAAAAAAALQAAAAAAAy0AAAAAAAMuAAAAAAADLQAAAAAAAC0AAAAAAAAlAAAAAAIAJQAAAAABAA==
           version: 7
         -3,-3:
           ind: -3,-3
-          tiles: LQAAAAAAAC4AAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAACBAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAIAAAAAADAIEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAIEAAAAAAAAkAAAAAAMAJAAAAAAAACQAAAAAAQAgAAAAAAAAgQAAAAAAAC0AAAAAAAAuAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAA4EAAAAAAAAtAAAAAAAALQAAAAAAAC4AAAAAAAEtAAAAAAADLQAAAAAAAxgAAAAAAAAtAAAAAAADLQAAAAAAAy4AAAAAAAAtAAAAAAAALQAAAAAAACUAAAAAAAAlAAAAAAEALQAAAAAAAy0AAAAAAAAtAAAAAAAALgAAAAAAAC0AAAAAAAAuAAAAAAACLQAAAAAAAy0AAAAAAAMYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAC0AAAAAAAMtAAAAAAAALQAAAAAAAC0AAAAAAAMuAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAAIEAAAAAAAAtAAAAAAADgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACQAAAAAAwAkAAAAAAIAKQAAAAACACkAAAAAAAAkAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAMAIAAAAAADAIEAAAAAAAAkAAAAAAAAJAAAAAADAIEAAAAAAACBAAAAAAAAJAAAAAAAACQAAAAAAwAkAAAAAAEAJAAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAACACUAAAAAAAAlAAAAAAEAGAAAAAAAAC4AAAAAAAKBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAAAlAAAAAAMAGAAAAAAAABgAAAAAAAAtAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAALgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAACACUAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAMAJQAAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAABACUAAAAAAQAlAAAAAAMAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAIAgQAAAAAAAA==
+          tiles: LQAAAAAAAC4AAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAACBAAAAAAAAJAAAAAABACQAAAAAAgAkAAAAAAMAIAAAAAADAIEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAIEAAAAAAAAkAAAAAAMAJAAAAAACACQAAAAAAAAgAAAAAAEAgQAAAAAAAC0AAAAAAAAuAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAA4EAAAAAAAAtAAAAAAAALQAAAAAAAC4AAAAAAAEtAAAAAAADLQAAAAAAAxgAAAAAAAAtAAAAAAADLQAAAAAAAy4AAAAAAAAtAAAAAAAALQAAAAAAACUAAAAAAQAlAAAAAAEALQAAAAAAAy0AAAAAAAAtAAAAAAAALgAAAAAAAC0AAAAAAAAuAAAAAAACLQAAAAAAAy0AAAAAAAMYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAC0AAAAAAAMtAAAAAAAALQAAAAAAAC0AAAAAAAMuAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAAIEAAAAAAAAtAAAAAAADgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACQAAAAAAgAkAAAAAAIAKQAAAAABACkAAAAAAgAkAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAEALQAAAAAAA4EAAAAAAAAkAAAAAAMAJAAAAAADAIEAAAAAAACBAAAAAAAAJAAAAAADACQAAAAAAwAkAAAAAAAAJAAAAAABAIEAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAwAlAAAAAAEAGAAAAAAAAC4AAAAAAAKBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAgAlAAAAAAMAGAAAAAAAABgAAAAAAAAtAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAALgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAADACUAAAAAAgAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAIAJQAAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAMAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAEAgQAAAAAAAA==
           version: 7
         -3,-2:
           ind: -3,-2
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAACgAAAAAAAIEAAAAAAAAKAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAKAAAAAAAAgQAAAAAAAAoAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAuAAAAAAACLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAEALgAAAAAAAS0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAItAAAAAAADgQAAAAAAAC8AAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAEtAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFgAAAAACABYAAAAAAACBAAAAAAAALgAAAAAAAi0AAAAAAAMuAAAAAAADgQAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAACgAAAAAAAIEAAAAAAAAKAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAKAAAAAAAAgQAAAAAAAAoAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAuAAAAAAACLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAALgAAAAAAAS0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAItAAAAAAADgQAAAAAAAC8AAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAEtAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFgAAAAACABYAAAAAAwCBAAAAAAAALgAAAAAAAi0AAAAAAAMuAAAAAAADgQAAAAAAAA==
           version: 7
         -3,-1:
           ind: -3,-1
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABYAAAAAAAAWAAAAAAEAFgAAAAAAABYAAAAAAQCBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLgAAAAAAAoEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAWAAAAAAMAFgAAAAABABYAAAAAAwAWAAAAAAIAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAgAAAAAAMALQAAAAAAAC0AAAAAAAAvAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFgAAAAAAAIEAAAAAAAAuAAAAAAABLQAAAAAAAy4AAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMuAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAC4AAAAAAAItAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAC8AAAAAAAAtAAAAAAAAJQAAAAAAACsAAAAAAgArAAAAAAEAKwAAAAABACsAAAAAAgArAAAAAAEAKwAAAAACACsAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAMAgQAAAAAAACAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAAIEAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAACAAAAAAAQCBAAAAAAAAIAAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABYAAAAAAQAWAAAAAAAAFgAAAAADABYAAAAAAQCBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLgAAAAAAAoEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAWAAAAAAAAFgAAAAABABYAAAAAAQAWAAAAAAIAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAAAgAAAAAAMALQAAAAAAAC0AAAAAAAAvAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFgAAAAADAIEAAAAAAAAuAAAAAAABLQAAAAAAAy4AAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMuAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAgQAAAAAAAC4AAAAAAAItAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAC8AAAAAAAAtAAAAAAAAJQAAAAAAACsAAAAAAgArAAAAAAAAKwAAAAADACsAAAAAAQArAAAAAAIAKwAAAAAAACsAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAIAgQAAAAAAACAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAABAIEAAAAAAAAgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAACAAAAAAAgCBAAAAAAAAIAAAAAADAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         -4,-1:
           ind: -4,-1
@@ -196,7 +196,7 @@ entities:
           version: 7
         -4,-2:
           ind: -4,-2
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAAsAAAAAAACBAAAAAAAACQAAAAAAAAkAAAAAAAArAAAAAAMAKwAAAAADACAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAALAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAAKwAAAAAAACsAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAACwAAAAAAAIEAAAAAAAAJAAAAAAAACQAAAAAAACsAAAAAAQArAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAADMAAAAAAAAzAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAMwAAAAAAAIEAAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAAsAAAAAAACBAAAAAAAACQAAAAAAAAkAAAAAAAArAAAAAAIAKwAAAAADACAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAALAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAAKwAAAAADACsAAAAAAQAgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAACwAAAAAAAIEAAAAAAAAJAAAAAAAACQAAAAAAACsAAAAAAQArAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAADMAAAAAAAAzAAAAAAwAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAMwAAAAAJAIEAAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         -5,-2:
           ind: -5,-2
@@ -204,7 +204,7 @@ entities:
           version: 7
         -4,-4:
           ind: -4,-4
-          tiles: DAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAALAAAAAAAAgQAAAAAAAA0AAAAAAAANAAAAAAAAKwAAAAAAACsAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAgCBAAAAAAAAgQAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACwAAAAAAAIEAAAAAAAANAAAAAAAADQAAAAAAACsAAAAAAAArAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAsAAAAAAACBAAAAAAAADQAAAAAAAA0AAAAAAAArAAAAAAIAKwAAAAADAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAxcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAy0AAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADLgAAAAAAAy0AAAAAAAAuAAAAAAABFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAAuAAAAAAABLQAAAAAAAxcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAtAAAAAAADLgAAAAAAAy4AAAAAAAIuAAAAAAAALgAAAAAAAi0AAAAAAAMXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAALgAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAy4AAAAAAAAuAAAAAAACFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALgAAAAAAAYEAAAAAAACBAAAAAAAALgAAAAAAAQ==
+          tiles: DAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAALAAAAAAAAgQAAAAAAAA0AAAAAAAANAAAAAAAAKwAAAAADACsAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAQCBAAAAAAAAgQAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACwAAAAAAAIEAAAAAAAANAAAAAAAADQAAAAAAACsAAAAAAAArAAAAAAEAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAsAAAAAAACBAAAAAAAADQAAAAAAAA0AAAAAAAArAAAAAAIAKwAAAAACAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAxcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAy0AAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADLgAAAAAAAy0AAAAAAAAuAAAAAAABFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAAuAAAAAAABLQAAAAAAAxcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAtAAAAAAADLgAAAAAAAy4AAAAAAAIuAAAAAAAALgAAAAAAAi0AAAAAAAMXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAALgAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAy4AAAAAAAAuAAAAAAACFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALgAAAAAAAYEAAAAAAACBAAAAAAAALgAAAAAAAQ==
           version: 7
         -4,-3:
           ind: -4,-3
@@ -212,7 +212,7 @@ entities:
           version: 7
         -3,-5:
           ind: -3,-5
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAItAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLgAAAAAAA4EAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAADLgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMuAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALwAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAOBAAAAAAAALQAAAAAAAy0AAAAAAAAuAAAAAAABLgAAAAAAAw8AAAAAAwAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAAAJQAAAAABAC0AAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLgAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAtAAAAAAADgQAAAAAAAIEAAAAAAACBAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMuAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALwAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAOBAAAAAAAALQAAAAAAAy0AAAAAAAAuAAAAAAABLgAAAAAAAw8AAAAAAQAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAAAJQAAAAAAAC0AAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAACsAAAAAAQctAAAAAAAAgQAAAAAAAA==
           version: 7
         -4,-5:
           ind: -4,-5
@@ -220,7 +220,7 @@ entities:
           version: 7
         -3,-6:
           ind: -3,-6
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAACBAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         -5,-4:
           ind: -5,-4
@@ -232,11 +232,11 @@ entities:
           version: 7
         -2,-5:
           ind: -2,-5
-          tiles: gQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAAAawAAAAABAGsAAAAAAABrAAAAAAEAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAACQAAAAAAAGAAAAAAAwBgAAAAAAIAYAAAAAADAGAAAAAAAwCBAAAAAAAAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgCBAAAAAAAAYAAAAAABAGAAAAAAAgBgAAAAAAEAgQAAAAAAAAkAAAAAAABgAAAAAAAAYAAAAAACAGAAAAAAAgBgAAAAAAIAYAAAAAAAAGAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAMAgQAAAAAAAGAAAAAAAABgAAAAAAMAYAAAAAADAIEAAAAAAAAJAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAMAYAAAAAACAIEAAAAAAABgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAwBgAAAAAAEAYAAAAAAAAGAAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAwBgAAAAAAIAYAAAAAADAGAAAAAAAwCBAAAAAAAAYAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgCBAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAIAYAAAAAADAGAAAAAAAABgAAAAAAMAYAAAAAACAGAAAAAAAABgAAAAAAEAgQAAAAAAAGAAAAAAAgBgAAAAAAIAYAAAAAACAGAAAAAAAABgAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAEAYAAAAAAAAGAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAIAYAAAAAAAAGAAAAAAAQBgAAAAAAMAYAAAAAABAGAAAAAAAQCBAAAAAAAAYAAAAAAAAGAAAAAAAwBgAAAAAAMAYAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAEAYAAAAAAAAGAAAAAAAQBgAAAAAAAAYAAAAAABAA==
+          tiles: gQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAIAawAAAAAAAGsAAAAAAwBrAAAAAAAAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAACQAAAAAAAGAAAAAAAwBgAAAAAAAAYAAAAAAAAGAAAAAAAwCBAAAAAAAAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAQBgAAAAAAAAgQAAAAAAAAkAAAAAAABgAAAAAAEAYAAAAAADAGAAAAAAAgBgAAAAAAEAYAAAAAABAGAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAMAgQAAAAAAAGAAAAAAAQBgAAAAAAMAYAAAAAADAIEAAAAAAAAJAAAAAAAAYAAAAAACAGAAAAAAAwBgAAAAAAIAYAAAAAAAAIEAAAAAAABgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAQBgAAAAAAIAYAAAAAAAAGAAAAAAAACBAAAAAAAAYAAAAAADAGAAAAAAAgBgAAAAAAEAYAAAAAADAGAAAAAAAwCBAAAAAAAAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQCBAAAAAAAAYAAAAAAAAGAAAAAAAgBgAAAAAAMAYAAAAAACAGAAAAAAAgBgAAAAAAMAYAAAAAACAGAAAAAAAgBgAAAAAAIAgQAAAAAAAGAAAAAAAABgAAAAAAEAYAAAAAABAGAAAAAAAABgAAAAAAMAgQAAAAAAAGAAAAAAAwBgAAAAAAMAYAAAAAADAGAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAEAYAAAAAAAAGAAAAAAAQBgAAAAAAMAYAAAAAADAGAAAAAAAACBAAAAAAAAYAAAAAADAGAAAAAAAQBgAAAAAAIAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAEAYAAAAAADAGAAAAAAAgBgAAAAAAAAYAAAAAADAA==
           version: 7
         -1,-5:
           ind: -1,-5
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC0AAAAAAAAgAAAAAAEALQAAAAAAAC8AAAAAAACBAAAAAAAALwAAAAAAAC0AAAAAAAAgAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAAAvAAAAAAAAgQAAAAAAAC8AAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAALgAAAAAAAC0AAAAAAAAuAAAAAAAALwAAAAAAAIEAAAAAAAAvAAAAAAAALgAAAAAAAC0AAAAAAAAuAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAABsAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAbAAAAAAAAGwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABsAAAAAAACBAAAAAAAAGwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAGwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAi0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAABsAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAgAgAAAAAAMAgQAAAAAAAC4AAAAAAAEtAAAAAAADLQAAAAAAAy0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAAAJAAAAAAAACQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAwAgAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAgAgAAAAAAIAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAwAgAAAAAAMAIAAAAAAAACAAAAAAAwAgAAAAAAMAIAAAAAADACAAAAAAAAAgAAAAAAIAIAAAAAAAAIEAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAbAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAIAIAAAAAACACAAAAAAAQAgAAAAAAMAIAAAAAAAACAAAAAAAAAgAAAAAAMAIAAAAAAAACAAAAAAAwCBAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAGwAAAAAAAIEAAAAAAAAgAAAAAAMAIAAAAAABACAAAAAAAwAgAAAAAAMAIAAAAAACACAAAAAAAAAgAAAAAAIAIAAAAAAAACAAAAAAAwAgAAAAAAMAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAACACAAAAAAAwAgAAAAAAIAIAAAAAABACAAAAAAAQAgAAAAAAEAIAAAAAABAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC0AAAAAAAAgAAAAAAAALQAAAAAAAC8AAAAAAACBAAAAAAAALwAAAAAAAC0AAAAAAAAgAAAAAAEALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAAAvAAAAAAAAgQAAAAAAAC8AAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAALgAAAAAAAC0AAAAAAAAuAAAAAAAALwAAAAAAAIEAAAAAAAAvAAAAAAAALgAAAAAAAC0AAAAAAAAuAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAABsAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAbAAAAAAAAGwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABsAAAAAAACBAAAAAAAAGwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAGwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAi0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAABsAAAAAAACBAAAAAAAAIAAAAAACACAAAAAAAQAgAAAAAAAAgQAAAAAAAC4AAAAAAAEtAAAAAAADLQAAAAAAAy0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAAAJAAAAAAAACQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAQAgAAAAAAIAIAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAACBAAAAAAAAIAAAAAACACAAAAAAAgAgAAAAAAMAIAAAAAABACAAAAAAAAAgAAAAAAIAIAAAAAABACAAAAAAAQAgAAAAAAMAIAAAAAADAIEAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAbAAAAAAAAgQAAAAAAACAAAAAAAQAgAAAAAAIAIAAAAAAAACAAAAAAAQAgAAAAAAEAIAAAAAAAACAAAAAAAwAgAAAAAAEAIAAAAAABACAAAAAAAQCBAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAGwAAAAAAAIEAAAAAAAAgAAAAAAMAIAAAAAABACAAAAAAAwAgAAAAAAAAIAAAAAADACAAAAAAAwAgAAAAAAEAIAAAAAABACAAAAAAAgAgAAAAAAAAgQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAACBAAAAAAAAIAAAAAADACAAAAAAAwAgAAAAAAEAIAAAAAABACAAAAAAAwAgAAAAAAIAIAAAAAACACAAAAAAAgAgAAAAAAIAIAAAAAABAA==
           version: 7
         -1,-6:
           ind: -1,-6
@@ -244,31 +244,31 @@ entities:
           version: 7
         0,-6:
           ind: 0,-6
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAABAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAQBgAAAAAAIAYAAAAAADAGAAAAAAAwBgAAAAAAMAYAAAAAADAGAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAEAYAAAAAABAGAAAAAAAgBgAAAAAAAAYAAAAAAAAGAAAAAAAwBgAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAACAGAAAAAAAgBgAAAAAAIAYAAAAAACAGAAAAAAAQBgAAAAAAAAYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAABAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAADAIEAAAAAAAAXAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAAAQAAAAAAAAEAAAAAADABAAAAAAAwCBAAAAAAAAAAAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAEAAAAAAAABAAAAAAAgAQAAAAAAEAgQAAAAAAAAAAAAAAAACBAAAAAAAAYAAAAAADAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAgQAAAAAAABAAAAAAAAAQAAAAAAIAEAAAAAADAIEAAAAAAAAAAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAEAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAQAAAAAAIAEAAAAAABABAAAAAAAwCBAAAAAAAAFwAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAACAGAAAAAAAQAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAABAGAAAAAAAABgAAAAAAIAYAAAAAADAGAAAAAAAwBgAAAAAAIAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAACAGAAAAAAAgBgAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAMAYAAAAAABAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAARAAAAAAAAIEAAAAAAABEAAAAAAAAgQAAAAAAAEQAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAEQAAAAAAACBAAAAAAAARAAAAAAAAIEAAAAAAABEAAAAAAAAgQAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAACAGAAAAAAAgBgAAAAAAMAYAAAAAADAGAAAAAAAwBgAAAAAAEAYAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAgBgAAAAAAAAYAAAAAADAGAAAAAAAQBgAAAAAAMAYAAAAAABAGAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAIAYAAAAAABAGAAAAAAAABgAAAAAAEAYAAAAAADAGAAAAAAAgBgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAABAGAAAAAAAABgAAAAAAMAYAAAAAACAGAAAAAAAwBgAAAAAAIAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAADAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABAAAAAAAQAQAAAAAAAAEAAAAAADAIEAAAAAAAAXAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAAAQAAAAAAIAEAAAAAAAABAAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAABgAAAAAAMAYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAEAAAAAACABAAAAAAAwAQAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAgQAAAAAAABAAAAAAAgAQAAAAAAEAEAAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAEAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAQAAAAAAMAEAAAAAADABAAAAAAAgCBAAAAAAAAFwAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAABAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAgAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAEAYAAAAAADAGAAAAAAAABgAAAAAAEAYAAAAAAAAGAAAAAAAgBgAAAAAAIAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAAAAGAAAAAAAQBgAAAAAAAAYAAAAAAAAGAAAAAAAQBgAAAAAAMAYAAAAAACAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAARAAAAAAAAIEAAAAAAABEAAAAAAAAgQAAAAAAAEQAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAEQAAAAAAACBAAAAAAAARAAAAAAAAIEAAAAAAABEAAAAAAAAgQAAAAAAAA==
           version: 7
         0,-7:
           ind: 0,-7
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAADAGAAAAAAAgBgAAAAAAEAYAAAAAACAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAACAGAAAAAAAgBgAAAAAAEAYAAAAAACAGAAAAAAAgBgAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAABAGAAAAAAAABgAAAAAAMAYAAAAAACAGAAAAAAAwBgAAAAAAIAYAAAAAABAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAABAGAAAAAAAABgAAAAAAIAYAAAAAABAGAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAQBgAAAAAAMAYAAAAAACAGAAAAAAAQBgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAIEAAAAAAABgAAAAAAMAYAAAAAADAGAAAAAAAQBgAAAAAAIAYAAAAAACAGAAAAAAAgBgAAAAAAEAYAAAAAACAA==
           version: 7
         1,-6:
           ind: 1,-6
-          tiles: YAAAAAACAGAAAAAAAABgAAAAAAMAYAAAAAACAGAAAAAAAwBgAAAAAAIAYAAAAAACAGAAAAAAAwAaAAAAAAAAYAAAAAACAGAAAAAAAABgAAAAAAIAYAAAAAACAGAAAAAAAQBgAAAAAAEAYAAAAAADAIEAAAAAAABgAAAAAAEAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAACAGAAAAAAAABgAAAAAAEAYAAAAAADAGAAAAAAAQBgAAAAAAAAYAAAAAABAGAAAAAAAgBgAAAAAAAAYAAAAAAAAGAAAAAAAACBAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAMAYAAAAAADAGAAAAAAAQBgAAAAAAIAYAAAAAABABoAAAAAAQBgAAAAAAEAYAAAAAAAAGAAAAAAAQBgAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAEAYAAAAAABAGAAAAAAAABgAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAAAYAAAAAADAGAAAAAAAQBgAAAAAAEAYAAAAAADAGAAAAAAAABgAAAAAAAAYAAAAAACAIEAAAAAAABgAAAAAAIAYAAAAAACAGsAAAAAAABgAAAAAAMAYAAAAAACAGsAAAAAAABgAAAAAAEAYAAAAAAAAGAAAAAAAgBrAAAAAAEAYAAAAAABAGsAAAAAAABgAAAAAAMAYAAAAAABAGAAAAAAAgCBAAAAAAAAYAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAMAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAgBgAAAAAAMAYAAAAAACAGAAAAAAAQBgAAAAAAEAYAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAAAYAAAAAACAGAAAAAAAABgAAAAAAEAYAAAAAADAGAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAACAGAAAAAAAgBgAAAAAAIAYAAAAAACAIEAAAAAAABgAAAAAAMAYAAAAAADAGAAAAAAAQBgAAAAAAIAYAAAAAABAGAAAAAAAgBgAAAAAAEAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABgAAAAAAMAYAAAAAACAGAAAAAAAwBgAAAAAAEAYAAAAAADAGAAAAAAAgBgAAAAAAMAYAAAAAABAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAEAYAAAAAABAGAAAAAAAQBgAAAAAAEAYAAAAAADAGAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: YAAAAAADAGAAAAAAAwBgAAAAAAMAYAAAAAADAGAAAAAAAABgAAAAAAMAYAAAAAAAAGAAAAAAAAAaAAAAAAEAYAAAAAACAGAAAAAAAQBgAAAAAAIAYAAAAAADAGAAAAAAAgBgAAAAAAIAYAAAAAACAIEAAAAAAABgAAAAAAIAYAAAAAACAGAAAAAAAwBgAAAAAAMAYAAAAAACAGAAAAAAAABgAAAAAAMAYAAAAAADAGAAAAAAAgBgAAAAAAIAYAAAAAACAGAAAAAAAgBgAAAAAAIAYAAAAAAAAGAAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAQBgAAAAAAEAYAAAAAAAAGAAAAAAAwBgAAAAAAMAYAAAAAABABoAAAAAAABgAAAAAAEAYAAAAAADAGAAAAAAAgBgAAAAAAEAYAAAAAAAAGAAAAAAAwBgAAAAAAEAgQAAAAAAAGAAAAAAAwBgAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAMAYAAAAAADAGAAAAAAAwBgAAAAAAEAYAAAAAADAGAAAAAAAQBgAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAEAYAAAAAABAIEAAAAAAABgAAAAAAEAYAAAAAAAAGsAAAAAAgBgAAAAAAIAYAAAAAACAGsAAAAAAgBgAAAAAAEAYAAAAAACAGAAAAAAAABrAAAAAAAAYAAAAAABAGsAAAAAAwBgAAAAAAEAYAAAAAAAAGAAAAAAAwCBAAAAAAAAYAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAwBgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAAAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAAAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAwBgAAAAAAIAYAAAAAAAAGAAAAAAAgBgAAAAAAMAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAIAYAAAAAADAGAAAAAAAQBgAAAAAAEAYAAAAAAAAGAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAACAGAAAAAAAABgAAAAAAMAYAAAAAABAIEAAAAAAABgAAAAAAMAYAAAAAADAGAAAAAAAgBgAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAIAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABgAAAAAAAAYAAAAAABAGAAAAAAAgBgAAAAAAMAYAAAAAADAGAAAAAAAABgAAAAAAMAYAAAAAABAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAABAGAAAAAAAwBgAAAAAAMAYAAAAAAAAGAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         1,-7:
           ind: 1,-7
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAIAgQAAAAAAAGAAAAAAAABgAAAAAAMAYAAAAAADAIEAAAAAAABgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAACBAAAAAAAAYAAAAAABAIEAAAAAAABgAAAAAAAAYAAAAAACAGAAAAAAAgCBAAAAAAAAYAAAAAACAIEAAAAAAABgAAAAAAEAYAAAAAACAGAAAAAAAwCBAAAAAAAAGgAAAAADAGAAAAAAAABgAAAAAAEAgQAAAAAAAGAAAAAAAwCBAAAAAAAAYAAAAAABAGAAAAAAAABgAAAAAAIAgQAAAAAAAGAAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAgBgAAAAAAEAgQAAAAAAABoAAAAAAABgAAAAAAIAYAAAAAAAAGAAAAAAAQBgAAAAAAEAYAAAAAAAAGAAAAAAAQAaAAAAAAMAYAAAAAACAGAAAAAAAgBgAAAAAAMAYAAAAAAAAGAAAAAAAQBgAAAAAAMAYAAAAAABAIEAAAAAAAAaAAAAAAMAYAAAAAACAGAAAAAAAgBgAAAAAAMAYAAAAAADAGAAAAAAAgBgAAAAAAAAYAAAAAABAGAAAAAAAABgAAAAAAAAYAAAAAABAGAAAAAAAwBgAAAAAAAAYAAAAAAAAGAAAAAAAACBAAAAAAAAYAAAAAACAGAAAAAAAQBgAAAAAAIAYAAAAAABAGAAAAAAAABgAAAAAAIAYAAAAAABABoAAAAAAABgAAAAAAAAYAAAAAACAGAAAAAAAQBgAAAAAAEAYAAAAAABAGAAAAAAAABgAAAAAAMAYAAAAAACAGAAAAAAAQBgAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAAAYAAAAAABAGAAAAAAAgBgAAAAAAMAYAAAAAACAGAAAAAAAwBgAAAAAAIAYAAAAAABAGAAAAAAAQBgAAAAAAMAYAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAADAIEAAAAAAABgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAACAGAAAAAAAgCBAAAAAAAAYAAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAACAGAAAAAAAQCBAAAAAAAAYAAAAAADAIEAAAAAAABgAAAAAAMAYAAAAAACAGAAAAAAAACBAAAAAAAAGgAAAAAAAGAAAAAAAABgAAAAAAEAgQAAAAAAAGAAAAAAAQCBAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAIAgQAAAAAAAGAAAAAAAACBAAAAAAAAYAAAAAACAGAAAAAAAQBgAAAAAAIAgQAAAAAAABoAAAAAAwBgAAAAAAIAYAAAAAABAGAAAAAAAQBgAAAAAAIAYAAAAAAAAGAAAAAAAgAaAAAAAAIAYAAAAAADAGAAAAAAAgBgAAAAAAEAYAAAAAAAAGAAAAAAAwBgAAAAAAAAYAAAAAAAAIEAAAAAAAAaAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAEAYAAAAAAAAGAAAAAAAQBgAAAAAAAAYAAAAAAAAGAAAAAAAgBgAAAAAAAAYAAAAAACAGAAAAAAAgBgAAAAAAAAYAAAAAABAGAAAAAAAgCBAAAAAAAAYAAAAAAAAGAAAAAAAQBgAAAAAAMAYAAAAAADAGAAAAAAAwBgAAAAAAAAYAAAAAACABoAAAAAAQBgAAAAAAAAYAAAAAADAGAAAAAAAQBgAAAAAAEAYAAAAAAAAGAAAAAAAgBgAAAAAAMAYAAAAAABAGAAAAAAAABgAAAAAAIAYAAAAAACAGAAAAAAAgBgAAAAAAMAYAAAAAADAGAAAAAAAQBgAAAAAAMAYAAAAAABAGAAAAAAAQBgAAAAAAEAYAAAAAABAGAAAAAAAgBgAAAAAAEAYAAAAAACAA==
           version: 7
         1,-5:
           ind: 1,-5
-          tiles: LQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAy0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACsAAAAAAQArAAAAAAAAKwAAAAAAACsAAAAAAwArAAAAAAEAKwAAAAADACsAAAAAAwArAAAAAAEAJQAAAAACAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAysAAAAAAActAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAoEAAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAACBAAAAAAAALgAAAAAAAy0AAAAAAAArAAAAAAAHLQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAADwAAAAACAA8AAAAAAgAPAAAAAAEAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAADwAAAAABAA8AAAAAAAAPAAAAAAIADwAAAAACAA8AAAAAAgCBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAA8AAAAAAwAPAAAAAAIADwAAAAADAA8AAAAAAQAPAAAAAAEAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAgAAAAAAMAIAAAAAADAIEAAAAAAAAPAAAAAAAADwAAAAABAA8AAAAAAAAPAAAAAAEADwAAAAACAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAADwAAAAADAA8AAAAAAAAPAAAAAAMADwAAAAACAA8AAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAACAAAAAAAAAgAAAAAAIAIAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAA8AAAAAAwAPAAAAAAMADwAAAAADAA8AAAAAAgAkAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAACAAAAAAAQAgAAAAAAMAIAAAAAABACAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAAABy0AAAAAAAAgAAAAAAAAIAAAAAACACAAAAAAAgAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAADACAAAAAAAgAgAAAAAAMAIAAAAAABACAAAAAAAgAgAAAAAAEALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJAAAAAACACAAAAAAAgAgAAAAAAMAJQAAAAABACAAAAAAAQAgAAAAAAMAgQAAAAAAAC0AAAAAAAArAAAAAAAHLgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAACAAAAAAAgAgAAAAAAAAIAAAAAABACUAAAAAAQAgAAAAAAIAIAAAAAABAIEAAAAAAAAtAAAAAAAAKwAAAAAABy4AAAAAAAItAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAAAgAAAAAAEAIAAAAAABACAAAAAAAgAgAAAAAAAAIAAAAAADACQAAAAAAgCBAAAAAAAALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAADAIEAAAAAAAAKAAAAAAAAgQAAAAAAAA==
+          tiles: LQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAy0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACsAAAAAAgArAAAAAAEAKwAAAAABACsAAAAAAQArAAAAAAMAKwAAAAAAACsAAAAAAgArAAAAAAIAJQAAAAADAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAysAAAAAAActAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAoEAAAAAAAAPAAAAAAMADwAAAAACAA8AAAAAAgCBAAAAAAAALgAAAAAAAy0AAAAAAAArAAAAAAEHLQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAADwAAAAADAA8AAAAAAAAPAAAAAAIAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAADwAAAAAAAA8AAAAAAgAPAAAAAAAADwAAAAABAA8AAAAAAQCBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAA8AAAAAAwAPAAAAAAMADwAAAAAAAA8AAAAAAgAPAAAAAAIAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAgAAAAAAMAIAAAAAACAIEAAAAAAAAPAAAAAAMADwAAAAACAA8AAAAAAgAPAAAAAAIADwAAAAABAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAADwAAAAADAA8AAAAAAgAPAAAAAAAADwAAAAABAA8AAAAAAACBAAAAAAAALQAAAAAAACsAAAAAAgctAAAAAAAAgQAAAAAAACAAAAAAAQAgAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA8AAAAAAQAPAAAAAAEADwAAAAADAA8AAAAAAwAkAAAAAAMAgQAAAAAAAC0AAAAAAAArAAAAAAEHLQAAAAAAACAAAAAAAAAgAAAAAAEAIAAAAAACACAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAAKwAAAAABBy0AAAAAAAAgAAAAAAMAIAAAAAABACAAAAAAAwAgAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAEAIAAAAAACACAAAAAAAAAgAAAAAAIALQAAAAAAACsAAAAAAActAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJAAAAAABACAAAAAAAQAgAAAAAAEAJQAAAAADACAAAAAAAwAgAAAAAAEAgQAAAAAAAC0AAAAAAAArAAAAAAIHLgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAACAAAAAAAwAgAAAAAAMAIAAAAAADACUAAAAAAwAgAAAAAAMAIAAAAAADAIEAAAAAAAAtAAAAAAAAKwAAAAADBy4AAAAAAAItAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAA4EAAAAAAAAgAAAAAAIAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACQAAAAAAgCBAAAAAAAALQAAAAAAACsAAAAAAgctAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAArAAAAAAAHLQAAAAAAAIEAAAAAAAAgAAAAAAIAIAAAAAACAIEAAAAAAAAKAAAAAAAAgQAAAAAAAA==
           version: 7
         2,-6:
           ind: 2,-6
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAA==
           version: 7
         2,-5:
           ind: 2,-5
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAADACAAAAAAAQCBAAAAAAAACgAAAAAAAAoAAAAAAACBAAAAAAAAgQAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAgQAAAAAAAAoAAAAAAAAKAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAADACAAAAAAAQCBAAAAAAAACgAAAAAAAAoAAAAAAACBAAAAAAAAgQAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAAgQAAAAAAAAoAAAAAAAAKAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         2,-7:
           ind: 2,-7
@@ -276,63 +276,63 @@ entities:
           version: 7
         3,-5:
           ind: 3,-5
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAeAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAAoAAAAAAAAKAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAoAAAAAAAAKAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAoAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAKAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAKAAAAAAAAHgAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAACgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAoAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAAoAAAAAAAAKAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAoAAAAAAAAKAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAoAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAKAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         4,-5:
           ind: 4,-5
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAHgAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAB4AAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAoAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAALwAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         3,-6:
           ind: 3,-6
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAeAAAAAAAAHgAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAeAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAA==
           version: 7
         4,-4:
           ind: 4,-4
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAADACAAAAAAAQAsAAAAAAMALAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAMAJAAAAAACAIEAAAAAAAAgAAAAAAIAIAAAAAAAACAAAAAAAgAgAAAAAAAALAAAAAADACwAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAC8AAAAAAACBAAAAAAAAIAAAAAADACAAAAAAAQAgAAAAAAEAIAAAAAADACAAAAAAAgAgAAAAAAMAIAAAAAACACAAAAAAAgAgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAwAgAAAAAAEAgQAAAAAAACAAAAAAAgAgAAAAAAMAIAAAAAACACAAAAAAAQAgAAAAAAAAIAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAACAGAAAAAAAwBgAAAAAAEAYAAAAAADAGAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAAAvAAAAAAAALwAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAACgAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAMAYAAAAAADAGAAAAAAAQBgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAADAGAAAAAAAgBgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAC8AAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAwBgAAAAAAAAYAAAAAAAAGAAAAAAAgBgAAAAAAMARAAAAAAAAEQAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAAAYAAAAAAAAGAAAAAAAAAaAAAAAAIAGgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAACABAAAAAAAQAQAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAACAGAAAAAAAABgAAAAAAIAgQAAAAAAACAAAAAAAQAgAAAAAAEAIAAAAAAAACAAAAAAAgAQAAAAAAAAEAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         5,-4:
           ind: 5,-4
-          tiles: LwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: LwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAAAGAAAAAAAAA==
           version: 7
         5,-5:
           ind: 5,-5
-          tiles: FwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAHQAAAAAAAB0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: FwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAHQAAAAAAAB0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         3,-4:
           ind: 3,-4
-          tiles: CgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAARAAAAAAAAEQAAAAAAABEAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAUAAAAAADAFAAAAAAAABQAAAAAAAAUAAAAAABAFAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAABACUAAAAAAAAlAAAAAAIAJQAAAAABACUAAAAAAwCBAAAAAAAAgQAAAAAAAFAAAAAAAgBQAAAAAAEAUAAAAAAAAFAAAAAAAgBQAAAAAAIAgQAAAAAAAIEAAAAAAAAlAAAAAAMAJQAAAAACACUAAAAAAQAlAAAAAAIAJQAAAAAAACUAAAAAAwAlAAAAAAMAgQAAAAAAAIEAAAAAAABQAAAAAAAAUAAAAAACAFAAAAAAAwBQAAAAAAMAUAAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAACACUAAAAAAAAlAAAAAAMAJQAAAAACACUAAAAAAQAlAAAAAAIAJQAAAAADAIEAAAAAAACBAAAAAAAAUAAAAAAAAFAAAAAAAwBQAAAAAAMAUAAAAAADAFAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAIAJQAAAAABACUAAAAAAgAlAAAAAAEAJQAAAAAAACUAAAAAAACBAAAAAAAAgQAAAAAAAFAAAAAAAgBQAAAAAAAAUAAAAAABAFAAAAAAAwCBAAAAAAAAgQAAAAAAAC0AAAAAAAOBAAAAAAAAJQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAARAAAAAAAAEQAAAAAAABEAAAAAAAARAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAMlAAAAAAMAIAAAAAADACAAAAAAAgAgAAAAAAMAUAAAAAACAFAAAAAAAwBQAAAAAAEAUAAAAAADACAAAAAAAAAgAAAAAAMALQAAAAAAAy4AAAAAAAMuAAAAAAACLQAAAAAAAy4AAAAAAAMtAAAAAAAAJQAAAAACACAAAAAAAQAgAAAAAAAAIAAAAAADACAAAAAAAAAgAAAAAAIAIAAAAAACACAAAAAAAAAgAAAAAAIAIAAAAAACAIEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAAMuAAAAAAAALQAAAAAAACUAAAAAAgAgAAAAAAIAIAAAAAABACAAAAAAAQAgAAAAAAMAIAAAAAAAACAAAAAAAQAgAAAAAAIAIAAAAAABACAAAAAAAQCBAAAAAAAALQAAAAAAAC4AAAAAAAEtAAAAAAADLQAAAAAAAy4AAAAAAAAlAAAAAAMAIAAAAAADACAAAAAAAQAgAAAAAAIAIAAAAAADACAAAAAAAgAgAAAAAAIAIAAAAAABACAAAAAAAgAgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAgAgAAAAAAMAIAAAAAAAACAAAAAAAwAgAAAAAAMAIAAAAAAAACAAAAAAAQAgAAAAAAAAIAAAAAACAA==
+          tiles: CgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAgAlAAAAAAEAJQAAAAACACUAAAAAAQAlAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAEAJQAAAAABACUAAAAAAwAlAAAAAAAAJQAAAAADACUAAAAAAQAlAAAAAAEAJQAAAAACAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAABACUAAAAAAQAlAAAAAAIAJQAAAAACACUAAAAAAAAlAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAIAJQAAAAADACUAAAAAAgAlAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAC0AAAAAAAOBAAAAAAAAJQAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAy0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAFAAAAAAAwBEAAAAAAAARAAAAAAAAEQAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAMtAAAAAAADLgAAAAAAAy0AAAAAAAAtAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABQAAAAAAEAUAAAAAADAFAAAAAAAgBQAAAAAAIAUAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAALQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAUAAAAAAAAFAAAAAAAQBQAAAAAAMAUAAAAAABAFAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAAALQAAAAAAAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAFAAAAAAAwBQAAAAAAAAUAAAAAADAFAAAAAAAABQAAAAAAAAgQAAAAAAAA==
           version: 7
         4,-3:
           ind: 4,-3
-          tiles: gQAAAAAAAGAAAAAAAwBgAAAAAAIAYAAAAAACAGAAAAAAAQBgAAAAAAMAYAAAAAAAAGAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAADAGAAAAAAAQBgAAAAAAIAYAAAAAAAAGAAAAAAAQBgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAQAgAAAAAAEAIAAAAAAAACAAAAAAAQCBAAAAAAAAYAAAAAADAGAAAAAAAwBgAAAAAAEAYAAAAAAAAGAAAAAAAwBEAAAAAAAARAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACYAAAAAAAAmAAAAAAIAJgAAAAABACYAAAAAAQAmAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAACACAAAAAAAgAgAAAAAAAAIAAAAAADAGAAAAAAAwBgAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAIAgQAAAAAAAGAAAAAAAwBgAAAAAAAAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAQAgAAAAAAIAIAAAAAABACAAAAAAAABgAAAAAAMAYAAAAAABAGAAAAAAAQBgAAAAAAMAYAAAAAABAGAAAAAAAABgAAAAAAAAYAAAAAACAGAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAIAYAAAAAADAGAAAAAAAwCBAAAAAAAAYAAAAAABAGAAAAAAAwBgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAABAGAAAAAAAwBgAAAAAAMAgQAAAAAAAGAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAwCBAAAAAAAAIAAAAAABACAAAAAAAwBEAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAIAgQAAAAAAACAAAAAAAgAgAAAAAAIARAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAABACAAAAAAAwAgAAAAAAEAIAAAAAABAEQAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAADAGAAAAAAAgAgAAAAAAAAIAAAAAACACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: YAAAAAAAAGAAAAAAAwBgAAAAAAEAIAAAAAAAACAAAAAAAQAgAAAAAAEAIAAAAAACACAAAAAAAQAgAAAAAAEAIAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAMAIAAAAAABAGAAAAAAAwBgAAAAAAMAYAAAAAADAIEAAAAAAAAgAAAAAAEAIAAAAAADACAAAAAAAQAgAAAAAAEAIAAAAAADACAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAABACAAAAAAAQBgAAAAAAAAYAAAAAADAGAAAAAAAgBgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACYAAAAAAwAmAAAAAAIAYAAAAAABAGAAAAAAAQBgAAAAAAAAYAAAAAAAAGAAAAAAAwBgAAAAAAIAYAAAAAADAGAAAAAAAQBgAAAAAAAAYAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAEAIAAAAAADAGAAAAAAAABgAAAAAAEAYAAAAAAAAGAAAAAAAQBgAAAAAAEAgQAAAAAAAIEAAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAABACAAAAAAAABgAAAAAAIAYAAAAAABAGAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAABvAAAAAAAAbwAAAAAAAG8AAAAAAABvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAACAGAAAAAAAwBgAAAAAAIAgQAAAAAAAGAAAAAAAABgAAAAAAMAYAAAAAAAAGAAAAAAAgBgAAAAAAAAbwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAIAYAAAAAADAGAAAAAAAABgAAAAAAIAYAAAAAAAAGAAAAAAAwBgAAAAAAIAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAADAGAAAAAAAgBgAAAAAAMAYAAAAAABAGAAAAAAAwBgAAAAAAEAYAAAAAADAGAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAEAYAAAAAADAGAAAAAAAwBgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAMAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAACAIEAAAAAAACBAAAAAAAAIAAAAAAAAEQAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAADAGAAAAAAAgCBAAAAAAAAIAAAAAAAACAAAAAAAwBEAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAAAgQAAAAAAACAAAAAAAgAgAAAAAAAARAAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAACACAAAAAAAQAgAAAAAAEAIAAAAAACACAAAAAAAgCBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAwCBAAAAAAAAIAAAAAACACAAAAAAAwAgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         5,-3:
           ind: 5,-3
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAEAAAAAAAABAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAACAAAAAAAQAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAAAQAAAAAAACBAAAAAAAAGAAAAAAAAIEAAAAAAAAmAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAABAAAAAAAAIEAAAAAAAAEAAAAAAAARwAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAIAAAAAABABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAABAAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAA==
+          tiles: IAAAAAADACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAAACAAAAAAAQAgAAAAAAEAIAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAABAAAAAAAABgAAAAAAAAmAAAAAAEAJgAAAAAAACYAAAAAAwAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAEAAAAAAAAgQAAAAAAAAQAAAAAAABHAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAAAIAAAAAABACAAAAAAAwAgAAAAAAEAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAEAAAAAAAAGAAAAAAAACAAAAAAAQAgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAEAAAAAAAABAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAEAAAAAAAABAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAA==
           version: 7
         3,-3:
           ind: 3,-3
-          tiles: gQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAAAeAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAMAYAAAAAABAIEAAAAAAABgAAAAAAAAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAIAYAAAAAACAGAAAAAAAgCBAAAAAAAAYAAAAAAAAGAAAAAAAwAlAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAACAGAAAAAAAgBgAAAAAAIAgQAAAAAAAGAAAAAAAwBgAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAgBgAAAAAAAAYAAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAAAACUAAAAAAwCBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAADAGAAAAAAAgAlAAAAAAEAgQAAAAAAAC8AAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAABAGAAAAAAAQBgAAAAAAIAYAAAAAAAAGAAAAAAAQBgAAAAAAMAJQAAAAABAIEAAAAAAAAvAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAARAAAAAAAAGAAAAAAAQBgAAAAAAIAYAAAAAABAGAAAAAAAQBgAAAAAAAAYAAAAAAAACUAAAAAAwCBAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAADAGAAAAAAAgCBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAAIEAAAAAAABgAAAAAAMAYAAAAAABAGAAAAAAAABgAAAAAAIAgQAAAAAAAGAAAAAAAABgAAAAAAMAgQAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAYAAAAAACAGAAAAAAAABgAAAAAAAAYAAAAAABAGAAAAAAAwBgAAAAAAAAYAAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAMAYAAAAAACAGAAAAAAAQBgAAAAAAIAYAAAAAACAGAAAAAAAwCBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAABgAAAAAAMAYAAAAAAAAGAAAAAAAABgAAAAAAMAgQAAAAAAAGAAAAAAAwBgAAAAAAEAgQAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAbwAAAAAAAGAAAAAAAgBgAAAAAAIAbwAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAABAIEAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAAAYAAAAAADAG8AAAAAAACBAAAAAAAAYAAAAAADAGAAAAAAAQAYAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAwCBAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAGQAAAAACABkAAAAAAAAZAAAAAAIAGQAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAABAA==
+          tiles: gQAAAAAAAIEAAAAAAAAtAAAAAAAAIAAAAAACAC0AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAFAAAAAAAgBQAAAAAAMAUAAAAAADAFAAAAAAAABQAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAC0AAAAAAAAuAAAAAAABLgAAAAAAA4EAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAUAAAAAACAFAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAAtAAAAAAAAIAAAAAAAAC4AAAAAAAEtAAAAAAABLQAAAAAAAYEAAAAAAACBAAAAAAAAUAAAAAABAFAAAAAAAgBQAAAAAAMAUAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAuAAAAAAAALgAAAAAAAS4AAAAAAAMgAAAAAAAAIAAAAAAAACAAAAAAAQAgAAAAAAIAIAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAQAgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAtAAAAAAAAIAAAAAACACAAAAAAAwAgAAAAAAAAIAAAAAAAACAAAAAAAgAgAAAAAAEAIAAAAAACACAAAAAAAgAgAAAAAAMAIAAAAAADAGAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAgAgAAAAAAIAIAAAAAADACAAAAAAAgAgAAAAAAAAIAAAAAAAACAAAAAAAQAgAAAAAAIAIAAAAAADACAAAAAAAABgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAACACAAAAAAAQAgAAAAAAAAIAAAAAAAACAAAAAAAgAgAAAAAAAAIAAAAAABACAAAAAAAQAgAAAAAAEAgQAAAAAAAIEAAAAAAAAeAAAAAAAAHgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAIAYAAAAAADAIEAAAAAAABgAAAAAAMAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAEARAAAAAAAAGAAAAAAAgBgAAAAAAIAYAAAAAACAGAAAAAAAgCBAAAAAAAAYAAAAAADAGAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAAAAGAAAAAAAgCBAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAMAgQAAAAAAAGAAAAAAAgBgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAMAgQAAAAAAAGAAAAAAAQBgAAAAAAEAYAAAAAAAAGAAAAAAAwBgAAAAAAMAYAAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAADAIEAAAAAAACBAAAAAAAAYAAAAAACAGAAAAAAAgBgAAAAAAIAYAAAAAADAIEAAAAAAABgAAAAAAMAYAAAAAADAGAAAAAAAwBgAAAAAAEAYAAAAAABAGAAAAAAAQBgAAAAAAEAYAAAAAACAGAAAAAAAABgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQCBAAAAAAAAgQAAAAAAAGAAAAAAAQCBAAAAAAAAYAAAAAADAGAAAAAAAgCBAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAIAYAAAAAAAAIEAAAAAAACBAAAAAAAAFgAAAAACABYAAAAAAwBgAAAAAAIAYAAAAAAAAGAAAAAAAABgAAAAAAEAYAAAAAACAGAAAAAAAQBgAAAAAAMAYAAAAAAAAGAAAAAAAwBgAAAAAAMAYAAAAAAAAGAAAAAAAgCBAAAAAAAAgQAAAAAAABYAAAAAAwAWAAAAAAAAYAAAAAACAGAAAAAAAgBgAAAAAAIAYAAAAAACAGAAAAAAAwBgAAAAAAIAYAAAAAAAAGAAAAAAAQBgAAAAAAMAYAAAAAABAGAAAAAAAABgAAAAAAIAgQAAAAAAAIEAAAAAAAAWAAAAAAAAFgAAAAACABYAAAAAAQBgAAAAAAEAYAAAAAADAGAAAAAAAwBgAAAAAAEAYAAAAAADAGAAAAAAAgBgAAAAAAIAYAAAAAACAGAAAAAAAQBgAAAAAAMAYAAAAAADAA==
           version: 7
         4,-2:
           ind: 4,-2
-          tiles: YAAAAAABAGAAAAAAAQCBAAAAAAAAIAAAAAACACAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAABgAAAAAAIAYAAAAAAAAGAAAAAAAwBgAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAAAEgAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAARwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAS8AAAAAAAAtAAAAAAABLQAAAAAAAS0AAAAAAAEuAAAAAAADgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAEvAAAAAAAALQAAAAAAAS0AAAAAAAEuAAAAAAADLgAAAAAAAS4AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAABLwAAAAAAAC0AAAAAAAGBAAAAAAAALgAAAAAAAS0AAAAAAAEtAAAAAAAALwAAAAAAACAAAAAAAQAgAAAAAAAAIAAAAAACACAAAAAAAAAgAAAAAAMAIAAAAAADACAAAAAAAwAgAAAAAAAAgQAAAAAAAEcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAS4AAAAAAAOBAAAAAAAAIAAAAAADACAAAAAAAgAgAAAAAAAAIAAAAAACACAAAAAAAgAgAAAAAAMAIAAAAAACAIEAAAAAAAAlAAAAAAMAJQAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAMtAAAAAAAAgQAAAAAAACAAAAAAAQAgAAAAAAIAIAAAAAADACAAAAAAAwAgAAAAAAAAIAAAAAADACAAAAAAAACBAAAAAAAAJQAAAAABACUAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAAAuAAAAAAABLgAAAAAAAIEAAAAAAAAgAAAAAAIAIAAAAAABACAAAAAAAgAgAAAAAAEAIAAAAAACACAAAAAAAQAgAAAAAAEAgQAAAAAAACUAAAAAAAAlAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAOBAAAAAAAAIAAAAAACACAAAAAAAgAgAAAAAAIAIAAAAAAAACAAAAAAAgAgAAAAAAAAIAAAAAACACUAAAAAAgAlAAAAAAAAJQAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAMAJQAAAAAAACUAAAAAAwCBAAAAAAAAIQAAAAABACEAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAA==
+          tiles: YAAAAAAAAGAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQCBAAAAAAAAgQAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAMAYAAAAAADAGAAAAAAAwBgAAAAAAEAYAAAAAACAGAAAAAAAgBgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAEAYAAAAAADAGAAAAAAAQBgAAAAAAIAYAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAABgAAAAAAEAEgAAAAAAABIAAAAAAAASAAAAAAAAEgAAAAAAABIAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAARwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAS8AAAAAAAAtAAAAAAABLQAAAAAAAS0AAAAAAAEuAAAAAAADgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC0AAAAAAAEvAAAAAAAALQAAAAAAAS0AAAAAAAEuAAAAAAADLgAAAAAAAS4AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAABLwAAAAAAAC0AAAAAAAGBAAAAAAAALgAAAAAAAS0AAAAAAAEtAAAAAAAALwAAAAAAACAAAAAAAwAgAAAAAAEAIAAAAAAAACAAAAAAAgAgAAAAAAAAIAAAAAADACAAAAAAAQAgAAAAAAMAgQAAAAAAAEcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAS4AAAAAAAOBAAAAAAAAIAAAAAACACAAAAAAAAAgAAAAAAIAIAAAAAADACAAAAAAAwAgAAAAAAIAIAAAAAACAIEAAAAAAAAlAAAAAAAAJQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAMtAAAAAAAAgQAAAAAAACAAAAAAAgAgAAAAAAAAIAAAAAADACAAAAAAAwAgAAAAAAMAIAAAAAACACAAAAAAAQCBAAAAAAAAJQAAAAABACUAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAuAAAAAAABLgAAAAAAAIEAAAAAAAAgAAAAAAMAIAAAAAAAACAAAAAAAAAgAAAAAAIAIAAAAAABACAAAAAAAQAgAAAAAAIAgQAAAAAAACUAAAAAAwAlAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAALQAAAAAAAy0AAAAAAAOBAAAAAAAAIAAAAAACACAAAAAAAAAgAAAAAAEAIAAAAAABACAAAAAAAgAgAAAAAAIAIAAAAAADACUAAAAAAQAlAAAAAAEAJQAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAIAJQAAAAADACUAAAAAAgCBAAAAAAAAIQAAAAAAACEAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAA==
           version: 7
         3,-2:
           ind: 3,-2
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAGQAAAAABABkAAAAAAAAZAAAAAAMAGQAAAAACAIEAAAAAAABgAAAAAAIAYAAAAAADAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAwAvAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAGAAAAAAAAIEAAAAAAABgAAAAAAMAYAAAAAADAGAAAAAAAgBgAAAAAAMAYAAAAAACAGAAAAAAAQBgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAADAIEAAAAAAABgAAAAAAEAYAAAAAABABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAGAAAAAAAQBgAAAAAAEAYAAAAAACAGAAAAAAAABgAAAAAAEAYAAAAAACAGAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAAAAGAAAAAAAABgAAAAAAIAgQAAAAAAAIEAAAAAAABHAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAABLwAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAABLQAAAAAAAS8AAAAAAAAuAAAAAAABLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAS0AAAAAAAEvAAAAAAAAIAAAAAACACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAgAgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAARwAAAAAAACUAAAAAAAAlAAAAAAMAJQAAAAAAACUAAAAAAwAlAAAAAAAAJQAAAAAAACUAAAAAAgAlAAAAAAAAJQAAAAABACUAAAAAAwAlAAAAAAMARwAAAAAAAIEAAAAAAABHAAAAAAAAgQAAAAAAACUAAAAAAABgAAAAAAAAYAAAAAACAGAAAAAAAgBgAAAAAAAAYAAAAAAAAGAAAAAAAgBgAAAAAAMAYAAAAAAAAGAAAAAAAQCBAAAAAAAAIAAAAAABACAAAAAAAwAgAAAAAAMAIAAAAAADACAAAAAAAwAlAAAAAAMAIgAAAAADACIAAAAAAQAiAAAAAAMAIgAAAAADACQAAAAAAgAiAAAAAAMAIgAAAAACACIAAAAAAgBgAAAAAAEAIAAAAAAAACAAAAAAAwAgAAAAAAIAIAAAAAADACAAAAAAAgCBAAAAAAAARwAAAAAAAGAAAAAAAgBgAAAAAAIAYAAAAAABAGAAAAAAAwBgAAAAAAMAYAAAAAADAGAAAAAAAgAiAAAAAAEAYAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAwAfAAAAAAIAgQAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAIEAAAAAAABgAAAAAAAAIgAAAAAAAGAAAAAAAABHAAAAAAAAJQAAAAAAACUAAAAAAwAlAAAAAAIAJQAAAAABACUAAAAAAwAlAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQAiAAAAAAMAIgAAAAAAACIAAAAAAQBgAAAAAAEAgQAAAAAAACQAAAAAAgAlAAAAAAAAJQAAAAAAACUAAAAAAQAlAAAAAAMAJQAAAAABAA==
+          tiles: gQAAAAAAAIEAAAAAAAAWAAAAAAIAFgAAAAADABYAAAAAAABgAAAAAAIAgQAAAAAAAGAAAAAAAQBgAAAAAAMAYAAAAAACAGAAAAAAAwBgAAAAAAMAYAAAAAABAGAAAAAAAgBgAAAAAAEAYAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAADAIEAAAAAAABgAAAAAAMAYAAAAAABAIEAAAAAAABgAAAAAAAAYAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAADAGAAAAAAAQCBAAAAAAAAYAAAAAACAGAAAAAAAABgAAAAAAIAYAAAAAADAGAAAAAAAgBgAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAAAYAAAAAAAAGAAAAAAAwBgAAAAAAAAYAAAAAABAIEAAAAAAABgAAAAAAEAYAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAADAGAAAAAAAwBgAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAEAYAAAAAACAGAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAQCBAAAAAAAAYAAAAAABAGAAAAAAAABgAAAAAAMAgQAAAAAAAIEAAAAAAABHAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAiAAAAAAAgAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAtAAAAAAABLwAAAAAAAC0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAADLgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAABLQAAAAAAAS8AAAAAAAAuAAAAAAABLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAS0AAAAAAAEvAAAAAAAAIAAAAAADACAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAADACAAAAAAAgAgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAARwAAAAAAACUAAAAAAwAlAAAAAAEAJQAAAAADACUAAAAAAQAlAAAAAAAAJQAAAAABACUAAAAAAAAlAAAAAAMAJQAAAAACACUAAAAAAwAlAAAAAAAARwAAAAAAAIEAAAAAAABHAAAAAAAAgQAAAAAAACUAAAAAAwBgAAAAAAEAYAAAAAADAGAAAAAAAABgAAAAAAMAYAAAAAAAAGAAAAAAAQBgAAAAAAEAYAAAAAACAGAAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAIAIAAAAAACACAAAAAAAwAlAAAAAAAAIgAAAAABACIAAAAAAgAiAAAAAAAAIgAAAAADACQAAAAAAAAiAAAAAAIAIgAAAAAAACIAAAAAAwBgAAAAAAIAIAAAAAAAACAAAAAAAQAgAAAAAAAAIAAAAAABACAAAAAAAwCBAAAAAAAARwAAAAAAAGAAAAAAAQBgAAAAAAAAYAAAAAAAAGAAAAAAAQBgAAAAAAMAYAAAAAABAGAAAAAAAAAiAAAAAAAAYAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAQAfAAAAAAIAgQAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAIEAAAAAAABgAAAAAAMAIgAAAAADAGAAAAAAAQBHAAAAAAAAJQAAAAADACUAAAAAAwAlAAAAAAEAJQAAAAABACUAAAAAAQAlAAAAAAEAgQAAAAAAAGAAAAAAAgCBAAAAAAAAgQAAAAAAAGAAAAAAAwAiAAAAAAEAIgAAAAABACIAAAAAAwBgAAAAAAIAgQAAAAAAACQAAAAAAwAlAAAAAAEAJQAAAAACACUAAAAAAwAlAAAAAAIAJQAAAAABAA==
           version: 7
         2,-2:
           ind: 2,-2
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAAAvAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAMAJQAAAAACACUAAAAAAQApAAAAAAAAgQAAAAAAAC8AAAAAAAAvAAAAAAAALwAAAAAAAC8AAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAKQAAAAACAIEAAAAAAAAvAAAAAAAALwAAAAAAAC8AAAAAAAAvAAAAAAAALwAAAAAAAC8AAAAAAACBAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAACkAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAJQAAAAADACUAAAAAAgApAAAAAAMAKQAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAAAi0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADgQAAAAAAACAAAAAAAwCBAAAAAAAAgQAAAAAAAC4AAAAAAAKBAAAAAAAALgAAAAAAAi0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAAuAAAAAAACLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAAKQAAAAACAC0AAAAAAAAuAAAAAAACLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAIEAAAAAAAAgAAAAAAEAgQAAAAAAACAAAAAAAAAgAAAAAAEAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAABAIEAAAAAAAAtAAAAAAAALgAAAAAAAS0AAAAAAAMuAAAAAAADLwAAAAAAAIEAAAAAAACBAAAAAAAARwAAAAAAACUAAAAAAQAlAAAAAAEAJQAAAAABACUAAAAAAwAlAAAAAAIAJQAAAAAAACUAAAAAAwCBAAAAAAAALgAAAAAAAS0AAAAAAAMtAAAAAAADLgAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAMAYAAAAAADAGAAAAAAAgBgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAAAZAAAAAAIAgQAAAAAAACIAAAAAAQAiAAAAAAMAIgAAAAAAACIAAAAAAAAiAAAAAAMAIgAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAYAAAAAACACIAAAAAAQAiAAAAAAIAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAABAGAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAAGAAAAAAAgAiAAAAAAMAYAAAAAAAAIEAAAAAAAAfAAAAAAEAHwAAAAADAGAAAAAAAAAfAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAABgAAAAAAEAIgAAAAAAAGAAAAAAAgBgAAAAAAMAgQAAAAAAAIEAAAAAAABgAAAAAAIAgQAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAALwAAAAAAACUAAAAAAgAlAAAAAAEAJQAAAAADACkAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAApAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAACkAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAYAAAAAAAAGAAAAAAAAIEAAAAAAAAlAAAAAAAAJQAAAAACACkAAAAAAwApAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAuAAAAAAACLQAAAAAAAy0AAAAAAAMuAAAAAAACLgAAAAAAA4EAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC0AAAAAAAMYAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAMtAAAAAAADLgAAAAAAAC4AAAAAAAEtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy4AAAAAAAIrAAAAAAMAGAAAAAAAACsAAAAAAwArAAAAAAIAKwAAAAABACUAAAAAAwAtAAAAAAAALQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLQAAAAAAAy0AAAAAAAMuAAAAAAAALQAAAAAAAxgAAAAAAAAtAAAAAAADLQAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAIEAAAAAAAAgAAAAAAIAgQAAAAAAACAAAAAAAQAgAAAAAAIAIAAAAAADACAAAAAAAAAgAAAAAAAAIAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAARwAAAAAAACUAAAAAAQAlAAAAAAIAJQAAAAADACUAAAAAAgAlAAAAAAIAJQAAAAADACUAAAAAAgApAAAAAAAAKQAAAAAAAIEAAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAwBgAAAAAAEAYAAAAAAAAGAAAAAAAwBgAAAAAAIAKQAAAAACACkAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAAAZAAAAAAMAgQAAAAAAACIAAAAAAgAiAAAAAAMAIgAAAAABACIAAAAAAgAiAAAAAAIAIgAAAAADACkAAAAAAwApAAAAAAAAKQAAAAABACkAAAAAAwApAAAAAAEAgQAAAAAAABcAAAAAAACBAAAAAAAAYAAAAAAAACIAAAAAAwAiAAAAAAMAYAAAAAAAAGAAAAAAAQBgAAAAAAAAYAAAAAABAGAAAAAAAwApAAAAAAMAKQAAAAABACkAAAAAAwApAAAAAAIAKQAAAAADAIEAAAAAAAAAAAAAAAAAgQAAAAAAAGAAAAAAAwAiAAAAAAAAYAAAAAADAIEAAAAAAAAfAAAAAAMAHwAAAAABAGAAAAAAAwAfAAAAAAIAKQAAAAAAAIEAAAAAAACBAAAAAAAAKQAAAAABAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAABgAAAAAAMAIgAAAAACAGAAAAAAAQBgAAAAAAEAgQAAAAAAAIEAAAAAAABgAAAAAAIAgQAAAAAAAA==
           version: 7
         2,-3:
           ind: 2,-3
-          tiles: gQAAAAAAACAAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAMAgQAAAAAAAIEAAAAAAAAPAAAAAAIADwAAAAABAA8AAAAAAAAPAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAwAlAAAAAAAAJQAAAAACAIEAAAAAAAABAAAAAAIAAQAAAAABACAAAAAAAgAPAAAAAAMADwAAAAAAAA8AAAAAAwAPAAAAAAIADwAAAAAAAA8AAAAAAgCBAAAAAAAAgQAAAAAAACUAAAAAAwAlAAAAAAAAJQAAAAACACUAAAAAAwAgAAAAAAIAAQAAAAADAAEAAAAAAAAgAAAAAAEADwAAAAAAAA8AAAAAAwAPAAAAAAMADwAAAAAAAA8AAAAAAgAPAAAAAAMAgQAAAAAAACUAAAAAAQAlAAAAAAAAJQAAAAACACUAAAAAAAAlAAAAAAAAIAAAAAAAAAEAAAAAAQABAAAAAAMAIAAAAAABAA8AAAAAAAAPAAAAAAMADwAAAAAAAA8AAAAAAgAPAAAAAAEADwAAAAAAAIEAAAAAAAAlAAAAAAIAGAAAAAAAACUAAAAAAQAlAAAAAAMAJQAAAAAAACAAAAAAAQABAAAAAAIAAQAAAAABACAAAAAAAQAPAAAAAAIADwAAAAADAA8AAAAAAgAPAAAAAAEADwAAAAACAA8AAAAAAwAPAAAAAAAAJQAAAAADACUAAAAAAwAlAAAAAAEAJQAAAAABACUAAAAAAgAgAAAAAAEAAQAAAAAAAAEAAAAAAQAgAAAAAAAADwAAAAABAA8AAAAAAAAPAAAAAAIADwAAAAABAA8AAAAAAAAPAAAAAAAAgQAAAAAAACUAAAAAAAAlAAAAAAIAJQAAAAAAACUAAAAAAAAlAAAAAAEAIAAAAAAAAAEAAAAAAwABAAAAAAIAgQAAAAAAAA8AAAAAAwAPAAAAAAEADwAAAAACAA8AAAAAAAAPAAAAAAIADwAAAAABAIEAAAAAAAAlAAAAAAIAJQAAAAACACUAAAAAAQAlAAAAAAAAJQAAAAACAIEAAAAAAAABAAAAAAIAAQAAAAACACAAAAAAAgAPAAAAAAIADwAAAAAAAA8AAAAAAwAPAAAAAAAADwAAAAADAA8AAAAAAgCBAAAAAAAAJQAAAAACACUAAAAAAwAlAAAAAAEAJQAAAAABACUAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAgAlAAAAAAIAgQAAAAAAAC8AAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAAAlAAAAAAAAJQAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAB4AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAAA==
+          tiles: gQAAAAAAACAAAAAAAQCBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAIAgQAAAAAAACAAAAAAAwAPAAAAAAAADwAAAAAAAA8AAAAAAwAPAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAwAlAAAAAAMAJQAAAAACAIEAAAAAAAABAAAAAAMAAQAAAAACACAAAAAAAwAPAAAAAAIADwAAAAAAAA8AAAAAAQAPAAAAAAIADwAAAAAAAA8AAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAIAJQAAAAAAACUAAAAAAAAgAAAAAAAAAQAAAAADAAEAAAAAAAAgAAAAAAEADwAAAAAAAA8AAAAAAwAPAAAAAAIADwAAAAAAAA8AAAAAAwAPAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAQAlAAAAAAMAIAAAAAAAAAEAAAAAAQABAAAAAAIAIAAAAAABAA8AAAAAAAAPAAAAAAMADwAAAAACAA8AAAAAAQAPAAAAAAMADwAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAAAlAAAAAAEAJQAAAAAAACAAAAAAAwABAAAAAAEAAQAAAAAAACAAAAAAAQAPAAAAAAEADwAAAAADAA8AAAAAAgAPAAAAAAIADwAAAAAAAA8AAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAEAJQAAAAADACUAAAAAAAAgAAAAAAMAAQAAAAADAAEAAAAAAQAgAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAAPAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAAAACUAAAAAAAAlAAAAAAMAIAAAAAACAAEAAAAAAAABAAAAAAAAgQAAAAAAAA8AAAAAAwAPAAAAAAIADwAAAAAAAA8AAAAAAwAPAAAAAAIADwAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAACUAAAAAAwAlAAAAAAEAJQAAAAACAIEAAAAAAAABAAAAAAMAAQAAAAABACAAAAAAAgAPAAAAAAIADwAAAAADAA8AAAAAAAAPAAAAAAMADwAAAAABAA8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAAAJQAAAAACACUAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAJQAAAAABACUAAAAAAgAlAAAAAAMAgQAAAAAAAC8AAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAAAlAAAAAAEAJQAAAAABACUAAAAAAwAlAAAAAAEAJQAAAAADACUAAAAAAQCBAAAAAAAAgQAAAAAAACUAAAAAAQAlAAAAAAEAJQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAlAAAAAAEAJQAAAAAAACUAAAAAAwAlAAAAAAIAJQAAAAACACUAAAAAAwAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAACUAAAAAAAAlAAAAAAEAJQAAAAABACUAAAAAAAAlAAAAAAMAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAAAvAAAAAAAALwAAAAAAAIEAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAAC8AAAAAAAAvAAAAAAAAGAAAAAAAAC8AAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAvAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALwAAAAAAABgAAAAAAAAvAAAAAAAAgQAAAAAAAA==
           version: 7
         5,-2:
           ind: 5,-2
-          tiles: gQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAEAgQAAAAAAACAAAAAAAQAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAACAIEAAAAAAAAgAAAAAAMAIAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAwAgAAAAAAEAIAAAAAAAACAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAIAgQAAAAAAACAAAAAAAAAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAHAAAAAAAABwAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAgQAAAAAAACAAAAAAAwAgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABAIEAAAAAAAAgAAAAAAEAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAQAgAAAAAAMAIAAAAAAAACAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAgQAAAAAAACAAAAAAAwAgAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAHAAAAAACABwAAAAAAwCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         5,-1:
           ind: 5,-1
@@ -340,7 +340,7 @@ entities:
           version: 7
         3,-1:
           ind: 3,-1
-          tiles: YAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAADACIAAAAAAwAiAAAAAAMAYAAAAAACAGAAAAAAAQBgAAAAAAMARwAAAAAAACUAAAAAAwAlAAAAAAIAJQAAAAADACUAAAAAAgCBAAAAAAAAgQAAAAAAACIAAAAAAQAiAAAAAAIAIgAAAAABACIAAAAAAQAiAAAAAAIAIwAAAAAAACMAAAAAAAAjAAAAAAAAIwAAAAAAAIEAAAAAAAAlAAAAAAIAJQAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAABAGAAAAAAAgBgAAAAAAEAYAAAAAAAACMAAAAAAAAjAAAAAAAAHwAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: YAAAAAABAGAAAAAAAABgAAAAAAMAYAAAAAADACIAAAAAAgAiAAAAAAAAYAAAAAACAGAAAAAAAwBgAAAAAAEARwAAAAAAACUAAAAAAwAlAAAAAAIAJQAAAAADACUAAAAAAwCBAAAAAAAAgQAAAAAAACIAAAAAAwAiAAAAAAIAIgAAAAAAACIAAAAAAQAiAAAAAAMAIwAAAAAAACMAAAAAAAAjAAAAAAAAIwAAAAAAAIEAAAAAAAAlAAAAAAIAJQAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAwBgAAAAAAEAYAAAAAADACMAAAAAAAAjAAAAAAAAHwAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         4,-1:
           ind: 4,-1
@@ -348,15 +348,15 @@ entities:
           version: 7
         2,-1:
           ind: 2,-1
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAADAIEAAAAAAACBAAAAAAAAAAAAAAAAAIEAAAAAAABgAAAAAAEAIgAAAAADAGAAAAAAAACBAAAAAAAAYAAAAAACAGAAAAAAAwBgAAAAAAMAYAAAAAABAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAAYAAAAAAAACIAAAAAAgAiAAAAAAMAIgAAAAACACIAAAAAAAAiAAAAAAAAIgAAAAACACIAAAAAAwCBAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAEAYAAAAAAAAGAAAAAAAgBgAAAAAAAAYAAAAAAAAGAAAAAAAwBgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: KQAAAAABACkAAAAAAwApAAAAAAAAKQAAAAAAACkAAAAAAwCBAAAAAAAAAAAAAAAAAIEAAAAAAABgAAAAAAEAIgAAAAADAGAAAAAAAQCBAAAAAAAAYAAAAAAAAGAAAAAAAwBgAAAAAAIAYAAAAAADACkAAAAAAAApAAAAAAAAKQAAAAACACkAAAAAAwApAAAAAAIAgQAAAAAAAAAAAAAAAACBAAAAAAAAYAAAAAABACIAAAAAAAAiAAAAAAEAIgAAAAAAACIAAAAAAgAiAAAAAAMAIgAAAAABACIAAAAAAgCBAAAAAAAAgQAAAAAAACkAAAAAAQApAAAAAAEAKQAAAAABAIEAAAAAAAAXAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAAAYAAAAAAAAGAAAAAAAgBgAAAAAAEAYAAAAAAAAGAAAAAAAgBgAAAAAAAAKQAAAAACAIEAAAAAAAApAAAAAAMAKQAAAAABACkAAAAAAQCBAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACkAAAAAAgCBAAAAAAAAKQAAAAABACkAAAAAAgApAAAAAAMAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         2,-4:
           ind: 2,-4
-          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAALQAAAAAAAC0AAAAAAAMtAAAAAAADGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAALQAAAAAAAy0AAAAAAAMuAAAAAAAGgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAC0AAAAAAAMuAAAAAAADGAAAAAAAAC0AAAAAAAMtAAAAAAADLgAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAy0AAAAAAAMtAAAAAAAALQAAAAAAAy0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAABBgAAAAAAAAYAAAAAAAAGAAAAAAAAC4AAAAAAAEtAAAAAAADLgAAAAAAAy4AAAAAAAEtAAAAAAADgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAgAgAAAAAAIAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAEtAAAAAAADLQAAAAAAAyAAAAAAAAAgAAAAAAEAIAAAAAABACAAAAAAAAAgAAAAAAIAIAAAAAAAAIEAAAAAAAAgAAAAAAMAIAAAAAABACAAAAAAAgAYAAAAAAAAIAAAAAADAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAAAIAAAAAADACAAAAAAAQAgAAAAAAEAIAAAAAADACAAAAAAAQAgAAAAAAMAIAAAAAADACAAAAAAAgAgAAAAAAMAGAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAACACAAAAAAAgAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
+          tiles: gQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAALQAAAAAAAC0AAAAAAAMtAAAAAAADGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAALQAAAAAAAy0AAAAAAAMuAAAAAAAGgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAC0AAAAAAAMuAAAAAAADGAAAAAAAAC0AAAAAAAMtAAAAAAADLgAAAAAAAy0AAAAAAAMtAAAAAAADLgAAAAAAAy0AAAAAAAMtAAAAAAAALQAAAAAAAy0AAAAAAAOBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAALgAAAAAABBgAAAAAAAAYAAAAAAAAGAAAAAAAAC4AAAAAAAEtAAAAAAADLgAAAAAAAy4AAAAAAAEtAAAAAAADgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAACAAAAAAAgAgAAAAAAEAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAAC4AAAAAAAEtAAAAAAADLQAAAAAAAyAAAAAAAwAgAAAAAAMAIAAAAAACACAAAAAAAgAgAAAAAAEAIAAAAAACAIEAAAAAAAAgAAAAAAMAIAAAAAACACAAAAAAAgAYAAAAAAAAIAAAAAACAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAgAAAAAAEAIAAAAAACACAAAAAAAwAgAAAAAAEAIAAAAAADACAAAAAAAgAgAAAAAAIAIAAAAAADACAAAAAAAgAYAAAAAAAAGAAAAAAAACAAAAAAAgCBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAIAAAAAAAACAAAAAAAgAgAAAAAAIAIAAAAAAAACAAAAAAAgAgAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAA==
           version: 7
         -2,-6:
           ind: -2,-6
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAA==
           version: 7
         -4,-6:
           ind: -4,-6
@@ -372,19 +372,19 @@ entities:
           version: 7
         6,-3:
           ind: 6,-3
-          tiles: gQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: GAAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         6,-2:
           ind: 6,-2
-          tiles: FwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: FwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         6,-4:
           ind: 6,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAAAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAFwAAAAAAABcAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAgQAAAAAAABcAAAAAAAAXAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAFwAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAXAAAAAAAAAAAAAAAAABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         3,-7:
           ind: 3,-7
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAADAGAAAAAAAQBgAAAAAAAAYAAAAAAAAGAAAAAAAQCBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAQBgAAAAAAIAYAAAAAACAGAAAAAAAwBgAAAAAAAAYAAAAAABAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAGAAAAAAAwBgAAAAAAEAYAAAAAADAGAAAAAAAwBgAAAAAAAAYAAAAAADAGAAAAAAAwCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAABgAAAAAAIAYAAAAAADAGAAAAAAAQBgAAAAAAEAYAAAAAAAAGAAAAAAAQBgAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAYAAAAAADAGAAAAAAAQBgAAAAAAMAYAAAAAAAAGAAAAAAAABgAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAAAYAAAAAADAGAAAAAAAABgAAAAAAMAgQAAAAAAAIEAAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAgQAAAAAAAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAABgAAAAAAMAYAAAAAADAGAAAAAAAgBgAAAAAAEAYAAAAAABAGAAAAAAAABgAAAAAAEAgQAAAAAAAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAYAAAAAABAGAAAAAAAQBgAAAAAAIAYAAAAAAAAGAAAAAAAwBgAAAAAAAAYAAAAAABAGAAAAAAAQCBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAGAAAAAAAgBgAAAAAAMAYAAAAAADAGAAAAAAAQBgAAAAAAMAYAAAAAABAGAAAAAAAQBgAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIEAAAAAAABgAAAAAAEAYAAAAAABAGAAAAAAAQBgAAAAAAAAYAAAAAABAGAAAAAAAwBgAAAAAAIAYAAAAAADAIEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAAAAAAAAYAAAAAAAAGAAAAAAAgBgAAAAAAEAYAAAAAABAGAAAAAAAABgAAAAAAEAYAAAAAACAIEAAAAAAACBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAG8AAAAAAABvAAAAAAAAbwAAAAAAAGAAAAAAAwBgAAAAAAMAYAAAAAABAIEAAAAAAACBAAAAAAAAFwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
           version: 7
         -5,-3:
           ind: -5,-3
@@ -411,6 +411,12 @@ entities:
       chunkCollection:
         version: 2
         nodes:
+        - node:
+            angle: -1.5707963267948966 rad
+            color: '#FFFFFFFF'
+            id: Arrows
+          decals:
+            4809: 52,-97
         - node:
             color: '#FFFFFFFF'
             id: Arrows
@@ -520,30 +526,18 @@ entities:
             173: 11,-58
             174: 11,-59
             175: 11,-60
-            455: 50,-97
-            456: 51,-97
-            457: 52,-97
             458: 54,-102
-            459: 53,-102
-            463: 49,-101
             1726: 40,-14
             1727: 41,-14
             1890: -7,-78
             1891: -6,-78
             3321: 60,-16
             3322: 61,-16
-            3385: 68,-41
-            3386: 67,-41
-            3387: 57,-37
-            3388: 57,-38
-            3389: 57,-39
-            3390: 57,-40
             3412: 63,-27
             3413: 65,-27
             3414: 65,-23
             3415: 57,-18
             3416: 57,-16
-            3438: 66,-28
             3665: -4,-18
             3666: -5,-18
             3667: -6,-18
@@ -562,14 +556,24 @@ entities:
             4062: 43,-74
             4067: 54,-72
             4068: 54,-73
-        - node:
-            zIndex: 1
-            color: '#FFFFFFFF'
-            id: Bot
-          decals:
-            1011: 31,-20
-            1012: 31,-21
-            1013: 31,-22
+            4416: 36,-18
+            4417: 36,-19
+            4418: 36,-15
+            4419: 29,-18
+            4420: 29,-21
+            4495: 23,-19
+            4496: 23,-20
+            4497: 15,-17
+            4498: 15,-18
+            4645: 68,-39
+            4646: 69,-39
+            4647: 70,-39
+            4648: 71,-39
+            4649: 72,-39
+            4671: 54,-37
+            4672: 56,-37
+            4776: 54,-97
+            4780: 53,-102
         - node:
             angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
@@ -620,17 +624,10 @@ entities:
             66: -27,-61
             67: -13,-62
             68: -12,-62
-            460: 55,-99
-            461: 55,-100
-            462: 55,-101
-        - node:
-            zIndex: 1
-            color: '#FFFFFFFF'
-            id: BotLeft
-          decals:
-            1014: 27,-22
-            1015: 27,-21
-            1016: 27,-20
+            4772: 56,-99
+            4773: 56,-100
+            4774: 56,-101
+            4781: 55,-98
         - node:
             angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
@@ -664,14 +661,11 @@ entities:
             2253: 30,-74
             2254: 31,-74
             2255: 33,-74
-            3392: 57,-35
-            3431: 67,-28
-            3432: 68,-28
-            3433: 69,-28
-            3434: 69,-30
-            3435: 68,-30
-            3436: 67,-30
-            3437: 66,-30
+            4413: 32,-21
+            4414: 33,-18
+            4415: 34,-18
+            4593: 33,-20
+            4644: 68,-42
         - node:
             angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
@@ -698,10 +692,11 @@ entities:
             305: 23,-103
             306: 24,-103
             307: 25,-103
-            464: 49,-102
             615: 18,-69
             616: 17,-69
             2003: -24,-82
+            4777: 49,-102
+            4778: 55,-102
         - node:
             color: '#00FFFFFF'
             id: BoxGreyscale
@@ -731,6 +726,11 @@ entities:
           decals:
             947: 9,-76
             948: 8,-76
+        - node:
+            color: '#2E99FF96'
+            id: BrickBoxOverlay
+          decals:
+            4494: 18,-16
         - node:
             color: '#95FF6F72'
             id: BrickCornerOverlayNE
@@ -749,6 +749,11 @@ entities:
             1862: 53,-16
             1863: 55,-17
             1865: 42,-19
+        - node:
+            color: '#52B4E996'
+            id: BrickCornerOverlayNW
+          decals:
+            4488: 23,-17
         - node:
             color: '#95FF6F72'
             id: BrickCornerOverlayNW
@@ -764,6 +769,11 @@ entities:
             id: BrickCornerOverlayNW
           decals:
             1860: 41,-15
+        - node:
+            color: '#52B4E996'
+            id: BrickCornerOverlaySE
+          decals:
+            4489: 22,-16
         - node:
             color: '#95FF6F72'
             id: BrickCornerOverlaySE
@@ -779,6 +789,12 @@ entities:
             id: BrickCornerOverlaySE
           decals:
             1864: 55,-20
+        - node:
+            color: '#52B4E996'
+            id: BrickCornerOverlaySW
+          decals:
+            4486: 19,-16
+            4487: 23,-18
         - node:
             color: '#95FF6F72'
             id: BrickCornerOverlaySW
@@ -822,10 +838,18 @@ entities:
             2986: 13,-31
             2987: 17,-30
         - node:
-            color: '#724276FF'
+            color: '#334E6DC8'
             id: BrickLineOverlayE
           decals:
-            8: -13,-49
+            4899: -35,-49
+            4900: -35,-43
+            4903: -35,-44
+            4904: -35,-48
+        - node:
+            color: '#8C347F96'
+            id: BrickLineOverlayE
+          decals:
+            4945: -13,-49
         - node:
             color: '#95FF6F72'
             id: BrickLineOverlayE
@@ -896,6 +920,12 @@ entities:
             3538: 10,-43
             3539: 9,-43
             3540: 8,-43
+        - node:
+            color: '#DE3A3A96'
+            id: BrickLineOverlayN
+          decals:
+            4616: 61,-42
+            4617: 62,-42
         - node:
             color: '#FA750096'
             id: BrickLineOverlayN
@@ -927,6 +957,12 @@ entities:
             1843: 50,-15
             1844: 51,-15
             1845: 54,-17
+        - node:
+            color: '#52B4E996'
+            id: BrickLineOverlayS
+          decals:
+            4490: 20,-16
+            4491: 21,-16
         - node:
             color: '#95FF6F72'
             id: BrickLineOverlayS
@@ -944,11 +980,6 @@ entities:
             534: 2,-7
             535: 8,-7
             537: 1,-7
-        - node:
-            color: '#9FED5896'
-            id: BrickLineOverlayS
-          decals:
-            2001: 39,-47
         - node:
             color: '#D381C926'
             id: BrickLineOverlayS
@@ -968,6 +999,12 @@ entities:
             938: 8,-74
             939: 9,-74
             940: 10,-74
+        - node:
+            color: '#DE3A3A96'
+            id: BrickLineOverlayS
+          decals:
+            4618: 55,-26
+            4619: 56,-26
         - node:
             color: '#EFB34196'
             id: BrickLineOverlayS
@@ -1025,11 +1062,6 @@ entities:
             503: -4,-6
             504: 6,2
             580: 4,-6
-        - node:
-            color: '#9FED5896'
-            id: BrickLineOverlayW
-          decals:
-            2000: 40,-48
         - node:
             color: '#A4610696'
             id: BrickLineOverlayW
@@ -1068,14 +1100,9 @@ entities:
             1429: -12,-38
             2904: -18,-26
             3512: 7,-42
-        - node:
-            zIndex: 2
-            color: '#FFFFFFFF'
-            id: BrickTileDarkCornerNe
-          decals:
-            381: 92,-44
-            382: 91,-43
-            383: 90,-42
+            4137: 92,-42
+            4138: 93,-43
+            4139: 94,-44
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerNw
@@ -1084,13 +1111,8 @@ entities:
             2903: -25,-26
             3508: 6,-42
             3892: -7,-27
-        - node:
-            zIndex: 2
-            color: '#FFFFFFFF'
-            id: BrickTileDarkCornerNw
-          decals:
-            361: 90,-49
-            362: 91,-48
+            4142: 92,-49
+            4143: 93,-48
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerSe
@@ -1099,47 +1121,31 @@ entities:
             2905: -18,-27
             3513: 7,-44
             3896: -4,-27
-        - node:
-            zIndex: 2
-            color: '#FFFFFFFF'
-            id: BrickTileDarkCornerSe
-          decals:
-            356: 90,-50
-            357: 91,-49
-            358: 92,-48
+            4134: 92,-50
+            4135: 93,-49
+            4136: 94,-48
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerSw
           decals:
             2902: -25,-27
             3509: 6,-44
+            4140: 93,-44
+            4141: 92,-43
         - node:
-            zIndex: 2
-            color: '#FFFFFFFF'
-            id: BrickTileDarkCornerSw
-          decals:
-            379: 90,-43
-            380: 91,-44
-        - node:
-            zIndex: 2
             color: '#FFFFFFFF'
             id: BrickTileDarkEndW
           decals:
-            391: 87,-50
-            392: 87,-42
+            4165: 89,-42
+            4166: 89,-50
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerNe
           decals:
             1435: -12,-39
             2208: 23,-55
-        - node:
-            zIndex: 2
-            color: '#FFFFFFFF'
-            id: BrickTileDarkInnerNe
-          decals:
-            389: 90,-43
-            390: 91,-44
+            4163: 92,-43
+            4164: 93,-44
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerNw
@@ -1148,15 +1154,10 @@ entities:
             1430: -3,-39
             2207: 25,-55
             3894: -6,-27
-        - node:
-            zIndex: 2
-            color: '#FFFFFFFF'
-            id: BrickTileDarkInnerNw
-          decals:
-            363: 90,-50
-            364: 91,-49
-            365: 92,-48
-            371: 92,-46
+            4153: 92,-50
+            4154: 93,-49
+            4155: 94,-48
+            4156: 94,-46
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerSe
@@ -1164,13 +1165,8 @@ entities:
             1432: -12,-33
             2209: 23,-53
             3893: -7,-27
-        - node:
-            zIndex: 2
-            color: '#FFFFFFFF'
-            id: BrickTileDarkInnerSe
-          decals:
-            368: 91,-48
-            369: 90,-49
+            4161: 92,-49
+            4162: 93,-48
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerSw
@@ -1178,15 +1174,10 @@ entities:
             758: -4,-34
             1431: -3,-33
             2210: 25,-53
-        - node:
-            zIndex: 2
-            color: '#FFFFFFFF'
-            id: BrickTileDarkInnerSw
-          decals:
-            370: 92,-46
-            386: 90,-42
-            387: 91,-43
-            388: 92,-44
+            4157: 93,-43
+            4158: 92,-42
+            4159: 94,-44
+            4160: 94,-46
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineE
@@ -1194,14 +1185,18 @@ entities:
             14: -4,-26
             2205: 23,-54
             3835: 10,-67
-        - node:
-            zIndex: 2
-            color: '#FFFFFFFF'
-            id: BrickTileDarkLineE
-          decals:
-            367: 92,-47
-            374: 92,-46
-            375: 92,-45
+            4146: 94,-45
+            4147: 94,-46
+            4148: 94,-47
+            4896: -35,-49
+            4897: -35,-43
+            4901: -35,-48
+            4902: -35,-44
+            4930: -48,-51
+            4931: -48,-50
+            4932: -48,-42
+            4933: -48,-41
+            4944: -13,-49
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineN
@@ -1242,17 +1237,11 @@ entities:
             3519: 13,-43
             3520: 14,-43
             3532: 15,-43
-        - node:
-            zIndex: 2
-            color: '#FFFFFFFF'
-            id: BrickTileDarkLineN
-          decals:
-            359: 88,-50
-            360: 89,-50
-            373: 91,-46
-            384: 89,-42
-            385: 88,-42
-            407: 87,-46
+            4132: 90,-50
+            4133: 91,-50
+            4150: 93,-46
+            4151: 90,-42
+            4152: 91,-42
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineS
@@ -1272,7 +1261,6 @@ entities:
             1423: -10,-33
             1424: -11,-33
             2206: 24,-53
-            2786: -29,-50
             2787: -28,-50
             2906: -24,-27
             2907: -23,-27
@@ -1297,17 +1285,12 @@ entities:
             3529: 8,-43
             3531: 15,-43
             3895: -6,-27
-        - node:
-            zIndex: 2
-            color: '#FFFFFFFF'
-            id: BrickTileDarkLineS
-          decals:
-            354: 88,-50
-            355: 89,-50
-            372: 91,-46
-            377: 88,-42
-            378: 89,-42
-            408: 87,-46
+            4128: 90,-42
+            4129: 91,-42
+            4130: 90,-50
+            4131: 91,-50
+            4149: 93,-46
+            4925: -29,-50
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineW
@@ -1332,13 +1315,12 @@ entities:
             3181: -4,-37
             3507: 6,-43
             3837: 23,-69
-        - node:
-            zIndex: 2
-            color: '#FFFFFFFF'
-            id: BrickTileDarkLineW
-          decals:
-            366: 92,-47
-            376: 92,-45
+            4144: 94,-47
+            4145: 94,-45
+            4926: -45,-41
+            4927: -45,-42
+            4928: -45,-50
+            4929: -45,-51
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelCornerNe
@@ -1393,7 +1375,6 @@ entities:
             1796: 53,-16
             1797: 52,-15
             1798: 55,-17
-            1999: 40,-47
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineE
@@ -1464,7 +1445,6 @@ entities:
             1778: 51,-20
             1779: 53,-20
             1780: 54,-20
-            1997: 39,-47
             2375: 10,-83
             2376: 9,-83
             2377: 11,-83
@@ -1489,7 +1469,6 @@ entities:
             1750: 41,-16
             1753: 55,-18
             1754: 55,-19
-            1998: 40,-48
             2120: -8,-2
             2121: -8,-4
             2488: 14,-87
@@ -1595,6 +1574,7 @@ entities:
             id: Caution
           decals:
             991: -26,-74
+            4516: 19,-26
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
@@ -1613,22 +1593,20 @@ entities:
             color: '#FFFFFFFF'
             id: Caution
           decals:
-            189: 18,-26
             1915: -26,-75
         - node:
-            color: '#00B6FF28'
+            color: '#334E6DC8'
             id: CheckerNESW
           decals:
-            430: 28,-24
+            4934: -41,-40
+            4935: -40,-40
         - node:
-            color: '#00E26A4E'
+            color: '#43995C96'
             id: CheckerNESW
           decals:
-            425: 27,-19
-            426: 28,-19
-            427: 29,-19
-            428: 30,-19
-            429: 31,-19
+            4380: 32,-18
+            4381: 31,-18
+            4382: 30,-18
         - node:
             color: '#52B4E996'
             id: CheckerNESW
@@ -1668,43 +1646,53 @@ entities:
             1621: 47,-23
             1622: 48,-23
             1623: 49,-23
-            1624: 53,-23
             1625: 54,-23
             1626: 55,-23
             1627: 56,-23
-            3269: 62,-47
-            3270: 62,-46
-            3271: 63,-46
-            3272: 63,-47
-            3273: 58,-39
-            3274: 58,-38
-            3275: 58,-37
-            3276: 58,-36
-            3277: 59,-36
-            3278: 59,-37
-            3279: 59,-38
-            3280: 59,-39
-            3362: 63,-33
-            3363: 63,-34
-            3364: 64,-35
-            3365: 64,-36
-            3366: 63,-37
-            3367: 63,-38
-            3368: 64,-39
-            3369: 64,-40
-            3370: 63,-41
-            3371: 63,-42
-            3442: 62,-49
-            3443: 63,-49
-            3448: 62,-45
-            3449: 63,-45
-            3450: 63,-48
-            3451: 62,-48
-            3460: 57,-32
-            3461: 57,-33
-            3462: 60,-32
-            3463: 60,-33
-            3495: 64,-43
+            4206: 50,-23
+            4210: 50,-32
+            4213: 50,-35
+            4229: 51,-35
+            4231: 52,-32
+            4283: 61,-39
+            4284: 61,-40
+            4285: 62,-40
+            4286: 62,-39
+            4287: 56,-28
+            4288: 55,-29
+            4289: 56,-29
+            4290: 55,-28
+            4291: 61,-41
+            4292: 62,-41
+            4293: 62,-38
+            4294: 61,-38
+            4295: 55,-30
+            4296: 56,-30
+            4297: 56,-27
+            4298: 55,-27
+            4325: 56,-34
+            4326: 56,-33
+            4327: 57,-33
+            4328: 57,-34
+            4329: 58,-33
+            4330: 58,-34
+            4331: 59,-34
+            4332: 59,-33
+            4637: 69,-41
+            4638: 70,-41
+            4639: 71,-41
+            4640: 71,-40
+            4641: 70,-40
+            4642: 69,-40
+            4733: 65,-39
+            4734: 65,-40
+            4735: 65,-41
+            4736: 65,-42
+            4738: 65,-44
+            4739: 65,-45
+            4740: 65,-46
+            4741: 65,-47
+            4744: 65,-43
         - node:
             color: '#EFB34196'
             id: CheckerNESW
@@ -1716,11 +1704,6 @@ entities:
             3875: 26,-70
             3876: 26,-71
             3878: 29,-70
-        - node:
-            color: '#00B6FF28'
-            id: CheckerNWSE
-          decals:
-            431: 28,-24
         - node:
             color: '#3E92D883'
             id: CheckerNWSE
@@ -1767,7 +1750,6 @@ entities:
             1968: 41,-43
             1969: 42,-43
             1970: 43,-47
-            1971: 40,-47
             1972: 40,-42
             1973: 43,-42
             1974: 43,-41
@@ -1787,12 +1769,12 @@ entities:
             1988: 39,-44
             1989: 39,-45
             1990: 39,-46
-            1991: 40,-48
             1992: 41,-48
             1993: 42,-48
             1994: 43,-48
-            1995: 39,-47
-            1996: 45,-44
+            4827: 40,-47
+            4828: 40,-48
+            4829: 39,-47
         - node:
             color: '#DE3A3A49'
             id: CheckerNWSE
@@ -1803,21 +1785,6 @@ entities:
             3804: 9,-50
             3805: 8,-49
             3806: 10,-49
-        - node:
-            color: '#DE3A3A96'
-            id: CheckerNWSE
-          decals:
-            3372: 64,-38
-            3373: 64,-37
-            3374: 63,-36
-            3375: 63,-35
-            3376: 64,-34
-            3377: 64,-33
-            3378: 63,-39
-            3379: 63,-40
-            3380: 64,-41
-            3381: 64,-42
-            3496: 63,-43
         - node:
             color: '#EFB34196'
             id: CheckerNWSE
@@ -1852,9 +1819,6 @@ entities:
             color: '#FFFFFFFF'
             id: Delivery
           decals:
-            5: -13,-54
-            6: -13,-53
-            7: -13,-52
             57: -25,-74
             58: -24,-74
             59: -23,-74
@@ -1881,12 +1845,15 @@ entities:
             988: -23,-75
             3319: 59,-15
             3320: 58,-15
+            4946: -13,-52
+            4947: -13,-53
+            4948: -13,-54
         - node:
             color: '#DE3A3AFF'
             id: DeliveryGreyscale
           decals:
-            3217: 60,-45
-            3384: 66,-41
+            4660: 59,-38
+            4753: 67,-44
         - node:
             color: '#00000056'
             id: DiagonalCheckerAOverlay
@@ -1989,26 +1956,16 @@ entities:
             color: '#FFFFFFFF'
             id: Dirt
           decals:
-            949: 58,-77
             950: 80,-68
-            951: 78,-62
             953: 74,-38
             954: 77,-40
             955: 76,-31
             956: 76,-27
             957: 76,-28
             958: 80,-29
-            959: 79,-28
             960: 80,-27
             961: 79,-34
-            962: 76,-33
-            1469: 57,-77
             1477: 28,-36
-            1480: 40,-38
-            1481: 41,-39
-            1482: 47,-36
-            1483: 48,-36
-            1484: 44,-33
             1498: -12,-80
             1499: -6,-73
             1506: 3,-77
@@ -2024,6 +1981,8 @@ entities:
             1934: 50,-16
             1935: 40,-16
             3408: 73,-28
+            4754: 67,-70
+            4755: 63,-62
         - node:
             cleanable: True
             color: '#000000FF'
@@ -2066,6 +2025,8 @@ entities:
             1936: 41,-32
             2122: -8,-7
             2403: 10,-84
+            4756: 67,-58
+            4850: 65,-69
         - node:
             cleanable: True
             color: '#000000FF'
@@ -2126,6 +2087,8 @@ entities:
             3405: 65,-22
             3406: 57,-16
             3407: 57,-18
+            4760: 78,-60
+            4851: 63,-66
         - node:
             cleanable: True
             color: '#000000FF'
@@ -2148,7 +2111,6 @@ entities:
             965: 59,-65
             1474: 44,-50
             1476: 41,-50
-            1485: 33,-24
             1487: 37,-13
             1488: 72,-28
             1494: 78,-33
@@ -2192,7 +2154,10 @@ entities:
             2415: 12,-84
             2417: 23,-82
             3054: 31,-99
-            3397: 61,-49
+            4758: 69,-70
+            4761: 73,-57
+            4853: 57,-73
+            4854: 55,-76
         - node:
             cleanable: True
             color: '#000000FF'
@@ -2209,7 +2174,6 @@ entities:
           decals:
             963: 57,-65
             1475: 39,-50
-            1486: 35,-17
             1497: 77,-50
             1524: -42,-29
             1552: 12,-14
@@ -2228,14 +2192,20 @@ entities:
             2418: 25,-83
             3051: 30,-90
             3052: 17,-92
-            3394: 63,-50
-            3395: 56,-50
-            3396: 59,-49
+            4757: 71,-66
+            4759: 78,-71
+            4763: 49,-17
+            4852: 61,-74
         - node:
             color: '#334E6DC8'
             id: FullTileOverlayGreyscale
           decals:
             3808: 9,-60
+        - node:
+            color: '#43995C96'
+            id: FullTileOverlayGreyscale
+          decals:
+            4385: 31,-17
         - node:
             color: '#9FED5896'
             id: FullTileOverlayGreyscale
@@ -2257,11 +2227,9 @@ entities:
             color: '#DE3A3A96'
             id: FullTileOverlayGreyscale
           decals:
-            3202: 66,-44
-            3452: 61,-42
-            3453: 61,-43
-            3454: 61,-44
-            3455: 66,-45
+            4336: 65,-49
+            4731: 63,-34
+            4732: 63,-35
         - node:
             color: '#EFB34196'
             id: FullTileOverlayGreyscale
@@ -2325,11 +2293,11 @@ entities:
             color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale
           decals:
-            3425: 59,-27
-            3426: 58,-27
-            3439: 58,-49
-            3440: 59,-49
-            3441: 60,-49
+            4565: 57,-42
+            4566: 58,-42
+            4567: 59,-42
+            4686: 59,-27
+            4726: 63,-33
         - node:
             color: '#EFB34196'
             id: HalfTileOverlayGreyscale
@@ -2362,6 +2330,12 @@ entities:
             2579: -20,-43
             2580: -19,-43
             2581: -18,-43
+        - node:
+            color: '#43995C96'
+            id: HalfTileOverlayGreyscale180
+          decals:
+            4386: 30,-21
+            4387: 31,-21
         - node:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale180
@@ -2370,16 +2344,23 @@ entities:
             1573: 14,-71
             1574: 13,-71
             3978: -40,-16
+            4408: 28,-25
+            4409: 29,-25
         - node:
             color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale180
           decals:
-            3203: 65,-44
-            3204: 67,-44
-            3423: 58,-30
-            3424: 59,-30
-            3429: 63,-30
-            3430: 64,-30
+            4337: 66,-49
+            4338: 64,-49
+            4685: 59,-30
+            4693: 63,-30
+            4694: 64,-30
+            4723: 63,-36
+        - node:
+            color: '#FA750096'
+            id: HalfTileOverlayGreyscale180
+          decals:
+            4510: 20,-25
         - node:
             color: '#00000067'
             id: HalfTileOverlayGreyscale270
@@ -2407,18 +2388,26 @@ entities:
             id: HalfTileOverlayGreyscale270
           decals:
             228: -5,0
+        - node:
+            color: '#43995C96'
+            id: HalfTileOverlayGreyscale270
+          decals:
+            4388: 29,-20
+            4389: 29,-19
         - node:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale270
           decals:
-            3566: 23,-23
-            3567: 23,-24
+            4579: 23,-23
+            4580: 23,-24
         - node:
             color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale270
           decals:
-            3421: 57,-28
-            3422: 57,-29
+            4683: 58,-29
+            4684: 58,-28
+            4724: 62,-34
+            4725: 62,-35
         - node:
             color: '#EFB34196'
             id: HalfTileOverlayGreyscale270
@@ -2430,13 +2419,6 @@ entities:
             id: HalfTileOverlayGreyscale270
           decals:
             229: -5,-6
-        - node:
-            color: '#00000026'
-            id: HalfTileOverlayGreyscale90
-          decals:
-            25: -44,-55
-            26: -44,-54
-            27: -44,-53
         - node:
             color: '#00000067'
             id: HalfTileOverlayGreyscale90
@@ -2457,11 +2439,16 @@ entities:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale90
           decals:
-            3568: 25,-23
-            3569: 25,-24
             3621: 10,-31
             3622: 10,-30
             3979: -38,-16
+        - node:
+            color: '#8C347F96'
+            id: HalfTileOverlayGreyscale90
+          decals:
+            4941: -13,-52
+            4942: -13,-53
+            4943: -13,-54
         - node:
             color: '#A4610696'
             id: HalfTileOverlayGreyscale90
@@ -2471,20 +2458,29 @@ entities:
             color: '#DE3A3A96'
             id: HalfTileOverlayGreyscale90
           decals:
-            3427: 60,-28
-            3428: 60,-29
+            4569: 62,-43
+            4570: 62,-44
+            4687: 60,-29
+            4688: 60,-28
+            4727: 64,-34
+            4728: 64,-35
         - node:
             color: '#EFB34196'
             id: HalfTileOverlayGreyscale90
           decals:
             3690: -28,-70
+        - node:
+            color: '#FA750096'
+            id: HalfTileOverlayGreyscale90
+          decals:
+            4509: 19,-26
         - node:
             angle: -1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
-            1565: 97,-58
-            1566: 97,-34
+            4125: 96,-58
+            4127: 96,-34
         - node:
             color: '#FFFFFFFF'
             id: LoadingArea
@@ -2541,6 +2537,46 @@ entities:
             id: LoadingAreaGreyscale
           decals:
             3903: -11,-70
+        - node:
+            angle: 1.5707963267948966 rad
+            color: '#00000019'
+            id: MarkupRectangle1x2
+          decals:
+            4962: -44,-55
+            4963: -44,-54
+            4964: -44,-53
+        - node:
+            color: '#0000003F'
+            id: MarkupRectangle1x2
+          decals:
+            4837: 51,-39
+            4842: 50,-39
+            4843: 52,-39
+        - node:
+            angle: 1.5707963267948966 rad
+            color: '#0000003F'
+            id: MarkupRectangle1x2
+          decals:
+            4838: 52,-38
+        - node:
+            angle: 3.141592653589793 rad
+            color: '#0000003F'
+            id: MarkupRectangle1x2
+          decals:
+            4839: 51,-37
+            4840: 50,-37
+            4841: 52,-37
+        - node:
+            angle: 4.71238898038469 rad
+            color: '#0000003F'
+            id: MarkupRectangle1x2
+          decals:
+            4844: 50,-38
+        - node:
+            color: '#0000003F'
+            id: MarkupSquare
+          decals:
+            4845: 49,-37
         - node:
             zIndex: 1
             color: '#5283FF37'
@@ -2574,6 +2610,29 @@ entities:
             2895: -19,-27
             2896: -18,-27
             2897: -18,-26
+        - node:
+            color: '#0000003F'
+            id: MarkupSquareQuater
+          decals:
+            4846: 52,-37
+        - node:
+            angle: 1.5707963267948966 rad
+            color: '#0000003F'
+            id: MarkupSquareQuater
+          decals:
+            4847: 52,-39
+        - node:
+            angle: 3.141592653589793 rad
+            color: '#0000003F'
+            id: MarkupSquareQuater
+          decals:
+            4848: 50,-39
+        - node:
+            angle: 4.71238898038469 rad
+            color: '#0000003F'
+            id: MarkupSquareQuater
+          decals:
+            4849: 50,-37
         - node:
             color: '#FF800066'
             id: MiniTileBoxOverlay
@@ -2657,7 +2716,6 @@ entities:
             161: -33,-38
             162: -33,-56
             200: 29,-73
-            215: 33,-75
             223: 40,-76
             638: 26,-50
             639: 27,-51
@@ -2666,15 +2724,14 @@ entities:
             647: 22,-57
             761: 35,-54
             764: 37,-54
-            1197: 46,-32
-            1199: 49,-34
-            1202: 51,-41
-            1219: 50,-36
             1246: -30,-36
             1247: -31,-35
             1263: -30,-54
             1264: -31,-53
             1296: -32,-50
+            4177: 34,-28
+            4201: 42,-50
+            4602: 33,-75
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkCornerNw
@@ -2688,22 +2745,21 @@ entities:
             627: 27,-56
             763: 36,-54
             767: 40,-53
-            793: 42,-50
             1250: -34,-36
             1251: -33,-35
             1258: -33,-53
             1260: -34,-54
             1285: -40,-42
+            4174: 28,-28
+            4601: 35,-76
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkCornerSe
           decals:
-            98: 34,-29
             136: -53,-47
             158: -33,-36
             164: -33,-54
             224: 40,-77
-            621: 27,-30
             628: 26,-58
             629: 27,-57
             630: 28,-56
@@ -2712,13 +2768,13 @@ entities:
             762: 36,-55
             766: 40,-55
             768: 42,-53
-            794: 43,-50
             1248: -30,-38
             1249: -31,-39
             1261: -31,-57
             1262: -30,-56
             1270: -32,-42
             3726: -32,-59
+            4176: 34,-30
         - node:
             color: '#C8C8FFFF'
             id: MiniTileDarkCornerSw
@@ -2739,26 +2795,26 @@ entities:
             637: 27,-52
             765: 37,-55
             769: 35,-55
-            1195: 44,-32
-            1198: 46,-34
-            1200: 49,-36
-            1201: 50,-41
             1244: -33,-39
             1245: -34,-38
             1257: -34,-56
             1259: -33,-57
-            1288: -40,-50
+            4175: 28,-30
+            4202: 41,-50
+            4868: -40,-50
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkEndN
           decals:
             157: -31,-21
             3867: -35,-58
+            4205: 41,-49
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkEndS
           decals:
             156: -31,-22
+            4961: 37,-78
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkEndW
@@ -2768,10 +2824,7 @@ entities:
             color: '#FFFFFFFF'
             id: MiniTileDarkInnerNe
           decals:
-            105: 35,-28
-            112: 46,-46
             201: 29,-75
-            216: 33,-76
             641: 27,-52
             642: 26,-51
             643: 21,-57
@@ -2783,18 +2836,18 @@ entities:
             1167: -34,-56
             1174: -33,-39
             1175: -34,-38
-            1213: 50,-41
-            1224: 46,-34
-            1225: 49,-36
-            1226: 44,-32
             1256: -31,-36
             1265: -31,-54
-            1305: -40,-50
             2761: 22,-77
             2773: 7,-66
             2784: -31,-52
             2840: -23,-55
             3868: -35,-59
+            4191: 34,-29
+            4198: 44,-39
+            4204: 41,-50
+            4607: 33,-77
+            4879: -40,-50
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkInnerNw
@@ -2808,7 +2861,6 @@ entities:
             780: 40,-55
             786: 36,-55
             788: 42,-53
-            796: 43,-50
             1170: -31,-57
             1171: -30,-56
             1172: -31,-39
@@ -2821,14 +2873,12 @@ entities:
             2774: 10,-66
             2839: -20,-55
             3729: -32,-59
+            4518: 7,-56
+            4606: 35,-77
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkInnerSe
           decals:
-            102: 35,-26
-            104: 34,-27
-            111: 46,-44
-            622: 27,-29
             680: 20,-52
             681: 21,-51
             682: 22,-50
@@ -2836,7 +2886,6 @@ entities:
             684: 27,-56
             783: 36,-54
             785: 40,-53
-            795: 42,-50
             1168: -34,-54
             1169: -33,-53
             1176: -34,-36
@@ -2848,6 +2897,9 @@ entities:
             2783: -31,-40
             2841: -23,-53
             3728: -34,-59
+            4190: 34,-29
+            4517: 5,-52
+            4960: 37,-77
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkInnerSw
@@ -2866,20 +2918,16 @@ entities:
             1166: -30,-54
             1178: -31,-35
             1179: -30,-36
-            1212: 51,-41
-            1218: 50,-36
-            1232: 49,-34
-            1233: 46,-32
             1253: -33,-38
             1268: -33,-56
             1297: -32,-50
             2842: -20,-53
+            4203: 42,-50
+            4959: 37,-77
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkLineE
           decals:
-            99: 34,-28
-            108: 46,-45
             122: -12,-12
             123: -12,-13
             124: -12,-14
@@ -2908,16 +2956,6 @@ entities:
             1183: -32,-40
             1184: -32,-35
             1185: -32,-34
-            1204: 51,-44
-            1205: 51,-43
-            1206: 51,-42
-            1214: 50,-40
-            1215: 50,-37
-            1228: 46,-33
-            1229: 49,-35
-            1236: 50,-39
-            1237: 50,-38
-            1239: 44,-31
             1252: -30,-37
             1269: -30,-55
             1306: -40,-49
@@ -2945,9 +2983,15 @@ entities:
             2844: 14,-13
             2863: 25,-45
             2864: 25,-44
-            3015: 44,-30
-            3016: 44,-29
             3681: -8,-18
+            4194: 44,-37
+            4195: 44,-38
+            4421: 32,-23
+            4422: 32,-24
+            4423: 32,-25
+            4603: 33,-76
+            4635: 66,-48
+            4771: -17,-38
         - node:
             color: '#C8C8FFFF'
             id: MiniTileDarkLineN
@@ -2957,20 +3001,6 @@ entities:
             color: '#FFFFFFFF'
             id: MiniTileDarkLineN
           decals:
-            81: 23,-27
-            82: 25,-27
-            84: 24,-27
-            85: 27,-27
-            86: 28,-27
-            87: 29,-27
-            88: 30,-27
-            89: 32,-27
-            90: 31,-27
-            91: 33,-27
-            100: 34,-27
-            101: 35,-27
-            106: 48,-46
-            107: 47,-46
             113: 23,-73
             114: 24,-73
             115: 25,-73
@@ -2985,7 +3015,6 @@ entities:
             203: 30,-75
             204: 31,-75
             214: 32,-75
-            217: 35,-76
             218: 36,-76
             219: 34,-76
             220: 37,-76
@@ -3010,11 +3039,6 @@ entities:
             1188: -34,-37
             1189: -35,-37
             1190: -36,-37
-            1207: 52,-46
-            1208: 51,-46
-            1222: 48,-34
-            1223: 47,-34
-            1227: 45,-32
             1278: -33,-42
             1279: -34,-42
             1280: -35,-42
@@ -3024,11 +3048,6 @@ entities:
             1284: -39,-42
             1298: -33,-50
             1299: -34,-50
-            1300: -35,-50
-            1301: -36,-50
-            1302: -37,-50
-            1303: -38,-50
-            1304: -39,-50
             2213: 26,-54
             2214: 27,-54
             2541: -21,-34
@@ -3072,12 +3091,30 @@ entities:
             2867: 28,-49
             2868: 29,-49
             2955: 34,-38
-            2958: 22,-27
-            2961: 26,-27
             3724: -34,-59
             3725: -33,-59
             3730: -35,-61
             3731: -34,-61
+            4178: 29,-28
+            4179: 30,-28
+            4180: 31,-28
+            4181: 32,-28
+            4182: 33,-28
+            4193: 35,-29
+            4200: 45,-39
+            4353: 23,-28
+            4354: 24,-28
+            4355: 25,-28
+            4383: 35,-18
+            4590: 25,-18
+            4591: 26,-18
+            4592: 27,-18
+            4604: 34,-77
+            4869: -39,-50
+            4870: -38,-50
+            4871: -37,-50
+            4872: -36,-50
+            4873: -35,-50
         - node:
             color: '#C8C8FFFF'
             id: MiniTileDarkLineS
@@ -3088,15 +3125,6 @@ entities:
             color: '#FFFFFFFF'
             id: MiniTileDarkLineS
           decals:
-            92: 28,-29
-            93: 29,-29
-            94: 30,-29
-            95: 31,-29
-            96: 32,-29
-            97: 33,-29
-            103: 35,-27
-            109: 47,-44
-            110: 48,-44
             133: -55,-47
             134: -54,-47
             137: -52,-45
@@ -3106,11 +3134,7 @@ entities:
             205: 31,-77
             206: 32,-77
             207: 33,-77
-            208: 34,-77
-            209: 35,-77
             210: 36,-77
-            211: 37,-77
-            212: 38,-77
             213: 39,-77
             617: 23,-30
             618: 24,-30
@@ -3133,11 +3157,6 @@ entities:
             1191: -34,-37
             1192: -35,-37
             1193: -36,-37
-            1196: 45,-32
-            1203: 52,-44
-            1220: 47,-34
-            1221: 48,-34
-            1238: 44,-25
             1271: -33,-42
             1272: -34,-42
             1273: -35,-42
@@ -3145,11 +3164,6 @@ entities:
             1275: -37,-42
             1276: -38,-42
             1277: -39,-42
-            1289: -39,-50
-            1290: -38,-50
-            1291: -37,-50
-            1292: -36,-50
-            1293: -35,-50
             1294: -34,-50
             1295: -33,-50
             1599: -23,-19
@@ -3196,6 +3210,24 @@ entities:
             2959: 25,-30
             2960: 26,-30
             3727: -33,-59
+            4183: 29,-30
+            4184: 30,-30
+            4185: 31,-30
+            4186: 32,-30
+            4187: 33,-30
+            4192: 35,-29
+            4587: 25,-16
+            4588: 26,-16
+            4589: 27,-16
+            4600: 35,-77
+            4605: 34,-77
+            4636: 72,-45
+            4874: -35,-50
+            4875: -36,-50
+            4876: -37,-50
+            4877: -38,-50
+            4878: -39,-50
+            4958: 38,-77
         - node:
             color: '#C8C8FFFF'
             id: MiniTileDarkLineW
@@ -3236,19 +3268,8 @@ entities:
             1186: -32,-35
             1187: -32,-34
             1194: -30,-37
-            1209: 51,-44
-            1210: 51,-43
-            1211: 51,-42
-            1216: 50,-40
-            1217: 50,-37
-            1230: 49,-35
-            1231: 46,-33
-            1234: 50,-39
-            1235: 50,-38
-            1240: 44,-31
             1286: -40,-43
             1287: -40,-49
-            1913: 23,-33
             2702: 7,-37
             2703: 7,-36
             2704: 7,-35
@@ -3276,10 +3297,12 @@ entities:
             2880: -9,-12
             2921: -27,-56
             2922: -27,-58
-            3017: 44,-30
-            3018: 44,-29
             3682: -7,-18
             3866: -35,-59
+            4188: 28,-29
+            4424: 34,-23
+            4425: 34,-24
+            4426: 34,-25
         - node:
             color: '#00000054'
             id: MiniTileDiagonalCheckerAOverlay
@@ -3307,6 +3330,12 @@ entities:
             id: MiniTileEndOverlayW
           decals:
             3677: -8,-18
+        - node:
+            color: '#334E6DC8'
+            id: MiniTileInnerOverlayNE
+          decals:
+            4906: -35,-50
+            4907: -35,-42
         - node:
             color: '#52B4E996'
             id: MiniTileInnerOverlayNE
@@ -3330,7 +3359,7 @@ entities:
             color: '#DE3A3A96'
             id: MiniTileInnerOverlayNE
           decals:
-            3201: 69,-47
+            4750: 69,-53
         - node:
             color: '#EFB34196'
             id: MiniTileInnerOverlayNE
@@ -3382,16 +3411,17 @@ entities:
             id: MiniTileInnerOverlayNW
           decals:
             3685: -7,-18
-        - node:
-            color: '#DE3A3A96'
-            id: MiniTileInnerOverlayNW
-          decals:
-            3210: 58,-43
         - node:
             color: '#FF940093'
             id: MiniTileInnerOverlayNW
           decals:
             1875: 55,-20
+        - node:
+            color: '#334E6DC8'
+            id: MiniTileInnerOverlaySE
+          decals:
+            4905: -35,-50
+            4908: -35,-42
         - node:
             color: '#52B4E996'
             id: MiniTileInnerOverlaySE
@@ -3415,6 +3445,12 @@ entities:
             id: MiniTileInnerOverlaySE
           decals:
             3683: -8,-18
+        - node:
+            color: '#DE3A3A96'
+            id: MiniTileInnerOverlaySE
+          decals:
+            4659: 54,-39
+            4749: 69,-51
         - node:
             color: '#EFB34196'
             id: MiniTileInnerOverlaySE
@@ -3448,11 +3484,6 @@ entities:
           decals:
             554: -3,-7
             556: 3,-7
-        - node:
-            color: '#9FED5896'
-            id: MiniTileInnerOverlaySW
-          decals:
-            2002: 40,-47
         - node:
             color: '#A4610696'
             id: MiniTileInnerOverlaySW
@@ -3468,6 +3499,11 @@ entities:
             id: MiniTileInnerOverlaySW
           decals:
             3684: -7,-18
+        - node:
+            color: '#DE3A3A96'
+            id: MiniTileInnerOverlaySW
+          decals:
+            4658: 56,-39
         - node:
             color: '#EFB34196'
             id: MiniTileInnerOverlaySW
@@ -3496,7 +3532,8 @@ entities:
             color: '#DE3A3A96'
             id: MiniTileLineOverlayE
           decals:
-            3198: 69,-46
+            4623: 69,-52
+            4657: 54,-40
         - node:
             color: '#EFB34196'
             id: MiniTileLineOverlayE
@@ -3520,6 +3557,19 @@ entities:
           decals:
             255: 22,-92
             256: 26,-92
+        - node:
+            color: '#334E6DC8'
+            id: MiniTileLineOverlayN
+          decals:
+            4884: -34,-45
+            4885: -35,-45
+            4886: -36,-45
+            4887: -37,-45
+        - node:
+            color: '#43995C96'
+            id: MiniTileLineOverlayN
+          decals:
+            4384: 35,-18
         - node:
             color: '#52B4E996'
             id: MiniTileLineOverlayN
@@ -3532,10 +3582,9 @@ entities:
             id: MiniTileLineOverlayN
           decals:
             1442: -27,-12
-            1452: 51,-24
             3399: 66,-24
-            3401: 53,-50
             3411: 4,-35
+            4209: 52,-24
         - node:
             color: '#D10000A3'
             id: MiniTileLineOverlayN
@@ -3551,9 +3600,8 @@ entities:
             color: '#DE3A3A96'
             id: MiniTileLineOverlayN
           decals:
-            3199: 70,-47
-            3200: 71,-47
-            3209: 57,-43
+            4751: 70,-53
+            4752: 71,-53
         - node:
             color: '#00000056'
             id: MiniTileLineOverlayS
@@ -3566,6 +3614,10 @@ entities:
             id: MiniTileLineOverlayS
           decals:
             3809: 11,-55
+            4880: -35,-47
+            4881: -36,-47
+            4882: -37,-47
+            4883: -34,-47
         - node:
             color: '#3C44AA33'
             id: MiniTileLineOverlayS
@@ -3589,6 +3641,12 @@ entities:
             id: MiniTileLineOverlayS
           decals:
             2229: -5,-20
+        - node:
+            color: '#DE3A3A96'
+            id: MiniTileLineOverlayS
+          decals:
+            4621: 65,-49
+            4656: 55,-39
         - node:
             color: '#EFB34196'
             id: MiniTileLineOverlayS
@@ -3611,8 +3669,9 @@ entities:
             1440: -35,-57
             1454: -15,-35
             1912: 8,-71
-            1914: 23,-33
             4109: 17,-93
+            4586: 25,-20
+            4957: 23,-32
         - node:
             color: '#D381C926'
             id: MiniTileLineOverlayW
@@ -3623,7 +3682,7 @@ entities:
             color: '#DE3A3A96'
             id: MiniTileLineOverlayW
           decals:
-            3208: 58,-42
+            4655: 56,-40
         - node:
             color: '#FF800066'
             id: MiniTileLineOverlayW
@@ -3643,7 +3702,7 @@ entities:
             1115: -28,-67
             1885: 43,-19
             1886: 46,-19
-            3197: 69,-47
+            4746: 69,-53
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelInnerNw
@@ -3651,7 +3710,6 @@ entities:
             1883: 46,-19
             1884: 49,-19
             3042: 18,-102
-            3207: 58,-43
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelInnerSe
@@ -3661,6 +3719,8 @@ entities:
             1145: -18,-57
             1888: 46,-17
             3814: 15,-85
+            4654: 54,-39
+            4745: 69,-51
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelInnerSw
@@ -3671,6 +3731,7 @@ entities:
             2967: 19,-19
             3041: 18,-98
             3815: 14,-85
+            4653: 56,-39
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelLineE
@@ -3679,8 +3740,10 @@ entities:
             1443: 29,-51
             1597: 7,-17
             1882: 46,-18
-            3196: 69,-46
-            3502: 68,-43
+            4342: 66,-40
+            4343: 66,-41
+            4622: 69,-52
+            4652: 54,-40
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelLineN
@@ -3690,20 +3753,23 @@ entities:
             253: 19,-92
             254: 28,-92
             1441: -27,-12
-            1451: 51,-24
             1877: 44,-19
             1878: 45,-19
             1879: 47,-19
             1880: 48,-19
-            3194: 70,-47
-            3195: 71,-47
-            3205: 57,-43
             3398: 66,-24
-            3400: 53,-50
             3410: 4,-35
             3623: 14,-35
             3624: 15,-35
             3625: 16,-35
+            4208: 52,-24
+            4344: 71,-45
+            4347: 58,-32
+            4348: 59,-32
+            4349: 63,-32
+            4350: 64,-32
+            4747: 70,-53
+            4748: 71,-53
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelLineS
@@ -3722,6 +3788,10 @@ entities:
             2964: 18,-19
             3040: 17,-98
             3807: 11,-55
+            4351: 55,-35
+            4352: 52,-35
+            4620: 65,-49
+            4651: 55,-39
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelLineW
@@ -3735,13 +3805,11 @@ entities:
             3037: 18,-101
             3038: 18,-100
             3039: 18,-99
-            3206: 58,-42
-            3497: 62,-39
-            3498: 62,-38
-            3501: 62,-42
-            3503: 62,-43
-            3504: 62,-44
             4108: 17,-93
+            4346: 61,-37
+            4585: 25,-20
+            4650: 56,-40
+            4956: 23,-32
         - node:
             color: '#1488C2FF'
             id: MiniTileWhiteInnerNe
@@ -3777,11 +3845,21 @@ entities:
             id: MiniTileWhiteInnerSe
           decals:
             600: -1,-52
+        - node:
+            color: '#48AC56FF'
+            id: MiniTileWhiteInnerSe
+          decals:
+            4834: 38,-47
         - node:
             color: '#DE8000FF'
             id: MiniTileWhiteInnerSe
           decals:
             593: -1,-57
+        - node:
+            color: '#48AC56FF'
+            id: MiniTileWhiteInnerSw
+          decals:
+            4833: 40,-47
         - node:
             color: '#DE8000FF'
             id: MiniTileWhiteInnerSw
@@ -3822,6 +3900,11 @@ entities:
             id: MiniTileWhiteLineN
           decals:
             612: 15,-67
+        - node:
+            color: '#48AC56FF'
+            id: MiniTileWhiteLineS
+          decals:
+            4832: 39,-47
         - node:
             color: '#DE8000FF'
             id: MiniTileWhiteLineS
@@ -3852,11 +3935,17 @@ entities:
             id: MiniTileWhiteLineW
           decals:
             611: 16,-66
+            4831: 40,-48
         - node:
             color: '#DE8000FF'
             id: MiniTileWhiteLineW
           decals:
             591: 1,-58
+        - node:
+            color: '#334E6DC8'
+            id: MonoOverlay
+          decals:
+            4894: -34,-43
         - node:
             color: '#D381C971'
             id: MonoOverlay
@@ -3888,8 +3977,8 @@ entities:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale
           decals:
-            3261: 58,-52
-            3262: 59,-52
+            4559: 58,-44
+            4560: 59,-44
         - node:
             color: '#EFB34196'
             id: QuarterTileOverlayGreyscale
@@ -3910,18 +3999,12 @@ entities:
             52: -23,-52
             53: -23,-53
             54: -23,-50
-        - node:
-            color: '#00B6FF28'
-            id: QuarterTileOverlayGreyscale180
-          decals:
-            432: 27,-24
         - node:
             color: '#52B4E996'
             id: QuarterTileOverlayGreyscale180
           decals:
-            3003: 21,-24
-            3004: 20,-24
-            3005: 19,-24
+            4405: 21,-24
+            4406: 20,-24
         - node:
             color: '#A4610696'
             id: QuarterTileOverlayGreyscale180
@@ -3932,18 +4015,17 @@ entities:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale180
           decals:
-            3265: 62,-52
-            3266: 62,-53
+            4564: 62,-45
+        - node:
+            color: '#FA750096'
+            id: QuarterTileOverlayGreyscale180
+          decals:
+            4512: 19,-25
         - node:
             color: '#00000067'
             id: QuarterTileOverlayGreyscale270
           decals:
             2588: -23,-40
-        - node:
-            color: '#00B6FF28'
-            id: QuarterTileOverlayGreyscale270
-          decals:
-            433: 29,-24
         - node:
             color: '#52B4E996'
             id: QuarterTileOverlayGreyscale270
@@ -3959,8 +4041,8 @@ entities:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale270
           decals:
-            3259: 57,-53
-            3260: 57,-52
+            4557: 57,-45
+            4558: 57,-44
         - node:
             color: '#52B4E996'
             id: QuarterTileOverlayGreyscale90
@@ -3973,9 +4055,9 @@ entities:
             1069: 15,-20
             1070: 14,-20
             1071: 13,-20
-            3000: 21,-23
-            3001: 20,-23
-            3002: 19,-23
+            4398: 19,-23
+            4401: 20,-23
+            4402: 21,-23
         - node:
             color: '#A4610696'
             id: QuarterTileOverlayGreyscale90
@@ -3985,8 +4067,8 @@ entities:
             color: '#DE3A3A96'
             id: QuarterTileOverlayGreyscale90
           decals:
-            3263: 60,-52
-            3264: 61,-52
+            4561: 60,-44
+            4562: 61,-44
         - node:
             color: '#EFB34196'
             id: QuarterTileOverlayGreyscale90
@@ -4025,8 +4107,8 @@ entities:
             2422: 23,-81
             2423: 24,-81
             2424: 25,-81
-            3257: 59,-53
-            3258: 60,-53
+            4555: 59,-45
+            4556: 60,-45
         - node:
             color: '#00000067'
             id: ThreeQuarterTileOverlayGreyscale
@@ -4042,7 +4124,8 @@ entities:
             color: '#DE3A3A96'
             id: ThreeQuarterTileOverlayGreyscale
           decals:
-            3420: 57,-27
+            4692: 58,-27
+            4720: 62,-33
         - node:
             color: '#00000067'
             id: ThreeQuarterTileOverlayGreyscale180
@@ -4058,7 +4141,8 @@ entities:
             color: '#DE3A3A96'
             id: ThreeQuarterTileOverlayGreyscale180
           decals:
-            3417: 60,-30
+            4689: 60,-30
+            4722: 64,-36
         - node:
             color: '#00000067'
             id: ThreeQuarterTileOverlayGreyscale270
@@ -4076,7 +4160,8 @@ entities:
             color: '#DE3A3A96'
             id: ThreeQuarterTileOverlayGreyscale270
           decals:
-            3419: 57,-30
+            4690: 58,-30
+            4719: 62,-36
         - node:
             color: '#52B4E996'
             id: ThreeQuarterTileOverlayGreyscale90
@@ -4087,7 +4172,8 @@ entities:
             color: '#DE3A3A96'
             id: ThreeQuarterTileOverlayGreyscale90
           decals:
-            3418: 60,-27
+            4691: 60,-27
+            4721: 64,-33
         - node:
             color: '#FFFFFFFF'
             id: WarnBox
@@ -4095,8 +4181,9 @@ entities:
             584: 17,-66
             586: 0,-58
             587: 0,-53
-            601: 19,-26
             608: 15,-66
+            4356: 20,-26
+            4835: 39,-48
         - node:
             color: '#41AC28FF'
             id: WarnBoxGreyscale
@@ -4107,16 +4194,17 @@ entities:
             id: WarnBoxGreyscale
           decals:
             609: 15,-66
+            4836: 39,-48
         - node:
             color: '#70D7FFFF'
             id: WarnBoxGreyscale
           decals:
             585: 17,-66
         - node:
-            color: '#FF8B00FF'
+            color: '#FA7500FF'
             id: WarnBoxGreyscale
           decals:
-            602: 19,-26
+            4357: 20,-26
         - node:
             color: '#FF9C00FF'
             id: WarnBoxGreyscale
@@ -4137,8 +4225,8 @@ entities:
             color: '#DE3A3AFF'
             id: WarnCornerSmallGreyscaleNE
           decals:
-            3216: 60,-46
-            3288: 65,-35
+            4666: 59,-39
+            4702: 65,-36
         - node:
             color: '#D381C9FF'
             id: WarnCornerSmallGreyscaleNW
@@ -4157,9 +4245,9 @@ entities:
             color: '#DE3A3AFF'
             id: WarnCornerSmallGreyscaleSE
           decals:
-            3215: 60,-44
-            3256: 57,-52
-            3287: 65,-32
+            4553: 57,-44
+            4665: 59,-37
+            4701: 65,-33
         - node:
             color: '#D381C9FF'
             id: WarnCornerSmallGreyscaleSW
@@ -4170,7 +4258,7 @@ entities:
             color: '#DE3A3AFF'
             id: WarnCornerSmallGreyscaleSW
           decals:
-            3255: 62,-52
+            4572: 62,-44
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallNE
@@ -4179,10 +4267,10 @@ entities:
             2241: 22,-12
             3013: 16,-44
             3122: -18,-24
-            3213: 60,-46
-            3283: 65,-35
             3472: -18,-20
             4098: 45,-72
+            4663: 59,-39
+            4698: 65,-36
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallNW
@@ -4199,15 +4287,15 @@ entities:
           decals:
             247: 26,-83
             1130: -26,-64
-            3006: 18,-25
             3014: 16,-42
             3092: -18,-22
             3117: -10,-22
-            3212: 60,-44
-            3234: 57,-52
-            3284: 65,-32
             3471: -18,-17
             4099: 45,-68
+            4515: 19,-25
+            4540: 57,-44
+            4662: 59,-37
+            4697: 65,-33
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallSW
@@ -4217,39 +4305,39 @@ entities:
             3011: 18,-42
             3091: -18,-22
             3113: -8,-22
-            3233: 62,-52
             4101: 47,-68
+            4571: 62,-44
         - node:
             color: '#FFFFFFFF'
             id: WarnEndE
           decals:
-            3222: 61,-53
+            4528: 61,-45
         - node:
             color: '#DE3A3AFF'
             id: WarnEndGreyscaleE
           decals:
-            3254: 61,-53
+            4548: 61,-45
         - node:
             color: '#DE3A3AFF'
             id: WarnEndGreyscaleW
           decals:
-            3253: 58,-53
+            4547: 58,-45
         - node:
             color: '#FFFFFFFF'
             id: WarnEndW
           decals:
-            3221: 58,-53
+            4527: 58,-45
         - node:
             color: '#FFFFFFFF'
             id: WarnFull
           decals:
             3159: -11,-36
-            3962: 80,-46
+            4765: 82,-46
         - node:
             color: '#D381C9FF'
             id: WarnFullGreyscale
           decals:
-            3963: 80,-46
+            4768: 82,-46
         - node:
             color: '#FFFFFFFF'
             id: WarnLineE
@@ -4263,7 +4351,6 @@ entities:
             183: -56,-30
             184: -56,-29
             185: -56,-28
-            186: 18,-26
             233: -17,-68
             234: -17,-67
             235: -17,-66
@@ -4271,22 +4358,14 @@ entities:
             246: 26,-84
             1124: -26,-65
             1560: 20,-64
-            2242: 80,-47
-            2244: 80,-45
             2529: -56,-64
             2530: -56,-63
             2531: -56,-62
             3090: -18,-23
-            3219: 60,-45
-            3232: 57,-53
-            3281: 65,-33
-            3282: 65,-34
             3315: 56,-20
             3323: 66,-22
             3324: 66,-20
             3325: 66,-21
-            3340: 61,-70
-            3341: 61,-69
             3468: -18,-19
             3469: -18,-18
             3554: 16,-43
@@ -4295,6 +4374,17 @@ entities:
             4090: 45,-71
             4091: 45,-70
             4092: 45,-69
+            4167: 76,-65
+            4168: 76,-66
+            4169: 76,-64
+            4513: 19,-26
+            4538: 57,-45
+            4661: 59,-38
+            4695: 65,-35
+            4696: 65,-34
+            4764: 76,-44
+            4766: 82,-45
+            4767: 82,-47
         - node:
             color: '#33A9E7FF'
             id: WarnLineGreyscaleE
@@ -4305,19 +4395,19 @@ entities:
             color: '#D381C9FF'
             id: WarnLineGreyscaleE
           decals:
-            2245: 80,-47
-            2247: 80,-45
             3106: -18,-23
             3475: -18,-19
             3476: -18,-18
+            4769: 82,-45
+            4770: 82,-47
         - node:
             color: '#DE3A3AFF'
             id: WarnLineGreyscaleE
           decals:
-            3220: 60,-45
-            3251: 57,-53
-            3285: 65,-34
-            3286: 65,-33
+            4546: 57,-45
+            4664: 59,-38
+            4699: 65,-35
+            4700: 65,-34
         - node:
             color: '#70FFB3FF'
             id: WarnLineGreyscaleN
@@ -4337,15 +4427,12 @@ entities:
             color: '#DE3A3AFF'
             id: WarnLineGreyscaleN
           decals:
-            3239: 58,-54
-            3240: 59,-54
-            3241: 60,-54
-            3242: 61,-54
-            3243: 59,-53
-            3244: 60,-53
             4119: 58,-22
             4120: 59,-22
             4121: 61,-22
+            4239: 51,-32
+            4551: 59,-45
+            4552: 60,-45
         - node:
             color: '#70FFB3FF'
             id: WarnLineGreyscaleS
@@ -4383,15 +4470,15 @@ entities:
             1640: 54,-21
             1641: 55,-21
             1642: 56,-21
-            3245: 59,-53
-            3246: 60,-53
-            3247: 58,-52
-            3248: 59,-52
-            3249: 60,-52
-            3250: 61,-52
             4122: 58,-22
             4123: 59,-22
             4124: 61,-22
+            4542: 61,-44
+            4543: 60,-44
+            4544: 59,-44
+            4545: 58,-44
+            4549: 59,-45
+            4550: 60,-45
         - node:
             color: '#D381C9FF'
             id: WarnLineGreyscaleW
@@ -4402,7 +4489,7 @@ entities:
             color: '#DE3A3AFF'
             id: WarnLineGreyscaleW
           decals:
-            3252: 62,-53
+            4541: 62,-45
         - node:
             color: '#FFFFFFFF'
             id: WarnLineN
@@ -4447,13 +4534,6 @@ entities:
             3087: -17,-22
             3088: -16,-22
             3111: -9,-22
-            3223: 60,-53
-            3224: 59,-53
-            3227: 58,-52
-            3228: 59,-52
-            3229: 60,-52
-            3230: 61,-52
-            3346: 60,-66
             3470: -17,-17
             3908: -28,-71
             3909: -29,-71
@@ -4465,6 +4545,15 @@ entities:
             4112: 59,-22
             4113: 58,-22
             4114: 61,-22
+            4172: 74,-61
+            4173: 75,-61
+            4514: 20,-25
+            4531: 59,-45
+            4532: 60,-45
+            4534: 61,-44
+            4535: 60,-44
+            4536: 59,-44
+            4537: 58,-44
         - node:
             color: '#FFFFFFFF'
             id: WarnLineS
@@ -4480,13 +4569,13 @@ entities:
             3089: -18,-23
             3112: -8,-23
             3160: -10,-36
-            3231: 62,-53
             3316: 58,-20
             3901: -31,-71
             3906: -13,-70
             4093: 47,-69
             4094: 47,-70
             4095: 47,-71
+            4533: 62,-45
         - node:
             color: '#FFFFFFFF'
             id: WarnLineW
@@ -4500,13 +4589,6 @@ entities:
             2337: 10,-83
             2366: 12,-83
             3007: 17,-44
-            3225: 59,-53
-            3226: 60,-53
-            3235: 58,-54
-            3236: 59,-54
-            3237: 60,-54
-            3238: 61,-54
-            3347: 60,-68
             3465: -18,-17
             3466: -17,-17
             3467: -17,-20
@@ -4514,6 +4596,13 @@ entities:
             4110: 61,-22
             4111: 59,-22
             4115: 58,-22
+            4170: 75,-63
+            4171: 74,-63
+            4529: 59,-45
+            4530: 60,-45
+            4806: 49,-98
+            4807: 50,-98
+            4808: 51,-98
         - node:
             angle: 4.71238898038469 rad
             color: '#FFFFFFFF'
@@ -4524,12 +4613,23 @@ entities:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerNw
           decals:
-            3192: 71,-53
+            4625: 72,-49
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinInnerNw
           decals:
             313: 31,-40
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinInnerSe
+          decals:
+            4634: 71,-48
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineE
+          decals:
+            4630: 71,-49
+            4631: 71,-50
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineN
@@ -4538,14 +4638,20 @@ entities:
             309: 29,-40
             310: 30,-40
             314: 27,-40
-            3193: 72,-53
+            4626: 73,-49
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineS
+          decals:
+            4632: 73,-48
+            4633: 72,-48
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineW
           decals:
             311: 31,-39
             312: 31,-38
-            3191: 71,-54
+            4627: 72,-50
         - node:
             cleanable: True
             color: '#008CE9FF'
@@ -4583,6 +4689,8 @@ entities:
             3494: 53,-67
             4102: 45,-71
             4106: 47,-72
+            4951: -37,-80
+            4952: -37,-81
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -4591,6 +4699,7 @@ entities:
             4071: 51,-67
             4084: 48,-71
             4105: 47,-71
+            4950: -37,-79
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -4608,6 +4717,8 @@ entities:
             4070: 50,-67
             4073: 44,-71
             4103: 46,-72
+            4949: -38,-80
+            4955: -36,-81
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -4615,12 +4726,8 @@ entities:
           decals:
             4076: 46,-71
             4104: 45,-72
-        - node:
-            cleanable: True
-            color: '#FF0000FF'
-            id: danger
-          decals:
-            2485: -39.515587,-77.16985
+            4953: -36,-80
+            4954: -39,-80
         - node:
             angle: 1.5707963267948966 rad
             color: '#262626FF'
@@ -4651,12 +4758,6 @@ entities:
             id: heart
           decals:
             1889: 68.50545,-17.796177
-        - node:
-            cleanable: True
-            color: '#FF0000FF'
-            id: radiation
-          decals:
-            2484: -40.09371,-76.7011
         - node:
             cleanable: True
             zIndex: 2
@@ -4664,12 +4765,6 @@ entities:
             id: shop
           decals:
             409: 70.97659,-23.924938
-        - node:
-            cleanable: True
-            color: '#FF0000FF'
-            id: skull
-          decals:
-            2483: -40.171837,-77.79485
         - node:
             cleanable: True
             color: '#FFFF00FF'
@@ -4917,56 +5012,63 @@ entities:
           4,-5:
             0: 65535
           5,-4:
-            0: 65481
+            0: 65287
           5,-3:
             0: 2191
           5,-5:
-            0: 48059
+            0: 65535
           6,-4:
-            0: 65339
+            0: 65534
           6,-3:
             0: 559
           6,-5:
-            0: 46011
+            0: 61166
           7,-4:
-            0: 54735
+            0: 48014
           7,-3:
-            0: 13
-            1: 3072
+            0: 11
+            1: 2048
           7,-5:
-            0: 63487
+            0: 52991
+          8,-4:
+            0: 56575
+          8,-3:
+            0: 13
+            1: 256
           4,-9:
             0: 14591
           5,-8:
             0: 48059
           5,-7:
-            0: 36041
+            0: 39305
           5,-6:
-            0: 47359
+            0: 28927
           5,-9:
             0: 35839
           6,-8:
-            0: 47923
+            0: 48051
           6,-7:
-            0: 15291
+            0: 63291
           6,-6:
-            0: 48127
+            0: 61439
           6,-9:
             0: 32631
           7,-8:
-            0: 65311
+            0: 65521
           7,-7:
-            0: 8191
+            0: 62463
           7,-6:
-            0: 65535
+            0: 60671
           7,-9:
-            0: 39743
+            0: 64319
           8,-8:
-            0: 65295
+            0: 65520
           8,-7:
-            0: 4095
+            0: 61695
           8,-6:
-            0: 61182
+            0: 47359
+          8,-5:
+            0: 40955
           0,-12:
             0: 119
             1: 24576
@@ -5178,9 +5280,9 @@ entities:
           -1,-16:
             0: 4095
           0,-16:
-            0: 58976
+            0: 26208
           0,-15:
-            0: 30471
+            0: 30479
           -1,-15:
             0: 65295
           0,-14:
@@ -5194,7 +5296,7 @@ entities:
           1,-16:
             0: 55607
           1,-15:
-            0: 47581
+            0: 47583
           1,-14:
             0: 65529
           2,-16:
@@ -5599,7 +5701,7 @@ entities:
           -12,-18:
             0: 61440
           -11,-20:
-            0: 56607
+            0: 32767
           -11,-19:
             1: 61696
             0: 12
@@ -5609,9 +5711,9 @@ entities:
             0: 32768
             1: 49
           -10,-20:
-            0: 64415
+            0: 61439
           -10,-19:
-            0: 34987
+            0: 36015
           -10,-18:
             1: 817
           -10,-21:
@@ -5707,22 +5809,21 @@ entities:
           -7,-18:
             0: 57309
           -7,-20:
-            1: 7709
-            0: 256
+            1: 7701
+            0: 264
           -7,-21:
-            1: 21853
-            0: 35456
+            1: 22365
+            0: 34976
           -6,-20:
-            0: 1
-            1: 7958
+            1: 7959
           -6,-19:
             1: 15
             0: 2032
           -6,-18:
             0: 63351
           -6,-21:
-            0: 15153
-            1: 17478
+            0: 45874
+            1: 19525
           -5,-20:
             0: 256
             1: 55441
@@ -5919,21 +6020,21 @@ entities:
             0: 8738
             1: 2176
           9,-20:
-            0: 62579
+            0: 62067
           10,-22:
             1: 12561
           10,-21:
             1: 24234
           11,-21:
-            1: 57215
+            1: 57343
           11,-22:
             1: 49152
           11,-24:
             1: 136
           12,-24:
-            1: 36848
+            1: 4080
           12,-22:
-            1: 65228
+            1: 65160
           12,-21:
             1: 65535
           9,-19:
@@ -6013,47 +6114,46 @@ entities:
           13,-17:
             0: 10928
           13,-21:
-            1: 16177
+            1: 16179
           13,-16:
             4: 819
             1: 8
           14,-20:
-            0: 61704
+            0: 53504
             1: 4
           14,-19:
-            0: 39743
+            0: 65247
           14,-18:
-            0: 56829
+            0: 65535
           14,-17:
-            0: 43933
+            0: 59311
           14,-16:
-            0: 238
+            0: 24814
           14,-21:
-            1: 16708
-            0: 36352
+            1: 20292
           15,-19:
-            0: 14563
+            0: 15347
           15,-18:
             0: 30583
           15,-17:
-            0: 49527
+            0: 64695
           15,-20:
             1: 2222
-          15,-16:
-            0: 119
           15,-21:
-            1: 47247
+            1: 47503
+          15,-16:
+            0: 64550
           16,-20:
             1: 44728
           16,-19:
             0: 62208
             1: 8
           16,-18:
-            0: 52700
+            0: 65436
           16,-17:
-            0: 24060
+            0: 57297
           16,-16:
-            0: 26231
+            0: 61917
           16,-21:
             1: 50736
           17,-20:
@@ -6062,31 +6162,34 @@ entities:
             0: 12288
             1: 136
           17,-18:
-            0: 60943
+            0: 26351
           17,-17:
-            0: 61070
+            0: 56660
           17,-16:
-            0: 28671
+            0: 43229
           17,-21:
             1: 12288
           18,-20:
-            1: 240
+            1: 4336
           18,-19:
-            1: 243
+            0: 17
+            1: 226
           18,-18:
-            0: 32015
+            0: 61663
           18,-17:
-            0: 65293
+            0: 65263
           18,-16:
-            0: 20479
+            0: 52974
           19,-20:
             1: 37244
           19,-19:
             1: 253
           19,-18:
-            0: 35755
+            0: 36603
           19,-17:
-            0: 34959
+            0: 48059
+          19,-16:
+            0: 35771
           20,-20:
             1: 65223
           20,-19:
@@ -6096,112 +6199,105 @@ entities:
             0: 57297
           20,-17:
             0: 4445
-          19,-16:
-            0: 52616
           13,-24:
-            1: 6136
-          12,-23:
-            1: 34952
-          13,-23:
-            1: 4369
+            1: 32752
           13,-22:
-            1: 7985
+            1: 16179
           13,-25:
-            0: 14335
+            0: 32767
+          13,-23:
+            1: 13107
           14,-24:
-            1: 1
+            1: 19
           14,-22:
             1: 61696
           14,-25:
-            1: 4096
+            1: 8192
+            0: 17
           15,-22:
             1: 4096
           16,-15:
-            0: 61038
+            0: 65273
           16,-14:
-            0: 45678
+            0: 64515
+          15,-15:
+            0: 63255
           16,-13:
-            0: 33727
-          15,-14:
-            0: 61447
-          15,-13:
-            0: 65535
+            0: 29439
           16,-12:
-            0: 20206
+            0: 63359
           17,-15:
-            0: 30696
+            0: 32138
           17,-14:
-            0: 65287
+            0: 65280
           17,-13:
-            0: 61695
+            0: 63551
           17,-12:
-            0: 4095
+            0: 61695
           18,-15:
-            0: 45311
-          18,-14:
-            0: 56777
+            0: 63989
           18,-13:
-            0: 19487
+            0: 47884
           18,-12:
-            0: 19524
+            0: 63931
+          18,-14:
+            0: 52416
           19,-15:
-            0: 47870
+            0: 61438
           19,-14:
-            0: 30583
+            0: 30578
           19,-13:
-            0: 1815
+            0: 5911
           19,-12:
-            0: 65535
+            0: 57309
           20,-16:
             0: 35225
-          20,-13:
-            1: 3584
+          20,-12:
+            0: 63475
           20,-15:
             1: 49356
             0: 3072
+          20,-13:
+            1: 2048
           21,-15:
             1: 61680
             0: 3840
           21,-13:
-            0: 3968
-          20,-12:
-            0: 65016
+            1: 800
+            0: 3072
           21,-12:
-            0: 65535
+            0: 65534
           22,-15:
             1: 61680
             0: 3840
           22,-13:
-            0: 65520
+            0: 53216
           22,-12:
-            0: 36495
+            0: 15167
           23,-15:
-            1: 28912
-            0: 36608
+            1: 61680
+            0: 3840
           23,-13:
-            0: 12544
-          23,-14:
-            1: 18724
-            0: 9928
+            0: 63280
           23,-12:
-            0: 22359
+            0: 28527
+          23,-14:
+            1: 1152
+            0: 34816
           24,-15:
-            1: 35063
-            0: 30464
+            1: 4343
+            0: 61184
           24,-14:
-            0: 61431
-            1: 4104
-          24,-13:
-            1: 8977
-            0: 52462
+            0: 36350
+            1: 20993
           21,-20:
             1: 65534
           21,-18:
             0: 10024
             1: 34944
           21,-17:
-            0: 4680
-            1: 8320
+            0: 4672
+            1: 9352
           21,-19:
             0: 33280
             1: 3072
@@ -6211,6 +6307,8 @@ entities:
             1: 4403
           22,-19:
             1: 273
+          22,-18:
+            1: 4368
           22,-21:
             1: 30188
           12,-15:
@@ -6225,74 +6323,73 @@ entities:
             1: 12
             0: 65280
           12,-13:
-            0: 3823
+            0: 56575
           11,-13:
-            0: 61262
+            0: 26382
           12,-12:
-            0: 43215
-            6: 4352
+            0: 56799
           13,-15:
             0: 65280
             1: 4
           13,-14:
-            0: 61695
+            0: 55351
           13,-13:
-            0: 36863
+            0: 56799
           13,-12:
-            0: 53747
-          14,-14:
-            0: 61452
-          14,-13:
-            0: 65535
+            0: 65465
           14,-15:
+            0: 57102
+          14,-14:
+            0: 5116
+          14,-13:
             0: 52424
           14,-12:
-            0: 61164
-          15,-15:
+            0: 61452
+          15,-14:
+            0: 119
+          15,-13:
             0: 30579
           15,-12:
-            0: 56797
+            0: 28679
           16,-11:
-            0: 65535
+            0: 63359
           15,-11:
-            0: 53247
+            0: 26623
           16,-10:
-            0: 15347
-          15,-10:
-            0: 57341
+            0: 14207
           16,-9:
-            0: 65467
+            0: 49147
+          15,-10:
+            0: 63078
           15,-9:
-            0: 56541
+            0: 65534
           16,-8:
-            0: 65307
+            0: 65427
           17,-11:
-            0: 24061
+            0: 65481
           17,-10:
-            0: 3952
+            0: 12543
           17,-9:
-            0: 4915
-          17,-8:
-            0: 15241
+            0: 13107
           18,-11:
-            0: 19797
+            0: 7096
           18,-10:
-            0: 38397
+            0: 56413
           18,-9:
-            0: 46047
+            0: 20375
           18,-8:
-            0: 61323
+            0: 53015
           19,-11:
-            0: 18191
+            0: 5917
           19,-10:
-            0: 29286
+            0: 13895
           19,-9:
-            0: 63701
+            0: 36311
           19,-8:
-            0: 43932
+            0: 60383
           20,-11:
-            1: 3584
-            0: 8
+            0: 3
+            1: 2048
           20,-9:
             1: 49344
             0: 3072
@@ -6300,69 +6397,72 @@ entities:
             1: 12
             0: 39296
           21,-11:
-            0: 36623
+            1: 8960
+            0: 3086
           21,-9:
             1: 61680
             0: 3840
           22,-11:
-            0: 65535
+            0: 61391
           22,-9:
             1: 61680
             0: 3840
           23,-11:
-            0: 311
+            0: 14335
           23,-9:
-            1: 61556
-            0: 3976
+            1: 61680
+            0: 3840
           23,-10:
-            1: 10560
-            0: 50720
+            1: 33792
+            0: 2176
+          24,-12:
+            0: 4369
+            1: 34952
           24,-11:
-            1: 4898
-            0: 60620
+            0: 32769
+            1: 19592
           24,-10:
-            0: 65518
-            1: 17
+            1: 596
+            0: 64904
           24,-9:
-            0: 1911
-            1: 63624
+            1: 61457
+            0: 4078
           11,-12:
-            0: 4508
-            6: 52224
+            0: 54740
           12,-11:
-            6: 4369
-            0: 52424
+            0: 65437
           11,-11:
-            6: 52428
-            0: 4371
+            0: 21853
           12,-10:
-            0: 17748
+            0: 60625
           11,-10:
-            0: 22512
+            0: 34944
+            6: 13104
           12,-9:
-            0: 30567
+            0: 56784
           11,-9:
-            0: 56589
+            0: 65416
+            6: 2
           12,-8:
-            0: 4082
+            0: 57117
           13,-11:
-            0: 56793
+            0: 7407
           13,-10:
-            0: 61944
+            0: 56797
           13,-9:
-            0: 61945
+            0: 65529
           13,-8:
-            0: 35768
+            0: 48043
           14,-11:
-            0: 52974
+            0: 61439
           14,-10:
-            0: 61166
+            0: 65535
           14,-9:
-            0: 60654
+            0: 65526
           14,-8:
-            0: 61134
+            0: 64991
           15,-8:
-            0: 57229
+            0: 57231
           16,-7:
             0: 65327
           15,-7:
@@ -6375,8 +6475,10 @@ entities:
             0: 1918
           15,-5:
             0: 65419
+          17,-8:
+            0: 30576
           17,-7:
-            0: 29579
+            0: 29447
           17,-6:
             0: 56783
           17,-5:
@@ -6396,7 +6498,7 @@ entities:
           18,-4:
             1: 61443
           19,-7:
-            0: 411
+            0: 3475
           19,-6:
             0: 65439
           19,-5:
@@ -6410,30 +6512,32 @@ entities:
             0: 57293
           20,-5:
             0: 193
+          11,-8:
+            0: 18024
           12,-7:
-            0: 63247
+            0: 61681
           11,-7:
-            0: 38365
+            0: 63590
           12,-6:
-            0: 65343
+            0: 65407
           11,-6:
             0: 65535
           12,-5:
-            0: 3583
+            0: 11775
           11,-5:
             0: 20479
           12,-4:
             0: 4095
           13,-7:
-            0: 61693
+            0: 64952
           13,-6:
-            0: 65519
+            0: 65487
           13,-5:
             0: 65023
           13,-4:
             0: 4095
           14,-7:
-            0: 61678
+            0: 61919
           14,-6:
             0: 57119
           14,-5:
@@ -6443,38 +6547,32 @@ entities:
           15,-4:
             0: 3
             1: 43008
-          8,-5:
-            0: 61156
-          8,-4:
-            0: 61166
-          9,-8:
-            0: 60999
+          9,-7:
+            0: 65030
           9,-6:
             0: 4991
           9,-5:
-            0: 4368
+            0: 272
             1: 68
           9,-9:
-            0: 23887
-          9,-7:
-            0: 57568
+            0: 15091
+          9,-8:
+            0: 57574
           9,-4:
             0: 4369
             1: 17408
           10,-8:
-            0: 30576
+            0: 40176
           10,-7:
-            0: 30896
+            0: 64461
           10,-6:
             0: 53215
           10,-5:
             0: 63485
           10,-9:
-            0: 32013
+            0: 65520
           10,-4:
             0: 4087
-          11,-8:
-            0: 5399
           11,-4:
             0: 4095
           9,-12:
@@ -6482,7 +6580,7 @@ entities:
           9,-11:
             0: 64511
           9,-10:
-            0: 30578
+            0: 28530
           9,-13:
             0: 16307
           10,-12:
@@ -6490,20 +6588,23 @@ entities:
           10,-11:
             0: 65535
           10,-10:
-            0: 22384
+            6: 65520
+            0: 4
           10,-13:
             0: 12276
           20,-4:
             1: 53247
           21,-7:
             0: 16912
-            1: 32800
+            1: 33824
           21,-6:
-            0: 10024
-            1: 34944
+            0: 10016
+            1: 34952
           21,-5:
             0: 648
             1: 3072
+          22,-6:
+            1: 4368
           22,-5:
             1: 4352
           22,-4:
@@ -6540,8 +6641,6 @@ entities:
             1: 16008
           17,-3:
             1: 62
-          8,-3:
-            0: 14
           9,-3:
             0: 1
             1: 3072
@@ -6579,40 +6678,52 @@ entities:
             1: 8031
           -5,-24:
             1: 12288
-          24,-12:
-            1: 8738
-            0: 52428
           24,-8:
             1: 3927
+          24,-13:
+            1: 35908
+            0: 136
           25,-12:
-            0: 4369
-            1: 28270
+            0: 30583
+            1: 2056
           25,-11:
-            0: 273
-            1: 63086
+            0: 14199
+            1: 49160
           25,-10:
-            1: 48051
+            0: 13107
+            1: 34952
           25,-9:
-            1: 22431
+            0: 273
+            1: 24142
           25,-13:
-            0: 4352
-            1: 26355
-          26,-12:
-            1: 4369
-          26,-11:
-            1: 4369
-          26,-13:
-            1: 4369
-          26,-10:
-            1: 1
+            0: 30515
+            1: 200
           25,-8:
-            1: 256
+            1: 785
+          26,-12:
+            1: 22359
+          26,-11:
+            1: 30039
+          26,-9:
+            1: 4387
+          26,-13:
+            1: 21876
+          26,-10:
+            1: 8740
           24,-16:
             1: 24320
+          25,-16:
+            1: 4864
           25,-15:
-            1: 38736
+            1: 20049
+            0: 4352
           25,-14:
-            1: 48063
+            0: 13105
+            1: 34958
+          26,-15:
+            1: 8464
+          26,-14:
+            1: 8739
           12,-26:
             0: 61064
           12,-27:
@@ -6620,7 +6731,9 @@ entities:
           13,-27:
             0: 4096
           13,-26:
-            0: 63249
+            0: 65299
+          14,-26:
+            0: 4096
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -6733,24 +6846,32 @@ entities:
     - type: BecomesStation
       id: Exo
     - type: ImplicitRoof
-- proto: AcousticGuitarInstrument
-  entities:
-  - uid: 1616
-    components:
-    - type: Transform
-      pos: -61.538322,-25.478237
-      parent: 2
-  - uid: 19232
-    components:
-    - type: Transform
-      pos: 46.37038,-29.595928
-      parent: 2
 - proto: ActionStethoscope
   entities:
   - uid: 6661
     components:
     - type: Transform
       parent: 6660
+- proto: ActionToggleBlock
+  entities:
+  - uid: 6618
+    mapInit: true
+    paused: true
+    components:
+    - type: Transform
+      parent: 13842
+    - type: Action
+      originalIconColor: '#FFFFFFFF'
+      container: 13842
+  - uid: 6619
+    mapInit: true
+    paused: true
+    components:
+    - type: Transform
+      parent: 13901
+    - type: Action
+      originalIconColor: '#FFFFFFFF'
+      container: 13901
 - proto: ActionToggleInternals
   entities:
   - uid: 3031
@@ -6865,18 +6986,21 @@ entities:
     components:
     - type: Transform
       parent: 33
-  - uid: 2230
-    mapInit: true
-    paused: true
-    components:
-    - type: Transform
-      parent: 2223
   - uid: 3844
     mapInit: true
     paused: true
     components:
     - type: Transform
       parent: 17536
+  - uid: 4915
+    mapInit: true
+    paused: true
+    components:
+    - type: Transform
+      parent: 10499
+    - type: Action
+      originalIconColor: '#FFFFFFFF'
+      container: 10499
   - uid: 5672
     components:
     - type: Transform
@@ -6889,6 +7013,15 @@ entities:
     components:
     - type: Transform
       parent: 5848
+  - uid: 7566
+    mapInit: true
+    paused: true
+    components:
+    - type: Transform
+      parent: 15343
+    - type: Action
+      originalIconColor: '#FFFFFFFF'
+      container: 15343
   - uid: 8005
     components:
     - type: Transform
@@ -6897,12 +7030,6 @@ entities:
     components:
     - type: Transform
       parent: 16318
-  - uid: 15464
-    mapInit: true
-    paused: true
-    components:
-    - type: Transform
-      parent: 15463
 - proto: AirAlarm
   entities:
   - uid: 364
@@ -6919,11 +7046,11 @@ entities:
       - 18775
       - 530
       - 8920
-      - 5203
-      - 2388
       - 18544
       - 18545
       - 19139
+      - 19838
+      - 19837
   - uid: 459
     components:
     - type: Transform
@@ -6932,118 +7059,15 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8541
-      - 8540
-      - 8539
       - 10476
       - 10477
       - 10478
       - 16422
       - 1099
       - 16423
-  - uid: 3446
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 56.5,-27.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 3551
-      - 9351
-      - 3447
-      - 7119
-      - 7117
-  - uid: 7104
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 61.5,-39.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 4174
-      - 4175
-      - 10754
-      - 7117
-      - 7119
-      - 3552
-      - 4200
-  - uid: 7131
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 63.5,-53.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 13816
-      - 275
-      - 9287
-      - 7733
-      - 9363
-      - 3531
-      - 17963
-      - 3399
-      - 3400
-      - 6164
-      - 3396
-      - 3397
-      - 13917
-      - 3398
-  - uid: 7950
-    components:
-    - type: Transform
-      pos: 69.5,-49.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 13910
-      - 13894
-      - 17963
-  - uid: 7952
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 70.5,-44.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 3553
-      - 9357
-  - uid: 7953
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 66.5,-35.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 7954
-      - 2157
-      - 9293
-      - 8403
-      - 4175
-      - 4174
-      - 8404
-      - 7987
-      - 9213
-      - 10298
-      - 7105
-      - 7114
-      - 7103
-  - uid: 8124
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 57.5,-56.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 10796
-      - 10267
-      - 275
-      - 13816
+      - 19831
+      - 19832
+      - 19833
   - uid: 8767
     components:
     - type: Transform
@@ -7051,15 +7075,15 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8525
-      - 8524
-      - 8873
-      - 8526
-      - 8870
-      - 872
-      - 8891
-      - 9463
       - 8655
+      - 9463
+      - 8870
+      - 8873
+      - 4972
+      - 872
+      - 6667
+      - 13188
+      - 4984
   - uid: 8816
     components:
     - type: Transform
@@ -7084,17 +7108,6 @@ entities:
       devices:
       - 6133
       - 9819
-  - uid: 10295
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 70.5,-49.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 7751
-      - 5415
-      - 10298
   - uid: 14458
     components:
     - type: Transform
@@ -7198,7 +7211,8 @@ entities:
       - 8664
       - 2516
       - 8665
-      - 12821
+      - 15401
+      - 8712
   - uid: 14642
     components:
     - type: Transform
@@ -7207,7 +7221,6 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 18546
       - 14657
       - 14656
       - 14654
@@ -7272,7 +7285,9 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 579
+      - 19924
+      - 9080
+      - 12242
   - uid: 14778
     components:
     - type: Transform
@@ -7287,6 +7302,101 @@ entities:
       - 14547
       - 14549
       - 14545
+  - uid: 16343
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 70.5,-49.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 17517
+      - 17518
+  - uid: 16344
+    components:
+    - type: Transform
+      pos: 67.5,-49.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 17943
+      - 17926
+  - uid: 16345
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 72.5,-43.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 17695
+      - 17700
+  - uid: 16346
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 53.5,-38.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 19900
+      - 19901
+      - 19902
+      - 19908
+      - 19907
+      - 17956
+      - 17957
+  - uid: 16353
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 53.5,-36.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 17908
+      - 17909
+  - uid: 16354
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 66.5,-32.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 16247
+      - 16252
+      - 16259
+      - 16431
+      - 16433
+      - 16240
+      - 16239
+      - 16238
+      - 16448
+      - 16437
+      - 17907
+      - 2157
+      - 7954
+      - 19908
+      - 19907
+      - 17906
+      - 17997
+  - uid: 16356
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 67.5,-45.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 16240
+      - 16239
+      - 16238
+      - 19903
+      - 19904
+      - 17601
+      - 17516
+      - 17996
   - uid: 17282
     components:
     - type: Transform
@@ -7302,6 +7412,16 @@ entities:
       - 18547
       - 2334
       - 2406
+  - uid: 17993
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 67.5,-36.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 17992
+      - 17990
   - uid: 18013
     components:
     - type: Transform
@@ -7334,6 +7454,8 @@ entities:
       - 13846
       - 14728
       - 7109
+      - 2155
+      - 4170
   - uid: 18493
     components:
     - type: Transform
@@ -7356,7 +7478,7 @@ entities:
       - 11725
       - 11724
       - 11723
-      - 11722
+      - 7979
       - 11721
       - 11720
       - 11719
@@ -7369,44 +7491,95 @@ entities:
       - 8778
       - 18055
       - 18056
+      - 4171
+      - 13846
+      - 9297
+      - 7800
+      - 8607
+      - 9082
+      - 9066
+      - 19872
   - uid: 19220
     components:
     - type: Transform
       pos: -29.5,-58.5
       parent: 2
-- proto: AirAlarmFreezer
-  entities:
-  - uid: 164
+    - type: DeviceList
+      devices:
+      - 19267
+      - 8020
+  - uid: 19835
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 45.5,-42.5
+      rot: 3.141592653589793 rad
+      pos: 6.5,-18.5
       parent: 2
     - type: DeviceList
       devices:
-      - 8793
-      - 14697
-- proto: AirAlarmXeno
-  entities:
-  - uid: 467
+      - 8665
+      - 19834
+      - 8832
+      - 8831
+  - uid: 19836
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-23.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 8757
+      - 8666
+      - 14635
+      - 14634
+      - 10070
+  - uid: 19905
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 95.5,-45.5
+      pos: 63.5,-48.5
       parent: 2
     - type: DeviceList
       devices:
-      - 8709
-      - 10421
-      - 8586
-      - 8587
-      - 8588
-      - 8589
-      - 8590
-      - 8591
-      - 7498
-      - 7654
-      - 18127
+      - 17267
+      - 17265
+  - uid: 19909
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 60.5,-30.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 3551
+      - 9351
+      - 3449
+      - 19906
+      - 19912
+      - 3447
+  - uid: 19911
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 53.5,-35.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 16259
+      - 16252
+      - 16247
+      - 17913
+      - 17911
+- proto: AirAlarmFreezer
+  entities:
+  - uid: 7344
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,-39.5
+      parent: 2
+- proto: AirAlarmXeno
+  entities:
   - uid: 469
     components:
     - type: Transform
@@ -7416,29 +7589,28 @@ entities:
       devices:
       - 10003
       - 10002
-      - 7443
+      - 19818
       - 9649
       - 9620
       - 7957
       - 567
-      - 8532
-      - 8531
-      - 8530
-      - 8520
-      - 8519
-      - 8518
-      - 8514
-      - 8513
-      - 8512
       - 8524
       - 8525
       - 8526
-      - 8453
-      - 8452
-      - 8451
-      - 8445
-      - 8446
-      - 8447
+      - 19817
+      - 19816
+      - 9878
+      - 15243
+      - 15173
+      - 4096
+      - 19820
+      - 19821
+      - 19822
+      - 19823
+      - 19824
+      - 19825
+      - 19826
+      - 19827
   - uid: 569
     components:
     - type: Transform
@@ -7449,18 +7621,17 @@ entities:
       - 8687
       - 3185
       - 18862
-      - 6614
+      - 19889
       - 18801
-      - 14832
-      - 14831
       - 8442
       - 8441
       - 8440
       - 8439
       - 8438
-      - 8390
-      - 8391
-      - 8392
+      - 19890
+      - 19893
+      - 19894
+      - 19895
   - uid: 572
     components:
     - type: Transform
@@ -7476,6 +7647,26 @@ entities:
       - 9613
       - 6422
       - 18812
+  - uid: 579
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 60.5,-25.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 14728
+      - 7109
+      - 11725
+      - 11724
+      - 11723
+      - 9877
+      - 9383
+      - 16452
+      - 16453
+      - 19871
+      - 19870
+      - 8480
   - uid: 1075
     components:
     - type: Transform
@@ -7505,12 +7696,12 @@ entities:
       - 518
       - 8765
       - 18859
-      - 8529
-      - 8528
-      - 8527
       - 10479
       - 10480
       - 10481
+      - 4096
+      - 19820
+      - 19821
   - uid: 1751
     components:
     - type: Transform
@@ -7521,12 +7712,12 @@ entities:
       devices:
       - 8647
       - 9796
-      - 8548
-      - 8549
-      - 8550
       - 19402
       - 12859
       - 19401
+      - 19841
+      - 19840
+      - 19839
   - uid: 1876
     components:
     - type: Transform
@@ -7564,6 +7755,8 @@ entities:
       - 18880
       - 9715
       - 2462
+      - 19815
+      - 811
   - uid: 2197
     components:
     - type: Transform
@@ -7582,15 +7775,14 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 9287
-      - 7733
-      - 9363
-      - 3531
       - 14283
       - 12148
       - 3402
-      - 3403
       - 8745
+      - 8547
+      - 8548
+      - 8549
+      - 16872
   - uid: 3897
     components:
     - type: Transform
@@ -7617,13 +7809,11 @@ entities:
       - 10479
       - 10480
       - 10481
-      - 8533
-      - 8534
-      - 8535
-      - 8831
-      - 8832
-      - 8665
+      - 19829
+      - 19828
+      - 8107
       - 16242
+      - 19830
   - uid: 5107
     components:
     - type: Transform
@@ -7661,7 +7851,8 @@ entities:
       - 14798
       - 9493
       - 9494
-      - 8744
+      - 14797
+      - 19819
   - uid: 5862
     components:
     - type: Transform
@@ -7701,35 +7892,6 @@ entities:
       - 8439
       - 8438
       - 18862
-  - uid: 6353
-    components:
-    - type: Transform
-      pos: 34.5,-24.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 8781
-      - 6670
-      - 8685
-      - 8789
-  - uid: 6354
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 32.5,-23.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 8797
-      - 8777
-      - 8774
-      - 8783
-      - 8784
-      - 8789
-      - 8785
-      - 8788
-      - 8787
-      - 8786
   - uid: 6358
     components:
     - type: Transform
@@ -7738,18 +7900,11 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8592
-      - 8818
-      - 8740
-  - uid: 6360
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 70.5,-66.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 8746
+      - 19875
+      - 14730
+      - 3448
+      - 19873
+      - 19874
   - uid: 6406
     components:
     - type: Transform
@@ -7763,6 +7918,7 @@ entities:
       - 8681
       - 8433
       - 8434
+      - 19885
   - uid: 6407
     components:
     - type: Transform
@@ -7775,6 +7931,7 @@ entities:
       - 8495
       - 8860
       - 8859
+      - 8721
   - uid: 6410
     components:
     - type: Transform
@@ -7787,12 +7944,6 @@ entities:
       - 8613
       - 8776
       - 8493
-      - 8456
-      - 8455
-      - 8454
-      - 8459
-      - 8458
-      - 8457
       - 8862
       - 8863
   - uid: 6411
@@ -7804,15 +7955,16 @@ entities:
       devices:
       - 8750
       - 8654
-      - 8466
-      - 8468
-      - 8467
-      - 8460
-      - 8461
-      - 8462
       - 8471
       - 8469
       - 8470
+      - 19802
+      - 19803
+      - 19804
+      - 19799
+      - 19800
+      - 19801
+      - 8751
   - uid: 6413
     components:
     - type: Transform
@@ -7830,6 +7982,10 @@ entities:
       - 8472
       - 8473
       - 8474
+      - 19806
+      - 19805
+      - 19807
+      - 19808
   - uid: 6416
     components:
     - type: Transform
@@ -7841,17 +7997,6 @@ entities:
       - 8713
       - 8714
       - 8715
-  - uid: 6418
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 48.5,-55.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 12148
-      - 14283
-      - 8745
   - uid: 6646
     components:
     - type: Transform
@@ -7860,17 +8005,16 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8463
-      - 8464
-      - 8465
-      - 8598
-      - 8597
-      - 8596
-      - 8856
-      - 8857
+      - 19800
+      - 19801
       - 8753
       - 8756
       - 8661
+      - 19799
+      - 19796
+      - 19797
+      - 19798
+      - 4002
   - uid: 7245
     components:
     - type: Transform
@@ -7896,6 +8040,19 @@ entities:
       - 8399
       - 3081
       - 18842
+      - 19920
+  - uid: 7582
+    components:
+    - type: Transform
+      pos: 34.5,-25.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 19854
+      - 19851
+      - 18293
+      - 18312
+      - 6423
   - uid: 7875
     components:
     - type: Transform
@@ -7915,26 +8072,6 @@ entities:
     - type: DeviceList
       devices:
       - 1112
-  - uid: 9040
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 26.5,-30.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 8644
-      - 9840
-      - 8703
-      - 8545
-      - 8546
-      - 8547
-      - 8551
-      - 8552
-      - 8553
-      - 18860
-      - 18861
-      - 9822
   - uid: 9180
     components:
     - type: Transform
@@ -7965,13 +8102,18 @@ entities:
       devices:
       - 8741
       - 8742
-      - 8743
+      - 19809
       - 5571
       - 5570
       - 5569
       - 5573
       - 5572
       - 5574
+      - 19810
+      - 19811
+      - 19812
+      - 19814
+      - 19813
   - uid: 9195
     components:
     - type: Transform
@@ -7989,6 +8131,8 @@ entities:
       - 5578
       - 10154
       - 10030
+      - 20047
+      - 20048
   - uid: 9198
     components:
     - type: Transform
@@ -7997,7 +8141,6 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 18781
       - 16964
       - 18782
       - 8604
@@ -8006,6 +8149,7 @@ entities:
       - 9541
       - 11336
       - 18786
+      - 8605
   - uid: 9199
     components:
     - type: Transform
@@ -8016,12 +8160,12 @@ entities:
       devices:
       - 8768
       - 8770
-      - 8536
-      - 8537
-      - 8538
       - 8601
       - 8600
       - 8599
+      - 19830
+      - 19829
+      - 19828
   - uid: 9216
     components:
     - type: Transform
@@ -8033,14 +8177,14 @@ entities:
       - 9962
       - 8673
       - 8507
-      - 8504
-      - 8503
-      - 8502
       - 8505
       - 8506
-      - 1809
-      - 1807
-      - 9834
+      - 19888
+      - 19887
+      - 19886
+      - 19892
+      - 19891
+      - 8759
   - uid: 9234
     components:
     - type: Transform
@@ -8052,15 +8196,16 @@ entities:
       - 14799
       - 14800
       - 14798
-      - 8448
-      - 8449
-      - 8450
       - 8498
       - 8497
       - 8496
       - 8716
       - 16897
       - 8401
+      - 9878
+      - 15243
+      - 15173
+      - 14797
   - uid: 9235
     components:
     - type: Transform
@@ -8069,16 +8214,16 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8551
-      - 8552
-      - 8553
-      - 8423
-      - 8422
-      - 8421
       - 8554
       - 8555
       - 8638
       - 8639
+      - 19850
+      - 19849
+      - 19848
+      - 19877
+      - 19878
+      - 19879
   - uid: 9236
     components:
     - type: Transform
@@ -8089,20 +8234,22 @@ entities:
       devices:
       - 8616
       - 8615
-      - 8429
-      - 8428
-      - 8427
-      - 8393
-      - 8394
-      - 8395
-      - 8418
-      - 8419
-      - 8420
-      - 8423
-      - 8422
-      - 8421
       - 6602
       - 15637
+      - 19879
+      - 19878
+      - 19877
+      - 8430
+      - 8431
+      - 8432
+      - 8398
+      - 8397
+      - 8396
+      - 8415
+      - 8416
+      - 8417
+      - 8424
+      - 8556
   - uid: 9239
     components:
     - type: Transform
@@ -8117,18 +8264,19 @@ entities:
       - 8676
       - 8678
       - 8677
-      - 8389
-      - 12781
-      - 8387
-      - 8384
-      - 8385
-      - 8386
       - 6976
       - 6977
       - 6978
       - 17153
       - 17130
       - 17129
+      - 19896
+      - 19897
+      - 19898
+      - 19893
+      - 19894
+      - 19895
+      - 19899
   - uid: 9240
     components:
     - type: Transform
@@ -8140,14 +8288,14 @@ entities:
       - 1732
       - 8612
       - 6616
-      - 4276
-      - 8382
-      - 8383
       - 8398
       - 8397
       - 8396
       - 10326
       - 9410
+      - 19896
+      - 19897
+      - 19898
   - uid: 9241
     components:
     - type: Transform
@@ -8162,7 +8310,8 @@ entities:
       - 7017
       - 15635
       - 8790
-      - 10059
+      - 19882
+      - 1800
   - uid: 9243
     components:
     - type: Transform
@@ -8181,7 +8330,6 @@ entities:
       - 7011
       - 7012
       - 9833
-      - 18811
       - 7056
   - uid: 9248
     components:
@@ -8197,6 +8345,7 @@ entities:
       - 8402
       - 9410
       - 10326
+      - 19920
   - uid: 9262
     components:
     - type: Transform
@@ -8206,14 +8355,15 @@ entities:
     - type: DeviceList
       devices:
       - 8735
-      - 8736
-      - 8730
+      - 8732
+      - 8734
       - 8737
       - 8728
       - 8729
-      - 8732
+      - 8628
+      - 8730
+      - 8479
       - 8731
-      - 8734
   - uid: 9403
     components:
     - type: Transform
@@ -8225,18 +8375,17 @@ entities:
       - 8667
       - 8668
       - 3440
-      - 8499
-      - 8500
-      - 8501
       - 8430
       - 8431
       - 8432
-      - 7930
-      - 7926
       - 8433
       - 8434
-      - 10370
-      - 10371
+      - 19888
+      - 19885
+      - 19887
+      - 19886
+      - 19889
+      - 19890
   - uid: 10429
     components:
     - type: Transform
@@ -8246,12 +8395,74 @@ entities:
       devices:
       - 8622
       - 9834
+  - uid: 10761
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 21.5,-14.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 18702
+      - 18703
+      - 18704
+      - 914
+      - 913
+      - 19831
+      - 19832
+      - 19833
+      - 18399
+      - 18398
+      - 15636
+  - uid: 10839
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 97.5,-45.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 10811
+      - 10788
+      - 15191
+      - 15192
+      - 15193
+      - 15194
+      - 19914
+      - 19915
+      - 3747
+      - 9311
+      - 7594
+  - uid: 12980
+    components:
+    - type: Transform
+      pos: -4.5,-46.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 10474
+      - 10473
   - uid: 15885
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -23.5,-15.5
       parent: 2
+    - type: DeviceList
+      devices:
+      - 8602
+      - 8603
+      - 8604
+      - 8601
+      - 8600
+      - 8599
+      - 19798
+      - 19797
+      - 19796
+      - 18795
+      - 14692
+      - 18794
+      - 18793
   - uid: 16120
     components:
     - type: Transform
@@ -8268,6 +8479,94 @@ entities:
       - 9963
       - 8717
       - 4002
+  - uid: 16312
+    components:
+    - type: Transform
+      pos: 53.5,-41.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 19903
+      - 19904
+      - 16450
+      - 16451
+      - 19902
+      - 19901
+      - 19900
+      - 8549
+      - 8548
+      - 8547
+      - 16910
+      - 16911
+      - 17995
+  - uid: 16342
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 49.5,-54.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 10595
+      - 10279
+  - uid: 16362
+    components:
+    - type: Transform
+      pos: 33.5,-16.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 18706
+      - 18707
+      - 18708
+      - 18724
+      - 18723
+      - 18709
+      - 18705
+      - 18554
+      - 18525
+      - 18731
+  - uid: 16363
+    components:
+    - type: Transform
+      pos: 33.5,-13.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 18724
+      - 18723
+      - 18709
+      - 18726
+      - 18725
+      - 18735
+  - uid: 16367
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 26.5,-27.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 19845
+      - 19846
+      - 19847
+      - 19838
+      - 19837
+      - 18702
+      - 18703
+      - 18704
+      - 18705
+      - 18706
+      - 18707
+      - 18708
+      - 8550
+      - 8551
+      - 8552
+      - 19854
+      - 19851
+      - 15526
+      - 1104
+      - 18400
   - uid: 16603
     components:
     - type: Transform
@@ -8291,31 +8590,23 @@ entities:
       - 7893
       - 17678
       - 18800
-      - 8515
-      - 8516
-      - 8517
-      - 1438
-      - 1806
-  - uid: 18598
+      - 19827
+      - 19826
+      - 19825
+      - 19892
+      - 19891
+  - uid: 18736
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 26.5,-14.5
+      rot: 1.5707963267948966 rad
+      pos: 33.5,-12.5
       parent: 2
     - type: DeviceList
       devices:
-      - 8764
-      - 14668
-      - 14669
-      - 8542
-      - 8543
-      - 8544
-      - 914
-      - 913
-      - 9643
-      - 15636
-      - 9496
-      - 14601
+      - 18735
+      - 18731
+      - 18665
+      - 18666
   - uid: 18783
     components:
     - type: Transform
@@ -8340,54 +8631,6 @@ entities:
       - 8677
       - 8678
       - 262
-  - uid: 18869
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 29.5,-11.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 17679
-      - 8426
-  - uid: 18873
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 47.5,-25.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 18828
-      - 11721
-      - 8572
-      - 8571
-      - 11720
-      - 11719
-      - 11718
-      - 11717
-      - 11716
-      - 11715
-      - 11712
-      - 18827
-      - 8785
-  - uid: 18874
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 56.5,-25.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 18061
-      - 8571
-      - 8572
-      - 11722
-      - 11723
-      - 11724
-      - 11725
-      - 7109
-      - 14728
   - uid: 19200
     components:
     - type: Transform
@@ -8413,21 +8656,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 52.5,-65.5
       parent: 2
-  - uid: 19354
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 32.5,-15.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 8426
-      - 16879
-      - 13106
-      - 8779
-      - 8788
-      - 8787
-      - 8786
   - uid: 19400
     components:
     - type: Transform
@@ -8438,14 +8666,14 @@ entities:
       devices:
       - 1796
       - 531
-      - 8523
-      - 8522
-      - 8521
       - 19401
       - 12859
       - 19402
       - 4972
       - 872
+      - 19822
+      - 19823
+      - 19824
   - uid: 19419
     components:
     - type: Transform
@@ -8459,27 +8687,198 @@ entities:
       - 18786
       - 9596
       - 11935
+  - uid: 19853
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 26.5,-31.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 19841
+      - 19840
+      - 19839
+      - 19848
+      - 19849
+      - 19850
+      - 19845
+      - 19846
+      - 19847
+      - 8644
+      - 9840
+  - uid: 19856
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 46.5,-25.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 8552
+      - 8551
+      - 8550
+      - 9383
+      - 9877
+      - 7979
+      - 11721
+      - 11720
+      - 11719
+      - 11718
+      - 11717
+      - 11716
+      - 11715
+      - 11712
+      - 18681
+      - 18673
+      - 18828
+  - uid: 19876
+    components:
+    - type: Transform
+      pos: 76.5,-18.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 19875
+      - 8592
+      - 8818
+      - 2646
+      - 8740
+  - uid: 19880
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 35.5,-46.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 7009
+      - 7056
+      - 7010
+      - 7011
+      - 7012
+      - 7017
+      - 7016
+      - 7015
+      - 7014
+      - 7013
+      - 10646
+      - 18789
+      - 18811
+      - 19882
+  - uid: 19883
+    components:
+    - type: Transform
+      pos: 42.5,-48.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 9247
+      - 582
+  - uid: 19884
+    components:
+    - type: Transform
+      pos: 13.5,-47.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 10371
+      - 10370
+  - uid: 19916
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 77.5,-47.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 19913
+      - 19914
+      - 19915
+      - 18832
+      - 591
+  - uid: 19917
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 72.5,-63.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 19064
+  - uid: 19922
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-72.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 19923
+  - uid: 19961
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -47.5,-62.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 9696
+      - 9699
+  - uid: 19962
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -43.5,-62.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 11944
+      - 10832
+  - uid: 19963
+    components:
+    - type: Transform
+      pos: -44.5,-67.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 9702
+      - 14581
+  - uid: 19964
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -39.5,-61.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 5830
+      - 9701
 - proto: AirCanister
   entities:
-  - uid: 8805
+  - uid: 6560
     components:
     - type: Transform
-      pos: 64.5,-62.5
+      pos: 59.5,-63.5
       parent: 2
-  - uid: 15140
+  - uid: 10815
     components:
     - type: Transform
-      pos: 71.5,-69.5
+      pos: 62.5,-54.5
       parent: 2
-  - uid: 17695
+  - uid: 15475
     components:
     - type: Transform
-      pos: 70.5,-55.5
+      pos: 58.5,-60.5
       parent: 2
-  - uid: 19227
+  - uid: 16265
     components:
     - type: Transform
-      pos: 51.5,-30.5
+      pos: 57.5,-60.5
+      parent: 2
+  - uid: 19079
+    components:
+    - type: Transform
+      pos: 74.5,-51.5
       parent: 2
   - uid: 19307
     components:
@@ -8491,27 +8890,48 @@ entities:
     - type: Transform
       pos: 54.5,-71.5
       parent: 2
+  - uid: 19970
+    components:
+    - type: Transform
+      pos: -54.5,-25.5
+      parent: 2
+- proto: AirGrenade
+  entities:
+  - uid: 20007
+    components:
+    - type: Transform
+      parent: 20005
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 20021
+    components:
+    - type: Transform
+      pos: 57.73585,-59.328594
+      parent: 2
 - proto: AirlockArmoryGlassLocked
   entities:
-  - uid: 3217
-    components:
-    - type: Transform
-      pos: 66.5,-32.5
-      parent: 2
-  - uid: 3287
+  - uid: 3617
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 66.5,-33.5
       parent: 2
-  - uid: 7307
+  - uid: 5427
     components:
     - type: Transform
-      pos: 58.5,-40.5
+      pos: 60.5,-36.5
       parent: 2
-  - uid: 9258
+  - uid: 7279
     components:
     - type: Transform
-      pos: 61.5,-41.5
+      rot: 1.5707963267948966 rad
+      pos: 66.5,-34.5
+      parent: 2
+  - uid: 7951
+    components:
+    - type: Transform
+      pos: 55.5,-35.5
       parent: 2
 - proto: AirlockAtmosphericsLocked
   entities:
@@ -8530,6 +8950,17 @@ entities:
     - type: Transform
       pos: 34.5,-70.5
       parent: 2
+  - uid: 8225
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,-59.5
+      parent: 2
+  - uid: 15488
+    components:
+    - type: Transform
+      pos: -52.5,-25.5
+      parent: 2
 - proto: AirlockBarLocked
   entities:
   - uid: 3879
@@ -8544,25 +8975,45 @@ entities:
       parent: 2
 - proto: AirlockBrigGlassLocked
   entities:
-  - uid: 3065
+  - uid: 3469
     components:
     - type: Transform
-      pos: 63.5,-44.5
+      pos: 61.5,-37.5
       parent: 2
-  - uid: 3094
+  - uid: 3525
     components:
     - type: Transform
-      pos: 62.5,-47.5
+      pos: 56.5,-26.5
       parent: 2
-  - uid: 3101
+  - uid: 4379
     components:
     - type: Transform
-      pos: 63.5,-47.5
+      pos: 62.5,-37.5
       parent: 2
-  - uid: 8413
+  - uid: 4712
     components:
     - type: Transform
-      pos: 62.5,-44.5
+      pos: 62.5,-40.5
+      parent: 2
+  - uid: 4874
+    components:
+    - type: Transform
+      pos: 55.5,-29.5
+      parent: 2
+  - uid: 4907
+    components:
+    - type: Transform
+      pos: 55.5,-26.5
+      parent: 2
+  - uid: 6125
+    components:
+    - type: Transform
+      pos: 61.5,-40.5
+      parent: 2
+  - uid: 9229
+    components:
+    - type: Transform
+      pos: 56.5,-29.5
       parent: 2
 - proto: AirlockBrigLocked
   entities:
@@ -8680,29 +9131,10 @@ entities:
       parent: 2
 - proto: AirlockCommandGlassLocked
   entities:
-  - uid: 2146
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 81.5,-46.5
-      parent: 2
-  - uid: 17853
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 81.5,-44.5
-      parent: 2
-- proto: AirlockCommandLocked
-  entities:
-  - uid: 5
-    components:
-    - type: Transform
-      pos: -46.5,-36.5
-      parent: 2
   - uid: 155
     components:
     - type: Transform
-      pos: -30.5,-42.5
+      pos: -30.5,-41.5
       parent: 2
   - uid: 157
     components:
@@ -8734,33 +9166,53 @@ entities:
     - type: Transform
       pos: -33.5,-42.5
       parent: 2
+  - uid: 291
+    components:
+    - type: Transform
+      pos: -30.5,-42.5
+      parent: 2
+  - uid: 3188
+    components:
+    - type: Transform
+      pos: 83.5,-46.5
+      parent: 2
+  - uid: 5321
+    components:
+    - type: Transform
+      pos: 83.5,-44.5
+      parent: 2
+- proto: AirlockCommandLocked
+  entities:
+  - uid: 5
+    components:
+    - type: Transform
+      pos: -46.5,-36.5
+      parent: 2
   - uid: 276
     components:
     - type: Transform
       pos: -5.5,-2.5
       parent: 2
-  - uid: 797
+  - uid: 7597
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 75.5,-45.5
+      rot: 1.5707963267948966 rad
+      pos: 77.5,-45.5
       parent: 2
-  - uid: 5425
+- proto: AirlockDetectiveGlassLocked
+  entities:
+  - uid: 10249
     components:
     - type: Transform
-      pos: -30.5,-41.5
+      pos: 67.5,-47.5
       parent: 2
 - proto: AirlockDetectiveLocked
   entities:
-  - uid: 9247
+  - uid: 7307
     components:
     - type: Transform
-      pos: 66.5,-51.5
-      parent: 2
-  - uid: 15386
-    components:
-    - type: Transform
-      pos: 73.5,-51.5
+      rot: -1.5707963267948966 rad
+      pos: 72.5,-45.5
       parent: 2
 - proto: AirlockEngineering
   entities:
@@ -8799,11 +9251,6 @@ entities:
     - type: Transform
       pos: 4.5,-61.5
       parent: 2
-  - uid: 325
-    components:
-    - type: Transform
-      pos: 47.5,-38.5
-      parent: 2
   - uid: 350
     components:
     - type: Transform
@@ -8859,6 +9306,12 @@ entities:
     - type: Transform
       pos: -26.5,-69.5
       parent: 2
+  - uid: 3461
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 49.5,-29.5
+      parent: 2
   - uid: 4725
     components:
     - type: Transform
@@ -8869,10 +9322,10 @@ entities:
     - type: Transform
       pos: -60.5,-66.5
       parent: 2
-  - uid: 7165
+  - uid: 12988
     components:
     - type: Transform
-      pos: 71.5,-37.5
+      pos: 46.5,-42.5
       parent: 2
   - uid: 14122
     components:
@@ -8914,28 +9367,30 @@ entities:
           - DoorBolt
 - proto: AirlockExternalCommandLocked
   entities:
-  - uid: 340
+  - uid: 797
     components:
     - type: Transform
-      pos: 84.5,-49.5
+      rot: -1.5707963267948966 rad
+      pos: 86.5,-41.5
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
     - type: DeviceLinkSource
       linkedPorts:
-        3051:
+        15197:
         - - DoorStatus
           - DoorBolt
-  - uid: 2499
+  - uid: 799
     components:
     - type: Transform
-      pos: 84.5,-41.5
+      rot: -1.5707963267948966 rad
+      pos: 86.5,-49.5
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
     - type: DeviceLinkSource
       linkedPorts:
-        3032:
+        15198:
         - - DoorStatus
           - DoorBolt
 - proto: AirlockExternalEngineeringLocked
@@ -9142,28 +9597,30 @@ entities:
           - InputB
 - proto: AirlockExternalGlassCommandLocked
   entities:
-  - uid: 3032
+  - uid: 15197
     components:
     - type: Transform
-      pos: 86.5,-41.5
+      rot: -1.5707963267948966 rad
+      pos: 88.5,-41.5
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
     - type: DeviceLinkSource
       linkedPorts:
-        2499:
+        797:
         - - DoorStatus
           - DoorBolt
-  - uid: 3051
+  - uid: 15198
     components:
     - type: Transform
-      pos: 86.5,-49.5
+      rot: -1.5707963267948966 rad
+      pos: 88.5,-49.5
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
     - type: DeviceLinkSource
       linkedPorts:
-        340:
+        799:
         - - DoorStatus
           - DoorBolt
 - proto: AirlockExternalGlassEngineeringLocked
@@ -9381,15 +9838,17 @@ entities:
       parent: 2
 - proto: AirlockFreezerLocked
   entities:
-  - uid: 4273
+  - uid: 800
     components:
     - type: Transform
-      pos: 45.5,-43.5
+      rot: 1.5707963267948966 rad
+      pos: 42.5,-39.5
       parent: 2
-  - uid: 4274
+  - uid: 3473
     components:
     - type: Transform
-      pos: 47.5,-46.5
+      rot: 1.5707963267948966 rad
+      pos: 39.5,-37.5
       parent: 2
 - proto: AirlockGlass
   entities:
@@ -9459,11 +9918,21 @@ entities:
     - type: Transform
       pos: 6.5,-35.5
       parent: 2
+  - uid: 918
+    components:
+    - type: Transform
+      pos: 33.5,-23.5
+      parent: 2
   - uid: 923
     components:
     - type: Transform
       pos: -27.5,-40.5
       parent: 2
+  - uid: 924
+    components:
+    - type: Transform
+      pos: 33.5,-24.5
+      parent: 2
   - uid: 926
     components:
     - type: Transform
@@ -9789,11 +10258,29 @@ entities:
     - type: Transform
       pos: 23.5,-38.5
       parent: 2
+  - uid: 5417
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 27.5,-16.5
+      parent: 2
+  - uid: 5835
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 26.5,-16.5
+      parent: 2
   - uid: 5887
     components:
     - type: Transform
       pos: 24.5,-38.5
       parent: 2
+  - uid: 6140
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 25.5,-16.5
+      parent: 2
   - uid: 7112
     components:
     - type: Transform
@@ -9809,6 +10296,37 @@ entities:
     - type: Transform
       pos: 15.5,-13.5
       parent: 2
+  - uid: 8682
+    components:
+    - type: Transform
+      pos: 33.5,-22.5
+      parent: 2
+  - uid: 8774
+    components:
+    - type: Transform
+      pos: 31.5,-21.5
+      parent: 2
+  - uid: 8994
+    components:
+    - type: Transform
+      pos: 28.5,-18.5
+      parent: 2
+  - uid: 9259
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 23.5,-28.5
+      parent: 2
+  - uid: 9291
+    components:
+    - type: Transform
+      pos: 30.5,-21.5
+      parent: 2
+  - uid: 9417
+    components:
+    - type: Transform
+      pos: 28.5,-19.5
+      parent: 2
   - uid: 10733
     components:
     - type: Transform
@@ -9841,6 +10359,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -34.5,-59.5
       parent: 2
+  - uid: 19843
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 24.5,-28.5
+      parent: 2
+  - uid: 19844
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 25.5,-28.5
+      parent: 2
 - proto: AirlockHeadOfPersonnelLocked
   entities:
   - uid: 1491
@@ -9860,10 +10390,11 @@ entities:
       parent: 2
 - proto: AirlockHeadOfSecurityGlassLocked
   entities:
-  - uid: 17245
+  - uid: 4099
     components:
     - type: Transform
-      pos: 66.5,-44.5
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-49.5
       parent: 2
 - proto: AirlockHydroGlassLocked
   entities:
@@ -9977,11 +10508,19 @@ entities:
       parent: 2
 - proto: AirlockMaintKitchenLocked
   entities:
-  - uid: 2279
+  - uid: 4713
     components:
     - type: Transform
+      rot: 3.141592653589793 rad
       pos: 41.5,-48.5
       parent: 2
+- proto: AirlockMaintLawyerLocked
+  entities:
+  - uid: 9615
+    components:
+    - type: Transform
+      pos: 57.5,-57.5
+      parent: 2
 - proto: AirlockMaintLocked
   entities:
   - uid: 156
@@ -9999,23 +10538,37 @@ entities:
     - type: Transform
       pos: 81.5,-21.5
       parent: 2
-  - uid: 4609
+  - uid: 9899
     components:
     - type: Transform
-      pos: 79.5,-30.5
+      pos: 80.5,-27.5
       parent: 2
 - proto: AirlockMaintMedLocked
   entities:
-  - uid: 295
-    components:
-    - type: Transform
-      pos: 28.5,-30.5
-      parent: 2
   - uid: 3673
     components:
     - type: Transform
       pos: 3.5,-21.5
       parent: 2
+  - uid: 4147
+    components:
+    - type: Transform
+      pos: 28.5,-31.5
+      parent: 2
+- proto: AirlockMaintSecLocked
+  entities:
+  - uid: 601
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 74.5,-44.5
+      parent: 2
+  - uid: 714
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 52.5,-39.5
+      parent: 2
 - proto: AirlockMaintServiceLocked
   entities:
   - uid: 689
@@ -10023,16 +10576,6 @@ entities:
     - type: Transform
       pos: -34.5,-24.5
       parent: 2
-  - uid: 1711
-    components:
-    - type: Transform
-      pos: 44.5,-49.5
-      parent: 2
-  - uid: 1803
-    components:
-    - type: Transform
-      pos: 42.5,-51.5
-      parent: 2
 - proto: AirlockMedicalGlassLocked
   entities:
   - uid: 357
@@ -10058,7 +10601,7 @@ entities:
       pos: 11.5,-30.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -127847.92
+      secondsUntilStateChange: -221892.55
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -10088,42 +10631,34 @@ entities:
       parent: 2
 - proto: AirlockMedicalLocked
   entities:
-  - uid: 234
-    components:
-    - type: Transform
-      pos: 26.5,-23.5
-      parent: 2
-  - uid: 237
-    components:
-    - type: Transform
-      pos: 26.5,-22.5
-      parent: 2
-  - uid: 283
-    components:
-    - type: Transform
-      pos: 22.5,-23.5
-      parent: 2
-  - uid: 284
-    components:
-    - type: Transform
-      pos: 22.5,-22.5
-      parent: 2
   - uid: 286
     components:
     - type: Transform
       pos: -5.5,0.5
       parent: 2
+  - uid: 2388
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-23.5
+      parent: 2
+  - uid: 7795
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-22.5
+      parent: 2
 - proto: AirlockMedicalMorgueLocked
   entities:
-  - uid: 296
+  - uid: 3714
     components:
     - type: Transform
-      pos: 28.5,-24.5
+      pos: 28.5,-25.5
       parent: 2
-  - uid: 297
+  - uid: 9409
     components:
     - type: Transform
-      pos: 32.5,-22.5
+      pos: 29.5,-25.5
       parent: 2
 - proto: AirlockQuartermasterGlassLocked
   entities:
@@ -10237,21 +10772,21 @@ entities:
     - type: Transform
       pos: 63.5,-30.5
       parent: 2
+  - uid: 2725
+    components:
+    - type: Transform
+      pos: 67.5,-39.5
+      parent: 2
+  - uid: 3033
+    components:
+    - type: Transform
+      pos: 67.5,-40.5
+      parent: 2
   - uid: 3102
     components:
     - type: Transform
       pos: 64.5,-30.5
       parent: 2
-  - uid: 4176
-    components:
-    - type: Transform
-      pos: 61.5,-37.5
-      parent: 2
-  - uid: 5386
-    components:
-    - type: Transform
-      pos: 61.5,-38.5
-      parent: 2
   - uid: 7190
     components:
     - type: Transform
@@ -10264,10 +10799,10 @@ entities:
       parent: 2
 - proto: AirlockSecurityLawyerLocked
   entities:
-  - uid: 7301
+  - uid: 7238
     components:
     - type: Transform
-      pos: 69.5,-42.5
+      pos: 52.5,-35.5
       parent: 2
 - proto: AirlockSecurityLocked
   entities:
@@ -10291,26 +10826,21 @@ entities:
     - type: Transform
       pos: 57.5,-19.5
       parent: 2
-  - uid: 4612
+  - uid: 3023
     components:
     - type: Transform
-      pos: 59.5,-33.5
+      pos: 71.5,-43.5
+      parent: 2
+  - uid: 3541
+    components:
+    - type: Transform
+      pos: 53.5,-30.5
       parent: 2
   - uid: 6267
     components:
     - type: Transform
       pos: 61.5,-29.5
       parent: 2
-  - uid: 8651
-    components:
-    - type: Transform
-      pos: 66.5,-38.5
-      parent: 2
-  - uid: 8691
-    components:
-    - type: Transform
-      pos: 58.5,-33.5
-      parent: 2
 - proto: AirlockServiceGlassLocked
   entities:
   - uid: 3529
@@ -10372,15 +10902,22 @@ entities:
       parent: 2
 - proto: AirlockVirologyGlassLocked
   entities:
-  - uid: 7767
+  - uid: 7953
     components:
     - type: Transform
-      pos: 29.5,-17.5
+      pos: 31.5,-13.5
       parent: 2
-  - uid: 7769
+  - uid: 8785
     components:
     - type: Transform
-      pos: 30.5,-13.5
+      pos: 31.5,-16.5
+      parent: 2
+- proto: AirlockVirologyLocked
+  entities:
+  - uid: 7807
+    components:
+    - type: Transform
+      pos: 35.5,-16.5
       parent: 2
 - proto: AirlockXeno
   entities:
@@ -10416,16 +10953,16 @@ entities:
     - type: Transform
       pos: -15.5,-45.5
       parent: 2
-  - uid: 291
-    components:
-    - type: Transform
-      pos: -39.5,-78.5
-      parent: 2
   - uid: 321
     components:
     - type: Transform
       pos: -44.5,-77.5
       parent: 2
+  - uid: 340
+    components:
+    - type: Transform
+      pos: 64.5,-62.5
+      parent: 2
   - uid: 360
     components:
     - type: Transform
@@ -10461,11 +10998,6 @@ entities:
     - type: Transform
       pos: -11.5,-45.5
       parent: 2
-  - uid: 601
-    components:
-    - type: Transform
-      pos: 3.5,-60.5
-      parent: 2
   - uid: 602
     components:
     - type: Transform
@@ -10516,11 +11048,6 @@ entities:
     - type: Transform
       pos: -34.5,-68.5
       parent: 2
-  - uid: 730
-    components:
-    - type: Transform
-      pos: -37.5,-76.5
-      parent: 2
   - uid: 732
     components:
     - type: Transform
@@ -10536,6 +11063,12 @@ entities:
     - type: Transform
       pos: 6.5,-68.5
       parent: 2
+  - uid: 739
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 42.5,-51.5
+      parent: 2
   - uid: 742
     components:
     - type: Transform
@@ -10546,61 +11079,6 @@ entities:
     - type: Transform
       pos: 37.5,-80.5
       parent: 2
-  - uid: 746
-    components:
-    - type: Transform
-      pos: 38.5,-77.5
-      parent: 2
-  - uid: 751
-    components:
-    - type: Transform
-      pos: 73.5,-68.5
-      parent: 2
-  - uid: 753
-    components:
-    - type: Transform
-      pos: 71.5,-66.5
-      parent: 2
-  - uid: 792
-    components:
-    - type: Transform
-      pos: 74.5,-60.5
-      parent: 2
-  - uid: 793
-    components:
-    - type: Transform
-      pos: 77.5,-57.5
-      parent: 2
-  - uid: 798
-    components:
-    - type: Transform
-      pos: 34.5,-19.5
-      parent: 2
-  - uid: 799
-    components:
-    - type: Transform
-      pos: 52.5,-43.5
-      parent: 2
-  - uid: 800
-    components:
-    - type: Transform
-      pos: 52.5,-45.5
-      parent: 2
-  - uid: 801
-    components:
-    - type: Transform
-      pos: 51.5,-45.5
-      parent: 2
-  - uid: 806
-    components:
-    - type: Transform
-      pos: 51.5,-43.5
-      parent: 2
-  - uid: 810
-    components:
-    - type: Transform
-      pos: 50.5,-39.5
-      parent: 2
   - uid: 812
     components:
     - type: Transform
@@ -10611,6 +11089,11 @@ entities:
     - type: Transform
       pos: 72.5,-23.5
       parent: 2
+  - uid: 863
+    components:
+    - type: Transform
+      pos: 55.5,-46.5
+      parent: 2
   - uid: 879
     components:
     - type: Transform
@@ -10641,11 +11124,6 @@ entities:
     - type: Transform
       pos: -35.5,-68.5
       parent: 2
-  - uid: 896
-    components:
-    - type: Transform
-      pos: 38.5,-34.5
-      parent: 2
   - uid: 897
     components:
     - type: Transform
@@ -10656,11 +11134,6 @@ entities:
     - type: Transform
       pos: -30.5,-17.5
       parent: 2
-  - uid: 901
-    components:
-    - type: Transform
-      pos: 38.5,-30.5
-      parent: 2
   - uid: 922
     components:
     - type: Transform
@@ -10672,40 +11145,142 @@ entities:
       rot: 3.141592653589793 rad
       pos: -34.5,-17.5
       parent: 2
-  - uid: 1815
+  - uid: 3144
     components:
     - type: Transform
-      pos: 44.5,-24.5
+      pos: 57.5,-75.5
       parent: 2
-  - uid: 3361
+  - uid: 3160
     components:
     - type: Transform
-      pos: 57.5,-70.5
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-33.5
       parent: 2
-  - uid: 3818
+  - uid: 3552
     components:
     - type: Transform
-      pos: 44.5,-27.5
+      pos: 53.5,-51.5
       parent: 2
-  - uid: 4077
+  - uid: 3685
     components:
     - type: Transform
-      pos: 74.5,-42.5
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-32.5
       parent: 2
-  - uid: 7214
+  - uid: 3687
     components:
     - type: Transform
-      pos: 59.5,-64.5
+      rot: -1.5707963267948966 rad
+      pos: 46.5,-33.5
+      parent: 2
+  - uid: 3934
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 76.5,-40.5
+      parent: 2
+  - uid: 5485
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-74.5
+      parent: 2
+  - uid: 5892
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 46.5,-32.5
+      parent: 2
+  - uid: 6360
+    components:
+    - type: Transform
+      pos: 67.5,-70.5
+      parent: 2
+  - uid: 7261
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 43.5,-25.5
       parent: 2
   - uid: 7297
     components:
     - type: Transform
       pos: 44.5,-76.5
       parent: 2
-  - uid: 10244
+  - uid: 7570
     components:
     - type: Transform
-      pos: 65.5,-53.5
+      pos: 60.5,-64.5
+      parent: 2
+  - uid: 8141
+    components:
+    - type: Transform
+      pos: 74.5,-59.5
+      parent: 2
+  - uid: 8420
+    components:
+    - type: Transform
+      pos: 38.5,-34.5
+      parent: 2
+  - uid: 8421
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 49.5,-47.5
+      parent: 2
+  - uid: 8620
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 52.5,-25.5
+      parent: 2
+  - uid: 9251
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,-49.5
+      parent: 2
+  - uid: 9371
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 35.5,-19.5
+      parent: 2
+  - uid: 9887
+    components:
+    - type: Transform
+      pos: 60.5,-58.5
+      parent: 2
+  - uid: 9888
+    components:
+    - type: Transform
+      pos: 63.5,-56.5
+      parent: 2
+  - uid: 10303
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 72.5,-64.5
+      parent: 2
+  - uid: 10742
+    components:
+    - type: Transform
+      pos: 3.5,-59.5
+      parent: 2
+  - uid: 10786
+    components:
+    - type: Transform
+      pos: 5.5,-59.5
+      parent: 2
+  - uid: 10805
+    components:
+    - type: Transform
+      pos: 51.5,-42.5
+      parent: 2
+  - uid: 11902
+    components:
+    - type: Transform
+      pos: 77.5,-55.5
       parent: 2
   - uid: 12409
     components:
@@ -10713,16 +11288,16 @@ entities:
       rot: 3.141592653589793 rad
       pos: -11.5,-56.5
       parent: 2
+  - uid: 12960
+    components:
+    - type: Transform
+      pos: 43.5,-28.5
+      parent: 2
   - uid: 13804
     components:
     - type: Transform
       pos: 61.5,-24.5
       parent: 2
-  - uid: 13807
-    components:
-    - type: Transform
-      pos: 46.5,-50.5
-      parent: 2
   - uid: 13811
     components:
     - type: Transform
@@ -10738,21 +11313,31 @@ entities:
     - type: Transform
       pos: 75.5,-24.5
       parent: 2
+  - uid: 14237
+    components:
+    - type: Transform
+      pos: 57.5,-66.5
+      parent: 2
+  - uid: 14303
+    components:
+    - type: Transform
+      pos: 65.5,-65.5
+      parent: 2
   - uid: 14396
     components:
     - type: Transform
       pos: 52.5,-76.5
       parent: 2
-  - uid: 15174
-    components:
-    - type: Transform
-      pos: 49.5,-31.5
-      parent: 2
   - uid: 15470
     components:
     - type: Transform
       pos: 5.5,-72.5
       parent: 2
+  - uid: 16387
+    components:
+    - type: Transform
+      pos: 37.5,-77.5
+      parent: 2
   - uid: 18040
     components:
     - type: Transform
@@ -10770,19 +11355,14 @@ entities:
       parent: 2
 - proto: AirSensor
   entities:
-  - uid: 579
-    components:
-    - type: Transform
-      pos: 49.5,-97.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 14759
   - uid: 1800
     components:
     - type: Transform
       pos: 40.5,-40.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9241
   - uid: 2195
     components:
     - type: Transform
@@ -10807,6 +11387,22 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 9403
+  - uid: 3747
+    components:
+    - type: Transform
+      pos: 86.5,-45.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 10839
+  - uid: 6423
+    components:
+    - type: Transform
+      pos: 35.5,-29.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 7582
   - uid: 6602
     components:
     - type: Transform
@@ -10828,9 +11424,6 @@ entities:
     - type: Transform
       pos: -1.5,-69.5
       parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 569
   - uid: 6615
     components:
     - type: Transform
@@ -10847,14 +11440,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 9240
-  - uid: 7103
-    components:
-    - type: Transform
-      pos: 67.5,-42.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7953
   - uid: 7956
     components:
     - type: Transform
@@ -10900,6 +11485,9 @@ entities:
     - type: Transform
       pos: -64.5,-62.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9262
   - uid: 8643
     components:
     - type: Transform
@@ -10948,19 +11536,14 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 6406
-  - uid: 8685
-    components:
-    - type: Transform
-      pos: 34.5,-25.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6353
   - uid: 8712
     components:
     - type: Transform
       pos: 9.5,-16.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 14636
   - uid: 8715
     components:
     - type: Transform
@@ -10990,6 +11573,9 @@ entities:
     - type: Transform
       pos: -21.5,-50.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6407
   - uid: 8722
     components:
     - type: Transform
@@ -11029,23 +11615,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 6358
-  - uid: 8743
-    components:
-    - type: Transform
-      pos: -36.5,-43.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9190
-  - uid: 8744
-    components:
-    - type: Transform
-      pos: -9.5,-52.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 5526
+      - 19876
   - uid: 8745
     components:
     - type: Transform
@@ -11053,16 +11623,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 6418
       - 3424
-  - uid: 8746
-    components:
-    - type: Transform
-      pos: 74.5,-64.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6360
   - uid: 8752
     components:
     - type: Transform
@@ -11084,6 +11645,9 @@ entities:
     - type: Transform
       pos: 4.5,-53.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9216
   - uid: 8760
     components:
     - type: Transform
@@ -11121,14 +11685,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 18818
-  - uid: 8779
-    components:
-    - type: Transform
-      pos: 29.5,-15.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 19354
   - uid: 8791
     components:
     - type: Transform
@@ -11145,14 +11701,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 19200
-  - uid: 8797
-    components:
-    - type: Transform
-      pos: 29.5,-19.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6354
   - uid: 8814
     components:
     - type: Transform
@@ -11171,9 +11719,6 @@ entities:
     - type: Transform
       pos: 2.5,-32.5
       parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 8767
   - uid: 9606
     components:
     - type: Transform
@@ -11182,14 +11727,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 14458
-  - uid: 9643
-    components:
-    - type: Transform
-      pos: 24.5,-19.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 18598
   - uid: 9647
     components:
     - type: Transform
@@ -11206,14 +11743,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 469
-  - uid: 9822
-    components:
-    - type: Transform
-      pos: 24.5,-34.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9040
   - uid: 10030
     components:
     - type: Transform
@@ -11227,6 +11756,9 @@ entities:
     - type: Transform
       pos: 7.5,-20.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19836
   - uid: 10154
     components:
     - type: Transform
@@ -11251,6 +11783,14 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 9195
+  - uid: 15526
+    components:
+    - type: Transform
+      pos: 24.5,-26.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16367
   - uid: 15636
     components:
     - type: Transform
@@ -11258,7 +11798,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18598
+      - 10761
   - uid: 15637
     components:
     - type: Transform
@@ -11297,30 +11837,40 @@ entities:
     - type: Transform
       pos: -20.5,-47.5
       parent: 2
-  - uid: 18061
+  - uid: 17995
     components:
     - type: Transform
-      pos: 57.5,-23.5
+      pos: 61.5,-42.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18874
-  - uid: 18127
+      - 16312
+  - uid: 17996
     components:
     - type: Transform
-      pos: 84.5,-45.5
+      pos: 70.5,-44.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 467
+      - 16356
+  - uid: 17997
+    components:
+    - type: Transform
+      pos: 65.5,-39.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16354
+  - uid: 17998
+    components:
+    - type: Transform
+      pos: 64.5,-32.5
+      parent: 2
   - uid: 18546
     components:
     - type: Transform
       pos: 13.5,-24.5
       parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 14642
   - uid: 18547
     components:
     - type: Transform
@@ -11342,19 +11892,22 @@ entities:
     - type: Transform
       pos: -33.5,-11.5
       parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9198
   - uid: 18793
     components:
     - type: Transform
       pos: -28.5,-17.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 15885
   - uid: 18794
     components:
     - type: Transform
       pos: -22.5,-12.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 15885
   - uid: 18799
     components:
     - type: Transform
@@ -11394,7 +11947,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 9243
+      - 19880
   - uid: 18812
     components:
     - type: Transform
@@ -11403,14 +11956,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 572
-  - uid: 18827
-    components:
-    - type: Transform
-      pos: 34.5,-21.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 18873
   - uid: 18828
     components:
     - type: Transform
@@ -11418,7 +11963,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18873
+      - 19856
   - uid: 18841
     components:
     - type: Transform
@@ -11467,12 +12012,77 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 364
-- proto: AltarConvertMaint
-  entities:
-  - uid: 8374
+  - uid: 19813
     components:
     - type: Transform
-      pos: -41.5,-76.5
+      pos: -36.5,-40.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9190
+  - uid: 19814
+    components:
+    - type: Transform
+      pos: -36.5,-50.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9190
+  - uid: 19819
+    components:
+    - type: Transform
+      pos: -10.5,-48.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 5526
+  - uid: 19870
+    components:
+    - type: Transform
+      pos: 54.5,-23.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 579
+  - uid: 19872
+    components:
+    - type: Transform
+      pos: 61.5,-17.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 18818
+  - uid: 19899
+    components:
+    - type: Transform
+      pos: 9.5,-78.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9239
+  - uid: 19923
+    components:
+    - type: Transform
+      pos: 58.5,-71.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19922
+  - uid: 19924
+    components:
+    - type: Transform
+      pos: 50.5,-101.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 14759
+- proto: AltarConvertMaint
+  entities:
+  - uid: 17343
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -40.5,-77.5
       parent: 2
 - proto: AltarSpawner
   entities:
@@ -11493,6 +12103,13 @@ entities:
     - type: Transform
       pos: -10.5,-35.5
       parent: 2
+- proto: AnalysisComputerCircuitboard
+  entities:
+  - uid: 17120
+    components:
+    - type: Transform
+      pos: -40.61705,-80.25643
+      parent: 2
 - proto: AnomalyScanner
   entities:
   - uid: 8653
@@ -11522,6 +12139,22 @@ entities:
       parent: 2
 - proto: APCBasic
   entities:
+  - uid: 295
+    components:
+    - type: MetaData
+      name: Virology APC
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 34.5,-19.5
+      parent: 2
+  - uid: 474
+    components:
+    - type: MetaData
+      name: Morgue APC
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 27.5,-26.5
+      parent: 2
   - uid: 3106
     components:
     - type: MetaData
@@ -11530,20 +12163,36 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -15.5,-16.5
       parent: 2
-  - uid: 3653
+  - uid: 3338
     components:
     - type: MetaData
       name: Disposals APC
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 57.5,-68.5
+      pos: 72.5,-62.5
       parent: 2
-  - uid: 5615
+  - uid: 3733
     components:
     - type: MetaData
-      name: Detective's Office APC
+      name: D.I.Y. Bar APC
     - type: Transform
-      pos: 67.5,-49.5
+      rot: 3.141592653589793 rad
+      pos: 58.5,-66.5
+      parent: 2
+  - uid: 4618
+    components:
+    - type: MetaData
+      name: Security Main APC
+    - type: Transform
+      pos: 54.5,-31.5
+      parent: 2
+  - uid: 4912
+    components:
+    - type: MetaData
+      name: Warden's Office APC
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 53.5,-37.5
       parent: 2
   - uid: 5884
     components:
@@ -11561,22 +12210,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -50.5,-42.5
       parent: 2
-  - uid: 7302
-    components:
-    - type: MetaData
-      name: AI Upload APC
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 75.5,-44.5
-      parent: 2
-  - uid: 7963
-    components:
-    - type: MetaData
-      name: Armory APC
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 63.5,-56.5
-      parent: 2
   - uid: 8197
     components:
     - type: MetaData
@@ -11593,35 +12226,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: 38.5,-72.5
       parent: 2
-  - uid: 9341
+  - uid: 9317
     components:
     - type: MetaData
-      name: Genpop Lockers APC
+      name: AI Upload APC
     - type: Transform
-      pos: 65.5,-30.5
-      parent: 2
-  - uid: 10250
-    components:
-    - type: MetaData
-      name: Warden's Office APC
-    - type: Transform
-      pos: 60.5,-40.5
-      parent: 2
-  - uid: 10276
-    components:
-    - type: MetaData
-      name: HoS' Office APC
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 72.5,-46.5
-      parent: 2
-  - uid: 10284
-    components:
-    - type: MetaData
-      name: Security APC
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 66.5,-39.5
+      rot: 1.5707963267948966 rad
+      pos: 77.5,-44.5
       parent: 2
   - uid: 10475
     components:
@@ -11730,14 +12341,6 @@ entities:
     - type: Transform
       pos: 43.5,-39.5
       parent: 2
-  - uid: 10503
-    components:
-    - type: MetaData
-      name: Virology / Morgue APC
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 30.5,-24.5
-      parent: 2
   - uid: 10504
     components:
     - type: MetaData
@@ -11777,26 +12380,11 @@ entities:
   - uid: 10512
     components:
     - type: MetaData
-      name: Maints shop APC
+      name: Maints Shop APC
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 72.5,-20.5
       parent: 2
-  - uid: 10515
-    components:
-    - type: MetaData
-      name: Maints Bar APC
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 73.5,-66.5
-      parent: 2
-  - uid: 10516
-    components:
-    - type: MetaData
-      name: AI Core APC
-    - type: Transform
-      pos: 93.5,-46.5
-      parent: 2
   - uid: 10518
     components:
     - type: MetaData
@@ -11819,6 +12407,13 @@ entities:
     - type: Transform
       pos: -6.5,-76.5
       parent: 2
+  - uid: 10838
+    components:
+    - type: MetaData
+      name: AI Core APC
+    - type: Transform
+      pos: 95.5,-46.5
+      parent: 2
   - uid: 10918
     components:
     - type: MetaData
@@ -11864,6 +12459,22 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -9.5,-22.5
       parent: 2
+  - uid: 11637
+    components:
+    - type: MetaData
+      name: Genpop Lockers APC
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 65.5,-30.5
+      parent: 2
+  - uid: 11638
+    components:
+    - type: MetaData
+      name: Security Offices APC
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 67.5,-48.5
+      parent: 2
   - uid: 11956
     components:
     - type: MetaData
@@ -11894,14 +12505,6 @@ entities:
     - type: Transform
       pos: 28.5,-59.5
       parent: 2
-  - uid: 12929
-    components:
-    - type: MetaData
-      name: Bar Maints APC
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 48.5,-34.5
-      parent: 2
   - uid: 13030
     components:
     - type: MetaData
@@ -11910,6 +12513,22 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,-18.5
       parent: 2
+  - uid: 13649
+    components:
+    - type: MetaData
+      name: Armory APC
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 57.5,-48.5
+      parent: 2
+  - uid: 13857
+    components:
+    - type: MetaData
+      name: Security Hallway APC
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 49.5,-45.5
+      parent: 2
   - uid: 13911
     components:
     - type: MetaData
@@ -11943,7 +12562,7 @@ entities:
   - uid: 17057
     components:
     - type: MetaData
-      name: Law APC
+      name: Lawyer's Office APC
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 50.5,-57.5
@@ -11994,6 +12613,14 @@ entities:
       rot: 3.141592653589793 rad
       pos: -33.5,-17.5
       parent: 2
+  - uid: 19925
+    components:
+    - type: MetaData
+      name: Visitor Docks APC
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 24.5,-15.5
+      parent: 2
 - proto: APCHighCapacity
   entities:
   - uid: 1126
@@ -12032,6 +12659,11 @@ entities:
       parent: 2
 - proto: ArtifactAnalyzerMachineCircuitboard
   entities:
+  - uid: 1801
+    components:
+    - type: Transform
+      pos: -40.408714,-80.51703
+      parent: 2
   - uid: 8509
     components:
     - type: Transform
@@ -12042,15 +12674,10 @@ entities:
   - uid: 18616
     components:
     - type: Transform
-      pos: 76.62189,-43.345737
+      pos: 78.645355,-43.3176
       parent: 2
 - proto: Ashtray
   entities:
-  - uid: 3020
-    components:
-    - type: Transform
-      pos: 49.633816,-49.261665
-      parent: 2
   - uid: 15122
     components:
     - type: Transform
@@ -12076,10 +12703,16 @@ entities:
   - uid: 18617
     components:
     - type: Transform
-      pos: 78.0073,-43.64803
+      pos: 80.05838,-43.49481
       parent: 2
 - proto: AtmosDeviceFanDirectional
   entities:
+  - uid: 753
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 39.5,-37.5
+      parent: 2
   - uid: 910
     components:
     - type: Transform
@@ -12163,17 +12796,11 @@ entities:
     - type: Transform
       pos: 52.5,-104.5
       parent: 2
-  - uid: 6261
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 45.5,-43.5
-      parent: 2
-  - uid: 7286
+  - uid: 12886
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 47.5,-46.5
+      pos: 42.5,-39.5
       parent: 2
   - uid: 18062
     components:
@@ -12297,95 +12924,100 @@ entities:
       parent: 2
 - proto: AtmosFixFreezerMarker
   entities:
-  - uid: 8348
+  - uid: 2269
     components:
     - type: Transform
-      pos: 47.5,-42.5
+      pos: 40.5,-36.5
       parent: 2
-  - uid: 16342
+  - uid: 2320
     components:
     - type: Transform
-      pos: 46.5,-42.5
+      pos: 40.5,-38.5
       parent: 2
-  - uid: 16343
+  - uid: 3379
     components:
     - type: Transform
-      pos: 47.5,-43.5
+      pos: 40.5,-37.5
       parent: 2
-  - uid: 16353
+  - uid: 3500
     components:
     - type: Transform
-      pos: 46.5,-43.5
+      pos: 43.5,-36.5
       parent: 2
-  - uid: 16354
+  - uid: 3501
     components:
     - type: Transform
-      pos: 46.5,-44.5
+      pos: 42.5,-36.5
       parent: 2
-  - uid: 16355
+  - uid: 3555
     components:
     - type: Transform
-      pos: 46.5,-45.5
+      pos: 44.5,-36.5
       parent: 2
-  - uid: 16356
+  - uid: 3556
     components:
     - type: Transform
-      pos: 47.5,-45.5
+      pos: 44.5,-37.5
       parent: 2
-  - uid: 16357
+  - uid: 3606
     components:
     - type: Transform
-      pos: 47.5,-44.5
+      pos: 45.5,-36.5
       parent: 2
-  - uid: 16358
+  - uid: 3935
     components:
     - type: Transform
-      pos: 48.5,-44.5
+      pos: 44.5,-38.5
       parent: 2
-  - uid: 16359
+  - uid: 3963
     components:
     - type: Transform
-      pos: 48.5,-45.5
+      pos: 43.5,-38.5
       parent: 2
-  - uid: 16360
+  - uid: 4047
     components:
     - type: Transform
-      pos: 48.5,-43.5
+      pos: 42.5,-37.5
       parent: 2
-  - uid: 16361
+  - uid: 4077
     components:
     - type: Transform
-      pos: 48.5,-42.5
+      pos: 42.5,-38.5
       parent: 2
-  - uid: 16362
+  - uid: 4636
     components:
     - type: Transform
-      pos: 48.5,-41.5
+      pos: 41.5,-38.5
       parent: 2
-  - uid: 16363
+  - uid: 4637
     components:
     - type: Transform
-      pos: 47.5,-41.5
+      pos: 43.5,-37.5
       parent: 2
-  - uid: 16365
+  - uid: 4864
     components:
     - type: Transform
-      pos: 46.5,-41.5
+      pos: 45.5,-38.5
       parent: 2
-  - uid: 16366
+  - uid: 4910
     components:
     - type: Transform
-      pos: 46.5,-40.5
+      pos: 45.5,-37.5
       parent: 2
-  - uid: 16367
+  - uid: 5834
     components:
     - type: Transform
-      pos: 47.5,-40.5
+      pos: 45.5,-35.5
       parent: 2
-  - uid: 16368
+  - uid: 8146
     components:
     - type: Transform
-      pos: 48.5,-40.5
+      pos: 41.5,-36.5
+      parent: 2
+  - uid: 12703
+    components:
+    - type: Transform
+      pos: 41.5,-37.5
       parent: 2
 - proto: AtmosFixNitrogenMarker
   entities:
@@ -12462,6 +13094,13 @@ entities:
     - type: Transform
       pos: -64.37506,-61.441326
       parent: 2
+- proto: BanjoInstrument
+  entities:
+  - uid: 285
+    components:
+    - type: Transform
+      pos: -61.48744,-25.476637
+      parent: 2
 - proto: BannerCargo
   entities:
   - uid: 6762
@@ -12476,64 +13115,63 @@ entities:
       parent: 2
 - proto: BarricadeBlock
   entities:
-  - uid: 6280
+  - uid: 6277
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 79.5,-30.5
+      pos: 76.5,-40.5
+      parent: 2
+  - uid: 7590
+    components:
+    - type: Transform
+      pos: 80.5,-27.5
       parent: 2
   - uid: 11847
     components:
     - type: Transform
       pos: 75.5,-24.5
       parent: 2
-  - uid: 18263
-    components:
-    - type: Transform
-      pos: 74.5,-42.5
-      parent: 2
 - proto: BarricadeDirectional
   entities:
-  - uid: 7120
+  - uid: 7258
     components:
     - type: Transform
-      pos: 79.5,-29.5
+      pos: 80.5,-26.5
+      parent: 2
+  - uid: 7380
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 76.5,-41.5
       parent: 2
   - uid: 13938
     components:
     - type: Transform
       pos: 75.5,-23.5
       parent: 2
-  - uid: 13943
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 74.5,-43.5
-      parent: 2
 - proto: BarSign
   entities:
-  - uid: 5872
-    components:
-    - type: Transform
-      pos: 72.5,-60.5
-      parent: 2
   - uid: 7070
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 26.5,-41.5
       parent: 2
+  - uid: 20080
+    components:
+    - type: Transform
+      pos: 60.5,-66.5
+      parent: 2
 - proto: BaseChemistryEmptyVial
   entities:
-  - uid: 6023
+  - uid: 10854
     components:
     - type: Transform
-      pos: 37.30002,-29.200367
+      pos: 68.31389,-65.30021
       parent: 2
-  - uid: 6047
+  - uid: 11687
     components:
     - type: Transform
-      pos: 42.366875,-29.288502
+      pos: 66.68898,-62.46224
       parent: 2
   - uid: 17573
     components:
@@ -12598,10 +13236,10 @@ entities:
     - type: Transform
       pos: 44.38433,-15.204194
       parent: 2
-  - uid: 9389
+  - uid: 10859
     components:
     - type: Transform
-      pos: 37.64377,-28.731617
+      pos: 67.048355,-62.27461
       parent: 2
   - uid: 15421
     components:
@@ -12615,10 +13253,15 @@ entities:
     - type: Transform
       pos: 10.5,-14.5
       parent: 2
-  - uid: 811
+  - uid: 1196
     components:
     - type: Transform
-      pos: 42.5,-28.5
+      pos: 70.5,-53.5
+      parent: 2
+  - uid: 3538
+    components:
+    - type: Transform
+      pos: 54.5,-37.5
       parent: 2
   - uid: 4721
     components:
@@ -12675,31 +13318,26 @@ entities:
     - type: Transform
       pos: 32.5,-50.5
       parent: 2
-  - uid: 7084
-    components:
-    - type: Transform
-      pos: 57.5,-43.5
-      parent: 2
   - uid: 7735
     components:
     - type: Transform
       pos: -30.5,-64.5
       parent: 2
-  - uid: 7979
+  - uid: 8347
     components:
     - type: Transform
-      pos: 71.5,-47.5
+      pos: 68.5,-66.5
+      parent: 2
+  - uid: 10670
+    components:
+    - type: Transform
+      pos: 43.5,-16.5
       parent: 2
   - uid: 13893
     components:
     - type: Transform
       pos: 42.5,-17.5
       parent: 2
-  - uid: 14263
-    components:
-    - type: Transform
-      pos: 42.5,-16.5
-      parent: 2
 - proto: BedsheetBlack
   entities:
   - uid: 5669
@@ -12709,11 +13347,17 @@ entities:
       parent: 2
 - proto: BedsheetBrigmedic
   entities:
-  - uid: 19421
+  - uid: 3479
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 60.5,-31.5
+      pos: 50.5,-32.5
+      parent: 2
+  - uid: 3502
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 50.5,-33.5
       parent: 2
 - proto: BedsheetCaptain
   entities:
@@ -12746,10 +13390,10 @@ entities:
       parent: 2
 - proto: BedsheetGreen
   entities:
-  - uid: 7791
+  - uid: 9357
     components:
     - type: Transform
-      pos: 31.5,-11.5
+      pos: 32.5,-11.5
       parent: 2
 - proto: BedsheetHOP
   entities:
@@ -12760,10 +13404,10 @@ entities:
       parent: 2
 - proto: BedsheetHOS
   entities:
-  - uid: 14824
+  - uid: 7105
     components:
     - type: Transform
-      pos: 71.5,-47.5
+      pos: 70.5,-53.5
       parent: 2
 - proto: BedsheetMedical
   entities:
@@ -12823,18 +13467,18 @@ entities:
       parent: 2
 - proto: BedsheetOrange
   entities:
+  - uid: 10777
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 43.5,-16.5
+      parent: 2
   - uid: 14264
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 42.5,-17.5
       parent: 2
-  - uid: 14265
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 42.5,-16.5
-      parent: 2
 - proto: BedsheetQM
   entities:
   - uid: 6830
@@ -12852,10 +13496,10 @@ entities:
       parent: 2
 - proto: BedsheetRed
   entities:
-  - uid: 7095
+  - uid: 7131
     components:
     - type: Transform
-      pos: 57.5,-43.5
+      pos: 54.5,-37.5
       parent: 2
 - proto: BedsheetSpawner
   entities:
@@ -12915,25 +13559,25 @@ entities:
     - type: Transform
       pos: -15.5,-67.5
       parent: 2
-  - uid: 4366
+  - uid: 3324
     components:
     - type: Transform
-      pos: 60.5,-53.5
+      pos: 58.5,-45.5
       parent: 2
-  - uid: 4377
+  - uid: 3548
     components:
     - type: Transform
-      pos: 58.5,-53.5
+      pos: 60.5,-45.5
       parent: 2
-  - uid: 4380
+  - uid: 3867
     components:
     - type: Transform
-      pos: 61.5,-53.5
+      pos: 59.5,-45.5
       parent: 2
-  - uid: 13934
+  - uid: 4000
     components:
     - type: Transform
-      pos: 59.5,-53.5
+      pos: 61.5,-45.5
       parent: 2
   - uid: 18451
     components:
@@ -12958,11 +13602,6 @@ entities:
     - type: Transform
       pos: 31.5,-10.5
       parent: 2
-  - uid: 625
-    components:
-    - type: Transform
-      pos: 30.5,-10.5
-      parent: 2
   - uid: 626
     components:
     - type: Transform
@@ -13030,10 +13669,15 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -21.5,-31.5
       parent: 2
-  - uid: 7185
+  - uid: 9352
     components:
     - type: Transform
-      pos: 59.5,-78.5
+      pos: 32.5,-10.5
+      parent: 2
+  - uid: 11883
+    components:
+    - type: Transform
+      pos: 72.5,-73.5
       parent: 2
 - proto: BlastDoorXenoOpen
   entities:
@@ -13151,12 +13795,12 @@ entities:
   - uid: 13193
     components:
     - type: Transform
-      pos: 27.248169,-28.225496
+      pos: 27.34858,-28.666481
       parent: 2
   - uid: 13206
     components:
     - type: Transform
-      pos: 27.539835,-28.350582
+      pos: 27.69233,-28.947927
       parent: 2
   - uid: 16847
     components:
@@ -13165,15 +13809,15 @@ entities:
       parent: 2
 - proto: Bola
   entities:
-  - uid: 14582
+  - uid: 16291
     components:
     - type: Transform
-      pos: 60.580673,-36.178726
+      pos: 72.450516,-40.26418
       parent: 2
-  - uid: 16109
+  - uid: 16311
     components:
     - type: Transform
-      pos: 60.719563,-36.428898
+      pos: 72.64801,-40.45181
       parent: 2
 - proto: Bonfire
   entities:
@@ -13314,17 +13958,16 @@ entities:
     - type: Transform
       pos: 11.5,-15.5
       parent: 2
+  - uid: 5306
+    components:
+    - type: Transform
+      pos: 60.5,-67.5
+      parent: 2
   - uid: 5493
     components:
     - type: Transform
       pos: -45.5,-52.5
       parent: 2
-  - uid: 6630
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 72.5,-52.5
-      parent: 2
   - uid: 6844
     components:
     - type: Transform
@@ -13337,11 +13980,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 36.5,-46.5
       parent: 2
-  - uid: 8083
+  - uid: 10258
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 69.5,-62.5
+      rot: -1.5707963267948966 rad
+      pos: 73.5,-48.5
       parent: 2
 - proto: BorgCharger
   entities:
@@ -13361,29 +14004,16 @@ entities:
     - type: Transform
       pos: -10.5,-23.5
       parent: 2
-  - uid: 11684
+  - uid: 14835
     components:
     - type: Transform
-      pos: 33.5,-11.5
+      pos: 93.5,-40.5
+      parent: 2
+  - uid: 14836
+    components:
+    - type: Transform
+      pos: 93.5,-50.5
       parent: 2
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14673
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
   - uid: 17415
     components:
     - type: Transform
@@ -13394,16 +14024,6 @@ entities:
     - type: Transform
       pos: -40.5,-61.5
       parent: 2
-  - uid: 18887
-    components:
-    - type: Transform
-      pos: 91.5,-40.5
-      parent: 2
-  - uid: 18888
-    components:
-    - type: Transform
-      pos: 91.5,-50.5
-      parent: 2
   - uid: 19481
     components:
     - type: Transform
@@ -13414,13 +14034,6 @@ entities:
     - type: Transform
       pos: 30.5,-46.5
       parent: 2
-- proto: BorgModuleTool
-  entities:
-  - uid: 17951
-    components:
-    - type: Transform
-      pos: 35.857727,-13.805476
-      parent: 2
 - proto: BoxBeaker
   entities:
   - uid: 7456
@@ -13438,7 +14051,7 @@ entities:
   - uid: 13160
     components:
     - type: Transform
-      pos: 27.352335,-27.339464
+      pos: 27.41108,-29.35446
       parent: 2
   - uid: 16848
     components:
@@ -13459,13 +14072,6 @@ entities:
       parent: 2
 - proto: BoxCartridgeCap
   entities:
-  - uid: 6029
-    components:
-    - type: Transform
-      parent: 2004
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
   - uid: 17387
     components:
     - type: Transform
@@ -13481,29 +14087,28 @@ entities:
   - uid: 7965
     components:
     - type: Transform
-      pos: 64.38522,-69.34135
+      pos: 69.54453,-60.30261
       parent: 2
 - proto: BoxFlashbang
   entities:
   - uid: 19251
     components:
     - type: Transform
-      pos: 60.50701,-57.15892
+      pos: 60.476963,-49.15756
       parent: 2
 - proto: BoxFolderBase
   entities:
-  - uid: 15225
+  - uid: 8079
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 37.64377,-29.309742
+      pos: 67.5849,-62.318325
       parent: 2
 - proto: BoxFolderBlack
   entities:
   - uid: 3522
     components:
     - type: Transform
-      pos: 53.386242,-56.416996
+      pos: 53.62837,-55.43601
       parent: 2
   - uid: 18172
     components:
@@ -13549,14 +14154,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -48.45786,-44.761845
       parent: 2
-- proto: BoxFolderGreen
-  entities:
-  - uid: 18186
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 28.48726,-17.412195
-      parent: 2
 - proto: BoxFolderGrey
   entities:
   - uid: 5062
@@ -13576,10 +14173,10 @@ entities:
       parent: 2
 - proto: BoxFolderRed
   entities:
-  - uid: 197
+  - uid: 10268
     components:
     - type: Transform
-      pos: 69.42398,-50.73358
+      pos: 70.4067,-46.639835
       parent: 2
   - uid: 18171
     components:
@@ -13615,7 +14212,7 @@ entities:
   - uid: 5243
     components:
     - type: Transform
-      pos: 19.54645,-17.287466
+      pos: 19.714624,-17.186592
       parent: 2
   - uid: 13336
     components:
@@ -13627,12 +14224,12 @@ entities:
   - uid: 11826
     components:
     - type: Transform
-      pos: 68.74172,-31.31939
+      pos: 69.64778,-32.437996
       parent: 2
   - uid: 13945
     components:
     - type: Transform
-      pos: 68.42691,-31.195847
+      pos: 69.408195,-32.385876
       parent: 2
 - proto: BoxLightbulb
   entities:
@@ -13646,11 +14243,6 @@ entities:
     - type: Transform
       pos: 32.59527,-78.26717
       parent: 2
-  - uid: 17793
-    components:
-    - type: Transform
-      pos: 71.517525,-59.410625
-      parent: 2
   - uid: 17795
     components:
     - type: Transform
@@ -13658,11 +14250,6 @@ entities:
       parent: 2
 - proto: BoxLightMixed
   entities:
-  - uid: 16895
-    components:
-    - type: Transform
-      pos: 53.617245,-30.419283
-      parent: 2
   - uid: 18131
     components:
     - type: Transform
@@ -13695,21 +14282,21 @@ entities:
   - uid: 19250
     components:
     - type: Transform
-      pos: 60.26743,-57.45079
+      pos: 60.372795,-49.240948
       parent: 2
 - proto: BoxMouthSwab
   entities:
-  - uid: 7787
+  - uid: 7771
     components:
     - type: Transform
-      pos: 27.498543,-16.372534
+      pos: 34.507298,-13.337973
       parent: 2
 - proto: BoxStinger
   entities:
   - uid: 19252
     components:
     - type: Transform
-      pos: 60.38201,-57.304855
+      pos: 60.572186,-49.080368
       parent: 2
 - proto: BoxSyringe
   entities:
@@ -13718,6 +14305,13 @@ entities:
     - type: Transform
       pos: 21.570786,-31.379005
       parent: 2
+- proto: BoxVial
+  entities:
+  - uid: 7789
+    components:
+    - type: Transform
+      pos: 36.569798,-12.369223
+      parent: 2
 - proto: BrbSign
   entities:
   - uid: 18161
@@ -13737,12 +14331,7 @@ entities:
   - uid: 9364
     components:
     - type: Transform
-      pos: 55.399124,-54.352894
-      parent: 2
-  - uid: 17420
-    components:
-    - type: Transform
-      pos: 46.49753,-47.4596
+      pos: 55.498257,-56.247276
       parent: 2
   - uid: 19673
     components:
@@ -13845,18 +14434,18 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 26.5,-100.5
       parent: 2
-  - uid: 7321
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 36.5,-25.5
-      parent: 2
   - uid: 8851
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -20.5,-18.5
       parent: 2
+  - uid: 15697
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 36.5,-27.5
+      parent: 2
   - uid: 17653
     components:
     - type: Transform
@@ -13897,6 +14486,12 @@ entities:
     - type: Transform
       pos: -63.5,-60.5
       parent: 2
+  - uid: 6096
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 60.5,-37.5
+      parent: 2
   - uid: 6226
     components:
     - type: Transform
@@ -13909,18 +14504,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -63.5,-30.5
       parent: 2
-  - uid: 7771
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 32.5,-14.5
-      parent: 2
-  - uid: 14247
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 61.5,-44.5
-      parent: 2
   - uid: 17743
     components:
     - type: Transform
@@ -13956,23 +14539,17 @@ entities:
     - type: Transform
       pos: 22.5,-90.5
       parent: 2
-  - uid: 7067
+  - uid: 7178
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 66.5,-48.5
+      pos: 65.5,-53.5
       parent: 2
-  - uid: 7320
+  - uid: 15699
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 36.5,-27.5
-      parent: 2
-  - uid: 7808
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 27.5,-24.5
+      pos: 36.5,-29.5
       parent: 2
   - uid: 16618
     components:
@@ -13980,12 +14557,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 10.5,-76.5
       parent: 2
-  - uid: 19186
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 21.5,-24.5
-      parent: 2
 - proto: ButtonFrameJanitor
   entities:
   - uid: 5811
@@ -14000,15 +14571,15 @@ entities:
     - type: Transform
       pos: 6.5,-78.5
       parent: 2
-  - uid: 287
+  - uid: 234
     components:
     - type: Transform
-      pos: 66.5,-64.5
+      pos: 32.5,-10.5
       parent: 2
   - uid: 351
     components:
     - type: Transform
-      pos: 61.5,-68.5
+      pos: 57.5,-70.5
       parent: 2
   - uid: 391
     components:
@@ -14045,10 +14616,10 @@ entities:
     - type: Transform
       pos: -27.5,-15.5
       parent: 2
-  - uid: 822
+  - uid: 717
     components:
     - type: Transform
-      pos: 44.5,-29.5
+      pos: 2.5,-59.5
       parent: 2
   - uid: 903
     components:
@@ -14075,36 +14646,26 @@ entities:
     - type: Transform
       pos: -51.5,-37.5
       parent: 2
-  - uid: 1073
+  - uid: 1063
     components:
     - type: Transform
-      pos: 76.5,-41.5
+      pos: 35.5,-28.5
       parent: 2
   - uid: 1096
     components:
     - type: Transform
       pos: -26.5,-15.5
       parent: 2
+  - uid: 1111
+    components:
+    - type: Transform
+      pos: 62.5,-64.5
+      parent: 2
   - uid: 1130
     components:
     - type: Transform
       pos: -22.5,-18.5
       parent: 2
-  - uid: 1140
-    components:
-    - type: Transform
-      pos: 77.5,-41.5
-      parent: 2
-  - uid: 1158
-    components:
-    - type: Transform
-      pos: 64.5,-41.5
-      parent: 2
-  - uid: 1169
-    components:
-    - type: Transform
-      pos: 63.5,-45.5
-      parent: 2
   - uid: 1172
     components:
     - type: Transform
@@ -14150,11 +14711,6 @@ entities:
     - type: Transform
       pos: -37.5,-12.5
       parent: 2
-  - uid: 1546
-    components:
-    - type: Transform
-      pos: 72.5,-36.5
-      parent: 2
   - uid: 1563
     components:
     - type: Transform
@@ -14175,11 +14731,36 @@ entities:
     - type: Transform
       pos: -13.5,-16.5
       parent: 2
+  - uid: 1998
+    components:
+    - type: Transform
+      pos: 75.5,-43.5
+      parent: 2
+  - uid: 2005
+    components:
+    - type: Transform
+      pos: -39.5,-79.5
+      parent: 2
+  - uid: 2006
+    components:
+    - type: Transform
+      pos: -40.5,-79.5
+      parent: 2
+  - uid: 2007
+    components:
+    - type: Transform
+      pos: -41.5,-79.5
+      parent: 2
   - uid: 2241
     components:
     - type: Transform
       pos: -16.5,-74.5
       parent: 2
+  - uid: 2246
+    components:
+    - type: Transform
+      pos: 38.5,-28.5
+      parent: 2
   - uid: 2275
     components:
     - type: Transform
@@ -14205,21 +14786,26 @@ entities:
     - type: Transform
       pos: 18.5,-84.5
       parent: 2
-  - uid: 2735
+  - uid: 2656
     components:
     - type: Transform
-      pos: 48.5,-44.5
+      pos: -41.5,-78.5
+      parent: 2
+  - uid: 2678
+    components:
+    - type: Transform
+      pos: 59.5,-72.5
+      parent: 2
+  - uid: 2739
+    components:
+    - type: Transform
+      pos: 64.5,-69.5
       parent: 2
   - uid: 2741
     components:
     - type: Transform
       pos: -7.5,-22.5
       parent: 2
-  - uid: 2767
-    components:
-    - type: Transform
-      pos: 66.5,-71.5
-      parent: 2
   - uid: 2936
     components:
     - type: Transform
@@ -14230,10 +14816,10 @@ entities:
     - type: Transform
       pos: 50.5,-65.5
       parent: 2
-  - uid: 3019
+  - uid: 2962
     components:
     - type: Transform
-      pos: 59.5,-80.5
+      pos: -42.5,-78.5
       parent: 2
   - uid: 3022
     components:
@@ -14250,10 +14836,10 @@ entities:
     - type: Transform
       pos: 53.5,-56.5
       parent: 2
-  - uid: 3029
+  - uid: 3032
     components:
     - type: Transform
-      pos: 59.5,-34.5
+      pos: 56.5,-75.5
       parent: 2
   - uid: 3048
     components:
@@ -14265,11 +14851,6 @@ entities:
     - type: Transform
       pos: 45.5,-72.5
       parent: 2
-  - uid: 3055
-    components:
-    - type: Transform
-      pos: 74.5,-39.5
-      parent: 2
   - uid: 3056
     components:
     - type: Transform
@@ -14280,11 +14861,6 @@ entities:
     - type: Transform
       pos: 33.5,-76.5
       parent: 2
-  - uid: 3058
-    components:
-    - type: Transform
-      pos: 38.5,-77.5
-      parent: 2
   - uid: 3063
     components:
     - type: Transform
@@ -14305,35 +14881,15 @@ entities:
     - type: Transform
       pos: 35.5,-79.5
       parent: 2
-  - uid: 3079
-    components:
-    - type: Transform
-      pos: 58.5,-81.5
-      parent: 2
-  - uid: 3080
-    components:
-    - type: Transform
-      pos: 59.5,-81.5
-      parent: 2
   - uid: 3085
     components:
     - type: Transform
       pos: 63.5,-20.5
       parent: 2
-  - uid: 3089
-    components:
-    - type: Transform
-      pos: 59.5,-76.5
-      parent: 2
-  - uid: 3090
-    components:
-    - type: Transform
-      pos: 59.5,-78.5
-      parent: 2
   - uid: 3091
     components:
     - type: Transform
-      pos: 59.5,-77.5
+      pos: 45.5,-31.5
       parent: 2
   - uid: 3095
     components:
@@ -14345,46 +14901,141 @@ entities:
     - type: Transform
       pos: 5.5,-73.5
       parent: 2
+  - uid: 3129
+    components:
+    - type: Transform
+      pos: 67.5,-72.5
+      parent: 2
+  - uid: 3147
+    components:
+    - type: Transform
+      pos: 67.5,-70.5
+      parent: 2
+  - uid: 3148
+    components:
+    - type: Transform
+      pos: 58.5,-68.5
+      parent: 2
+  - uid: 3149
+    components:
+    - type: Transform
+      pos: 45.5,-32.5
+      parent: 2
+  - uid: 3153
+    components:
+    - type: Transform
+      pos: 65.5,-69.5
+      parent: 2
+  - uid: 3157
+    components:
+    - type: Transform
+      pos: 64.5,-64.5
+      parent: 2
+  - uid: 3161
+    components:
+    - type: Transform
+      pos: 81.5,-46.5
+      parent: 2
+  - uid: 3162
+    components:
+    - type: Transform
+      pos: 81.5,-45.5
+      parent: 2
+  - uid: 3163
+    components:
+    - type: Transform
+      pos: 58.5,-59.5
+      parent: 2
+  - uid: 3180
+    components:
+    - type: Transform
+      pos: 95.5,-46.5
+      parent: 2
   - uid: 3183
     components:
     - type: Transform
       pos: 73.5,-25.5
       parent: 2
+  - uid: 3190
+    components:
+    - type: Transform
+      pos: 63.5,-64.5
+      parent: 2
   - uid: 3192
     components:
     - type: Transform
       pos: 72.5,-25.5
       parent: 2
+  - uid: 3197
+    components:
+    - type: Transform
+      pos: 43.5,-24.5
+      parent: 2
+  - uid: 3199
+    components:
+    - type: Transform
+      pos: 74.5,-27.5
+      parent: 2
+  - uid: 3200
+    components:
+    - type: Transform
+      pos: 72.5,-30.5
+      parent: 2
+  - uid: 3204
+    components:
+    - type: Transform
+      pos: 79.5,-31.5
+      parent: 2
+  - uid: 3210
+    components:
+    - type: Transform
+      pos: 78.5,-31.5
+      parent: 2
+  - uid: 3277
+    components:
+    - type: Transform
+      pos: 78.5,-37.5
+      parent: 2
+  - uid: 3280
+    components:
+    - type: Transform
+      pos: 77.5,-37.5
+      parent: 2
+  - uid: 3281
+    components:
+    - type: Transform
+      pos: 77.5,-35.5
+      parent: 2
   - uid: 3283
     components:
     - type: Transform
-      pos: 74.5,-41.5
+      pos: 74.5,-38.5
       parent: 2
   - uid: 3284
     components:
     - type: Transform
-      pos: 74.5,-40.5
+      pos: 72.5,-33.5
       parent: 2
-  - uid: 3314
+  - uid: 3285
     components:
     - type: Transform
-      pos: 57.5,-63.5
+      pos: 73.5,-33.5
       parent: 2
-  - uid: 3315
+  - uid: 3299
     components:
     - type: Transform
-      pos: 56.5,-73.5
+      pos: 73.5,-35.5
+      parent: 2
+  - uid: 3300
+    components:
+    - type: Transform
+      pos: 77.5,-28.5
       parent: 2
   - uid: 3316
     components:
     - type: Transform
       pos: 39.5,-76.5
       parent: 2
-  - uid: 3317
-    components:
-    - type: Transform
-      pos: 56.5,-75.5
-      parent: 2
   - uid: 3318
     components:
     - type: Transform
@@ -14395,105 +15046,105 @@ entities:
     - type: Transform
       pos: 43.5,-76.5
       parent: 2
+  - uid: 3333
+    components:
+    - type: Transform
+      pos: 73.5,-62.5
+      parent: 2
+  - uid: 3334
+    components:
+    - type: Transform
+      pos: 74.5,-62.5
+      parent: 2
+  - uid: 3354
+    components:
+    - type: Transform
+      pos: 77.5,-64.5
+      parent: 2
+  - uid: 3355
+    components:
+    - type: Transform
+      pos: 77.5,-63.5
+      parent: 2
   - uid: 3356
     components:
     - type: Transform
-      pos: 60.5,-72.5
+      pos: 77.5,-62.5
       parent: 2
   - uid: 3358
     components:
     - type: Transform
       pos: 40.5,-72.5
       parent: 2
+  - uid: 3361
+    components:
+    - type: Transform
+      pos: 77.5,-61.5
+      parent: 2
+  - uid: 3362
+    components:
+    - type: Transform
+      pos: 76.5,-61.5
+      parent: 2
   - uid: 3364
     components:
     - type: Transform
-      pos: 56.5,-70.5
+      pos: 75.5,-61.5
       parent: 2
   - uid: 3365
     components:
     - type: Transform
-      pos: 58.5,-70.5
+      pos: 74.5,-61.5
       parent: 2
   - uid: 3377
     components:
     - type: Transform
-      pos: 58.5,-69.5
+      pos: 58.5,-66.5
       parent: 2
   - uid: 3378
     components:
     - type: Transform
-      pos: 59.5,-67.5
+      pos: 57.5,-66.5
       parent: 2
-  - uid: 3442
+  - uid: 3387
     components:
     - type: Transform
-      pos: 52.5,-37.5
+      pos: 72.5,-62.5
       parent: 2
-  - uid: 3443
+  - uid: 3388
     components:
     - type: Transform
-      pos: 63.5,-47.5
+      pos: 43.5,-37.5
       parent: 2
-  - uid: 3450
+  - uid: 3389
     components:
     - type: Transform
-      pos: 66.5,-46.5
+      pos: 42.5,-37.5
       parent: 2
-  - uid: 3452
+  - uid: 3390
     components:
     - type: Transform
-      pos: 63.5,-56.5
+      pos: 43.5,-38.5
       parent: 2
-  - uid: 3457
+  - uid: 3426
     components:
     - type: Transform
-      pos: 67.5,-49.5
+      pos: 39.5,-28.5
       parent: 2
-  - uid: 3459
+  - uid: 3435
     components:
     - type: Transform
-      pos: 69.5,-52.5
+      pos: 30.5,-75.5
       parent: 2
-  - uid: 3460
+  - uid: 3455
     components:
     - type: Transform
-      pos: 68.5,-51.5
+      pos: 33.5,-19.5
       parent: 2
-  - uid: 3463
+  - uid: 3492
     components:
     - type: Transform
-      pos: 60.5,-58.5
-      parent: 2
-  - uid: 3464
-    components:
-    - type: Transform
-      pos: 60.5,-54.5
-      parent: 2
-  - uid: 3470
-    components:
-    - type: Transform
-      pos: 59.5,-44.5
-      parent: 2
-  - uid: 3471
-    components:
-    - type: Transform
-      pos: 59.5,-46.5
-      parent: 2
-  - uid: 3474
-    components:
-    - type: Transform
-      pos: 72.5,-46.5
-      parent: 2
-  - uid: 3479
-    components:
-    - type: Transform
-      pos: 58.5,-42.5
-      parent: 2
-  - uid: 3480
-    components:
-    - type: Transform
-      pos: 72.5,-51.5
+      pos: 34.5,-19.5
       parent: 2
   - uid: 3512
     components:
@@ -14510,11 +15161,21 @@ entities:
     - type: Transform
       pos: -14.5,-79.5
       parent: 2
+  - uid: 3554
+    components:
+    - type: Transform
+      pos: 64.5,-68.5
+      parent: 2
   - uid: 3566
     components:
     - type: Transform
       pos: 69.5,-28.5
       parent: 2
+  - uid: 3581
+    components:
+    - type: Transform
+      pos: 55.5,-44.5
+      parent: 2
   - uid: 3586
     components:
     - type: Transform
@@ -14525,30 +15186,40 @@ entities:
     - type: Transform
       pos: 63.5,-26.5
       parent: 2
+  - uid: 3607
+    components:
+    - type: Transform
+      pos: 64.5,-67.5
+      parent: 2
+  - uid: 3608
+    components:
+    - type: Transform
+      pos: 37.5,-28.5
+      parent: 2
   - uid: 3610
     components:
     - type: Transform
       pos: 47.5,-52.5
       parent: 2
-  - uid: 3612
+  - uid: 3611
     components:
     - type: Transform
-      pos: 59.5,-53.5
-      parent: 2
-  - uid: 3614
-    components:
-    - type: Transform
-      pos: 61.5,-53.5
+      pos: 39.5,-37.5
       parent: 2
   - uid: 3615
     components:
     - type: Transform
       pos: 46.5,-52.5
       parent: 2
-  - uid: 3617
+  - uid: 3622
     components:
     - type: Transform
-      pos: 60.5,-53.5
+      pos: 34.5,-29.5
+      parent: 2
+  - uid: 3623
+    components:
+    - type: Transform
+      pos: 40.5,-37.5
       parent: 2
   - uid: 3644
     components:
@@ -14565,20 +15236,200 @@ entities:
     - type: Transform
       pos: 42.5,-14.5
       parent: 2
+  - uid: 3652
+    components:
+    - type: Transform
+      pos: 51.5,-43.5
+      parent: 2
+  - uid: 3653
+    components:
+    - type: Transform
+      pos: 37.5,-34.5
+      parent: 2
   - uid: 3654
     components:
     - type: Transform
-      pos: 57.5,-81.5
+      pos: 37.5,-36.5
       parent: 2
-  - uid: 3723
+  - uid: 3661
     components:
     - type: Transform
-      pos: 44.5,-28.5
+      pos: 37.5,-33.5
       parent: 2
-  - uid: 3836
+  - uid: 3683
     components:
     - type: Transform
-      pos: 66.5,-58.5
+      pos: 64.5,-66.5
+      parent: 2
+  - uid: 3684
+    components:
+    - type: Transform
+      pos: 43.5,-27.5
+      parent: 2
+  - uid: 3686
+    components:
+    - type: Transform
+      pos: 40.5,-27.5
+      parent: 2
+  - uid: 3694
+    components:
+    - type: Transform
+      pos: 43.5,-26.5
+      parent: 2
+  - uid: 3695
+    components:
+    - type: Transform
+      pos: 45.5,-26.5
+      parent: 2
+  - uid: 3696
+    components:
+    - type: Transform
+      pos: 46.5,-27.5
+      parent: 2
+  - uid: 3698
+    components:
+    - type: Transform
+      pos: 45.5,-27.5
+      parent: 2
+  - uid: 3699
+    components:
+    - type: Transform
+      pos: 46.5,-28.5
+      parent: 2
+  - uid: 3700
+    components:
+    - type: Transform
+      pos: 45.5,-33.5
+      parent: 2
+  - uid: 3701
+    components:
+    - type: Transform
+      pos: 45.5,-35.5
+      parent: 2
+  - uid: 3702
+    components:
+    - type: Transform
+      pos: 45.5,-30.5
+      parent: 2
+  - uid: 3703
+    components:
+    - type: Transform
+      pos: 45.5,-29.5
+      parent: 2
+  - uid: 3704
+    components:
+    - type: Transform
+      pos: 45.5,-38.5
+      parent: 2
+  - uid: 3707
+    components:
+    - type: Transform
+      pos: 45.5,-36.5
+      parent: 2
+  - uid: 3712
+    components:
+    - type: Transform
+      pos: 75.5,-46.5
+      parent: 2
+  - uid: 3724
+    components:
+    - type: Transform
+      pos: 45.5,-34.5
+      parent: 2
+  - uid: 3735
+    components:
+    - type: Transform
+      pos: 29.5,-32.5
+      parent: 2
+  - uid: 3736
+    components:
+    - type: Transform
+      pos: 60.5,-68.5
+      parent: 2
+  - uid: 3740
+    components:
+    - type: Transform
+      pos: 67.5,-69.5
+      parent: 2
+  - uid: 3746
+    components:
+    - type: Transform
+      pos: 59.5,-68.5
+      parent: 2
+  - uid: 3754
+    components:
+    - type: Transform
+      pos: 91.5,-49.5
+      parent: 2
+  - uid: 3755
+    components:
+    - type: Transform
+      pos: 92.5,-49.5
+      parent: 2
+  - uid: 3761
+    components:
+    - type: Transform
+      pos: 30.5,-32.5
+      parent: 2
+  - uid: 3765
+    components:
+    - type: Transform
+      pos: 31.5,-32.5
+      parent: 2
+  - uid: 3781
+    components:
+    - type: Transform
+      pos: 74.5,-31.5
+      parent: 2
+  - uid: 3786
+    components:
+    - type: Transform
+      pos: 77.5,-31.5
+      parent: 2
+  - uid: 3794
+    components:
+    - type: Transform
+      pos: 77.5,-29.5
+      parent: 2
+  - uid: 3795
+    components:
+    - type: Transform
+      pos: 76.5,-31.5
+      parent: 2
+  - uid: 3796
+    components:
+    - type: Transform
+      pos: 74.5,-32.5
+      parent: 2
+  - uid: 3800
+    components:
+    - type: Transform
+      pos: 76.5,-26.5
+      parent: 2
+  - uid: 3802
+    components:
+    - type: Transform
+      pos: 74.5,-39.5
+      parent: 2
+  - uid: 3803
+    components:
+    - type: Transform
+      pos: 74.5,-37.5
+      parent: 2
+  - uid: 3804
+    components:
+    - type: Transform
+      pos: 72.5,-35.5
+      parent: 2
+  - uid: 3807
+    components:
+    - type: Transform
+      pos: 74.5,-36.5
+      parent: 2
+  - uid: 3808
+    components:
+    - type: Transform
+      pos: 77.5,-27.5
       parent: 2
   - uid: 3921
     components:
@@ -14600,16 +15451,6 @@ entities:
     - type: Transform
       pos: 42.5,-72.5
       parent: 2
-  - uid: 3934
-    components:
-    - type: Transform
-      pos: 73.5,-38.5
-      parent: 2
-  - uid: 3935
-    components:
-    - type: Transform
-      pos: 72.5,-38.5
-      parent: 2
   - uid: 3939
     components:
     - type: Transform
@@ -14623,7 +15464,7 @@ entities:
   - uid: 3952
     components:
     - type: Transform
-      pos: 38.5,-78.5
+      pos: 37.5,-79.5
       parent: 2
   - uid: 4017
     components:
@@ -14645,6 +15486,11 @@ entities:
     - type: Transform
       pos: 72.5,-27.5
       parent: 2
+  - uid: 4080
+    components:
+    - type: Transform
+      pos: 44.5,-38.5
+      parent: 2
   - uid: 4104
     components:
     - type: Transform
@@ -14680,11 +15526,6 @@ entities:
     - type: Transform
       pos: 59.5,-24.5
       parent: 2
-  - uid: 4212
-    components:
-    - type: Transform
-      pos: 68.5,-32.5
-      parent: 2
   - uid: 4213
     components:
     - type: Transform
@@ -14715,11 +15556,6 @@ entities:
     - type: Transform
       pos: 47.5,-19.5
       parent: 2
-  - uid: 4252
-    components:
-    - type: Transform
-      pos: 30.5,-15.5
-      parent: 2
   - uid: 4264
     components:
     - type: Transform
@@ -14730,6 +15566,16 @@ entities:
     - type: Transform
       pos: 66.5,-28.5
       parent: 2
+  - uid: 4266
+    components:
+    - type: Transform
+      pos: 44.5,-42.5
+      parent: 2
+  - uid: 4274
+    components:
+    - type: Transform
+      pos: 76.5,-67.5
+      parent: 2
   - uid: 4281
     components:
     - type: Transform
@@ -14740,21 +15586,11 @@ entities:
     - type: Transform
       pos: -31.5,-74.5
       parent: 2
-  - uid: 4297
-    components:
-    - type: Transform
-      pos: 58.5,-53.5
-      parent: 2
   - uid: 4326
     components:
     - type: Transform
       pos: -15.5,-74.5
       parent: 2
-  - uid: 4405
-    components:
-    - type: Transform
-      pos: 62.5,-70.5
-      parent: 2
   - uid: 4407
     components:
     - type: Transform
@@ -14765,16 +15601,16 @@ entities:
     - type: Transform
       pos: -17.5,-74.5
       parent: 2
-  - uid: 4433
-    components:
-    - type: Transform
-      pos: 61.5,-72.5
-      parent: 2
   - uid: 4559
     components:
     - type: Transform
       pos: 31.5,-79.5
       parent: 2
+  - uid: 4634
+    components:
+    - type: Transform
+      pos: 41.5,-37.5
+      parent: 2
   - uid: 4678
     components:
     - type: Transform
@@ -14808,12 +15644,7 @@ entities:
   - uid: 4816
     components:
     - type: Transform
-      pos: 36.5,-78.5
-      parent: 2
-  - uid: 4864
-    components:
-    - type: Transform
-      pos: 66.5,-59.5
+      pos: 32.5,-68.5
       parent: 2
   - uid: 4881
     components:
@@ -14830,11 +15661,6 @@ entities:
     - type: Transform
       pos: 78.5,-44.5
       parent: 2
-  - uid: 4910
-    components:
-    - type: Transform
-      pos: 78.5,-45.5
-      parent: 2
   - uid: 4997
     components:
     - type: Transform
@@ -14865,21 +15691,6 @@ entities:
     - type: Transform
       pos: -10.5,-18.5
       parent: 2
-  - uid: 5089
-    components:
-    - type: Transform
-      pos: 57.5,-64.5
-      parent: 2
-  - uid: 5181
-    components:
-    - type: Transform
-      pos: 60.5,-66.5
-      parent: 2
-  - uid: 5192
-    components:
-    - type: Transform
-      pos: 78.5,-41.5
-      parent: 2
   - uid: 5197
     components:
     - type: Transform
@@ -14900,15 +15711,40 @@ entities:
     - type: Transform
       pos: 4.5,-52.5
       parent: 2
-  - uid: 5254
+  - uid: 5281
     components:
     - type: Transform
-      pos: 57.5,-65.5
+      pos: 40.5,-28.5
       parent: 2
-  - uid: 5276
+  - uid: 5282
     components:
     - type: Transform
-      pos: 66.5,-60.5
+      pos: 36.5,-28.5
+      parent: 2
+  - uid: 5284
+    components:
+    - type: Transform
+      pos: 34.5,-28.5
+      parent: 2
+  - uid: 5285
+    components:
+    - type: Transform
+      pos: 51.5,-42.5
+      parent: 2
+  - uid: 5286
+    components:
+    - type: Transform
+      pos: 33.5,-29.5
+      parent: 2
+  - uid: 5287
+    components:
+    - type: Transform
+      pos: 37.5,-35.5
+      parent: 2
+  - uid: 5288
+    components:
+    - type: Transform
+      pos: 37.5,-32.5
       parent: 2
   - uid: 5289
     components:
@@ -14935,15 +15771,70 @@ entities:
     - type: Transform
       pos: 4.5,-57.5
       parent: 2
+  - uid: 5300
+    components:
+    - type: Transform
+      pos: 33.5,-32.5
+      parent: 2
+  - uid: 5304
+    components:
+    - type: Transform
+      pos: 51.5,-41.5
+      parent: 2
+  - uid: 5307
+    components:
+    - type: Transform
+      pos: 41.5,-27.5
+      parent: 2
   - uid: 5309
     components:
     - type: Transform
-      pos: 49.5,-31.5
+      pos: 51.5,-49.5
       parent: 2
-  - uid: 5346
+  - uid: 5311
     components:
     - type: Transform
-      pos: 47.5,-27.5
+      pos: 51.5,-44.5
+      parent: 2
+  - uid: 5324
+    components:
+    - type: Transform
+      pos: 92.5,-48.5
+      parent: 2
+  - uid: 5326
+    components:
+    - type: Transform
+      pos: 74.5,-29.5
+      parent: 2
+  - uid: 5327
+    components:
+    - type: Transform
+      pos: 57.5,-68.5
+      parent: 2
+  - uid: 5331
+    components:
+    - type: Transform
+      pos: 76.5,-27.5
+      parent: 2
+  - uid: 5368
+    components:
+    - type: Transform
+      pos: 74.5,-33.5
+      parent: 2
+  - uid: 5370
+    components:
+    - type: Transform
+      pos: 76.5,-30.5
+      parent: 2
+  - uid: 5371
+    components:
+    - type: Transform
+      pos: 76.5,-29.5
+      parent: 2
+  - uid: 5372
+    components:
+    - type: Transform
+      pos: 75.5,-45.5
       parent: 2
   - uid: 5382
     components:
@@ -14965,25 +15856,20 @@ entities:
     - type: Transform
       pos: 68.5,-21.5
       parent: 2
+  - uid: 5404
+    components:
+    - type: Transform
+      pos: 66.5,-69.5
+      parent: 2
   - uid: 5424
     components:
     - type: Transform
       pos: 4.5,-56.5
       parent: 2
-  - uid: 5538
+  - uid: 5461
     components:
     - type: Transform
-      pos: 58.5,-56.5
-      parent: 2
-  - uid: 5539
-    components:
-    - type: Transform
-      pos: 60.5,-59.5
-      parent: 2
-  - uid: 5603
-    components:
-    - type: Transform
-      pos: 62.5,-56.5
+      pos: 37.5,-76.5
       parent: 2
   - uid: 5610
     components:
@@ -14995,11 +15881,31 @@ entities:
     - type: Transform
       pos: -48.5,-37.5
       parent: 2
+  - uid: 5731
+    components:
+    - type: Transform
+      pos: 58.5,-71.5
+      parent: 2
+  - uid: 5736
+    components:
+    - type: Transform
+      pos: 57.5,-71.5
+      parent: 2
   - uid: 5790
     components:
     - type: Transform
       pos: 15.5,-83.5
       parent: 2
+  - uid: 5791
+    components:
+    - type: Transform
+      pos: 57.5,-69.5
+      parent: 2
+  - uid: 5795
+    components:
+    - type: Transform
+      pos: 74.5,-35.5
+      parent: 2
   - uid: 5804
     components:
     - type: Transform
@@ -15010,51 +15916,56 @@ entities:
     - type: Transform
       pos: 80.5,-45.5
       parent: 2
-  - uid: 5809
+  - uid: 5857
     components:
     - type: Transform
-      pos: 78.5,-46.5
+      pos: 37.5,-37.5
+      parent: 2
+  - uid: 5872
+    components:
+    - type: Transform
+      pos: 37.5,-39.5
       parent: 2
   - uid: 5891
     components:
     - type: Transform
-      pos: 80.5,-44.5
-      parent: 2
-  - uid: 5892
-    components:
-    - type: Transform
-      pos: 80.5,-46.5
+      pos: 37.5,-38.5
       parent: 2
   - uid: 5927
     components:
     - type: Transform
       pos: 4.5,-55.5
       parent: 2
-  - uid: 5957
+  - uid: 6014
     components:
     - type: Transform
-      pos: 66.5,-45.5
+      pos: 72.5,-34.5
+      parent: 2
+  - uid: 6029
+    components:
+    - type: Transform
+      pos: 55.5,-98.5
+      parent: 2
+  - uid: 6032
+    components:
+    - type: Transform
+      pos: 55.5,-97.5
       parent: 2
   - uid: 6082
     components:
     - type: Transform
-      pos: 34.5,-20.5
+      pos: 51.5,-50.5
       parent: 2
-  - uid: 6083
+  - uid: 6092
     components:
     - type: Transform
-      pos: 34.5,-19.5
+      pos: 70.5,-44.5
       parent: 2
   - uid: 6099
     components:
     - type: Transform
       pos: 55.5,-17.5
       parent: 2
-  - uid: 6100
-    components:
-    - type: Transform
-      pos: 62.5,-68.5
-      parent: 2
   - uid: 6101
     components:
     - type: Transform
@@ -15070,26 +15981,11 @@ entities:
     - type: Transform
       pos: 42.5,-19.5
       parent: 2
-  - uid: 6104
-    components:
-    - type: Transform
-      pos: 62.5,-69.5
-      parent: 2
-  - uid: 6106
-    components:
-    - type: Transform
-      pos: 59.5,-72.5
-      parent: 2
   - uid: 6115
     components:
     - type: Transform
       pos: 55.5,-19.5
       parent: 2
-  - uid: 6118
-    components:
-    - type: Transform
-      pos: 34.5,-21.5
-      parent: 2
   - uid: 6122
     components:
     - type: Transform
@@ -15100,31 +15996,11 @@ entities:
     - type: Transform
       pos: 53.5,-19.5
       parent: 2
-  - uid: 6132
-    components:
-    - type: Transform
-      pos: 56.5,-66.5
-      parent: 2
-  - uid: 6136
-    components:
-    - type: Transform
-      pos: 57.5,-70.5
-      parent: 2
   - uid: 6137
     components:
     - type: Transform
       pos: 58.5,-17.5
       parent: 2
-  - uid: 6139
-    components:
-    - type: Transform
-      pos: 56.5,-74.5
-      parent: 2
-  - uid: 6140
-    components:
-    - type: Transform
-      pos: 56.5,-65.5
-      parent: 2
   - uid: 6216
     components:
     - type: Transform
@@ -15145,6 +16021,31 @@ entities:
     - type: Transform
       pos: 49.5,-72.5
       parent: 2
+  - uid: 6288
+    components:
+    - type: Transform
+      pos: 74.5,-28.5
+      parent: 2
+  - uid: 6294
+    components:
+    - type: Transform
+      pos: 37.5,-40.5
+      parent: 2
+  - uid: 6380
+    components:
+    - type: Transform
+      pos: 44.5,-26.5
+      parent: 2
+  - uid: 6384
+    components:
+    - type: Transform
+      pos: 77.5,-67.5
+      parent: 2
+  - uid: 6402
+    components:
+    - type: Transform
+      pos: 72.5,-75.5
+      parent: 2
   - uid: 6472
     components:
     - type: Transform
@@ -15155,11 +16056,6 @@ entities:
     - type: Transform
       pos: -2.5,-36.5
       parent: 2
-  - uid: 6612
-    components:
-    - type: Transform
-      pos: 56.5,-72.5
-      parent: 2
   - uid: 6626
     components:
     - type: Transform
@@ -15168,58 +16064,58 @@ entities:
   - uid: 6627
     components:
     - type: Transform
-      pos: 49.5,-32.5
+      pos: 91.5,-41.5
       parent: 2
   - uid: 6680
     components:
     - type: Transform
       pos: 53.5,-72.5
       parent: 2
-  - uid: 6716
+  - uid: 6847
     components:
     - type: Transform
-      pos: 43.5,-26.5
-      parent: 2
-  - uid: 6717
-    components:
-    - type: Transform
-      pos: 41.5,-32.5
+      pos: 61.5,-68.5
       parent: 2
   - uid: 6935
     components:
     - type: Transform
       pos: 54.5,-71.5
       parent: 2
-  - uid: 7168
+  - uid: 7035
     components:
     - type: Transform
-      pos: 64.5,-34.5
+      pos: 28.5,-30.5
       parent: 2
-  - uid: 7169
+  - uid: 7043
     components:
     - type: Transform
-      pos: 63.5,-46.5
+      pos: 61.5,-69.5
       parent: 2
-  - uid: 7172
+  - uid: 7046
     components:
     - type: Transform
-      pos: 59.5,-37.5
+      pos: 32.5,-29.5
+      parent: 2
+  - uid: 7047
+    components:
+    - type: Transform
+      pos: 31.5,-29.5
+      parent: 2
+  - uid: 7116
+    components:
+    - type: Transform
+      pos: 30.5,-29.5
+      parent: 2
+  - uid: 7127
+    components:
+    - type: Transform
+      pos: 29.5,-29.5
       parent: 2
   - uid: 7175
     components:
     - type: Transform
       pos: 54.5,-56.5
       parent: 2
-  - uid: 7203
-    components:
-    - type: Transform
-      pos: 67.5,-57.5
-      parent: 2
-  - uid: 7226
-    components:
-    - type: Transform
-      pos: 63.5,-43.5
-      parent: 2
   - uid: 7229
     components:
     - type: Transform
@@ -15230,15 +16126,20 @@ entities:
     - type: Transform
       pos: 49.5,-19.5
       parent: 2
-  - uid: 7261
+  - uid: 7240
     components:
     - type: Transform
-      pos: 66.5,-61.5
+      pos: 32.5,-32.5
       parent: 2
-  - uid: 7275
+  - uid: 7281
     components:
     - type: Transform
-      pos: 60.5,-40.5
+      pos: 27.5,-26.5
+      parent: 2
+  - uid: 7291
+    components:
+    - type: Transform
+      pos: 55.5,-45.5
       parent: 2
   - uid: 7296
     components:
@@ -15270,25 +16171,25 @@ entities:
     - type: Transform
       pos: 52.5,-14.5
       parent: 2
-  - uid: 7332
+  - uid: 7339
     components:
     - type: Transform
-      pos: 61.5,-71.5
+      pos: 3.5,-59.5
       parent: 2
-  - uid: 7342
+  - uid: 7393
     components:
     - type: Transform
-      pos: 62.5,-71.5
+      pos: 72.5,-69.5
       parent: 2
-  - uid: 7344
+  - uid: 7401
     components:
     - type: Transform
-      pos: 59.5,-73.5
+      pos: 72.5,-71.5
       parent: 2
-  - uid: 7426
+  - uid: 7402
     components:
     - type: Transform
-      pos: 84.5,-43.5
+      pos: 72.5,-72.5
       parent: 2
   - uid: 7451
     components:
@@ -15300,11 +16201,6 @@ entities:
     - type: Transform
       pos: 49.5,-63.5
       parent: 2
-  - uid: 7486
-    components:
-    - type: Transform
-      pos: 93.5,-46.5
-      parent: 2
   - uid: 7487
     components:
     - type: Transform
@@ -15395,35 +16291,85 @@ entities:
     - type: Transform
       pos: 93.5,-43.5
       parent: 2
-  - uid: 7509
+  - uid: 7572
     components:
     - type: Transform
-      pos: 93.5,-44.5
+      pos: 65.5,-65.5
       parent: 2
-  - uid: 7510
+  - uid: 7580
     components:
     - type: Transform
-      pos: 93.5,-45.5
+      pos: 67.5,-65.5
+      parent: 2
+  - uid: 7587
+    components:
+    - type: Transform
+      pos: 58.5,-73.5
+      parent: 2
+  - uid: 7588
+    components:
+    - type: Transform
+      pos: 36.5,-40.5
+      parent: 2
+  - uid: 7589
+    components:
+    - type: Transform
+      pos: 58.5,-72.5
+      parent: 2
+  - uid: 7600
+    components:
+    - type: Transform
+      pos: 95.5,-45.5
+      parent: 2
+  - uid: 7619
+    components:
+    - type: Transform
+      pos: 95.5,-44.5
       parent: 2
   - uid: 7648
     components:
     - type: Transform
       pos: -21.5,-19.5
       parent: 2
+  - uid: 7658
+    components:
+    - type: Transform
+      pos: 67.5,-71.5
+      parent: 2
+  - uid: 7706
+    components:
+    - type: Transform
+      pos: 49.5,-45.5
+      parent: 2
   - uid: 7712
     components:
     - type: Transform
       pos: 24.5,-90.5
       parent: 2
+  - uid: 7716
+    components:
+    - type: Transform
+      pos: 64.5,-65.5
+      parent: 2
+  - uid: 7723
+    components:
+    - type: Transform
+      pos: 56.5,-76.5
+      parent: 2
   - uid: 7732
     components:
     - type: Transform
       pos: 65.5,-20.5
       parent: 2
-  - uid: 7754
+  - uid: 7742
     components:
     - type: Transform
-      pos: 59.5,-38.5
+      pos: 77.5,-54.5
+      parent: 2
+  - uid: 7750
+    components:
+    - type: Transform
+      pos: 46.5,-29.5
       parent: 2
   - uid: 7757
     components:
@@ -15435,6 +16381,16 @@ entities:
     - type: Transform
       pos: 49.5,-14.5
       parent: 2
+  - uid: 7808
+    components:
+    - type: Transform
+      pos: 7.5,-59.5
+      parent: 2
+  - uid: 7892
+    components:
+    - type: Transform
+      pos: 48.5,-29.5
+      parent: 2
   - uid: 7910
     components:
     - type: Transform
@@ -15455,6 +16411,11 @@ entities:
     - type: Transform
       pos: 15.5,-67.5
       parent: 2
+  - uid: 7926
+    components:
+    - type: Transform
+      pos: 64.5,-63.5
+      parent: 2
   - uid: 7941
     components:
     - type: Transform
@@ -15465,21 +16426,6 @@ entities:
     - type: Transform
       pos: 64.5,-28.5
       parent: 2
-  - uid: 7947
-    components:
-    - type: Transform
-      pos: 62.5,-67.5
-      parent: 2
-  - uid: 7948
-    components:
-    - type: Transform
-      pos: 62.5,-66.5
-      parent: 2
-  - uid: 7949
-    components:
-    - type: Transform
-      pos: 61.5,-66.5
-      parent: 2
   - uid: 7966
     components:
     - type: Transform
@@ -15490,61 +16436,56 @@ entities:
     - type: Transform
       pos: 35.5,-70.5
       parent: 2
-  - uid: 7969
+  - uid: 8045
     components:
     - type: Transform
-      pos: 51.5,-50.5
+      pos: 67.5,-64.5
       parent: 2
-  - uid: 7971
+  - uid: 8074
     components:
     - type: Transform
-      pos: 63.5,-44.5
+      pos: 57.5,-67.5
       parent: 2
-  - uid: 7985
+  - uid: 8081
     components:
     - type: Transform
-      pos: 58.5,-48.5
+      pos: 77.5,-66.5
       parent: 2
-  - uid: 8035
+  - uid: 8083
     components:
     - type: Transform
-      pos: 62.5,-63.5
+      pos: 77.5,-65.5
       parent: 2
-  - uid: 8047
+  - uid: 8091
     components:
     - type: Transform
-      pos: 62.5,-64.5
+      pos: 67.5,-63.5
       parent: 2
-  - uid: 8068
+  - uid: 8094
     components:
     - type: Transform
-      pos: 69.5,-42.5
+      pos: 92.5,-41.5
       parent: 2
-  - uid: 8113
+  - uid: 8099
     components:
     - type: Transform
-      pos: 59.5,-65.5
-      parent: 2
-  - uid: 8116
-    components:
-    - type: Transform
-      pos: 59.5,-63.5
-      parent: 2
-  - uid: 8134
-    components:
-    - type: Transform
-      pos: 61.5,-63.5
-      parent: 2
-  - uid: 8135
-    components:
-    - type: Transform
-      pos: 63.5,-42.5
+      pos: 92.5,-42.5
       parent: 2
   - uid: 8142
     components:
     - type: Transform
       pos: 55.5,-56.5
       parent: 2
+  - uid: 8149
+    components:
+    - type: Transform
+      pos: 28.5,-35.5
+      parent: 2
+  - uid: 8157
+    components:
+    - type: Transform
+      pos: 75.5,-48.5
+      parent: 2
   - uid: 8178
     components:
     - type: Transform
@@ -15605,31 +16546,26 @@ entities:
     - type: Transform
       pos: 65.5,-27.5
       parent: 2
-  - uid: 8412
+  - uid: 8449
     components:
     - type: Transform
-      pos: 58.5,-35.5
+      pos: 66.5,-65.5
       parent: 2
-  - uid: 8573
+  - uid: 8545
     components:
     - type: Transform
-      pos: 56.5,-71.5
+      pos: 37.5,-77.5
+      parent: 2
+  - uid: 8546
+    components:
+    - type: Transform
+      pos: 56.5,-57.5
       parent: 2
   - uid: 8579
     components:
     - type: Transform
       pos: 59.5,-27.5
       parent: 2
-  - uid: 8611
-    components:
-    - type: Transform
-      pos: 63.5,-38.5
-      parent: 2
-  - uid: 8620
-    components:
-    - type: Transform
-      pos: 65.5,-33.5
-      parent: 2
   - uid: 8626
     components:
     - type: Transform
@@ -15640,11 +16576,6 @@ entities:
     - type: Transform
       pos: 56.5,-17.5
       parent: 2
-  - uid: 8642
-    components:
-    - type: Transform
-      pos: 38.5,-32.5
-      parent: 2
   - uid: 8660
     components:
     - type: Transform
@@ -15660,10 +16591,10 @@ entities:
     - type: Transform
       pos: 54.5,-70.5
       parent: 2
-  - uid: 8812
+  - uid: 8804
     components:
     - type: Transform
-      pos: 59.5,-56.5
+      pos: 76.5,-25.5
       parent: 2
   - uid: 8815
     components:
@@ -15680,21 +16611,6 @@ entities:
     - type: Transform
       pos: -33.5,-57.5
       parent: 2
-  - uid: 8825
-    components:
-    - type: Transform
-      pos: 59.5,-42.5
-      parent: 2
-  - uid: 8826
-    components:
-    - type: Transform
-      pos: 69.5,-46.5
-      parent: 2
-  - uid: 8827
-    components:
-    - type: Transform
-      pos: 65.5,-39.5
-      parent: 2
   - uid: 8828
     components:
     - type: Transform
@@ -15705,11 +16621,6 @@ entities:
     - type: Transform
       pos: -34.5,-65.5
       parent: 2
-  - uid: 8864
-    components:
-    - type: Transform
-      pos: 71.5,-52.5
-      parent: 2
   - uid: 9054
     components:
     - type: Transform
@@ -15780,11 +16691,6 @@ entities:
     - type: Transform
       pos: 12.5,-83.5
       parent: 2
-  - uid: 9211
-    components:
-    - type: Transform
-      pos: 55.5,-52.5
-      parent: 2
   - uid: 9220
     components:
     - type: Transform
@@ -15810,11 +16716,6 @@ entities:
     - type: Transform
       pos: 47.5,-72.5
       parent: 2
-  - uid: 9275
-    components:
-    - type: Transform
-      pos: 31.5,-69.5
-      parent: 2
   - uid: 9276
     components:
     - type: Transform
@@ -15835,16 +16736,6 @@ entities:
     - type: Transform
       pos: 65.5,-72.5
       parent: 2
-  - uid: 9320
-    components:
-    - type: Transform
-      pos: 63.5,-64.5
-      parent: 2
-  - uid: 9332
-    components:
-    - type: Transform
-      pos: 55.5,-50.5
-      parent: 2
   - uid: 9338
     components:
     - type: Transform
@@ -15860,86 +16751,36 @@ entities:
     - type: Transform
       pos: 48.5,-19.5
       parent: 2
-  - uid: 9349
-    components:
-    - type: Transform
-      pos: 34.5,-13.5
-      parent: 2
   - uid: 9350
     components:
     - type: Transform
-      pos: 34.5,-18.5
+      pos: 31.5,-11.5
       parent: 2
   - uid: 9365
     components:
     - type: Transform
       pos: 65.5,-21.5
       parent: 2
-  - uid: 9388
+  - uid: 9389
     components:
     - type: Transform
-      pos: 38.5,-31.5
+      pos: 60.5,-64.5
       parent: 2
-  - uid: 9446
+  - uid: 9397
     components:
     - type: Transform
-      pos: 83.5,-47.5
+      pos: 61.5,-64.5
       parent: 2
   - uid: 9454
     components:
     - type: Transform
       pos: 50.5,-72.5
       parent: 2
-  - uid: 9459
-    components:
-    - type: Transform
-      pos: 60.5,-41.5
-      parent: 2
-  - uid: 9483
-    components:
-    - type: Transform
-      pos: 60.5,-42.5
-      parent: 2
-  - uid: 9586
-    components:
-    - type: Transform
-      pos: 60.5,-55.5
-      parent: 2
-  - uid: 9589
-    components:
-    - type: Transform
-      pos: 61.5,-56.5
-      parent: 2
   - uid: 9599
     components:
     - type: Transform
       pos: -33.5,-16.5
       parent: 2
-  - uid: 9602
-    components:
-    - type: Transform
-      pos: 69.5,-47.5
-      parent: 2
-  - uid: 9610
-    components:
-    - type: Transform
-      pos: 67.5,-50.5
-      parent: 2
-  - uid: 9672
-    components:
-    - type: Transform
-      pos: 59.5,-45.5
-      parent: 2
-  - uid: 9675
-    components:
-    - type: Transform
-      pos: 64.5,-39.5
-      parent: 2
-  - uid: 9676
-    components:
-    - type: Transform
-      pos: 67.5,-46.5
-      parent: 2
   - uid: 9677
     components:
     - type: Transform
@@ -15980,51 +16821,11 @@ entities:
     - type: Transform
       pos: 47.5,-63.5
       parent: 2
-  - uid: 10259
-    components:
-    - type: Transform
-      pos: 71.5,-46.5
-      parent: 2
   - uid: 10270
     components:
     - type: Transform
       pos: 68.5,-35.5
       parent: 2
-  - uid: 10275
-    components:
-    - type: Transform
-      pos: 59.5,-43.5
-      parent: 2
-  - uid: 10277
-    components:
-    - type: Transform
-      pos: 60.5,-57.5
-      parent: 2
-  - uid: 10279
-    components:
-    - type: Transform
-      pos: 60.5,-56.5
-      parent: 2
-  - uid: 10280
-    components:
-    - type: Transform
-      pos: 69.5,-48.5
-      parent: 2
-  - uid: 10281
-    components:
-    - type: Transform
-      pos: 67.5,-51.5
-      parent: 2
-  - uid: 10285
-    components:
-    - type: Transform
-      pos: 68.5,-46.5
-      parent: 2
-  - uid: 10314
-    components:
-    - type: Transform
-      pos: 71.5,-51.5
-      parent: 2
   - uid: 10329
     components:
     - type: Transform
@@ -16060,91 +16861,101 @@ entities:
     - type: Transform
       pos: 52.5,-52.5
       parent: 2
-  - uid: 10734
+  - uid: 10709
     components:
     - type: Transform
-      pos: 70.5,-46.5
+      pos: 72.5,-68.5
       parent: 2
-  - uid: 10741
+  - uid: 10711
     components:
     - type: Transform
-      pos: 34.5,-17.5
+      pos: 73.5,-68.5
       parent: 2
-  - uid: 10742
+  - uid: 10712
     components:
     - type: Transform
-      pos: 34.5,-16.5
+      pos: 74.5,-68.5
       parent: 2
-  - uid: 10743
+  - uid: 10715
     components:
     - type: Transform
-      pos: 34.5,-15.5
+      pos: 78.5,-45.5
       parent: 2
-  - uid: 10755
+  - uid: 10716
     components:
     - type: Transform
-      pos: 66.5,-39.5
+      pos: 81.5,-44.5
+      parent: 2
+  - uid: 10718
+    components:
+    - type: Transform
+      pos: 79.5,-46.5
+      parent: 2
+  - uid: 10751
+    components:
+    - type: Transform
+      pos: 74.5,-60.5
       parent: 2
   - uid: 10765
     components:
     - type: Transform
       pos: 65.5,-19.5
       parent: 2
-  - uid: 10777
-    components:
-    - type: Transform
-      pos: 70.5,-52.5
-      parent: 2
-  - uid: 10778
-    components:
-    - type: Transform
-      pos: 58.5,-38.5
-      parent: 2
   - uid: 10779
     components:
     - type: Transform
       pos: 35.5,-95.5
       parent: 2
-  - uid: 10782
-    components:
-    - type: Transform
-      pos: 58.5,-45.5
-      parent: 2
-  - uid: 10787
-    components:
-    - type: Transform
-      pos: 53.5,-52.5
-      parent: 2
   - uid: 10789
     components:
     - type: Transform
       pos: 40.5,-76.5
       parent: 2
-  - uid: 10792
-    components:
-    - type: Transform
-      pos: 59.5,-66.5
-      parent: 2
-  - uid: 10795
-    components:
-    - type: Transform
-      pos: 54.5,-52.5
-      parent: 2
-  - uid: 10797
-    components:
-    - type: Transform
-      pos: 68.5,-52.5
-      parent: 2
-  - uid: 10814
-    components:
-    - type: Transform
-      pos: 58.5,-31.5
-      parent: 2
   - uid: 10824
     components:
     - type: Transform
       pos: -56.5,-68.5
       parent: 2
+  - uid: 10834
+    components:
+    - type: Transform
+      pos: 98.5,-43.5
+      parent: 2
+  - uid: 10844
+    components:
+    - type: Transform
+      pos: 96.5,-43.5
+      parent: 2
+  - uid: 10845
+    components:
+    - type: Transform
+      pos: 98.5,-47.5
+      parent: 2
+  - uid: 10846
+    components:
+    - type: Transform
+      pos: 97.5,-43.5
+      parent: 2
+  - uid: 10847
+    components:
+    - type: Transform
+      pos: 97.5,-47.5
+      parent: 2
+  - uid: 10848
+    components:
+    - type: Transform
+      pos: 96.5,-47.5
+      parent: 2
+  - uid: 10858
+    components:
+    - type: Transform
+      pos: 74.5,-59.5
+      parent: 2
+  - uid: 10861
+    components:
+    - type: Transform
+      pos: 74.5,-58.5
+      parent: 2
   - uid: 10920
     components:
     - type: Transform
@@ -16875,31 +17686,6 @@ entities:
     - type: Transform
       pos: -38.5,-79.5
       parent: 2
-  - uid: 11128
-    components:
-    - type: Transform
-      pos: -39.5,-79.5
-      parent: 2
-  - uid: 11129
-    components:
-    - type: Transform
-      pos: -40.5,-79.5
-      parent: 2
-  - uid: 11130
-    components:
-    - type: Transform
-      pos: -41.5,-79.5
-      parent: 2
-  - uid: 11131
-    components:
-    - type: Transform
-      pos: -42.5,-79.5
-      parent: 2
-  - uid: 11132
-    components:
-    - type: Transform
-      pos: -43.5,-79.5
-      parent: 2
   - uid: 11133
     components:
     - type: Transform
@@ -17910,10 +18696,10 @@ entities:
     - type: Transform
       pos: -6.5,-11.5
       parent: 2
-  - uid: 11413
+  - uid: 11412
     components:
     - type: Transform
-      pos: 57.5,-48.5
+      pos: 57.5,-57.5
       parent: 2
   - uid: 11414
     components:
@@ -17925,11 +18711,6 @@ entities:
     - type: Transform
       pos: -18.5,-16.5
       parent: 2
-  - uid: 11416
-    components:
-    - type: Transform
-      pos: 60.5,-48.5
-      parent: 2
   - uid: 11417
     components:
     - type: Transform
@@ -18815,71 +19596,6 @@ entities:
     - type: Transform
       pos: 12.5,-16.5
       parent: 2
-  - uid: 11633
-    components:
-    - type: Transform
-      pos: 30.5,-24.5
-      parent: 2
-  - uid: 11634
-    components:
-    - type: Transform
-      pos: 30.5,-23.5
-      parent: 2
-  - uid: 11635
-    components:
-    - type: Transform
-      pos: 30.5,-22.5
-      parent: 2
-  - uid: 11636
-    components:
-    - type: Transform
-      pos: 30.5,-21.5
-      parent: 2
-  - uid: 11637
-    components:
-    - type: Transform
-      pos: 29.5,-21.5
-      parent: 2
-  - uid: 11638
-    components:
-    - type: Transform
-      pos: 29.5,-20.5
-      parent: 2
-  - uid: 11639
-    components:
-    - type: Transform
-      pos: 29.5,-19.5
-      parent: 2
-  - uid: 11640
-    components:
-    - type: Transform
-      pos: 29.5,-18.5
-      parent: 2
-  - uid: 11641
-    components:
-    - type: Transform
-      pos: 29.5,-17.5
-      parent: 2
-  - uid: 11642
-    components:
-    - type: Transform
-      pos: 29.5,-16.5
-      parent: 2
-  - uid: 11643
-    components:
-    - type: Transform
-      pos: 29.5,-15.5
-      parent: 2
-  - uid: 11646
-    components:
-    - type: Transform
-      pos: 30.5,-14.5
-      parent: 2
-  - uid: 11647
-    components:
-    - type: Transform
-      pos: 29.5,-23.5
-      parent: 2
   - uid: 11648
     components:
     - type: Transform
@@ -18935,36 +19651,6 @@ entities:
     - type: Transform
       pos: 34.5,-27.5
       parent: 2
-  - uid: 11659
-    components:
-    - type: Transform
-      pos: 31.5,-22.5
-      parent: 2
-  - uid: 11660
-    components:
-    - type: Transform
-      pos: 32.5,-22.5
-      parent: 2
-  - uid: 11661
-    components:
-    - type: Transform
-      pos: 33.5,-22.5
-      parent: 2
-  - uid: 11662
-    components:
-    - type: Transform
-      pos: 34.5,-22.5
-      parent: 2
-  - uid: 11663
-    components:
-    - type: Transform
-      pos: 35.5,-22.5
-      parent: 2
-  - uid: 11664
-    components:
-    - type: Transform
-      pos: 36.5,-22.5
-      parent: 2
   - uid: 11670
     components:
     - type: Transform
@@ -18975,50 +19661,100 @@ entities:
     - type: Transform
       pos: 44.5,-76.5
       parent: 2
-  - uid: 11676
-    components:
-    - type: Transform
-      pos: 34.5,-14.5
-      parent: 2
-  - uid: 11677
-    components:
-    - type: Transform
-      pos: 34.5,-12.5
-      parent: 2
   - uid: 11681
     components:
     - type: Transform
       pos: 47.5,-76.5
       parent: 2
-  - uid: 11689
+  - uid: 11703
     components:
     - type: Transform
-      pos: 49.5,-27.5
+      pos: 59.5,-32.5
       parent: 2
-  - uid: 11690
+  - uid: 11704
     components:
     - type: Transform
-      pos: 50.5,-27.5
+      pos: 58.5,-32.5
       parent: 2
-  - uid: 11691
+  - uid: 11705
     components:
     - type: Transform
-      pos: 51.5,-27.5
-      parent: 2
-  - uid: 11692
-    components:
-    - type: Transform
-      pos: 52.5,-27.5
-      parent: 2
-  - uid: 11702
-    components:
-    - type: Transform
-      pos: 64.5,-42.5
+      pos: 57.5,-32.5
       parent: 2
   - uid: 11706
     components:
     - type: Transform
-      pos: 61.5,-48.5
+      pos: 56.5,-32.5
+      parent: 2
+  - uid: 11714
+    components:
+    - type: Transform
+      pos: 55.5,-32.5
+      parent: 2
+  - uid: 11722
+    components:
+    - type: Transform
+      pos: 54.5,-32.5
+      parent: 2
+  - uid: 11732
+    components:
+    - type: Transform
+      pos: 54.5,-31.5
+      parent: 2
+  - uid: 11733
+    components:
+    - type: Transform
+      pos: 53.5,-31.5
+      parent: 2
+  - uid: 11734
+    components:
+    - type: Transform
+      pos: 53.5,-30.5
+      parent: 2
+  - uid: 11735
+    components:
+    - type: Transform
+      pos: 53.5,-29.5
+      parent: 2
+  - uid: 11738
+    components:
+    - type: Transform
+      pos: 53.5,-28.5
+      parent: 2
+  - uid: 11739
+    components:
+    - type: Transform
+      pos: 52.5,-28.5
+      parent: 2
+  - uid: 11740
+    components:
+    - type: Transform
+      pos: 51.5,-28.5
+      parent: 2
+  - uid: 11742
+    components:
+    - type: Transform
+      pos: 50.5,-28.5
+      parent: 2
+  - uid: 11750
+    components:
+    - type: Transform
+      pos: 54.5,-33.5
+      parent: 2
+  - uid: 11753
+    components:
+    - type: Transform
+      pos: 53.5,-33.5
+      parent: 2
+  - uid: 11756
+    components:
+    - type: Transform
+      pos: 52.5,-33.5
+      parent: 2
+  - uid: 11757
+    components:
+    - type: Transform
+      pos: 51.5,-33.5
       parent: 2
   - uid: 11764
     components:
@@ -19110,11 +19846,6 @@ entities:
     - type: Transform
       pos: 43.5,-23.5
       parent: 2
-  - uid: 11793
-    components:
-    - type: Transform
-      pos: 42.5,-23.5
-      parent: 2
   - uid: 11794
     components:
     - type: Transform
@@ -19235,16 +19966,16 @@ entities:
     - type: Transform
       pos: 75.5,-25.5
       parent: 2
+  - uid: 11827
+    components:
+    - type: Transform
+      pos: 52.5,-34.5
+      parent: 2
   - uid: 11829
     components:
     - type: Transform
       pos: 73.5,-27.5
       parent: 2
-  - uid: 11830
-    components:
-    - type: Transform
-      pos: 73.5,-28.5
-      parent: 2
   - uid: 11831
     components:
     - type: Transform
@@ -19255,21 +19986,6 @@ entities:
     - type: Transform
       pos: 72.5,-29.5
       parent: 2
-  - uid: 11833
-    components:
-    - type: Transform
-      pos: 71.5,-29.5
-      parent: 2
-  - uid: 11834
-    components:
-    - type: Transform
-      pos: 71.5,-30.5
-      parent: 2
-  - uid: 11835
-    components:
-    - type: Transform
-      pos: 71.5,-31.5
-      parent: 2
   - uid: 11836
     components:
     - type: Transform
@@ -19280,50 +19996,35 @@ entities:
     - type: Transform
       pos: 73.5,-31.5
       parent: 2
-  - uid: 11838
-    components:
-    - type: Transform
-      pos: 73.5,-33.5
-      parent: 2
-  - uid: 11839
-    components:
-    - type: Transform
-      pos: 73.5,-32.5
-      parent: 2
-  - uid: 11840
-    components:
-    - type: Transform
-      pos: 72.5,-33.5
-      parent: 2
   - uid: 11841
     components:
     - type: Transform
       pos: 76.5,-44.5
       parent: 2
+  - uid: 11845
+    components:
+    - type: Transform
+      pos: 52.5,-35.5
+      parent: 2
+  - uid: 11846
+    components:
+    - type: Transform
+      pos: 52.5,-36.5
+      parent: 2
   - uid: 11849
     components:
     - type: Transform
-      pos: 75.5,-41.5
+      pos: 51.5,-36.5
       parent: 2
-  - uid: 11854
+  - uid: 11850
     components:
     - type: Transform
-      pos: 77.5,-38.5
+      pos: 51.5,-37.5
       parent: 2
-  - uid: 11855
+  - uid: 11851
     components:
     - type: Transform
-      pos: 77.5,-37.5
-      parent: 2
-  - uid: 11856
-    components:
-    - type: Transform
-      pos: 77.5,-36.5
-      parent: 2
-  - uid: 11857
-    components:
-    - type: Transform
-      pos: 78.5,-36.5
+      pos: 50.5,-37.5
       parent: 2
   - uid: 11858
     components:
@@ -19350,40 +20051,10 @@ entities:
     - type: Transform
       pos: 79.5,-32.5
       parent: 2
-  - uid: 11863
+  - uid: 11871
     components:
     - type: Transform
-      pos: 78.5,-32.5
-      parent: 2
-  - uid: 11864
-    components:
-    - type: Transform
-      pos: 77.5,-32.5
-      parent: 2
-  - uid: 11865
-    components:
-    - type: Transform
-      pos: 76.5,-32.5
-      parent: 2
-  - uid: 11866
-    components:
-    - type: Transform
-      pos: 75.5,-32.5
-      parent: 2
-  - uid: 11867
-    components:
-    - type: Transform
-      pos: 75.5,-31.5
-      parent: 2
-  - uid: 11868
-    components:
-    - type: Transform
-      pos: 75.5,-30.5
-      parent: 2
-  - uid: 11869
-    components:
-    - type: Transform
-      pos: 74.5,-38.5
+      pos: 52.5,-38.5
       parent: 2
   - uid: 11873
     components:
@@ -19420,11 +20091,6 @@ entities:
     - type: Transform
       pos: 76.5,-54.5
       parent: 2
-  - uid: 11880
-    components:
-    - type: Transform
-      pos: 76.5,-55.5
-      parent: 2
   - uid: 11881
     components:
     - type: Transform
@@ -19435,165 +20101,45 @@ entities:
     - type: Transform
       pos: 77.5,-56.5
       parent: 2
-  - uid: 11883
-    components:
-    - type: Transform
-      pos: 77.5,-57.5
-      parent: 2
-  - uid: 11884
-    components:
-    - type: Transform
-      pos: 73.5,-66.5
-      parent: 2
   - uid: 11885
     components:
     - type: Transform
-      pos: 73.5,-65.5
-      parent: 2
-  - uid: 11886
-    components:
-    - type: Transform
-      pos: 72.5,-65.5
-      parent: 2
-  - uid: 11887
-    components:
-    - type: Transform
-      pos: 71.5,-65.5
+      pos: 59.5,-64.5
       parent: 2
   - uid: 11888
     components:
     - type: Transform
-      pos: 70.5,-65.5
+      pos: 54.5,-34.5
       parent: 2
   - uid: 11889
     components:
     - type: Transform
-      pos: 70.5,-64.5
-      parent: 2
-  - uid: 11890
-    components:
-    - type: Transform
-      pos: 70.5,-63.5
-      parent: 2
-  - uid: 11891
-    components:
-    - type: Transform
-      pos: 70.5,-62.5
-      parent: 2
-  - uid: 11892
-    components:
-    - type: Transform
-      pos: 74.5,-65.5
-      parent: 2
-  - uid: 11893
-    components:
-    - type: Transform
-      pos: 74.5,-64.5
+      pos: 58.5,-64.5
       parent: 2
   - uid: 11894
     components:
     - type: Transform
-      pos: 74.5,-63.5
-      parent: 2
-  - uid: 11895
-    components:
-    - type: Transform
-      pos: 74.5,-62.5
+      pos: 57.5,-75.5
       parent: 2
   - uid: 11896
     components:
     - type: Transform
-      pos: 74.5,-61.5
+      pos: 55.5,-76.5
       parent: 2
   - uid: 11897
     components:
     - type: Transform
-      pos: 74.5,-60.5
+      pos: 54.5,-76.5
       parent: 2
-  - uid: 11898
+  - uid: 11909
     components:
     - type: Transform
-      pos: 74.5,-59.5
-      parent: 2
-  - uid: 11899
-    components:
-    - type: Transform
-      pos: 74.5,-58.5
-      parent: 2
-  - uid: 11900
-    components:
-    - type: Transform
-      pos: 73.5,-58.5
-      parent: 2
-  - uid: 11901
-    components:
-    - type: Transform
-      pos: 72.5,-58.5
-      parent: 2
-  - uid: 11902
-    components:
-    - type: Transform
-      pos: 71.5,-58.5
-      parent: 2
-  - uid: 11903
-    components:
-    - type: Transform
-      pos: 70.5,-58.5
-      parent: 2
-  - uid: 11904
-    components:
-    - type: Transform
-      pos: 69.5,-58.5
-      parent: 2
-  - uid: 11905
-    components:
-    - type: Transform
-      pos: 69.5,-57.5
-      parent: 2
-  - uid: 11906
-    components:
-    - type: Transform
-      pos: 68.5,-57.5
-      parent: 2
-  - uid: 11908
-    components:
-    - type: Transform
-      pos: 66.5,-57.5
-      parent: 2
-  - uid: 11910
-    components:
-    - type: Transform
-      pos: 71.5,-66.5
+      pos: 55.5,-34.5
       parent: 2
   - uid: 11911
     components:
     - type: Transform
-      pos: 71.5,-67.5
-      parent: 2
-  - uid: 11912
-    components:
-    - type: Transform
-      pos: 71.5,-68.5
-      parent: 2
-  - uid: 11913
-    components:
-    - type: Transform
-      pos: 72.5,-68.5
-      parent: 2
-  - uid: 11914
-    components:
-    - type: Transform
-      pos: 73.5,-68.5
-      parent: 2
-  - uid: 11915
-    components:
-    - type: Transform
-      pos: 74.5,-68.5
-      parent: 2
-  - uid: 11919
-    components:
-    - type: Transform
-      pos: 77.5,-67.5
+      pos: 55.5,-36.5
       parent: 2
   - uid: 11921
     components:
@@ -19665,6 +20211,46 @@ entities:
     - type: Transform
       pos: 51.5,-101.5
       parent: 2
+  - uid: 11939
+    components:
+    - type: Transform
+      pos: 55.5,-37.5
+      parent: 2
+  - uid: 11940
+    components:
+    - type: Transform
+      pos: 55.5,-38.5
+      parent: 2
+  - uid: 11941
+    components:
+    - type: Transform
+      pos: 57.5,-39.5
+      parent: 2
+  - uid: 11949
+    components:
+    - type: Transform
+      pos: 58.5,-39.5
+      parent: 2
+  - uid: 11950
+    components:
+    - type: Transform
+      pos: 59.5,-39.5
+      parent: 2
+  - uid: 11953
+    components:
+    - type: Transform
+      pos: 65.5,-31.5
+      parent: 2
+  - uid: 11955
+    components:
+    - type: Transform
+      pos: 65.5,-32.5
+      parent: 2
+  - uid: 11957
+    components:
+    - type: Transform
+      pos: 65.5,-33.5
+      parent: 2
   - uid: 11958
     components:
     - type: Transform
@@ -19755,41 +20341,6 @@ entities:
     - type: Transform
       pos: 40.5,-40.5
       parent: 2
-  - uid: 11976
-    components:
-    - type: Transform
-      pos: 44.5,-43.5
-      parent: 2
-  - uid: 11977
-    components:
-    - type: Transform
-      pos: 45.5,-43.5
-      parent: 2
-  - uid: 11978
-    components:
-    - type: Transform
-      pos: 46.5,-43.5
-      parent: 2
-  - uid: 11979
-    components:
-    - type: Transform
-      pos: 47.5,-43.5
-      parent: 2
-  - uid: 11980
-    components:
-    - type: Transform
-      pos: 47.5,-42.5
-      parent: 2
-  - uid: 11981
-    components:
-    - type: Transform
-      pos: 47.5,-41.5
-      parent: 2
-  - uid: 11982
-    components:
-    - type: Transform
-      pos: 47.5,-44.5
-      parent: 2
   - uid: 11983
     components:
     - type: Transform
@@ -20690,16 +21241,6 @@ entities:
     - type: Transform
       pos: 54.5,-100.5
       parent: 2
-  - uid: 12242
-    components:
-    - type: Transform
-      pos: 54.5,-99.5
-      parent: 2
-  - uid: 12243
-    components:
-    - type: Transform
-      pos: 54.5,-98.5
-      parent: 2
   - uid: 12244
     components:
     - type: Transform
@@ -22075,6 +22616,11 @@ entities:
     - type: Transform
       pos: -19.5,-30.5
       parent: 2
+  - uid: 12579
+    components:
+    - type: Transform
+      pos: 59.5,-36.5
+      parent: 2
   - uid: 12595
     components:
     - type: Transform
@@ -22635,6 +23181,11 @@ entities:
     - type: Transform
       pos: -28.5,-16.5
       parent: 2
+  - uid: 12729
+    components:
+    - type: Transform
+      pos: 60.5,-36.5
+      parent: 2
   - uid: 12731
     components:
     - type: Transform
@@ -22700,31 +23251,6 @@ entities:
     - type: Transform
       pos: -49.5,-61.5
       parent: 2
-  - uid: 12744
-    components:
-    - type: Transform
-      pos: -36.5,-76.5
-      parent: 2
-  - uid: 12745
-    components:
-    - type: Transform
-      pos: -37.5,-76.5
-      parent: 2
-  - uid: 12746
-    components:
-    - type: Transform
-      pos: -38.5,-76.5
-      parent: 2
-  - uid: 12747
-    components:
-    - type: Transform
-      pos: -39.5,-76.5
-      parent: 2
-  - uid: 12748
-    components:
-    - type: Transform
-      pos: -40.5,-76.5
-      parent: 2
   - uid: 12749
     components:
     - type: Transform
@@ -22915,6 +23441,11 @@ entities:
     - type: Transform
       pos: 24.5,-68.5
       parent: 2
+  - uid: 12792
+    components:
+    - type: Transform
+      pos: 42.5,-27.5
+      parent: 2
   - uid: 12798
     components:
     - type: Transform
@@ -22940,6 +23471,11 @@ entities:
     - type: Transform
       pos: 66.5,-33.5
       parent: 2
+  - uid: 12805
+    components:
+    - type: Transform
+      pos: 59.5,-37.5
+      parent: 2
   - uid: 12806
     components:
     - type: Transform
@@ -23008,12 +23544,37 @@ entities:
   - uid: 12819
     components:
     - type: Transform
-      pos: 64.5,-33.5
+      pos: 59.5,-38.5
+      parent: 2
+  - uid: 12822
+    components:
+    - type: Transform
+      pos: 60.5,-32.5
+      parent: 2
+  - uid: 12828
+    components:
+    - type: Transform
+      pos: 62.5,-32.5
+      parent: 2
+  - uid: 12829
+    components:
+    - type: Transform
+      pos: 61.5,-32.5
+      parent: 2
+  - uid: 12830
+    components:
+    - type: Transform
+      pos: 62.5,-33.5
+      parent: 2
+  - uid: 12832
+    components:
+    - type: Transform
+      pos: 62.5,-34.5
       parent: 2
   - uid: 12835
     components:
     - type: Transform
-      pos: 59.5,-33.5
+      pos: 62.5,-35.5
       parent: 2
   - uid: 12836
     components:
@@ -23023,22 +23584,22 @@ entities:
   - uid: 12837
     components:
     - type: Transform
-      pos: 59.5,-32.5
+      pos: 62.5,-36.5
       parent: 2
   - uid: 12838
     components:
     - type: Transform
-      pos: 61.5,-38.5
+      pos: 62.5,-37.5
       parent: 2
   - uid: 12839
     components:
     - type: Transform
       pos: 62.5,-38.5
       parent: 2
-  - uid: 12842
+  - uid: 12840
     components:
     - type: Transform
-      pos: 57.5,-75.5
+      pos: 62.5,-39.5
       parent: 2
   - uid: 12843
     components:
@@ -23050,6 +23611,31 @@ entities:
     - type: Transform
       pos: 59.5,-75.5
       parent: 2
+  - uid: 12855
+    components:
+    - type: Transform
+      pos: 62.5,-40.5
+      parent: 2
+  - uid: 12856
+    components:
+    - type: Transform
+      pos: 63.5,-36.5
+      parent: 2
+  - uid: 12857
+    components:
+    - type: Transform
+      pos: 64.5,-36.5
+      parent: 2
+  - uid: 12858
+    components:
+    - type: Transform
+      pos: 67.5,-48.5
+      parent: 2
+  - uid: 12860
+    components:
+    - type: Transform
+      pos: 66.5,-48.5
+      parent: 2
   - uid: 12861
     components:
     - type: Transform
@@ -23090,6 +23676,16 @@ entities:
     - type: Transform
       pos: 65.5,-73.5
       parent: 2
+  - uid: 12882
+    components:
+    - type: Transform
+      pos: 65.5,-48.5
+      parent: 2
+  - uid: 12883
+    components:
+    - type: Transform
+      pos: 65.5,-49.5
+      parent: 2
   - uid: 12888
     components:
     - type: Transform
@@ -23145,11 +23741,21 @@ entities:
     - type: Transform
       pos: 29.5,-66.5
       parent: 2
+  - uid: 12912
+    components:
+    - type: Transform
+      pos: 65.5,-50.5
+      parent: 2
   - uid: 12913
     components:
     - type: Transform
       pos: 53.5,-55.5
       parent: 2
+  - uid: 12914
+    components:
+    - type: Transform
+      pos: 65.5,-51.5
+      parent: 2
   - uid: 12917
     components:
     - type: Transform
@@ -23180,270 +23786,130 @@ entities:
     - type: Transform
       pos: 43.5,-49.5
       parent: 2
-  - uid: 12933
+  - uid: 12927
     components:
     - type: Transform
-      pos: 48.5,-35.5
+      pos: 66.5,-51.5
+      parent: 2
+  - uid: 12930
+    components:
+    - type: Transform
+      pos: 66.5,-52.5
+      parent: 2
+  - uid: 12931
+    components:
+    - type: Transform
+      pos: 67.5,-52.5
+      parent: 2
+  - uid: 12932
+    components:
+    - type: Transform
+      pos: 68.5,-52.5
+      parent: 2
+  - uid: 12934
+    components:
+    - type: Transform
+      pos: 69.5,-52.5
       parent: 2
   - uid: 12935
     components:
     - type: Transform
-      pos: 47.5,-35.5
+      pos: 70.5,-52.5
       parent: 2
   - uid: 12936
     components:
     - type: Transform
-      pos: 46.5,-35.5
+      pos: 68.5,-48.5
       parent: 2
   - uid: 12937
     components:
     - type: Transform
-      pos: 46.5,-36.5
+      pos: 69.5,-48.5
       parent: 2
   - uid: 12938
     components:
     - type: Transform
-      pos: 46.5,-37.5
+      pos: 70.5,-48.5
       parent: 2
   - uid: 12939
     components:
     - type: Transform
-      pos: 45.5,-37.5
+      pos: 71.5,-48.5
       parent: 2
   - uid: 12940
     components:
     - type: Transform
-      pos: 44.5,-37.5
+      pos: 72.5,-48.5
       parent: 2
   - uid: 12941
     components:
     - type: Transform
-      pos: 44.5,-36.5
-      parent: 2
-  - uid: 12942
-    components:
-    - type: Transform
-      pos: 44.5,-35.5
-      parent: 2
-  - uid: 12943
-    components:
-    - type: Transform
-      pos: 43.5,-35.5
-      parent: 2
-  - uid: 12944
-    components:
-    - type: Transform
-      pos: 42.5,-35.5
+      pos: 72.5,-47.5
       parent: 2
   - uid: 12945
     components:
     - type: Transform
-      pos: 42.5,-36.5
+      pos: 72.5,-46.5
       parent: 2
   - uid: 12946
     components:
     - type: Transform
-      pos: 42.5,-37.5
+      pos: 69.5,-47.5
       parent: 2
   - uid: 12947
     components:
     - type: Transform
-      pos: 42.5,-38.5
+      pos: 72.5,-49.5
       parent: 2
   - uid: 12948
     components:
     - type: Transform
-      pos: 41.5,-38.5
+      pos: 65.5,-47.5
       parent: 2
   - uid: 12949
     components:
     - type: Transform
-      pos: 40.5,-38.5
-      parent: 2
-  - uid: 12950
-    components:
-    - type: Transform
-      pos: 40.5,-37.5
+      pos: 65.5,-46.5
       parent: 2
   - uid: 12951
     components:
     - type: Transform
-      pos: 40.5,-36.5
-      parent: 2
-  - uid: 12952
-    components:
-    - type: Transform
-      pos: 40.5,-35.5
+      pos: 65.5,-45.5
       parent: 2
   - uid: 12953
     components:
     - type: Transform
-      pos: 39.5,-35.5
+      pos: 65.5,-44.5
       parent: 2
   - uid: 12954
     components:
     - type: Transform
-      pos: 38.5,-35.5
-      parent: 2
-  - uid: 12955
-    components:
-    - type: Transform
-      pos: 38.5,-34.5
-      parent: 2
-  - uid: 12956
-    components:
-    - type: Transform
-      pos: 38.5,-33.5
-      parent: 2
-  - uid: 12957
-    components:
-    - type: Transform
-      pos: 49.5,-35.5
-      parent: 2
-  - uid: 12958
-    components:
-    - type: Transform
-      pos: 50.5,-35.5
-      parent: 2
-  - uid: 12959
-    components:
-    - type: Transform
-      pos: 50.5,-36.5
-      parent: 2
-  - uid: 12960
-    components:
-    - type: Transform
-      pos: 50.5,-37.5
-      parent: 2
-  - uid: 12961
-    components:
-    - type: Transform
-      pos: 50.5,-38.5
-      parent: 2
-  - uid: 12962
-    components:
-    - type: Transform
-      pos: 50.5,-39.5
-      parent: 2
-  - uid: 12963
-    components:
-    - type: Transform
-      pos: 50.5,-40.5
-      parent: 2
-  - uid: 12964
-    components:
-    - type: Transform
-      pos: 51.5,-40.5
-      parent: 2
-  - uid: 12965
-    components:
-    - type: Transform
-      pos: 52.5,-40.5
+      pos: 65.5,-43.5
       parent: 2
   - uid: 12966
     components:
     - type: Transform
-      pos: 52.5,-41.5
+      pos: 65.5,-42.5
       parent: 2
   - uid: 12967
     components:
     - type: Transform
-      pos: 52.5,-42.5
+      pos: 65.5,-41.5
       parent: 2
   - uid: 12969
     components:
     - type: Transform
-      pos: 48.5,-33.5
+      pos: 65.5,-40.5
       parent: 2
   - uid: 12970
     components:
     - type: Transform
-      pos: 49.5,-33.5
-      parent: 2
-  - uid: 12974
-    components:
-    - type: Transform
-      pos: 48.5,-34.5
-      parent: 2
-  - uid: 12976
-    components:
-    - type: Transform
-      pos: 50.5,-29.5
-      parent: 2
-  - uid: 12977
-    components:
-    - type: Transform
-      pos: 51.5,-29.5
-      parent: 2
-  - uid: 12978
-    components:
-    - type: Transform
-      pos: 52.5,-29.5
+      pos: 66.5,-40.5
       parent: 2
   - uid: 12979
     components:
     - type: Transform
-      pos: 47.5,-33.5
-      parent: 2
-  - uid: 12980
-    components:
-    - type: Transform
-      pos: 46.5,-33.5
-      parent: 2
-  - uid: 12981
-    components:
-    - type: Transform
-      pos: 46.5,-32.5
-      parent: 2
-  - uid: 12982
-    components:
-    - type: Transform
-      pos: 46.5,-31.5
-      parent: 2
-  - uid: 12983
-    components:
-    - type: Transform
-      pos: 45.5,-31.5
-      parent: 2
-  - uid: 12984
-    components:
-    - type: Transform
-      pos: 44.5,-31.5
-      parent: 2
-  - uid: 12985
-    components:
-    - type: Transform
-      pos: 44.5,-32.5
-      parent: 2
-  - uid: 12986
-    components:
-    - type: Transform
-      pos: 44.5,-33.5
-      parent: 2
-  - uid: 12987
-    components:
-    - type: Transform
-      pos: 43.5,-33.5
-      parent: 2
-  - uid: 12988
-    components:
-    - type: Transform
-      pos: 42.5,-33.5
-      parent: 2
-  - uid: 12989
-    components:
-    - type: Transform
-      pos: 42.5,-32.5
-      parent: 2
-  - uid: 12993
-    components:
-    - type: Transform
-      pos: 40.5,-32.5
-      parent: 2
-  - uid: 12994
-    components:
-    - type: Transform
-      pos: 40.5,-33.5
+      pos: 67.5,-40.5
       parent: 2
   - uid: 12995
     components:
@@ -23533,42 +23999,42 @@ entities:
   - uid: 13012
     components:
     - type: Transform
-      pos: 24.5,-22.5
+      pos: 68.5,-40.5
       parent: 2
   - uid: 13013
     components:
     - type: Transform
-      pos: 24.5,-21.5
+      pos: 69.5,-40.5
       parent: 2
   - uid: 13014
     components:
     - type: Transform
-      pos: 24.5,-20.5
+      pos: 70.5,-40.5
       parent: 2
   - uid: 13015
     components:
     - type: Transform
-      pos: 24.5,-19.5
+      pos: 71.5,-40.5
       parent: 2
   - uid: 13016
     components:
     - type: Transform
-      pos: 24.5,-18.5
+      pos: 71.5,-41.5
       parent: 2
   - uid: 13017
     components:
     - type: Transform
-      pos: 24.5,-17.5
+      pos: 69.5,-39.5
       parent: 2
   - uid: 13018
     components:
     - type: Transform
-      pos: 24.5,-16.5
+      pos: 71.5,-39.5
       parent: 2
   - uid: 13019
     components:
     - type: Transform
-      pos: 24.5,-15.5
+      pos: 71.5,-42.5
       parent: 2
   - uid: 13020
     components:
@@ -23915,6 +24381,11 @@ entities:
     - type: Transform
       pos: -2.5,-40.5
       parent: 2
+  - uid: 13106
+    components:
+    - type: Transform
+      pos: 71.5,-43.5
+      parent: 2
   - uid: 13107
     components:
     - type: Transform
@@ -24130,6 +24601,31 @@ entities:
     - type: Transform
       pos: 4.5,-37.5
       parent: 2
+  - uid: 13154
+    components:
+    - type: Transform
+      pos: 71.5,-44.5
+      parent: 2
+  - uid: 13155
+    components:
+    - type: Transform
+      pos: 72.5,-44.5
+      parent: 2
+  - uid: 13156
+    components:
+    - type: Transform
+      pos: 73.5,-44.5
+      parent: 2
+  - uid: 13157
+    components:
+    - type: Transform
+      pos: 72.5,-45.5
+      parent: 2
+  - uid: 13161
+    components:
+    - type: Transform
+      pos: 65.5,-39.5
+      parent: 2
   - uid: 13174
     components:
     - type: Transform
@@ -24200,6 +24696,11 @@ entities:
     - type: Transform
       pos: 8.5,-59.5
       parent: 2
+  - uid: 13198
+    components:
+    - type: Transform
+      pos: 65.5,-36.5
+      parent: 2
   - uid: 13199
     components:
     - type: Transform
@@ -24365,31 +24866,6 @@ entities:
     - type: Transform
       pos: 37.5,-88.5
       parent: 2
-  - uid: 13253
-    components:
-    - type: Transform
-      pos: 74.5,-69.5
-      parent: 2
-  - uid: 13254
-    components:
-    - type: Transform
-      pos: 75.5,-69.5
-      parent: 2
-  - uid: 13255
-    components:
-    - type: Transform
-      pos: 76.5,-69.5
-      parent: 2
-  - uid: 13256
-    components:
-    - type: Transform
-      pos: 77.5,-69.5
-      parent: 2
-  - uid: 13257
-    components:
-    - type: Transform
-      pos: 77.5,-70.5
-      parent: 2
   - uid: 13258
     components:
     - type: Transform
@@ -24510,15 +24986,150 @@ entities:
     - type: Transform
       pos: 16.5,-67.5
       parent: 2
-  - uid: 13645
+  - uid: 13634
     components:
     - type: Transform
-      pos: 59.5,-74.5
+      pos: 34.5,-68.5
+      parent: 2
+  - uid: 13689
+    components:
+    - type: Transform
+      pos: 58.5,-48.5
+      parent: 2
+  - uid: 13690
+    components:
+    - type: Transform
+      pos: 59.5,-48.5
+      parent: 2
+  - uid: 13691
+    components:
+    - type: Transform
+      pos: 57.5,-48.5
+      parent: 2
+  - uid: 13692
+    components:
+    - type: Transform
+      pos: 59.5,-49.5
+      parent: 2
+  - uid: 13693
+    components:
+    - type: Transform
+      pos: 59.5,-50.5
+      parent: 2
+  - uid: 13694
+    components:
+    - type: Transform
+      pos: 61.5,-51.5
+      parent: 2
+  - uid: 13695
+    components:
+    - type: Transform
+      pos: 61.5,-50.5
+      parent: 2
+  - uid: 13696
+    components:
+    - type: Transform
+      pos: 61.5,-49.5
+      parent: 2
+  - uid: 13697
+    components:
+    - type: Transform
+      pos: 61.5,-48.5
+      parent: 2
+  - uid: 13698
+    components:
+    - type: Transform
+      pos: 61.5,-47.5
+      parent: 2
+  - uid: 13699
+    components:
+    - type: Transform
+      pos: 60.5,-47.5
+      parent: 2
+  - uid: 13700
+    components:
+    - type: Transform
+      pos: 59.5,-47.5
+      parent: 2
+  - uid: 13701
+    components:
+    - type: Transform
+      pos: 62.5,-48.5
+      parent: 2
+  - uid: 13721
+    components:
+    - type: Transform
+      pos: 60.5,-51.5
+      parent: 2
+  - uid: 13789
+    components:
+    - type: Transform
+      pos: 59.5,-51.5
+      parent: 2
+  - uid: 13790
+    components:
+    - type: Transform
+      pos: 60.5,-46.5
+      parent: 2
+  - uid: 13791
+    components:
+    - type: Transform
+      pos: 60.5,-45.5
+      parent: 2
+  - uid: 13792
+    components:
+    - type: Transform
+      pos: 60.5,-44.5
+      parent: 2
+  - uid: 13793
+    components:
+    - type: Transform
+      pos: 59.5,-44.5
+      parent: 2
+  - uid: 13797
+    components:
+    - type: Transform
+      pos: 58.5,-44.5
+      parent: 2
+  - uid: 13798
+    components:
+    - type: Transform
+      pos: 61.5,-44.5
+      parent: 2
+  - uid: 13799
+    components:
+    - type: Transform
+      pos: 56.5,-39.5
       parent: 2
   - uid: 13800
     components:
     - type: Transform
-      pos: 64.5,-40.5
+      pos: 55.5,-39.5
+      parent: 2
+  - uid: 13801
+    components:
+    - type: Transform
+      pos: 56.5,-36.5
+      parent: 2
+  - uid: 13809
+    components:
+    - type: Transform
+      pos: 57.5,-36.5
+      parent: 2
+  - uid: 13810
+    components:
+    - type: Transform
+      pos: 58.5,-36.5
+      parent: 2
+  - uid: 13815
+    components:
+    - type: Transform
+      pos: 56.5,-31.5
+      parent: 2
+  - uid: 13816
+    components:
+    - type: Transform
+      pos: 56.5,-30.5
       parent: 2
   - uid: 13817
     components:
@@ -24530,10 +25141,20 @@ entities:
     - type: Transform
       pos: 48.5,-52.5
       parent: 2
+  - uid: 13819
+    components:
+    - type: Transform
+      pos: 56.5,-29.5
+      parent: 2
+  - uid: 13821
+    components:
+    - type: Transform
+      pos: 56.5,-28.5
+      parent: 2
   - uid: 13822
     components:
     - type: Transform
-      pos: 65.5,-42.5
+      pos: 56.5,-27.5
       parent: 2
   - uid: 13823
     components:
@@ -24545,20 +25166,70 @@ entities:
     - type: Transform
       pos: 59.5,-30.5
       parent: 2
+  - uid: 13825
+    components:
+    - type: Transform
+      pos: 56.5,-26.5
+      parent: 2
+  - uid: 13826
+    components:
+    - type: Transform
+      pos: 69.5,-29.5
+      parent: 2
+  - uid: 13827
+    components:
+    - type: Transform
+      pos: 67.5,-29.5
+      parent: 2
+  - uid: 13828
+    components:
+    - type: Transform
+      pos: 70.5,-28.5
+      parent: 2
+  - uid: 13830
+    components:
+    - type: Transform
+      pos: 65.5,-26.5
+      parent: 2
+  - uid: 13831
+    components:
+    - type: Transform
+      pos: 65.5,-25.5
+      parent: 2
+  - uid: 13832
+    components:
+    - type: Transform
+      pos: 65.5,-24.5
+      parent: 2
+  - uid: 13834
+    components:
+    - type: Transform
+      pos: 66.5,-24.5
+      parent: 2
+  - uid: 13841
+    components:
+    - type: Transform
+      pos: 69.5,-44.5
+      parent: 2
+  - uid: 13848
+    components:
+    - type: Transform
+      pos: 68.5,-44.5
+      parent: 2
+  - uid: 13851
+    components:
+    - type: Transform
+      pos: 67.5,-44.5
+      parent: 2
   - uid: 13854
     components:
     - type: Transform
-      pos: 70.5,-42.5
-      parent: 2
-  - uid: 13858
-    components:
-    - type: Transform
-      pos: 60.5,-63.5
+      pos: 66.5,-44.5
       parent: 2
   - uid: 13862
     components:
     - type: Transform
-      pos: 59.5,-64.5
+      pos: 50.5,-45.5
       parent: 2
   - uid: 13863
     components:
@@ -24570,35 +25241,265 @@ entities:
     - type: Transform
       pos: 75.5,-23.5
       parent: 2
+  - uid: 13867
+    components:
+    - type: Transform
+      pos: 51.5,-45.5
+      parent: 2
+  - uid: 13869
+    components:
+    - type: Transform
+      pos: 51.5,-46.5
+      parent: 2
+  - uid: 13870
+    components:
+    - type: Transform
+      pos: 51.5,-47.5
+      parent: 2
+  - uid: 13872
+    components:
+    - type: Transform
+      pos: 51.5,-48.5
+      parent: 2
+  - uid: 13875
+    components:
+    - type: Transform
+      pos: 52.5,-44.5
+      parent: 2
+  - uid: 13877
+    components:
+    - type: Transform
+      pos: 53.5,-44.5
+      parent: 2
+  - uid: 13878
+    components:
+    - type: Transform
+      pos: 59.5,-56.5
+      parent: 2
+  - uid: 13882
+    components:
+    - type: Transform
+      pos: 53.5,-43.5
+      parent: 2
+  - uid: 13894
+    components:
+    - type: Transform
+      pos: 55.5,-43.5
+      parent: 2
+  - uid: 13895
+    components:
+    - type: Transform
+      pos: 55.5,-42.5
+      parent: 2
+  - uid: 13896
+    components:
+    - type: Transform
+      pos: 56.5,-42.5
+      parent: 2
+  - uid: 13897
+    components:
+    - type: Transform
+      pos: 57.5,-42.5
+      parent: 2
+  - uid: 13898
+    components:
+    - type: Transform
+      pos: 58.5,-42.5
+      parent: 2
+  - uid: 13902
+    components:
+    - type: Transform
+      pos: 59.5,-42.5
+      parent: 2
+  - uid: 13907
+    components:
+    - type: Transform
+      pos: 58.5,-65.5
+      parent: 2
+  - uid: 13910
+    components:
+    - type: Transform
+      pos: 60.5,-42.5
+      parent: 2
+  - uid: 13915
+    components:
+    - type: Transform
+      pos: 61.5,-42.5
+      parent: 2
   - uid: 13916
     components:
     - type: Transform
       pos: 31.5,-70.5
       parent: 2
+  - uid: 13917
+    components:
+    - type: Transform
+      pos: 55.5,-46.5
+      parent: 2
+  - uid: 13920
+    components:
+    - type: Transform
+      pos: 55.5,-47.5
+      parent: 2
+  - uid: 13921
+    components:
+    - type: Transform
+      pos: 55.5,-48.5
+      parent: 2
+  - uid: 13922
+    components:
+    - type: Transform
+      pos: 55.5,-49.5
+      parent: 2
+  - uid: 13923
+    components:
+    - type: Transform
+      pos: 55.5,-50.5
+      parent: 2
+  - uid: 13924
+    components:
+    - type: Transform
+      pos: 55.5,-51.5
+      parent: 2
+  - uid: 13925
+    components:
+    - type: Transform
+      pos: 55.5,-52.5
+      parent: 2
+  - uid: 13926
+    components:
+    - type: Transform
+      pos: 62.5,-59.5
+      parent: 2
+  - uid: 13927
+    components:
+    - type: Transform
+      pos: 56.5,-53.5
+      parent: 2
+  - uid: 13928
+    components:
+    - type: Transform
+      pos: 59.5,-59.5
+      parent: 2
+  - uid: 13929
+    components:
+    - type: Transform
+      pos: 57.5,-54.5
+      parent: 2
+  - uid: 13930
+    components:
+    - type: Transform
+      pos: 58.5,-54.5
+      parent: 2
+  - uid: 13931
+    components:
+    - type: Transform
+      pos: 58.5,-55.5
+      parent: 2
+  - uid: 13933
+    components:
+    - type: Transform
+      pos: 59.5,-55.5
+      parent: 2
+  - uid: 13934
+    components:
+    - type: Transform
+      pos: 54.5,-43.5
+      parent: 2
+  - uid: 13935
+    components:
+    - type: Transform
+      pos: 60.5,-56.5
+      parent: 2
+  - uid: 13936
+    components:
+    - type: Transform
+      pos: 61.5,-56.5
+      parent: 2
+  - uid: 13937
+    components:
+    - type: Transform
+      pos: 62.5,-56.5
+      parent: 2
+  - uid: 13940
+    components:
+    - type: Transform
+      pos: 63.5,-56.5
+      parent: 2
+  - uid: 13986
+    components:
+    - type: Transform
+      pos: 64.5,-56.5
+      parent: 2
+  - uid: 14082
+    components:
+    - type: Transform
+      pos: 60.5,-57.5
+      parent: 2
+  - uid: 14083
+    components:
+    - type: Transform
+      pos: 60.5,-58.5
+      parent: 2
   - uid: 14086
     components:
     - type: Transform
-      pos: 64.5,-37.5
-      parent: 2
-  - uid: 14093
-    components:
-    - type: Transform
-      pos: 78.5,-40.5
+      pos: 60.5,-59.5
       parent: 2
   - uid: 14096
     components:
     - type: Transform
       pos: 78.5,-39.5
       parent: 2
+  - uid: 14118
+    components:
+    - type: Transform
+      pos: 73.5,-58.5
+      parent: 2
   - uid: 14199
     components:
     - type: Transform
       pos: -34.5,-10.5
       parent: 2
+  - uid: 14200
+    components:
+    - type: Transform
+      pos: 77.5,-36.5
+      parent: 2
   - uid: 14212
     components:
     - type: Transform
-      pos: 50.5,-51.5
+      pos: 72.5,-58.5
+      parent: 2
+  - uid: 14240
+    components:
+    - type: Transform
+      pos: 72.5,-57.5
+      parent: 2
+  - uid: 14247
+    components:
+    - type: Transform
+      pos: 71.5,-57.5
+      parent: 2
+  - uid: 14248
+    components:
+    - type: Transform
+      pos: 70.5,-57.5
+      parent: 2
+  - uid: 14249
+    components:
+    - type: Transform
+      pos: 70.5,-56.5
+      parent: 2
+  - uid: 14250
+    components:
+    - type: Transform
+      pos: 66.5,-56.5
+      parent: 2
+  - uid: 14254
+    components:
+    - type: Transform
+      pos: 61.5,-59.5
       parent: 2
   - uid: 14257
     components:
@@ -24608,17 +25509,62 @@ entities:
   - uid: 14261
     components:
     - type: Transform
-      pos: 52.5,-50.5
+      pos: 75.5,-58.5
       parent: 2
-  - uid: 14297
+  - uid: 14263
     components:
     - type: Transform
-      pos: 72.5,-35.5
+      pos: 73.5,-63.5
       parent: 2
-  - uid: 14298
+  - uid: 14265
     components:
     - type: Transform
-      pos: 31.5,-68.5
+      pos: 73.5,-64.5
+      parent: 2
+  - uid: 14275
+    components:
+    - type: Transform
+      pos: 72.5,-64.5
+      parent: 2
+  - uid: 14276
+    components:
+    - type: Transform
+      pos: 71.5,-64.5
+      parent: 2
+  - uid: 14277
+    components:
+    - type: Transform
+      pos: 70.5,-64.5
+      parent: 2
+  - uid: 14279
+    components:
+    - type: Transform
+      pos: 70.5,-65.5
+      parent: 2
+  - uid: 14281
+    components:
+    - type: Transform
+      pos: 70.5,-66.5
+      parent: 2
+  - uid: 14282
+    components:
+    - type: Transform
+      pos: 70.5,-67.5
+      parent: 2
+  - uid: 14287
+    components:
+    - type: Transform
+      pos: 70.5,-68.5
+      parent: 2
+  - uid: 14290
+    components:
+    - type: Transform
+      pos: 70.5,-69.5
+      parent: 2
+  - uid: 14295
+    components:
+    - type: Transform
+      pos: 70.5,-70.5
       parent: 2
   - uid: 14299
     components:
@@ -24640,6 +25586,16 @@ entities:
     - type: Transform
       pos: 31.5,-64.5
       parent: 2
+  - uid: 14304
+    components:
+    - type: Transform
+      pos: 70.5,-71.5
+      parent: 2
+  - uid: 14308
+    components:
+    - type: Transform
+      pos: 79.5,-61.5
+      parent: 2
   - uid: 14309
     components:
     - type: Transform
@@ -24660,6 +25616,41 @@ entities:
     - type: Transform
       pos: 65.5,-29.5
       parent: 2
+  - uid: 14316
+    components:
+    - type: Transform
+      pos: 61.5,-72.5
+      parent: 2
+  - uid: 14317
+    components:
+    - type: Transform
+      pos: 67.5,-66.5
+      parent: 2
+  - uid: 14320
+    components:
+    - type: Transform
+      pos: 55.5,-53.5
+      parent: 2
+  - uid: 14321
+    components:
+    - type: Transform
+      pos: 56.5,-54.5
+      parent: 2
+  - uid: 14327
+    components:
+    - type: Transform
+      pos: 60.5,-72.5
+      parent: 2
+  - uid: 14328
+    components:
+    - type: Transform
+      pos: 50.5,-41.5
+      parent: 2
+  - uid: 14331
+    components:
+    - type: Transform
+      pos: 49.5,-41.5
+      parent: 2
   - uid: 14333
     components:
     - type: Transform
@@ -24670,20 +25661,85 @@ entities:
     - type: Transform
       pos: 70.5,-20.5
       parent: 2
+  - uid: 14343
+    components:
+    - type: Transform
+      pos: 48.5,-41.5
+      parent: 2
+  - uid: 14344
+    components:
+    - type: Transform
+      pos: 48.5,-40.5
+      parent: 2
   - uid: 14345
     components:
     - type: Transform
       pos: 70.5,-21.5
       parent: 2
+  - uid: 14350
+    components:
+    - type: Transform
+      pos: 48.5,-39.5
+      parent: 2
+  - uid: 14352
+    components:
+    - type: Transform
+      pos: 48.5,-38.5
+      parent: 2
+  - uid: 14353
+    components:
+    - type: Transform
+      pos: 58.5,-74.5
+      parent: 2
+  - uid: 14355
+    components:
+    - type: Transform
+      pos: 75.5,-47.5
+      parent: 2
   - uid: 14356
     components:
     - type: Transform
       pos: 65.5,-18.5
       parent: 2
+  - uid: 14357
+    components:
+    - type: Transform
+      pos: 47.5,-38.5
+      parent: 2
+  - uid: 14358
+    components:
+    - type: Transform
+      pos: 50.5,-29.5
+      parent: 2
+  - uid: 14362
+    components:
+    - type: Transform
+      pos: 49.5,-29.5
+      parent: 2
+  - uid: 14363
+    components:
+    - type: Transform
+      pos: 47.5,-37.5
+      parent: 2
+  - uid: 14386
+    components:
+    - type: Transform
+      pos: 48.5,-42.5
+      parent: 2
+  - uid: 14393
+    components:
+    - type: Transform
+      pos: 48.5,-43.5
+      parent: 2
+  - uid: 14406
+    components:
+    - type: Transform
+      pos: 47.5,-43.5
+      parent: 2
   - uid: 14410
     components:
     - type: Transform
-      pos: 60.5,-38.5
+      pos: 44.5,-49.5
       parent: 2
   - uid: 14422
     components:
@@ -24705,31 +25761,236 @@ entities:
     - type: Transform
       pos: 85.5,-22.5
       parent: 2
+  - uid: 14427
+    components:
+    - type: Transform
+      pos: 45.5,-49.5
+      parent: 2
+  - uid: 14428
+    components:
+    - type: Transform
+      pos: 46.5,-43.5
+      parent: 2
+  - uid: 14450
+    components:
+    - type: Transform
+      pos: 46.5,-44.5
+      parent: 2
+  - uid: 14555
+    components:
+    - type: Transform
+      pos: 46.5,-45.5
+      parent: 2
+  - uid: 14574
+    components:
+    - type: Transform
+      pos: 46.5,-46.5
+      parent: 2
+  - uid: 14582
+    components:
+    - type: Transform
+      pos: 47.5,-46.5
+      parent: 2
+  - uid: 14583
+    components:
+    - type: Transform
+      pos: 48.5,-46.5
+      parent: 2
+  - uid: 14585
+    components:
+    - type: Transform
+      pos: 48.5,-45.5
+      parent: 2
+  - uid: 14588
+    components:
+    - type: Transform
+      pos: 38.5,-34.5
+      parent: 2
+  - uid: 14601
+    components:
+    - type: Transform
+      pos: 39.5,-34.5
+      parent: 2
+  - uid: 14602
+    components:
+    - type: Transform
+      pos: 32.5,-19.5
+      parent: 2
+  - uid: 14622
+    components:
+    - type: Transform
+      pos: 31.5,-19.5
+      parent: 2
+  - uid: 14641
+    components:
+    - type: Transform
+      pos: 31.5,-18.5
+      parent: 2
+  - uid: 14668
+    components:
+    - type: Transform
+      pos: 31.5,-17.5
+      parent: 2
+  - uid: 14669
+    components:
+    - type: Transform
+      pos: 31.5,-16.5
+      parent: 2
+  - uid: 14679
+    components:
+    - type: Transform
+      pos: 31.5,-15.5
+      parent: 2
   - uid: 14689
     components:
     - type: Transform
       pos: -30.5,-13.5
       parent: 2
+  - uid: 14694
+    components:
+    - type: Transform
+      pos: 31.5,-14.5
+      parent: 2
+  - uid: 14698
+    components:
+    - type: Transform
+      pos: 31.5,-12.5
+      parent: 2
+  - uid: 14700
+    components:
+    - type: Transform
+      pos: 31.5,-13.5
+      parent: 2
+  - uid: 14724
+    components:
+    - type: Transform
+      pos: 32.5,-15.5
+      parent: 2
+  - uid: 14732
+    components:
+    - type: Transform
+      pos: 33.5,-15.5
+      parent: 2
+  - uid: 14733
+    components:
+    - type: Transform
+      pos: 34.5,-15.5
+      parent: 2
   - uid: 14734
     components:
     - type: Transform
       pos: 59.5,-28.5
       parent: 2
+  - uid: 14735
+    components:
+    - type: Transform
+      pos: 35.5,-15.5
+      parent: 2
+  - uid: 14736
+    components:
+    - type: Transform
+      pos: 35.5,-14.5
+      parent: 2
   - uid: 14750
     components:
     - type: Transform
       pos: 67.5,-28.5
       parent: 2
+  - uid: 14760
+    components:
+    - type: Transform
+      pos: 35.5,-13.5
+      parent: 2
+  - uid: 14762
+    components:
+    - type: Transform
+      pos: 55.5,-100.5
+      parent: 2
+  - uid: 14763
+    components:
+    - type: Transform
+      pos: 55.5,-99.5
+      parent: 2
+  - uid: 14772
+    components:
+    - type: Transform
+      pos: 35.5,-12.5
+      parent: 2
   - uid: 14802
     components:
     - type: Transform
       pos: -17.5,-52.5
       parent: 2
+  - uid: 14804
+    components:
+    - type: Transform
+      pos: 30.5,-15.5
+      parent: 2
   - uid: 14813
     components:
     - type: Transform
       pos: 65.5,-30.5
       parent: 2
+  - uid: 14814
+    components:
+    - type: Transform
+      pos: 31.5,-20.5
+      parent: 2
+  - uid: 14823
+    components:
+    - type: Transform
+      pos: 30.5,-18.5
+      parent: 2
+  - uid: 14824
+    components:
+    - type: Transform
+      pos: 29.5,-18.5
+      parent: 2
+  - uid: 14831
+    components:
+    - type: Transform
+      pos: 35.5,-16.5
+      parent: 2
+  - uid: 14832
+    components:
+    - type: Transform
+      pos: 35.5,-17.5
+      parent: 2
+  - uid: 14874
+    components:
+    - type: Transform
+      pos: 35.5,-18.5
+      parent: 2
+  - uid: 14875
+    components:
+    - type: Transform
+      pos: 29.5,-23.5
+      parent: 2
+  - uid: 14917
+    components:
+    - type: Transform
+      pos: 35.5,-19.5
+      parent: 2
+  - uid: 14922
+    components:
+    - type: Transform
+      pos: 35.5,-20.5
+      parent: 2
+  - uid: 14923
+    components:
+    - type: Transform
+      pos: 35.5,-21.5
+      parent: 2
+  - uid: 14925
+    components:
+    - type: Transform
+      pos: 30.5,-23.5
+      parent: 2
+  - uid: 14956
+    components:
+    - type: Transform
+      pos: 31.5,-23.5
+      parent: 2
   - uid: 14986
     components:
     - type: Transform
@@ -24810,305 +26071,80 @@ entities:
     - type: Transform
       pos: 19.5,-60.5
       parent: 2
+  - uid: 15127
+    components:
+    - type: Transform
+      pos: 75.5,-68.5
+      parent: 2
+  - uid: 15129
+    components:
+    - type: Transform
+      pos: 32.5,-23.5
+      parent: 2
+  - uid: 15137
+    components:
+    - type: Transform
+      pos: 33.5,-23.5
+      parent: 2
+  - uid: 15138
+    components:
+    - type: Transform
+      pos: 34.5,-23.5
+      parent: 2
+  - uid: 15139
+    components:
+    - type: Transform
+      pos: 35.5,-23.5
+      parent: 2
+  - uid: 15140
+    components:
+    - type: Transform
+      pos: 75.5,-67.5
+      parent: 2
   - uid: 15141
     components:
     - type: Transform
       pos: -15.5,-16.5
       parent: 2
-  - uid: 15146
+  - uid: 15145
     components:
     - type: Transform
-      pos: 67.5,-42.5
+      pos: 36.5,-23.5
+      parent: 2
+  - uid: 15147
+    components:
+    - type: Transform
+      pos: 72.5,-70.5
       parent: 2
   - uid: 15149
     components:
     - type: Transform
-      pos: 34.5,-26.5
+      pos: 72.5,-74.5
       parent: 2
   - uid: 15150
     components:
     - type: Transform
-      pos: 35.5,-26.5
-      parent: 2
-  - uid: 15151
-    components:
-    - type: Transform
-      pos: 36.5,-26.5
-      parent: 2
-  - uid: 15152
-    components:
-    - type: Transform
-      pos: 37.5,-26.5
-      parent: 2
-  - uid: 15153
-    components:
-    - type: Transform
-      pos: 38.5,-26.5
-      parent: 2
-  - uid: 15154
-    components:
-    - type: Transform
-      pos: 39.5,-26.5
-      parent: 2
-  - uid: 15155
-    components:
-    - type: Transform
-      pos: 40.5,-26.5
-      parent: 2
-  - uid: 15156
-    components:
-    - type: Transform
-      pos: 41.5,-26.5
-      parent: 2
-  - uid: 15157
-    components:
-    - type: Transform
-      pos: 42.5,-26.5
-      parent: 2
-  - uid: 15161
-    components:
-    - type: Transform
-      pos: 45.5,-25.5
-      parent: 2
-  - uid: 15162
-    components:
-    - type: Transform
-      pos: 44.5,-30.5
-      parent: 2
-  - uid: 15163
-    components:
-    - type: Transform
-      pos: 49.5,-30.5
-      parent: 2
-  - uid: 15164
-    components:
-    - type: Transform
-      pos: 49.5,-29.5
-      parent: 2
-  - uid: 15166
-    components:
-    - type: Transform
-      pos: 44.5,-26.5
-      parent: 2
-  - uid: 15167
-    components:
-    - type: Transform
-      pos: 44.5,-25.5
-      parent: 2
-  - uid: 15168
-    components:
-    - type: Transform
-      pos: 46.5,-25.5
-      parent: 2
-  - uid: 15169
-    components:
-    - type: Transform
-      pos: 46.5,-26.5
-      parent: 2
-  - uid: 15170
-    components:
-    - type: Transform
-      pos: 46.5,-27.5
-      parent: 2
-  - uid: 15176
-    components:
-    - type: Transform
-      pos: 48.5,-27.5
-      parent: 2
-  - uid: 15181
-    components:
-    - type: Transform
-      pos: 52.5,-26.5
-      parent: 2
-  - uid: 15182
-    components:
-    - type: Transform
-      pos: 53.5,-26.5
+      pos: 72.5,-73.5
       parent: 2
   - uid: 15183
     components:
     - type: Transform
-      pos: 54.5,-26.5
+      pos: 84.5,-44.5
       parent: 2
   - uid: 15184
     components:
     - type: Transform
-      pos: 55.5,-26.5
+      pos: 85.5,-44.5
       parent: 2
   - uid: 15185
     components:
     - type: Transform
-      pos: 55.5,-27.5
+      pos: 84.5,-46.5
       parent: 2
   - uid: 15186
     components:
     - type: Transform
-      pos: 55.5,-28.5
-      parent: 2
-  - uid: 15187
-    components:
-    - type: Transform
-      pos: 55.5,-29.5
-      parent: 2
-  - uid: 15188
-    components:
-    - type: Transform
-      pos: 55.5,-30.5
-      parent: 2
-  - uid: 15189
-    components:
-    - type: Transform
-      pos: 55.5,-31.5
-      parent: 2
-  - uid: 15190
-    components:
-    - type: Transform
-      pos: 55.5,-32.5
-      parent: 2
-  - uid: 15191
-    components:
-    - type: Transform
-      pos: 54.5,-32.5
-      parent: 2
-  - uid: 15192
-    components:
-    - type: Transform
-      pos: 53.5,-32.5
-      parent: 2
-  - uid: 15193
-    components:
-    - type: Transform
-      pos: 52.5,-32.5
-      parent: 2
-  - uid: 15194
-    components:
-    - type: Transform
-      pos: 52.5,-33.5
-      parent: 2
-  - uid: 15195
-    components:
-    - type: Transform
-      pos: 52.5,-34.5
-      parent: 2
-  - uid: 15196
-    components:
-    - type: Transform
-      pos: 53.5,-34.5
-      parent: 2
-  - uid: 15197
-    components:
-    - type: Transform
-      pos: 54.5,-34.5
-      parent: 2
-  - uid: 15198
-    components:
-    - type: Transform
-      pos: 55.5,-34.5
-      parent: 2
-  - uid: 15199
-    components:
-    - type: Transform
-      pos: 55.5,-35.5
-      parent: 2
-  - uid: 15200
-    components:
-    - type: Transform
-      pos: 55.5,-36.5
-      parent: 2
-  - uid: 15201
-    components:
-    - type: Transform
-      pos: 49.5,-44.5
-      parent: 2
-  - uid: 15202
-    components:
-    - type: Transform
-      pos: 50.5,-44.5
-      parent: 2
-  - uid: 15203
-    components:
-    - type: Transform
-      pos: 51.5,-44.5
-      parent: 2
-  - uid: 15204
-    components:
-    - type: Transform
-      pos: 52.5,-44.5
-      parent: 2
-  - uid: 15205
-    components:
-    - type: Transform
-      pos: 53.5,-44.5
-      parent: 2
-  - uid: 15206
-    components:
-    - type: Transform
-      pos: 54.5,-44.5
-      parent: 2
-  - uid: 15207
-    components:
-    - type: Transform
-      pos: 55.5,-44.5
-      parent: 2
-  - uid: 15208
-    components:
-    - type: Transform
-      pos: 55.5,-43.5
-      parent: 2
-  - uid: 15209
-    components:
-    - type: Transform
-      pos: 55.5,-42.5
-      parent: 2
-  - uid: 15210
-    components:
-    - type: Transform
-      pos: 55.5,-41.5
-      parent: 2
-  - uid: 15211
-    components:
-    - type: Transform
-      pos: 55.5,-40.5
-      parent: 2
-  - uid: 15212
-    components:
-    - type: Transform
-      pos: 55.5,-39.5
-      parent: 2
-  - uid: 15213
-    components:
-    - type: Transform
-      pos: 55.5,-38.5
-      parent: 2
-  - uid: 15214
-    components:
-    - type: Transform
-      pos: 54.5,-36.5
-      parent: 2
-  - uid: 15215
-    components:
-    - type: Transform
-      pos: 53.5,-36.5
-      parent: 2
-  - uid: 15216
-    components:
-    - type: Transform
-      pos: 52.5,-36.5
-      parent: 2
-  - uid: 15217
-    components:
-    - type: Transform
-      pos: 52.5,-38.5
-      parent: 2
-  - uid: 15218
-    components:
-    - type: Transform
-      pos: 53.5,-38.5
-      parent: 2
-  - uid: 15219
-    components:
-    - type: Transform
-      pos: 54.5,-38.5
+      pos: 85.5,-46.5
       parent: 2
   - uid: 15263
     components:
@@ -25145,46 +26181,111 @@ entities:
     - type: Transform
       pos: 60.5,-28.5
       parent: 2
+  - uid: 15400
+    components:
+    - type: Transform
+      pos: 79.5,-60.5
+      parent: 2
   - uid: 15407
     components:
     - type: Transform
       pos: 49.5,-76.5
       parent: 2
-  - uid: 15408
-    components:
-    - type: Transform
-      pos: 55.5,-75.5
-      parent: 2
-  - uid: 15438
-    components:
-    - type: Transform
-      pos: 64.5,-36.5
-      parent: 2
   - uid: 15439
     components:
     - type: Transform
       pos: 68.5,-28.5
       parent: 2
-  - uid: 15454
+  - uid: 15463
     components:
     - type: Transform
-      pos: 74.5,-44.5
+      pos: 62.5,-60.5
+      parent: 2
+  - uid: 15464
+    components:
+    - type: Transform
+      pos: 63.5,-60.5
+      parent: 2
+  - uid: 15465
+    components:
+    - type: Transform
+      pos: 64.5,-60.5
       parent: 2
   - uid: 15468
     components:
     - type: Transform
       pos: 61.5,-28.5
       parent: 2
-  - uid: 15469
+  - uid: 15473
     components:
     - type: Transform
-      pos: 64.5,-32.5
+      pos: 65.5,-57.5
+      parent: 2
+  - uid: 15474
+    components:
+    - type: Transform
+      pos: 65.5,-56.5
       parent: 2
   - uid: 15511
     components:
     - type: Transform
       pos: 29.5,-35.5
       parent: 2
+  - uid: 15850
+    components:
+    - type: Transform
+      pos: 48.5,-28.5
+      parent: 2
+  - uid: 15851
+    components:
+    - type: Transform
+      pos: 48.5,-27.5
+      parent: 2
+  - uid: 15854
+    components:
+    - type: Transform
+      pos: 48.5,-30.5
+      parent: 2
+  - uid: 15855
+    components:
+    - type: Transform
+      pos: 48.5,-31.5
+      parent: 2
+  - uid: 15884
+    components:
+    - type: Transform
+      pos: 40.5,-34.5
+      parent: 2
+  - uid: 15893
+    components:
+    - type: Transform
+      pos: 41.5,-34.5
+      parent: 2
+  - uid: 15908
+    components:
+    - type: Transform
+      pos: 41.5,-33.5
+      parent: 2
+  - uid: 15909
+    components:
+    - type: Transform
+      pos: 41.5,-32.5
+      parent: 2
+  - uid: 15911
+    components:
+    - type: Transform
+      pos: 42.5,-32.5
+      parent: 2
+  - uid: 16036
+    components:
+    - type: Transform
+      pos: 65.5,-58.5
+      parent: 2
+  - uid: 16037
+    components:
+    - type: Transform
+      pos: 67.5,-56.5
+      parent: 2
   - uid: 16043
     components:
     - type: Transform
@@ -25195,41 +26296,16 @@ entities:
     - type: Transform
       pos: 46.5,-63.5
       parent: 2
-  - uid: 16117
+  - uid: 16155
     components:
     - type: Transform
-      pos: 30.5,-31.5
+      pos: 6.5,-59.5
       parent: 2
   - uid: 16232
     components:
     - type: Transform
       pos: -18.5,-20.5
       parent: 2
-  - uid: 16240
-    components:
-    - type: Transform
-      pos: 71.5,-42.5
-      parent: 2
-  - uid: 16247
-    components:
-    - type: Transform
-      pos: 64.5,-35.5
-      parent: 2
-  - uid: 16252
-    components:
-    - type: Transform
-      pos: 66.5,-42.5
-      parent: 2
-  - uid: 16259
-    components:
-    - type: Transform
-      pos: 68.5,-42.5
-      parent: 2
-  - uid: 16270
-    components:
-    - type: Transform
-      pos: 64.5,-38.5
-      parent: 2
   - uid: 16275
     components:
     - type: Transform
@@ -25515,11 +26591,6 @@ entities:
     - type: Transform
       pos: -7.5,-8.5
       parent: 2
-  - uid: 16453
-    components:
-    - type: Transform
-      pos: 60.5,-68.5
-      parent: 2
   - uid: 16455
     components:
     - type: Transform
@@ -25535,11 +26606,6 @@ entities:
     - type: Transform
       pos: -10.5,-16.5
       parent: 2
-  - uid: 16552
-    components:
-    - type: Transform
-      pos: 3.5,-60.5
-      parent: 2
   - uid: 16553
     components:
     - type: Transform
@@ -25575,16 +26641,6 @@ entities:
     - type: Transform
       pos: -37.5,-35.5
       parent: 2
-  - uid: 16590
-    components:
-    - type: Transform
-      pos: 66.5,-62.5
-      parent: 2
-  - uid: 16591
-    components:
-    - type: Transform
-      pos: 66.5,-63.5
-      parent: 2
   - uid: 16613
     components:
     - type: Transform
@@ -25810,11 +26866,6 @@ entities:
     - type: Transform
       pos: 50.5,-52.5
       parent: 2
-  - uid: 17472
-    components:
-    - type: Transform
-      pos: 59.5,-48.5
-      parent: 2
   - uid: 17485
     components:
     - type: Transform
@@ -25915,11 +26966,6 @@ entities:
     - type: Transform
       pos: 37.5,-75.5
       parent: 2
-  - uid: 17508
-    components:
-    - type: Transform
-      pos: 38.5,-75.5
-      parent: 2
   - uid: 17509
     components:
     - type: Transform
@@ -25965,10 +27011,15 @@ entities:
     - type: Transform
       pos: -15.5,-71.5
       parent: 2
-  - uid: 17650
+  - uid: 17728
     components:
     - type: Transform
-      pos: 84.5,-47.5
+      pos: 33.5,-68.5
+      parent: 2
+  - uid: 17729
+    components:
+    - type: Transform
+      pos: 35.5,-68.5
       parent: 2
   - uid: 17735
     components:
@@ -26000,11 +27051,6 @@ entities:
     - type: Transform
       pos: 28.5,-82.5
       parent: 2
-  - uid: 17767
-    components:
-    - type: Transform
-      pos: 85.5,-41.5
-      parent: 2
   - uid: 17830
     components:
     - type: Transform
@@ -26055,21 +27101,6 @@ entities:
     - type: Transform
       pos: 69.5,-23.5
       parent: 2
-  - uid: 17896
-    components:
-    - type: Transform
-      pos: 57.5,-68.5
-      parent: 2
-  - uid: 17897
-    components:
-    - type: Transform
-      pos: 58.5,-68.5
-      parent: 2
-  - uid: 17898
-    components:
-    - type: Transform
-      pos: 59.5,-68.5
-      parent: 2
   - uid: 17932
     components:
     - type: Transform
@@ -26115,16 +27146,6 @@ entities:
     - type: Transform
       pos: 20.5,-51.5
       parent: 2
-  - uid: 17990
-    components:
-    - type: Transform
-      pos: 85.5,-49.5
-      parent: 2
-  - uid: 17992
-    components:
-    - type: Transform
-      pos: 72.5,-34.5
-      parent: 2
   - uid: 18008
     components:
     - type: Transform
@@ -26135,21 +27156,6 @@ entities:
     - type: Transform
       pos: 83.5,-44.5
       parent: 2
-  - uid: 18029
-    components:
-    - type: Transform
-      pos: 64.5,-31.5
-      parent: 2
-  - uid: 18037
-    components:
-    - type: Transform
-      pos: 59.5,-35.5
-      parent: 2
-  - uid: 18038
-    components:
-    - type: Transform
-      pos: 59.5,-36.5
-      parent: 2
   - uid: 18104
     components:
     - type: Transform
@@ -26180,21 +27186,6 @@ entities:
     - type: Transform
       pos: 50.5,-53.5
       parent: 2
-  - uid: 18165
-    components:
-    - type: Transform
-      pos: 58.5,-63.5
-      parent: 2
-  - uid: 18212
-    components:
-    - type: Transform
-      pos: 72.5,-37.5
-      parent: 2
-  - uid: 18228
-    components:
-    - type: Transform
-      pos: 50.5,-50.5
-      parent: 2
   - uid: 18234
     components:
     - type: Transform
@@ -26235,16 +27226,6 @@ entities:
     - type: Transform
       pos: 59.5,-20.5
       parent: 2
-  - uid: 18363
-    components:
-    - type: Transform
-      pos: 53.5,-50.5
-      parent: 2
-  - uid: 18364
-    components:
-    - type: Transform
-      pos: 59.5,-47.5
-      parent: 2
   - uid: 18381
     components:
     - type: Transform
@@ -26305,26 +27286,6 @@ entities:
     - type: Transform
       pos: -0.5,-12.5
       parent: 2
-  - uid: 18398
-    components:
-    - type: Transform
-      pos: 30.5,-13.5
-      parent: 2
-  - uid: 18399
-    components:
-    - type: Transform
-      pos: 30.5,-12.5
-      parent: 2
-  - uid: 18400
-    components:
-    - type: Transform
-      pos: 30.5,-11.5
-      parent: 2
-  - uid: 18405
-    components:
-    - type: Transform
-      pos: 30.5,-10.5
-      parent: 2
   - uid: 18407
     components:
     - type: Transform
@@ -26365,16 +27326,6 @@ entities:
     - type: Transform
       pos: -45.5,-35.5
       parent: 2
-  - uid: 18419
-    components:
-    - type: Transform
-      pos: 90.5,-48.5
-      parent: 2
-  - uid: 18420
-    components:
-    - type: Transform
-      pos: 90.5,-42.5
-      parent: 2
   - uid: 18421
     components:
     - type: Transform
@@ -26430,11 +27381,6 @@ entities:
     - type: Transform
       pos: 69.5,-24.5
       parent: 2
-  - uid: 18464
-    components:
-    - type: Transform
-      pos: 83.5,-43.5
-      parent: 2
   - uid: 18499
     components:
     - type: Transform
@@ -26450,31 +27396,11 @@ entities:
     - type: Transform
       pos: 28.5,-32.5
       parent: 2
-  - uid: 18505
-    components:
-    - type: Transform
-      pos: 28.5,-31.5
-      parent: 2
-  - uid: 18507
-    components:
-    - type: Transform
-      pos: 31.5,-31.5
-      parent: 2
-  - uid: 18508
-    components:
-    - type: Transform
-      pos: 38.5,-30.5
-      parent: 2
   - uid: 18510
     components:
     - type: Transform
       pos: 32.5,-38.5
       parent: 2
-  - uid: 18511
-    components:
-    - type: Transform
-      pos: 38.5,-29.5
-      parent: 2
   - uid: 18514
     components:
     - type: Transform
@@ -26485,31 +27411,11 @@ entities:
     - type: Transform
       pos: 33.5,-35.5
       parent: 2
-  - uid: 18516
-    components:
-    - type: Transform
-      pos: 29.5,-31.5
-      parent: 2
-  - uid: 18517
-    components:
-    - type: Transform
-      pos: 29.5,-34.5
-      parent: 2
-  - uid: 18519
-    components:
-    - type: Transform
-      pos: 32.5,-31.5
-      parent: 2
   - uid: 18524
     components:
     - type: Transform
       pos: 46.5,-76.5
       parent: 2
-  - uid: 18633
-    components:
-    - type: Transform
-      pos: 54.5,-50.5
-      parent: 2
   - uid: 18695
     components:
     - type: Transform
@@ -26525,20 +27431,40 @@ entities:
     - type: Transform
       pos: 84.5,-68.5
       parent: 2
-  - uid: 18740
-    components:
-    - type: Transform
-      pos: 59.5,-79.5
-      parent: 2
   - uid: 18771
     components:
     - type: Transform
       pos: -57.5,-68.5
       parent: 2
-  - uid: 18816
+  - uid: 18838
     components:
     - type: Transform
-      pos: 68.5,-24.5
+      pos: 35.5,-69.5
+      parent: 2
+  - uid: 18839
+    components:
+    - type: Transform
+      pos: 51.5,-67.5
+      parent: 2
+  - uid: 18840
+    components:
+    - type: Transform
+      pos: 51.5,-68.5
+      parent: 2
+  - uid: 18853
+    components:
+    - type: Transform
+      pos: 52.5,-68.5
+      parent: 2
+  - uid: 18891
+    components:
+    - type: Transform
+      pos: 21.5,-19.5
+      parent: 2
+  - uid: 18915
+    components:
+    - type: Transform
+      pos: 22.5,-19.5
       parent: 2
   - uid: 18916
     components:
@@ -26615,6 +27541,21 @@ entities:
     - type: Transform
       pos: 43.5,-63.5
       parent: 2
+  - uid: 18934
+    components:
+    - type: Transform
+      pos: 22.5,-18.5
+      parent: 2
+  - uid: 19061
+    components:
+    - type: Transform
+      pos: 22.5,-17.5
+      parent: 2
+  - uid: 19062
+    components:
+    - type: Transform
+      pos: 22.5,-16.5
+      parent: 2
   - uid: 19068
     components:
     - type: Transform
@@ -26845,31 +27786,6 @@ entities:
     - type: Transform
       pos: -4.5,-20.5
       parent: 2
-  - uid: 19244
-    components:
-    - type: Transform
-      pos: 74.5,-49.5
-      parent: 2
-  - uid: 19245
-    components:
-    - type: Transform
-      pos: 74.5,-48.5
-      parent: 2
-  - uid: 19246
-    components:
-    - type: Transform
-      pos: 74.5,-47.5
-      parent: 2
-  - uid: 19247
-    components:
-    - type: Transform
-      pos: 74.5,-46.5
-      parent: 2
-  - uid: 19248
-    components:
-    - type: Transform
-      pos: 74.5,-45.5
-      parent: 2
   - uid: 19310
     components:
     - type: Transform
@@ -27055,6 +27971,156 @@ entities:
     - type: Transform
       pos: 95.5,-47.5
       parent: 2
+  - uid: 19730
+    components:
+    - type: Transform
+      pos: 52.5,-103.5
+      parent: 2
+  - uid: 19755
+    components:
+    - type: Transform
+      pos: 53.5,-37.5
+      parent: 2
+  - uid: 19756
+    components:
+    - type: Transform
+      pos: 54.5,-37.5
+      parent: 2
+  - uid: 19757
+    components:
+    - type: Transform
+      pos: 51.5,-38.5
+      parent: 2
+  - uid: 19936
+    components:
+    - type: Transform
+      pos: 24.5,-15.5
+      parent: 2
+  - uid: 19937
+    components:
+    - type: Transform
+      pos: 28.5,-12.5
+      parent: 2
+  - uid: 19938
+    components:
+    - type: Transform
+      pos: 26.5,-13.5
+      parent: 2
+  - uid: 19939
+    components:
+    - type: Transform
+      pos: 26.5,-14.5
+      parent: 2
+  - uid: 19940
+    components:
+    - type: Transform
+      pos: 26.5,-15.5
+      parent: 2
+  - uid: 19941
+    components:
+    - type: Transform
+      pos: 22.5,-11.5
+      parent: 2
+  - uid: 19942
+    components:
+    - type: Transform
+      pos: 22.5,-10.5
+      parent: 2
+  - uid: 19943
+    components:
+    - type: Transform
+      pos: 26.5,-11.5
+      parent: 2
+  - uid: 19944
+    components:
+    - type: Transform
+      pos: 26.5,-10.5
+      parent: 2
+  - uid: 19945
+    components:
+    - type: Transform
+      pos: 16.5,-12.5
+      parent: 2
+  - uid: 19946
+    components:
+    - type: Transform
+      pos: 26.5,-16.5
+      parent: 2
+  - uid: 19947
+    components:
+    - type: Transform
+      pos: 26.5,-17.5
+      parent: 2
+  - uid: 19948
+    components:
+    - type: Transform
+      pos: 26.5,-18.5
+      parent: 2
+  - uid: 19949
+    components:
+    - type: Transform
+      pos: 26.5,-19.5
+      parent: 2
+  - uid: 19950
+    components:
+    - type: Transform
+      pos: 26.5,-20.5
+      parent: 2
+  - uid: 19951
+    components:
+    - type: Transform
+      pos: 75.5,-42.5
+      parent: 2
+  - uid: 19956
+    components:
+    - type: Transform
+      pos: 31.5,-69.5
+      parent: 2
+  - uid: 19957
+    components:
+    - type: Transform
+      pos: 32.5,-70.5
+      parent: 2
+  - uid: 19958
+    components:
+    - type: Transform
+      pos: 33.5,-70.5
+      parent: 2
+  - uid: 19959
+    components:
+    - type: Transform
+      pos: 32.5,-67.5
+      parent: 2
+  - uid: 19960
+    components:
+    - type: Transform
+      pos: 28.5,-74.5
+      parent: 2
+  - uid: 19966
+    components:
+    - type: Transform
+      pos: -50.5,-25.5
+      parent: 2
+  - uid: 19967
+    components:
+    - type: Transform
+      pos: -51.5,-25.5
+      parent: 2
+  - uid: 19968
+    components:
+    - type: Transform
+      pos: -52.5,-25.5
+      parent: 2
+  - uid: 19969
+    components:
+    - type: Transform
+      pos: -53.5,-25.5
+      parent: 2
+  - uid: 20081
+    components:
+    - type: Transform
+      pos: 60.5,-67.5
+      parent: 2
 - proto: CableApcStack
   entities:
   - uid: 9765
@@ -27069,10 +28135,10 @@ entities:
       parent: 2
 - proto: CableHV
   entities:
-  - uid: 717
+  - uid: 325
     components:
     - type: Transform
-      pos: 49.5,-52.5
+      pos: 46.5,-48.5
       parent: 2
   - uid: 718
     components:
@@ -27084,16 +28150,6 @@ entities:
     - type: Transform
       pos: 24.5,-74.5
       parent: 2
-  - uid: 739
-    components:
-    - type: Transform
-      pos: 63.5,-43.5
-      parent: 2
-  - uid: 748
-    components:
-    - type: Transform
-      pos: 63.5,-45.5
-      parent: 2
   - uid: 868
     components:
     - type: Transform
@@ -27119,15 +28175,10 @@ entities:
     - type: Transform
       pos: -29.5,-48.5
       parent: 2
-  - uid: 1113
+  - uid: 1447
     components:
     - type: Transform
-      pos: 63.5,-41.5
-      parent: 2
-  - uid: 1196
-    components:
-    - type: Transform
-      pos: 63.5,-42.5
+      pos: 37.5,-12.5
       parent: 2
   - uid: 1483
     components:
@@ -27149,15 +28200,15 @@ entities:
     - type: Transform
       pos: 40.5,-13.5
       parent: 2
-  - uid: 1849
+  - uid: 1885
     components:
     - type: Transform
-      pos: 51.5,-52.5
+      pos: 55.5,-28.5
       parent: 2
-  - uid: 1877
+  - uid: 2146
     components:
     - type: Transform
-      pos: 63.5,-40.5
+      pos: 33.5,-32.5
       parent: 2
   - uid: 2276
     components:
@@ -27174,36 +28225,101 @@ entities:
     - type: Transform
       pos: -10.5,-43.5
       parent: 2
-  - uid: 2739
+  - uid: 2735
     components:
     - type: Transform
-      pos: 48.5,-53.5
+      pos: 78.5,-31.5
+      parent: 2
+  - uid: 2756
+    components:
+    - type: Transform
+      pos: 55.5,-31.5
       parent: 2
   - uid: 2890
     components:
     - type: Transform
       pos: 41.5,-13.5
       parent: 2
+  - uid: 2920
+    components:
+    - type: Transform
+      pos: 53.5,-29.5
+      parent: 2
   - uid: 2941
     components:
     - type: Transform
       pos: 42.5,-13.5
       parent: 2
+  - uid: 2943
+    components:
+    - type: Transform
+      pos: 55.5,-26.5
+      parent: 2
+  - uid: 2948
+    components:
+    - type: Transform
+      pos: 53.5,-31.5
+      parent: 2
   - uid: 3036
     components:
     - type: Transform
       pos: 39.5,-13.5
       parent: 2
+  - uid: 3055
+    components:
+    - type: Transform
+      pos: 46.5,-42.5
+      parent: 2
+  - uid: 3068
+    components:
+    - type: Transform
+      pos: 55.5,-30.5
+      parent: 2
   - uid: 3075
     components:
     - type: Transform
       pos: 67.5,-19.5
       parent: 2
+  - uid: 3079
+    components:
+    - type: Transform
+      pos: 36.5,-32.5
+      parent: 2
+  - uid: 3080
+    components:
+    - type: Transform
+      pos: 34.5,-32.5
+      parent: 2
+  - uid: 3117
+    components:
+    - type: Transform
+      pos: 102.5,-46.5
+      parent: 2
+  - uid: 3118
+    components:
+    - type: Transform
+      pos: 102.5,-48.5
+      parent: 2
+  - uid: 3158
+    components:
+    - type: Transform
+      pos: 102.5,-47.5
+      parent: 2
   - uid: 3212
     components:
     - type: Transform
       pos: -10.5,-41.5
       parent: 2
+  - uid: 3325
+    components:
+    - type: Transform
+      pos: 53.5,-30.5
+      parent: 2
+  - uid: 3327
+    components:
+    - type: Transform
+      pos: 55.5,-27.5
+      parent: 2
   - uid: 3339
     components:
     - type: Transform
@@ -27239,16 +28355,51 @@ entities:
     - type: Transform
       pos: -29.5,-74.5
       parent: 2
+  - uid: 3392
+    components:
+    - type: Transform
+      pos: 46.5,-40.5
+      parent: 2
+  - uid: 3398
+    components:
+    - type: Transform
+      pos: 49.5,-29.5
+      parent: 2
+  - uid: 3401
+    components:
+    - type: Transform
+      pos: 55.5,-29.5
+      parent: 2
+  - uid: 3409
+    components:
+    - type: Transform
+      pos: 46.5,-41.5
+      parent: 2
+  - uid: 3418
+    components:
+    - type: Transform
+      pos: 53.5,-32.5
+      parent: 2
   - uid: 3419
     components:
     - type: Transform
       pos: 71.5,-23.5
       parent: 2
+  - uid: 3427
+    components:
+    - type: Transform
+      pos: 50.5,-29.5
+      parent: 2
   - uid: 3431
     components:
     - type: Transform
       pos: 70.5,-23.5
       parent: 2
+  - uid: 3443
+    components:
+    - type: Transform
+      pos: 55.5,-25.5
+      parent: 2
   - uid: 3490
     components:
     - type: Transform
@@ -27284,60 +28435,20 @@ entities:
     - type: Transform
       pos: 75.5,-25.5
       parent: 2
-  - uid: 3500
+  - uid: 3549
     components:
     - type: Transform
-      pos: 76.5,-26.5
+      pos: 54.5,-32.5
       parent: 2
-  - uid: 3501
+  - uid: 3558
     components:
     - type: Transform
-      pos: 76.5,-27.5
+      pos: 55.5,-24.5
       parent: 2
-  - uid: 3554
+  - uid: 3560
     components:
     - type: Transform
-      pos: 72.5,-37.5
-      parent: 2
-  - uid: 3555
-    components:
-    - type: Transform
-      pos: 74.5,-40.5
-      parent: 2
-  - uid: 3556
-    components:
-    - type: Transform
-      pos: 74.5,-38.5
-      parent: 2
-  - uid: 3568
-    components:
-    - type: Transform
-      pos: 55.5,-52.5
-      parent: 2
-  - uid: 3573
-    components:
-    - type: Transform
-      pos: 58.5,-52.5
-      parent: 2
-  - uid: 3574
-    components:
-    - type: Transform
-      pos: 57.5,-52.5
-      parent: 2
-  - uid: 3578
-    components:
-    - type: Transform
-      pos: 53.5,-52.5
-      parent: 2
-  - uid: 3579
-    components:
-    - type: Transform
-      pos: 54.5,-52.5
-      parent: 2
-  - uid: 3582
-    components:
-    - type: Transform
-      pos: 56.5,-52.5
+      pos: 52.5,-28.5
       parent: 2
   - uid: 3589
     components:
@@ -27374,40 +28485,120 @@ entities:
     - type: Transform
       pos: 43.5,-13.5
       parent: 2
-  - uid: 3676
+  - uid: 3762
     components:
     - type: Transform
-      pos: 28.5,-31.5
+      pos: 30.5,-32.5
       parent: 2
-  - uid: 3683
+  - uid: 3763
     components:
     - type: Transform
-      pos: 77.5,-27.5
+      pos: 48.5,-29.5
       parent: 2
-  - uid: 3684
+  - uid: 3770
     components:
     - type: Transform
-      pos: 29.5,-31.5
+      pos: 31.5,-32.5
       parent: 2
-  - uid: 3685
+  - uid: 3787
     components:
     - type: Transform
-      pos: 30.5,-31.5
+      pos: 41.5,-32.5
       parent: 2
-  - uid: 3686
+  - uid: 3792
     components:
     - type: Transform
-      pos: 35.5,-31.5
+      pos: 56.5,-76.5
       parent: 2
-  - uid: 3687
+  - uid: 3809
     components:
     - type: Transform
-      pos: 34.5,-31.5
+      pos: 99.5,-51.5
       parent: 2
-  - uid: 3742
+  - uid: 3816
     components:
     - type: Transform
-      pos: 33.5,-31.5
+      pos: 100.5,-47.5
+      parent: 2
+  - uid: 3817
+    components:
+    - type: Transform
+      pos: 100.5,-48.5
+      parent: 2
+  - uid: 3818
+    components:
+    - type: Transform
+      pos: 100.5,-43.5
+      parent: 2
+  - uid: 3821
+    components:
+    - type: Transform
+      pos: 99.5,-50.5
+      parent: 2
+  - uid: 3822
+    components:
+    - type: Transform
+      pos: 100.5,-42.5
+      parent: 2
+  - uid: 3853
+    components:
+    - type: Transform
+      pos: 98.5,-57.5
+      parent: 2
+  - uid: 3854
+    components:
+    - type: Transform
+      pos: 97.5,-57.5
+      parent: 2
+  - uid: 3856
+    components:
+    - type: Transform
+      pos: 97.5,-33.5
+      parent: 2
+  - uid: 3858
+    components:
+    - type: Transform
+      pos: 100.5,-35.5
+      parent: 2
+  - uid: 3865
+    components:
+    - type: Transform
+      pos: 98.5,-33.5
+      parent: 2
+  - uid: 3866
+    components:
+    - type: Transform
+      pos: 99.5,-57.5
+      parent: 2
+  - uid: 3901
+    components:
+    - type: Transform
+      pos: 99.5,-33.5
+      parent: 2
+  - uid: 3904
+    components:
+    - type: Transform
+      pos: 99.5,-52.5
+      parent: 2
+  - uid: 3905
+    components:
+    - type: Transform
+      pos: 77.5,-36.5
+      parent: 2
+  - uid: 3907
+    components:
+    - type: Transform
+      pos: 77.5,-54.5
+      parent: 2
+  - uid: 4020
+    components:
+    - type: Transform
+      pos: 37.5,-23.5
+      parent: 2
+  - uid: 4049
+    components:
+    - type: Transform
+      pos: 51.5,-28.5
       parent: 2
   - uid: 4054
     components:
@@ -27419,6 +28610,11 @@ entities:
     - type: Transform
       pos: 37.5,-15.5
       parent: 2
+  - uid: 4063
+    components:
+    - type: Transform
+      pos: 53.5,-28.5
+      parent: 2
   - uid: 4065
     components:
     - type: Transform
@@ -27489,11 +28685,56 @@ entities:
     - type: Transform
       pos: 49.5,-76.5
       parent: 2
+  - uid: 4139
+    components:
+    - type: Transform
+      pos: 39.5,-34.5
+      parent: 2
+  - uid: 4167
+    components:
+    - type: Transform
+      pos: 36.5,-23.5
+      parent: 2
+  - uid: 4184
+    components:
+    - type: Transform
+      pos: 35.5,-23.5
+      parent: 2
+  - uid: 4190
+    components:
+    - type: Transform
+      pos: 79.5,-59.5
+      parent: 2
+  - uid: 4191
+    components:
+    - type: Transform
+      pos: 34.5,-23.5
+      parent: 2
+  - uid: 4273
+    components:
+    - type: Transform
+      pos: 79.5,-60.5
+      parent: 2
+  - uid: 4276
+    components:
+    - type: Transform
+      pos: 38.5,-34.5
+      parent: 2
   - uid: 4357
     components:
     - type: Transform
       pos: 46.5,-76.5
       parent: 2
+  - uid: 4358
+    components:
+    - type: Transform
+      pos: 55.5,-32.5
+      parent: 2
+  - uid: 4366
+    components:
+    - type: Transform
+      pos: 50.5,-28.5
+      parent: 2
   - uid: 4400
     components:
     - type: Transform
@@ -27519,31 +28760,36 @@ entities:
     - type: Transform
       pos: 34.5,-70.5
       parent: 2
+  - uid: 4465
+    components:
+    - type: Transform
+      pos: 37.5,-33.5
+      parent: 2
   - uid: 4473
     components:
     - type: Transform
       pos: 52.5,-76.5
       parent: 2
-  - uid: 4492
-    components:
-    - type: Transform
-      pos: 56.5,-76.5
-      parent: 2
   - uid: 4501
     components:
     - type: Transform
       pos: 33.5,-70.5
       parent: 2
+  - uid: 4623
+    components:
+    - type: Transform
+      pos: 41.5,-33.5
+      parent: 2
+  - uid: 4638
+    components:
+    - type: Transform
+      pos: 41.5,-34.5
+      parent: 2
   - uid: 4760
     components:
     - type: Transform
       pos: 65.5,-21.5
       parent: 2
-  - uid: 4916
-    components:
-    - type: Transform
-      pos: 76.5,-29.5
-      parent: 2
   - uid: 4917
     components:
     - type: Transform
@@ -27559,6 +28805,16 @@ entities:
     - type: Transform
       pos: 79.5,-58.5
       parent: 2
+  - uid: 5192
+    components:
+    - type: Transform
+      pos: 101.5,-53.5
+      parent: 2
+  - uid: 5193
+    components:
+    - type: Transform
+      pos: 100.5,-57.5
+      parent: 2
   - uid: 5214
     components:
     - type: Transform
@@ -27569,26 +28825,61 @@ entities:
     - type: Transform
       pos: 83.5,-33.5
       parent: 2
+  - uid: 5280
+    components:
+    - type: Transform
+      pos: 40.5,-34.5
+      parent: 2
+  - uid: 5283
+    components:
+    - type: Transform
+      pos: 37.5,-34.5
+      parent: 2
   - uid: 5294
     components:
     - type: Transform
       pos: 80.5,-33.5
       parent: 2
+  - uid: 5319
+    components:
+    - type: Transform
+      pos: 98.5,-56.5
+      parent: 2
+  - uid: 5350
+    components:
+    - type: Transform
+      pos: 98.5,-34.5
+      parent: 2
+  - uid: 5353
+    components:
+    - type: Transform
+      pos: 98.5,-35.5
+      parent: 2
   - uid: 5356
     components:
     - type: Transform
-      pos: 77.5,-28.5
+      pos: 99.5,-37.5
+      parent: 2
+  - uid: 5358
+    components:
+    - type: Transform
+      pos: 98.5,-37.5
+      parent: 2
+  - uid: 5359
+    components:
+    - type: Transform
+      pos: 98.5,-36.5
+      parent: 2
+  - uid: 5373
+    components:
+    - type: Transform
+      pos: 102.5,-49.5
       parent: 2
   - uid: 5391
     components:
     - type: Transform
       pos: 81.5,-33.5
       parent: 2
-  - uid: 5392
-    components:
-    - type: Transform
-      pos: 77.5,-29.5
-      parent: 2
   - uid: 5396
     components:
     - type: Transform
@@ -27599,35 +28890,15 @@ entities:
     - type: Transform
       pos: -25.5,-80.5
       parent: 2
-  - uid: 5412
+  - uid: 5421
     components:
     - type: Transform
-      pos: 52.5,-52.5
+      pos: 33.5,-23.5
       parent: 2
-  - uid: 5416
+  - uid: 5432
     components:
     - type: Transform
-      pos: 71.5,-37.5
-      parent: 2
-  - uid: 5417
-    components:
-    - type: Transform
-      pos: 74.5,-39.5
-      parent: 2
-  - uid: 5418
-    components:
-    - type: Transform
-      pos: 73.5,-38.5
-      parent: 2
-  - uid: 5427
-    components:
-    - type: Transform
-      pos: 70.5,-38.5
-      parent: 2
-  - uid: 5430
-    components:
-    - type: Transform
-      pos: 69.5,-38.5
+      pos: 48.5,-30.5
       parent: 2
   - uid: 5566
     components:
@@ -27674,10 +28945,10 @@ entities:
     - type: Transform
       pos: -14.5,-75.5
       parent: 2
-  - uid: 5795
+  - uid: 5794
     components:
     - type: Transform
-      pos: 75.5,-30.5
+      pos: 30.5,-23.5
       parent: 2
   - uid: 5802
     components:
@@ -27709,45 +28980,25 @@ entities:
     - type: Transform
       pos: 46.5,-71.5
       parent: 2
+  - uid: 5886
+    components:
+    - type: Transform
+      pos: 28.5,-23.5
+      parent: 2
   - uid: 5893
     components:
     - type: Transform
       pos: 79.5,-32.5
       parent: 2
-  - uid: 5894
-    components:
-    - type: Transform
-      pos: 78.5,-32.5
-      parent: 2
-  - uid: 5895
-    components:
-    - type: Transform
-      pos: 77.5,-32.5
-      parent: 2
-  - uid: 5896
-    components:
-    - type: Transform
-      pos: 76.5,-32.5
-      parent: 2
   - uid: 5941
     components:
     - type: Transform
       pos: -24.5,-65.5
       parent: 2
-  - uid: 5944
-    components:
-    - type: Transform
-      pos: 75.5,-32.5
-      parent: 2
-  - uid: 6009
-    components:
-    - type: Transform
-      pos: 32.5,-31.5
-      parent: 2
   - uid: 6011
     components:
     - type: Transform
-      pos: 31.5,-31.5
+      pos: 76.5,-26.5
       parent: 2
   - uid: 6066
     components:
@@ -27769,6 +29020,16 @@ entities:
     - type: Transform
       pos: 46.5,-11.5
       parent: 2
+  - uid: 6083
+    components:
+    - type: Transform
+      pos: 27.5,-23.5
+      parent: 2
+  - uid: 6100
+    components:
+    - type: Transform
+      pos: 29.5,-32.5
+      parent: 2
   - uid: 6105
     components:
     - type: Transform
@@ -27814,10 +29075,20 @@ entities:
     - type: Transform
       pos: 63.5,-23.5
       parent: 2
-  - uid: 6230
+  - uid: 6273
     components:
     - type: Transform
-      pos: 75.5,-31.5
+      pos: 29.5,-23.5
+      parent: 2
+  - uid: 6274
+    components:
+    - type: Transform
+      pos: 31.5,-23.5
+      parent: 2
+  - uid: 6275
+    components:
+    - type: Transform
+      pos: 32.5,-23.5
       parent: 2
   - uid: 6291
     components:
@@ -27834,11 +29105,36 @@ entities:
     - type: Transform
       pos: 24.5,-67.5
       parent: 2
+  - uid: 6299
+    components:
+    - type: Transform
+      pos: 77.5,-28.5
+      parent: 2
   - uid: 6352
     components:
     - type: Transform
       pos: 24.5,-70.5
       parent: 2
+  - uid: 6354
+    components:
+    - type: Transform
+      pos: 25.5,-23.5
+      parent: 2
+  - uid: 6369
+    components:
+    - type: Transform
+      pos: 46.5,-45.5
+      parent: 2
+  - uid: 6379
+    components:
+    - type: Transform
+      pos: 47.5,-37.5
+      parent: 2
+  - uid: 6389
+    components:
+    - type: Transform
+      pos: 24.5,-23.5
+      parent: 2
   - uid: 6468
     components:
     - type: Transform
@@ -27889,10 +29185,15 @@ entities:
     - type: Transform
       pos: 67.5,-21.5
       parent: 2
-  - uid: 6638
+  - uid: 7128
     components:
     - type: Transform
-      pos: 75.5,-29.5
+      pos: 100.5,-56.5
+      parent: 2
+  - uid: 7133
+    components:
+    - type: Transform
+      pos: 46.5,-47.5
       parent: 2
   - uid: 7149
     components:
@@ -27914,46 +29215,51 @@ entities:
     - type: Transform
       pos: 63.5,-16.5
       parent: 2
-  - uid: 7228
+  - uid: 7256
     components:
     - type: Transform
-      pos: 58.5,-53.5
-      parent: 2
-  - uid: 7266
-    components:
-    - type: Transform
-      pos: 59.5,-52.5
+      pos: 46.5,-43.5
       parent: 2
   - uid: 7276
     components:
     - type: Transform
       pos: 31.5,-70.5
       parent: 2
-  - uid: 7277
-    components:
-    - type: Transform
-      pos: 60.5,-52.5
-      parent: 2
   - uid: 7288
     components:
     - type: Transform
       pos: 50.5,-76.5
       parent: 2
-  - uid: 7293
-    components:
-    - type: Transform
-      pos: 65.5,-38.5
-      parent: 2
   - uid: 7298
     components:
     - type: Transform
       pos: 30.5,-72.5
       parent: 2
+  - uid: 7318
+    components:
+    - type: Transform
+      pos: 26.5,-23.5
+      parent: 2
+  - uid: 7365
+    components:
+    - type: Transform
+      pos: 4.5,-59.5
+      parent: 2
+  - uid: 7366
+    components:
+    - type: Transform
+      pos: 3.5,-59.5
+      parent: 2
   - uid: 7418
     components:
     - type: Transform
       pos: 26.5,-70.5
       parent: 2
+  - uid: 7422
+    components:
+    - type: Transform
+      pos: 102.5,-45.5
+      parent: 2
   - uid: 7424
     components:
     - type: Transform
@@ -28044,250 +29350,45 @@ entities:
     - type: Transform
       pos: 78.5,-45.5
       parent: 2
-  - uid: 7528
+  - uid: 7510
     components:
     - type: Transform
-      pos: 98.5,-55.5
+      pos: 102.5,-44.5
+      parent: 2
+  - uid: 7511
+    components:
+    - type: Transform
+      pos: 102.5,-43.5
+      parent: 2
+  - uid: 7512
+    components:
+    - type: Transform
+      pos: 102.5,-41.5
       parent: 2
   - uid: 7535
     components:
     - type: Transform
       pos: 82.5,-33.5
       parent: 2
-  - uid: 7536
+  - uid: 7547
     components:
     - type: Transform
-      pos: 96.5,-56.5
+      pos: 102.5,-42.5
       parent: 2
-  - uid: 7537
+  - uid: 7555
     components:
     - type: Transform
-      pos: 96.5,-55.5
-      parent: 2
-  - uid: 7554
-    components:
-    - type: Transform
-      pos: 98.5,-56.5
-      parent: 2
-  - uid: 7557
-    components:
-    - type: Transform
-      pos: 98.5,-57.5
-      parent: 2
-  - uid: 7558
-    components:
-    - type: Transform
-      pos: 99.5,-54.5
-      parent: 2
-  - uid: 7559
-    components:
-    - type: Transform
-      pos: 99.5,-53.5
-      parent: 2
-  - uid: 7560
-    components:
-    - type: Transform
-      pos: 99.5,-52.5
-      parent: 2
-  - uid: 7561
-    components:
-    - type: Transform
-      pos: 99.5,-51.5
-      parent: 2
-  - uid: 7562
-    components:
-    - type: Transform
-      pos: 97.5,-53.5
+      pos: 101.5,-51.5
       parent: 2
   - uid: 7563
     components:
     - type: Transform
-      pos: 97.5,-52.5
+      pos: 94.5,-45.5
       parent: 2
-  - uid: 7564
+  - uid: 7614
     components:
     - type: Transform
-      pos: 97.5,-51.5
-      parent: 2
-  - uid: 7565
-    components:
-    - type: Transform
-      pos: 97.5,-50.5
-      parent: 2
-  - uid: 7566
-    components:
-    - type: Transform
-      pos: 100.5,-49.5
-      parent: 2
-  - uid: 7567
-    components:
-    - type: Transform
-      pos: 100.5,-48.5
-      parent: 2
-  - uid: 7568
-    components:
-    - type: Transform
-      pos: 100.5,-47.5
-      parent: 2
-  - uid: 7569
-    components:
-    - type: Transform
-      pos: 100.5,-46.5
-      parent: 2
-  - uid: 7570
-    components:
-    - type: Transform
-      pos: 100.5,-45.5
-      parent: 2
-  - uid: 7571
-    components:
-    - type: Transform
-      pos: 100.5,-44.5
-      parent: 2
-  - uid: 7572
-    components:
-    - type: Transform
-      pos: 100.5,-43.5
-      parent: 2
-  - uid: 7573
-    components:
-    - type: Transform
-      pos: 100.5,-42.5
-      parent: 2
-  - uid: 7574
-    components:
-    - type: Transform
-      pos: 100.5,-41.5
-      parent: 2
-  - uid: 7575
-    components:
-    - type: Transform
-      pos: 98.5,-48.5
-      parent: 2
-  - uid: 7576
-    components:
-    - type: Transform
-      pos: 98.5,-47.5
-      parent: 2
-  - uid: 7577
-    components:
-    - type: Transform
-      pos: 98.5,-46.5
-      parent: 2
-  - uid: 7578
-    components:
-    - type: Transform
-      pos: 98.5,-45.5
-      parent: 2
-  - uid: 7579
-    components:
-    - type: Transform
-      pos: 98.5,-44.5
-      parent: 2
-  - uid: 7580
-    components:
-    - type: Transform
-      pos: 98.5,-43.5
-      parent: 2
-  - uid: 7581
-    components:
-    - type: Transform
-      pos: 98.5,-42.5
-      parent: 2
-  - uid: 7582
-    components:
-    - type: Transform
-      pos: 97.5,-40.5
-      parent: 2
-  - uid: 7583
-    components:
-    - type: Transform
-      pos: 97.5,-39.5
-      parent: 2
-  - uid: 7584
-    components:
-    - type: Transform
-      pos: 97.5,-38.5
-      parent: 2
-  - uid: 7585
-    components:
-    - type: Transform
-      pos: 97.5,-37.5
-      parent: 2
-  - uid: 7586
-    components:
-    - type: Transform
-      pos: 99.5,-39.5
-      parent: 2
-  - uid: 7587
-    components:
-    - type: Transform
-      pos: 99.5,-38.5
-      parent: 2
-  - uid: 7588
-    components:
-    - type: Transform
-      pos: 99.5,-37.5
-      parent: 2
-  - uid: 7589
-    components:
-    - type: Transform
-      pos: 99.5,-36.5
-      parent: 2
-  - uid: 7590
-    components:
-    - type: Transform
-      pos: 98.5,-35.5
-      parent: 2
-  - uid: 7591
-    components:
-    - type: Transform
-      pos: 98.5,-34.5
-      parent: 2
-  - uid: 7592
-    components:
-    - type: Transform
-      pos: 98.5,-33.5
-      parent: 2
-  - uid: 7593
-    components:
-    - type: Transform
-      pos: 96.5,-34.5
-      parent: 2
-  - uid: 7594
-    components:
-    - type: Transform
-      pos: 96.5,-35.5
-      parent: 2
-  - uid: 7595
-    components:
-    - type: Transform
-      pos: 98.5,-36.5
-      parent: 2
-  - uid: 7596
-    components:
-    - type: Transform
-      pos: 96.5,-36.5
-      parent: 2
-  - uid: 7597
-    components:
-    - type: Transform
-      pos: 96.5,-37.5
-      parent: 2
-  - uid: 7598
-    components:
-    - type: Transform
-      pos: 96.5,-53.5
-      parent: 2
-  - uid: 7599
-    components:
-    - type: Transform
-      pos: 96.5,-54.5
-      parent: 2
-  - uid: 7623
-    components:
-    - type: Transform
-      pos: 98.5,-54.5
+      pos: 32.5,-32.5
       parent: 2
   - uid: 7624
     components:
@@ -28309,11 +29410,6 @@ entities:
     - type: Transform
       pos: 78.5,-35.5
       parent: 2
-  - uid: 7628
-    components:
-    - type: Transform
-      pos: 78.5,-36.5
-      parent: 2
   - uid: 7630
     components:
     - type: Transform
@@ -28402,7 +29498,7 @@ entities:
   - uid: 7647
     components:
     - type: Transform
-      pos: 78.5,-55.5
+      pos: 45.5,-32.5
       parent: 2
   - uid: 7649
     components:
@@ -28429,66 +29525,56 @@ entities:
     - type: Transform
       pos: 83.5,-57.5
       parent: 2
-  - uid: 7748
-    components:
-    - type: Transform
-      pos: 67.5,-38.5
-      parent: 2
-  - uid: 7749
-    components:
-    - type: Transform
-      pos: 63.5,-39.5
-      parent: 2
-  - uid: 7750
-    components:
-    - type: Transform
-      pos: 77.5,-41.5
-      parent: 2
   - uid: 7986
     components:
     - type: Transform
       pos: 28.5,-69.5
       parent: 2
-  - uid: 7988
-    components:
-    - type: Transform
-      pos: 61.5,-53.5
-      parent: 2
   - uid: 7991
     components:
     - type: Transform
       pos: 67.5,-24.5
       parent: 2
-  - uid: 7993
-    components:
-    - type: Transform
-      pos: 50.5,-52.5
-      parent: 2
-  - uid: 8069
-    components:
-    - type: Transform
-      pos: 63.5,-44.5
-      parent: 2
   - uid: 8072
     components:
     - type: Transform
       pos: 66.5,-24.5
       parent: 2
+  - uid: 8118
+    components:
+    - type: Transform
+      pos: 100.5,-54.5
+      parent: 2
+  - uid: 8127
+    components:
+    - type: Transform
+      pos: 35.5,-32.5
+      parent: 2
   - uid: 8128
     components:
     - type: Transform
       pos: -28.5,-88.5
       parent: 2
-  - uid: 8131
+  - uid: 8133
     components:
     - type: Transform
-      pos: 61.5,-54.5
+      pos: 37.5,-32.5
       parent: 2
   - uid: 8137
     components:
     - type: Transform
       pos: -26.5,-88.5
       parent: 2
+  - uid: 8147
+    components:
+    - type: Transform
+      pos: 47.5,-32.5
+      parent: 2
+  - uid: 8167
+    components:
+    - type: Transform
+      pos: 98.5,-53.5
+      parent: 2
   - uid: 8179
     components:
     - type: Transform
@@ -28509,11 +29595,26 @@ entities:
     - type: Transform
       pos: 24.5,-72.5
       parent: 2
+  - uid: 8194
+    components:
+    - type: Transform
+      pos: 101.5,-39.5
+      parent: 2
   - uid: 8203
     components:
     - type: Transform
       pos: 24.5,-62.5
       parent: 2
+  - uid: 8219
+    components:
+    - type: Transform
+      pos: 101.5,-38.5
+      parent: 2
+  - uid: 8221
+    components:
+    - type: Transform
+      pos: 101.5,-37.5
+      parent: 2
   - uid: 8250
     components:
     - type: Transform
@@ -28826,11 +29927,96 @@ entities:
     - type: Transform
       pos: -54.5,-23.5
       parent: 2
+  - uid: 8345
+    components:
+    - type: Transform
+      pos: 101.5,-36.5
+      parent: 2
+  - uid: 8348
+    components:
+    - type: Transform
+      pos: 100.5,-36.5
+      parent: 2
+  - uid: 8359
+    components:
+    - type: Transform
+      pos: 100.5,-34.5
+      parent: 2
   - uid: 8370
     components:
     - type: Transform
       pos: -25.5,-88.5
       parent: 2
+  - uid: 8371
+    components:
+    - type: Transform
+      pos: 100.5,-33.5
+      parent: 2
+  - uid: 8393
+    components:
+    - type: Transform
+      pos: 47.5,-34.5
+      parent: 2
+  - uid: 8418
+    components:
+    - type: Transform
+      pos: 47.5,-33.5
+      parent: 2
+  - uid: 8445
+    components:
+    - type: Transform
+      pos: 47.5,-35.5
+      parent: 2
+  - uid: 8446
+    components:
+    - type: Transform
+      pos: 47.5,-36.5
+      parent: 2
+  - uid: 8457
+    components:
+    - type: Transform
+      pos: 47.5,-38.5
+      parent: 2
+  - uid: 8458
+    components:
+    - type: Transform
+      pos: 48.5,-38.5
+      parent: 2
+  - uid: 8459
+    components:
+    - type: Transform
+      pos: 48.5,-39.5
+      parent: 2
+  - uid: 8460
+    components:
+    - type: Transform
+      pos: 48.5,-40.5
+      parent: 2
+  - uid: 8461
+    components:
+    - type: Transform
+      pos: 48.5,-41.5
+      parent: 2
+  - uid: 8462
+    components:
+    - type: Transform
+      pos: 48.5,-42.5
+      parent: 2
+  - uid: 8463
+    components:
+    - type: Transform
+      pos: 48.5,-43.5
+      parent: 2
+  - uid: 8464
+    components:
+    - type: Transform
+      pos: 47.5,-43.5
+      parent: 2
+  - uid: 8510
+    components:
+    - type: Transform
+      pos: 99.5,-40.5
+      parent: 2
   - uid: 8559
     components:
     - type: Transform
@@ -28846,16 +30032,46 @@ entities:
     - type: Transform
       pos: 64.5,-23.5
       parent: 2
-  - uid: 8569
+  - uid: 8566
     components:
     - type: Transform
-      pos: 75.5,-41.5
+      pos: 99.5,-39.5
+      parent: 2
+  - uid: 8573
+    components:
+    - type: Transform
+      pos: 100.5,-46.5
+      parent: 2
+  - uid: 8580
+    components:
+    - type: Transform
+      pos: 100.5,-44.5
       parent: 2
   - uid: 8583
     components:
     - type: Transform
       pos: 24.5,-59.5
       parent: 2
+  - uid: 8584
+    components:
+    - type: Transform
+      pos: 100.5,-45.5
+      parent: 2
+  - uid: 8586
+    components:
+    - type: Transform
+      pos: 98.5,-55.5
+      parent: 2
+  - uid: 8587
+    components:
+    - type: Transform
+      pos: 98.5,-54.5
+      parent: 2
+  - uid: 8588
+    components:
+    - type: Transform
+      pos: 99.5,-53.5
+      parent: 2
   - uid: 8694
     components:
     - type: Transform
@@ -28896,6 +30112,21 @@ entities:
     - type: Transform
       pos: 7.5,-87.5
       parent: 2
+  - uid: 9275
+    components:
+    - type: Transform
+      pos: 37.5,-78.5
+      parent: 2
+  - uid: 9284
+    components:
+    - type: Transform
+      pos: 37.5,-76.5
+      parent: 2
+  - uid: 9314
+    components:
+    - type: Transform
+      pos: 99.5,-38.5
+      parent: 2
   - uid: 9339
     components:
     - type: Transform
@@ -28921,21 +30152,6 @@ entities:
     - type: Transform
       pos: 43.5,-12.5
       parent: 2
-  - uid: 9384
-    components:
-    - type: Transform
-      pos: 72.5,-38.5
-      parent: 2
-  - uid: 9385
-    components:
-    - type: Transform
-      pos: 64.5,-38.5
-      parent: 2
-  - uid: 9386
-    components:
-    - type: Transform
-      pos: 66.5,-38.5
-      parent: 2
   - uid: 10007
     components:
     - type: Transform
@@ -28976,21 +30192,6 @@ entities:
     - type: Transform
       pos: 56.5,-15.5
       parent: 2
-  - uid: 10289
-    components:
-    - type: Transform
-      pos: 68.5,-38.5
-      parent: 2
-  - uid: 10290
-    components:
-    - type: Transform
-      pos: 63.5,-38.5
-      parent: 2
-  - uid: 10291
-    components:
-    - type: Transform
-      pos: 74.5,-41.5
-      parent: 2
   - uid: 10325
     components:
     - type: Transform
@@ -29001,6 +30202,31 @@ entities:
     - type: Transform
       pos: 65.5,-17.5
       parent: 2
+  - uid: 10676
+    components:
+    - type: Transform
+      pos: 46.5,-44.5
+      parent: 2
+  - uid: 10719
+    components:
+    - type: Transform
+      pos: 101.5,-52.5
+      parent: 2
+  - uid: 10720
+    components:
+    - type: Transform
+      pos: 77.5,-29.5
+      parent: 2
+  - uid: 10722
+    components:
+    - type: Transform
+      pos: 100.5,-55.5
+      parent: 2
+  - uid: 10738
+    components:
+    - type: Transform
+      pos: 101.5,-54.5
+      parent: 2
   - uid: 10744
     components:
     - type: Transform
@@ -29019,12 +30245,7 @@ entities:
   - uid: 10750
     components:
     - type: Transform
-      pos: 70.5,-37.5
-      parent: 2
-  - uid: 10752
-    components:
-    - type: Transform
-      pos: 76.5,-41.5
+      pos: 76.5,-30.5
       parent: 2
   - uid: 10769
     components:
@@ -29051,10 +30272,10 @@ entities:
     - type: Transform
       pos: 78.5,-46.5
       parent: 2
-  - uid: 10861
+  - uid: 10857
     components:
     - type: Transform
-      pos: 63.5,-46.5
+      pos: 76.5,-27.5
       parent: 2
   - uid: 10879
     components:
@@ -29091,6 +30312,11 @@ entities:
     - type: Transform
       pos: -26.5,-21.5
       parent: 2
+  - uid: 11633
+    components:
+    - type: Transform
+      pos: 48.5,-32.5
+      parent: 2
   - uid: 11679
     components:
     - type: Transform
@@ -29171,21 +30397,41 @@ entities:
     - type: Transform
       pos: 52.5,-14.5
       parent: 2
-  - uid: 11827
+  - uid: 11833
     components:
     - type: Transform
-      pos: 48.5,-52.5
+      pos: 77.5,-27.5
       parent: 2
-  - uid: 11871
+  - uid: 11835
     components:
     - type: Transform
-      pos: 63.5,-50.5
+      pos: 76.5,-29.5
+      parent: 2
+  - uid: 11855
+    components:
+    - type: Transform
+      pos: 78.5,-69.5
+      parent: 2
+  - uid: 11901
+    components:
+    - type: Transform
+      pos: 76.5,-31.5
       parent: 2
   - uid: 11943
     components:
     - type: Transform
       pos: 76.5,-25.5
       parent: 2
+  - uid: 11976
+    components:
+    - type: Transform
+      pos: 44.5,-49.5
+      parent: 2
+  - uid: 11977
+    components:
+    - type: Transform
+      pos: 45.5,-49.5
+      parent: 2
   - uid: 12419
     components:
     - type: Transform
@@ -29196,6 +30442,66 @@ entities:
     - type: Transform
       pos: 1.5,-35.5
       parent: 2
+  - uid: 12933
+    components:
+    - type: Transform
+      pos: 48.5,-31.5
+      parent: 2
+  - uid: 12963
+    components:
+    - type: Transform
+      pos: 44.5,-32.5
+      parent: 2
+  - uid: 12964
+    components:
+    - type: Transform
+      pos: 43.5,-32.5
+      parent: 2
+  - uid: 12965
+    components:
+    - type: Transform
+      pos: 45.5,-48.5
+      parent: 2
+  - uid: 12972
+    components:
+    - type: Transform
+      pos: 46.5,-32.5
+      parent: 2
+  - uid: 12982
+    components:
+    - type: Transform
+      pos: 42.5,-52.5
+      parent: 2
+  - uid: 12984
+    components:
+    - type: Transform
+      pos: 42.5,-51.5
+      parent: 2
+  - uid: 12985
+    components:
+    - type: Transform
+      pos: 42.5,-50.5
+      parent: 2
+  - uid: 12986
+    components:
+    - type: Transform
+      pos: 42.5,-49.5
+      parent: 2
+  - uid: 12987
+    components:
+    - type: Transform
+      pos: 43.5,-49.5
+      parent: 2
+  - uid: 13253
+    components:
+    - type: Transform
+      pos: 77.5,-35.5
+      parent: 2
+  - uid: 13255
+    components:
+    - type: Transform
+      pos: 79.5,-31.5
+      parent: 2
   - uid: 13265
     components:
     - type: Transform
@@ -30316,11 +31622,6 @@ entities:
     - type: Transform
       pos: 2.5,-60.5
       parent: 2
-  - uid: 13560
-    components:
-    - type: Transform
-      pos: 3.5,-60.5
-      parent: 2
   - uid: 13561
     components:
     - type: Transform
@@ -30626,25 +31927,15 @@ entities:
     - type: Transform
       pos: 37.5,-79.5
       parent: 2
-  - uid: 13634
-    components:
-    - type: Transform
-      pos: 37.5,-78.5
-      parent: 2
   - uid: 13635
     components:
     - type: Transform
-      pos: 38.5,-78.5
+      pos: 38.5,-76.5
       parent: 2
   - uid: 13636
     components:
     - type: Transform
-      pos: 38.5,-77.5
-      parent: 2
-  - uid: 13637
-    components:
-    - type: Transform
-      pos: 38.5,-76.5
+      pos: 37.5,-77.5
       parent: 2
   - uid: 13638
     components:
@@ -30856,86 +32147,6 @@ entities:
     - type: Transform
       pos: 24.5,-24.5
       parent: 2
-  - uid: 13686
-    components:
-    - type: Transform
-      pos: 24.5,-23.5
-      parent: 2
-  - uid: 13687
-    components:
-    - type: Transform
-      pos: 24.5,-22.5
-      parent: 2
-  - uid: 13688
-    components:
-    - type: Transform
-      pos: 25.5,-22.5
-      parent: 2
-  - uid: 13689
-    components:
-    - type: Transform
-      pos: 26.5,-22.5
-      parent: 2
-  - uid: 13690
-    components:
-    - type: Transform
-      pos: 27.5,-22.5
-      parent: 2
-  - uid: 13691
-    components:
-    - type: Transform
-      pos: 28.5,-22.5
-      parent: 2
-  - uid: 13692
-    components:
-    - type: Transform
-      pos: 29.5,-22.5
-      parent: 2
-  - uid: 13693
-    components:
-    - type: Transform
-      pos: 30.5,-22.5
-      parent: 2
-  - uid: 13694
-    components:
-    - type: Transform
-      pos: 31.5,-22.5
-      parent: 2
-  - uid: 13695
-    components:
-    - type: Transform
-      pos: 32.5,-22.5
-      parent: 2
-  - uid: 13696
-    components:
-    - type: Transform
-      pos: 33.5,-22.5
-      parent: 2
-  - uid: 13697
-    components:
-    - type: Transform
-      pos: 34.5,-22.5
-      parent: 2
-  - uid: 13698
-    components:
-    - type: Transform
-      pos: 35.5,-22.5
-      parent: 2
-  - uid: 13699
-    components:
-    - type: Transform
-      pos: 36.5,-22.5
-      parent: 2
-  - uid: 13700
-    components:
-    - type: Transform
-      pos: 37.5,-22.5
-      parent: 2
-  - uid: 13701
-    components:
-    - type: Transform
-      pos: 38.5,-22.5
-      parent: 2
   - uid: 13702
     components:
     - type: Transform
@@ -31361,31 +32572,6 @@ entities:
     - type: Transform
       pos: 42.5,-53.5
       parent: 2
-  - uid: 13789
-    components:
-    - type: Transform
-      pos: 43.5,-53.5
-      parent: 2
-  - uid: 13790
-    components:
-    - type: Transform
-      pos: 44.5,-53.5
-      parent: 2
-  - uid: 13791
-    components:
-    - type: Transform
-      pos: 45.5,-53.5
-      parent: 2
-  - uid: 13792
-    components:
-    - type: Transform
-      pos: 46.5,-53.5
-      parent: 2
-  - uid: 13793
-    components:
-    - type: Transform
-      pos: 47.5,-53.5
-      parent: 2
   - uid: 13795
     components:
     - type: Transform
@@ -31396,16 +32582,6 @@ entities:
     - type: Transform
       pos: 61.5,-15.5
       parent: 2
-  - uid: 13826
-    components:
-    - type: Transform
-      pos: 63.5,-51.5
-      parent: 2
-  - uid: 13827
-    components:
-    - type: Transform
-      pos: 63.5,-48.5
-      parent: 2
   - uid: 13835
     components:
     - type: Transform
@@ -31426,21 +32602,21 @@ entities:
     - type: Transform
       pos: 68.5,-24.5
       parent: 2
+  - uid: 13919
+    components:
+    - type: Transform
+      pos: 77.5,-31.5
+      parent: 2
+  - uid: 13943
+    components:
+    - type: Transform
+      pos: 77.5,-37.5
+      parent: 2
   - uid: 14030
     components:
     - type: Transform
       pos: -22.5,-74.5
       parent: 2
-  - uid: 14083
-    components:
-    - type: Transform
-      pos: 63.5,-52.5
-      parent: 2
-  - uid: 14118
-    components:
-    - type: Transform
-      pos: 63.5,-47.5
-      parent: 2
   - uid: 14143
     components:
     - type: Transform
@@ -31451,40 +32627,35 @@ entities:
     - type: Transform
       pos: 29.5,-71.5
       parent: 2
-  - uid: 14316
-    components:
-    - type: Transform
-      pos: 62.5,-52.5
-      parent: 2
-  - uid: 14358
-    components:
-    - type: Transform
-      pos: 61.5,-52.5
-      parent: 2
   - uid: 14394
     components:
     - type: Transform
       pos: -3.5,-40.5
       parent: 2
-  - uid: 14583
-    components:
-    - type: Transform
-      pos: 58.5,-54.5
-      parent: 2
   - uid: 14722
     components:
     - type: Transform
       pos: -28.5,-72.5
       parent: 2
+  - uid: 14737
+    components:
+    - type: Transform
+      pos: 42.5,-32.5
+      parent: 2
   - uid: 14790
     components:
     - type: Transform
       pos: -21.5,-74.5
       parent: 2
-  - uid: 14814
+  - uid: 14837
     components:
     - type: Transform
-      pos: 63.5,-49.5
+      pos: 95.5,-45.5
+      parent: 2
+  - uid: 14864
+    components:
+    - type: Transform
+      pos: 46.5,-46.5
       parent: 2
   - uid: 14977
     components:
@@ -31971,136 +33142,6 @@ entities:
     - type: Transform
       pos: 28.5,-33.5
       parent: 2
-  - uid: 15236
-    components:
-    - type: Transform
-      pos: 38.5,-35.5
-      parent: 2
-  - uid: 15237
-    components:
-    - type: Transform
-      pos: 39.5,-35.5
-      parent: 2
-  - uid: 15238
-    components:
-    - type: Transform
-      pos: 40.5,-35.5
-      parent: 2
-  - uid: 15239
-    components:
-    - type: Transform
-      pos: 40.5,-36.5
-      parent: 2
-  - uid: 15240
-    components:
-    - type: Transform
-      pos: 40.5,-37.5
-      parent: 2
-  - uid: 15241
-    components:
-    - type: Transform
-      pos: 40.5,-38.5
-      parent: 2
-  - uid: 15242
-    components:
-    - type: Transform
-      pos: 41.5,-38.5
-      parent: 2
-  - uid: 15243
-    components:
-    - type: Transform
-      pos: 42.5,-38.5
-      parent: 2
-  - uid: 15244
-    components:
-    - type: Transform
-      pos: 42.5,-37.5
-      parent: 2
-  - uid: 15245
-    components:
-    - type: Transform
-      pos: 42.5,-36.5
-      parent: 2
-  - uid: 15246
-    components:
-    - type: Transform
-      pos: 42.5,-35.5
-      parent: 2
-  - uid: 15247
-    components:
-    - type: Transform
-      pos: 43.5,-35.5
-      parent: 2
-  - uid: 15248
-    components:
-    - type: Transform
-      pos: 44.5,-35.5
-      parent: 2
-  - uid: 15249
-    components:
-    - type: Transform
-      pos: 44.5,-36.5
-      parent: 2
-  - uid: 15250
-    components:
-    - type: Transform
-      pos: 44.5,-37.5
-      parent: 2
-  - uid: 15251
-    components:
-    - type: Transform
-      pos: 45.5,-37.5
-      parent: 2
-  - uid: 15252
-    components:
-    - type: Transform
-      pos: 46.5,-37.5
-      parent: 2
-  - uid: 15253
-    components:
-    - type: Transform
-      pos: 46.5,-38.5
-      parent: 2
-  - uid: 15254
-    components:
-    - type: Transform
-      pos: 47.5,-38.5
-      parent: 2
-  - uid: 15255
-    components:
-    - type: Transform
-      pos: 48.5,-38.5
-      parent: 2
-  - uid: 15256
-    components:
-    - type: Transform
-      pos: 48.5,-37.5
-      parent: 2
-  - uid: 15259
-    components:
-    - type: Transform
-      pos: 38.5,-34.5
-      parent: 2
-  - uid: 15260
-    components:
-    - type: Transform
-      pos: 38.5,-33.5
-      parent: 2
-  - uid: 15264
-    components:
-    - type: Transform
-      pos: 38.5,-32.5
-      parent: 2
-  - uid: 15508
-    components:
-    - type: Transform
-      pos: 38.5,-31.5
-      parent: 2
-  - uid: 15509
-    components:
-    - type: Transform
-      pos: 37.5,-31.5
-      parent: 2
   - uid: 15789
     components:
     - type: Transform
@@ -32451,11 +33492,6 @@ entities:
     - type: Transform
       pos: -1.5,-74.5
       parent: 2
-  - uid: 17224
-    components:
-    - type: Transform
-      pos: 36.5,-31.5
-      parent: 2
   - uid: 17585
     components:
     - type: Transform
@@ -32741,51 +33777,6 @@ entities:
     - type: Transform
       pos: 77.5,-69.5
       parent: 2
-  - uid: 18665
-    components:
-    - type: Transform
-      pos: 76.5,-69.5
-      parent: 2
-  - uid: 18666
-    components:
-    - type: Transform
-      pos: 75.5,-69.5
-      parent: 2
-  - uid: 18667
-    components:
-    - type: Transform
-      pos: 74.5,-69.5
-      parent: 2
-  - uid: 18668
-    components:
-    - type: Transform
-      pos: 74.5,-68.5
-      parent: 2
-  - uid: 18669
-    components:
-    - type: Transform
-      pos: 74.5,-67.5
-      parent: 2
-  - uid: 18670
-    components:
-    - type: Transform
-      pos: 75.5,-67.5
-      parent: 2
-  - uid: 18671
-    components:
-    - type: Transform
-      pos: 77.5,-67.5
-      parent: 2
-  - uid: 18672
-    components:
-    - type: Transform
-      pos: 78.5,-67.5
-      parent: 2
-  - uid: 18673
-    components:
-    - type: Transform
-      pos: 76.5,-67.5
-      parent: 2
   - uid: 18674
     components:
     - type: Transform
@@ -32821,21 +33812,6 @@ entities:
     - type: Transform
       pos: 78.5,-58.5
       parent: 2
-  - uid: 18681
-    components:
-    - type: Transform
-      pos: 78.5,-59.5
-      parent: 2
-  - uid: 18682
-    components:
-    - type: Transform
-      pos: 78.5,-60.5
-      parent: 2
-  - uid: 18683
-    components:
-    - type: Transform
-      pos: 78.5,-61.5
-      parent: 2
   - uid: 18684
     components:
     - type: Transform
@@ -32968,10 +33944,10 @@ entities:
     - type: Transform
       pos: 7.5,-49.5
       parent: 2
-  - uid: 256
+  - uid: 386
     components:
     - type: Transform
-      pos: 64.5,-39.5
+      pos: 41.5,-44.5
       parent: 2
   - uid: 527
     components:
@@ -32988,11 +33964,21 @@ entities:
     - type: Transform
       pos: -21.5,-23.5
       parent: 2
+  - uid: 751
+    components:
+    - type: Transform
+      pos: 58.5,-74.5
+      parent: 2
   - uid: 773
     components:
     - type: Transform
       pos: 64.5,-28.5
       parent: 2
+  - uid: 810
+    components:
+    - type: Transform
+      pos: 46.5,-43.5
+      parent: 2
   - uid: 824
     components:
     - type: Transform
@@ -33003,11 +33989,6 @@ entities:
     - type: Transform
       pos: 31.5,-70.5
       parent: 2
-  - uid: 1062
-    components:
-    - type: Transform
-      pos: 64.5,-41.5
-      parent: 2
   - uid: 1070
     components:
     - type: Transform
@@ -33053,10 +34034,10 @@ entities:
     - type: Transform
       pos: -7.5,-21.5
       parent: 2
-  - uid: 1885
+  - uid: 1849
     components:
     - type: Transform
-      pos: 63.5,-54.5
+      pos: 33.5,-19.5
       parent: 2
   - uid: 2240
     components:
@@ -33128,11 +34109,6 @@ entities:
     - type: Transform
       pos: 4.5,-59.5
       parent: 2
-  - uid: 2948
-    components:
-    - type: Transform
-      pos: 69.5,-38.5
-      parent: 2
   - uid: 3024
     components:
     - type: Transform
@@ -33143,6 +34119,11 @@ entities:
     - type: Transform
       pos: 61.5,-74.5
       parent: 2
+  - uid: 3051
+    components:
+    - type: Transform
+      pos: 41.5,-41.5
+      parent: 2
   - uid: 3052
     components:
     - type: Transform
@@ -33158,6 +34139,36 @@ entities:
     - type: Transform
       pos: -16.5,-16.5
       parent: 2
+  - uid: 3154
+    components:
+    - type: Transform
+      pos: 57.5,-67.5
+      parent: 2
+  - uid: 3155
+    components:
+    - type: Transform
+      pos: 78.5,-45.5
+      parent: 2
+  - uid: 3170
+    components:
+    - type: Transform
+      pos: 57.5,-69.5
+      parent: 2
+  - uid: 3178
+    components:
+    - type: Transform
+      pos: 95.5,-46.5
+      parent: 2
+  - uid: 3179
+    components:
+    - type: Transform
+      pos: 94.5,-45.5
+      parent: 2
+  - uid: 3193
+    components:
+    - type: Transform
+      pos: 34.5,-19.5
+      parent: 2
   - uid: 3301
     components:
     - type: Transform
@@ -33168,30 +34179,30 @@ entities:
     - type: Transform
       pos: 32.5,-70.5
       parent: 2
-  - uid: 3409
+  - uid: 3384
     components:
     - type: Transform
-      pos: 71.5,-66.5
+      pos: 57.5,-70.5
       parent: 2
-  - uid: 3451
+  - uid: 3386
     components:
     - type: Transform
-      pos: 67.5,-49.5
+      pos: 57.5,-68.5
       parent: 2
-  - uid: 3453
+  - uid: 3391
     components:
     - type: Transform
-      pos: 66.5,-51.5
+      pos: 46.5,-40.5
       parent: 2
-  - uid: 3454
+  - uid: 3403
     components:
     - type: Transform
-      pos: 66.5,-49.5
+      pos: 27.5,-26.5
       parent: 2
-  - uid: 3465
+  - uid: 3423
     components:
     - type: Transform
-      pos: 61.5,-42.5
+      pos: 46.5,-41.5
       parent: 2
   - uid: 3481
     components:
@@ -33213,21 +34224,6 @@ entities:
     - type: Transform
       pos: -47.5,-36.5
       parent: 2
-  - uid: 3561
-    components:
-    - type: Transform
-      pos: 63.5,-52.5
-      parent: 2
-  - uid: 3580
-    components:
-    - type: Transform
-      pos: 54.5,-52.5
-      parent: 2
-  - uid: 3581
-    components:
-    - type: Transform
-      pos: 53.5,-52.5
-      parent: 2
   - uid: 3585
     components:
     - type: Transform
@@ -33243,11 +34239,6 @@ entities:
     - type: Transform
       pos: -48.5,-38.5
       parent: 2
-  - uid: 3611
-    components:
-    - type: Transform
-      pos: 57.5,-75.5
-      parent: 2
   - uid: 3628
     components:
     - type: Transform
@@ -33268,6 +34259,16 @@ entities:
     - type: Transform
       pos: 4.5,-57.5
       parent: 2
+  - uid: 3771
+    components:
+    - type: Transform
+      pos: 30.5,-23.5
+      parent: 2
+  - uid: 3812
+    components:
+    - type: Transform
+      pos: 32.5,-19.5
+      parent: 2
   - uid: 3896
     components:
     - type: Transform
@@ -33278,20 +34279,10 @@ entities:
     - type: Transform
       pos: 58.5,-22.5
       parent: 2
-  - uid: 4000
+  - uid: 4118
     components:
     - type: Transform
-      pos: 60.5,-41.5
-      parent: 2
-  - uid: 4049
-    components:
-    - type: Transform
-      pos: 62.5,-52.5
-      parent: 2
-  - uid: 4063
-    components:
-    - type: Transform
-      pos: 61.5,-52.5
+      pos: 29.5,-23.5
       parent: 2
   - uid: 4128
     components:
@@ -33303,11 +34294,46 @@ entities:
     - type: Transform
       pos: 31.5,-69.5
       parent: 2
+  - uid: 4160
+    components:
+    - type: Transform
+      pos: 78.5,-69.5
+      parent: 2
   - uid: 4194
     components:
     - type: Transform
       pos: 59.5,-21.5
       parent: 2
+  - uid: 4258
+    components:
+    - type: Transform
+      pos: 31.5,-19.5
+      parent: 2
+  - uid: 4347
+    components:
+    - type: Transform
+      pos: 31.5,-20.5
+      parent: 2
+  - uid: 4356
+    components:
+    - type: Transform
+      pos: 31.5,-21.5
+      parent: 2
+  - uid: 4399
+    components:
+    - type: Transform
+      pos: 31.5,-22.5
+      parent: 2
+  - uid: 4405
+    components:
+    - type: Transform
+      pos: 95.5,-47.5
+      parent: 2
+  - uid: 4419
+    components:
+    - type: Transform
+      pos: 31.5,-23.5
+      parent: 2
   - uid: 4438
     components:
     - type: Transform
@@ -33323,6 +34349,11 @@ entities:
     - type: Transform
       pos: 29.5,-68.5
       parent: 2
+  - uid: 4562
+    components:
+    - type: Transform
+      pos: 25.5,-23.5
+      parent: 2
   - uid: 4691
     components:
     - type: Transform
@@ -33353,6 +34384,31 @@ entities:
     - type: Transform
       pos: 82.5,-45.5
       parent: 2
+  - uid: 4916
+    components:
+    - type: Transform
+      pos: 46.5,-48.5
+      parent: 2
+  - uid: 4919
+    components:
+    - type: Transform
+      pos: 46.5,-47.5
+      parent: 2
+  - uid: 4920
+    components:
+    - type: Transform
+      pos: 46.5,-46.5
+      parent: 2
+  - uid: 4925
+    components:
+    - type: Transform
+      pos: 46.5,-45.5
+      parent: 2
+  - uid: 4926
+    components:
+    - type: Transform
+      pos: 46.5,-44.5
+      parent: 2
   - uid: 4999
     components:
     - type: Transform
@@ -33388,6 +34444,21 @@ entities:
     - type: Transform
       pos: -32.5,-83.5
       parent: 2
+  - uid: 5318
+    components:
+    - type: Transform
+      pos: 58.5,-66.5
+      parent: 2
+  - uid: 5323
+    components:
+    - type: Transform
+      pos: 95.5,-45.5
+      parent: 2
+  - uid: 5333
+    components:
+    - type: Transform
+      pos: 41.5,-49.5
+      parent: 2
   - uid: 5379
     components:
     - type: Transform
@@ -33403,20 +34474,10 @@ entities:
     - type: Transform
       pos: 58.5,-18.5
       parent: 2
-  - uid: 5432
+  - uid: 5412
     components:
     - type: Transform
-      pos: 65.5,-52.5
-      parent: 2
-  - uid: 5435
-    components:
-    - type: Transform
-      pos: 64.5,-52.5
-      parent: 2
-  - uid: 5474
-    components:
-    - type: Transform
-      pos: 60.5,-42.5
+      pos: 3.5,-59.5
       parent: 2
   - uid: 5558
     components:
@@ -33458,11 +34519,6 @@ entities:
     - type: Transform
       pos: -39.5,-45.5
       parent: 2
-  - uid: 5600
-    components:
-    - type: Transform
-      pos: 66.5,-50.5
-      parent: 2
   - uid: 5748
     components:
     - type: Transform
@@ -33633,21 +34689,51 @@ entities:
     - type: Transform
       pos: 79.5,-45.5
       parent: 2
+  - uid: 5827
+    components:
+    - type: Transform
+      pos: 42.5,-49.5
+      parent: 2
+  - uid: 5828
+    components:
+    - type: Transform
+      pos: 43.5,-49.5
+      parent: 2
+  - uid: 5831
+    components:
+    - type: Transform
+      pos: 44.5,-49.5
+      parent: 2
   - uid: 6025
     components:
     - type: Transform
       pos: 12.5,-21.5
       parent: 2
-  - uid: 6041
+  - uid: 6118
     components:
     - type: Transform
-      pos: 66.5,-48.5
+      pos: 51.5,-48.5
+      parent: 2
+  - uid: 6217
+    components:
+    - type: Transform
+      pos: 51.5,-50.5
       parent: 2
   - uid: 6361
     components:
     - type: Transform
       pos: 27.5,-65.5
       parent: 2
+  - uid: 6374
+    components:
+    - type: Transform
+      pos: 41.5,-45.5
+      parent: 2
+  - uid: 6382
+    components:
+    - type: Transform
+      pos: 49.5,-47.5
+      parent: 2
   - uid: 6404
     components:
     - type: Transform
@@ -33668,6 +34754,11 @@ entities:
     - type: Transform
       pos: 27.5,-68.5
       parent: 2
+  - uid: 6424
+    components:
+    - type: Transform
+      pos: 51.5,-51.5
+      parent: 2
   - uid: 6473
     components:
     - type: Transform
@@ -33743,11 +34834,21 @@ entities:
     - type: Transform
       pos: 29.5,-69.5
       parent: 2
+  - uid: 6639
+    components:
+    - type: Transform
+      pos: 70.5,-66.5
+      parent: 2
   - uid: 6653
     components:
     - type: Transform
       pos: 12.5,-26.5
       parent: 2
+  - uid: 6670
+    components:
+    - type: Transform
+      pos: 73.5,-64.5
+      parent: 2
   - uid: 6679
     components:
     - type: Transform
@@ -33763,25 +34864,110 @@ entities:
     - type: Transform
       pos: 12.5,-22.5
       parent: 2
+  - uid: 6711
+    components:
+    - type: Transform
+      pos: 73.5,-62.5
+      parent: 2
+  - uid: 6716
+    components:
+    - type: Transform
+      pos: 73.5,-63.5
+      parent: 2
+  - uid: 6717
+    components:
+    - type: Transform
+      pos: 70.5,-64.5
+      parent: 2
+  - uid: 6901
+    components:
+    - type: Transform
+      pos: 51.5,-49.5
+      parent: 2
+  - uid: 7000
+    components:
+    - type: Transform
+      pos: 51.5,-47.5
+      parent: 2
+  - uid: 7036
+    components:
+    - type: Transform
+      pos: 70.5,-69.5
+      parent: 2
+  - uid: 7037
+    components:
+    - type: Transform
+      pos: 70.5,-65.5
+      parent: 2
+  - uid: 7038
+    components:
+    - type: Transform
+      pos: 72.5,-64.5
+      parent: 2
+  - uid: 7039
+    components:
+    - type: Transform
+      pos: 71.5,-64.5
+      parent: 2
+  - uid: 7041
+    components:
+    - type: Transform
+      pos: 70.5,-70.5
+      parent: 2
+  - uid: 7044
+    components:
+    - type: Transform
+      pos: 70.5,-67.5
+      parent: 2
+  - uid: 7045
+    components:
+    - type: Transform
+      pos: 70.5,-68.5
+      parent: 2
+  - uid: 7101
+    components:
+    - type: Transform
+      pos: 47.5,-46.5
+      parent: 2
+  - uid: 7113
+    components:
+    - type: Transform
+      pos: 72.5,-62.5
+      parent: 2
   - uid: 7126
     components:
     - type: Transform
       pos: -32.5,-74.5
       parent: 2
+  - uid: 7143
+    components:
+    - type: Transform
+      pos: 48.5,-46.5
+      parent: 2
+  - uid: 7152
+    components:
+    - type: Transform
+      pos: 48.5,-45.5
+      parent: 2
   - uid: 7174
     components:
     - type: Transform
       pos: 58.5,-75.5
       parent: 2
-  - uid: 7179
+  - uid: 7214
     components:
     - type: Transform
-      pos: 68.5,-38.5
+      pos: 58.5,-71.5
       parent: 2
-  - uid: 7195
+  - uid: 7219
     components:
     - type: Transform
-      pos: 67.5,-44.5
+      pos: 49.5,-45.5
+      parent: 2
+  - uid: 7224
+    components:
+    - type: Transform
+      pos: 48.5,-47.5
       parent: 2
   - uid: 7225
     components:
@@ -33818,10 +35004,15 @@ entities:
     - type: Transform
       pos: 75.5,-71.5
       parent: 2
-  - uid: 7291
+  - uid: 7275
     components:
     - type: Transform
-      pos: 60.5,-40.5
+      pos: 28.5,-26.5
+      parent: 2
+  - uid: 7286
+    components:
+    - type: Transform
+      pos: 41.5,-46.5
       parent: 2
   - uid: 7324
     components:
@@ -33833,6 +35024,11 @@ entities:
     - type: Transform
       pos: 34.5,-70.5
       parent: 2
+  - uid: 7377
+    components:
+    - type: Transform
+      pos: 28.5,-25.5
+      parent: 2
   - uid: 7462
     components:
     - type: Transform
@@ -33858,16 +35054,6 @@ entities:
     - type: Transform
       pos: 91.5,-45.5
       parent: 2
-  - uid: 7477
-    components:
-    - type: Transform
-      pos: 90.5,-45.5
-      parent: 2
-  - uid: 7478
-    components:
-    - type: Transform
-      pos: 89.5,-45.5
-      parent: 2
   - uid: 7479
     components:
     - type: Transform
@@ -33878,15 +35064,30 @@ entities:
     - type: Transform
       pos: 88.5,-47.5
       parent: 2
-  - uid: 7497
+  - uid: 7534
     components:
     - type: Transform
-      pos: 84.5,-47.5
+      pos: 57.5,-71.5
       parent: 2
-  - uid: 7500
+  - uid: 7577
     components:
     - type: Transform
-      pos: 93.5,-46.5
+      pos: 58.5,-73.5
+      parent: 2
+  - uid: 7602
+    components:
+    - type: Transform
+      pos: 95.5,-43.5
+      parent: 2
+  - uid: 7604
+    components:
+    - type: Transform
+      pos: 28.5,-24.5
+      parent: 2
+  - uid: 7620
+    components:
+    - type: Transform
+      pos: 94.5,-47.5
       parent: 2
   - uid: 7703
     components:
@@ -33898,46 +35099,51 @@ entities:
     - type: Transform
       pos: -2.5,-48.5
       parent: 2
-  - uid: 7745
-    components:
-    - type: Transform
-      pos: 63.5,-56.5
-      parent: 2
-  - uid: 7746
-    components:
-    - type: Transform
-      pos: 66.5,-52.5
-      parent: 2
   - uid: 7946
     components:
     - type: Transform
       pos: 65.5,-30.5
       parent: 2
-  - uid: 7961
-    components:
-    - type: Transform
-      pos: 74.5,-69.5
-      parent: 2
-  - uid: 8003
-    components:
-    - type: Transform
-      pos: 67.5,-38.5
-      parent: 2
   - uid: 8070
     components:
     - type: Transform
       pos: 64.5,-29.5
       parent: 2
+  - uid: 8082
+    components:
+    - type: Transform
+      pos: 57.5,-66.5
+      parent: 2
+  - uid: 8084
+    components:
+    - type: Transform
+      pos: 46.5,-42.5
+      parent: 2
+  - uid: 8087
+    components:
+    - type: Transform
+      pos: 45.5,-49.5
+      parent: 2
+  - uid: 8090
+    components:
+    - type: Transform
+      pos: 45.5,-48.5
+      parent: 2
+  - uid: 8116
+    components:
+    - type: Transform
+      pos: 41.5,-43.5
+      parent: 2
+  - uid: 8117
+    components:
+    - type: Transform
+      pos: 41.5,-42.5
+      parent: 2
   - uid: 8123
     components:
     - type: Transform
       pos: 74.5,-71.5
       parent: 2
-  - uid: 8162
-    components:
-    - type: Transform
-      pos: 64.5,-38.5
-      parent: 2
   - uid: 8350
     components:
     - type: Transform
@@ -33948,26 +35154,16 @@ entities:
     - type: Transform
       pos: -18.5,-16.5
       parent: 2
-  - uid: 8577
+  - uid: 8595
     components:
     - type: Transform
-      pos: 58.5,-52.5
-      parent: 2
-  - uid: 8578
-    components:
-    - type: Transform
-      pos: 55.5,-52.5
+      pos: 50.5,-47.5
       parent: 2
   - uid: 8698
     components:
     - type: Transform
       pos: 17.5,-94.5
       parent: 2
-  - uid: 8823
-    components:
-    - type: Transform
-      pos: 66.5,-47.5
-      parent: 2
   - uid: 8916
     components:
     - type: Transform
@@ -34003,31 +35199,16 @@ entities:
     - type: Transform
       pos: 38.5,-72.5
       parent: 2
-  - uid: 9333
+  - uid: 9310
     components:
     - type: Transform
-      pos: 60.5,-52.5
-      parent: 2
-  - uid: 9334
-    components:
-    - type: Transform
-      pos: 59.5,-52.5
-      parent: 2
-  - uid: 9417
-    components:
-    - type: Transform
-      pos: 66.5,-45.5
+      pos: 94.5,-43.5
       parent: 2
   - uid: 9419
     components:
     - type: Transform
       pos: 4.5,-39.5
       parent: 2
-  - uid: 9666
-    components:
-    - type: Transform
-      pos: 66.5,-42.5
-      parent: 2
   - uid: 10019
     components:
     - type: Transform
@@ -34048,31 +35229,11 @@ entities:
     - type: Transform
       pos: 0.5,-35.5
       parent: 2
-  - uid: 10271
-    components:
-    - type: Transform
-      pos: 64.5,-31.5
-      parent: 2
   - uid: 10274
     components:
     - type: Transform
       pos: 64.5,-30.5
       parent: 2
-  - uid: 10282
-    components:
-    - type: Transform
-      pos: 63.5,-42.5
-      parent: 2
-  - uid: 10286
-    components:
-    - type: Transform
-      pos: 65.5,-44.5
-      parent: 2
-  - uid: 10287
-    components:
-    - type: Transform
-      pos: 63.5,-53.5
-      parent: 2
   - uid: 10316
     components:
     - type: Transform
@@ -34083,15 +35244,10 @@ entities:
     - type: Transform
       pos: 61.5,-19.5
       parent: 2
-  - uid: 10339
+  - uid: 10401
     components:
     - type: Transform
-      pos: 57.5,-52.5
-      parent: 2
-  - uid: 10340
-    components:
-    - type: Transform
-      pos: 56.5,-52.5
+      pos: 84.5,-44.5
       parent: 2
   - uid: 10519
     components:
@@ -34368,21 +35524,6 @@ entities:
     - type: Transform
       pos: 4.5,-60.5
       parent: 2
-  - uid: 10595
-    components:
-    - type: Transform
-      pos: 3.5,-60.5
-      parent: 2
-  - uid: 10596
-    components:
-    - type: Transform
-      pos: 2.5,-60.5
-      parent: 2
-  - uid: 10597
-    components:
-    - type: Transform
-      pos: 1.5,-60.5
-      parent: 2
   - uid: 10598
     components:
     - type: Transform
@@ -34648,11 +35789,6 @@ entities:
     - type: Transform
       pos: 20.5,-69.5
       parent: 2
-  - uid: 10672
-    components:
-    - type: Transform
-      pos: 63.5,-55.5
-      parent: 2
   - uid: 10677
     components:
     - type: Transform
@@ -34756,132 +35892,12 @@ entities:
   - uid: 10698
     components:
     - type: Transform
-      pos: 48.5,-37.5
-      parent: 2
-  - uid: 10699
-    components:
-    - type: Transform
-      pos: 48.5,-38.5
+      pos: 41.5,-47.5
       parent: 2
   - uid: 10700
     components:
     - type: Transform
-      pos: 47.5,-38.5
-      parent: 2
-  - uid: 10701
-    components:
-    - type: Transform
-      pos: 46.5,-38.5
-      parent: 2
-  - uid: 10702
-    components:
-    - type: Transform
-      pos: 46.5,-37.5
-      parent: 2
-  - uid: 10703
-    components:
-    - type: Transform
-      pos: 45.5,-37.5
-      parent: 2
-  - uid: 10704
-    components:
-    - type: Transform
-      pos: 44.5,-37.5
-      parent: 2
-  - uid: 10705
-    components:
-    - type: Transform
-      pos: 44.5,-36.5
-      parent: 2
-  - uid: 10706
-    components:
-    - type: Transform
-      pos: 44.5,-35.5
-      parent: 2
-  - uid: 10707
-    components:
-    - type: Transform
-      pos: 43.5,-35.5
-      parent: 2
-  - uid: 10708
-    components:
-    - type: Transform
-      pos: 42.5,-35.5
-      parent: 2
-  - uid: 10709
-    components:
-    - type: Transform
-      pos: 42.5,-36.5
-      parent: 2
-  - uid: 10710
-    components:
-    - type: Transform
-      pos: 42.5,-37.5
-      parent: 2
-  - uid: 10711
-    components:
-    - type: Transform
-      pos: 42.5,-38.5
-      parent: 2
-  - uid: 10712
-    components:
-    - type: Transform
-      pos: 41.5,-38.5
-      parent: 2
-  - uid: 10713
-    components:
-    - type: Transform
-      pos: 40.5,-38.5
-      parent: 2
-  - uid: 10714
-    components:
-    - type: Transform
-      pos: 40.5,-37.5
-      parent: 2
-  - uid: 10715
-    components:
-    - type: Transform
-      pos: 40.5,-36.5
-      parent: 2
-  - uid: 10716
-    components:
-    - type: Transform
-      pos: 40.5,-35.5
-      parent: 2
-  - uid: 10717
-    components:
-    - type: Transform
-      pos: 39.5,-35.5
-      parent: 2
-  - uid: 10718
-    components:
-    - type: Transform
-      pos: 38.5,-35.5
-      parent: 2
-  - uid: 10719
-    components:
-    - type: Transform
-      pos: 37.5,-35.5
-      parent: 2
-  - uid: 10720
-    components:
-    - type: Transform
-      pos: 37.5,-36.5
-      parent: 2
-  - uid: 10721
-    components:
-    - type: Transform
-      pos: 37.5,-37.5
-      parent: 2
-  - uid: 10722
-    components:
-    - type: Transform
-      pos: 37.5,-38.5
-      parent: 2
-  - uid: 10723
-    components:
-    - type: Transform
-      pos: 37.5,-39.5
+      pos: 41.5,-48.5
       parent: 2
   - uid: 10724
     components:
@@ -34933,51 +35949,21 @@ entities:
     - type: Transform
       pos: 35.5,-40.5
       parent: 2
-  - uid: 10753
-    components:
-    - type: Transform
-      pos: 62.5,-42.5
-      parent: 2
   - uid: 10772
     components:
     - type: Transform
       pos: 63.5,-19.5
       parent: 2
-  - uid: 10805
+  - uid: 10785
     components:
     - type: Transform
-      pos: 66.5,-39.5
+      pos: 2.5,-59.5
       parent: 2
   - uid: 10827
     components:
     - type: Transform
       pos: 93.5,-47.5
       parent: 2
-  - uid: 10828
-    components:
-    - type: Transform
-      pos: 71.5,-65.5
-      parent: 2
-  - uid: 10829
-    components:
-    - type: Transform
-      pos: 72.5,-65.5
-      parent: 2
-  - uid: 10830
-    components:
-    - type: Transform
-      pos: 73.5,-65.5
-      parent: 2
-  - uid: 10831
-    components:
-    - type: Transform
-      pos: 73.5,-66.5
-      parent: 2
-  - uid: 10835
-    components:
-    - type: Transform
-      pos: 78.5,-45.5
-      parent: 2
   - uid: 10836
     components:
     - type: Transform
@@ -34988,100 +35974,10 @@ entities:
     - type: Transform
       pos: 77.5,-44.5
       parent: 2
-  - uid: 10838
-    components:
-    - type: Transform
-      pos: 76.5,-44.5
-      parent: 2
-  - uid: 10843
-    components:
-    - type: Transform
-      pos: 46.5,-36.5
-      parent: 2
-  - uid: 10844
-    components:
-    - type: Transform
-      pos: 46.5,-35.5
-      parent: 2
-  - uid: 10845
-    components:
-    - type: Transform
-      pos: 47.5,-35.5
-      parent: 2
-  - uid: 10846
-    components:
-    - type: Transform
-      pos: 48.5,-35.5
-      parent: 2
-  - uid: 10847
-    components:
-    - type: Transform
-      pos: 49.5,-35.5
-      parent: 2
-  - uid: 10848
-    components:
-    - type: Transform
-      pos: 50.5,-35.5
-      parent: 2
-  - uid: 10849
-    components:
-    - type: Transform
-      pos: 50.5,-36.5
-      parent: 2
-  - uid: 10850
-    components:
-    - type: Transform
-      pos: 50.5,-37.5
-      parent: 2
   - uid: 10851
     components:
     - type: Transform
-      pos: 50.5,-38.5
-      parent: 2
-  - uid: 10852
-    components:
-    - type: Transform
-      pos: 50.5,-39.5
-      parent: 2
-  - uid: 10853
-    components:
-    - type: Transform
-      pos: 50.5,-40.5
-      parent: 2
-  - uid: 10854
-    components:
-    - type: Transform
-      pos: 51.5,-40.5
-      parent: 2
-  - uid: 10855
-    components:
-    - type: Transform
-      pos: 52.5,-40.5
-      parent: 2
-  - uid: 10856
-    components:
-    - type: Transform
-      pos: 52.5,-41.5
-      parent: 2
-  - uid: 10857
-    components:
-    - type: Transform
-      pos: 52.5,-42.5
-      parent: 2
-  - uid: 10858
-    components:
-    - type: Transform
-      pos: 52.5,-43.5
-      parent: 2
-  - uid: 10859
-    components:
-    - type: Transform
-      pos: 52.5,-44.5
-      parent: 2
-  - uid: 10860
-    components:
-    - type: Transform
-      pos: 52.5,-45.5
+      pos: 95.5,-44.5
       parent: 2
   - uid: 10863
     components:
@@ -35888,20 +36784,25 @@ entities:
     - type: Transform
       pos: -12.5,-10.5
       parent: 2
-  - uid: 11612
+  - uid: 11413
     components:
     - type: Transform
-      pos: 30.5,-24.5
+      pos: 50.5,-28.5
+      parent: 2
+  - uid: 11416
+    components:
+    - type: Transform
+      pos: 51.5,-28.5
       parent: 2
   - uid: 11613
     components:
     - type: Transform
-      pos: 30.5,-23.5
+      pos: 52.5,-28.5
       parent: 2
   - uid: 11614
     components:
     - type: Transform
-      pos: 29.5,-23.5
+      pos: 53.5,-28.5
       parent: 2
   - uid: 11615
     components:
@@ -35921,7 +36822,7 @@ entities:
   - uid: 11618
     components:
     - type: Transform
-      pos: 25.5,-23.5
+      pos: 53.5,-29.5
       parent: 2
   - uid: 11619
     components:
@@ -35993,11 +36894,181 @@ entities:
     - type: Transform
       pos: 14.5,-20.5
       parent: 2
+  - uid: 11634
+    components:
+    - type: Transform
+      pos: 53.5,-30.5
+      parent: 2
+  - uid: 11635
+    components:
+    - type: Transform
+      pos: 53.5,-31.5
+      parent: 2
+  - uid: 11636
+    components:
+    - type: Transform
+      pos: 54.5,-31.5
+      parent: 2
+  - uid: 11639
+    components:
+    - type: Transform
+      pos: 54.5,-32.5
+      parent: 2
+  - uid: 11640
+    components:
+    - type: Transform
+      pos: 55.5,-32.5
+      parent: 2
+  - uid: 11641
+    components:
+    - type: Transform
+      pos: 56.5,-32.5
+      parent: 2
+  - uid: 11642
+    components:
+    - type: Transform
+      pos: 57.5,-32.5
+      parent: 2
+  - uid: 11643
+    components:
+    - type: Transform
+      pos: 58.5,-32.5
+      parent: 2
+  - uid: 11646
+    components:
+    - type: Transform
+      pos: 59.5,-32.5
+      parent: 2
+  - uid: 11647
+    components:
+    - type: Transform
+      pos: 60.5,-32.5
+      parent: 2
+  - uid: 11659
+    components:
+    - type: Transform
+      pos: 61.5,-32.5
+      parent: 2
+  - uid: 11660
+    components:
+    - type: Transform
+      pos: 62.5,-32.5
+      parent: 2
+  - uid: 11661
+    components:
+    - type: Transform
+      pos: 63.5,-32.5
+      parent: 2
+  - uid: 11662
+    components:
+    - type: Transform
+      pos: 64.5,-32.5
+      parent: 2
+  - uid: 11663
+    components:
+    - type: Transform
+      pos: 64.5,-31.5
+      parent: 2
+  - uid: 11664
+    components:
+    - type: Transform
+      pos: 64.5,-33.5
+      parent: 2
+  - uid: 11665
+    components:
+    - type: Transform
+      pos: 64.5,-34.5
+      parent: 2
+  - uid: 11667
+    components:
+    - type: Transform
+      pos: 64.5,-35.5
+      parent: 2
+  - uid: 11676
+    components:
+    - type: Transform
+      pos: 65.5,-35.5
+      parent: 2
+  - uid: 11677
+    components:
+    - type: Transform
+      pos: 65.5,-36.5
+      parent: 2
+  - uid: 11684
+    components:
+    - type: Transform
+      pos: 65.5,-37.5
+      parent: 2
+  - uid: 11685
+    components:
+    - type: Transform
+      pos: 65.5,-38.5
+      parent: 2
+  - uid: 11686
+    components:
+    - type: Transform
+      pos: 65.5,-39.5
+      parent: 2
+  - uid: 11691
+    components:
+    - type: Transform
+      pos: 65.5,-40.5
+      parent: 2
+  - uid: 11692
+    components:
+    - type: Transform
+      pos: 65.5,-41.5
+      parent: 2
+  - uid: 11693
+    components:
+    - type: Transform
+      pos: 65.5,-42.5
+      parent: 2
+  - uid: 11694
+    components:
+    - type: Transform
+      pos: 65.5,-43.5
+      parent: 2
+  - uid: 11695
+    components:
+    - type: Transform
+      pos: 65.5,-44.5
+      parent: 2
+  - uid: 11696
+    components:
+    - type: Transform
+      pos: 65.5,-45.5
+      parent: 2
+  - uid: 11697
+    components:
+    - type: Transform
+      pos: 65.5,-46.5
+      parent: 2
+  - uid: 11698
+    components:
+    - type: Transform
+      pos: 65.5,-47.5
+      parent: 2
+  - uid: 11699
+    components:
+    - type: Transform
+      pos: 65.5,-48.5
+      parent: 2
+  - uid: 11700
+    components:
+    - type: Transform
+      pos: 66.5,-48.5
+      parent: 2
   - uid: 11701
     components:
     - type: Transform
       pos: 65.5,-27.5
       parent: 2
+  - uid: 11702
+    components:
+    - type: Transform
+      pos: 67.5,-48.5
+      parent: 2
   - uid: 11802
     components:
     - type: Transform
@@ -36018,6 +37089,11 @@ entities:
     - type: Transform
       pos: 66.5,-25.5
       parent: 2
+  - uid: 11910
+    components:
+    - type: Transform
+      pos: 54.5,-33.5
+      parent: 2
   - uid: 11952
     components:
     - type: Transform
@@ -36588,31 +37664,16 @@ entities:
     - type: Transform
       pos: -13.5,-12.5
       parent: 2
-  - uid: 12791
+  - uid: 12781
     components:
     - type: Transform
-      pos: 56.5,-72.5
-      parent: 2
-  - uid: 12801
-    components:
-    - type: Transform
-      pos: 57.5,-70.5
+      pos: 55.5,-37.5
       parent: 2
   - uid: 12826
     components:
     - type: Transform
       pos: 70.5,-23.5
       parent: 2
-  - uid: 12840
-    components:
-    - type: Transform
-      pos: 66.5,-38.5
-      parent: 2
-  - uid: 12860
-    components:
-    - type: Transform
-      pos: 65.5,-38.5
-      parent: 2
   - uid: 12875
     components:
     - type: Transform
@@ -36683,11 +37744,6 @@ entities:
     - type: Transform
       pos: 60.5,-75.5
       parent: 2
-  - uid: 12934
-    components:
-    - type: Transform
-      pos: 48.5,-34.5
-      parent: 2
   - uid: 13031
     components:
     - type: Transform
@@ -36753,6 +37809,11 @@ entities:
     - type: Transform
       pos: -6.5,-41.5
       parent: 2
+  - uid: 13162
+    components:
+    - type: Transform
+      pos: 64.5,-46.5
+      parent: 2
   - uid: 13163
     components:
     - type: Transform
@@ -36813,6 +37874,16 @@ entities:
     - type: Transform
       pos: 33.5,-95.5
       parent: 2
+  - uid: 13256
+    components:
+    - type: Transform
+      pos: 63.5,-46.5
+      parent: 2
+  - uid: 13257
+    components:
+    - type: Transform
+      pos: 62.5,-46.5
+      parent: 2
   - uid: 13272
     components:
     - type: Transform
@@ -36838,41 +37909,51 @@ entities:
     - type: Transform
       pos: -35.5,-24.5
       parent: 2
+  - uid: 13436
+    components:
+    - type: Transform
+      pos: 61.5,-46.5
+      parent: 2
   - uid: 13449
     components:
     - type: Transform
       pos: -19.5,-19.5
       parent: 2
-  - uid: 13836
+  - uid: 13519
     components:
     - type: Transform
-      pos: 56.5,-71.5
+      pos: 60.5,-46.5
       parent: 2
-  - uid: 13838
+  - uid: 13520
     components:
     - type: Transform
-      pos: 76.5,-69.5
+      pos: 59.5,-46.5
+      parent: 2
+  - uid: 13560
+    components:
+    - type: Transform
+      pos: 58.5,-46.5
+      parent: 2
+  - uid: 13686
+    components:
+    - type: Transform
+      pos: 58.5,-47.5
+      parent: 2
+  - uid: 13687
+    components:
+    - type: Transform
+      pos: 58.5,-48.5
+      parent: 2
+  - uid: 13688
+    components:
+    - type: Transform
+      pos: 57.5,-48.5
       parent: 2
   - uid: 13865
     components:
     - type: Transform
       pos: 65.5,-72.5
       parent: 2
-  - uid: 13874
-    components:
-    - type: Transform
-      pos: 56.5,-73.5
-      parent: 2
-  - uid: 13919
-    components:
-    - type: Transform
-      pos: 57.5,-68.5
-      parent: 2
-  - uid: 13932
-    components:
-    - type: Transform
-      pos: 58.5,-70.5
-      parent: 2
   - uid: 13939
     components:
     - type: Transform
@@ -36898,16 +37979,6 @@ entities:
     - type: Transform
       pos: 85.5,-47.5
       parent: 2
-  - uid: 14304
-    components:
-    - type: Transform
-      pos: 64.5,-40.5
-      parent: 2
-  - uid: 14315
-    components:
-    - type: Transform
-      pos: 56.5,-70.5
-      parent: 2
   - uid: 14322
     components:
     - type: Transform
@@ -36943,16 +38014,6 @@ entities:
     - type: Transform
       pos: 4.5,-38.5
       parent: 2
-  - uid: 14450
-    components:
-    - type: Transform
-      pos: 58.5,-69.5
-      parent: 2
-  - uid: 14555
-    components:
-    - type: Transform
-      pos: 83.5,-47.5
-      parent: 2
   - uid: 14575
     components:
     - type: Transform
@@ -36968,11 +38029,6 @@ entities:
     - type: Transform
       pos: 63.5,-73.5
       parent: 2
-  - uid: 14723
-    components:
-    - type: Transform
-      pos: 75.5,-69.5
-      parent: 2
   - uid: 14782
     components:
     - type: Transform
@@ -36983,25 +38039,30 @@ entities:
     - type: Transform
       pos: 5.5,-25.5
       parent: 2
+  - uid: 15104
+    components:
+    - type: Transform
+      pos: 58.5,-72.5
+      parent: 2
   - uid: 15123
     components:
     - type: Transform
       pos: 8.5,-49.5
       parent: 2
-  - uid: 15148
+  - uid: 15176
     components:
     - type: Transform
-      pos: 64.5,-35.5
+      pos: 85.5,-44.5
       parent: 2
-  - uid: 15158
+  - uid: 15181
     components:
     - type: Transform
-      pos: 64.5,-32.5
+      pos: 84.5,-46.5
       parent: 2
-  - uid: 15336
+  - uid: 15182
     components:
     - type: Transform
-      pos: 64.5,-37.5
+      pos: 85.5,-46.5
       parent: 2
   - uid: 15338
     components:
@@ -37033,11 +38094,6 @@ entities:
     - type: Transform
       pos: 51.5,-52.5
       parent: 2
-  - uid: 15399
-    components:
-    - type: Transform
-      pos: 70.5,-38.5
-      parent: 2
   - uid: 15466
     components:
     - type: Transform
@@ -37068,21 +38124,6 @@ entities:
     - type: Transform
       pos: 18.5,-56.5
       parent: 2
-  - uid: 16238
-    components:
-    - type: Transform
-      pos: 64.5,-34.5
-      parent: 2
-  - uid: 16239
-    components:
-    - type: Transform
-      pos: 64.5,-36.5
-      parent: 2
-  - uid: 16271
-    components:
-    - type: Transform
-      pos: 64.5,-33.5
-      parent: 2
   - uid: 16320
     components:
     - type: Transform
@@ -37093,11 +38134,6 @@ entities:
     - type: Transform
       pos: -18.5,-17.5
       parent: 2
-  - uid: 16448
-    components:
-    - type: Transform
-      pos: 66.5,-44.5
-      parent: 2
   - uid: 16454
     components:
     - type: Transform
@@ -37108,11 +38144,6 @@ entities:
     - type: Transform
       pos: 67.5,-72.5
       parent: 2
-  - uid: 16483
-    components:
-    - type: Transform
-      pos: 58.5,-68.5
-      parent: 2
   - uid: 16484
     components:
     - type: Transform
@@ -37138,11 +38169,6 @@ entities:
     - type: Transform
       pos: 77.5,-69.5
       parent: 2
-  - uid: 16510
-    components:
-    - type: Transform
-      pos: 56.5,-75.5
-      parent: 2
   - uid: 16517
     components:
     - type: Transform
@@ -37173,56 +38199,21 @@ entities:
     - type: Transform
       pos: -15.5,-77.5
       parent: 2
-  - uid: 16868
+  - uid: 17280
     components:
     - type: Transform
-      pos: 67.5,-46.5
+      pos: 64.5,-44.5
       parent: 2
-  - uid: 16869
+  - uid: 17283
     components:
     - type: Transform
-      pos: 66.5,-46.5
-      parent: 2
-  - uid: 16870
-    components:
-    - type: Transform
-      pos: 71.5,-46.5
-      parent: 2
-  - uid: 16871
-    components:
-    - type: Transform
-      pos: 64.5,-42.5
-      parent: 2
-  - uid: 16872
-    components:
-    - type: Transform
-      pos: 70.5,-46.5
-      parent: 2
-  - uid: 16873
-    components:
-    - type: Transform
-      pos: 65.5,-42.5
-      parent: 2
-  - uid: 16874
-    components:
-    - type: Transform
-      pos: 66.5,-43.5
-      parent: 2
-  - uid: 17267
-    components:
-    - type: Transform
-      pos: 75.5,-44.5
+      pos: 63.5,-44.5
       parent: 2
   - uid: 17436
     components:
     - type: Transform
       pos: 20.5,-62.5
       parent: 2
-  - uid: 17471
-    components:
-    - type: Transform
-      pos: 52.5,-52.5
-      parent: 2
   - uid: 17512
     components:
     - type: Transform
@@ -37233,21 +38224,6 @@ entities:
     - type: Transform
       pos: -7.5,-20.5
       parent: 2
-  - uid: 17855
-    components:
-    - type: Transform
-      pos: 68.5,-46.5
-      parent: 2
-  - uid: 17859
-    components:
-    - type: Transform
-      pos: 69.5,-46.5
-      parent: 2
-  - uid: 17866
-    components:
-    - type: Transform
-      pos: 72.5,-46.5
-      parent: 2
   - uid: 17927
     components:
     - type: Transform
@@ -37303,11 +38279,6 @@ entities:
     - type: Transform
       pos: 50.5,-57.5
       parent: 2
-  - uid: 18229
-    components:
-    - type: Transform
-      pos: 56.5,-74.5
-      parent: 2
   - uid: 18231
     components:
     - type: Transform
@@ -37373,16 +38344,6 @@ entities:
     - type: Transform
       pos: 83.5,-44.5
       parent: 2
-  - uid: 18604
-    components:
-    - type: Transform
-      pos: 83.5,-43.5
-      parent: 2
-  - uid: 18605
-    components:
-    - type: Transform
-      pos: 84.5,-43.5
-      parent: 2
   - uid: 18606
     components:
     - type: Transform
@@ -37428,71 +38389,6 @@ entities:
     - type: Transform
       pos: 93.5,-43.5
       parent: 2
-  - uid: 18615
-    components:
-    - type: Transform
-      pos: 93.5,-44.5
-      parent: 2
-  - uid: 18698
-    components:
-    - type: Transform
-      pos: 71.5,-67.5
-      parent: 2
-  - uid: 18699
-    components:
-    - type: Transform
-      pos: 71.5,-68.5
-      parent: 2
-  - uid: 18700
-    components:
-    - type: Transform
-      pos: 72.5,-68.5
-      parent: 2
-  - uid: 18701
-    components:
-    - type: Transform
-      pos: 73.5,-68.5
-      parent: 2
-  - uid: 18702
-    components:
-    - type: Transform
-      pos: 74.5,-68.5
-      parent: 2
-  - uid: 18703
-    components:
-    - type: Transform
-      pos: 74.5,-67.5
-      parent: 2
-  - uid: 18704
-    components:
-    - type: Transform
-      pos: 75.5,-67.5
-      parent: 2
-  - uid: 18705
-    components:
-    - type: Transform
-      pos: 76.5,-67.5
-      parent: 2
-  - uid: 18706
-    components:
-    - type: Transform
-      pos: 77.5,-67.5
-      parent: 2
-  - uid: 18707
-    components:
-    - type: Transform
-      pos: 78.5,-67.5
-      parent: 2
-  - uid: 18708
-    components:
-    - type: Transform
-      pos: 79.5,-67.5
-      parent: 2
-  - uid: 18709
-    components:
-    - type: Transform
-      pos: 79.5,-68.5
-      parent: 2
   - uid: 18710
     components:
     - type: Transform
@@ -37538,6 +38434,11 @@ entities:
     - type: Transform
       pos: -18.5,-15.5
       parent: 2
+  - uid: 19063
+    components:
+    - type: Transform
+      pos: 54.5,-34.5
+      parent: 2
   - uid: 19072
     components:
     - type: Transform
@@ -37558,6 +38459,11 @@ entities:
     - type: Transform
       pos: -45.5,-35.5
       parent: 2
+  - uid: 19368
+    components:
+    - type: Transform
+      pos: 54.5,-35.5
+      parent: 2
   - uid: 19623
     components:
     - type: Transform
@@ -37583,6 +38489,156 @@ entities:
     - type: Transform
       pos: 62.5,-21.5
       parent: 2
+  - uid: 19752
+    components:
+    - type: Transform
+      pos: 54.5,-36.5
+      parent: 2
+  - uid: 19753
+    components:
+    - type: Transform
+      pos: 54.5,-37.5
+      parent: 2
+  - uid: 19754
+    components:
+    - type: Transform
+      pos: 53.5,-37.5
+      parent: 2
+  - uid: 19758
+    components:
+    - type: Transform
+      pos: 55.5,-38.5
+      parent: 2
+  - uid: 19759
+    components:
+    - type: Transform
+      pos: 55.5,-39.5
+      parent: 2
+  - uid: 19760
+    components:
+    - type: Transform
+      pos: 55.5,-40.5
+      parent: 2
+  - uid: 19761
+    components:
+    - type: Transform
+      pos: 56.5,-40.5
+      parent: 2
+  - uid: 19762
+    components:
+    - type: Transform
+      pos: 55.5,-35.5
+      parent: 2
+  - uid: 19763
+    components:
+    - type: Transform
+      pos: 56.5,-35.5
+      parent: 2
+  - uid: 19764
+    components:
+    - type: Transform
+      pos: 57.5,-35.5
+      parent: 2
+  - uid: 19765
+    components:
+    - type: Transform
+      pos: 58.5,-35.5
+      parent: 2
+  - uid: 19766
+    components:
+    - type: Transform
+      pos: 59.5,-35.5
+      parent: 2
+  - uid: 19767
+    components:
+    - type: Transform
+      pos: 60.5,-35.5
+      parent: 2
+  - uid: 19768
+    components:
+    - type: Transform
+      pos: 60.5,-36.5
+      parent: 2
+  - uid: 19769
+    components:
+    - type: Transform
+      pos: 60.5,-37.5
+      parent: 2
+  - uid: 19770
+    components:
+    - type: Transform
+      pos: 60.5,-38.5
+      parent: 2
+  - uid: 19771
+    components:
+    - type: Transform
+      pos: 60.5,-39.5
+      parent: 2
+  - uid: 19772
+    components:
+    - type: Transform
+      pos: 66.5,-49.5
+      parent: 2
+  - uid: 19773
+    components:
+    - type: Transform
+      pos: 64.5,-48.5
+      parent: 2
+  - uid: 19774
+    components:
+    - type: Transform
+      pos: 64.5,-49.5
+      parent: 2
+  - uid: 19926
+    components:
+    - type: Transform
+      pos: 26.5,-22.5
+      parent: 2
+  - uid: 19927
+    components:
+    - type: Transform
+      pos: 26.5,-21.5
+      parent: 2
+  - uid: 19928
+    components:
+    - type: Transform
+      pos: 26.5,-20.5
+      parent: 2
+  - uid: 19929
+    components:
+    - type: Transform
+      pos: 26.5,-19.5
+      parent: 2
+  - uid: 19930
+    components:
+    - type: Transform
+      pos: 26.5,-18.5
+      parent: 2
+  - uid: 19931
+    components:
+    - type: Transform
+      pos: 26.5,-17.5
+      parent: 2
+  - uid: 19932
+    components:
+    - type: Transform
+      pos: 26.5,-16.5
+      parent: 2
+  - uid: 19933
+    components:
+    - type: Transform
+      pos: 26.5,-15.5
+      parent: 2
+  - uid: 19934
+    components:
+    - type: Transform
+      pos: 24.5,-15.5
+      parent: 2
+  - uid: 19935
+    components:
+    - type: Transform
+      pos: 25.5,-15.5
+      parent: 2
 - proto: CableTerminal
   entities:
   - uid: 3002
@@ -37595,6 +38651,12 @@ entities:
     - type: Transform
       pos: 31.5,-70.5
       parent: 2
+  - uid: 4343
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 88.5,-45.5
+      parent: 2
   - uid: 4401
     components:
     - type: Transform
@@ -37641,12 +38703,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 67.5,-21.5
       parent: 2
-  - uid: 18071
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 86.5,-45.5
-      parent: 2
 - proto: CandleGreen
   entities:
   - uid: 19004
@@ -37784,6 +38840,36 @@ entities:
       parent: 2
 - proto: Carpet
   entities:
+  - uid: 256
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 70.5,-53.5
+      parent: 2
+  - uid: 3540
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 70.5,-52.5
+      parent: 2
+  - uid: 3726
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 71.5,-53.5
+      parent: 2
+  - uid: 4380
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 71.5,-52.5
+      parent: 2
+  - uid: 5301
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 54.5,-37.5
+      parent: 2
   - uid: 7087
     components:
     - type: Transform
@@ -37809,35 +38895,23 @@ entities:
     - type: Transform
       pos: 36.5,-49.5
       parent: 2
-  - uid: 10330
+  - uid: 7117
     components:
     - type: Transform
-      pos: 57.5,-44.5
+      rot: 3.141592653589793 rad
+      pos: 54.5,-38.5
       parent: 2
-  - uid: 10790
+  - uid: 7177
     components:
     - type: Transform
-      pos: 57.5,-43.5
+      rot: -1.5707963267948966 rad
+      pos: 69.5,-53.5
       parent: 2
-  - uid: 12883
+  - uid: 7202
     components:
     - type: Transform
-      pos: 71.5,-47.5
-      parent: 2
-  - uid: 13834
-    components:
-    - type: Transform
-      pos: 71.5,-48.5
-      parent: 2
-  - uid: 16200
-    components:
-    - type: Transform
-      pos: 70.5,-47.5
-      parent: 2
-  - uid: 16205
-    components:
-    - type: Transform
-      pos: 70.5,-48.5
+      rot: -1.5707963267948966 rad
+      pos: 69.5,-52.5
       parent: 2
   - uid: 17424
     components:
@@ -37926,6 +39000,11 @@ entities:
     - type: Transform
       pos: -0.5,-66.5
       parent: 2
+  - uid: 3582
+    components:
+    - type: Transform
+      pos: 54.5,-57.5
+      parent: 2
   - uid: 3587
     components:
     - type: Transform
@@ -37946,11 +39025,6 @@ entities:
     - type: Transform
       pos: 54.5,-56.5
       parent: 2
-  - uid: 3915
-    components:
-    - type: Transform
-      pos: 54.5,-57.5
-      parent: 2
   - uid: 4752
     components:
     - type: Transform
@@ -38201,22 +39275,12 @@ entities:
     - type: Transform
       pos: -5.5,-61.5
       parent: 2
-  - uid: 8627
+  - uid: 8126
     components:
     - type: Transform
-      pos: 55.5,-57.5
+      pos: 52.5,-57.5
       parent: 2
-  - uid: 9219
-    components:
-    - type: Transform
-      pos: 55.5,-55.5
-      parent: 2
-  - uid: 9252
-    components:
-    - type: Transform
-      pos: 55.5,-56.5
-      parent: 2
-  - uid: 9373
+  - uid: 8135
     components:
     - type: Transform
       pos: 53.5,-57.5
@@ -38236,11 +39300,6 @@ entities:
     - type: Transform
       pos: 54.5,-55.5
       parent: 2
-  - uid: 14698
-    components:
-    - type: Transform
-      pos: 52.5,-57.5
-      parent: 2
   - uid: 15390
     components:
     - type: Transform
@@ -39161,83 +40220,6 @@ entities:
       rot: 0.7853981633974483 rad
       pos: 4.501627,-10.320071
       parent: 2
-  - uid: 18837
-    components:
-    - type: Transform
-      rot: -0.6108652381980153 rad
-      pos: 59.640903,-49.893475
-      parent: 2
-  - uid: 18838
-    components:
-    - type: Transform
-      rot: 0.3490658503988659 rad
-      pos: 59.109653,-50.15407
-      parent: 2
-  - uid: 18839
-    components:
-    - type: Transform
-      rot: -1.0471975511965976 rad
-      pos: 58.536736,-49.69542
-      parent: 2
-  - uid: 18840
-    components:
-    - type: Transform
-      rot: -0.3490658503988659 rad
-      pos: 59.005486,-49.309734
-      parent: 2
-  - uid: 18870
-    components:
-    - type: Transform
-      rot: 0.4188790204786391 rad
-      pos: 58.067986,-49.236767
-      parent: 2
-  - uid: 18871
-    components:
-    - type: Transform
-      rot: 1.6231562043547265 rad
-      pos: 57.422153,-50.07068
-      parent: 2
-  - uid: 18872
-    components:
-    - type: Transform
-      rot: 0.24434609527920614 rad
-      pos: 56.939404,-49.486263
-      parent: 2
-  - uid: 18875
-    components:
-    - type: Transform
-      pos: 57.265903,-49.184647
-      parent: 2
-  - uid: 18878
-    components:
-    - type: Transform
-      rot: 0.4363323129985824 rad
-      pos: 56.526318,-49.841354
-      parent: 2
-  - uid: 18879
-    components:
-    - type: Transform
-      rot: -0.3490658503988659 rad
-      pos: 57.213818,-48.74684
-      parent: 2
-  - uid: 18882
-    components:
-    - type: Transform
-      rot: 0.5934119456780721 rad
-      pos: 57.536736,-49.476517
-      parent: 2
-  - uid: 18884
-    components:
-    - type: Transform
-      rot: 2.3387411976724017 rad
-      pos: 56.533154,-49.26804
-      parent: 2
-  - uid: 18915
-    components:
-    - type: Transform
-      rot: 2.6878070480712677 rad
-      pos: 56.69982,-49.017864
-      parent: 2
   - uid: 19051
     components:
     - type: Transform
@@ -39273,6 +40255,60 @@ entities:
       rot: 0.9599310885968813 rad
       pos: -29.21888,-36.33141
       parent: 2
+  - uid: 20069
+    components:
+    - type: Transform
+      rot: 0.6981317007977318 rad
+      pos: 55.905697,-42.965652
+      parent: 2
+  - uid: 20070
+    components:
+    - type: Transform
+      rot: 0.5235987755982988 rad
+      pos: 55.29111,-42.69463
+      parent: 2
+  - uid: 20071
+    components:
+    - type: Transform
+      rot: 0.17453292519943295 rad
+      pos: 54.92249,-42.811863
+      parent: 2
+  - uid: 20072
+    components:
+    - type: Transform
+      rot: -0.5235987755982988 rad
+      pos: 54.38486,-42.767597
+      parent: 2
+  - uid: 20073
+    components:
+    - type: Transform
+      rot: -0.17453292519943295 rad
+      pos: 54.78707,-42.6972
+      parent: 2
+  - uid: 20074
+    components:
+    - type: Transform
+      rot: -0.3490658503988659 rad
+      pos: 54.155697,-42.507
+      parent: 2
+  - uid: 20075
+    components:
+    - type: Transform
+      rot: -0.17453292519943295 rad
+      pos: 53.672485,-42.926468
+      parent: 2
+  - uid: 20076
+    components:
+    - type: Transform
+      rot: -0.17453292519943295 rad
+      pos: 54.97457,-42.269817
+      parent: 2
+  - uid: 20077
+    components:
+    - type: Transform
+      rot: 0.08726646259971647 rad
+      pos: 54.526653,-42.457447
+      parent: 2
 - proto: Catwalk
   entities:
   - uid: 488
@@ -39280,21 +40316,28 @@ entities:
     - type: Transform
       pos: 77.5,-52.5
       parent: 2
+  - uid: 730
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 37.5,-88.5
+      parent: 2
   - uid: 1485
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -59.5,-25.5
       parent: 2
-  - uid: 2883
+  - uid: 1856
     components:
     - type: Transform
-      pos: 76.5,-35.5
+      pos: 85.5,-43.5
       parent: 2
-  - uid: 2917
+  - uid: 1997
     components:
     - type: Transform
-      pos: 71.5,-31.5
+      rot: 3.141592653589793 rad
+      pos: 37.5,-81.5
       parent: 2
   - uid: 2930
     components:
@@ -39311,16 +40354,25 @@ entities:
     - type: Transform
       pos: 68.5,-21.5
       parent: 2
-  - uid: 3337
+  - uid: 3119
     components:
     - type: Transform
-      pos: 66.5,-56.5
+      pos: 74.5,-29.5
       parent: 2
-  - uid: 3338
+  - uid: 3213
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 47.5,-48.5
+      pos: 77.5,-28.5
+      parent: 2
+  - uid: 3282
+    components:
+    - type: Transform
+      pos: 74.5,-35.5
+      parent: 2
+  - uid: 3302
+    components:
+    - type: Transform
+      pos: 74.5,-39.5
       parent: 2
   - uid: 3344
     components:
@@ -39342,21 +40394,15 @@ entities:
     - type: Transform
       pos: 31.5,-72.5
       parent: 2
-  - uid: 3380
+  - uid: 3450
     components:
     - type: Transform
-      pos: 56.5,-71.5
+      pos: 50.5,-26.5
       parent: 2
-  - uid: 3425
+  - uid: 3471
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 47.5,-49.5
-      parent: 2
-  - uid: 3435
-    components:
-    - type: Transform
-      pos: 75.5,-30.5
+      pos: 49.5,-26.5
       parent: 2
   - uid: 3508
     components:
@@ -39373,21 +40419,168 @@ entities:
     - type: Transform
       pos: -15.5,-65.5
       parent: 2
+  - uid: 3632
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 52.5,-28.5
+      parent: 2
+  - uid: 3677
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 33.5,-32.5
+      parent: 2
+  - uid: 3678
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 48.5,-31.5
+      parent: 2
   - uid: 3688
     components:
     - type: Transform
       pos: 33.5,-35.5
       parent: 2
-  - uid: 3948
+  - uid: 3713
     components:
     - type: Transform
-      pos: 83.5,-43.5
+      pos: 79.5,-31.5
       parent: 2
-  - uid: 4185
+  - uid: 3748
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 50.5,-46.5
+      pos: 77.5,-27.5
+      parent: 2
+  - uid: 3753
+    components:
+    - type: Transform
+      pos: 73.5,-29.5
+      parent: 2
+  - uid: 3782
+    components:
+    - type: Transform
+      pos: 72.5,-29.5
+      parent: 2
+  - uid: 3784
+    components:
+    - type: Transform
+      pos: 77.5,-31.5
+      parent: 2
+  - uid: 3785
+    components:
+    - type: Transform
+      pos: 29.5,-32.5
+      parent: 2
+  - uid: 3788
+    components:
+    - type: Transform
+      pos: 31.5,-32.5
+      parent: 2
+  - uid: 3789
+    components:
+    - type: Transform
+      pos: 30.5,-32.5
+      parent: 2
+  - uid: 3798
+    components:
+    - type: Transform
+      pos: 78.5,-31.5
+      parent: 2
+  - uid: 3801
+    components:
+    - type: Transform
+      pos: 74.5,-36.5
+      parent: 2
+  - uid: 3820
+    components:
+    - type: Transform
+      pos: 99.5,-54.5
+      parent: 2
+  - uid: 3827
+    components:
+    - type: Transform
+      pos: 101.5,-49.5
+      parent: 2
+  - uid: 3828
+    components:
+    - type: Transform
+      pos: 101.5,-47.5
+      parent: 2
+  - uid: 3830
+    components:
+    - type: Transform
+      pos: 101.5,-48.5
+      parent: 2
+  - uid: 3836
+    components:
+    - type: Transform
+      pos: 101.5,-43.5
+      parent: 2
+  - uid: 3837
+    components:
+    - type: Transform
+      pos: 101.5,-41.5
+      parent: 2
+  - uid: 3838
+    components:
+    - type: Transform
+      pos: 101.5,-42.5
+      parent: 2
+  - uid: 3839
+    components:
+    - type: Transform
+      pos: 101.5,-46.5
+      parent: 2
+  - uid: 3840
+    components:
+    - type: Transform
+      pos: 101.5,-44.5
+      parent: 2
+  - uid: 3841
+    components:
+    - type: Transform
+      pos: 101.5,-45.5
+      parent: 2
+  - uid: 3857
+    components:
+    - type: Transform
+      pos: 100.5,-39.5
+      parent: 2
+  - uid: 3859
+    components:
+    - type: Transform
+      pos: 100.5,-38.5
+      parent: 2
+  - uid: 3860
+    components:
+    - type: Transform
+      pos: 100.5,-40.5
+      parent: 2
+  - uid: 3861
+    components:
+    - type: Transform
+      pos: 99.5,-36.5
+      parent: 2
+  - uid: 3863
+    components:
+    - type: Transform
+      pos: 99.5,-34.5
+      parent: 2
+  - uid: 3864
+    components:
+    - type: Transform
+      pos: 99.5,-35.5
+      parent: 2
+  - uid: 3882
+    components:
+    - type: Transform
+      pos: 100.5,-37.5
+      parent: 2
+  - uid: 4193
+    components:
+    - type: Transform
+      pos: 51.5,-26.5
       parent: 2
   - uid: 4642
     components:
@@ -39616,6 +40809,18 @@ entities:
     - type: Transform
       pos: -17.5,-70.5
       parent: 2
+  - uid: 5296
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 34.5,-32.5
+      parent: 2
+  - uid: 5299
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 48.5,-32.5
+      parent: 2
   - uid: 5378
     components:
     - type: Transform
@@ -39726,11 +40931,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 39.5,-50.5
       parent: 2
-  - uid: 6092
-    components:
-    - type: Transform
-      pos: 70.5,-24.5
-      parent: 2
   - uid: 6227
     components:
     - type: Transform
@@ -39749,16 +40949,23 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -56.5,-25.5
       parent: 2
+  - uid: 6381
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 74.5,-31.5
+      parent: 2
+  - uid: 7084
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 53.5,-28.5
+      parent: 2
   - uid: 7191
     components:
     - type: Transform
       pos: 74.5,-52.5
       parent: 2
-  - uid: 7232
-    components:
-    - type: Transform
-      pos: 68.5,-37.5
-      parent: 2
   - uid: 7284
     components:
     - type: Transform
@@ -39774,120 +40981,30 @@ entities:
     - type: Transform
       pos: 33.5,-70.5
       parent: 2
-  - uid: 7600
+  - uid: 7411
     components:
     - type: Transform
-      pos: 99.5,-43.5
-      parent: 2
-  - uid: 7601
-    components:
-    - type: Transform
-      pos: 99.5,-41.5
-      parent: 2
-  - uid: 7602
-    components:
-    - type: Transform
-      pos: 99.5,-44.5
-      parent: 2
-  - uid: 7603
-    components:
-    - type: Transform
-      pos: 99.5,-42.5
-      parent: 2
-  - uid: 7604
-    components:
-    - type: Transform
-      pos: 99.5,-45.5
-      parent: 2
-  - uid: 7605
-    components:
-    - type: Transform
-      pos: 99.5,-46.5
-      parent: 2
-  - uid: 7606
-    components:
-    - type: Transform
-      pos: 99.5,-47.5
-      parent: 2
-  - uid: 7607
-    components:
-    - type: Transform
-      pos: 99.5,-48.5
+      pos: 86.5,-47.5
       parent: 2
   - uid: 7608
     components:
     - type: Transform
-      pos: 99.5,-49.5
+      pos: 75.5,-45.5
       parent: 2
   - uid: 7609
     components:
     - type: Transform
-      pos: 98.5,-50.5
-      parent: 2
-  - uid: 7610
-    components:
-    - type: Transform
-      pos: 98.5,-51.5
-      parent: 2
-  - uid: 7611
-    components:
-    - type: Transform
-      pos: 98.5,-52.5
-      parent: 2
-  - uid: 7612
-    components:
-    - type: Transform
-      pos: 98.5,-53.5
-      parent: 2
-  - uid: 7613
-    components:
-    - type: Transform
-      pos: 97.5,-54.5
-      parent: 2
-  - uid: 7614
-    components:
-    - type: Transform
-      pos: 97.5,-55.5
-      parent: 2
-  - uid: 7615
-    components:
-    - type: Transform
-      pos: 97.5,-56.5
-      parent: 2
-  - uid: 7616
-    components:
-    - type: Transform
-      pos: 98.5,-40.5
-      parent: 2
-  - uid: 7617
-    components:
-    - type: Transform
-      pos: 98.5,-39.5
-      parent: 2
-  - uid: 7618
-    components:
-    - type: Transform
-      pos: 98.5,-38.5
-      parent: 2
-  - uid: 7619
-    components:
-    - type: Transform
-      pos: 98.5,-37.5
-      parent: 2
-  - uid: 7620
-    components:
-    - type: Transform
-      pos: 97.5,-36.5
+      pos: 75.5,-46.5
       parent: 2
   - uid: 7621
     components:
     - type: Transform
-      pos: 97.5,-35.5
+      pos: 86.5,-43.5
       parent: 2
   - uid: 7622
     components:
     - type: Transform
-      pos: 97.5,-34.5
+      pos: 85.5,-47.5
       parent: 2
   - uid: 7714
     components:
@@ -39899,31 +41016,22 @@ entities:
     - type: Transform
       pos: 78.5,-35.5
       parent: 2
-  - uid: 7716
-    components:
-    - type: Transform
-      pos: 78.5,-36.5
-      parent: 2
-  - uid: 7722
-    components:
-    - type: Transform
-      pos: 77.5,-27.5
-      parent: 2
-  - uid: 7723
-    components:
-    - type: Transform
-      pos: 77.5,-28.5
-      parent: 2
-  - uid: 7724
-    components:
-    - type: Transform
-      pos: 77.5,-29.5
-      parent: 2
   - uid: 7886
     components:
     - type: Transform
       pos: -11.5,-35.5
       parent: 2
+  - uid: 7925
+    components:
+    - type: Transform
+      pos: 75.5,-47.5
+      parent: 2
+  - uid: 8071
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 48.5,-30.5
+      parent: 2
   - uid: 8102
     components:
     - type: Transform
@@ -39944,31 +41052,11 @@ entities:
     - type: Transform
       pos: 78.5,-49.5
       parent: 2
-  - uid: 8110
-    components:
-    - type: Transform
-      pos: 78.5,-40.5
-      parent: 2
-  - uid: 8111
-    components:
-    - type: Transform
-      pos: 78.5,-41.5
-      parent: 2
   - uid: 8112
     components:
     - type: Transform
       pos: 78.5,-38.5
       parent: 2
-  - uid: 8117
-    components:
-    - type: Transform
-      pos: 72.5,-71.5
-      parent: 2
-  - uid: 8118
-    components:
-    - type: Transform
-      pos: 73.5,-71.5
-      parent: 2
   - uid: 8119
     components:
     - type: Transform
@@ -39989,31 +41077,6 @@ entities:
     - type: Transform
       pos: 77.5,-71.5
       parent: 2
-  - uid: 8146
-    components:
-    - type: Transform
-      pos: 67.5,-66.5
-      parent: 2
-  - uid: 8147
-    components:
-    - type: Transform
-      pos: 67.5,-67.5
-      parent: 2
-  - uid: 8148
-    components:
-    - type: Transform
-      pos: 67.5,-68.5
-      parent: 2
-  - uid: 8149
-    components:
-    - type: Transform
-      pos: 67.5,-69.5
-      parent: 2
-  - uid: 8150
-    components:
-    - type: Transform
-      pos: 67.5,-70.5
-      parent: 2
   - uid: 8155
     components:
     - type: Transform
@@ -40024,11 +41087,6 @@ entities:
     - type: Transform
       pos: 65.5,-73.5
       parent: 2
-  - uid: 8157
-    components:
-    - type: Transform
-      pos: 62.5,-74.5
-      parent: 2
   - uid: 8158
     components:
     - type: Transform
@@ -40037,12 +41095,7 @@ entities:
   - uid: 8159
     components:
     - type: Transform
-      pos: 60.5,-75.5
-      parent: 2
-  - uid: 8160
-    components:
-    - type: Transform
-      pos: 61.5,-75.5
+      pos: 75.5,-48.5
       parent: 2
   - uid: 8327
     components:
@@ -40116,45 +41169,144 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 35.5,-79.5
       parent: 2
+  - uid: 8406
+    components:
+    - type: Transform
+      pos: 99.5,-56.5
+      parent: 2
+  - uid: 8407
+    components:
+    - type: Transform
+      pos: 100.5,-53.5
+      parent: 2
+  - uid: 8408
+    components:
+    - type: Transform
+      pos: 99.5,-55.5
+      parent: 2
+  - uid: 8465
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 46.5,-43.5
+      parent: 2
+  - uid: 8466
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 48.5,-42.5
+      parent: 2
+  - uid: 8467
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 48.5,-41.5
+      parent: 2
+  - uid: 8468
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 48.5,-40.5
+      parent: 2
+  - uid: 8499
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 48.5,-39.5
+      parent: 2
+  - uid: 8500
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 47.5,-37.5
+      parent: 2
+  - uid: 8501
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 47.5,-36.5
+      parent: 2
+  - uid: 8502
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 47.5,-35.5
+      parent: 2
+  - uid: 8511
+    components:
+    - type: Transform
+      pos: 99.5,-57.5
+      parent: 2
+  - uid: 8568
+    components:
+    - type: Transform
+      pos: 100.5,-52.5
+      parent: 2
+  - uid: 8569
+    components:
+    - type: Transform
+      pos: 100.5,-50.5
+      parent: 2
+  - uid: 8570
+    components:
+    - type: Transform
+      pos: 100.5,-51.5
+      parent: 2
+  - uid: 8827
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 50.5,-28.5
+      parent: 2
   - uid: 8913
     components:
     - type: Transform
       pos: 82.5,-24.5
       parent: 2
-  - uid: 9310
+  - uid: 9254
     components:
     - type: Transform
-      pos: 69.5,-55.5
+      rot: 3.141592653589793 rad
+      pos: 46.5,-44.5
       parent: 2
-  - uid: 9721
+  - uid: 9258
     components:
     - type: Transform
-      pos: 56.5,-72.5
+      rot: 3.141592653589793 rad
+      pos: 46.5,-45.5
       parent: 2
-  - uid: 10332
+  - uid: 9281
     components:
     - type: Transform
-      pos: 70.5,-55.5
+      rot: 3.141592653589793 rad
+      pos: 46.5,-46.5
+      parent: 2
+  - uid: 9287
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 46.5,-47.5
+      parent: 2
+  - uid: 9711
+    components:
+    - type: Transform
+      pos: 37.5,-30.5
       parent: 2
   - uid: 10530
     components:
     - type: Transform
       pos: -25.5,-21.5
       parent: 2
-  - uid: 10676
+  - uid: 11793
     components:
     - type: Transform
-      pos: 68.5,-55.5
+      rot: 1.5707963267948966 rad
+      pos: 74.5,-32.5
       parent: 2
-  - uid: 10811
+  - uid: 11834
     components:
     - type: Transform
-      pos: 75.5,-31.5
-      parent: 2
-  - uid: 10823
-    components:
-    - type: Transform
-      pos: 56.5,-73.5
+      pos: 77.5,-29.5
       parent: 2
   - uid: 12410
     components:
@@ -40167,16 +41319,17 @@ entities:
     - type: Transform
       pos: 33.5,-72.5
       parent: 2
+  - uid: 12992
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 74.5,-33.5
+      parent: 2
   - uid: 13812
     components:
     - type: Transform
       pos: 68.5,-19.5
       parent: 2
-  - uid: 13848
-    components:
-    - type: Transform
-      pos: 67.5,-37.5
-      parent: 2
   - uid: 13885
     components:
     - type: Transform
@@ -40187,12 +41340,22 @@ entities:
     - type: Transform
       pos: -28.5,-71.5
       parent: 2
+  - uid: 14070
+    components:
+    - type: Transform
+      pos: 74.5,-38.5
+      parent: 2
   - uid: 14121
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 6.5,-63.5
       parent: 2
+  - uid: 14809
+    components:
+    - type: Transform
+      pos: 74.5,-37.5
+      parent: 2
   - uid: 15261
     components:
     - type: Transform
@@ -40203,20 +41366,95 @@ entities:
     - type: Transform
       pos: 32.5,-35.5
       parent: 2
+  - uid: 15402
+    components:
+    - type: Transform
+      pos: 71.5,-62.5
+      parent: 2
+  - uid: 15426
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 46.5,-49.5
+      parent: 2
   - uid: 15431
     components:
     - type: Transform
       pos: 30.5,-71.5
       parent: 2
+  - uid: 15443
+    components:
+    - type: Transform
+      pos: 79.5,-63.5
+      parent: 2
+  - uid: 15444
+    components:
+    - type: Transform
+      pos: 79.5,-64.5
+      parent: 2
+  - uid: 15445
+    components:
+    - type: Transform
+      pos: 79.5,-62.5
+      parent: 2
+  - uid: 15446
+    components:
+    - type: Transform
+      pos: 79.5,-66.5
+      parent: 2
+  - uid: 15447
+    components:
+    - type: Transform
+      pos: 79.5,-67.5
+      parent: 2
+  - uid: 15448
+    components:
+    - type: Transform
+      pos: 79.5,-65.5
+      parent: 2
+  - uid: 15451
+    components:
+    - type: Transform
+      pos: 70.5,-67.5
+      parent: 2
   - uid: 15452
     components:
     - type: Transform
-      pos: 74.5,-45.5
+      pos: 70.5,-66.5
       parent: 2
   - uid: 15453
     components:
     - type: Transform
-      pos: 74.5,-46.5
+      pos: 70.5,-68.5
+      parent: 2
+  - uid: 15454
+    components:
+    - type: Transform
+      pos: 70.5,-65.5
+      parent: 2
+  - uid: 15518
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 79.5,-58.5
+      parent: 2
+  - uid: 15520
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 55.5,-48.5
+      parent: 2
+  - uid: 15547
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 55.5,-49.5
+      parent: 2
+  - uid: 15548
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 55.5,-50.5
       parent: 2
   - uid: 16004
     components:
@@ -40224,105 +41462,80 @@ entities:
       rot: 3.141592653589793 rad
       pos: 78.5,-39.5
       parent: 2
+  - uid: 16031
+    components:
+    - type: Transform
+      pos: 55.5,-53.5
+      parent: 2
+  - uid: 16032
+    components:
+    - type: Transform
+      pos: 56.5,-54.5
+      parent: 2
+  - uid: 16040
+    components:
+    - type: Transform
+      pos: 68.5,-23.5
+      parent: 2
   - uid: 16148
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -31.5,-18.5
       parent: 2
-  - uid: 16284
+  - uid: 16164
     components:
     - type: Transform
-      pos: 74.5,-47.5
+      rot: 1.5707963267948966 rad
+      pos: 39.5,-30.5
       parent: 2
-  - uid: 16528
+  - uid: 16175
     components:
     - type: Transform
-      pos: 74.5,-48.5
+      rot: 1.5707963267948966 rad
+      pos: 40.5,-30.5
       parent: 2
-  - uid: 16565
+  - uid: 16193
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 51.5,-46.5
+      rot: 1.5707963267948966 rad
+      pos: 41.5,-30.5
       parent: 2
-  - uid: 16566
+  - uid: 16587
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 52.5,-46.5
+      rot: 1.5707963267948966 rad
+      pos: 67.5,-56.5
       parent: 2
-  - uid: 16567
+  - uid: 16588
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 53.5,-46.5
+      rot: 1.5707963267948966 rad
+      pos: 66.5,-56.5
       parent: 2
-  - uid: 16570
+  - uid: 16589
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 42.5,-35.5
+      rot: 1.5707963267948966 rad
+      pos: 65.5,-56.5
       parent: 2
-  - uid: 16571
+  - uid: 16590
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 42.5,-36.5
+      rot: 1.5707963267948966 rad
+      pos: 55.5,-51.5
       parent: 2
-  - uid: 16572
+  - uid: 16591
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 42.5,-37.5
+      rot: 1.5707963267948966 rad
+      pos: 61.5,-56.5
       parent: 2
-  - uid: 16573
+  - uid: 16592
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 42.5,-38.5
-      parent: 2
-  - uid: 16574
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 40.5,-35.5
-      parent: 2
-  - uid: 16575
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 40.5,-36.5
-      parent: 2
-  - uid: 16577
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 42.5,-32.5
-      parent: 2
-  - uid: 16578
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 42.5,-33.5
-      parent: 2
-  - uid: 16582
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 50.5,-38.5
-      parent: 2
-  - uid: 16583
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 50.5,-37.5
-      parent: 2
-  - uid: 16584
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 50.5,-36.5
+      rot: 1.5707963267948966 rad
+      pos: 60.5,-56.5
       parent: 2
   - uid: 16594
     components:
@@ -40336,24 +41549,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -40.5,-79.5
       parent: 2
-  - uid: 16596
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -39.5,-79.5
-      parent: 2
-  - uid: 16597
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -38.5,-79.5
-      parent: 2
-  - uid: 16598
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -37.5,-79.5
-      parent: 2
   - uid: 16599
     components:
     - type: Transform
@@ -40378,6 +41573,21 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -35.5,-73.5
       parent: 2
+  - uid: 16607
+    components:
+    - type: Transform
+      pos: 71.5,-61.5
+      parent: 2
+  - uid: 16608
+    components:
+    - type: Transform
+      pos: 71.5,-60.5
+      parent: 2
+  - uid: 16609
+    components:
+    - type: Transform
+      pos: 71.5,-59.5
+      parent: 2
   - uid: 16764
     components:
     - type: Transform
@@ -40414,26 +41624,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -24.5,-43.5
       parent: 2
-  - uid: 17093
-    components:
-    - type: Transform
-      pos: 52.5,-29.5
-      parent: 2
-  - uid: 17102
-    components:
-    - type: Transform
-      pos: -35.5,-76.5
-      parent: 2
-  - uid: 17118
-    components:
-    - type: Transform
-      pos: -35.5,-77.5
-      parent: 2
-  - uid: 17119
-    components:
-    - type: Transform
-      pos: -35.5,-78.5
-      parent: 2
   - uid: 17174
     components:
     - type: Transform
@@ -40610,30 +41800,6 @@ entities:
     - type: Transform
       pos: 21.5,-63.5
       parent: 2
-  - uid: 17718
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 75.5,-67.5
-      parent: 2
-  - uid: 17719
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 76.5,-67.5
-      parent: 2
-  - uid: 17720
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 77.5,-67.5
-      parent: 2
-  - uid: 17721
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 78.5,-67.5
-      parent: 2
   - uid: 17723
     components:
     - type: Transform
@@ -40664,56 +41830,11 @@ entities:
     - type: Transform
       pos: 76.5,-52.5
       parent: 2
-  - uid: 17856
-    components:
-    - type: Transform
-      pos: 75.5,-35.5
-      parent: 2
-  - uid: 17857
-    components:
-    - type: Transform
-      pos: 74.5,-35.5
-      parent: 2
-  - uid: 17858
-    components:
-    - type: Transform
-      pos: 73.5,-35.5
-      parent: 2
-  - uid: 17860
-    components:
-    - type: Transform
-      pos: 73.5,-33.5
-      parent: 2
-  - uid: 17861
-    components:
-    - type: Transform
-      pos: 71.5,-29.5
-      parent: 2
-  - uid: 17862
-    components:
-    - type: Transform
-      pos: 73.5,-32.5
-      parent: 2
   - uid: 17869
     components:
     - type: Transform
       pos: -24.5,-21.5
       parent: 2
-  - uid: 17870
-    components:
-    - type: Transform
-      pos: 71.5,-30.5
-      parent: 2
-  - uid: 17871
-    components:
-    - type: Transform
-      pos: 73.5,-31.5
-      parent: 2
-  - uid: 17998
-    components:
-    - type: Transform
-      pos: 75.5,-32.5
-      parent: 2
   - uid: 18477
     components:
     - type: Transform
@@ -40783,10 +41904,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 82.5,-70.5
       parent: 2
-  - uid: 18790
+  - uid: 18861
     components:
     - type: Transform
-      pos: 83.5,-47.5
+      rot: -1.5707963267948966 rad
+      pos: 54.5,-70.5
       parent: 2
   - uid: 18892
     components:
@@ -40842,36 +41964,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 34.5,-93.5
       parent: 2
-  - uid: 19078
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 30.5,-31.5
-      parent: 2
-  - uid: 19079
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 31.5,-31.5
-      parent: 2
-  - uid: 19080
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 29.5,-31.5
-      parent: 2
-  - uid: 19147
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 84.5,-47.5
-      parent: 2
-  - uid: 19171
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 84.5,-43.5
-      parent: 2
   - uid: 19329
     components:
     - type: Transform
@@ -40910,6 +42002,12 @@ entities:
       parent: 2
 - proto: Chair
   entities:
+  - uid: 748
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 66.5,-38.5
+      parent: 2
   - uid: 1266
     components:
     - type: Transform
@@ -40922,23 +42020,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 59.5,-27.5
       parent: 2
-  - uid: 3021
+  - uid: 3649
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 65.5,-37.5
-      parent: 2
-  - uid: 4304
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 50.5,-49.5
-      parent: 2
-  - uid: 4305
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 49.5,-50.5
+      rot: 1.5707963267948966 rad
+      pos: 66.5,-51.5
       parent: 2
   - uid: 4867
     components:
@@ -41085,18 +42171,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -35.5,-15.5
       parent: 2
-  - uid: 12857
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 65.5,-36.5
-      parent: 2
-  - uid: 12858
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 65.5,-35.5
-      parent: 2
   - uid: 13852
     components:
     - type: Transform
@@ -41146,12 +42220,6 @@ entities:
     - type: Transform
       pos: 26.5,-81.5
       parent: 2
-  - uid: 17601
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 66.5,-46.5
-      parent: 2
   - uid: 17899
     components:
     - type: Transform
@@ -41211,17 +42279,17 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 5.5,-28.5
       parent: 2
-  - uid: 348
-    components:
-    - type: Transform
-      pos: 21.5,-18.5
-      parent: 2
   - uid: 877
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 10.5,-31.5
       parent: 2
+  - uid: 915
+    components:
+    - type: Transform
+      pos: 34.5,-17.5
+      parent: 2
   - uid: 2198
     components:
     - type: Transform
@@ -41234,12 +42302,24 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -1.5554351,-26.347584
       parent: 2
-  - uid: 3209
+  - uid: 4613
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-20.5
+      parent: 2
+  - uid: 4614
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 20.5,-20.5
       parent: 2
+  - uid: 4627
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 33.5,-19.5
+      parent: 2
   - uid: 5141
     components:
     - type: Transform
@@ -41307,23 +42387,17 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -61.426323,-25.462961
       parent: 2
-  - uid: 6657
+  - uid: 6904
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 21.5,-20.5
+      rot: -1.5707963267948966 rad
+      pos: 54.5,-98.5
       parent: 2
   - uid: 6920
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 53.5,-99.5
-      parent: 2
-  - uid: 6921
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 53.5,-98.5
+      pos: 54.5,-99.5
       parent: 2
   - uid: 7674
     components:
@@ -41331,23 +42405,16 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 78.5,-20.5
       parent: 2
-  - uid: 7796
+  - uid: 7774
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 27.5,-20.5
+      pos: 33.5,-17.5
       parent: 2
-  - uid: 7797
+  - uid: 7775
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 27.5,-19.5
-      parent: 2
-  - uid: 7798
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 27.5,-21.5
+      rot: 3.141592653589793 rad
+      pos: 32.5,-20.5
       parent: 2
   - uid: 7937
     components:
@@ -41355,22 +42422,22 @@ entities:
       rot: 3.141592653589793 rad
       pos: 49.5,-23.5
       parent: 2
-  - uid: 8568
+  - uid: 8845
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 50.5,-25.5
+      pos: 22.5,-19.5
       parent: 2
   - uid: 10302
     components:
     - type: Transform
       pos: 49.5,-20.5
       parent: 2
-  - uid: 11756
+  - uid: 19152
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 48.5,-25.5
+      rot: -1.5707963267948966 rad
+      pos: 41.5,-25.5
       parent: 2
   - uid: 19669
     components:
@@ -41380,15 +42447,17 @@ entities:
       parent: 2
 - proto: ChairFoldingSpawnFolded
   entities:
-  - uid: 9949
+  - uid: 7752
     components:
     - type: Transform
-      pos: 36.415863,-13.360202
+      rot: -1.5707963267948966 rad
+      pos: 47.450993,-25.454924
       parent: 2
-  - uid: 11686
+  - uid: 15417
     components:
     - type: Transform
-      pos: 36.322113,-13.21948
+      rot: -1.5707963267948966 rad
+      pos: 47.482243,-25.298674
       parent: 2
   - uid: 16294
     components:
@@ -41405,19 +42474,36 @@ entities:
     - type: Transform
       pos: 43.51082,-13.164188
       parent: 2
-  - uid: 17954
-    components:
-    - type: Transform
-      pos: 36.525238,-13.125664
-      parent: 2
 - proto: ChairOfficeDark
   entities:
+  - uid: 237
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 69.5,-46.5
+      parent: 2
   - uid: 2929
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -0.5,-67.5
       parent: 2
+  - uid: 3460
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 52.5,-55.5
+      parent: 2
+  - uid: 3527
+    components:
+    - type: Transform
+      pos: 64.5,-43.5
+      parent: 2
+  - uid: 5414
+    components:
+    - type: Transform
+      pos: 58.5,-39.5
+      parent: 2
   - uid: 5479
     components:
     - type: Transform
@@ -41448,26 +42534,38 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 13.5,-59.5
       parent: 2
+  - uid: 7169
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 52.606865,-56.41906
+      parent: 2
   - uid: 7977
     components:
     - type: Transform
       pos: 29.5,-75.5
       parent: 2
-  - uid: 9092
+  - uid: 10421
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 63.5,-39.5
+      pos: 50.5,-36.5
       parent: 2
-  - uid: 10410
+  - uid: 10424
     components:
     - type: Transform
-      pos: 54.5,-55.5
+      pos: 51.5,-36.5
       parent: 2
-  - uid: 14248
+  - uid: 12942
     components:
     - type: Transform
-      pos: 59.5,-46.5
+      rot: 3.141592653589793 rad
+      pos: 51.5,-38.5
+      parent: 2
+  - uid: 12943
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 50.5,-38.5
       parent: 2
   - uid: 15610
     components:
@@ -41475,34 +42573,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -28.5,-67.5
       parent: 2
-  - uid: 17515
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 72.5,-43.5
-      parent: 2
-  - uid: 17516
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 71.5,-43.5
-      parent: 2
-  - uid: 17517
-    components:
-    - type: Transform
-      pos: 72.5,-41.5
-      parent: 2
-  - uid: 17518
-    components:
-    - type: Transform
-      pos: 71.5,-41.5
-      parent: 2
-  - uid: 17748
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 68.5,-50.5
-      parent: 2
   - uid: 18595
     components:
     - type: Transform
@@ -41521,26 +42591,38 @@ entities:
       rot: 3.141592653589793 rad
       pos: 17.5,-72.5
       parent: 2
-  - uid: 2293
+  - uid: 3927
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 28.352335,-27.985746
+      pos: 32.5,-15.5
+      parent: 2
+  - uid: 3936
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 35.5,-12.5
+      parent: 2
+  - uid: 4626
+    components:
+    - type: Transform
+      pos: 30.5,-15.5
       parent: 2
   - uid: 6281
     components:
     - type: Transform
       pos: 21.5,-73.5
       parent: 2
-  - uid: 7766
+  - uid: 7769
     components:
     - type: Transform
-      pos: 30.5,-16.5
+      rot: 3.141592653589793 rad
+      pos: 34.5,-12.5
       parent: 2
-  - uid: 7782
+  - uid: 10414
     components:
     - type: Transform
-      pos: 28.5,-16.5
+      rot: -1.5707963267948966 rad
+      pos: 28.41108,-29.119923
       parent: 2
 - proto: ChairPilotSeat
   entities:
@@ -41588,21 +42670,16 @@ entities:
       parent: 2
 - proto: ChairXeno
   entities:
-  - uid: 3386
-    components:
-    - type: Transform
-      pos: 59.5,-62.5
-      parent: 2
   - uid: 5085
     components:
     - type: Transform
       pos: -22.5,-21.5
       parent: 2
-  - uid: 5485
+  - uid: 5419
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 66.5,-70.5
+      pos: 67.5,-63.5
       parent: 2
   - uid: 5544
     components:
@@ -41634,11 +42711,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 41.5,-77.5
       parent: 2
-  - uid: 6901
-    components:
-    - type: Transform
-      pos: 66.5,-68.5
-      parent: 2
   - uid: 7008
     components:
     - type: Transform
@@ -41668,18 +42740,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -51.5,-37.5
       parent: 2
-  - uid: 8359
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 38.5,-28.5
-      parent: 2
-  - uid: 8817
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 58.5,-62.5
-      parent: 2
   - uid: 9201
     components:
     - type: Transform
@@ -41698,6 +42758,28 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -53.5,-45.5
       parent: 2
+  - uid: 15433
+    components:
+    - type: Transform
+      pos: 80.5,-63.5
+      parent: 2
+  - uid: 15434
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 80.5,-65.5
+      parent: 2
+  - uid: 15484
+    components:
+    - type: Transform
+      pos: 62.5,-59.5
+      parent: 2
+  - uid: 15633
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-78.5
+      parent: 2
   - uid: 19198
     components:
     - type: Transform
@@ -41705,14 +42787,11 @@ entities:
       parent: 2
 - proto: CheapLighter
   entities:
-  - uid: 18268
+  - uid: 3613
     components:
     - type: Transform
-      pos: 47.771713,-26.742779
+      pos: 45.30708,-27.668627
       parent: 2
-    - type: CollisionWake
-      enabled: False
-    - type: Conveyed
 - proto: CheapRollerBed
   entities:
   - uid: 2888
@@ -41720,11 +42799,6 @@ entities:
     - type: Transform
       pos: 4.5,-19.5
       parent: 2
-  - uid: 17880
-    components:
-    - type: Transform
-      pos: 36.237247,-17.218662
-      parent: 2
 - proto: ChemDispenser
   entities:
   - uid: 4427
@@ -41749,12 +42823,31 @@ entities:
   - uid: 699
     components:
     - type: Transform
-      pos: 60.3243,-32.26429
+      pos: 50.284008,-34.290295
       parent: 2
   - uid: 14384
     components:
     - type: Transform
-      pos: 60.46319,-32.208694
+      pos: 50.431988,-34.165295
+      parent: 2
+- proto: ChemistryBottleRobustHarvest
+  entities:
+  - uid: 16200
+    components:
+    - type: Transform
+      pos: 3.406568,-79.26463
+      parent: 2
+- proto: ChemistryEmptyBottle01
+  entities:
+  - uid: 3159
+    components:
+    - type: Transform
+      pos: 66.35149,-62.94295
+      parent: 2
+  - uid: 7197
+    components:
+    - type: Transform
+      pos: 66.50148,-63.087673
       parent: 2
 - proto: ChemistryHotplate
   entities:
@@ -41819,16 +42912,6 @@ entities:
       parent: 2
 - proto: CigaretteSpent
   entities:
-  - uid: 9354
-    components:
-    - type: Transform
-      pos: 68.70699,-38.075283
-      parent: 2
-  - uid: 10268
-    components:
-    - type: Transform
-      pos: 68.09442,-38.40559
-      parent: 2
   - uid: 19660
     components:
     - type: Transform
@@ -42107,10 +43190,10 @@ entities:
       parent: 2
 - proto: ClosetChefFilled
   entities:
-  - uid: 7041
+  - uid: 7203
     components:
     - type: Transform
-      pos: 47.5,-40.5
+      pos: 41.5,-38.5
       parent: 2
 - proto: ClosetEmergencyFilledRandom
   entities:
@@ -42119,11 +43202,21 @@ entities:
     - type: Transform
       pos: 2.5,-64.5
       parent: 2
+  - uid: 1095
+    components:
+    - type: Transform
+      pos: 54.5,-48.5
+      parent: 2
   - uid: 3194
     components:
     - type: Transform
       pos: -33.5,-16.5
       parent: 2
+  - uid: 3769
+    components:
+    - type: Transform
+      pos: 29.5,-34.5
+      parent: 2
   - uid: 5343
     components:
     - type: Transform
@@ -42164,6 +43257,11 @@ entities:
     - type: Transform
       pos: 0.5,-77.5
       parent: 2
+  - uid: 6915
+    components:
+    - type: Transform
+      pos: 49.5,-100.5
+      parent: 2
   - uid: 6919
     components:
     - type: Transform
@@ -42194,20 +43292,25 @@ entities:
     - type: Transform
       pos: 27.5,-77.5
       parent: 2
+  - uid: 8374
+    components:
+    - type: Transform
+      pos: -38.5,-74.5
+      parent: 2
+  - uid: 9764
+    components:
+    - type: Transform
+      pos: 80.5,-66.5
+      parent: 2
   - uid: 10348
     components:
     - type: Transform
       pos: 18.5,-101.5
       parent: 2
-  - uid: 11474
+  - uid: 10674
     components:
     - type: Transform
-      pos: 49.5,-96.5
-      parent: 2
-  - uid: 12927
-    components:
-    - type: Transform
-      pos: 38.5,-22.5
+      pos: 62.5,-63.5
       parent: 2
   - uid: 12971
     components:
@@ -42219,21 +43322,31 @@ entities:
     - type: Transform
       pos: -59.5,-24.5
       parent: 2
-  - uid: 15257
+  - uid: 15408
     components:
     - type: Transform
-      pos: 28.5,-35.5
+      pos: 50.5,-40.5
+      parent: 2
+  - uid: 15425
+    components:
+    - type: Transform
+      pos: 38.5,-25.5
+      parent: 2
+  - uid: 15596
+    components:
+    - type: Transform
+      pos: 47.5,-31.5
+      parent: 2
+  - uid: 16038
+    components:
+    - type: Transform
+      pos: 9.5,-37.5
       parent: 2
   - uid: 17038
     components:
     - type: Transform
       pos: -12.5,-80.5
       parent: 2
-  - uid: 17352
-    components:
-    - type: Transform
-      pos: -43.5,-76.5
-      parent: 2
   - uid: 17396
     components:
     - type: Transform
@@ -42278,6 +43391,11 @@ entities:
     - type: Transform
       pos: -58.5,-24.5
       parent: 2
+  - uid: 3676
+    components:
+    - type: Transform
+      pos: 35.5,-34.5
+      parent: 2
   - uid: 4552
     components:
     - type: Transform
@@ -42293,6 +43411,11 @@ entities:
     - type: Transform
       pos: 83.5,-23.5
       parent: 2
+  - uid: 7786
+    components:
+    - type: Transform
+      pos: 37.5,-25.5
+      parent: 2
   - uid: 8210
     components:
     - type: Transform
@@ -42303,11 +43426,6 @@ entities:
     - type: Transform
       pos: -24.5,-41.5
       parent: 2
-  - uid: 16287
-    components:
-    - type: Transform
-      pos: 38.5,-37.5
-      parent: 2
   - uid: 17100
     components:
     - type: Transform
@@ -42370,20 +43488,45 @@ entities:
     - type: Transform
       pos: 18.5,-91.5
       parent: 2
+  - uid: 10755
+    components:
+    - type: Transform
+      pos: 35.5,-75.5
+      parent: 2
+  - uid: 10812
+    components:
+    - type: Transform
+      pos: 54.5,-49.5
+      parent: 2
   - uid: 12147
     components:
     - type: Transform
       pos: 1.5,-64.5
       parent: 2
+  - uid: 15410
+    components:
+    - type: Transform
+      pos: 49.5,-40.5
+      parent: 2
+  - uid: 15412
+    components:
+    - type: Transform
+      pos: 39.5,-25.5
+      parent: 2
   - uid: 15640
     components:
     - type: Transform
       pos: 48.5,-63.5
       parent: 2
-  - uid: 17246
+  - uid: 16039
     components:
     - type: Transform
-      pos: 36.5,-20.5
+      pos: 10.5,-37.5
+      parent: 2
+  - uid: 16050
+    components:
+    - type: Transform
+      pos: 36.5,-75.5
       parent: 2
   - uid: 17296
     components:
@@ -42425,6 +43568,11 @@ entities:
     - type: Transform
       pos: 19.5,-33.5
       parent: 2
+  - uid: 20050
+    components:
+    - type: Transform
+      pos: 74.5,-70.5
+      parent: 2
 - proto: ClosetJanitorFilled
   entities:
   - uid: 5620
@@ -42439,50 +43587,62 @@ entities:
     - type: Transform
       pos: -7.5,-50.5
       parent: 2
-- proto: ClosetL3VirologyFilled
+- proto: ClosetL3SecurityFilled
   entities:
-  - uid: 7779
-    components:
-    - type: Transform
-      pos: 31.5,-20.5
-      parent: 2
   - uid: 7780
     components:
     - type: Transform
-      pos: 31.5,-19.5
+      pos: 66.5,-18.5
+      parent: 2
+  - uid: 9292
+    components:
+    - type: Transform
+      pos: 66.5,-17.5
+      parent: 2
+- proto: ClosetL3VirologyFilled
+  entities:
+  - uid: 3634
+    components:
+    - type: Transform
+      pos: 36.5,-17.5
+      parent: 2
+  - uid: 4219
+    components:
+    - type: Transform
+      pos: 36.5,-14.5
+      parent: 2
+  - uid: 4220
+    components:
+    - type: Transform
+      pos: 36.5,-18.5
       parent: 2
 - proto: ClosetMaintenanceFilledRandom
   entities:
-  - uid: 4345
+  - uid: 919
     components:
     - type: Transform
-      pos: 66.5,-54.5
+      pos: 37.5,-30.5
+      parent: 2
+  - uid: 3006
+    components:
+    - type: Transform
+      pos: 53.5,-26.5
+      parent: 2
+  - uid: 6013
+    components:
+    - type: Transform
+      pos: 78.5,-30.5
+      parent: 2
+  - uid: 7390
+    components:
+    - type: Transform
+      pos: 75.5,-28.5
       parent: 2
   - uid: 7629
     components:
     - type: Transform
       pos: -53.5,-27.5
       parent: 2
-  - uid: 7705
-    components:
-    - type: Transform
-      pos: 71.5,-26.5
-      parent: 2
-  - uid: 7708
-    components:
-    - type: Transform
-      pos: 74.5,-34.5
-      parent: 2
-  - uid: 8043
-    components:
-    - type: Transform
-      pos: 44.5,-38.5
-      parent: 2
-  - uid: 8046
-    components:
-    - type: Transform
-      pos: 37.5,-24.5
-      parent: 2
   - uid: 8049
     components:
     - type: Transform
@@ -42513,16 +43673,6 @@ entities:
     - type: Transform
       pos: -54.5,-65.5
       parent: 2
-  - uid: 8057
-    components:
-    - type: Transform
-      pos: -38.5,-74.5
-      parent: 2
-  - uid: 8058
-    components:
-    - type: Transform
-      pos: -35.5,-80.5
-      parent: 2
   - uid: 8062
     components:
     - type: Transform
@@ -42548,50 +43698,55 @@ entities:
     - type: Transform
       pos: -46.5,-28.5
       parent: 2
+  - uid: 8373
+    components:
+    - type: Transform
+      pos: -43.5,-76.5
+      parent: 2
   - uid: 8380
     components:
     - type: Transform
       pos: -25.5,-53.5
       parent: 2
-  - uid: 8584
+  - uid: 8504
     components:
     - type: Transform
-      pos: 57.5,-73.5
+      pos: 64.5,-70.5
       parent: 2
-  - uid: 10334
+  - uid: 10672
     components:
     - type: Transform
-      pos: 55.5,-65.5
+      pos: 75.5,-37.5
       parent: 2
-  - uid: 10788
+  - uid: 10673
     components:
     - type: Transform
-      pos: 77.5,-39.5
+      pos: 48.5,-48.5
       parent: 2
-  - uid: 12703
+  - uid: 10748
     components:
     - type: Transform
-      pos: 74.5,-54.5
+      pos: 1.5,-61.5
       parent: 2
-  - uid: 12991
+  - uid: 13158
     components:
     - type: Transform
-      pos: 47.5,-32.5
+      pos: 72.5,-36.5
       parent: 2
   - uid: 13905
     components:
     - type: Transform
       pos: 73.5,-21.5
       parent: 2
-  - uid: 14296
+  - uid: 14242
     components:
     - type: Transform
-      pos: 74.5,-27.5
+      pos: 56.5,-74.5
       parent: 2
-  - uid: 16268
+  - uid: 15477
     components:
     - type: Transform
-      pos: 50.5,-42.5
+      pos: 69.5,-68.5
       parent: 2
   - uid: 17044
     components:
@@ -42613,16 +43768,6 @@ entities:
     - type: Transform
       pos: 3.5,-71.5
       parent: 2
-  - uid: 17887
-    components:
-    - type: Transform
-      pos: 2.5,-59.5
-      parent: 2
-  - uid: 17995
-    components:
-    - type: Transform
-      pos: 72.5,-39.5
-      parent: 2
   - uid: 18250
     components:
     - type: Transform
@@ -42645,11 +43790,6 @@ entities:
     - type: Transform
       pos: -48.5,-55.5
       parent: 2
-  - uid: 7800
-    components:
-    - type: Transform
-      pos: 31.5,-21.5
-      parent: 2
   - uid: 8201
     components:
     - type: Transform
@@ -42660,6 +43800,11 @@ entities:
     - type: Transform
       pos: -45.5,-12.5
       parent: 2
+  - uid: 10776
+    components:
+    - type: Transform
+      pos: 36.5,-20.5
+      parent: 2
   - uid: 17043
     components:
     - type: Transform
@@ -42670,11 +43815,6 @@ entities:
     - type: Transform
       pos: -9.5,-79.5
       parent: 2
-  - uid: 17958
-    components:
-    - type: Transform
-      pos: 35.5,-20.5
-      parent: 2
   - uid: 19389
     components:
     - type: Transform
@@ -42692,11 +43832,40 @@ entities:
     - type: Transform
       pos: -11.5,-74.5
       parent: 2
-  - uid: 19225
+- proto: ClosetWallAtmospherics
+  entities:
+  - uid: 20005
     components:
     - type: Transform
-      pos: 48.5,-30.5
+      pos: -53.5,-24.5
       parent: 2
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 20006
+          - 20007
+          - 20008
 - proto: ClosetWallBlue
   entities:
   - uid: 5967
@@ -42759,25 +43928,17 @@ entities:
           - 6069
           - 6068
           - 6075
-- proto: ClosetWallMaintenanceFilledRandom
-  entities:
-  - uid: 4047
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 64.5,-67.5
-      parent: 2
 - proto: ClothingBackpack
   entities:
   - uid: 12849
     components:
     - type: Transform
-      pos: 66.59503,-17.370646
+      pos: 66.39443,-29.194597
       parent: 2
   - uid: 14243
     components:
     - type: Transform
-      pos: 66.62203,-17.271994
+      pos: 66.67568,-29.241472
       parent: 2
 - proto: ClothingBackpackDuffelMedical
   entities:
@@ -42836,7 +43997,14 @@ entities:
   - uid: 5236
     components:
     - type: Transform
-      pos: 17.505743,-17.404364
+      pos: 20.337646,-17.241425
+      parent: 2
+- proto: ClothingBeltPlantFilled
+  entities:
+  - uid: 15598
+    components:
+    - type: Transform
+      pos: 2.510798,-79.082664
       parent: 2
 - proto: ClothingBeltUtilityEngineering
   entities:
@@ -42874,12 +44042,12 @@ entities:
   - uid: 6987
     components:
     - type: Transform
-      pos: 51.629555,-99.27984
+      pos: 52.425804,-99.20869
       parent: 2
   - uid: 6988
     components:
     - type: Transform
-      pos: 52.44282,-99.49868
+      pos: 52.83198,-99.4205
       parent: 2
   - uid: 7958
     components:
@@ -42912,6 +44080,18 @@ entities:
     - type: Transform
       pos: -9.340807,-26.550825
       parent: 2
+- proto: ClothingEyesHudMedical
+  entities:
+  - uid: 7754
+    components:
+    - type: Transform
+      pos: 20.337646,-17.5383
+      parent: 2
+  - uid: 7798
+    components:
+    - type: Transform
+      pos: 20.634521,-17.44455
+      parent: 2
 - proto: ClothingHandsGlovesBoxingBlue
   entities:
   - uid: 7687
@@ -42976,15 +44156,10 @@ entities:
     - type: Transform
       pos: 9.506972,-24.333637
       parent: 2
-  - uid: 7786
-    components:
-    - type: Transform
-      pos: 27.561043,-15.543834
-      parent: 2
   - uid: 16849
     components:
     - type: Transform
-      pos: 27.414835,-27.933626
+      pos: 27.47358,-28.431944
       parent: 2
 - proto: ClothingHeadBandMerc
   entities:
@@ -42993,13 +44168,6 @@ entities:
     - type: Transform
       pos: -56.602005,-29.002491
       parent: 2
-- proto: ClothingHeadBandSkull
-  entities:
-  - uid: 17950
-    components:
-    - type: Transform
-      pos: 35.406235,-18.407043
-      parent: 2
 - proto: ClothingHeadFishCap
   entities:
   - uid: 16710
@@ -43025,10 +44193,10 @@ entities:
       parent: 2
 - proto: ClothingHeadHatBeretMerc
   entities:
-  - uid: 11757
+  - uid: 19171
     components:
     - type: Transform
-      pos: 49.279545,-25.185894
+      pos: 40.35338,-25.259914
       parent: 2
 - proto: ClothingHeadHatBrownFlatcap
   entities:
@@ -43063,6 +44231,13 @@ entities:
     - type: Transform
       pos: -42.64476,-62.24417
       parent: 2
+- proto: ClothingHeadHatChef
+  entities:
+  - uid: 19742
+    components:
+    - type: Transform
+      pos: 42.692513,-34.382397
+      parent: 2
 - proto: ClothingHeadHatCone
   entities:
   - uid: 2336
@@ -43100,13 +44275,6 @@ entities:
     - type: Transform
       pos: 11.390965,-79.291046
       parent: 2
-- proto: ClothingHeadHatCowboyRed
-  entities:
-  - uid: 19230
-    components:
-    - type: Transform
-      pos: 46.667255,-29.220667
-      parent: 2
 - proto: ClothingHeadHatFedoraBrown
   entities:
   - uid: 6070
@@ -43156,7 +44324,14 @@ entities:
   - uid: 17525
     components:
     - type: Transform
-      pos: 83.5435,-72.335686
+      pos: 83.39368,-72.298546
+      parent: 2
+- proto: ClothingHeadHatPaper
+  entities:
+  - uid: 16035
+    components:
+    - type: Transform
+      pos: 61.497665,-57.252792
       parent: 2
 - proto: ClothingHeadHatPartyGreen
   entities:
@@ -43207,19 +44382,12 @@ entities:
     - type: Transform
       pos: -12.630263,-28.354128
       parent: 2
-- proto: ClothingHeadHatWeldingMaskFlame
-  entities:
-  - uid: 3302
-    components:
-    - type: Transform
-      pos: 53.542313,-29.537529
-      parent: 2
 - proto: ClothingHeadHatWeldingMaskFlameBlue
   entities:
-  - uid: 19226
+  - uid: 15457
     components:
     - type: Transform
-      pos: 48.679688,-29.271996
+      pos: 67.39528,-68.335495
       parent: 2
 - proto: ClothingHeadHatYellowsoftFlipped
   entities:
@@ -43230,6 +44398,12 @@ entities:
       parent: 2
 - proto: ClothingHeadHelmetEVA
   entities:
+  - uid: 15545
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 38.77258,-19.393414
+      parent: 2
   - uid: 16569
     components:
     - type: Transform
@@ -43284,12 +44458,12 @@ entities:
   - uid: 11848
     components:
     - type: Transform
-      pos: 67.23555,-31.516634
+      pos: 68.52531,-32.620815
       parent: 2
   - uid: 14558
     components:
     - type: Transform
-      pos: 67.531845,-31.618555
+      pos: 68.27531,-32.564243
       parent: 2
 - proto: ClothingHeadHelmetWizardHelm
   entities:
@@ -43336,7 +44510,7 @@ entities:
     - type: MetaData
       desc: Something about this particular mime mask makes you feel like you should run amok across the station...
     - type: Transform
-      pos: 83.44597,-72.587036
+      pos: 83.56729,-72.486176
       parent: 2
 - proto: ClothingMultipleHeadphones
   entities:
@@ -43361,27 +44535,27 @@ entities:
       parent: 2
 - proto: ClothingNeckCloakAro
   entities:
-  - uid: 17334
+  - uid: 8150
     components:
     - type: Transform
-      pos: 37.522045,-26.442745
+      pos: 39.571434,-28.464401
       parent: 2
     - type: CollisionWake
       enabled: False
     - type: Conveyed
 - proto: ClothingNeckCloakBi
   entities:
-  - uid: 17329
+  - uid: 6921
     components:
     - type: Transform
-      pos: 56.517162,-96.50428
+      pos: 57.523323,-96.46691
       parent: 2
 - proto: ClothingNeckCloakEnby
   entities:
-  - uid: 17333
+  - uid: 13645
     components:
     - type: Transform
-      pos: 80.59616,-29.47204
+      pos: 79.02105,-25.344301
       parent: 2
 - proto: ClothingNeckCloakGay
   entities:
@@ -43392,10 +44566,10 @@ entities:
       parent: 2
 - proto: ClothingNeckCloakIntersex
   entities:
-  - uid: 17327
+  - uid: 7509
     components:
     - type: Transform
-      pos: 103.49843,-45.428753
+      pos: 105.5457,-45.44423
       parent: 2
 - proto: ClothingNeckCloakLesbian
   entities:
@@ -43413,10 +44587,10 @@ entities:
       parent: 2
 - proto: ClothingNeckCloakPan
   entities:
-  - uid: 17326
+  - uid: 11982
     components:
     - type: Transform
-      pos: 46.512062,-41.474453
+      pos: 44.485863,-38.413647
       parent: 2
 - proto: ClothingNeckCloakPirateCap
   entities:
@@ -43458,13 +44632,6 @@ entities:
     - type: Transform
       pos: -24.46909,-39.37975
       parent: 2
-- proto: ClothingOuterApron
-  entities:
-  - uid: 19224
-    components:
-    - type: Transform
-      pos: 48.45174,-29.451004
-      parent: 2
 - proto: ClothingOuterApronChef
   entities:
   - uid: 13574
@@ -43477,48 +44644,41 @@ entities:
   - uid: 3326
     components:
     - type: Transform
-      pos: 62.66438,-56.32613
+      pos: 62.646404,-48.329308
       parent: 2
   - uid: 12928
     components:
     - type: Transform
-      pos: 62.516026,-56.163982
+      pos: 62.771404,-48.454395
       parent: 2
   - uid: 18163
     components:
     - type: Transform
-      pos: 62.738453,-56.48828
+      pos: 62.479736,-48.235493
       parent: 2
 - proto: ClothingOuterArmorReflective
   entities:
   - uid: 13210
     components:
     - type: Transform
-      pos: 62.456047,-56.506813
+      pos: 62.485695,-48.574135
       parent: 2
   - uid: 13547
     components:
     - type: Transform
-      pos: 62.19195,-56.32613
+      pos: 62.256527,-48.454395
       parent: 2
 - proto: ClothingOuterArmorRiot
   entities:
   - uid: 13853
     components:
     - type: Transform
-      pos: 67.58277,-31.423977
+      pos: 68.61906,-32.512123
       parent: 2
   - uid: 13944
     components:
     - type: Transform
-      pos: 67.318886,-31.368382
-      parent: 2
-- proto: ClothingOuterCoatExpensive
-  entities:
-  - uid: 19228
-    components:
-    - type: Transform
-      pos: 46.408375,-29.34115
+      pos: 68.40031,-32.439156
       parent: 2
 - proto: ClothingOuterCoatJensen
   entities:
@@ -43537,7 +44697,7 @@ entities:
   - uid: 16581
     components:
     - type: Transform
-      pos: 19.3277,-17.56891
+      pos: 19.48025,-17.483467
       parent: 2
   - uid: 19195
     components:
@@ -43625,14 +44785,14 @@ entities:
   - uid: 16579
     components:
     - type: Transform
-      pos: 18.963116,-17.370857
+      pos: 19.0115,-17.311592
       parent: 2
 - proto: ClothingOuterJacketChef
   entities:
-  - uid: 17121
+  - uid: 11128
     components:
     - type: Transform
-      pos: -36.48301,-78.397415
+      pos: -40.301754,-80.29031
       parent: 2
 - proto: ClothingOuterNunRobe
   entities:
@@ -43686,13 +44846,6 @@ entities:
     - type: Transform
       pos: -5.464688,-51.46298
       parent: 2
-- proto: ClothingShoesBootsCowboyFancy
-  entities:
-  - uid: 19229
-    components:
-    - type: Transform
-      pos: 46.68288,-29.752285
-      parent: 2
 - proto: ClothingShoesBootsMagSci
   entities:
   - uid: 203
@@ -43712,10 +44865,10 @@ entities:
       parent: 2
 - proto: ClothingShoesBootsWinterWeb
   entities:
-  - uid: 15425
+  - uid: 3569
     components:
     - type: Transform
-      pos: 71.44248,-48.105747
+      pos: 71.453255,-53.02562
       parent: 2
 - proto: ClothingShoesBootsWork
   entities:
@@ -43741,14 +44894,14 @@ entities:
   - uid: 17526
     components:
     - type: Transform
-      pos: 83.44124,-72.75265
+      pos: 83.45022,-72.70801
       parent: 2
 - proto: ClothingShoesSlippers
   entities:
   - uid: 16481
     components:
     - type: Transform
-      pos: 43.431202,-16.162926
+      pos: 42.48139,-16.580917
       parent: 2
   - uid: 17390
     components:
@@ -43786,12 +44939,12 @@ entities:
   - uid: 12848
     components:
     - type: Transform
-      pos: 66.41339,-17.527605
+      pos: 66.25381,-29.431435
       parent: 2
   - uid: 18042
     components:
     - type: Transform
-      pos: 66.45755,-17.432138
+      pos: 66.51943,-29.493935
       parent: 2
 - proto: ClothingUniformJumpskirtLawyerBlack
   entities:
@@ -43822,19 +44975,19 @@ entities:
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 68.67686,-48.527916
+      pos: 68.50647,-53.550026
       parent: 2
 - proto: ClothingUniformJumpsuitColorGrey
   entities:
   - uid: 7216
     components:
     - type: Transform
-      pos: 66.257866,-17.398647
+      pos: 66.75381,-29.444597
       parent: 2
   - uid: 7217
     components:
     - type: Transform
-      pos: 66.26817,-17.333786
+      pos: 66.44131,-29.366472
       parent: 2
 - proto: ClothingUniformJumpsuitColorMaroon
   entities:
@@ -43895,15 +45048,27 @@ entities:
   - uid: 7173
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 68.37998,-48.309013
+      rot: -1.5707965016404568 rad
+      pos: 68.14163,-53.268776
       parent: 2
 - proto: Cobweb1
   entities:
-  - uid: 3719
+  - uid: 2933
     components:
     - type: Transform
-      pos: 40.5,-32.5
+      rot: -1.5707963267948966 rad
+      pos: 71.5,-51.5
+      parent: 2
+  - uid: 3710
+    components:
+    - type: Transform
+      pos: 77.5,-69.5
+      parent: 2
+  - uid: 7574
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 74.5,-39.5
       parent: 2
   - uid: 8220
     components:
@@ -43922,18 +45087,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -56.5,-25.5
       parent: 2
-  - uid: 13798
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 67.5,-48.5
-      parent: 2
-  - uid: 16509
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 75.5,-38.5
-      parent: 2
   - uid: 17713
     components:
     - type: Transform
@@ -43952,29 +45105,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 42.5,-77.5
       parent: 2
-  - uid: 17717
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 77.5,-69.5
-      parent: 2
   - uid: 17965
     components:
     - type: Transform
       pos: 72.5,-25.5
       parent: 2
-  - uid: 18218
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 44.5,-35.5
-      parent: 2
-  - uid: 18221
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 46.5,-33.5
-      parent: 2
   - uid: 18909
     components:
     - type: Transform
@@ -43983,27 +45118,27 @@ entities:
       parent: 2
 - proto: Cobweb2
   entities:
+  - uid: 896
+    components:
+    - type: Transform
+      pos: 74.5,-35.5
+      parent: 2
+  - uid: 8113
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 76.5,-31.5
+      parent: 2
   - uid: 8222
     components:
     - type: Transform
       pos: -44.5,-22.5
       parent: 2
-  - uid: 13799
-    components:
-    - type: Transform
-      pos: 71.5,-45.5
-      parent: 2
-  - uid: 16497
+  - uid: 12989
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 71.5,-29.5
-      parent: 2
-  - uid: 16506
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 76.5,-30.5
+      pos: 72.5,-29.5
       parent: 2
   - uid: 16507
     components:
@@ -44023,30 +45158,26 @@ entities:
       rot: 3.141592653589793 rad
       pos: -40.5,-80.5
       parent: 2
-  - uid: 17722
-    components:
-    - type: Transform
-      pos: 67.5,-65.5
-      parent: 2
-  - uid: 18220
-    components:
-    - type: Transform
-      pos: 40.5,-35.5
-      parent: 2
 - proto: ComfyChair
   entities:
+  - uid: 3465
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 54.5,-55.5
+      parent: 2
+  - uid: 4177
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 68.5,-51.5
+      parent: 2
   - uid: 4995
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 24.5,-90.5
       parent: 2
-  - uid: 6289
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 70.5,-50.5
-      parent: 2
   - uid: 6724
     components:
     - type: Transform
@@ -44109,41 +45240,42 @@ entities:
     - type: Transform
       pos: 34.5,-48.5
       parent: 2
-  - uid: 7734
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 54.5,-57.5
-      parent: 2
-  - uid: 8089
-    components:
-    - type: Transform
-      pos: 75.5,-63.5
-      parent: 2
-  - uid: 8090
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 75.5,-65.5
-      parent: 2
-  - uid: 17170
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 53.5,-57.5
-      parent: 2
-  - uid: 17683
+  - uid: 7110
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 68.5,-46.5
+      pos: 54.5,-56.5
+      parent: 2
+  - uid: 7384
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 60.5,-73.5
+      parent: 2
+  - uid: 7385
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 58.5,-73.5
+      parent: 2
+  - uid: 7388
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 58.5,-76.5
+      parent: 2
+  - uid: 10250
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 71.5,-46.5
       parent: 2
 - proto: CommandmentCircuitBoard
   entities:
   - uid: 18626
     components:
     - type: Transform
-      pos: 76.992035,-47.50165
+      pos: 80.45743,-47.240086
       parent: 2
 - proto: CommsComputerCircuitboard
   entities:
@@ -44166,18 +45298,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -31.5,-60.5
       parent: 2
+  - uid: 7526
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 86.5,-47.5
+      parent: 2
   - uid: 18594
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 27.5,-71.5
       parent: 2
-  - uid: 19128
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 84.5,-47.5
-      parent: 2
 - proto: ComputerAnalysisConsole
   entities:
   - uid: 5049
@@ -44281,11 +45413,10 @@ entities:
       parent: 2
 - proto: ComputerCargoOrdersSecurity
   entities:
-  - uid: 10561
+  - uid: 9332
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 62.5,-33.5
+      pos: 66.5,-37.5
       parent: 2
 - proto: ComputerCargoOrdersService
   entities:
@@ -44316,12 +45447,6 @@ entities:
       parent: 2
 - proto: ComputerCrewMonitoring
   entities:
-  - uid: 3543
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 58.5,-46.5
-      parent: 2
   - uid: 5109
     components:
     - type: Transform
@@ -44334,6 +45459,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -53.5,-40.5
       parent: 2
+  - uid: 6370
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 57.5,-39.5
+      parent: 2
+  - uid: 12821
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-58.5
+      parent: 2
 - proto: ComputerCriminalRecords
   entities:
   - uid: 373
@@ -44342,11 +45479,16 @@ entities:
       rot: 3.141592653589793 rad
       pos: -2.5,-14.5
       parent: 2
-  - uid: 3547
+  - uid: 4212
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 62.5,-39.5
+      pos: 68.5,-50.5
+      parent: 2
+  - uid: 5202
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 64.5,-44.5
       parent: 2
   - uid: 5542
     components:
@@ -44360,35 +45502,38 @@ entities:
       rot: 3.141592653589793 rad
       pos: 8.5,-50.5
       parent: 2
-  - uid: 10248
+  - uid: 7267
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 60.5,-46.5
+      pos: 59.5,-39.5
       parent: 2
-  - uid: 15445
+  - uid: 8558
     components:
     - type: Transform
-      pos: 58.5,-26.5
+      pos: 59.5,-26.5
       parent: 2
-  - uid: 16106
-    components:
-    - type: Transform
-      pos: 68.5,-45.5
-      parent: 2
-  - uid: 18166
+  - uid: 10244
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 72.5,-50.5
+      pos: 73.5,-46.5
+      parent: 2
+- proto: ComputerFrame
+  entities:
+  - uid: 7207
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -39.5,-80.5
       parent: 2
 - proto: ComputerFundingAllocation
   entities:
-  - uid: 19368
+  - uid: 15385
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 15.5,-58.5
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-57.5
       parent: 2
 - proto: ComputerId
   entities:
@@ -44444,17 +45589,17 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -53.5,-50.5
       parent: 2
+  - uid: 7527
+    components:
+    - type: Transform
+      pos: 86.5,-43.5
+      parent: 2
   - uid: 10232
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -31.5,-61.5
       parent: 2
-  - uid: 18834
-    components:
-    - type: Transform
-      pos: 84.5,-43.5
-      parent: 2
 - proto: ComputerRadar
   entities:
   - uid: 5514
@@ -44463,11 +45608,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -54.5,-46.5
       parent: 2
-  - uid: 6912
+  - uid: 17228
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 54.5,-101.5
+      rot: -1.5707963267948966 rad
+      pos: 53.5,-103.5
       parent: 2
 - proto: ComputerResearchAndDevelopment
   entities:
@@ -44493,18 +45638,18 @@ entities:
       parent: 2
 - proto: ComputerSalvageExpedition
   entities:
-  - uid: 6904
-    components:
-    - type: Transform
-      pos: 52.5,-96.5
-      parent: 2
-- proto: ComputerSalvageJobBoard
-  entities:
-  - uid: 561
+  - uid: 6894
     components:
     - type: Transform
       pos: 53.5,-96.5
       parent: 2
+- proto: ComputerSalvageJobBoard
+  entities:
+  - uid: 6924
+    components:
+    - type: Transform
+      pos: 54.5,-96.5
+      parent: 2
 - proto: ComputerShuttleCargo
   entities:
   - uid: 6714
@@ -44544,42 +45689,34 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -57.5,-68.5
       parent: 2
-- proto: ComputerStationRecords
-  entities:
-  - uid: 15486
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 57.5,-29.5
-      parent: 2
 - proto: ComputerSurveillanceCameraMonitor
   entities:
-  - uid: 374
+  - uid: 1158
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 60.5,-45.5
-      parent: 2
-  - uid: 7040
-    components:
-    - type: Transform
-      pos: 69.5,-45.5
+      pos: 69.5,-50.5
       parent: 2
   - uid: 8248
     components:
     - type: Transform
       pos: -51.5,-36.5
       parent: 2
+  - uid: 9225
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 59.5,-38.5
+      parent: 2
+  - uid: 9288
+    components:
+    - type: Transform
+      pos: 58.5,-26.5
+      parent: 2
   - uid: 13269
     components:
     - type: Transform
       pos: 7.5,-48.5
       parent: 2
-  - uid: 15489
-    components:
-    - type: Transform
-      pos: 59.5,-26.5
-      parent: 2
 - proto: ComputerTelevision
   entities:
   - uid: 5478
@@ -44652,6 +45789,18 @@ entities:
       parent: 2
 - proto: ConveyorBelt
   entities:
+  - uid: 1073
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 41.5,-27.5
+      parent: 2
+  - uid: 1140
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 42.5,-27.5
+      parent: 2
   - uid: 2500
     components:
     - type: Transform
@@ -44664,11 +45813,33 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 18.5,-84.5
       parent: 2
-  - uid: 3387
+  - uid: 2883
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 58.5,-81.5
+      pos: 76.5,-67.5
+      parent: 2
+  - uid: 3168
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 46.5,-29.5
+      parent: 2
+  - uid: 3314
+    components:
+    - type: Transform
+      pos: 72.5,-68.5
+      parent: 2
+  - uid: 3530
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 45.5,-26.5
+      parent: 2
+  - uid: 3531
+    components:
+    - type: Transform
+      pos: 46.5,-26.5
       parent: 2
   - uid: 3681
     components:
@@ -44676,17 +45847,44 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 20.5,-90.5
       parent: 2
-  - uid: 3792
+  - uid: 3717
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 43.5,-26.5
+      pos: 45.5,-30.5
       parent: 2
-  - uid: 3816
+  - uid: 3718
+    components:
+    - type: Transform
+      pos: 45.5,-29.5
+      parent: 2
+  - uid: 3719
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 42.5,-26.5
+      pos: 39.5,-28.5
+      parent: 2
+  - uid: 3720
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,-28.5
+      parent: 2
+  - uid: 3721
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 40.5,-28.5
+      parent: 2
+  - uid: 3725
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 34.5,-28.5
+      parent: 2
+  - uid: 3729
+    components:
+    - type: Transform
+      pos: 46.5,-27.5
       parent: 2
   - uid: 4946
     components:
@@ -44934,324 +46132,55 @@ entities:
     - type: Transform
       pos: 19.5,-84.5
       parent: 2
-  - uid: 5296
+  - uid: 5374
+    components:
+    - type: Transform
+      pos: 72.5,-73.5
+      parent: 2
+  - uid: 6139
+    components:
+    - type: Transform
+      pos: 46.5,-28.5
+      parent: 2
+  - uid: 6388
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 35.5,-26.5
+      pos: 35.5,-28.5
       parent: 2
-  - uid: 5297
+  - uid: 6396
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 36.5,-26.5
+      pos: 37.5,-28.5
       parent: 2
-  - uid: 5298
+  - uid: 6397
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 37.5,-26.5
+      pos: 43.5,-26.5
       parent: 2
-  - uid: 5299
+  - uid: 6400
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 38.5,-26.5
+      pos: 40.5,-27.5
       parent: 2
-  - uid: 5300
+  - uid: 6401
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 39.5,-26.5
-      parent: 2
-  - uid: 5301
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 40.5,-26.5
-      parent: 2
-  - uid: 5302
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 41.5,-26.5
-      parent: 2
-  - uid: 5306
-    components:
-    - type: Transform
-      pos: 46.5,-25.5
-      parent: 2
-  - uid: 5307
-    components:
-    - type: Transform
-      pos: 46.5,-26.5
-      parent: 2
-  - uid: 5310
-    components:
-    - type: Transform
-      pos: 55.5,-26.5
-      parent: 2
-  - uid: 5311
-    components:
-    - type: Transform
-      pos: 55.5,-27.5
-      parent: 2
-  - uid: 5312
-    components:
-    - type: Transform
-      pos: 55.5,-28.5
-      parent: 2
-  - uid: 5313
-    components:
-    - type: Transform
-      pos: 55.5,-29.5
-      parent: 2
-  - uid: 5314
-    components:
-    - type: Transform
-      pos: 55.5,-30.5
-      parent: 2
-  - uid: 5315
-    components:
-    - type: Transform
-      pos: 55.5,-31.5
-      parent: 2
-  - uid: 5316
-    components:
-    - type: Transform
-      pos: 52.5,-32.5
-      parent: 2
-  - uid: 5317
-    components:
-    - type: Transform
-      pos: 52.5,-33.5
-      parent: 2
-  - uid: 5318
-    components:
-    - type: Transform
-      pos: 55.5,-34.5
-      parent: 2
-  - uid: 5319
-    components:
-    - type: Transform
-      pos: 55.5,-35.5
-      parent: 2
-  - uid: 5320
-    components:
-    - type: Transform
-      pos: 52.5,-36.5
-      parent: 2
-  - uid: 5321
-    components:
-    - type: Transform
-      pos: 52.5,-37.5
-      parent: 2
-  - uid: 5322
-    components:
-    - type: Transform
-      pos: 55.5,-38.5
-      parent: 2
-  - uid: 5323
-    components:
-    - type: Transform
-      pos: 55.5,-39.5
-      parent: 2
-  - uid: 5324
-    components:
-    - type: Transform
-      pos: 55.5,-40.5
-      parent: 2
-  - uid: 5325
-    components:
-    - type: Transform
-      pos: 55.5,-41.5
-      parent: 2
-  - uid: 5326
-    components:
-    - type: Transform
-      pos: 55.5,-42.5
-      parent: 2
-  - uid: 5327
-    components:
-    - type: Transform
-      pos: 55.5,-43.5
-      parent: 2
-  - uid: 5328
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 55.5,-44.5
-      parent: 2
-  - uid: 5329
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 54.5,-44.5
-      parent: 2
-  - uid: 5330
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 53.5,-44.5
-      parent: 2
-  - uid: 5331
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 51.5,-44.5
-      parent: 2
-  - uid: 5332
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 52.5,-44.5
-      parent: 2
-  - uid: 5333
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 50.5,-44.5
-      parent: 2
-  - uid: 5334
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 49.5,-44.5
-      parent: 2
-  - uid: 5335
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 55.5,-36.5
-      parent: 2
-  - uid: 5336
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 54.5,-36.5
-      parent: 2
-  - uid: 5337
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 53.5,-36.5
-      parent: 2
-  - uid: 5338
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 55.5,-32.5
-      parent: 2
-  - uid: 5339
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 54.5,-32.5
-      parent: 2
-  - uid: 5341
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 46.5,-27.5
-      parent: 2
-  - uid: 5342
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 47.5,-27.5
-      parent: 2
-  - uid: 5344
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
       pos: 44.5,-26.5
       parent: 2
-  - uid: 5350
+  - uid: 6403
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 44.5,-25.5
+      pos: 72.5,-75.5
       parent: 2
-  - uid: 5351
+  - uid: 6412
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 45.5,-25.5
-      parent: 2
-  - uid: 5358
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 52.5,-26.5
-      parent: 2
-  - uid: 5359
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 53.5,-26.5
-      parent: 2
-  - uid: 5360
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 54.5,-26.5
-      parent: 2
-  - uid: 5361
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 52.5,-34.5
-      parent: 2
-  - uid: 5362
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 53.5,-34.5
-      parent: 2
-  - uid: 5363
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 54.5,-34.5
-      parent: 2
-  - uid: 5364
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 52.5,-38.5
-      parent: 2
-  - uid: 5365
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 53.5,-38.5
-      parent: 2
-  - uid: 5366
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 54.5,-38.5
-      parent: 2
-  - uid: 5370
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 48.5,-44.5
-      parent: 2
-  - uid: 6127
-    components:
-    - type: Transform
-      pos: 61.5,-71.5
-      parent: 2
-  - uid: 6128
-    components:
-    - type: Transform
-      pos: 59.5,-73.5
-      parent: 2
-  - uid: 6129
-    components:
-    - type: Transform
-      pos: 59.5,-75.5
+      pos: 72.5,-74.5
       parent: 2
   - uid: 6708
     components:
@@ -45259,145 +46188,152 @@ entities:
       rot: 3.141592653589793 rad
       pos: 20.5,-91.5
       parent: 2
-  - uid: 7132
+  - uid: 6868
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 59.5,-81.5
+      pos: 51.5,-96.5
       parent: 2
-  - uid: 7133
+  - uid: 6918
     components:
     - type: Transform
-      pos: 59.5,-80.5
+      rot: -1.5707963267948966 rad
+      pos: 49.5,-96.5
       parent: 2
-  - uid: 7136
+  - uid: 7408
     components:
     - type: Transform
-      pos: 59.5,-78.5
+      rot: -1.5707963267948966 rad
+      pos: 73.5,-68.5
       parent: 2
-  - uid: 7137
+  - uid: 7571
     components:
     - type: Transform
-      pos: 59.5,-77.5
+      rot: -1.5707963267948966 rad
+      pos: 75.5,-68.5
       parent: 2
-  - uid: 7139
-    components:
-    - type: Transform
-      pos: 59.5,-76.5
-      parent: 2
-  - uid: 7141
-    components:
-    - type: Transform
-      pos: 59.5,-74.5
-      parent: 2
-  - uid: 7142
-    components:
-    - type: Transform
-      pos: 59.5,-72.5
-      parent: 2
-  - uid: 7143
-    components:
-    - type: Transform
-      pos: 62.5,-69.5
-      parent: 2
-  - uid: 7704
+  - uid: 7891
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 60.5,-66.5
+      pos: 36.5,-28.5
       parent: 2
-  - uid: 7706
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-71.5
-      parent: 2
-  - uid: 7727
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 60.5,-72.5
-      parent: 2
-  - uid: 7728
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 61.5,-72.5
-      parent: 2
-  - uid: 7730
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 57.5,-81.5
-      parent: 2
-  - uid: 8219
-    components:
-    - type: Transform
-      pos: 62.5,-70.5
-      parent: 2
-  - uid: 8566
+  - uid: 8075
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 50.5,-27.5
+      pos: 75.5,-61.5
       parent: 2
-  - uid: 8580
+  - uid: 8077
     components:
     - type: Transform
-      pos: 59.5,-79.5
+      pos: 77.5,-63.5
       parent: 2
-  - uid: 8637
+  - uid: 8089
+    components:
+    - type: Transform
+      pos: 45.5,-34.5
+      parent: 2
+  - uid: 8148
+    components:
+    - type: Transform
+      pos: 45.5,-31.5
+      parent: 2
+  - uid: 8822
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 76.5,-61.5
+      parent: 2
+  - uid: 9301
+    components:
+    - type: Transform
+      pos: 77.5,-61.5
+      parent: 2
+  - uid: 9305
+    components:
+    - type: Transform
+      pos: 77.5,-62.5
+      parent: 2
+  - uid: 10278
+    components:
+    - type: Transform
+      pos: 77.5,-65.5
+      parent: 2
+  - uid: 10301
+    components:
+    - type: Transform
+      pos: 77.5,-66.5
+      parent: 2
+  - uid: 10306
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 77.5,-67.5
+      parent: 2
+  - uid: 10703
+    components:
+    - type: Transform
+      pos: 72.5,-72.5
+      parent: 2
+  - uid: 10704
+    components:
+    - type: Transform
+      pos: 72.5,-71.5
+      parent: 2
+  - uid: 11460
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 74.5,-68.5
+      parent: 2
+  - uid: 11690
+    components:
+    - type: Transform
+      pos: 72.5,-69.5
+      parent: 2
+  - uid: 11899
+    components:
+    - type: Transform
+      pos: 75.5,-67.5
+      parent: 2
+  - uid: 11903
+    components:
+    - type: Transform
+      pos: 72.5,-70.5
+      parent: 2
+  - uid: 11978
+    components:
+    - type: Transform
+      pos: 45.5,-36.5
+      parent: 2
+  - uid: 11979
+    components:
+    - type: Transform
+      pos: 45.5,-35.5
+      parent: 2
+  - uid: 11980
+    components:
+    - type: Transform
+      pos: 45.5,-33.5
+      parent: 2
+  - uid: 12955
+    components:
+    - type: Transform
+      pos: 45.5,-32.5
+      parent: 2
+  - uid: 12962
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 52.5,-27.5
-      parent: 2
-  - uid: 8801
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 61.5,-66.5
-      parent: 2
-  - uid: 8804
-    components:
-    - type: Transform
-      pos: 62.5,-67.5
-      parent: 2
-  - uid: 11693
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 48.5,-27.5
-      parent: 2
-  - uid: 11694
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 49.5,-27.5
-      parent: 2
-  - uid: 11695
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 51.5,-27.5
-      parent: 2
-  - uid: 16537
-    components:
-    - type: Transform
-      pos: 62.5,-66.5
-      parent: 2
-  - uid: 17406
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 53.5,-32.5
+      pos: 43.5,-27.5
       parent: 2
 - proto: CorporateCircuitBoard
   entities:
   - uid: 18621
     components:
     - type: Transform
-      pos: 76.60105,-47.30546
+      pos: 80.12597,-47.469414
       parent: 2
 - proto: CrateArtifactContainer
   entities:
@@ -45413,6 +46349,11 @@ entities:
       parent: 2
 - proto: CrateCoffin
   entities:
+  - uid: 3715
+    components:
+    - type: Transform
+      pos: 34.5,-26.5
+      parent: 2
   - uid: 5029
     components:
     - type: Transform
@@ -45423,24 +46364,24 @@ entities:
     - type: Transform
       pos: -21.5,-29.5
       parent: 2
-  - uid: 10301
+  - uid: 7605
     components:
     - type: Transform
-      pos: 35.5,-25.5
+      pos: 35.5,-26.5
       parent: 2
 - proto: CrateContrabandStorageSecure
   entities:
-  - uid: 10331
+  - uid: 9219
     components:
     - type: Transform
-      pos: 60.5,-43.5
+      pos: 56.5,-36.5
       parent: 2
 - proto: CrateEmergencyInternals
   entities:
-  - uid: 10756
+  - uid: 8086
     components:
     - type: Transform
-      pos: 57.5,-62.5
+      pos: 63.5,-66.5
       parent: 2
 - proto: CrateEmergencyRadiation
   entities:
@@ -45488,6 +46429,11 @@ entities:
     - type: Transform
       pos: 28.5,-11.5
       parent: 2
+  - uid: 5203
+    components:
+    - type: Transform
+      pos: 29.5,-11.5
+      parent: 2
 - proto: CrateEngineeringAMEJar
   entities:
   - uid: 8027
@@ -45519,6 +46465,11 @@ entities:
     - type: Transform
       pos: -14.5,-64.5
       parent: 2
+  - uid: 18860
+    components:
+    - type: Transform
+      pos: 54.5,-70.5
+      parent: 2
 - proto: CrateEngineeringCableHV
   entities:
   - uid: 3369
@@ -45615,11 +46566,6 @@ entities:
     - type: Transform
       pos: 27.5,-95.5
       parent: 2
-  - uid: 17957
-    components:
-    - type: Transform
-      pos: 33.5,-23.5
-      parent: 2
 - proto: CrateFreezer
   entities:
   - uid: 5993
@@ -45641,27 +46587,11 @@ entities:
           showEnts: False
           occludes: True
           ent: null
-  - uid: 7043
+  - uid: 12842
     components:
     - type: Transform
-      pos: 46.5,-45.5
+      pos: 45.5,-38.5
       parent: 2
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 7044
-          - 7045
-          - 7046
-          - 7047
-          - 7048
-          - 7049
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
   - uid: 13205
     components:
     - type: Transform
@@ -45687,8 +46617,8 @@ entities:
         immutable: False
         temperature: 293.14673
         moles:
-        - 1.7459903
-        - 6.568249
+        - 1.8856695
+        - 7.0937095
         - 0
         - 0
         - 0
@@ -45705,45 +46635,27 @@ entities:
           showEnts: False
           occludes: True
           ents:
+          - 561
+          - 5788
+          - 6036
           - 6024
-          - 6026
           - 6027
           - 6028
-          - 6029
           - 6030
           - 6031
-          - 6032
           - 6033
           - 6034
           - 6035
-          - 6036
+          - 6026
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
           ent: null
-  - uid: 8099
+  - uid: 7383
     components:
     - type: Transform
-      pos: 69.5,-68.5
+      pos: 55.5,-65.5
       parent: 2
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14673
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
 - proto: CrateHydroponicsSeeds
   entities:
   - uid: 19590
@@ -45779,10 +46691,10 @@ entities:
       parent: 2
 - proto: CrateLockBoxSecurity
   entities:
-  - uid: 12856
+  - uid: 9795
     components:
     - type: Transform
-      pos: 66.5,-40.5
+      pos: 67.5,-43.5
       parent: 2
 - proto: CrateLockBoxService
   entities:
@@ -45829,10 +46741,10 @@ entities:
       parent: 2
 - proto: CrateMindShieldImplants
   entities:
-  - uid: 16980
+  - uid: 6628
     components:
     - type: Transform
-      pos: 68.5,-35.5
+      pos: 68.5,-36.5
       parent: 2
 - proto: CrateNPCHamlet
   entities:
@@ -45862,17 +46774,17 @@ entities:
       parent: 2
 - proto: CrateSecurityTrackingMindshieldImplants
   entities:
-  - uid: 15462
+  - uid: 7223
     components:
     - type: Transform
-      pos: 58.5,-56.5
+      pos: 58.5,-48.5
       parent: 2
 - proto: CrateServiceJanitorialSupplies
   entities:
-  - uid: 15413
+  - uid: 2158
     components:
     - type: Transform
-      pos: 60.5,-65.5
+      pos: 75.5,-60.5
       parent: 2
 - proto: CrateSurgery
   entities:
@@ -45915,7 +46827,7 @@ entities:
   - uid: 19375
     components:
     - type: Transform
-      pos: 80.55276,-27.64461
+      pos: 78.83267,-25.61246
       parent: 2
   - uid: 19376
     components:
@@ -45932,14 +46844,11 @@ entities:
       parent: 2
 - proto: CrewMonitoringServer
   entities:
-  - uid: 15383
+  - uid: 18836
     components:
     - type: Transform
-      pos: -47.5,-38.5
+      pos: 13.5,-16.5
       parent: 2
-    - type: SingletonDeviceNetServer
-      active: False
-      available: False
 - proto: CriminalRecordsComputerCircuitboard
   entities:
   - uid: 18304
@@ -46090,23 +46999,6 @@ entities:
     - type: Transform
       pos: 13.567814,-24.401138
       parent: 2
-- proto: CrystalSpawner
-  entities:
-  - uid: 17343
-    components:
-    - type: Transform
-      pos: -37.5,-80.5
-      parent: 2
-  - uid: 17347
-    components:
-    - type: Transform
-      pos: -40.5,-75.5
-      parent: 2
-  - uid: 18377
-    components:
-    - type: Transform
-      pos: -40.5,-77.5
-      parent: 2
 - proto: CurtainsBlueOpen
   entities:
   - uid: 243
@@ -46175,27 +47067,20 @@ entities:
       parent: 2
 - proto: CurtainsRedOpen
   entities:
-  - uid: 3030
+  - uid: 3568
     components:
     - type: Transform
-      pos: 66.5,-50.5
+      pos: 54.5,-37.5
       parent: 2
-  - uid: 7094
+  - uid: 3868
     components:
     - type: Transform
-      pos: 57.5,-43.5
+      pos: 70.5,-53.5
       parent: 2
-  - uid: 16272
+  - uid: 10277
     components:
     - type: Transform
-      pos: 71.5,-47.5
-      parent: 2
-- proto: CyborgEndoskeleton
-  entities:
-  - uid: 17946
-    components:
-    - type: Transform
-      pos: 35.46804,-15.35495
+      pos: 67.5,-46.5
       parent: 2
 - proto: d6Dice
   entities:
@@ -46233,10 +47118,17 @@ entities:
       parent: 2
 - proto: DefaultStationBeaconAICore
   entities:
-  - uid: 16345
+  - uid: 7532
     components:
     - type: Transform
-      pos: 89.5,-45.5
+      pos: 92.5,-45.5
+      parent: 2
+- proto: DefaultStationBeaconAIUpload
+  entities:
+  - uid: 18127
+    components:
+    - type: Transform
+      pos: 81.5,-45.5
       parent: 2
 - proto: DefaultStationBeaconAME
   entities:
@@ -46254,11 +47146,6 @@ entities:
       parent: 2
 - proto: DefaultStationBeaconArmory
   entities:
-  - uid: 6096
-    components:
-    - type: Transform
-      pos: 60.5,-57.5
-      parent: 2
   - uid: 15449
     components:
     - type: Transform
@@ -46266,6 +47153,11 @@ entities:
       parent: 2
     - type: NavMapBeacon
       defaultText: Mini-Armory
+  - uid: 18100
+    components:
+    - type: Transform
+      pos: 60.5,-49.5
+      parent: 2
 - proto: DefaultStationBeaconArrivals
   entities:
   - uid: 16222
@@ -46312,10 +47204,10 @@ entities:
     - type: BombingTarget
 - proto: DefaultStationBeaconBrigMed
   entities:
-  - uid: 7204
+  - uid: 18105
     components:
     - type: Transform
-      pos: 58.5,-32.5
+      pos: 51.5,-32.5
       parent: 2
 - proto: DefaultStationBeaconCaptainsQuarters
   entities:
@@ -46379,17 +47271,17 @@ entities:
       parent: 2
 - proto: DefaultStationBeaconDetectiveRoom
   entities:
-  - uid: 6097
+  - uid: 18115
     components:
     - type: Transform
-      pos: 69.5,-52.5
+      pos: 70.5,-47.5
       parent: 2
 - proto: DefaultStationBeaconDisposals
   entities:
-  - uid: 13900
+  - uid: 11865
     components:
     - type: Transform
-      pos: 60.5,-69.5
+      pos: 75.5,-65.5
       parent: 2
 - proto: DefaultStationBeaconDorms
   entities:
@@ -46459,10 +47351,10 @@ entities:
     - type: BombingTarget
 - proto: DefaultStationBeaconHOSRoom
   entities:
-  - uid: 7202
+  - uid: 18071
     components:
     - type: Transform
-      pos: 69.5,-47.5
+      pos: 67.5,-51.5
       parent: 2
 - proto: DefaultStationBeaconJanitorsCloset
   entities:
@@ -46501,22 +47393,12 @@ entities:
       pos: 14.5,-29.5
       parent: 2
     - type: BombingTarget
-- proto: DefaultStationBeaconMedical
-  entities:
-  - uid: 7768
-    components:
-    - type: Transform
-      pos: 29.5,-16.5
-      parent: 2
-    - type: NavMapBeacon
-      defaultText: Virology
-    - type: BombingTarget
 - proto: DefaultStationBeaconMorgue
   entities:
-  - uid: 16250
+  - uid: 8744
     components:
     - type: Transform
-      pos: 31.5,-27.5
+      pos: 31.5,-28.5
       parent: 2
 - proto: DefaultStationBeaconPermaBrig
   entities:
@@ -46559,12 +47441,11 @@ entities:
       parent: 2
 - proto: DefaultStationBeaconSalvage
   entities:
-  - uid: 16262
+  - uid: 8736
     components:
     - type: Transform
-      pos: 51.5,-99.5
+      pos: 52.5,-99.5
       parent: 2
-    - type: BombingTarget
 - proto: DefaultStationBeaconScience
   entities:
   - uid: 16215
@@ -46575,10 +47456,10 @@ entities:
     - type: BombingTarget
 - proto: DefaultStationBeaconSecurity
   entities:
-  - uid: 7211
+  - uid: 18001
     components:
     - type: Transform
-      pos: 65.5,-42.5
+      pos: 59.5,-33.5
       parent: 2
 - proto: DefaultStationBeaconSecurityCheckpoint
   entities:
@@ -46602,29 +47483,27 @@ entities:
       pos: -23.5,-71.5
       parent: 2
     - type: BombingTarget
-- proto: DefaultStationBeaconSolars
+- proto: DefaultStationBeaconSolarsE
   entities:
-  - uid: 16263
+  - uid: 8642
     components:
     - type: Transform
-      pos: 99.5,-45.5
+      pos: 101.5,-45.5
       parent: 2
-    - type: NavMapBeacon
-      defaultText: Eastern Solars
-  - uid: 16264
+- proto: DefaultStationBeaconSolarsNW
+  entities:
+  - uid: 8763
     components:
     - type: Transform
       pos: -64.5,-21.5
       parent: 2
-    - type: NavMapBeacon
-      defaultText: NW Solars
-  - uid: 16265
+- proto: DefaultStationBeaconSolarsSW
+  entities:
+  - uid: 10671
     components:
     - type: Transform
       pos: -64.5,-69.5
       parent: 2
-    - type: NavMapBeacon
-      defaultText: SW Solars
 - proto: DefaultStationBeaconTEG
   entities:
   - uid: 3076
@@ -46648,13 +47527,6 @@ entities:
       parent: 2
     - type: NavMapBeacon
       defaultText: Medical Telecoms
-  - uid: 6093
-    components:
-    - type: Transform
-      pos: 68.5,-38.5
-      parent: 2
-    - type: NavMapBeacon
-      defaultText: Security Telecoms
   - uid: 7294
     components:
     - type: Transform
@@ -46669,10 +47541,10 @@ entities:
       parent: 2
     - type: NavMapBeacon
       defaultText: Engineer Telecoms
-  - uid: 12841
+  - uid: 8743
     components:
     - type: Transform
-      pos: 83.5,-47.5
+      pos: 85.5,-47.5
       parent: 2
     - type: NavMapBeacon
       defaultText: Common Telecoms
@@ -46690,6 +47562,13 @@ entities:
       parent: 2
     - type: NavMapBeacon
       defaultText: Command Telecoms
+  - uid: 18114
+    components:
+    - type: Transform
+      pos: 52.5,-28.5
+      parent: 2
+    - type: NavMapBeacon
+      defaultText: Security Telecoms
 - proto: DefaultStationBeaconTheater
   entities:
   - uid: 16236
@@ -46717,18 +47596,17 @@ entities:
       parent: 2
 - proto: DefaultStationBeaconVault
   entities:
-  - uid: 16229
+  - uid: 18573
     components:
     - type: Transform
-      pos: 10.5,-41.5
+      pos: 10.5,-42.5
       parent: 2
-    - type: BombingTarget
 - proto: DefaultStationBeaconWardensOffice
   entities:
-  - uid: 13933
+  - uid: 18066
     components:
     - type: Transform
-      pos: 58.5,-44.5
+      pos: 57.5,-38.5
       parent: 2
 - proto: Defibrillator
   entities:
@@ -46742,13 +47620,15 @@ entities:
     - type: Transform
       pos: -52.604927,-39.291473
       parent: 2
-- proto: DefibrillatorCabinetFilled
+- proto: DefibrillatorCabinet
   entities:
-  - uid: 582
+  - uid: 2218
     components:
     - type: Transform
-      pos: 60.5,-30.5
+      pos: 51.5,-30.5
       parent: 2
+- proto: DefibrillatorCabinetFilled
+  entities:
   - uid: 5238
     components:
     - type: Transform
@@ -46770,12 +47650,6 @@ entities:
     - type: Transform
       pos: 13.5,-68.5
       parent: 2
-  - uid: 15334
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 20.5,-24.5
-      parent: 2
   - uid: 17131
     components:
     - type: Transform
@@ -46850,10 +47724,10 @@ entities:
       parent: 2
 - proto: DiseaseDiagnoser
   entities:
-  - uid: 908
+  - uid: 9610
     components:
     - type: Transform
-      pos: 28.5,-15.5
+      pos: 35.5,-11.5
       parent: 2
 - proto: DisposalBend
   entities:
@@ -46892,6 +47766,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 19.5,-59.5
       parent: 2
+  - uid: 1815
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 73.5,-64.5
+      parent: 2
   - uid: 2104
     components:
     - type: Transform
@@ -46904,11 +47784,17 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 29.5,-56.5
       parent: 2
-  - uid: 2302
+  - uid: 3317
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 21.5,-27.5
+      rot: 1.5707963267948966 rad
+      pos: 70.5,-64.5
+      parent: 2
+  - uid: 3352
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 73.5,-61.5
       parent: 2
   - uid: 3385
     components:
@@ -46916,30 +47802,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 28.5,-57.5
       parent: 2
-  - uid: 3602
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 66.5,-47.5
-      parent: 2
   - uid: 3603
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 64.5,-29.5
       parent: 2
-  - uid: 4266
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 60.5,-46.5
-      parent: 2
-  - uid: 4272
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 60.5,-51.5
-      parent: 2
   - uid: 4288
     components:
     - type: Transform
@@ -46951,29 +47819,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 20.5,-70.5
       parent: 2
-  - uid: 5193
+  - uid: 6359
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 56.5,-70.5
-      parent: 2
-  - uid: 5730
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 58.5,-67.5
-      parent: 2
-  - uid: 5734
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 59.5,-66.5
-      parent: 2
-  - uid: 5736
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 59.5,-67.5
+      rot: 3.141592653589793 rad
+      pos: 40.5,-44.5
       parent: 2
   - uid: 6408
     components:
@@ -46990,27 +47840,15 @@ entities:
     - type: Transform
       pos: 15.5,-64.5
       parent: 2
-  - uid: 7258
+  - uid: 7232
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 58.5,-70.5
+      pos: 22.5,-25.5
       parent: 2
-  - uid: 7306
+  - uid: 7565
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 56.5,-76.5
-      parent: 2
-  - uid: 7707
-    components:
-    - type: Transform
-      pos: 22.5,-27.5
-      parent: 2
-  - uid: 7759
-    components:
-    - type: Transform
-      pos: 63.5,-46.5
+      pos: 35.5,-29.5
       parent: 2
   - uid: 7890
     components:
@@ -47034,17 +47872,6 @@ entities:
     - type: Transform
       pos: 9.5,-67.5
       parent: 2
-  - uid: 7928
-    components:
-    - type: Transform
-      pos: -16.5,-56.5
-      parent: 2
-  - uid: 7942
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 48.5,-53.5
-      parent: 2
   - uid: 7996
     components:
     - type: Transform
@@ -47054,14 +47881,80 @@ entities:
   - uid: 8411
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -15.5,-56.5
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-42.5
       parent: 2
-  - uid: 8576
+  - uid: 8516
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-76.5
+      parent: 2
+  - uid: 8517
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 62.5,-43.5
+      pos: 56.5,-75.5
+      parent: 2
+  - uid: 8518
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-75.5
+      parent: 2
+  - uid: 8519
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 61.5,-74.5
+      parent: 2
+  - uid: 8520
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-74.5
+      parent: 2
+  - uid: 8521
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-73.5
+      parent: 2
+  - uid: 8522
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-73.5
+      parent: 2
+  - uid: 8523
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 65.5,-72.5
+      parent: 2
+  - uid: 8527
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 67.5,-72.5
+      parent: 2
+  - uid: 8528
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 67.5,-71.5
+      parent: 2
+  - uid: 8529
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 70.5,-71.5
+      parent: 2
+  - uid: 8593
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -16.5,-58.5
       parent: 2
   - uid: 8720
     components:
@@ -47104,35 +47997,51 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -33.5,-65.5
       parent: 2
-  - uid: 8865
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 24.5,-30.5
-      parent: 2
   - uid: 8927
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -2.5,-40.5
       parent: 2
-  - uid: 8960
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 48.5,-51.5
-      parent: 2
-  - uid: 9337
+  - uid: 8975
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 63.5,-49.5
+      pos: 54.5,-42.5
       parent: 2
-  - uid: 10324
+  - uid: 9204
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 43.5,-54.5
+      pos: 64.5,-32.5
+      parent: 2
+  - uid: 9540
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-39.5
+      parent: 2
+  - uid: 9675
+    components:
+    - type: Transform
+      pos: 62.5,-38.5
+      parent: 2
+  - uid: 10333
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 30.5,-24.5
+      parent: 2
+  - uid: 10339
+    components:
+    - type: Transform
+      pos: 30.5,-17.5
+      parent: 2
+  - uid: 10393
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,-24.5
       parent: 2
   - uid: 10517
     components:
@@ -47140,11 +48049,17 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 17.5,-64.5
       parent: 2
-  - uid: 12579
+  - uid: 11937
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,-29.5
+      parent: 2
+  - uid: 13637
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 43.5,-53.5
+      pos: 37.5,-76.5
       parent: 2
   - uid: 14239
     components:
@@ -47152,16 +48067,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 27.5,-57.5
       parent: 2
-  - uid: 14287
-    components:
-    - type: Transform
-      pos: 66.5,-43.5
-      parent: 2
-  - uid: 14700
-    components:
-    - type: Transform
-      pos: 25.5,-30.5
-      parent: 2
   - uid: 14850
     components:
     - type: Transform
@@ -47218,23 +48123,18 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 22.5,-37.5
       parent: 2
-  - uid: 14927
-    components:
-    - type: Transform
-      pos: 1.5,-52.5
-      parent: 2
-  - uid: 14928
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-53.5
-      parent: 2
   - uid: 14966
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 39.5,-53.5
       parent: 2
+  - uid: 15383
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 37.5,-78.5
+      parent: 2
   - uid: 15510
     components:
     - type: Transform
@@ -47259,18 +48159,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 34.5,-78.5
       parent: 2
-  - uid: 15545
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 38.5,-78.5
-      parent: 2
-  - uid: 15546
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 38.5,-76.5
-      parent: 2
   - uid: 15552
     components:
     - type: Transform
@@ -47414,11 +48302,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 11.5,-11.5
       parent: 2
-  - uid: 15849
-    components:
-    - type: Transform
-      pos: 23.5,-13.5
-      parent: 2
   - uid: 15867
     components:
     - type: Transform
@@ -47537,6 +48420,84 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 28.5,-56.5
       parent: 2
+  - uid: 16483
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 55.5,-53.5
+      parent: 2
+  - uid: 16497
+    components:
+    - type: Transform
+      pos: 56.5,-53.5
+      parent: 2
+  - uid: 16506
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 56.5,-54.5
+      parent: 2
+  - uid: 16509
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 70.5,-57.5
+      parent: 2
+  - uid: 16510
+    components:
+    - type: Transform
+      pos: 71.5,-57.5
+      parent: 2
+  - uid: 16571
+    components:
+    - type: Transform
+      pos: 70.5,-56.5
+      parent: 2
+  - uid: 16572
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,-56.5
+      parent: 2
+  - uid: 16573
+    components:
+    - type: Transform
+      pos: 59.5,-55.5
+      parent: 2
+  - uid: 16574
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 58.5,-55.5
+      parent: 2
+  - uid: 16575
+    components:
+    - type: Transform
+      pos: 58.5,-54.5
+      parent: 2
+  - uid: 16586
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 61.5,-32.5
+      parent: 2
+  - uid: 16640
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 65.5,-44.5
+      parent: 2
+  - uid: 16641
+    components:
+    - type: Transform
+      pos: 65.5,-36.5
+      parent: 2
+  - uid: 16643
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 68.5,-44.5
+      parent: 2
   - uid: 16937
     components:
     - type: Transform
@@ -47554,11 +48515,6 @@ entities:
     - type: Transform
       pos: 8.5,-61.5
       parent: 2
-  - uid: 18372
-    components:
-    - type: Transform
-      pos: 21.5,-25.5
-      parent: 2
   - uid: 19369
     components:
     - type: Transform
@@ -47571,16 +48527,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 25.5,-77.5
       parent: 2
-  - uid: 19542
+  - uid: 19744
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 28.5,-28.5
-      parent: 2
-  - uid: 19543
-    components:
-    - type: Transform
-      pos: 35.5,-28.5
+      pos: 0.5,-53.5
       parent: 2
 - proto: DisposalJunction
   entities:
@@ -47606,17 +48557,22 @@ entities:
     - type: Transform
       pos: 26.5,-77.5
       parent: 2
-  - uid: 8806
+  - uid: 7969
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-46.5
+      rot: 1.5707963267948966 rad
+      pos: -15.5,-56.5
       parent: 2
-  - uid: 10673
+  - uid: 8978
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 64.5,-43.5
+      pos: 62.5,-32.5
+      parent: 2
+  - uid: 9871
+    components:
+    - type: Transform
+      pos: 7.5,-60.5
       parent: 2
   - uid: 15507
     components:
@@ -47659,27 +48615,33 @@ entities:
       parent: 2
 - proto: DisposalJunctionFlipped
   entities:
-  - uid: 529
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 28.5,-23.5
-      parent: 2
   - uid: 8061
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 8.5,-67.5
       parent: 2
-  - uid: 8795
+  - uid: 8594
     components:
     - type: Transform
-      pos: 29.5,-54.5
+      rot: 1.5707963267948966 rad
+      pos: 71.5,-64.5
       parent: 2
-  - uid: 10661
+  - uid: 8596
     components:
     - type: Transform
-      pos: 64.5,-31.5
+      rot: 3.141592653589793 rad
+      pos: -15.5,-58.5
+      parent: 2
+  - uid: 9669
+    components:
+    - type: Transform
+      pos: 61.5,-39.5
+      parent: 2
+  - uid: 9798
+    components:
+    - type: Transform
+      pos: 7.5,-59.5
       parent: 2
   - uid: 15537
     components:
@@ -47703,12 +48665,6 @@ entities:
     - type: Transform
       pos: 25.5,-32.5
       parent: 2
-  - uid: 15694
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 23.5,-23.5
-      parent: 2
   - uid: 15703
     components:
     - type: Transform
@@ -47733,19 +48689,13 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -43.5,-48.5
       parent: 2
-  - uid: 19472
+  - uid: 16582
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -15.5,-59.5
+      pos: 61.5,-36.5
       parent: 2
 - proto: DisposalPipe
   entities:
-  - uid: 285
-    components:
-    - type: Transform
-      pos: 21.5,-26.5
-      parent: 2
   - uid: 339
     components:
     - type: Transform
@@ -47805,39 +48755,32 @@ entities:
     - type: Transform
       pos: 20.5,-71.5
       parent: 2
+  - uid: 2960
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,-76.5
+      parent: 2
+  - uid: 3058
+    components:
+    - type: Transform
+      pos: 37.5,-77.5
+      parent: 2
+  - uid: 3329
+    components:
+    - type: Transform
+      pos: 73.5,-63.5
+      parent: 2
   - uid: 3350
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 56.5,-73.5
+      pos: 73.5,-62.5
       parent: 2
   - uid: 3351
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 57.5,-70.5
-      parent: 2
-  - uid: 3352
-    components:
-    - type: Transform
-      pos: 58.5,-68.5
-      parent: 2
-  - uid: 3353
-    components:
-    - type: Transform
-      pos: 58.5,-69.5
-      parent: 2
-  - uid: 3354
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 56.5,-74.5
-      parent: 2
-  - uid: 3355
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 56.5,-75.5
+      pos: 72.5,-64.5
       parent: 2
   - uid: 3383
     components:
@@ -47845,29 +48788,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,-69.5
       parent: 2
-  - uid: 3455
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 63.5,-48.5
-      parent: 2
-  - uid: 3456
-    components:
-    - type: Transform
-      pos: 64.5,-32.5
-      parent: 2
-  - uid: 3461
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-49.5
-      parent: 2
-  - uid: 3462
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-50.5
-      parent: 2
   - uid: 3776
     components:
     - type: Transform
@@ -47880,17 +48800,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -43.5,-65.5
       parent: 2
-  - uid: 3961
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-48.5
-      parent: 2
-  - uid: 4165
-    components:
-    - type: Transform
-      pos: 64.5,-40.5
-      parent: 2
   - uid: 4351
     components:
     - type: Transform
@@ -47909,17 +48818,21 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -9.5,-20.5
       parent: 2
-  - uid: 5373
+  - uid: 5381
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 56.5,-71.5
+      pos: 22.5,-27.5
       parent: 2
-  - uid: 5374
+  - uid: 5430
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 56.5,-72.5
+      pos: 22.5,-26.5
+      parent: 2
+  - uid: 5445
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 21.5,-25.5
       parent: 2
   - uid: 5732
     components:
@@ -47931,53 +48844,28 @@ entities:
     - type: Transform
       pos: -7.5,-28.5
       parent: 2
-  - uid: 6065
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-47.5
-      parent: 2
   - uid: 6084
     components:
     - type: Transform
       pos: 64.5,-30.5
       parent: 2
-  - uid: 6087
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 64.5,-49.5
-      parent: 2
-  - uid: 6088
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 63.5,-47.5
-      parent: 2
-  - uid: 6089
-    components:
-    - type: Transform
-      pos: 64.5,-33.5
-      parent: 2
-  - uid: 6090
-    components:
-    - type: Transform
-      pos: 64.5,-34.5
-      parent: 2
   - uid: 6351
     components:
     - type: Transform
-      pos: 40.5,-45.5
+      rot: 1.5707963267948966 rad
+      pos: 41.5,-44.5
       parent: 2
-  - uid: 6409
+  - uid: 6355
     components:
     - type: Transform
-      pos: 40.5,-46.5
+      rot: 1.5707963267948966 rad
+      pos: 42.5,-44.5
       parent: 2
   - uid: 6414
     components:
     - type: Transform
-      pos: 40.5,-44.5
+      rot: 1.5707963267948966 rad
+      pos: 43.5,-44.5
       parent: 2
   - uid: 6426
     components:
@@ -48031,67 +48919,94 @@ entities:
     - type: Transform
       pos: 40.5,-42.5
       parent: 2
+  - uid: 7028
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-53.5
+      parent: 2
+  - uid: 7049
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 31.5,-29.5
+      parent: 2
+  - uid: 7050
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 33.5,-29.5
+      parent: 2
+  - uid: 7053
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 34.5,-29.5
+      parent: 2
+  - uid: 7054
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 32.5,-29.5
+      parent: 2
   - uid: 7106
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 19.5,-64.5
       parent: 2
-  - uid: 7110
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 65.5,-43.5
-      parent: 2
-  - uid: 7111
-    components:
-    - type: Transform
-      pos: 66.5,-46.5
-      parent: 2
   - uid: 7145
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 45.5,-76.5
       parent: 2
-  - uid: 7224
+  - uid: 7292
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,-28.5
+      parent: 2
+  - uid: 7338
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 52.5,-51.5
+      pos: 29.5,-29.5
       parent: 2
-  - uid: 7235
-    components:
-    - type: Transform
-      pos: 64.5,-37.5
-      parent: 2
-  - uid: 7236
+  - uid: 7372
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 55.5,-51.5
-      parent: 2
-  - uid: 7311
-    components:
-    - type: Transform
-      pos: 64.5,-39.5
-      parent: 2
-  - uid: 7891
-    components:
-    - type: Transform
-      pos: -15.5,-58.5
+      pos: 30.5,-29.5
       parent: 2
   - uid: 7914
     components:
     - type: Transform
       pos: -15.5,-60.5
       parent: 2
+  - uid: 7928
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -16.5,-56.5
+      parent: 2
+  - uid: 7942
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 56.5,-42.5
+      parent: 2
   - uid: 7968
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 12.5,-72.5
       parent: 2
+  - uid: 7993
+    components:
+    - type: Transform
+      pos: 55.5,-44.5
+      parent: 2
   - uid: 8060
     components:
     - type: Transform
@@ -48128,25 +49043,117 @@ entities:
       rot: 3.141592653589793 rad
       pos: 9.5,-69.5
       parent: 2
-  - uid: 8231
-    components:
-    - type: Transform
-      pos: 24.5,-27.5
-      parent: 2
   - uid: 8376
     components:
     - type: Transform
       pos: 22.5,-28.5
       parent: 2
-  - uid: 8377
+  - uid: 8435
     components:
     - type: Transform
-      pos: 24.5,-25.5
+      rot: 3.141592653589793 rad
+      pos: 61.5,-41.5
       parent: 2
-  - uid: 8378
+  - uid: 8530
     components:
     - type: Transform
-      pos: 24.5,-24.5
+      rot: 3.141592653589793 rad
+      pos: 70.5,-65.5
+      parent: 2
+  - uid: 8531
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 70.5,-66.5
+      parent: 2
+  - uid: 8532
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 70.5,-67.5
+      parent: 2
+  - uid: 8533
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 70.5,-68.5
+      parent: 2
+  - uid: 8534
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 70.5,-69.5
+      parent: 2
+  - uid: 8535
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 70.5,-70.5
+      parent: 2
+  - uid: 8536
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 69.5,-71.5
+      parent: 2
+  - uid: 8537
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 68.5,-71.5
+      parent: 2
+  - uid: 8538
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 66.5,-72.5
+      parent: 2
+  - uid: 8539
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 64.5,-73.5
+      parent: 2
+  - uid: 8540
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 62.5,-74.5
+      parent: 2
+  - uid: 8541
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 60.5,-75.5
+      parent: 2
+  - uid: 8542
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 59.5,-75.5
+      parent: 2
+  - uid: 8543
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 58.5,-75.5
+      parent: 2
+  - uid: 8544
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 57.5,-75.5
+      parent: 2
+  - uid: 8553
+    components:
+    - type: Transform
+      pos: 25.5,-28.5
+      parent: 2
+  - uid: 8561
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 29.5,-54.5
       parent: 2
   - uid: 8581
     components:
@@ -48154,20 +49161,17 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -16.5,-61.5
       parent: 2
-  - uid: 8607
+  - uid: 8597
     components:
     - type: Transform
-      pos: 24.5,-26.5
+      rot: 1.5707963267948966 rad
+      pos: 60.5,-42.5
       parent: 2
-  - uid: 8610
+  - uid: 8598
     components:
     - type: Transform
-      pos: 24.5,-28.5
-      parent: 2
-  - uid: 8617
-    components:
-    - type: Transform
-      pos: 24.5,-29.5
+      rot: 1.5707963267948966 rad
+      pos: 59.5,-42.5
       parent: 2
   - uid: 8619
     components:
@@ -48189,6 +49193,12 @@ entities:
     - type: Transform
       pos: -2.5,-37.5
       parent: 2
+  - uid: 8688
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 58.5,-42.5
+      parent: 2
   - uid: 8696
     components:
     - type: Transform
@@ -48206,6 +49216,17 @@ entities:
       rot: 3.141592653589793 rad
       pos: 4.5,-41.5
       parent: 2
+  - uid: 8749
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 57.5,-42.5
+      parent: 2
+  - uid: 8795
+    components:
+    - type: Transform
+      pos: 55.5,-46.5
+      parent: 2
   - uid: 8796
     components:
     - type: Transform
@@ -48296,42 +49317,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: 4.5,-39.5
       parent: 2
-  - uid: 8975
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 44.5,-53.5
-      parent: 2
-  - uid: 8977
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 45.5,-53.5
-      parent: 2
-  - uid: 8978
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 46.5,-53.5
-      parent: 2
-  - uid: 8979
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 47.5,-53.5
-      parent: 2
-  - uid: 8994
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 25.5,-23.5
-      parent: 2
   - uid: 9037
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -37.5,-65.5
       parent: 2
+  - uid: 9252
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 64.5,-31.5
+      parent: 2
   - uid: 9260
     components:
     - type: Transform
@@ -48386,53 +49383,147 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 50.5,-76.5
       parent: 2
-  - uid: 9288
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 62.5,-44.5
-      parent: 2
-  - uid: 9289
+  - uid: 9334
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 63.5,-43.5
-      parent: 2
-  - uid: 9290
-    components:
-    - type: Transform
-      pos: 66.5,-44.5
-      parent: 2
-  - uid: 9291
-    components:
-    - type: Transform
-      pos: 66.5,-45.5
-      parent: 2
-  - uid: 9292
-    components:
-    - type: Transform
-      pos: 64.5,-42.5
+      pos: 63.5,-32.5
       parent: 2
   - uid: 9429
     components:
     - type: Transform
       pos: -2.5,-33.5
       parent: 2
+  - uid: 9676
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.5,-40.5
+      parent: 2
+  - uid: 9678
+    components:
+    - type: Transform
+      pos: 55.5,-43.5
+      parent: 2
+  - uid: 9697
+    components:
+    - type: Transform
+      pos: 55.5,-45.5
+      parent: 2
+  - uid: 9722
+    components:
+    - type: Transform
+      pos: 55.5,-47.5
+      parent: 2
+  - uid: 9882
+    components:
+    - type: Transform
+      pos: 25.5,-27.5
+      parent: 2
+  - uid: 9883
+    components:
+    - type: Transform
+      pos: 30.5,-21.5
+      parent: 2
+  - uid: 9884
+    components:
+    - type: Transform
+      pos: 25.5,-26.5
+      parent: 2
   - uid: 9906
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 4.5,-43.5
       parent: 2
-  - uid: 10327
+  - uid: 10280
     components:
     - type: Transform
-      pos: 64.5,-38.5
+      pos: 25.5,-25.5
       parent: 2
-  - uid: 10761
+  - uid: 10284
     components:
     - type: Transform
-      pos: 64.5,-41.5
+      rot: -1.5707963267948966 rad
+      pos: 29.5,-24.5
+      parent: 2
+  - uid: 10295
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 28.5,-24.5
+      parent: 2
+  - uid: 10296
+    components:
+    - type: Transform
+      pos: 25.5,-29.5
+      parent: 2
+  - uid: 10297
+    components:
+    - type: Transform
+      pos: 25.5,-30.5
+      parent: 2
+  - uid: 10319
+    components:
+    - type: Transform
+      pos: 55.5,-51.5
+      parent: 2
+  - uid: 10330
+    components:
+    - type: Transform
+      pos: 55.5,-52.5
+      parent: 2
+  - uid: 10331
+    components:
+    - type: Transform
+      pos: 30.5,-22.5
+      parent: 2
+  - uid: 10396
+    components:
+    - type: Transform
+      pos: 30.5,-18.5
+      parent: 2
+  - uid: 10398
+    components:
+    - type: Transform
+      pos: 30.5,-19.5
+      parent: 2
+  - uid: 10409
+    components:
+    - type: Transform
+      pos: 30.5,-20.5
+      parent: 2
+  - uid: 10410
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 26.5,-24.5
+      parent: 2
+  - uid: 10435
+    components:
+    - type: Transform
+      pos: 55.5,-50.5
+      parent: 2
+  - uid: 10498
+    components:
+    - type: Transform
+      pos: 30.5,-23.5
+      parent: 2
+  - uid: 10511
+    components:
+    - type: Transform
+      pos: 55.5,-49.5
+      parent: 2
+  - uid: 10515
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 27.5,-24.5
+      parent: 2
+  - uid: 10561
+    components:
+    - type: Transform
+      pos: 55.5,-48.5
       parent: 2
   - uid: 11088
     components:
@@ -48440,76 +49531,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,-68.5
       parent: 2
-  - uid: 11667
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 61.5,-46.5
-      parent: 2
-  - uid: 11703
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 59.5,-51.5
-      parent: 2
-  - uid: 11704
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 57.5,-51.5
-      parent: 2
-  - uid: 11705
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 54.5,-51.5
-      parent: 2
   - uid: 13153
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 4.5,-44.5
       parent: 2
-  - uid: 13821
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 50.5,-51.5
-      parent: 2
-  - uid: 13935
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 58.5,-51.5
-      parent: 2
-  - uid: 13936
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 56.5,-51.5
-      parent: 2
-  - uid: 13937
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 53.5,-51.5
-      parent: 2
-  - uid: 13940
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 62.5,-45.5
-      parent: 2
-  - uid: 14344
-    components:
-    - type: Transform
-      pos: 64.5,-36.5
-      parent: 2
-  - uid: 14357
-    components:
-    - type: Transform
-      pos: 64.5,-35.5
-      parent: 2
   - uid: 14451
     components:
     - type: Transform
@@ -49211,12 +50238,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 39.5,-76.5
       parent: 2
-  - uid: 15526
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 38.5,-77.5
-      parent: 2
   - uid: 15527
     components:
     - type: Transform
@@ -49229,12 +50250,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 36.5,-78.5
       parent: 2
-  - uid: 15529
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 37.5,-78.5
-      parent: 2
   - uid: 15530
     components:
     - type: Transform
@@ -49580,11 +50595,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 8.5,-59.5
       parent: 2
-  - uid: 15633
-    components:
-    - type: Transform
-      pos: 7.5,-60.5
-      parent: 2
   - uid: 15641
     components:
     - type: Transform
@@ -49776,30 +50786,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 22.5,-23.5
       parent: 2
-  - uid: 15696
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 30.5,-23.5
-      parent: 2
-  - uid: 15697
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 29.5,-23.5
-      parent: 2
-  - uid: 15699
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 27.5,-23.5
-      parent: 2
-  - uid: 15700
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 26.5,-23.5
-      parent: 2
   - uid: 15704
     components:
     - type: Transform
@@ -50270,51 +51256,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 14.5,-13.5
       parent: 2
-  - uid: 15850
-    components:
-    - type: Transform
-      pos: 23.5,-22.5
-      parent: 2
-  - uid: 15851
-    components:
-    - type: Transform
-      pos: 23.5,-21.5
-      parent: 2
-  - uid: 15852
-    components:
-    - type: Transform
-      pos: 23.5,-20.5
-      parent: 2
-  - uid: 15853
-    components:
-    - type: Transform
-      pos: 23.5,-19.5
-      parent: 2
-  - uid: 15854
-    components:
-    - type: Transform
-      pos: 23.5,-18.5
-      parent: 2
-  - uid: 15855
-    components:
-    - type: Transform
-      pos: 23.5,-17.5
-      parent: 2
-  - uid: 15856
-    components:
-    - type: Transform
-      pos: 23.5,-16.5
-      parent: 2
-  - uid: 15857
-    components:
-    - type: Transform
-      pos: 23.5,-15.5
-      parent: 2
-  - uid: 15858
-    components:
-    - type: Transform
-      pos: 23.5,-14.5
-      parent: 2
   - uid: 15859
     components:
     - type: Transform
@@ -50980,84 +51921,6 @@ entities:
     - type: Transform
       pos: 29.5,-53.5
       parent: 2
-  - uid: 16028
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 30.5,-54.5
-      parent: 2
-  - uid: 16029
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 31.5,-54.5
-      parent: 2
-  - uid: 16030
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 32.5,-54.5
-      parent: 2
-  - uid: 16031
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 33.5,-54.5
-      parent: 2
-  - uid: 16032
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 34.5,-54.5
-      parent: 2
-  - uid: 16033
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 35.5,-54.5
-      parent: 2
-  - uid: 16034
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 36.5,-54.5
-      parent: 2
-  - uid: 16035
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 37.5,-54.5
-      parent: 2
-  - uid: 16036
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 38.5,-54.5
-      parent: 2
-  - uid: 16037
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 39.5,-54.5
-      parent: 2
-  - uid: 16038
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 40.5,-54.5
-      parent: 2
-  - uid: 16039
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 41.5,-54.5
-      parent: 2
-  - uid: 16040
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 42.5,-54.5
-      parent: 2
   - uid: 16057
     components:
     - type: Transform
@@ -51244,22 +52107,197 @@ entities:
     - type: Transform
       pos: -47.5,-36.5
       parent: 2
+  - uid: 16523
+    components:
+    - type: Transform
+      pos: 71.5,-63.5
+      parent: 2
+  - uid: 16528
+    components:
+    - type: Transform
+      pos: 71.5,-62.5
+      parent: 2
+  - uid: 16529
+    components:
+    - type: Transform
+      pos: 71.5,-61.5
+      parent: 2
+  - uid: 16537
+    components:
+    - type: Transform
+      pos: 71.5,-60.5
+      parent: 2
+  - uid: 16538
+    components:
+    - type: Transform
+      pos: 71.5,-59.5
+      parent: 2
+  - uid: 16539
+    components:
+    - type: Transform
+      pos: 71.5,-58.5
+      parent: 2
+  - uid: 16541
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 69.5,-56.5
+      parent: 2
+  - uid: 16542
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 68.5,-56.5
+      parent: 2
+  - uid: 16551
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 67.5,-56.5
+      parent: 2
+  - uid: 16552
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 66.5,-56.5
+      parent: 2
+  - uid: 16563
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-56.5
+      parent: 2
+  - uid: 16565
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 64.5,-56.5
+      parent: 2
+  - uid: 16566
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-56.5
+      parent: 2
+  - uid: 16567
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-56.5
+      parent: 2
+  - uid: 16568
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-56.5
+      parent: 2
+  - uid: 16570
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 60.5,-56.5
+      parent: 2
+  - uid: 16577
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-54.5
+      parent: 2
+  - uid: 16578
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.5,-37.5
+      parent: 2
+  - uid: 16583
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.5,-35.5
+      parent: 2
+  - uid: 16584
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.5,-34.5
+      parent: 2
+  - uid: 16585
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.5,-33.5
+      parent: 2
+  - uid: 16803
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-36.5
+      parent: 2
+  - uid: 16808
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-36.5
+      parent: 2
+  - uid: 16809
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 64.5,-36.5
+      parent: 2
+  - uid: 16861
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 65.5,-37.5
+      parent: 2
+  - uid: 16862
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 65.5,-38.5
+      parent: 2
   - uid: 16863
     components:
     - type: Transform
-      pos: 48.5,-52.5
+      rot: 3.141592653589793 rad
+      pos: 65.5,-39.5
       parent: 2
   - uid: 16864
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 49.5,-51.5
+      rot: 3.141592653589793 rad
+      pos: 65.5,-40.5
+      parent: 2
+  - uid: 16865
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 65.5,-41.5
+      parent: 2
+  - uid: 16866
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 65.5,-42.5
       parent: 2
   - uid: 16867
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 65.5,-43.5
+      parent: 2
+  - uid: 16868
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 51.5,-51.5
+      pos: 67.5,-44.5
+      parent: 2
+  - uid: 16869
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 66.5,-44.5
       parent: 2
   - uid: 16938
     components:
@@ -51319,12 +52357,6 @@ entities:
     - type: Transform
       pos: 25.5,-59.5
       parent: 2
-  - uid: 18341
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 20.5,-25.5
-      parent: 2
   - uid: 19453
     components:
     - type: Transform
@@ -51415,16 +52447,6 @@ entities:
     - type: Transform
       pos: -15.5,-57.5
       parent: 2
-  - uid: 19474
-    components:
-    - type: Transform
-      pos: -16.5,-57.5
-      parent: 2
-  - uid: 19475
-    components:
-    - type: Transform
-      pos: -16.5,-58.5
-      parent: 2
   - uid: 19482
     components:
     - type: Transform
@@ -51448,54 +52470,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: 28.5,-27.5
       parent: 2
-  - uid: 19546
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 29.5,-28.5
-      parent: 2
-  - uid: 19547
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 30.5,-28.5
-      parent: 2
-  - uid: 19548
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 31.5,-28.5
-      parent: 2
-  - uid: 19549
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 32.5,-28.5
-      parent: 2
-  - uid: 19550
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 33.5,-28.5
-      parent: 2
-  - uid: 19551
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 34.5,-28.5
-      parent: 2
 - proto: DisposalPipeBroken
   entities:
-  - uid: 7201
+  - uid: 3337
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 60.5,-66.5
-      parent: 2
-  - uid: 14973
-    components:
-    - type: Transform
-      pos: 39.5,-47.5
+      pos: 74.5,-61.5
       parent: 2
 - proto: DisposalTrunk
   entities:
@@ -51540,41 +52521,56 @@ entities:
     - type: Transform
       pos: 31.5,-37.5
       parent: 2
+  - uid: 5302
+    components:
+    - type: Transform
+      pos: 0.5,-52.5
+      parent: 2
   - uid: 5801
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -8.5,-29.5
       parent: 2
-  - uid: 6359
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 40.5,-47.5
-      parent: 2
   - uid: 6577
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 17.5,-65.5
       parent: 2
-  - uid: 7908
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 65.5,-31.5
-      parent: 2
-  - uid: 7913
+  - uid: 7204
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 6.5,-59.5
+      pos: 20.5,-25.5
       parent: 2
-  - uid: 10337
+  - uid: 8960
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 65.5,-49.5
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-60.5
+      parent: 2
+  - uid: 8979
+    components:
+    - type: Transform
+      pos: 62.5,-31.5
+      parent: 2
+  - uid: 9040
+    components:
+    - type: Transform
+      pos: 54.5,-41.5
+      parent: 2
+  - uid: 10290
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 29.5,-17.5
+      parent: 2
+  - uid: 11914
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 35.5,-30.5
       parent: 2
   - uid: 14678
     components:
@@ -51587,12 +52583,6 @@ entities:
     - type: Transform
       pos: 0.5,-57.5
       parent: 2
-  - uid: 14926
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,-52.5
-      parent: 2
   - uid: 15393
     components:
     - type: Transform
@@ -51632,12 +52622,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 26.5,-32.5
       parent: 2
-  - uid: 15670
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 31.5,-23.5
-      parent: 2
   - uid: 15671
     components:
     - type: Transform
@@ -51700,6 +52684,11 @@ entities:
     - type: Transform
       pos: -47.5,-35.5
       parent: 2
+  - uid: 16644
+    components:
+    - type: Transform
+      pos: 68.5,-43.5
+      parent: 2
   - uid: 17024
     components:
     - type: Transform
@@ -51733,17 +52722,10 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 21.5,-70.5
       parent: 2
-  - uid: 18105
+  - uid: 17987
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 65.5,-47.5
-      parent: 2
-  - uid: 18280
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 19.5,-25.5
+      pos: 39.5,-47.5
       parent: 2
   - uid: 19367
     components:
@@ -51751,11 +52733,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -19.5,-49.5
       parent: 2
-  - uid: 19544
+  - uid: 19749
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 35.5,-29.5
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-44.5
       parent: 2
 - proto: DisposalUnit
   entities:
@@ -51774,11 +52756,6 @@ entities:
     - type: Transform
       pos: 2.5,-70.5
       parent: 2
-  - uid: 2320
-    components:
-    - type: Transform
-      pos: 35.5,-29.5
-      parent: 2
   - uid: 2465
     components:
     - type: Transform
@@ -51794,6 +52771,21 @@ entities:
     - type: Transform
       pos: -38.5,-66.5
       parent: 2
+  - uid: 4189
+    components:
+    - type: Transform
+      pos: 64.5,-52.5
+      parent: 2
+  - uid: 4426
+    components:
+    - type: Transform
+      pos: 36.5,-15.5
+      parent: 2
+  - uid: 4625
+    components:
+    - type: Transform
+      pos: 29.5,-17.5
+      parent: 2
   - uid: 5007
     components:
     - type: Transform
@@ -51859,11 +52851,6 @@ entities:
     - type: Transform
       pos: 0.5,-57.5
       parent: 2
-  - uid: 6274
-    components:
-    - type: Transform
-      pos: 19.5,-25.5
-      parent: 2
   - uid: 7755
     components:
     - type: Transform
@@ -51879,76 +52866,81 @@ entities:
     - type: Transform
       pos: -5.5,-53.5
       parent: 2
-  - uid: 7799
-    components:
-    - type: Transform
-      pos: 31.5,-23.5
-      parent: 2
   - uid: 7876
     components:
     - type: Transform
       pos: 65.5,-29.5
       parent: 2
+  - uid: 7913
+    components:
+    - type: Transform
+      pos: 68.5,-43.5
+      parent: 2
   - uid: 8040
     components:
     - type: Transform
       pos: 26.5,-32.5
       parent: 2
+  - uid: 9336
+    components:
+    - type: Transform
+      pos: 20.5,-25.5
+      parent: 2
   - uid: 10155
     components:
     - type: Transform
       pos: -31.5,-15.5
       parent: 2
-  - uid: 10562
+  - uid: 10242
     components:
     - type: Transform
-      pos: 65.5,-49.5
+      pos: 62.5,-31.5
+      parent: 2
+  - uid: 10754
+    components:
+    - type: Transform
+      pos: 6.5,-60.5
+      parent: 2
+  - uid: 10801
+    components:
+    - type: Transform
+      pos: 54.5,-41.5
       parent: 2
   - uid: 11411
     components:
     - type: Transform
       pos: 15.5,-65.5
       parent: 2
-  - uid: 13828
+  - uid: 11913
     components:
     - type: Transform
-      pos: 65.5,-47.5
+      pos: 35.5,-30.5
       parent: 2
   - uid: 13996
     components:
     - type: Transform
       pos: 17.5,-65.5
       parent: 2
-  - uid: 14249
-    components:
-    - type: Transform
-      pos: 65.5,-31.5
-      parent: 2
   - uid: 14395
     components:
     - type: Transform
       pos: -14.5,-28.5
       parent: 2
-  - uid: 14596
-    components:
-    - type: Transform
-      pos: 40.5,-47.5
-      parent: 2
   - uid: 15539
     components:
     - type: Transform
       pos: 26.5,-76.5
       parent: 2
+  - uid: 16205
+    components:
+    - type: Transform
+      pos: 39.5,-47.5
+      parent: 2
   - uid: 16389
     components:
     - type: Transform
       pos: 21.5,-70.5
       parent: 2
-  - uid: 17084
-    components:
-    - type: Transform
-      pos: 6.5,-59.5
-      parent: 2
   - uid: 18135
     components:
     - type: Transform
@@ -51959,12 +52951,10 @@ entities:
     - type: Transform
       pos: -19.5,-49.5
       parent: 2
-- proto: DisposalXJunction
-  entities:
-  - uid: 7892
+  - uid: 19750
     components:
     - type: Transform
-      pos: 7.5,-59.5
+      pos: 44.5,-44.5
       parent: 2
 - proto: DisposalYJunction
   entities:
@@ -51979,10 +52969,22 @@ entities:
     - type: Transform
       pos: 25.5,-58.5
       parent: 2
-  - uid: 8618
+  - uid: 8977
     components:
     - type: Transform
-      pos: 24.5,-23.5
+      pos: 55.5,-42.5
+      parent: 2
+  - uid: 9416
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 61.5,-38.5
+      parent: 2
+  - uid: 9794
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -15.5,-59.5
       parent: 2
   - uid: 15674
     components:
@@ -51998,16 +53000,21 @@ entities:
       parent: 2
 - proto: DogBed
   entities:
-  - uid: 3545
-    components:
-    - type: Transform
-      pos: 57.5,-44.5
-      parent: 2
   - uid: 6188
     components:
     - type: Transform
       pos: 15.5,-59.5
       parent: 2
+  - uid: 7130
+    components:
+    - type: Transform
+      pos: 54.5,-38.5
+      parent: 2
+  - uid: 7194
+    components:
+    - type: Transform
+      pos: 69.5,-53.5
+      parent: 2
   - uid: 11762
     components:
     - type: Transform
@@ -52018,11 +53025,6 @@ entities:
     - type: Transform
       pos: 19.5,-72.5
       parent: 2
-  - uid: 18292
-    components:
-    - type: Transform
-      pos: 69.5,-48.5
-      parent: 2
 - proto: DonkpocketBoxSpawner
   entities:
   - uid: 6806
@@ -52035,16 +53037,16 @@ entities:
     - type: Transform
       pos: 29.5,-101.5
       parent: 2
+  - uid: 14690
+    components:
+    - type: Transform
+      pos: 53.5,-98.5
+      parent: 2
   - uid: 16973
     components:
     - type: Transform
       pos: 22.5,-85.5
       parent: 2
-  - uid: 16974
-    components:
-    - type: Transform
-      pos: 52.5,-98.5
-      parent: 2
   - uid: 18533
     components:
     - type: Transform
@@ -52060,7 +53062,7 @@ entities:
   - uid: 907
     components:
     - type: Transform
-      pos: 28.5,-12.5
+      pos: 29.461311,-12.535852
       parent: 2
   - uid: 18776
     components:
@@ -52120,11 +53122,6 @@ entities:
     - type: Transform
       pos: -60.5,-61.5
       parent: 2
-  - uid: 14343
-    components:
-    - type: Transform
-      pos: 43.5,-16.5
-      parent: 2
   - uid: 19479
     components:
     - type: Transform
@@ -52139,10 +53136,10 @@ entities:
       parent: 2
 - proto: DresserHeadOfSecurityFilled
   entities:
-  - uid: 18028
+  - uid: 7179
     components:
     - type: Transform
-      pos: 71.5,-48.5
+      pos: 71.5,-53.5
       parent: 2
 - proto: DresserQuarterMasterFilled
   entities:
@@ -52160,10 +53157,27 @@ entities:
       parent: 2
 - proto: DresserWardenFilled
   entities:
-  - uid: 3546
+  - uid: 7114
     components:
     - type: Transform
-      pos: 57.5,-42.5
+      pos: 54.5,-39.5
+      parent: 2
+- proto: DrinkBeerCan
+  entities:
+  - uid: 19732
+    components:
+    - type: Transform
+      pos: 52.991863,-98.5449
+      parent: 2
+  - uid: 19733
+    components:
+    - type: Transform
+      pos: 53.472607,-99.264145
+      parent: 2
+  - uid: 19734
+    components:
+    - type: Transform
+      pos: 52.628857,-98.82634
       parent: 2
 - proto: DrinkBottleAlcoClear
   entities:
@@ -52196,7 +53210,7 @@ entities:
   - uid: 14280
     components:
     - type: Transform
-      pos: 21.681454,-19.427164
+      pos: 21.64727,-19.389515
       parent: 2
 - proto: DrinkEnergyDrinkCan
   entities:
@@ -52242,17 +53256,17 @@ entities:
   - uid: 3330
     components:
     - type: Transform
-      pos: 70.72181,-69.31151
+      pos: 57.398575,-63.22958
       parent: 2
   - uid: 3335
     components:
     - type: Transform
-      pos: 70.81903,-69.41807
+      pos: 57.57045,-63.30776
       parent: 2
   - uid: 3336
     components:
     - type: Transform
-      pos: 70.59218,-69.22349
+      pos: 57.701633,-63.41804
       parent: 2
   - uid: 5250
     components:
@@ -52288,10 +53302,15 @@ entities:
     - type: Transform
       pos: 12.745599,-98.425545
       parent: 2
-  - uid: 7196
+  - uid: 10271
     components:
     - type: Transform
-      pos: 70.59718,-51.425907
+      pos: 71.42389,-47.31942
+      parent: 2
+  - uid: 10275
+    components:
+    - type: Transform
+      pos: 71.58014,-47.41317
       parent: 2
   - uid: 15265
     components:
@@ -52305,11 +53324,6 @@ entities:
       parent: 14704
     - type: Physics
       canCollide: False
-  - uid: 15339
-    components:
-    - type: Transform
-      pos: 70.40968,-51.300816
-      parent: 2
   - uid: 17441
     components:
     - type: Transform
@@ -52339,12 +53353,12 @@ entities:
   - uid: 921
     components:
     - type: Transform
-      pos: 21.316872,-19.489708
+      pos: 21.412895,-19.78014
       parent: 2
   - uid: 14020
     components:
     - type: Transform
-      pos: 21.108538,-19.239534
+      pos: 21.287895,-19.452015
       parent: 2
 - proto: DrinkMugBlack
   entities:
@@ -52440,6 +53454,11 @@ entities:
       parent: 2
 - proto: DrinkWaterBottleFull
   entities:
+  - uid: 901
+    components:
+    - type: Transform
+      pos: 40.217396,-32.324863
+      parent: 2
   - uid: 5597
     components:
     - type: Transform
@@ -52460,6 +53479,11 @@ entities:
     - type: Transform
       pos: -22.248049,-44.28955
       parent: 2
+  - uid: 14928
+    components:
+    - type: Transform
+      pos: 40.35802,-32.52799
+      parent: 2
   - uid: 17710
     components:
     - type: Transform
@@ -52501,16 +53525,10 @@ entities:
   - uid: 11954
     components:
     - type: Transform
-      pos: 67.697716,-46.025784
+      pos: 67.68143,-50.99232
       parent: 2
 - proto: EmergencyLight
   entities:
-  - uid: 1061
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 60.5,-35.5
-      parent: 2
   - uid: 1230
     components:
     - type: Transform
@@ -52570,39 +53588,46 @@ entities:
       rot: 3.141592653589793 rad
       pos: 33.5,-68.5
       parent: 2
-  - uid: 8196
+  - uid: 6343
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 62.5,-35.5
+      pos: 53.5,-42.5
+      parent: 2
+  - uid: 9875
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 68.5,-41.5
+      parent: 2
+  - uid: 10402
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 78.5,-44.5
       parent: 2
   - uid: 10454
     components:
     - type: Transform
       pos: -0.5,-77.5
       parent: 2
+  - uid: 10749
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 64.5,-37.5
+      parent: 2
+  - uid: 10782
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 72.5,-38.5
+      parent: 2
   - uid: 11395
     components:
     - type: Transform
       pos: -6.5,-77.5
       parent: 2
-  - uid: 11412
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 68.5,-32.5
-      parent: 2
-  - uid: 11845
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 58.5,-58.5
-      parent: 2
-  - uid: 13851
-    components:
-    - type: Transform
-      pos: 71.5,-50.5
-      parent: 2
   - uid: 13969
     components:
     - type: Transform
@@ -52679,18 +53704,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 13.5,-36.5
       parent: 2
-  - uid: 14362
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 29.5,-23.5
-      parent: 2
-  - uid: 14363
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 30.5,-17.5
-      parent: 2
   - uid: 14369
     components:
     - type: Transform
@@ -52790,35 +53803,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -12.5,-21.5
       parent: 2
-  - uid: 14393
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 23.5,-18.5
-      parent: 2
-  - uid: 14772
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 57.5,-45.5
-      parent: 2
   - uid: 16419
     components:
     - type: Transform
       pos: 21.5,-48.5
       parent: 2
-  - uid: 17915
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 76.5,-44.5
-      parent: 2
-  - uid: 17924
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 68.5,-48.5
-      parent: 2
   - uid: 18273
     components:
     - type: Transform
@@ -52892,12 +53881,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 48.5,-53.5
       parent: 2
-  - uid: 18289
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 57.5,-24.5
-      parent: 2
   - uid: 18291
     components:
     - type: Transform
@@ -52938,18 +53921,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 44.5,-44.5
       parent: 2
-  - uid: 18365
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-58.5
-      parent: 2
-  - uid: 18632
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 63.5,-48.5
-      parent: 2
   - uid: 18634
     components:
     - type: Transform
@@ -52961,6 +53932,82 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 54.5,-17.5
       parent: 2
+  - uid: 19186
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 66.5,-45.5
+      parent: 2
+  - uid: 19191
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 66.5,-53.5
+      parent: 2
+  - uid: 19248
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 52.5,-38.5
+      parent: 2
+  - uid: 19257
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 53.5,-31.5
+      parent: 2
+  - uid: 19313
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 55.5,-31.5
+      parent: 2
+  - uid: 19314
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 54.5,-39.5
+      parent: 2
+  - uid: 19315
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 56.5,-44.5
+      parent: 2
+  - uid: 19317
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-31.5
+      parent: 2
+  - uid: 19354
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 70.5,-29.5
+      parent: 2
+  - uid: 19952
+    components:
+    - type: Transform
+      pos: 95.5,-47.5
+      parent: 2
+  - uid: 19953
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 95.5,-43.5
+      parent: 2
+  - uid: 19954
+    components:
+    - type: Transform
+      pos: 87.5,-43.5
+      parent: 2
+  - uid: 19955
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 87.5,-47.5
+      parent: 2
 - proto: EmergencyNitrogenTankFilled
   entities:
   - uid: 18755
@@ -53034,14 +54081,6 @@ entities:
       parent: 6930
     - type: Physics
       canCollide: False
-- proto: EncryptionKeyCommand
-  entities:
-  - uid: 16387
-    components:
-    - type: Transform
-      parent: 5607
-    - type: Physics
-      canCollide: False
 - proto: EncryptionKeyCommon
   entities:
   - uid: 6028
@@ -53074,14 +54113,6 @@ entities:
     - type: Transform
       pos: -14.5,-26.5
       parent: 2
-- proto: ExosuitFabricatorMachineCircuitboard
-  entities:
-  - uid: 17885
-    components:
-    - type: Transform
-      parent: 17884
-    - type: Physics
-      canCollide: False
 - proto: ExtinguisherCabinetFilled
   entities:
   - uid: 5781
@@ -53161,6 +54192,13 @@ entities:
       parent: 2
     - type: FaxMachine
       name: CE's Office
+  - uid: 6093
+    components:
+    - type: Transform
+      pos: 67.5,-50.5
+      parent: 2
+    - type: FaxMachine
+      name: HoS
   - uid: 6966
     components:
     - type: Transform
@@ -53168,10 +54206,17 @@ entities:
       parent: 2
     - type: FaxMachine
       name: QM's Office
-  - uid: 9358
+  - uid: 7176
     components:
     - type: Transform
-      pos: 62.5,-31.5
+      pos: 53.5,-54.5
+      parent: 2
+    - type: FaxMachine
+      name: Lawyer
+  - uid: 8381
+    components:
+    - type: Transform
+      pos: 64.5,-45.5
       parent: 2
     - type: FaxMachine
       name: Security
@@ -53182,20 +54227,6 @@ entities:
       parent: 2
     - type: FaxMachine
       name: RD's Office
-  - uid: 10498
-    components:
-    - type: Transform
-      pos: 49.5,-56.5
-      parent: 2
-    - type: FaxMachine
-      name: Lawyer's Office
-  - uid: 15440
-    components:
-    - type: Transform
-      pos: 69.5,-53.5
-      parent: 2
-    - type: FaxMachine
-      name: Detective's Office
   - uid: 16282
     components:
     - type: Transform
@@ -53224,13 +54255,6 @@ entities:
       parent: 2
     - type: FaxMachine
       name: Cargo
-  - uid: 18215
-    components:
-    - type: Transform
-      pos: 67.5,-45.5
-      parent: 2
-    - type: FaxMachine
-      name: HoS' Office
 - proto: FaxMachineCaptain
   entities:
   - uid: 3831
@@ -53302,24 +54326,17 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 10.5,-21.5
       parent: 2
-- proto: FigureSpawner
-  entities:
-  - uid: 8609
-    components:
-    - type: Transform
-      pos: 36.5,-33.5
-      parent: 2
 - proto: filingCabinetDrawerRandom
   entities:
-  - uid: 3084
+  - uid: 283
     components:
     - type: Transform
-      pos: 70.5,-53.5
+      pos: 29.5,-15.5
       parent: 2
-  - uid: 4184
+  - uid: 1438
     components:
     - type: Transform
-      pos: 53.5,-54.5
+      pos: 49.5,-36.5
       parent: 2
   - uid: 5274
     components:
@@ -53331,15 +54348,15 @@ entities:
     - type: Transform
       pos: 15.5,-60.5
       parent: 2
-  - uid: 13819
+  - uid: 7168
     components:
     - type: Transform
-      pos: 62.5,-34.5
+      pos: 49.5,-56.5
       parent: 2
-  - uid: 15340
+  - uid: 9293
     components:
     - type: Transform
-      pos: 70.5,-40.5
+      pos: 73.5,-47.5
       parent: 2
   - uid: 17427
     components:
@@ -53381,40 +54398,6 @@ entities:
       - 1595
       - 18775
       - 3279
-  - uid: 3401
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 64.5,-53.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 3399
-      - 3400
-      - 6164
-      - 3396
-      - 3397
-      - 3531
-      - 9363
-      - 7733
-      - 9287
-      - 275
-      - 13816
-      - 17963
-  - uid: 3427
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 56.5,-28.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 3447
-      - 3449
-      - 7119
-      - 7117
-      - 9351
-      - 3551
   - uid: 5295
     components:
     - type: Transform
@@ -53427,20 +54410,6 @@ entities:
       - 530
       - 8870
       - 8873
-  - uid: 7281
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 62.5,-30.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 3441
-      - 4166
-      - 3449
-      - 3447
-      - 7954
-      - 2157
   - uid: 7439
     components:
     - type: Transform
@@ -53449,12 +54418,12 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8541
-      - 8540
-      - 8539
       - 10476
       - 10477
       - 10478
+      - 19831
+      - 19832
+      - 19833
   - uid: 8800
     components:
     - type: Transform
@@ -53468,24 +54437,27 @@ entities:
       - 872
       - 8870
       - 8873
-  - uid: 10296
+  - uid: 9873
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 66.5,-37.5
+      pos: 62.5,-30.5
       parent: 2
     - type: DeviceList
       devices:
-      - 7954
+      - 16247
+      - 16252
+      - 16259
+      - 16431
+      - 16433
+      - 16240
+      - 16239
+      - 16238
+      - 16448
+      - 16437
       - 2157
-      - 9293
-      - 8403
-      - 4175
-      - 4174
-      - 8404
-      - 7987
-      - 9213
-      - 10298
+      - 7954
+      - 19908
+      - 19907
   - uid: 10791
     components:
     - type: Transform
@@ -53591,6 +54563,32 @@ entities:
       - 17153
       - 17130
       - 17129
+  - uid: 16355
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 66.5,-30.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 3447
+      - 3449
+      - 7954
+      - 2157
+      - 3441
+      - 4166
+  - uid: 16357
+    components:
+    - type: Transform
+      pos: 67.5,-42.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 16240
+      - 16239
+      - 16238
+      - 19903
+      - 19904
   - uid: 18593
     components:
     - type: Transform
@@ -53605,29 +54603,8 @@ entities:
       - 18775
       - 530
       - 8920
-      - 5203
-      - 2388
-  - uid: 18817
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 49.5,-16.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 11725
-      - 11724
-      - 11723
-      - 11722
-      - 11721
-      - 11720
-      - 11719
-      - 11718
-      - 11717
-      - 11716
-      - 11715
-      - 11712
-      - 4169
+      - 19838
+      - 19837
   - uid: 18881
     components:
     - type: Transform
@@ -53639,6 +54616,47 @@ entities:
       - 16165
       - 14594
       - 14595
+  - uid: 19247
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 53.5,-17.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 4169
+      - 4171
+      - 13846
+      - 11724
+      - 11725
+      - 11723
+      - 7979
+      - 11721
+      - 11720
+      - 11719
+      - 11718
+      - 11717
+      - 11716
+      - 11715
+      - 11712
+      - 9297
+      - 7800
+      - 8607
+      - 9082
+      - 9066
+  - uid: 19910
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 53.5,-39.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 19900
+      - 19901
+      - 19902
+      - 19908
+      - 19907
 - proto: FireAlarmXeno
   entities:
   - uid: 1691
@@ -53649,31 +54667,14 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8504
-      - 8503
-      - 8502
       - 8505
       - 8506
-      - 1809
-      - 1807
       - 8507
-  - uid: 1694
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 26.5,-31.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 8545
-      - 8546
-      - 8547
-      - 8551
-      - 8552
-      - 8553
-      - 8703
-      - 18860
-      - 18861
+      - 19888
+      - 19887
+      - 19886
+      - 19892
+      - 19891
   - uid: 2359
     components:
     - type: Transform
@@ -53684,8 +54685,8 @@ entities:
       devices:
       - 8735
       - 8737
-      - 8736
       - 8734
+      - 8479
   - uid: 2409
     components:
     - type: Transform
@@ -53717,6 +54718,10 @@ entities:
       - 5573
       - 5572
       - 5574
+      - 19809
+      - 19810
+      - 19811
+      - 19812
   - uid: 2513
     components:
     - type: Transform
@@ -53743,6 +54748,7 @@ entities:
       - 9541
       - 11336
       - 18786
+      - 8605
   - uid: 3258
     components:
     - type: Transform
@@ -53754,22 +54760,9 @@ entities:
       - 8599
       - 8600
       - 8601
-      - 8538
-      - 8537
-      - 8536
-  - uid: 3329
-    components:
-    - type: Transform
-      pos: 48.5,-50.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 9287
-      - 7733
-      - 9363
-      - 3531
-      - 14283
-      - 12148
+      - 19830
+      - 19829
+      - 19828
   - uid: 5200
     components:
     - type: Transform
@@ -53778,12 +54771,13 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8596
-      - 8597
-      - 8598
-      - 8465
-      - 8464
-      - 8463
+      - 19801
+      - 19800
+      - 19799
+      - 19796
+      - 19797
+      - 19798
+      - 4002
   - uid: 6218
     components:
     - type: Transform
@@ -53795,14 +54789,13 @@ entities:
       - 8498
       - 8497
       - 8496
-      - 14594
-      - 14595
-      - 8450
-      - 8449
-      - 8448
+      - 15243
+      - 9878
       - 14798
       - 14800
       - 14799
+      - 15173
+      - 14797
   - uid: 6344
     components:
     - type: Transform
@@ -53811,14 +54804,14 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8551
-      - 8552
-      - 8553
-      - 8423
-      - 8422
-      - 8421
       - 8554
       - 8555
+      - 19850
+      - 19849
+      - 19848
+      - 19877
+      - 19878
+      - 19879
   - uid: 6345
     components:
     - type: Transform
@@ -53827,20 +54820,20 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8429
-      - 8428
-      - 8427
-      - 8393
-      - 8394
-      - 8395
-      - 8418
-      - 8419
-      - 8420
-      - 8423
-      - 8422
-      - 8421
       - 8556
       - 8424
+      - 19879
+      - 19878
+      - 19877
+      - 8430
+      - 8431
+      - 8432
+      - 8398
+      - 8397
+      - 8396
+      - 8415
+      - 8416
+      - 8417
   - uid: 6346
     components:
     - type: Transform
@@ -53849,14 +54842,15 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8499
-      - 8500
-      - 8501
       - 8430
       - 8431
       - 8432
-      - 7930
-      - 7926
+      - 19888
+      - 19885
+      - 19887
+      - 19886
+      - 19889
+      - 19890
       - 8434
       - 8433
   - uid: 6348
@@ -53867,12 +54861,6 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8389
-      - 12781
-      - 8387
-      - 8384
-      - 8385
-      - 8386
       - 6976
       - 6977
       - 6978
@@ -53882,6 +54870,12 @@ entities:
       - 17153
       - 17130
       - 17129
+      - 19896
+      - 19897
+      - 19898
+      - 19893
+      - 19894
+      - 19895
   - uid: 6349
     components:
     - type: Transform
@@ -53890,14 +54884,14 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 4276
-      - 8382
-      - 8383
       - 8398
       - 8397
       - 8396
       - 10326
       - 9410
+      - 19896
+      - 19897
+      - 19898
   - uid: 6350
     components:
     - type: Transform
@@ -53910,6 +54904,7 @@ entities:
       - 7015
       - 7016
       - 7017
+      - 19882
   - uid: 6405
     components:
     - type: Transform
@@ -53921,6 +54916,7 @@ entities:
       - 9410
       - 10326
       - 8402
+      - 19920
   - uid: 7880
     components:
     - type: Transform
@@ -53944,25 +54940,24 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8532
-      - 8531
-      - 8530
-      - 8520
-      - 8519
-      - 8518
-      - 8514
-      - 8513
-      - 8512
       - 8524
       - 8525
       - 8526
-      - 8453
-      - 8452
-      - 8451
-      - 8445
-      - 8446
-      - 8447
-      - 7443
+      - 19818
+      - 19817
+      - 19816
+      - 9878
+      - 15243
+      - 15173
+      - 4096
+      - 19820
+      - 19821
+      - 19822
+      - 19823
+      - 19824
+      - 19825
+      - 19826
+      - 19827
   - uid: 9039
     components:
     - type: Transform
@@ -53991,6 +54986,8 @@ entities:
       - 8498
       - 8494
       - 8495
+      - 9715
+      - 2462
   - uid: 9200
     components:
     - type: Transform
@@ -54012,14 +55009,11 @@ entities:
       - 10479
       - 10480
       - 10481
-      - 8533
-      - 8534
-      - 8535
       - 7442
       - 8107
-      - 8831
-      - 8832
-      - 8665
+      - 19830
+      - 19829
+      - 19828
       - 16242
   - uid: 9202
     components:
@@ -54056,6 +55050,7 @@ entities:
       - 14799
       - 14800
       - 14798
+      - 14797
   - uid: 9237
     components:
     - type: Transform
@@ -54063,17 +55058,17 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 14832
-      - 14831
       - 8442
       - 8441
       - 8440
       - 8439
       - 8438
-      - 8390
-      - 8391
-      - 8392
       - 18862
+      - 19889
+      - 19890
+      - 19893
+      - 19894
+      - 19895
   - uid: 9238
     components:
     - type: Transform
@@ -54111,6 +55106,7 @@ entities:
       devices:
       - 8433
       - 8434
+      - 19885
   - uid: 9250
     components:
     - type: Transform
@@ -54119,12 +55115,6 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8456
-      - 8455
-      - 8454
-      - 8459
-      - 8458
-      - 8457
       - 8493
   - uid: 9255
     components:
@@ -54133,15 +55123,15 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8466
-      - 8468
-      - 8467
-      - 8460
-      - 8461
-      - 8462
       - 8471
       - 8469
       - 8470
+      - 19802
+      - 19803
+      - 19804
+      - 19799
+      - 19800
+      - 19801
   - uid: 9256
     components:
     - type: Transform
@@ -54156,6 +55146,10 @@ entities:
       - 8472
       - 8473
       - 8474
+      - 19806
+      - 19805
+      - 19807
+      - 19808
   - uid: 9489
     components:
     - type: Transform
@@ -54164,12 +55158,12 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8529
-      - 8528
-      - 8527
       - 10479
       - 10480
       - 10481
+      - 4096
+      - 19820
+      - 19821
   - uid: 9931
     components:
     - type: Transform
@@ -54181,15 +55175,72 @@ entities:
       - 19401
       - 12859
       - 19402
-      - 8550
-      - 8549
+      - 19841
+      - 19840
+      - 19839
+  - uid: 11905
+    components:
+    - type: Transform
+      pos: 46.5,-50.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 12148
+      - 14283
+      - 8547
       - 8548
+      - 8549
   - uid: 15092
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -24.5,-15.5
       parent: 2
+    - type: DeviceList
+      devices:
+      - 8602
+      - 8603
+      - 8604
+      - 8601
+      - 8600
+      - 8599
+      - 19798
+      - 19797
+      - 19796
+  - uid: 16341
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 52.5,-42.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 19903
+      - 19904
+      - 16450
+      - 16451
+      - 19902
+      - 19901
+      - 19900
+      - 8549
+      - 8548
+      - 8547
+  - uid: 16366
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.5,-14.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 18702
+      - 18703
+      - 18704
+      - 914
+      - 913
+      - 19831
+      - 19832
+      - 19833
   - uid: 16800
     components:
     - type: Transform
@@ -54201,21 +55252,10 @@ entities:
       - 8477
       - 8478
       - 18880
-  - uid: 16803
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 32.5,-21.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 8783
-      - 8784
-      - 8789
-      - 8785
-      - 8788
-      - 8787
-      - 8786
+      - 2462
+      - 9715
+      - 19815
+      - 811
   - uid: 16807
     components:
     - type: Transform
@@ -54227,16 +55267,6 @@ entities:
       - 8677
       - 8678
       - 262
-  - uid: 16808
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 48.5,-56.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 12148
-      - 14283
   - uid: 17681
     components:
     - type: Transform
@@ -54245,46 +55275,36 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8515
-      - 8516
-      - 8517
-      - 1438
-      - 1806
-  - uid: 18600
+      - 19827
+      - 19826
+      - 19825
+      - 19892
+      - 19891
+  - uid: 17872
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 22.5,-15.5
+      rot: -1.5707963267948966 rad
+      pos: 26.5,-26.5
       parent: 2
     - type: DeviceList
       devices:
-      - 8764
-      - 14668
-      - 14669
-      - 8542
-      - 8543
-      - 8544
-      - 914
-      - 913
-  - uid: 18883
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 48.5,-26.5
-      parent: 2
-    - type: DeviceList
-      devices:
-      - 11712
-      - 11715
-      - 11716
-      - 11717
-      - 11718
-      - 11719
-      - 11720
-      - 11721
-      - 8572
-      - 8571
-      - 8785
+      - 19845
+      - 19846
+      - 19847
+      - 19838
+      - 19837
+      - 18702
+      - 18703
+      - 18704
+      - 18705
+      - 18706
+      - 18707
+      - 18708
+      - 8550
+      - 8551
+      - 8552
+      - 19854
+      - 19851
   - uid: 19201
     components:
     - type: Transform
@@ -54308,14 +55328,14 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 8523
-      - 8522
-      - 8521
       - 19401
       - 12859
       - 19402
       - 4972
       - 872
+      - 19822
+      - 19823
+      - 19824
   - uid: 19420
     components:
     - type: Transform
@@ -54327,6 +55347,91 @@ entities:
       - 18786
       - 11336
       - 9541
+  - uid: 19852
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 26.5,-30.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 19841
+      - 19840
+      - 19839
+      - 19848
+      - 19849
+      - 19850
+      - 19845
+      - 19846
+      - 19847
+  - uid: 19855
+    components:
+    - type: Transform
+      pos: 34.5,-16.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 18708
+      - 18707
+      - 18706
+      - 18705
+      - 18724
+      - 18723
+      - 18709
+      - 18731
+  - uid: 19857
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 45.5,-25.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 8552
+      - 8551
+      - 8550
+      - 9383
+      - 9877
+      - 7979
+      - 11721
+      - 11720
+      - 11719
+      - 11718
+      - 11717
+      - 11716
+      - 11715
+      - 11712
+  - uid: 19881
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 36.5,-47.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 7009
+      - 7056
+      - 7010
+      - 7011
+      - 7012
+      - 7017
+      - 7016
+      - 7015
+      - 7014
+      - 7013
+      - 19882
+  - uid: 19921
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 30.5,-65.5
+      parent: 2
+    - type: DeviceList
+      devices:
+      - 8976
+      - 8400
+      - 8399
+      - 19920
 - proto: FireAxeCabinetFilled
   entities:
   - uid: 5385
@@ -54349,6 +55454,17 @@ entities:
       parent: 2
 - proto: Firelock
   entities:
+  - uid: 7979
+    components:
+    - type: Transform
+      pos: 50.5,-22.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 18818
+      - 19857
+      - 19856
+      - 19247
   - uid: 11712
     components:
     - type: Transform
@@ -54356,10 +55472,10 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18817
-      - 18873
-      - 18883
       - 18818
+      - 19857
+      - 19856
+      - 19247
   - uid: 11715
     components:
     - type: Transform
@@ -54367,10 +55483,10 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18817
-      - 18873
-      - 18883
       - 18818
+      - 19857
+      - 19856
+      - 19247
   - uid: 11716
     components:
     - type: Transform
@@ -54378,10 +55494,10 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18817
-      - 18873
-      - 18883
       - 18818
+      - 19857
+      - 19856
+      - 19247
   - uid: 11717
     components:
     - type: Transform
@@ -54389,10 +55505,10 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18817
-      - 18873
-      - 18883
       - 18818
+      - 19857
+      - 19856
+      - 19247
   - uid: 11718
     components:
     - type: Transform
@@ -54400,10 +55516,10 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18817
-      - 18873
-      - 18883
       - 18818
+      - 19857
+      - 19856
+      - 19247
   - uid: 11719
     components:
     - type: Transform
@@ -54411,10 +55527,10 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18817
-      - 18873
-      - 18883
       - 18818
+      - 19857
+      - 19856
+      - 19247
   - uid: 11720
     components:
     - type: Transform
@@ -54422,10 +55538,10 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18817
-      - 18873
-      - 18883
       - 18818
+      - 19857
+      - 19856
+      - 19247
   - uid: 11721
     components:
     - type: Transform
@@ -54433,20 +55549,10 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18817
-      - 18873
-      - 18883
-      - 18818
-  - uid: 11722
-    components:
-    - type: Transform
-      pos: 53.5,-22.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 18817
-      - 18874
       - 18818
+      - 19857
+      - 19856
+      - 19247
   - uid: 11723
     components:
     - type: Transform
@@ -54454,9 +55560,9 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18817
-      - 18874
       - 18818
+      - 579
+      - 19247
   - uid: 11724
     components:
     - type: Transform
@@ -54464,9 +55570,9 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18817
-      - 18874
       - 18818
+      - 579
+      - 19247
   - uid: 11725
     components:
     - type: Transform
@@ -54474,11 +55580,30 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18817
-      - 18874
       - 18818
+      - 579
+      - 19247
+  - uid: 19913
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 77.5,-45.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19916
 - proto: FirelockEdge
   entities:
+  - uid: 811
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -35.5,-69.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16800
+      - 2110
   - uid: 913
     components:
     - type: Transform
@@ -54486,8 +55611,8 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18600
-      - 18598
+      - 16366
+      - 10761
   - uid: 914
     components:
     - type: Transform
@@ -54495,46 +55620,19 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18600
-      - 18598
-  - uid: 1438
+      - 16366
+      - 10761
+  - uid: 2008
     components:
     - type: Transform
-      pos: 4.5,-44.5
+      pos: 37.5,-87.5
       parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 17681
-      - 17680
-  - uid: 1806
-    components:
-    - type: Transform
-      pos: 5.5,-44.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 17681
-      - 17680
-  - uid: 1807
+  - uid: 2009
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 5.5,-46.5
+      pos: 37.5,-82.5
       parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9216
-      - 1691
-  - uid: 1809
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-46.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9216
-      - 1691
   - uid: 3441
     components:
     - type: Transform
@@ -54544,8 +55642,8 @@ entities:
       deviceLists:
       - 18059
       - 10791
-      - 7281
       - 8816
+      - 16355
   - uid: 4166
     components:
     - type: Transform
@@ -54555,8 +55653,8 @@ entities:
       deviceLists:
       - 18059
       - 10791
-      - 7281
       - 8816
+      - 16355
   - uid: 4169
     components:
     - type: Transform
@@ -54565,25 +55663,10 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18817
       - 18059
       - 10791
       - 18818
-  - uid: 4276
-    components:
-    - type: Transform
-      pos: 23.5,-74.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9240
-      - 6349
-  - uid: 5461
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 33.5,-98.5
-      parent: 2
+      - 19247
   - uid: 5575
     components:
     - type: Transform
@@ -54632,17 +55715,6 @@ entities:
       - 2409
       - 9195
       - 2513
-  - uid: 6970
-    components:
-    - type: Transform
-      pos: 37.5,-82.5
-      parent: 2
-  - uid: 6971
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 37.5,-87.5
-      parent: 2
   - uid: 7013
     components:
     - type: Transform
@@ -54653,6 +55725,8 @@ entities:
       deviceLists:
       - 6350
       - 9241
+      - 19881
+      - 19880
   - uid: 7014
     components:
     - type: Transform
@@ -54663,6 +55737,8 @@ entities:
       deviceLists:
       - 6350
       - 9241
+      - 19881
+      - 19880
   - uid: 7015
     components:
     - type: Transform
@@ -54673,6 +55749,8 @@ entities:
       deviceLists:
       - 6350
       - 9241
+      - 19881
+      - 19880
   - uid: 7016
     components:
     - type: Transform
@@ -54683,6 +55761,8 @@ entities:
       deviceLists:
       - 6350
       - 9241
+      - 19881
+      - 19880
   - uid: 7017
     components:
     - type: Transform
@@ -54693,6 +55773,8 @@ entities:
       deviceLists:
       - 6350
       - 9241
+      - 19881
+      - 19880
   - uid: 7135
     components:
     - type: Transform
@@ -54703,146 +55785,16 @@ entities:
       deviceLists:
       - 14591
       - 14590
-  - uid: 7926
-    components:
-    - type: Transform
-      pos: 8.5,-63.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9403
-      - 6346
-  - uid: 7930
-    components:
-    - type: Transform
-      pos: 9.5,-63.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9403
-      - 6346
-  - uid: 8382
-    components:
-    - type: Transform
-      pos: 24.5,-74.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9240
-      - 6349
-  - uid: 8383
-    components:
-    - type: Transform
-      pos: 25.5,-74.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9240
-      - 6349
-  - uid: 8384
+  - uid: 7800
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 23.5,-76.5
+      pos: 46.5,-13.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 9239
-      - 6348
-  - uid: 8385
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 24.5,-76.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9239
-      - 6348
-  - uid: 8386
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-76.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9239
-      - 6348
-  - uid: 8387
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 15.5,-76.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9239
-      - 6348
-  - uid: 8389
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 13.5,-76.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9239
-      - 6348
-  - uid: 8390
-    components:
-    - type: Transform
-      pos: 13.5,-74.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 569
-      - 9237
-  - uid: 8391
-    components:
-    - type: Transform
-      pos: 14.5,-74.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 569
-      - 9237
-  - uid: 8392
-    components:
-    - type: Transform
-      pos: 15.5,-74.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 569
-      - 9237
-  - uid: 8393
-    components:
-    - type: Transform
-      pos: 23.5,-59.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9236
-      - 6345
-  - uid: 8394
-    components:
-    - type: Transform
-      pos: 24.5,-59.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9236
-      - 6345
-  - uid: 8395
-    components:
-    - type: Transform
-      pos: 25.5,-59.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9236
-      - 6345
+      - 19247
+      - 18818
   - uid: 8396
     components:
     - type: Transform
@@ -54853,6 +55805,8 @@ entities:
       deviceLists:
       - 9240
       - 6349
+      - 6345
+      - 9236
   - uid: 8397
     components:
     - type: Transform
@@ -54863,6 +55817,8 @@ entities:
       deviceLists:
       - 9240
       - 6349
+      - 6345
+      - 9236
   - uid: 8398
     components:
     - type: Transform
@@ -54873,6 +55829,8 @@ entities:
       deviceLists:
       - 9240
       - 6349
+      - 6345
+      - 9236
   - uid: 8399
     components:
     - type: Transform
@@ -54882,6 +55840,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 7310
+      - 19921
   - uid: 8400
     components:
     - type: Transform
@@ -54891,6 +55850,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 7310
+      - 19921
   - uid: 8415
     components:
     - type: Transform
@@ -54901,6 +55861,8 @@ entities:
       deviceLists:
       - 572
       - 9039
+      - 6345
+      - 9236
   - uid: 8416
     components:
     - type: Transform
@@ -54911,6 +55873,8 @@ entities:
       deviceLists:
       - 572
       - 9039
+      - 6345
+      - 9236
   - uid: 8417
     components:
     - type: Transform
@@ -54921,112 +55885,8 @@ entities:
       deviceLists:
       - 572
       - 9039
-  - uid: 8418
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 30.5,-54.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9236
       - 6345
-  - uid: 8419
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 30.5,-53.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
       - 9236
-      - 6345
-  - uid: 8420
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 30.5,-52.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9236
-      - 6345
-  - uid: 8421
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 23.5,-47.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9236
-      - 6345
-      - 6344
-      - 9235
-  - uid: 8422
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 24.5,-47.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9236
-      - 6345
-      - 6344
-      - 9235
-  - uid: 8423
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-47.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9236
-      - 6345
-      - 6344
-      - 9235
-  - uid: 8426
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 30.5,-14.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 19354
-      - 18869
-  - uid: 8427
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 18.5,-54.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9236
-      - 6345
-  - uid: 8428
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 18.5,-53.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9236
-      - 6345
-  - uid: 8429
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 18.5,-52.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9236
-      - 6345
   - uid: 8430
     components:
     - type: Transform
@@ -55037,6 +55897,8 @@ entities:
       deviceLists:
       - 9403
       - 6346
+      - 6345
+      - 9236
   - uid: 8431
     components:
     - type: Transform
@@ -55047,6 +55909,8 @@ entities:
       deviceLists:
       - 9403
       - 6346
+      - 6345
+      - 9236
   - uid: 8432
     components:
     - type: Transform
@@ -55057,240 +55921,8 @@ entities:
       deviceLists:
       - 9403
       - 6346
-  - uid: 8445
-    components:
-    - type: Transform
-      pos: -14.5,-42.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 469
-      - 9038
-  - uid: 8446
-    components:
-    - type: Transform
-      pos: -13.5,-42.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 469
-      - 9038
-  - uid: 8447
-    components:
-    - type: Transform
-      pos: -12.5,-42.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 469
-      - 9038
-  - uid: 8448
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -12.5,-44.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6218
-      - 9234
-  - uid: 8449
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -13.5,-44.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6218
-      - 9234
-  - uid: 8450
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,-44.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6218
-      - 9234
-  - uid: 8451
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.5,-39.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 469
-      - 9038
-  - uid: 8452
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.5,-38.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 469
-      - 9038
-  - uid: 8453
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -14.5,-37.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 469
-      - 9038
-  - uid: 8454
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -16.5,-37.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6410
-      - 9250
-  - uid: 8455
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -16.5,-38.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6410
-      - 9250
-  - uid: 8456
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -16.5,-39.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6410
-      - 9250
-  - uid: 8457
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -25.5,-37.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6410
-      - 9250
-  - uid: 8458
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -25.5,-36.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6410
-      - 9250
-  - uid: 8459
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -25.5,-35.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6410
-      - 9250
-  - uid: 8460
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -27.5,-35.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6411
-      - 9255
-  - uid: 8461
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -27.5,-36.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6411
-      - 9255
-  - uid: 8462
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -27.5,-37.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6411
-      - 9255
-  - uid: 8463
-    components:
-    - type: Transform
-      pos: -29.5,-29.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6646
-      - 5200
-  - uid: 8464
-    components:
-    - type: Transform
-      pos: -28.5,-29.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6646
-      - 5200
-  - uid: 8465
-    components:
-    - type: Transform
-      pos: -27.5,-29.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6646
-      - 5200
-  - uid: 8466
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -29.5,-31.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6411
-      - 9255
-  - uid: 8467
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.5,-31.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6411
-      - 9255
-  - uid: 8468
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -28.5,-31.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6411
-      - 9255
+      - 6345
+      - 9236
   - uid: 8477
     components:
     - type: Transform
@@ -55349,475 +55981,6 @@ entities:
       - 6407
       - 1876
       - 9178
-  - uid: 8499
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-52.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9403
-      - 6346
-  - uid: 8500
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-53.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9403
-      - 6346
-  - uid: 8501
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-54.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9403
-      - 6346
-  - uid: 8502
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-54.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9216
-      - 1691
-  - uid: 8503
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-53.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9216
-      - 1691
-  - uid: 8504
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-52.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9216
-      - 1691
-  - uid: 8512
-    components:
-    - type: Transform
-      pos: 3.5,-37.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 469
-      - 9038
-  - uid: 8513
-    components:
-    - type: Transform
-      pos: 4.5,-37.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 469
-      - 9038
-  - uid: 8514
-    components:
-    - type: Transform
-      pos: 5.5,-37.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 469
-      - 9038
-  - uid: 8515
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-39.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 17681
-      - 17680
-  - uid: 8516
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-39.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 17681
-      - 17680
-  - uid: 8517
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-39.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 17681
-      - 17680
-  - uid: 8518
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-36.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 469
-      - 9038
-  - uid: 8519
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-35.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 469
-      - 9038
-  - uid: 8520
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-34.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 469
-      - 9038
-  - uid: 8521
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-34.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 19399
-      - 19400
-  - uid: 8522
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-35.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 19399
-      - 19400
-  - uid: 8523
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-36.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 19399
-      - 19400
-  - uid: 8527
-    components:
-    - type: Transform
-      pos: -1.5,-26.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9489
-      - 1212
-  - uid: 8528
-    components:
-    - type: Transform
-      pos: -0.5,-26.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9489
-      - 1212
-  - uid: 8529
-    components:
-    - type: Transform
-      pos: 0.5,-26.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9489
-      - 1212
-  - uid: 8530
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-28.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 469
-      - 9038
-  - uid: 8531
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,-28.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 469
-      - 9038
-  - uid: 8532
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-28.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 469
-      - 9038
-  - uid: 8533
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -8.5,-13.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 3897
-      - 9200
-  - uid: 8534
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -8.5,-12.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 3897
-      - 9200
-  - uid: 8535
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -8.5,-11.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 3897
-      - 9200
-  - uid: 8536
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -10.5,-11.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9199
-      - 3258
-  - uid: 8537
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -10.5,-12.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9199
-      - 3258
-  - uid: 8538
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -10.5,-13.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9199
-      - 3258
-  - uid: 8539
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 14.5,-11.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7439
-      - 459
-  - uid: 8540
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 14.5,-12.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7439
-      - 459
-  - uid: 8541
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 14.5,-13.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7439
-      - 459
-  - uid: 8542
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 16.5,-13.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 18600
-      - 18598
-  - uid: 8543
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 16.5,-12.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 18600
-      - 18598
-  - uid: 8544
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 16.5,-11.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 18600
-      - 18598
-  - uid: 8545
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 23.5,-34.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9040
-      - 1694
-  - uid: 8546
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 23.5,-35.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9040
-      - 1694
-  - uid: 8547
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 23.5,-36.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9040
-      - 1694
-  - uid: 8548
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 21.5,-36.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9931
-      - 1751
-  - uid: 8549
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 21.5,-35.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9931
-      - 1751
-  - uid: 8550
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 21.5,-34.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9931
-      - 1751
-  - uid: 8551
-    components:
-    - type: Transform
-      pos: 23.5,-37.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9040
-      - 1694
-      - 6344
-      - 9235
-  - uid: 8552
-    components:
-    - type: Transform
-      pos: 24.5,-37.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9040
-      - 1694
-      - 6344
-      - 9235
-  - uid: 8553
-    components:
-    - type: Transform
-      pos: 25.5,-37.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9040
-      - 1694
-      - 6344
-      - 9235
-  - uid: 8571
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 52.5,-24.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 18874
-      - 18873
-      - 18883
-  - uid: 8572
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 52.5,-23.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 18874
-      - 18873
-      - 18883
   - uid: 8592
     components:
     - type: Transform
@@ -55826,52 +55989,17 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 6358
-  - uid: 8593
-    components:
-    - type: Transform
-      pos: -29.5,-18.5
-      parent: 2
-  - uid: 8594
-    components:
-    - type: Transform
-      pos: -28.5,-18.5
-      parent: 2
-  - uid: 8595
-    components:
-    - type: Transform
-      pos: -27.5,-18.5
-      parent: 2
-  - uid: 8596
+      - 19876
+  - uid: 8607
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -29.5,-20.5
+      pos: 45.5,-13.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 6646
-      - 5200
-  - uid: 8597
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -28.5,-20.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6646
-      - 5200
-  - uid: 8598
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -27.5,-20.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6646
-      - 5200
+      - 19247
+      - 18818
   - uid: 8640
     components:
     - type: Transform
@@ -55888,25 +56016,9 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 4.5,-21.5
       parent: 2
-  - uid: 8703
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-25.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 9040
-      - 1694
-  - uid: 8764
-    components:
-    - type: Transform
-      pos: 23.5,-20.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 18600
-      - 18598
+      - 19836
   - uid: 8976
     components:
     - type: Transform
@@ -55915,34 +56027,59 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 7310
-  - uid: 12781
+      - 19921
+  - uid: 9066
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 14.5,-76.5
+      pos: 43.5,-13.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 9239
-      - 6348
-  - uid: 14668
+      - 19247
+      - 18818
+  - uid: 9082
     components:
     - type: Transform
-      pos: 24.5,-20.5
+      rot: 3.141592653589793 rad
+      pos: 44.5,-13.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18600
-      - 18598
-  - uid: 14669
+      - 19247
+      - 18818
+  - uid: 9297
     components:
     - type: Transform
-      pos: 25.5,-20.5
+      rot: 3.141592653589793 rad
+      pos: 47.5,-13.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18600
-      - 18598
+      - 19247
+      - 18818
+  - uid: 9383
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 53.5,-24.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19856
+      - 19857
+      - 579
+  - uid: 9877
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 53.5,-23.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19856
+      - 19857
+      - 579
   - uid: 14755
     components:
     - type: Transform
@@ -55999,26 +56136,6 @@ entities:
       - 5526
       - 9234
       - 6218
-  - uid: 14831
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 9.5,-65.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 569
-      - 9237
-  - uid: 14832
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 8.5,-65.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 569
-      - 9237
   - uid: 17129
     components:
     - type: Transform
@@ -56061,17 +56178,16 @@ entities:
       rot: 3.141592653589793 rad
       pos: -59.5,-27.5
       parent: 2
-  - uid: 17872
-    components:
-    - type: Transform
-      pos: -59.5,-63.5
-      parent: 2
-  - uid: 18269
+  - uid: 18735
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 33.5,-99.5
+      pos: 34.5,-15.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16363
+      - 18736
   - uid: 18857
     components:
     - type: Transform
@@ -56083,26 +56199,6 @@ entities:
       - 14590
       - 14592
       - 14591
-  - uid: 18860
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 24.5,-25.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9040
-      - 1694
-  - uid: 18861
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 23.5,-25.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9040
-      - 1694
   - uid: 18865
     components:
     - type: Transform
@@ -56129,6 +56225,49 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -14.5,-32.5
       parent: 2
+  - uid: 19815
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -34.5,-69.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16800
+      - 2110
+  - uid: 19877
+    components:
+    - type: Transform
+      pos: 25.5,-45.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9235
+      - 6344
+      - 6345
+      - 9236
+  - uid: 19878
+    components:
+    - type: Transform
+      pos: 24.5,-45.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9235
+      - 6344
+      - 6345
+      - 9236
+  - uid: 19879
+    components:
+    - type: Transform
+      pos: 23.5,-45.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9235
+      - 6344
+      - 6345
+      - 9236
 - proto: FirelockGlass
   entities:
   - uid: 44
@@ -56152,16 +56291,6 @@ entities:
       - 18864
       - 16807
       - 2197
-  - uid: 275
-    components:
-    - type: Transform
-      pos: 59.5,-54.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 8124
-      - 3401
-      - 7131
   - uid: 530
     components:
     - type: Transform
@@ -56184,11 +56313,6 @@ entities:
       - 8800
       - 8767
       - 19400
-  - uid: 885
-    components:
-    - type: Transform
-      pos: 75.5,-45.5
-      parent: 2
   - uid: 1112
     components:
     - type: Transform
@@ -56237,9 +56361,9 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 8816
-      - 7281
-      - 7953
-      - 10296
+      - 9873
+      - 16354
+      - 16355
   - uid: 2381
     components:
     - type: Transform
@@ -56251,15 +56375,6 @@ entities:
       - 14642
       - 18593
       - 364
-  - uid: 2388
-    components:
-    - type: Transform
-      pos: 22.5,-22.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 18593
-      - 364
   - uid: 2462
     components:
     - type: Transform
@@ -56269,6 +56384,8 @@ entities:
       deviceLists:
       - 2110
       - 1876
+      - 9178
+      - 16800
   - uid: 3279
     components:
     - type: Transform
@@ -56280,47 +56397,6 @@ entities:
       - 14642
       - 18593
       - 364
-  - uid: 3390
-    components:
-    - type: Transform
-      pos: 65.5,-61.5
-      parent: 2
-  - uid: 3396
-    components:
-    - type: Transform
-      pos: 59.5,-47.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 3401
-      - 7131
-  - uid: 3397
-    components:
-    - type: Transform
-      pos: 58.5,-47.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 3401
-      - 7131
-  - uid: 3399
-    components:
-    - type: Transform
-      pos: 62.5,-47.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 3401
-      - 7131
-  - uid: 3400
-    components:
-    - type: Transform
-      pos: 63.5,-47.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 3401
-      - 7131
   - uid: 3447
     components:
     - type: Transform
@@ -56329,9 +56405,8 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 8816
-      - 7281
-      - 3446
-      - 3427
+      - 19909
+      - 16355
   - uid: 3448
     components:
     - type: Transform
@@ -56341,6 +56416,7 @@ entities:
       deviceLists:
       - 18059
       - 10791
+      - 6358
   - uid: 3449
     components:
     - type: Transform
@@ -56349,19 +56425,8 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 8816
-      - 7281
-      - 3427
-  - uid: 3531
-    components:
-    - type: Transform
-      pos: 54.5,-49.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 3401
-      - 7131
-      - 3329
-      - 3424
+      - 19909
+      - 16355
   - uid: 3659
     components:
     - type: Transform
@@ -56381,6 +56446,19 @@ entities:
       deviceLists:
       - 16120
       - 9202
+      - 5200
+      - 6646
+  - uid: 4096
+    components:
+    - type: Transform
+      pos: -1.5,-27.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9038
+      - 469
+      - 9489
+      - 1212
   - uid: 4171
     components:
     - type: Transform
@@ -56390,26 +56468,8 @@ entities:
       deviceLists:
       - 18059
       - 10791
-  - uid: 4174
-    components:
-    - type: Transform
-      pos: 61.5,-38.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7104
-      - 7953
-      - 10296
-  - uid: 4175
-    components:
-    - type: Transform
-      pos: 61.5,-37.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7104
-      - 7953
-      - 10296
+      - 19247
+      - 18818
   - uid: 4972
     components:
     - type: Transform
@@ -56419,20 +56479,15 @@ entities:
       deviceLists:
       - 19399
       - 19400
+      - 8767
   - uid: 4984
     components:
     - type: Transform
       pos: 7.5,-32.5
       parent: 2
-  - uid: 5203
-    components:
-    - type: Transform
-      pos: 22.5,-23.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18593
-      - 364
+      - 8767
   - uid: 5569
     components:
     - type: Transform
@@ -56587,15 +56642,6 @@ entities:
       - 14459
       - 3897
       - 9200
-  - uid: 6164
-    components:
-    - type: Transform
-      pos: 60.5,-47.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 3401
-      - 7131
   - uid: 6631
     components:
     - type: Transform
@@ -56660,6 +56706,9 @@ entities:
     - type: Transform
       pos: 7.5,-30.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 8767
   - uid: 6976
     components:
     - type: Transform
@@ -56702,6 +56751,8 @@ entities:
       deviceLists:
       - 9243
       - 7880
+      - 19881
+      - 19880
   - uid: 7010
     components:
     - type: Transform
@@ -56711,6 +56762,8 @@ entities:
       deviceLists:
       - 9243
       - 7880
+      - 19881
+      - 19880
   - uid: 7011
     components:
     - type: Transform
@@ -56720,6 +56773,8 @@ entities:
       deviceLists:
       - 9243
       - 7880
+      - 19881
+      - 19880
   - uid: 7012
     components:
     - type: Transform
@@ -56729,6 +56784,8 @@ entities:
       deviceLists:
       - 9243
       - 7880
+      - 19881
+      - 19880
   - uid: 7056
     components:
     - type: Transform
@@ -56738,6 +56795,8 @@ entities:
       deviceLists:
       - 7880
       - 9243
+      - 19881
+      - 19880
   - uid: 7109
     components:
     - type: Transform
@@ -56747,27 +56806,7 @@ entities:
       deviceLists:
       - 18059
       - 10791
-      - 18874
-  - uid: 7117
-    components:
-    - type: Transform
-      pos: 58.5,-33.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 3446
-      - 3427
-      - 7104
-  - uid: 7119
-    components:
-    - type: Transform
-      pos: 59.5,-33.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 3446
-      - 3427
-      - 7104
+      - 579
   - uid: 7440
     components:
     - type: Transform
@@ -56795,9 +56834,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 469
       - 9242
-      - 9038
       - 1075
   - uid: 7459
     components:
@@ -56809,33 +56846,6 @@ entities:
       - 14460
       - 14458
       - 14459
-  - uid: 7498
-    components:
-    - type: Transform
-      pos: 81.5,-46.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 467
-  - uid: 7654
-    components:
-    - type: Transform
-      pos: 81.5,-44.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 467
-  - uid: 7733
-    components:
-    - type: Transform
-      pos: 54.5,-51.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 3401
-      - 7131
-      - 3329
-      - 3424
   - uid: 7954
     components:
     - type: Transform
@@ -56844,18 +56854,9 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 8816
-      - 7281
-      - 7953
-      - 10296
-  - uid: 7987
-    components:
-    - type: Transform
-      pos: 62.5,-44.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7953
-      - 10296
+      - 9873
+      - 16354
+      - 16355
   - uid: 8107
     components:
     - type: Transform
@@ -56866,11 +56867,7 @@ entities:
       - 19201
       - 19200
       - 9200
-  - uid: 8381
-    components:
-    - type: Transform
-      pos: 61.5,-43.5
-      parent: 2
+      - 3897
   - uid: 8402
     components:
     - type: Transform
@@ -56880,44 +56877,6 @@ entities:
       deviceLists:
       - 9248
       - 6405
-  - uid: 8403
-    components:
-    - type: Transform
-      pos: 66.5,-33.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7953
-      - 10296
-  - uid: 8404
-    components:
-    - type: Transform
-      pos: 61.5,-41.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7953
-      - 10296
-  - uid: 8405
-    components:
-    - type: Transform
-      pos: 66.5,-67.5
-      parent: 2
-  - uid: 8406
-    components:
-    - type: Transform
-      pos: 67.5,-67.5
-      parent: 2
-  - uid: 8407
-    components:
-    - type: Transform
-      pos: 70.5,-71.5
-      parent: 2
-  - uid: 8408
-    components:
-    - type: Transform
-      pos: 78.5,-60.5
-      parent: 2
   - uid: 8409
     components:
     - type: Transform
@@ -56933,6 +56892,7 @@ entities:
       - 6345
       - 9243
       - 7880
+      - 9236
   - uid: 8425
     components:
     - type: Transform
@@ -57096,11 +57056,10 @@ entities:
     - type: Transform
       pos: -52.5,-61.5
       parent: 2
-  - uid: 8480
-    components:
-    - type: Transform
-      pos: -52.5,-62.5
-      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 2359
+      - 9262
   - uid: 8481
     components:
     - type: Transform
@@ -57234,7 +57193,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 8800
-      - 8767
       - 469
       - 9038
   - uid: 8525
@@ -57245,7 +57203,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 8800
-      - 8767
       - 469
       - 9038
   - uid: 8526
@@ -57256,9 +57213,74 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 8800
-      - 8767
       - 469
       - 9038
+  - uid: 8547
+    components:
+    - type: Transform
+      pos: 50.5,-48.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 11905
+      - 3424
+      - 16341
+      - 16312
+  - uid: 8548
+    components:
+    - type: Transform
+      pos: 51.5,-48.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 11905
+      - 3424
+      - 16341
+      - 16312
+  - uid: 8549
+    components:
+    - type: Transform
+      pos: 52.5,-48.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 11905
+      - 3424
+      - 16341
+      - 16312
+  - uid: 8550
+    components:
+    - type: Transform
+      pos: 33.5,-22.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17872
+      - 16367
+      - 19857
+      - 19856
+  - uid: 8551
+    components:
+    - type: Transform
+      pos: 33.5,-23.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17872
+      - 16367
+      - 19857
+      - 19856
+  - uid: 8552
+    components:
+    - type: Transform
+      pos: 33.5,-24.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17872
+      - 16367
+      - 19857
+      - 19856
   - uid: 8554
     components:
     - type: Transform
@@ -57291,54 +57313,7 @@ entities:
       - 6345
       - 9243
       - 7880
-  - uid: 8586
-    components:
-    - type: Transform
-      pos: 88.5,-48.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 467
-  - uid: 8587
-    components:
-    - type: Transform
-      pos: 88.5,-49.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 467
-  - uid: 8588
-    components:
-    - type: Transform
-      pos: 88.5,-50.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 467
-  - uid: 8589
-    components:
-    - type: Transform
-      pos: 88.5,-42.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 467
-  - uid: 8590
-    components:
-    - type: Transform
-      pos: 88.5,-41.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 467
-  - uid: 8591
-    components:
-    - type: Transform
-      pos: 88.5,-40.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 467
+      - 9236
   - uid: 8599
     components:
     - type: Transform
@@ -57348,6 +57323,8 @@ entities:
       deviceLists:
       - 9199
       - 3258
+      - 15092
+      - 15885
   - uid: 8600
     components:
     - type: Transform
@@ -57357,6 +57334,8 @@ entities:
       deviceLists:
       - 9199
       - 3258
+      - 15092
+      - 15885
   - uid: 8601
     components:
     - type: Transform
@@ -57366,6 +57345,8 @@ entities:
       deviceLists:
       - 9199
       - 3258
+      - 15092
+      - 15885
   - uid: 8602
     components:
     - type: Transform
@@ -57375,6 +57356,8 @@ entities:
       deviceLists:
       - 9198
       - 3256
+      - 15092
+      - 15885
   - uid: 8603
     components:
     - type: Transform
@@ -57384,6 +57367,8 @@ entities:
       deviceLists:
       - 9198
       - 3256
+      - 15092
+      - 15885
   - uid: 8604
     components:
     - type: Transform
@@ -57393,11 +57378,17 @@ entities:
       deviceLists:
       - 9198
       - 3256
+      - 15092
+      - 15885
   - uid: 8605
     components:
     - type: Transform
       pos: -41.5,-11.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 3256
+      - 9198
   - uid: 8664
     components:
     - type: Transform
@@ -57416,8 +57407,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 14636
-      - 3897
-      - 9200
+      - 19835
   - uid: 8676
     components:
     - type: Transform
@@ -57458,8 +57448,8 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 9262
       - 2359
+      - 9262
   - uid: 8735
     components:
     - type: Transform
@@ -57469,15 +57459,6 @@ entities:
       deviceLists:
       - 9262
       - 2359
-  - uid: 8736
-    components:
-    - type: Transform
-      pos: -52.5,-61.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 9262
-      - 2359
   - uid: 8737
     components:
     - type: Transform
@@ -57496,75 +57477,7 @@ entities:
       deviceLists:
       - 349
       - 14642
-  - uid: 8783
-    components:
-    - type: Transform
-      pos: 26.5,-22.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6354
-      - 16803
-  - uid: 8784
-    components:
-    - type: Transform
-      pos: 26.5,-23.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6354
-      - 16803
-  - uid: 8785
-    components:
-    - type: Transform
-      pos: 32.5,-22.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6354
-      - 18873
-      - 16803
-      - 18883
-  - uid: 8786
-    components:
-    - type: Transform
-      pos: 28.5,-17.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 16803
-      - 19354
-      - 6354
-  - uid: 8787
-    components:
-    - type: Transform
-      pos: 29.5,-17.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 19354
-      - 16803
-      - 6354
-  - uid: 8788
-    components:
-    - type: Transform
-      pos: 30.5,-17.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 16803
-      - 19354
-      - 6354
-  - uid: 8789
-    components:
-    - type: Transform
-      pos: 28.5,-24.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6353
-      - 6354
-      - 16803
+      - 19836
   - uid: 8870
     components:
     - type: Transform
@@ -57598,46 +57511,6 @@ entities:
       - 364
       - 5295
       - 17282
-  - uid: 9213
-    components:
-    - type: Transform
-      pos: 63.5,-44.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7953
-      - 10296
-  - uid: 9287
-    components:
-    - type: Transform
-      pos: 54.5,-52.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 3401
-      - 7131
-      - 3329
-      - 3424
-  - uid: 9293
-    components:
-    - type: Transform
-      pos: 66.5,-32.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7953
-      - 10296
-  - uid: 9363
-    components:
-    - type: Transform
-      pos: 54.5,-50.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 3401
-      - 7131
-      - 3329
-      - 3424
   - uid: 9410
     components:
     - type: Transform
@@ -57670,21 +57543,20 @@ entities:
       deviceLists:
       - 2110
       - 1876
-  - uid: 10297
+      - 9178
+      - 16800
+  - uid: 9878
     components:
     - type: Transform
-      pos: 61.5,-42.5
-      parent: 2
-  - uid: 10298
-    components:
-    - type: Transform
-      pos: 66.5,-44.5
+      rot: 3.141592653589793 rad
+      pos: -14.5,-43.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 7953
-      - 10296
-      - 10295
+      - 6218
+      - 9234
+      - 9038
+      - 469
   - uid: 10326
     components:
     - type: Transform
@@ -57762,14 +57634,24 @@ entities:
       - 9200
       - 9489
       - 1212
-  - uid: 10754
+  - uid: 10788
     components:
     - type: Transform
-      pos: 58.5,-40.5
+      rot: -1.5707963267948966 rad
+      pos: 90.5,-49.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 7104
+      - 10839
+  - uid: 10811
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 90.5,-48.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 10839
   - uid: 11336
     components:
     - type: Transform
@@ -57789,17 +57671,10 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 6418
-      - 16808
       - 572
       - 9039
-      - 3329
       - 3424
-  - uid: 12855
-    components:
-    - type: Transform
-      pos: 66.5,-61.5
-      parent: 2
+      - 11905
   - uid: 12859
     components:
     - type: Transform
@@ -57816,6 +57691,9 @@ entities:
     - type: Transform
       pos: 7.5,-31.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 8767
   - uid: 13567
     components:
     - type: Transform
@@ -57826,16 +57704,6 @@ entities:
       - 18493
       - 18013
       - 15095
-  - uid: 13816
-    components:
-    - type: Transform
-      pos: 60.5,-54.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 8124
-      - 3401
-      - 7131
   - uid: 13846
     components:
     - type: Transform
@@ -57845,6 +57713,8 @@ entities:
       deviceLists:
       - 18059
       - 10791
+      - 19247
+      - 18818
   - uid: 14283
     components:
     - type: Transform
@@ -57852,12 +57722,10 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 6418
-      - 16808
       - 572
       - 9039
-      - 3329
       - 3424
+      - 11905
   - uid: 14594
     components:
     - type: Transform
@@ -57866,7 +57734,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 14593
-      - 6218
       - 18881
   - uid: 14595
     components:
@@ -57876,7 +57743,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 14593
-      - 6218
       - 18881
   - uid: 14728
     components:
@@ -57887,7 +57753,7 @@ entities:
       deviceLists:
       - 18059
       - 10791
-      - 18874
+      - 579
   - uid: 14730
     components:
     - type: Transform
@@ -57897,6 +57763,7 @@ entities:
       deviceLists:
       - 18059
       - 10791
+      - 6358
   - uid: 14753
     components:
     - type: Transform
@@ -57922,15 +57789,76 @@ entities:
     - type: Transform
       pos: -11.5,-48.5
       parent: 2
-  - uid: 15269
+    - type: DeviceNetwork
+      deviceLists:
+      - 6218
+      - 9234
+      - 9233
+      - 5526
+  - uid: 15173
     components:
     - type: Transform
-      pos: -36.5,-75.5
+      rot: 3.141592653589793 rad
+      pos: -12.5,-43.5
       parent: 2
-  - uid: 15270
+    - type: DeviceNetwork
+      deviceLists:
+      - 6218
+      - 9234
+      - 9038
+      - 469
+  - uid: 15191
     components:
     - type: Transform
-      pos: -35.5,-75.5
+      rot: -1.5707963267948966 rad
+      pos: 90.5,-50.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 10839
+  - uid: 15192
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 90.5,-42.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 10839
+  - uid: 15193
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 90.5,-41.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 10839
+  - uid: 15194
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 90.5,-40.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 10839
+  - uid: 15243
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -13.5,-43.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6218
+      - 9234
+      - 9038
+      - 469
+  - uid: 15409
+    components:
+    - type: Transform
+      pos: -36.5,-74.5
       parent: 2
   - uid: 16165
     components:
@@ -57943,6 +57871,39 @@ entities:
       - 14593
       - 14591
       - 18881
+  - uid: 16238
+    components:
+    - type: Transform
+      pos: 66.5,-41.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9873
+      - 16354
+      - 16357
+      - 16356
+  - uid: 16239
+    components:
+    - type: Transform
+      pos: 65.5,-41.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9873
+      - 16354
+      - 16357
+      - 16356
+  - uid: 16240
+    components:
+    - type: Transform
+      pos: 64.5,-41.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9873
+      - 16354
+      - 16357
+      - 16356
   - uid: 16242
     components:
     - type: Transform
@@ -57954,16 +57915,119 @@ entities:
       - 19201
       - 3897
       - 9200
-  - uid: 17963
+  - uid: 16247
     components:
     - type: Transform
-      pos: 66.5,-51.5
+      pos: 54.5,-32.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 7950
-      - 3401
-      - 7131
+      - 19911
+      - 9873
+      - 16354
+  - uid: 16252
+    components:
+    - type: Transform
+      pos: 54.5,-33.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19911
+      - 9873
+      - 16354
+  - uid: 16259
+    components:
+    - type: Transform
+      pos: 54.5,-34.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19911
+      - 9873
+      - 16354
+  - uid: 16431
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 55.5,-29.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9873
+      - 16354
+  - uid: 16433
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-29.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9873
+      - 16354
+  - uid: 16437
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-37.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9873
+      - 16354
+  - uid: 16448
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-37.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9873
+      - 16354
+  - uid: 16450
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-40.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16341
+      - 16312
+  - uid: 16451
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-40.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16341
+      - 16312
+  - uid: 16452
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 55.5,-26.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 579
+  - uid: 16453
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-26.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 579
+  - uid: 17101
+    components:
+    - type: Transform
+      pos: -35.5,-74.5
+      parent: 2
   - uid: 18091
     components:
     - type: Transform
@@ -57974,6 +58038,133 @@ entities:
       - 14752
       - 18013
       - 15095
+  - uid: 18702
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 25.5,-16.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17872
+      - 16367
+      - 16366
+      - 10761
+  - uid: 18703
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 26.5,-16.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17872
+      - 16367
+      - 16366
+      - 10761
+  - uid: 18704
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 27.5,-16.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17872
+      - 16367
+      - 16366
+      - 10761
+  - uid: 18705
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 28.5,-18.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17872
+      - 16367
+      - 19855
+      - 16362
+  - uid: 18706
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 28.5,-19.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17872
+      - 16367
+      - 19855
+      - 16362
+  - uid: 18707
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 30.5,-21.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17872
+      - 16367
+      - 19855
+      - 16362
+  - uid: 18708
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 31.5,-21.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17872
+      - 16367
+      - 19855
+      - 16362
+  - uid: 18709
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 30.5,-16.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16362
+      - 19855
+      - 16363
+  - uid: 18723
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 31.5,-16.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16362
+      - 19855
+      - 16363
+  - uid: 18724
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 32.5,-16.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16362
+      - 19855
+      - 16363
+  - uid: 18731
+    components:
+    - type: Transform
+      pos: 35.5,-16.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 18736
+      - 19855
+      - 16362
   - uid: 18761
     components:
     - type: Transform
@@ -58057,6 +58248,24 @@ entities:
       - 2110
       - 14590
       - 14591
+  - uid: 19065
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 30.5,-35.5
+      parent: 2
+  - uid: 19067
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 37.5,-33.5
+      parent: 2
+  - uid: 19078
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 48.5,-42.5
+      parent: 2
   - uid: 19203
     components:
     - type: Transform
@@ -58093,11 +58302,6 @@ entities:
       deviceLists:
       - 14460
       - 14461
-  - uid: 19315
-    components:
-    - type: Transform
-      pos: 56.5,-69.5
-      parent: 2
   - uid: 19401
     components:
     - type: Transform
@@ -58120,6 +58324,850 @@ entities:
       - 19400
       - 1751
       - 9931
+  - uid: 19796
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -29.5,-19.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 15092
+      - 15885
+      - 5200
+      - 6646
+  - uid: 19797
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -28.5,-19.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 15092
+      - 15885
+      - 5200
+      - 6646
+  - uid: 19798
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -27.5,-19.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 15092
+      - 15885
+      - 5200
+      - 6646
+  - uid: 19799
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -29.5,-30.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 5200
+      - 6646
+      - 9255
+      - 6411
+  - uid: 19800
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -28.5,-30.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 5200
+      - 6646
+      - 9255
+      - 6411
+  - uid: 19801
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -27.5,-30.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 5200
+      - 6646
+      - 9255
+      - 6411
+  - uid: 19802
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -26.5,-37.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9255
+      - 6411
+  - uid: 19803
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -26.5,-36.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9255
+      - 6411
+  - uid: 19804
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -26.5,-35.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9255
+      - 6411
+  - uid: 19805
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -30.5,-42.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9256
+      - 6413
+  - uid: 19806
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -30.5,-41.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9256
+      - 6413
+  - uid: 19807
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -30.5,-48.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9256
+      - 6413
+  - uid: 19808
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -30.5,-49.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9256
+      - 6413
+  - uid: 19809
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -33.5,-42.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 2452
+      - 9190
+  - uid: 19810
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -33.5,-41.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 2452
+      - 9190
+  - uid: 19811
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -33.5,-48.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 2452
+      - 9190
+  - uid: 19812
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -33.5,-49.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 2452
+      - 9190
+  - uid: 19816
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -15.5,-39.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9038
+      - 469
+  - uid: 19817
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -15.5,-38.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9038
+      - 469
+  - uid: 19818
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -15.5,-37.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9038
+      - 469
+  - uid: 19820
+    components:
+    - type: Transform
+      pos: -0.5,-27.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9038
+      - 469
+      - 9489
+      - 1212
+  - uid: 19821
+    components:
+    - type: Transform
+      pos: 0.5,-27.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9038
+      - 469
+      - 9489
+      - 1212
+  - uid: 19822
+    components:
+    - type: Transform
+      pos: 6.5,-34.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9038
+      - 469
+      - 19399
+      - 19400
+  - uid: 19823
+    components:
+    - type: Transform
+      pos: 6.5,-35.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9038
+      - 469
+      - 19399
+      - 19400
+  - uid: 19824
+    components:
+    - type: Transform
+      pos: 6.5,-36.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9038
+      - 469
+      - 19399
+      - 19400
+  - uid: 19825
+    components:
+    - type: Transform
+      pos: 5.5,-38.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9038
+      - 469
+      - 17681
+      - 17680
+  - uid: 19826
+    components:
+    - type: Transform
+      pos: 4.5,-38.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9038
+      - 469
+      - 17681
+      - 17680
+  - uid: 19827
+    components:
+    - type: Transform
+      pos: 3.5,-38.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9038
+      - 469
+      - 17681
+      - 17680
+  - uid: 19828
+    components:
+    - type: Transform
+      pos: -9.5,-13.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 3258
+      - 9199
+      - 9200
+      - 3897
+  - uid: 19829
+    components:
+    - type: Transform
+      pos: -9.5,-12.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 3258
+      - 9199
+      - 9200
+      - 3897
+  - uid: 19830
+    components:
+    - type: Transform
+      pos: -9.5,-11.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 3258
+      - 9199
+      - 9200
+      - 3897
+  - uid: 19831
+    components:
+    - type: Transform
+      pos: 15.5,-13.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 7439
+      - 459
+      - 16366
+      - 10761
+  - uid: 19832
+    components:
+    - type: Transform
+      pos: 15.5,-12.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 7439
+      - 459
+      - 16366
+      - 10761
+  - uid: 19833
+    components:
+    - type: Transform
+      pos: 15.5,-11.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 7439
+      - 459
+      - 16366
+      - 10761
+  - uid: 19834
+    components:
+    - type: Transform
+      pos: 3.5,-16.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19835
+  - uid: 19837
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.5,-22.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 18593
+      - 364
+      - 17872
+      - 16367
+  - uid: 19838
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.5,-23.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 18593
+      - 364
+      - 17872
+      - 16367
+  - uid: 19839
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.5,-36.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9931
+      - 1751
+      - 19852
+      - 19853
+  - uid: 19840
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.5,-35.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9931
+      - 1751
+      - 19852
+      - 19853
+  - uid: 19841
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.5,-34.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9931
+      - 1751
+      - 19852
+      - 19853
+  - uid: 19845
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 23.5,-28.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19852
+      - 19853
+      - 17872
+      - 16367
+  - uid: 19846
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 24.5,-28.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19852
+      - 19853
+      - 17872
+      - 16367
+  - uid: 19847
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 25.5,-28.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19852
+      - 19853
+      - 17872
+      - 16367
+  - uid: 19848
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 23.5,-38.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19852
+      - 19853
+      - 6344
+      - 9235
+  - uid: 19849
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 24.5,-38.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19852
+      - 19853
+      - 6344
+      - 9235
+  - uid: 19850
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 25.5,-38.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19852
+      - 19853
+      - 6344
+      - 9235
+  - uid: 19851
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 28.5,-25.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17872
+      - 16367
+      - 7582
+  - uid: 19854
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 29.5,-25.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17872
+      - 16367
+      - 7582
+  - uid: 19875
+    components:
+    - type: Transform
+      pos: 72.5,-23.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6358
+      - 19876
+  - uid: 19882
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 38.5,-40.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6350
+      - 9241
+      - 19880
+      - 19881
+  - uid: 19885
+    components:
+    - type: Transform
+      pos: 14.5,-55.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6346
+      - 9403
+      - 9249
+      - 6406
+  - uid: 19886
+    components:
+    - type: Transform
+      pos: 6.5,-52.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6346
+      - 9403
+      - 1691
+      - 9216
+  - uid: 19887
+    components:
+    - type: Transform
+      pos: 6.5,-53.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6346
+      - 9403
+      - 1691
+      - 9216
+  - uid: 19888
+    components:
+    - type: Transform
+      pos: 6.5,-54.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6346
+      - 9403
+      - 1691
+      - 9216
+  - uid: 19889
+    components:
+    - type: Transform
+      pos: 8.5,-64.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6346
+      - 9403
+      - 9237
+      - 569
+  - uid: 19890
+    components:
+    - type: Transform
+      pos: 9.5,-64.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6346
+      - 9403
+      - 9237
+      - 569
+  - uid: 19891
+    components:
+    - type: Transform
+      pos: 5.5,-45.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17681
+      - 17680
+      - 1691
+      - 9216
+  - uid: 19892
+    components:
+    - type: Transform
+      pos: 4.5,-45.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17681
+      - 17680
+      - 1691
+      - 9216
+  - uid: 19893
+    components:
+    - type: Transform
+      pos: 13.5,-75.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9237
+      - 569
+      - 6348
+      - 9239
+  - uid: 19894
+    components:
+    - type: Transform
+      pos: 14.5,-75.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9237
+      - 569
+      - 6348
+      - 9239
+  - uid: 19895
+    components:
+    - type: Transform
+      pos: 15.5,-75.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9237
+      - 569
+      - 6348
+      - 9239
+  - uid: 19896
+    components:
+    - type: Transform
+      pos: 23.5,-75.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6348
+      - 9239
+      - 6349
+      - 9240
+  - uid: 19897
+    components:
+    - type: Transform
+      pos: 24.5,-75.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6348
+      - 9239
+      - 6349
+      - 9240
+  - uid: 19898
+    components:
+    - type: Transform
+      pos: 25.5,-75.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6348
+      - 9239
+      - 6349
+      - 9240
+  - uid: 19900
+    components:
+    - type: Transform
+      pos: 57.5,-40.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16341
+      - 16312
+      - 19910
+      - 16346
+  - uid: 19901
+    components:
+    - type: Transform
+      pos: 58.5,-40.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16341
+      - 16312
+      - 19910
+      - 16346
+  - uid: 19902
+    components:
+    - type: Transform
+      pos: 59.5,-40.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16341
+      - 16312
+      - 19910
+      - 16346
+  - uid: 19903
+    components:
+    - type: Transform
+      pos: 63.5,-43.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16341
+      - 16312
+      - 16357
+      - 16356
+  - uid: 19904
+    components:
+    - type: Transform
+      pos: 63.5,-42.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16341
+      - 16312
+      - 16357
+      - 16356
+  - uid: 19906
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 57.5,-28.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19909
+  - uid: 19907
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-35.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19910
+      - 16346
+      - 9873
+      - 16354
+  - uid: 19908
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 58.5,-35.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19910
+      - 16346
+      - 9873
+      - 16354
+  - uid: 19912
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 57.5,-27.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19909
+  - uid: 19914
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 83.5,-46.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19916
+      - 10839
+  - uid: 19915
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 83.5,-44.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19916
+      - 10839
+  - uid: 19918
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 73.5,-71.5
+      parent: 2
+  - uid: 19919
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 71.5,-61.5
+      parent: 2
+  - uid: 19920
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 34.5,-70.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 7310
+      - 19921
+      - 6405
+      - 9248
 - proto: Flare
   entities:
   - uid: 10803
@@ -58176,21 +59224,16 @@ entities:
     - type: Transform
       pos: 29.42569,-76.37392
       parent: 2
-  - uid: 15463
-    components:
-    - type: Transform
-      pos: 49.38892,-25.404797
-      parent: 2
-  - uid: 15465
-    components:
-    - type: Transform
-      pos: 49.60767,-25.529884
-      parent: 2
   - uid: 15887
     components:
     - type: Transform
       pos: 8.378325,-77.38192
       parent: 2
+  - uid: 16034
+    components:
+    - type: Transform
+      pos: 58.37897,-56.323803
+      parent: 2
   - uid: 16301
     components:
     - type: Transform
@@ -58226,6 +59269,11 @@ entities:
     - type: Transform
       pos: -33.738388,-29.310532
       parent: 2
+  - uid: 19185
+    components:
+    - type: Transform
+      pos: 40.650253,-25.478815
+      parent: 2
 - proto: FlashlightSeclite
   entities:
   - uid: 5588
@@ -58233,11 +59281,6 @@ entities:
     - type: Transform
       pos: -52.491226,-38.6449
       parent: 2
-  - uid: 7742
-    components:
-    - type: Transform
-      pos: 55.5,-46.5
-      parent: 2
 - proto: FlippoLighter
   entities:
   - uid: 6024
@@ -58254,6 +59297,51 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: FloorCarpetItemBlack
+  entities:
+  - uid: 7382
+    components:
+    - type: Transform
+      pos: 55.366177,-66.28229
+      parent: 2
+    - type: Stack
+      count: 10
+- proto: FloorCarpetItemOrange
+  entities:
+  - uid: 5314
+    components:
+    - type: Transform
+      pos: 55.392075,-66.48532
+      parent: 2
+    - type: Stack
+      count: 10
+- proto: FloorCarpetItemPurple
+  entities:
+  - uid: 10699
+    components:
+    - type: Transform
+      pos: 55.65664,-66.53657
+      parent: 2
+    - type: Stack
+      count: 10
+- proto: FloorCarpetItemSkyBlue
+  entities:
+  - uid: 7201
+    components:
+    - type: Transform
+      pos: 55.609764,-66.3333
+      parent: 2
+    - type: Stack
+      count: 10
+- proto: FloorCarpetItemWhite
+  entities:
+  - uid: 7381
+    components:
+    - type: Transform
+      pos: 55.65664,-66.23949
+      parent: 2
+    - type: Stack
+      count: 10
 - proto: FloorDrain
   entities:
   - uid: 1834
@@ -58285,10 +59373,24 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
-  - uid: 7038
+  - uid: 6409
     components:
     - type: Transform
-      pos: 47.5,-41.5
+      pos: 44.5,-43.5
+      parent: 2
+    - type: Fixtures
+      fixtures: {}
+  - uid: 7030
+    components:
+    - type: Transform
+      pos: 44.5,-42.5
+      parent: 2
+    - type: Fixtures
+      fixtures: {}
+  - uid: 7142
+    components:
+    - type: Transform
+      pos: 42.5,-37.5
       parent: 2
     - type: Fixtures
       fixtures: {}
@@ -58299,13 +59401,6 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
-  - uid: 17878
-    components:
-    - type: Transform
-      pos: 36.5,-18.5
-      parent: 2
-    - type: Fixtures
-      fixtures: {}
   - uid: 19016
     components:
     - type: Transform
@@ -58341,11 +59436,6 @@ entities:
     - type: Transform
       pos: -49.5,-68.5
       parent: 2
-  - uid: 16175
-    components:
-    - type: Transform
-      pos: 72.5,-32.5
-      parent: 2
   - uid: 17097
     components:
     - type: Transform
@@ -58361,11 +59451,6 @@ entities:
     - type: Transform
       pos: -25.5,-51.5
       parent: 2
-  - uid: 17101
-    components:
-    - type: Transform
-      pos: -40.5,-80.5
-      parent: 2
   - uid: 17103
     components:
     - type: Transform
@@ -58376,31 +59461,11 @@ entities:
     - type: Transform
       pos: 5.5,-71.5
       parent: 2
-  - uid: 17107
-    components:
-    - type: Transform
-      pos: 66.5,-58.5
-      parent: 2
   - uid: 17108
     components:
     - type: Transform
       pos: 77.5,-51.5
       parent: 2
-  - uid: 17109
-    components:
-    - type: Transform
-      pos: 33.5,-31.5
-      parent: 2
-  - uid: 17110
-    components:
-    - type: Transform
-      pos: 50.5,-34.5
-      parent: 2
-  - uid: 17111
-    components:
-    - type: Transform
-      pos: 54.5,-40.5
-      parent: 2
   - uid: 17113
     components:
     - type: Transform
@@ -58421,10 +59486,11 @@ entities:
     - type: Transform
       pos: -37.5,-36.5
       parent: 2
-  - uid: 17117
+  - uid: 17119
     components:
     - type: Transform
-      pos: -36.5,-77.5
+      rot: 1.5707963267948966 rad
+      pos: -38.523506,-80.51952
       parent: 2
   - uid: 17308
     components:
@@ -58461,36 +59527,25 @@ entities:
     - type: Transform
       pos: -39.5,-70.5
       parent: 2
-  - uid: 18100
-    components:
-    - type: Transform
-      pos: 56.5,-67.5
-      parent: 2
   - uid: 18266
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 37.5,-21.5
       parent: 2
-  - uid: 18270
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 46.5,-48.5
-      parent: 2
 - proto: FoamCrossbow
   entities:
   - uid: 7960
     components:
     - type: Transform
-      pos: 64.66352,-70.57762
+      pos: 69.6651,-59.63053
       parent: 2
 - proto: FoamCutlass
   entities:
   - uid: 18301
     components:
     - type: Transform
-      pos: 64.45814,-70.017105
+      pos: 69.39864,-60.424595
       parent: 2
   - uid: 18854
     components:
@@ -58500,7 +59555,7 @@ entities:
   - uid: 18933
     components:
     - type: Transform
-      pos: 64.58314,-70.288124
+      pos: 69.55489,-60.50272
       parent: 2
 - proto: FolderSpawner
   entities:
@@ -58533,7 +59588,7 @@ entities:
   - uid: 5021
     components:
     - type: Transform
-      pos: 48.518234,-40.351086
+      pos: 40.572193,-36.354713
       parent: 2
 - proto: FoodBanana
   entities:
@@ -58542,13 +59597,6 @@ entities:
     - type: Transform
       pos: -64.68415,-61.398476
       parent: 2
-- proto: FoodBowlBigTrash
-  entities:
-  - uid: 7329
-    components:
-    - type: Transform
-      pos: 80.43792,-29.298622
-      parent: 2
 - proto: FoodBoxDonkpocketStonk
   entities:
   - uid: 6834
@@ -58814,10 +59862,10 @@ entities:
       parent: 2
 - proto: FoodDonutJellySlugcat
   entities:
-  - uid: 7256
+  - uid: 2917
     components:
     - type: Transform
-      pos: 59.48766,-79.48507
+      pos: 72.49038,-74.3934
       parent: 2
     - type: CollisionWake
       enabled: False
@@ -58922,60 +59970,13 @@ entities:
     - type: Transform
       pos: -38.619698,-62.26088
       parent: 2
-- proto: FoodMeatXeno
-  entities:
-  - uid: 7044
-    components:
-    - type: Transform
-      parent: 7043
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 7045
-    components:
-    - type: Transform
-      parent: 7043
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 7046
-    components:
-    - type: Transform
-      parent: 7043
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 7047
-    components:
-    - type: Transform
-      parent: 7043
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 7048
-    components:
-    - type: Transform
-      parent: 7043
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 7049
-    components:
-    - type: Transform
-      parent: 7043
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: FoodMeatXenoCutlet
   entities:
-  - uid: 14737
+  - uid: 3722
     components:
     - type: Transform
-      pos: 43.38109,-25.742085
+      pos: 42.54103,-26.571922
       parent: 2
-    - type: CollisionWake
-      enabled: False
-    - type: Conveyed
 - proto: FoodOrange
   entities:
   - uid: 17558
@@ -59102,14 +60103,14 @@ entities:
   - uid: 7328
     components:
     - type: Transform
-      pos: 80.31292,-26.405987
+      pos: 79.62434,-25.69585
       parent: 2
 - proto: FoodTinMRETrash
   entities:
   - uid: 7327
     components:
     - type: Transform
-      pos: 80.69421,-26.558718
+      pos: 79.27017,-25.581188
       parent: 2
 - proto: ForkPlastic
   entities:
@@ -59130,7 +60131,7 @@ entities:
   - uid: 18622
     components:
     - type: Transform
-      pos: 77.75246,-47.4808
+      pos: 78.98819,-47.30669
       parent: 2
 - proto: GasAnalyzer
   entities:
@@ -59149,10 +60150,10 @@ entities:
     - type: Transform
       pos: 33.576553,-78.39452
       parent: 2
-  - uid: 18283
+  - uid: 20022
     components:
     - type: Transform
-      pos: 45.667137,-48.489754
+      pos: 57.381683,-59.359867
       parent: 2
 - proto: GasFilter
   entities:
@@ -59327,6 +60328,12 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 6353
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,-37.5
+      parent: 2
   - uid: 7242
     components:
     - type: Transform
@@ -59376,18 +60383,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 14763
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 50.5,-101.5
-      parent: 2
-  - uid: 19314
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 47.5,-45.5
-      parent: 2
 - proto: GasPipeBend
   entities:
   - uid: 2287
@@ -59413,22 +60408,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 2933
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 67.5,-46.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 2943
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 65.5,-47.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 3845
     components:
     - type: Transform
@@ -59445,14 +60424,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 4096
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 70.5,-22.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 4108
     components:
     - type: Transform
@@ -59485,13 +60456,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 5788
-    components:
-    - type: Transform
-      pos: 27.5,-97.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 5840
     components:
     - type: Transform
@@ -59535,6 +60499,21 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 7132
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 41.5,-38.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 7137
+    components:
+    - type: Transform
+      pos: 42.5,-38.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 7162
     components:
     - type: Transform
@@ -59559,6 +60538,85 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 7302
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 85.5,-47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 7329
+    components:
+    - type: Transform
+      pos: 91.5,-47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 7332
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 43.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 7334
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 91.5,-43.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 7342
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 85.5,-43.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 7367
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 42.5,-41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 7369
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 85.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 7370
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 78.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 7376
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 78.5,-45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 7379
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 41.5,-41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 7839
     components:
     - type: Transform
@@ -59659,22 +60717,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 8688
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 41.5,-49.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 8763
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -33.5,-14.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 8810
     components:
     - type: Transform
@@ -59691,22 +60733,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 8861
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 30.5,-15.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 8867
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 30.5,-15.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 8874
     components:
     - type: Transform
@@ -59786,14 +60812,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9080
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 27.5,-94.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 9083
     components:
     - type: Transform
@@ -59955,14 +60973,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 9371
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-51.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 9374
     components:
     - type: Transform
@@ -60077,13 +61087,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9540
-    components:
-    - type: Transform
-      pos: 25.5,-13.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 9587
     components:
     - type: Transform
@@ -60192,14 +61195,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9764
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -48.5,-41.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 9797
     components:
     - type: Transform
@@ -60224,37 +61219,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 9870
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 27.5,-29.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 9871
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 25.5,-25.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9872
+  - uid: 9880
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 24.5,-25.5
+      pos: 40.5,-52.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9873
-    components:
-    - type: Transform
-      pos: 25.5,-30.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#0335FCFF'
   - uid: 9914
     components:
     - type: Transform
@@ -60376,11 +61348,11 @@ entities:
   - uid: 10174
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -48.5,-49.5
+      rot: 1.5707963267948966 rad
+      pos: -51.5,-41.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#0335FCFF'
   - uid: 10175
     components:
     - type: Transform
@@ -60412,6 +61384,13 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 10282
+    components:
+    - type: Transform
+      pos: 42.5,-49.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 10323
     components:
     - type: Transform
@@ -60451,22 +61430,13 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 10401
+  - uid: 10405
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 77.5,-45.5
+      pos: 85.5,-46.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 10402
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 77.5,-44.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#FF1212FF'
   - uid: 10416
     components:
     - type: Transform
@@ -60475,45 +61445,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 10419
-    components:
-    - type: Transform
-      pos: 84.5,-46.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 10420
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 84.5,-47.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 10424
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 84.5,-44.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 10425
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 84.5,-43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 10435
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 40.5,-49.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 10453
     components:
     - type: Transform
@@ -60537,11 +61468,11 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 10513
+  - uid: 10596
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 63.5,-52.5
+      pos: 5.5,-17.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
@@ -60561,6 +61492,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FFAD4FFF'
+  - uid: 10753
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -52.5,-49.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 10770
     components:
     - type: Transform
@@ -60610,29 +61549,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 11740
-    components:
-    - type: Transform
-      pos: 61.5,-56.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 11742
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 52.5,-56.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 11851
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 59.5,-37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 12153
     components:
     - type: Transform
@@ -60916,14 +61832,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 15418
+  - uid: 15509
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 58.5,-38.5
+      rot: -1.5707963267948966 rad
+      pos: 13.5,-16.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#0335FCFF'
   - uid: 16234
     components:
     - type: Transform
@@ -60948,22 +61864,62 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FFAD4FFF'
-  - uid: 16885
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 89.5,-43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 16896
+  - uid: 16873
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 41.5,-43.5
+      pos: 50.5,-44.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 16874
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 53.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16876
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 53.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16877
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 53.5,-46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 16878
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 53.5,-45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 16879
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 54.5,-45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 16885
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 54.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 16898
     components:
     - type: Transform
@@ -60980,38 +61936,22 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 16907
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 48.5,-44.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 16908
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 24.5,-30.5
+      rot: -1.5707963267948966 rad
+      pos: 52.5,-56.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 16915
+  - uid: 16909
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 27.5,-20.5
+      pos: 52.5,-46.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 16916
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 28.5,-20.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
+      color: '#FF1212FF'
   - uid: 16931
     components:
     - type: Transform
@@ -61034,6 +61974,21 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 17260
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 60.5,-48.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17261
+    components:
+    - type: Transform
+      pos: 61.5,-48.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 17275
     components:
     - type: Transform
@@ -61057,14 +62012,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 17474
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-56.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 17597
     components:
     - type: Transform
@@ -61073,18 +62020,105 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 17685
+  - uid: 17605
     components:
     - type: Transform
-      pos: 89.5,-47.5
+      pos: 69.5,-46.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 17999
+      color: '#0335FCFF'
+  - uid: 17644
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 62.5,-41.5
+      pos: 64.5,-39.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17685
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 66.5,-40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17717
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 62.5,-36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17718
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 61.5,-35.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17719
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 64.5,-36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17720
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-35.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17897
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 52.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17898
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 51.5,-32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17910
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 51.5,-36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17915
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 64.5,-50.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17924
+    components:
+    - type: Transform
+      pos: 65.5,-50.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17954
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-37.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
@@ -61120,6 +62154,108 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 18061
+    components:
+    - type: Transform
+      pos: 75.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18289
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18292
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 23.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18341
+    components:
+    - type: Transform
+      pos: 27.5,-13.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18506
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 31.5,-20.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18508
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 32.5,-20.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18571
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 75.5,-45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18598
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 30.5,-15.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18600
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 32.5,-15.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18604
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 31.5,-14.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18605
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 31.5,-15.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18631
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 34.5,-14.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18632
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 34.5,-13.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 18798
     components:
     - type: Transform
@@ -61137,11 +62273,108 @@ entities:
       pipeLayer: Secondary
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 18853
+  - uid: 18825
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 28.5,-15.5
+      rot: 3.141592653589793 rad
+      pos: 54.5,-52.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18826
+    components:
+    - type: Transform
+      pos: 55.5,-52.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18827
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 55.5,-53.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18829
+    components:
+    - type: Transform
+      pos: 56.5,-53.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18833
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 56.5,-54.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18837
+    components:
+    - type: Transform
+      pos: 54.5,-51.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18878
+    components:
+    - type: Transform
+      pos: 58.5,-54.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18879
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 58.5,-55.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18882
+    components:
+    - type: Transform
+      pos: 59.5,-55.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18883
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,-56.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19057
+    components:
+    - type: Transform
+      pos: 70.5,-56.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19058
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 70.5,-57.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19059
+    components:
+    - type: Transform
+      pos: 71.5,-57.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19060
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 71.5,-64.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
@@ -61175,6 +62408,169 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FFAD4FFF'
+  - uid: 19581
+    components:
+    - type: Transform
+      pos: 29.5,-97.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19582
+    components:
+    - type: Transform
+      pos: 30.5,-94.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19594
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 29.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19595
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 30.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19790
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 67.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19791
+    components:
+    - type: Transform
+      pos: 67.5,-43.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19793
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 65.5,-43.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19794
+    components:
+    - type: Transform
+      pos: 65.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19795
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 71.5,-46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19995
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -33.5,-16.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19996
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -34.5,-16.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19997
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -34.5,-18.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19998
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -35.5,-18.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19999
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -35.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20000
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -44.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20001
+    components:
+    - type: Transform
+      pos: -44.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20002
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -50.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20003
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -50.5,-25.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20011
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 60.5,-59.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20012
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 57.5,-59.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20046
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -52.5,-40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
 - proto: GasPipeFourway
   entities:
   - uid: 3132
@@ -61261,6 +62657,20 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 16361
+    components:
+    - type: Transform
+      pos: 63.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16368
+    components:
+    - type: Transform
+      pos: 64.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 16854
     components:
     - type: Transform
@@ -61268,6 +62678,20 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 17311
+    components:
+    - type: Transform
+      pos: 66.5,-47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17792
+    components:
+    - type: Transform
+      pos: 64.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
 - proto: GasPipeManifold
   entities:
   - uid: 10223
@@ -61388,14 +62812,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 1226
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-38.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 1697
     components:
     - type: Transform
@@ -61511,30 +62927,6 @@ entities:
       pipeLayer: Secondary
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 2678
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 51.5,-53.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 2725
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 60.5,-43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 2931
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 68.5,-47.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 3060
     components:
     - type: Transform
@@ -61575,14 +62967,6 @@ entities:
       pipeLayer: Tertiary
     - type: AtmosPipeColor
       color: '#947507FF'
-  - uid: 3515
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 62.5,-47.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 3516
     components:
     - type: Transform
@@ -61591,66 +62975,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 3518
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 63.5,-31.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 3519
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 57.5,-51.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 3520
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 55.5,-51.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 3521
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 58.5,-52.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 3557
-    components:
-    - type: Transform
-      pos: 63.5,-38.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 3558
-    components:
-    - type: Transform
-      pos: 63.5,-40.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 3559
-    components:
-    - type: Transform
-      pos: 63.5,-39.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 3560
-    components:
-    - type: Transform
-      pos: 64.5,-39.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 3562
     components:
     - type: Transform
@@ -61699,30 +63023,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#03FCD3FF'
-  - uid: 3668
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 62.5,-49.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 3763
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 63.5,-44.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 3811
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 63.5,-50.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 3946
     components:
     - type: Transform
@@ -61761,30 +63061,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 4187
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 59.5,-52.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 4189
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 56.5,-51.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 4191
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 64.5,-31.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 4192
     components:
     - type: Transform
@@ -61793,14 +63069,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 4193
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 62.5,-46.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 4201
     components:
     - type: Transform
@@ -61817,14 +63085,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 4204
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 67.5,-33.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 4294
     components:
     - type: Transform
@@ -61833,6 +63093,22 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 4346
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 43.5,-49.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 4516
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 42.5,-50.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 4709
     components:
     - type: Transform
@@ -61909,22 +63185,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -3.5,-51.5
       parent: 2
-  - uid: 5405
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 56.5,-52.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 5406
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 57.5,-52.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 5407
     components:
     - type: Transform
@@ -61941,14 +63201,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 5409
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 62.5,-45.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 5567
     components:
     - type: Transform
@@ -61986,13 +63238,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 6424
-    components:
-    - type: Transform
-      pos: 28.5,-24.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 6466
     components:
     - type: Transform
@@ -62053,46 +63298,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 47.5,-78.5
       parent: 2
-  - uid: 7152
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 51.5,-54.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 7154
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 60.5,-42.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 7155
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 59.5,-54.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 7160
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 60.5,-37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 7164
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 63.5,-38.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 7167
     components:
     - type: Transform
@@ -62100,27 +63305,10 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 7176
+  - uid: 7189
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 66.5,-32.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 7177
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 65.5,-33.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 7178
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 66.5,-33.5
+      pos: 43.5,-38.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
@@ -62132,35 +63320,99 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 7270
+  - uid: 7306
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 61.5,-51.5
+      pos: 77.5,-45.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 7282
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 67.5,-50.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 7737
+  - uid: 7319
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 53.5,-51.5
+      pos: 84.5,-46.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 7739
+      color: '#FF1212FF'
+  - uid: 7321
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 50.5,-51.5
+      pos: 84.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 7330
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 43.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 7348
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 43.5,-43.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 7350
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 43.5,-41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 7351
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 42.5,-39.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 7364
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 42.5,-40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 7373
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 89.5,-47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 7375
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 43.5,-40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 7378
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 90.5,-47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 7601
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 90.5,-43.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
@@ -62375,14 +63627,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 34.5,-66.5
       parent: 2
-  - uid: 7951
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 63.5,-50.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 8097
     components:
     - type: Transform
@@ -62391,11 +63635,11 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 8140
+  - uid: 8161
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 67.5,-32.5
+      pos: 89.5,-43.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
@@ -62459,14 +63703,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 49.5,-75.5
       parent: 2
-  - uid: 8630
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 63.5,-49.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 8636
     components:
     - type: Transform
@@ -62527,14 +63763,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 8813
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 69.5,-50.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 8820
     components:
     - type: Transform
@@ -62550,14 +63778,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 8845
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 28.5,-16.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 8876
     components:
     - type: Transform
@@ -64129,14 +65349,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9204
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 42.5,-52.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 9205
     components:
     - type: Transform
@@ -64177,6 +65389,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 9226
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 64.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 9227
     components:
     - type: Transform
@@ -64201,21 +65421,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9251
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 62.5,-48.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 9259
-    components:
-    - type: Transform
-      pos: 65.5,-23.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 9279
     components:
     - type: Transform
@@ -64253,14 +65458,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9360
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 54.5,-52.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 9368
     components:
     - type: Transform
@@ -64269,14 +65466,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9369
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 63.5,-46.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 9375
     components:
     - type: Transform
@@ -64332,14 +65521,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 9383
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 71.5,-23.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 9387
     components:
     - type: Transform
@@ -64439,55 +65620,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 9406
-    components:
-    - type: Transform
-      pos: 23.5,-20.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 9407
-    components:
-    - type: Transform
-      pos: 23.5,-19.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 9408
-    components:
-    - type: Transform
-      pos: 23.5,-18.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 9409
-    components:
-    - type: Transform
-      pos: 23.5,-17.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 9411
-    components:
-    - type: Transform
-      pos: 23.5,-15.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 9412
-    components:
-    - type: Transform
-      pos: 23.5,-14.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 9413
-    components:
-    - type: Transform
-      pos: 23.5,-13.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 9414
     components:
     - type: Transform
@@ -64509,14 +65641,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9420
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 28.5,-29.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 9422
     components:
     - type: Transform
@@ -65441,13 +66565,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 9615
-    components:
-    - type: Transform
-      pos: 64.5,-37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 9616
     components:
     - type: Transform
@@ -65566,27 +66683,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9635
-    components:
-    - type: Transform
-      pos: 64.5,-36.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9636
-    components:
-    - type: Transform
-      pos: 64.5,-32.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9638
-    components:
-    - type: Transform
-      pos: 63.5,-35.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 9639
     components:
     - type: Transform
@@ -65642,7 +66738,7 @@ entities:
       pos: 83.5,-46.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#FF1212FF'
   - uid: 9652
     components:
     - type: Transform
@@ -65934,13 +67030,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9722
-    components:
-    - type: Transform
-      pos: 27.5,-27.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 9724
     components:
     - type: Transform
@@ -66368,20 +67457,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9793
-    components:
-    - type: Transform
-      pos: 27.5,-28.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 9794
-    components:
-    - type: Transform
-      pos: 28.5,-23.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 9799
     components:
     - type: Transform
@@ -66774,83 +67849,11 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 9875
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-24.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9876
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-23.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9877
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-21.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9878
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-20.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9879
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-19.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9880
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-18.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 9881
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 25.5,-17.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9882
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-16.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9883
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-15.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9884
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 25.5,-14.5
+      pos: 27.5,-18.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
@@ -66862,86 +67865,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9889
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 26.5,-22.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9890
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 27.5,-22.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9892
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 29.5,-22.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9893
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 30.5,-21.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9894
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 30.5,-20.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9895
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 30.5,-19.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9896
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 30.5,-18.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9897
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 30.5,-17.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9898
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 30.5,-16.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9899
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 26.5,-25.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 9900
     components:
     - type: Transform
@@ -67621,13 +68544,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 10036
-    components:
-    - type: Transform
-      pos: 30.5,-13.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 10037
     components:
     - type: Transform
@@ -67688,14 +68604,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 10049
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 29.5,-15.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 10051
     components:
     - type: Transform
@@ -68811,13 +69719,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 10266
-    components:
-    - type: Transform
-      pos: 64.5,-35.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 10269
     components:
     - type: Transform
@@ -68826,21 +69727,91 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 10293
+  - uid: 10281
     components:
     - type: Transform
-      pos: 63.5,-36.5
+      rot: 3.141592653589793 rad
+      pos: 51.5,-53.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 10286
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 51.5,-54.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 10287
+    components:
+    - type: Transform
+      pos: 25.5,-30.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 10289
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 41.5,-44.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 10294
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 68.5,-50.5
+      pos: 25.5,-29.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0335FCFF'
+      color: '#FF1212FF'
+  - uid: 10298
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 27.5,-19.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 10299
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 27.5,-20.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 10308
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 27.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 10309
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 27.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 10311
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 26.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 10312
+    components:
+    - type: Transform
+      pos: 25.5,-25.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 10315
     components:
     - type: Transform
@@ -68875,10 +69846,32 @@ entities:
   - uid: 10328
     components:
     - type: Transform
-      pos: 63.5,-33.5
+      rot: 3.141592653589793 rad
+      pos: 51.5,-52.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 10337
+    components:
+    - type: Transform
+      pos: 25.5,-28.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 10338
+    components:
+    - type: Transform
+      pos: 25.5,-27.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 10340
+    components:
+    - type: Transform
+      pos: 25.5,-26.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 10343
     components:
     - type: Transform
@@ -69167,6 +70160,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 10392
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 42.5,-50.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 10395
     components:
     - type: Transform
@@ -69174,7 +70175,7 @@ entities:
       pos: 76.5,-45.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 10397
     components:
     - type: Transform
@@ -69183,14 +70184,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 10398
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 54.5,-51.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 10399
     components:
     - type: Transform
@@ -69198,7 +70191,7 @@ entities:
       pos: 76.5,-46.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#FF1212FF'
   - uid: 10400
     components:
     - type: Transform
@@ -69206,7 +70199,7 @@ entities:
       pos: 77.5,-46.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#FF1212FF'
   - uid: 10403
     components:
     - type: Transform
@@ -69214,7 +70207,7 @@ entities:
       pos: 78.5,-46.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#FF1212FF'
   - uid: 10404
     components:
     - type: Transform
@@ -69222,7 +70215,7 @@ entities:
       pos: 80.5,-46.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#FF1212FF'
   - uid: 10406
     components:
     - type: Transform
@@ -69230,7 +70223,7 @@ entities:
       pos: 81.5,-46.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#FF1212FF'
   - uid: 10407
     components:
     - type: Transform
@@ -69238,7 +70231,7 @@ entities:
       pos: 82.5,-46.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#FF1212FF'
   - uid: 10412
     components:
     - type: Transform
@@ -69246,7 +70239,7 @@ entities:
       pos: 79.5,-44.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 10413
     components:
     - type: Transform
@@ -69254,15 +70247,15 @@ entities:
       pos: 80.5,-44.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 10414
+      color: '#0335FCFF'
+  - uid: 10415
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 81.5,-44.5
+      pos: 40.5,-42.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 10417
     components:
     - type: Transform
@@ -69270,7 +70263,7 @@ entities:
       pos: 82.5,-44.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 10418
     components:
     - type: Transform
@@ -69278,7 +70271,15 @@ entities:
       pos: 83.5,-44.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
+  - uid: 10419
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 39.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 10422
     components:
     - type: Transform
@@ -69286,7 +70287,7 @@ entities:
       pos: 88.5,-43.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 10423
     components:
     - type: Transform
@@ -69294,15 +70295,7 @@ entities:
       pos: 88.5,-47.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 10426
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 85.5,-47.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#FF1212FF'
   - uid: 10427
     components:
     - type: Transform
@@ -69310,7 +70303,7 @@ entities:
       pos: 86.5,-47.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#FF1212FF'
   - uid: 10428
     components:
     - type: Transform
@@ -69318,7 +70311,15 @@ entities:
       pos: 87.5,-47.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#FF1212FF'
+  - uid: 10432
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 52.5,-54.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 10434
     components:
     - type: Transform
@@ -69326,6 +70327,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 10437
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 27.5,-16.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 10438
     components:
     - type: Transform
@@ -69530,14 +70539,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 10511
+  - uid: 10513
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 55.5,-52.5
+      rot: 3.141592653589793 rad
+      pos: 41.5,-43.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#0335FCFF'
   - uid: 10514
     components:
     - type: Transform
@@ -69550,7 +70559,7 @@ entities:
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 63.5,-47.5
+      pos: 27.5,-17.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
@@ -69558,10 +70567,18 @@ entities:
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 62.5,-44.5
+      pos: 42.5,-51.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 10597
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 52.5,-53.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 10660
     components:
     - type: Transform
@@ -69570,13 +70587,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FFAD4FFF'
-  - uid: 10666
-    components:
-    - type: Transform
-      pos: 64.5,-34.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 10667
     components:
     - type: Transform
@@ -69585,30 +70595,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 10668
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 60.5,-51.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 10669
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 53.5,-52.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 10671
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 10735
     components:
     - type: Transform
@@ -69655,14 +70641,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 10762
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 64.5,-50.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 10768
     components:
     - type: Transform
@@ -69679,38 +70657,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 10776
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 52.5,-52.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 10786
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-52.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 10800
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 63.5,-48.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 10812
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 61.5,-37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 10813
     components:
     - type: Transform
@@ -69719,14 +70665,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 10816
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 65.5,-50.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 10886
     components:
     - type: Transform
@@ -69750,70 +70688,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 11732
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 52.5,-54.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 11733
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 52.5,-55.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 11734
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 52.5,-53.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 11735
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 52.5,-52.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 11738
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 59.5,-55.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 11739
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 59.5,-56.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 11750
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 66.5,-41.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 11753
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 64.5,-41.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 11828
     components:
     - type: Transform
@@ -69824,14 +70698,6 @@ entities:
       pipeLayer: Tertiary
     - type: AtmosPipeColor
       color: '#947507FF'
-  - uid: 11850
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 64.5,-32.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 11946
     components:
     - type: Transform
@@ -69846,14 +70712,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 11957
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 65.5,-32.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 12151
     components:
     - type: Transform
@@ -70051,28 +70909,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#03FCD3FF'
-  - uid: 12828
-    components:
-    - type: Transform
-      pos: 64.5,-42.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 12829
-    components:
-    - type: Transform
-      pos: 64.5,-41.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 12830
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 67.5,-47.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 12831
     components:
     - type: Transform
@@ -70087,6 +70923,14 @@ entities:
       rot: 3.141592653589793 rad
       pos: 49.5,-76.5
       parent: 2
+  - uid: 12910
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 43.5,-39.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 12923
     components:
     - type: Transform
@@ -70106,22 +70950,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 47.5,-79.5
       parent: 2
-  - uid: 12931
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-53.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 12932
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 69.5,-41.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 12968
     components:
     - type: Transform
@@ -70152,36 +70980,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 13155
-    components:
-    - type: Transform
-      pos: 23.5,-22.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 13156
-    components:
-    - type: Transform
-      pos: 23.5,-21.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 13157
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 24.5,-23.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 13161
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 25.5,-23.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 13207
     components:
     - type: Transform
@@ -70210,20 +71008,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 13519
-    components:
-    - type: Transform
-      pos: 27.5,-26.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 13520
-    components:
-    - type: Transform
-      pos: 27.5,-25.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 13521
     components:
     - type: Transform
@@ -70303,22 +71087,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 13831
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 66.5,-43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13832
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-54.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 13866
     components:
     - type: Transform
@@ -70326,163 +71094,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 13869
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 62.5,-43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 13870
-    components:
-    - type: Transform
-      pos: 65.5,-43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 13882
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 64.5,-51.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13895
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 65.5,-51.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13896
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 70.5,-50.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 13897
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 66.5,-51.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13898
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 67.5,-51.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13915
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 61.5,-51.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13920
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 67.5,-41.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 13921
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 68.5,-41.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 13923
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-55.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13924
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 62.5,-43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13925
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 61.5,-42.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 13926
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 68.5,-43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13927
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 69.5,-43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13928
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 70.5,-43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13929
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 70.5,-41.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 13930
-    components:
-    - type: Transform
-      pos: 67.5,-44.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13931
-    components:
-    - type: Transform
-      pos: 67.5,-45.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 14290
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 63.5,-45.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 14443
     components:
     - type: Transform
@@ -71070,14 +71681,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 14588
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 23.5,-16.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 14589
     components:
     - type: Transform
@@ -71442,14 +72045,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 14679
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 26.5,-23.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 14681
     components:
     - type: Transform
@@ -71482,13 +72077,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 14694
-    components:
-    - type: Transform
-      pos: 27.5,-24.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 14707
     components:
     - type: Transform
@@ -71512,28 +72100,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 14732
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 65.5,-43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 14735
-    components:
-    - type: Transform
-      pos: 65.5,-45.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 14736
-    components:
-    - type: Transform
-      pos: 65.5,-46.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 14743
     components:
     - type: Transform
@@ -71605,14 +72171,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 14804
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 66.5,-50.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 15036
     components:
     - type: Transform
@@ -71645,21 +72203,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 15137
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 61.5,-43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 15139
-    components:
-    - type: Transform
-      pos: 65.5,-42.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 15142
     components:
     - type: Transform
@@ -71668,22 +72211,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 15401
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 61.5,-38.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 15402
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 59.5,-38.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 15416
     components:
     - type: Transform
@@ -71692,14 +72219,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 15417
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 60.5,-38.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 15428
     components:
     - type: Transform
@@ -71804,13 +72323,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 16878
-    components:
-    - type: Transform
-      pos: 40.5,-51.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 16884
     components:
     - type: Transform
@@ -71818,13 +72330,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 16886
-    components:
-    - type: Transform
-      pos: 43.5,-50.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 16887
     components:
     - type: Transform
@@ -71839,38 +72344,22 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 16889
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 45.5,-43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 16890
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 44.5,-43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 16891
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 43.5,-43.5
+      pos: 51.5,-52.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0335FCFF'
+      color: '#FF1212FF'
   - uid: 16892
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 42.5,-43.5
+      rot: 3.141592653589793 rad
+      pos: 52.5,-55.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0335FCFF'
+      color: '#FF1212FF'
   - uid: 16893
     components:
     - type: Transform
@@ -71887,6 +72376,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 16896
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 52.5,-50.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 16900
     components:
     - type: Transform
@@ -71897,104 +72394,101 @@ entities:
   - uid: 16902
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 43.5,-44.5
+      rot: 3.141592653589793 rad
+      pos: 52.5,-49.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 16903
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 44.5,-44.5
+      rot: 3.141592653589793 rad
+      pos: 52.5,-48.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 16904
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 45.5,-44.5
+      rot: 3.141592653589793 rad
+      pos: 52.5,-47.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 16905
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 46.5,-44.5
+      rot: 3.141592653589793 rad
+      pos: 50.5,-49.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#0335FCFF'
   - uid: 16906
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 47.5,-44.5
+      rot: 3.141592653589793 rad
+      pos: 50.5,-48.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 16909
+      color: '#0335FCFF'
+  - uid: 16907
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 24.5,-29.5
+      pos: 50.5,-47.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 16910
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 24.5,-28.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 16911
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 24.5,-27.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
+      color: '#0335FCFF'
   - uid: 16912
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 24.5,-26.5
+      pos: 52.5,-51.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 16913
+  - uid: 16914
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 27.5,-22.5
+      pos: 50.5,-45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16915
+    components:
+    - type: Transform
+      pos: 53.5,-43.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16916
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 51.5,-44.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 16917
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 28.5,-19.5
+      rot: -1.5707963267948966 rad
+      pos: 52.5,-44.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 16918
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 28.5,-18.5
+      rot: -1.5707963267948966 rad
+      pos: 54.5,-42.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 16919
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 28.5,-17.5
+      rot: -1.5707963267948966 rad
+      pos: 55.5,-42.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
@@ -72219,6 +72713,267 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 16980
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 16989
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17084
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 58.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17092
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 59.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17094
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17105
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17106
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17107
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 58.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17110
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 60.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17111
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17140
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 62.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17141
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 62.5,-41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17142
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 62.5,-40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17151
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 62.5,-39.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17152
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 62.5,-38.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17162
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 62.5,-37.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17164
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.5,-41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17166
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.5,-40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17169
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.5,-39.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17170
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.5,-38.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17211
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.5,-37.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17212
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,-43.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17224
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17239
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,-45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17240
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,-46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17241
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,-47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17245
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 60.5,-45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17246
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 60.5,-46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17251
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 60.5,-47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17264
+    components:
+    - type: Transform
+      pos: 59.5,-48.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17268
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17269
+    components:
+    - type: Transform
+      pos: 62.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17270
+    components:
+    - type: Transform
+      pos: 62.5,-43.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 17276
     components:
     - type: Transform
@@ -72234,6 +72989,22 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 17285
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 64.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17286
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 17289
     components:
     - type: Transform
@@ -72242,29 +73013,147 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 17344
+  - uid: 17327
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 59.5,-52.5
+      pos: 66.5,-45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17333
+    components:
+    - type: Transform
+      pos: 66.5,-46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17334
+    components:
+    - type: Transform
+      pos: 64.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17340
+    components:
+    - type: Transform
+      pos: 64.5,-45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17346
+    components:
+    - type: Transform
+      pos: 64.5,-47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17353
+    components:
+    - type: Transform
+      pos: 64.5,-48.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17375
+    components:
+    - type: Transform
+      pos: 64.5,-49.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 17388
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 59.5,-53.5
+      pos: 66.5,-49.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17406
+    components:
+    - type: Transform
+      pos: 66.5,-48.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17410
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 67.5,-47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17420
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 68.5,-47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17471
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 65.5,-46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17472
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 66.5,-46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17473
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 67.5,-46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17474
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 68.5,-46.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 17475
     components:
     - type: Transform
-      pos: 65.5,-44.5
+      rot: 1.5707963267948966 rad
+      pos: 69.5,-47.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0335FCFF'
+      color: '#FF1212FF'
+  - uid: 17479
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 70.5,-47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17505
+    components:
+    - type: Transform
+      pos: 66.5,-43.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17515
+    components:
+    - type: Transform
+      pos: 66.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 17538
     components:
     - type: Transform
@@ -72273,6 +73162,83 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 17608
+    components:
+    - type: Transform
+      pos: 66.5,-41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17641
+    components:
+    - type: Transform
+      pos: 64.5,-41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17643
+    components:
+    - type: Transform
+      pos: 64.5,-40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17646
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 65.5,-39.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17650
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 66.5,-39.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17651
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 67.5,-39.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17659
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 67.5,-40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17661
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 68.5,-40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17679
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 69.5,-40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17683
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 70.5,-40.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 17684
     components:
     - type: Transform
@@ -72291,6 +73257,96 @@ entities:
       pipeLayer: Tertiary
     - type: AtmosPipeColor
       color: '#947507FF'
+  - uid: 17702
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 68.5,-39.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17721
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.5,-36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17722
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 62.5,-35.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17731
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17733
+    components:
+    - type: Transform
+      pos: 64.5,-35.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17734
+    components:
+    - type: Transform
+      pos: 64.5,-34.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17766
+    components:
+    - type: Transform
+      pos: 64.5,-32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17767
+    components:
+    - type: Transform
+      pos: 64.5,-31.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17770
+    components:
+    - type: Transform
+      pos: 63.5,-31.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17781
+    components:
+    - type: Transform
+      pos: 63.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17793
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17798
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 17818
     components:
     - type: Transform
@@ -72299,30 +73355,278 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 17943
+  - uid: 17821
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 42.5,-49.5
+      pos: 61.5,-33.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 17997
+  - uid: 17851
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 68.5,-46.5
+      pos: 60.5,-33.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 18010
+  - uid: 17853
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 66.5,-47.5
+      pos: 62.5,-32.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 17855
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17856
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 60.5,-32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17857
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 59.5,-32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17858
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 58.5,-32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17866
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 57.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17870
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 56.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17871
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 55.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17877
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 54.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17879
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 55.5,-32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17880
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 54.5,-32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17883
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 52.5,-32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17884
+    components:
+    - type: Transform
+      pos: 51.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17885
+    components:
+    - type: Transform
+      pos: 51.5,-34.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17886
+    components:
+    - type: Transform
+      pos: 51.5,-35.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17887
+    components:
+    - type: Transform
+      pos: 52.5,-34.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17893
+    components:
+    - type: Transform
+      pos: 52.5,-35.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17894
+    components:
+    - type: Transform
+      pos: 52.5,-36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17896
+    components:
+    - type: Transform
+      pos: 52.5,-37.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17925
+    components:
+    - type: Transform
+      pos: 66.5,-50.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17944
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 57.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17946
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 57.5,-34.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17947
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 58.5,-34.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17950
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 58.5,-35.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17951
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 57.5,-35.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17952
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 57.5,-36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17953
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 58.5,-36.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17958
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 64.5,-34.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17960
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 65.5,-34.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17961
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 65.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17962
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 66.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17963
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 66.5,-34.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17964
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 67.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 18026
     components:
     - type: Transform
@@ -72362,6 +73666,333 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 18154
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 27.5,-15.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18162
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-21.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18165
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-20.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18166
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-19.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18186
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-17.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18212
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-16.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18214
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-15.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18215
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-14.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18218
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-13.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18220
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 23.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18221
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 24.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18228
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 26.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18229
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 27.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18261
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 28.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18262
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18263
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18265
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,-25.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18268
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,-26.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18270
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,-27.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18271
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,-28.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18272
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,-29.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18280
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 29.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18283
+    components:
+    - type: Transform
+      pos: 29.5,-25.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18363
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 26.5,-13.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18364
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 25.5,-13.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18365
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 24.5,-13.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18366
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 24.5,-12.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18372
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 23.5,-12.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18420
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 30.5,-21.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18464
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 30.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18474
+    components:
+    - type: Transform
+      pos: 31.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18487
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 75.5,-46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18497
+    components:
+    - type: Transform
+      pos: 31.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18503
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 31.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18505
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 31.5,-21.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18507
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 30.5,-20.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18516
+    components:
+    - type: Transform
+      pos: 30.5,-19.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18517
+    components:
+    - type: Transform
+      pos: 30.5,-17.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18519
+    components:
+    - type: Transform
+      pos: 30.5,-16.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18520
+    components:
+    - type: Transform
+      pos: 32.5,-18.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18521
+    components:
+    - type: Transform
+      pos: 32.5,-17.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18522
+    components:
+    - type: Transform
+      pos: 32.5,-16.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 18542
     components:
     - type: Transform
@@ -72378,6 +74009,142 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 18568
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 74.5,-46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18629
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 33.5,-14.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18633
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 34.5,-15.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18667
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 32.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18668
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 33.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18669
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 34.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18670
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18671
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 36.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18672
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 37.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18682
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 32.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18683
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 33.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18698
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 34.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18699
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18700
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 36.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18701
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 37.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18740
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 40.5,-49.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18757
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 18785
     components:
     - type: Transform
@@ -72386,6 +74153,22 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 18788
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,-45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18790
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 52.5,-51.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 18791
     components:
     - type: Transform
@@ -72413,27 +74196,83 @@ entities:
   - uid: 18807
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 40.5,-44.5
+      rot: -1.5707963267948966 rad
+      pos: 53.5,-51.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18808
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 39.5,-44.5
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-54.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 18829
+  - uid: 18809
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 85.5,-43.5
+      pos: 61.5,-56.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
+  - uid: 18810
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-56.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18816
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-56.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18817
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 64.5,-56.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18819
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-56.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18820
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 66.5,-56.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18821
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 68.5,-56.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18822
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 69.5,-56.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 18830
     components:
     - type: Transform
@@ -72441,7 +74280,7 @@ entities:
       pos: 86.5,-43.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
   - uid: 18831
     components:
     - type: Transform
@@ -72449,7 +74288,73 @@ entities:
       pos: 87.5,-43.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#0335FCFF'
+  - uid: 18835
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 67.5,-56.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18935
+    components:
+    - type: Transform
+      pos: 71.5,-58.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19022
+    components:
+    - type: Transform
+      pos: 71.5,-59.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19037
+    components:
+    - type: Transform
+      pos: 71.5,-60.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19038
+    components:
+    - type: Transform
+      pos: 71.5,-61.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19039
+    components:
+    - type: Transform
+      pos: 71.5,-62.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19044
+    components:
+    - type: Transform
+      pos: 71.5,-63.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19045
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 72.5,-64.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19046
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 73.5,-64.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 19263
     components:
     - type: Transform
@@ -72492,6 +74397,901 @@ entities:
       pipeLayer: Secondary
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 19607
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 28.5,-97.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19642
+    components:
+    - type: Transform
+      pos: 29.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19643
+    components:
+    - type: Transform
+      pos: 30.5,-97.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19645
+    components:
+    - type: Transform
+      pos: 30.5,-96.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19648
+    components:
+    - type: Transform
+      pos: 30.5,-95.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19649
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 28.5,-94.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19681
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 29.5,-94.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19682
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 31.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19683
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 32.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19684
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 33.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19685
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 34.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19686
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19687
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 36.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19688
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 37.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19689
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 38.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19690
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 39.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19691
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 40.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19692
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 41.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19693
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 42.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19694
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 43.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19695
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19696
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 45.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19697
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 46.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19698
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 47.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19699
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 48.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19700
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 49.5,-98.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19701
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 30.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19702
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 31.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19703
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 32.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19704
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 33.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19705
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 34.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19706
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19707
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 36.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19708
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 37.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19709
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 38.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19710
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 39.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19711
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 40.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19712
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 41.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19713
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 42.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19714
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 43.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19715
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19716
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 45.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19717
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 46.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19718
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 47.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19719
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 48.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19720
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 49.5,-99.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19781
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 73.5,-46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19782
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 72.5,-46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19783
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 74.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19784
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 73.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19785
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 72.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19786
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 71.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19787
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 70.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19788
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 69.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19789
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 68.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19792
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 66.5,-43.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19858
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19859
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19860
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19861
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 60.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19862
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 59.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 19863
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19864
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19865
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 60.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19866
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 59.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19867
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 58.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19868
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19869
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19973
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -52.5,-25.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19974
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -51.5,-25.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19975
+    components:
+    - type: Transform
+      pos: -50.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19976
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -49.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19977
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -48.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19978
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -46.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19979
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -45.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19980
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -43.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19981
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -42.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19982
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -41.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19983
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -40.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19984
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -39.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19985
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -38.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19986
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -37.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19987
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -36.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19988
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -35.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19989
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -35.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19990
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -35.5,-21.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19991
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -35.5,-20.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19992
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -35.5,-19.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19993
+    components:
+    - type: Transform
+      pos: -34.5,-17.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 19994
+    components:
+    - type: Transform
+      pos: -33.5,-15.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20004
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -47.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20013
+    components:
+    - type: Transform
+      pos: 60.5,-57.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20014
+    components:
+    - type: Transform
+      pos: 60.5,-58.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20025
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -49.5,-41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20026
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -50.5,-41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20027
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -51.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20028
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -51.5,-43.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20029
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -51.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20030
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -51.5,-45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20031
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -51.5,-46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20032
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -51.5,-47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20033
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -51.5,-48.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20034
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -51.5,-49.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20035
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -51.5,-49.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 20036
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -50.5,-49.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 20037
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -49.5,-49.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 20038
+    components:
+    - type: Transform
+      pos: -52.5,-48.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 20039
+    components:
+    - type: Transform
+      pos: -52.5,-47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 20040
+    components:
+    - type: Transform
+      pos: -52.5,-46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 20041
+    components:
+    - type: Transform
+      pos: -52.5,-45.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 20042
+    components:
+    - type: Transform
+      pos: -52.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 20043
+    components:
+    - type: Transform
+      pos: -52.5,-43.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 20044
+    components:
+    - type: Transform
+      pos: -52.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 20045
+    components:
+    - type: Transform
+      pos: -52.5,-41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
 - proto: GasPipeStraightAlt1
   entities:
   - uid: 15414
@@ -72528,14 +75328,6 @@ entities:
       color: '#FF1212FF'
 - proto: GasPipeTJunction
   entities:
-  - uid: 1072
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 58.5,-51.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 1463
     components:
     - type: Transform
@@ -72574,14 +75366,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 2724
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 63.5,-41.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 2811
     components:
     - type: Transform
@@ -72596,26 +75380,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 47.5,-77.5
       parent: 2
-  - uid: 3768
+  - uid: 4200
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 62.5,-50.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 3778
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 63.5,-51.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 3812
-    components:
-    - type: Transform
-      pos: 51.5,-52.5
+      rot: -1.5707963267948966 rad
+      pos: 43.5,-50.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
@@ -72627,21 +75396,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 5404
-    components:
-    - type: Transform
-      pos: 52.5,-51.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 5886
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 43.5,-49.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 6356
     components:
     - type: Transform
@@ -72665,6 +75419,21 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 6905
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 27.5,-94.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 6906
+    components:
+    - type: Transform
+      pos: 27.5,-97.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 7265
     components:
     - type: Transform
@@ -72673,6 +75442,13 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 7341
+    components:
+    - type: Transform
+      pos: 81.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 7447
     components:
     - type: Transform
@@ -72689,14 +75465,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 7743
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 64.5,-33.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 7889
     components:
     - type: Transform
@@ -72719,22 +75487,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 8195
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 63.5,-37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 8435
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 23.5,-12.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 8436
     components:
     - type: Transform
@@ -73015,14 +75767,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 9217
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 61.5,-52.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 9223
     components:
     - type: Transform
@@ -73039,14 +75783,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 9226
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 63.5,-24.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 9308
     components:
     - type: Transform
@@ -73220,14 +75956,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9637
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 64.5,-38.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 9644
     components:
     - type: Transform
@@ -73353,14 +76081,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 9798
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 23.5,-23.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 9807
     components:
     - type: Transform
@@ -73439,19 +76159,11 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 9887
+  - uid: 9879
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 25.5,-22.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 9888
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 30.5,-22.5
+      rot: 3.141592653589793 rad
+      pos: 27.5,-24.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
@@ -73508,14 +76220,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 10042
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 30.5,-14.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 10048
     components:
     - type: Transform
@@ -73662,11 +76366,65 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 10285
+    components:
+    - type: Transform
+      pos: 29.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 10288
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 41.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 10292
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 63.5,-32.5
+      rot: 3.141592653589793 rad
+      pos: 50.5,-51.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 10293
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 42.5,-52.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 10304
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 27.5,-21.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 10314
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 10324
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 52.5,-52.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 10327
+    components:
+    - type: Transform
+      pos: 51.5,-51.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
@@ -73686,21 +76444,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 10396
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 51.5,-51.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 10405
-    components:
-    - type: Transform
-      pos: 78.5,-44.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 10408
     components:
     - type: Transform
@@ -73708,20 +76451,12 @@ entities:
       pos: 79.5,-46.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 10432
+      color: '#FF1212FF'
+  - uid: 10420
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 40.5,-50.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 10437
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 41.5,-44.5
+      rot: 3.141592653589793 rad
+      pos: 41.5,-49.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
@@ -73738,18 +76473,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 33.5,-65.5
       parent: 2
-  - uid: 10783
+  - uid: 10562
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 63.5,-34.5
+      pos: 28.5,-22.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 10785
+  - uid: 10669
     components:
     - type: Transform
-      pos: 59.5,-51.5
+      rot: 1.5707963267948966 rad
+      pos: 30.5,-18.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
@@ -73761,13 +76496,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 10817
-    components:
-    - type: Transform
-      pos: 60.5,-52.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 12154
     components:
     - type: Transform
@@ -73832,14 +76560,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 12822
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 64.5,-40.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 12880
     components:
     - type: Transform
@@ -73847,28 +76567,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#03FCD3FF'
-  - uid: 12930
-    components:
-    - type: Transform
-      pos: 65.5,-41.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 13154
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 27.5,-23.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 13162
-    components:
-    - type: Transform
-      pos: 28.5,-22.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 13234
     components:
     - type: Transform
@@ -73893,14 +76591,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 13922
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 64.5,-43.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 14138
     components:
     - type: Transform
@@ -73909,6 +76599,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 14298
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -33.5,-14.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 14318
     components:
     - type: Transform
@@ -74019,22 +76717,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 14602
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 24.5,-13.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 14641
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 40.5,-52.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 14660
     components:
     - type: Transform
@@ -74075,11 +76757,10 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 15138
+  - uid: 15344
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-42.5
+      pos: 60.5,-56.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
@@ -74091,6 +76772,38 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 16229
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 70.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16250
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 16262
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 71.5,-23.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 16360
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 71.5,-47.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 16424
     components:
     - type: Transform
@@ -74146,11 +76859,43 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 16914
+  - uid: 16886
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 62.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 16889
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16890
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 27.5,-21.5
+      pos: 50.5,-50.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16895
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 55.5,-44.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 16913
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 50.5,-46.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
@@ -74169,20 +76914,44 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 17473
+  - uid: 17093
     components:
     - type: Transform
-      pos: 63.5,-43.5
+      pos: 60.5,-44.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 17504
+  - uid: 17109
     components:
     - type: Transform
-      pos: 67.5,-43.5
+      pos: 59.5,-42.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17288
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 66.5,-44.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 17326
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 64.5,-43.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17344
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 64.5,-46.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 17682
     components:
     - type: Transform
@@ -74191,6 +76960,22 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 17748
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17778
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-34.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 17819
     components:
     - type: Transform
@@ -74199,6 +76984,50 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 17859
+    components:
+    - type: Transform
+      pos: 58.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17860
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17861
+    components:
+    - type: Transform
+      pos: 56.5,-32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17862
+    components:
+    - type: Transform
+      pos: 57.5,-32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17878
+    components:
+    - type: Transform
+      pos: 53.5,-33.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17882
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 53.5,-32.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 18060
     components:
     - type: Transform
@@ -74206,6 +77035,68 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 18158
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 27.5,-14.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18167
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,-18.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18315
+    components:
+    - type: Transform
+      pos: 25.5,-12.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18405
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 31.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18419
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 30.5,-22.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18509
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 32.5,-19.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18615
+    components:
+    - type: Transform
+      pos: 32.5,-14.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18630
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 33.5,-15.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 19478
     components:
     - type: Transform
@@ -74214,6 +77105,28 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#03FCD3FF'
+  - uid: 20016
+    components:
+    - type: Transform
+      pos: 58.5,-59.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20023
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -48.5,-49.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 20024
+    components:
+    - type: Transform
+      pos: -48.5,-41.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
 - proto: GasPort
   entities:
   - uid: 5032
@@ -74262,12 +77175,30 @@ entities:
     - type: Transform
       pos: 49.5,-74.5
       parent: 2
-  - uid: 14762
+  - uid: 19971
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 49.5,-101.5
+      pos: -54.5,-25.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20017
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 58.5,-60.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20018
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 57.5,-60.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
 - proto: GasPressurePump
   entities:
   - uid: 5046
@@ -74327,6 +77258,12 @@ entities:
     - type: Transform
       pos: 33.5,-63.5
       parent: 2
+  - uid: 10655
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 49.5,-77.5
+      parent: 2
   - uid: 13135
     components:
     - type: Transform
@@ -74355,8 +77292,29 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 19972
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -53.5,-25.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 20015
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 59.5,-59.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
 - proto: GasThermoMachineFreezer
   entities:
+  - uid: 5297
+    components:
+    - type: Transform
+      pos: 44.5,-36.5
+      parent: 2
   - uid: 13437
     components:
     - type: Transform
@@ -74377,12 +77335,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#03FCD3FF'
-  - uid: 19313
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 48.5,-45.5
-      parent: 2
 - proto: GasThermoMachineHeater
   entities:
   - uid: 14305
@@ -74468,6 +77420,28 @@ entities:
       - 469
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 582
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 39.5,-49.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19883
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 591
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 81.5,-45.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19916
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 813
     components:
     - type: Transform
@@ -74511,26 +77485,6 @@ entities:
       - 17282
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 3398
-    components:
-    - type: Transform
-      pos: 58.5,-50.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7131
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 3403
-    components:
-    - type: Transform
-      pos: 51.5,-50.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 3424
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 3444
     components:
     - type: Transform
@@ -74542,52 +77496,15 @@ entities:
       - 8816
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 3552
-    components:
-    - type: Transform
-      pos: 59.5,-36.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7104
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 3553
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 71.5,-41.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7952
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 4170
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 64.5,-18.5
       parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 5414
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 59.5,-42.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 5415
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 69.5,-47.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 10295
+      - 18059
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5789
@@ -74608,17 +77525,6 @@ entities:
       - 7245
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 7114
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 64.5,-34.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7953
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 7448
     components:
     - type: Transform
@@ -74646,6 +77552,16 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -30.5,-61.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19220
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 8453
+    components:
+    - type: Transform
+      pos: 41.5,-37.5
+      parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 8616
@@ -74883,6 +77799,9 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -28.5,-34.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 6411
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 8753
@@ -74918,28 +77837,6 @@ entities:
       - 6410
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 8777
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 28.5,-21.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6354
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 8781
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 29.5,-29.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6353
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 8818
     components:
     - type: Transform
@@ -74948,7 +77845,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 6358
+      - 19876
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 8831
@@ -74959,8 +77856,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 3897
-      - 9200
+      - 19835
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 8841
@@ -75001,9 +77897,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -32.5,-23.5
       parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6646
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 8859
@@ -75061,6 +77954,16 @@ entities:
       - 6406
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 9311
+    components:
+    - type: Transform
+      pos: 91.5,-42.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 10839
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 9351
     components:
     - type: Transform
@@ -75069,16 +77972,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 3446
-      - 3427
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 9352
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 68.5,-32.5
-      parent: 2
+      - 19909
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 9463
@@ -75138,6 +78032,9 @@ entities:
     - type: Transform
       pos: -46.5,-62.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19961
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 9701
@@ -75145,6 +78042,9 @@ entities:
     - type: Transform
       pos: -38.5,-62.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19964
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 9702
@@ -75153,6 +78053,9 @@ entities:
       rot: 3.141592653589793 rad
       pos: -46.5,-67.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19963
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 9819
@@ -75184,7 +78087,6 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 9216
       - 10429
     - type: AtmosPipeColor
       color: '#0335FCFF'
@@ -75196,7 +78098,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 9040
+      - 19853
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 9874
@@ -75243,15 +78145,15 @@ entities:
       - 469
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 10059
+  - uid: 10279
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 41.5,-50.5
+      rot: 3.141592653589793 rad
+      pos: 51.5,-55.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 9241
+      - 16342
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 10341
@@ -75271,19 +78173,9 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 9403
+      - 19884
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 10421
-    components:
-    - type: Transform
-      pos: 89.5,-42.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 467
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 10473
     components:
     - type: Transform
@@ -75293,25 +78185,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 5107
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 10751
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 51.5,-56.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 10796
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 59.5,-57.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 8124
+      - 12980
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 10832
@@ -75319,6 +78193,20 @@ entities:
     - type: Transform
       pos: -41.5,-62.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19962
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 12242
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 50.5,-98.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 14759
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12421
@@ -75340,28 +78228,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 12821
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 13.5,-16.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 14636
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 13894
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 71.5,-50.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7950
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 14539
     components:
     - type: Transform
@@ -75435,22 +78301,15 @@ entities:
       - 14460
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 14601
-    components:
-    - type: Transform
-      pos: 23.5,-11.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 18598
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
   - uid: 14634
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 4.5,-20.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19836
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 14654
@@ -75479,17 +78338,9 @@ entities:
       rot: 3.141592653589793 rad
       pos: -27.5,-12.5
       parent: 2
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 14697
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 46.5,-43.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 164
+      - 15885
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 14713
@@ -75525,6 +78376,17 @@ entities:
       - 7310
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 15401
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-16.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 14636
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 15635
     components:
     - type: Transform
@@ -75547,15 +78409,26 @@ entities:
       - 2110
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 16879
+  - uid: 16872
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 31.5,-14.5
+      pos: 51.5,-50.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 19354
+      - 3424
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 16910
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 51.5,-46.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16312
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 16964
@@ -75569,14 +78442,113 @@ entities:
       - 9198
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 17679
+  - uid: 17265
     components:
     - type: Transform
-      pos: 30.5,-12.5
+      rot: 3.141592653589793 rad
+      pos: 59.5,-49.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18869
+      - 19905
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17518
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 69.5,-47.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16343
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17601
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-43.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16356
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17700
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 69.5,-39.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16345
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17907
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 56.5,-33.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16354
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17908
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 52.5,-36.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16353
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17913
+    components:
+    - type: Transform
+      pos: 53.5,-31.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19911
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17943
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 65.5,-51.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16344
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17957
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 56.5,-37.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16346
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 17992
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 67.5,-34.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17993
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 18056
@@ -75600,6 +78572,39 @@ entities:
       - 18493
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 18312
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,-30.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 7582
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18399
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 26.5,-12.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 10761
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18400
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 26.5,-18.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16367
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 18545
     components:
     - type: Transform
@@ -75611,6 +78616,61 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 364
+  - uid: 18554
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 31.5,-18.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16362
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18665
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-13.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 18736
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18681
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 38.5,-22.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19856
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18725
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 32.5,-15.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16363
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 18789
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 37.5,-42.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19880
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
   - uid: 18796
     components:
     - type: Transform
@@ -75621,22 +78681,17 @@ entities:
       - 1876
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 18809
+  - uid: 19064
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 38.5,-44.5
+      rot: -1.5707963267948966 rad
+      pos: 74.5,-64.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19917
     - type: AtmosPipeColor
       color: '#0335FCFF'
-  - uid: 18833
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 78.5,-45.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 19353
     components:
     - type: Transform
@@ -75644,8 +78699,51 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
+  - uid: 19871
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 55.5,-24.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+    - type: DeviceNetwork
+      deviceLists:
+      - 579
+  - uid: 19874
+    components:
+    - type: Transform
+      pos: 70.5,-21.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+    - type: DeviceNetwork
+      deviceLists:
+      - 6358
+  - uid: 20047
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -51.5,-50.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9195
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
 - proto: GasVentScrubber
   entities:
+  - uid: 1104
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 26.5,-21.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16367
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 1796
     components:
     - type: Transform
@@ -75663,6 +78761,9 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 66.5,-20.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 18059
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 2406
@@ -75693,6 +78794,9 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 75.5,-22.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19876
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 3185
@@ -75735,18 +78839,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 3446
-      - 3427
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 4200
-    components:
-    - type: Transform
-      pos: 58.5,-37.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7104
+      - 19909
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 5168
@@ -75758,19 +78851,14 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 5159
-  - uid: 5413
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 68.5,-33.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 5830
     components:
     - type: Transform
       pos: -37.5,-61.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19964
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 6133
@@ -75795,26 +78883,22 @@ entities:
       - 572
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 6670
+  - uid: 7074
+    components:
+    - type: Transform
+      pos: 43.5,-37.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 7594
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 28.5,-25.5
+      pos: 91.5,-48.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 6353
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 7105
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 63.5,-40.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7953
+      - 10839
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 7700
@@ -75828,25 +78912,6 @@ entities:
       - 2110
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 7751
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 69.5,-46.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 10295
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 7752
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 51.5,-55.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 8437
     components:
     - type: Transform
@@ -75858,14 +78923,17 @@ entities:
       - 7310
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 8562
+  - uid: 8480
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 59.5,-43.5
+      pos: 58.5,-23.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+    - type: DeviceNetwork
+      deviceLists:
+      - 579
   - uid: 8612
     components:
     - type: Transform
@@ -75929,7 +78997,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 9040
+      - 19853
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 8655
@@ -76050,17 +79118,6 @@ entities:
       - 5107
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 8709
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 89.5,-48.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 467
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 8713
     components:
     - type: Transform
@@ -76178,17 +79235,6 @@ entities:
       - 9199
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 8774
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 30.5,-23.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6354
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 8780
     components:
     - type: Transform
@@ -76210,16 +79256,6 @@ entities:
       - 9241
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 8793
-    components:
-    - type: Transform
-      pos: 48.5,-43.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 164
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 8832
     components:
     - type: Transform
@@ -76227,10 +79263,9 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 3897
-      - 9200
+      - 19835
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#FF1212FF'
   - uid: 8839
     components:
     - type: Transform
@@ -76269,9 +79304,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -32.5,-24.5
       parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 6646
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 8860
@@ -76326,6 +79358,17 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 9080
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 50.5,-99.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 14759
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 9081
     components:
     - type: Transform
@@ -76333,15 +79376,15 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 9357
+  - uid: 9247
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 71.5,-43.5
+      rot: 1.5707963267948966 rad
+      pos: 41.5,-50.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 7952
+      - 19883
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 9428
@@ -76366,16 +79409,6 @@ entities:
       - 5526
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 9496
-    components:
-    - type: Transform
-      pos: 24.5,-12.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 18598
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 9546
     components:
     - type: Transform
@@ -76402,6 +79435,9 @@ entities:
     - type: Transform
       pos: -44.5,-62.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19961
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 9796
@@ -76448,17 +79484,6 @@ entities:
       - 469
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 10267
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 61.5,-57.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 8124
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 10342
     components:
     - type: Transform
@@ -76476,7 +79501,7 @@ entities:
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 9403
+      - 19884
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 10474
@@ -76488,6 +79513,29 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 5107
+      - 12980
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 10595
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 51.5,-56.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16342
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 10646
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 37.5,-45.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19880
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 11935
@@ -76507,6 +79555,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -41.5,-61.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19962
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 12422
@@ -76520,38 +79571,6 @@ entities:
       - 18013
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 13106
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 31.5,-15.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 19354
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13910
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 68.5,-51.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7950
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 13917
-    components:
-    - type: Transform
-      pos: 61.5,-50.5
-      parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 7131
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 14538
     components:
     - type: Transform
@@ -76632,6 +79651,9 @@ entities:
       rot: 3.141592653589793 rad
       pos: -45.5,-68.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19963
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 14635
@@ -76640,6 +79662,9 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 4.5,-21.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19836
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 14655
@@ -76674,14 +79699,6 @@ entities:
       - 6342
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 15129
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 41.5,-49.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 16173
     components:
     - type: Transform
@@ -76725,6 +79742,16 @@ entities:
       - 9234
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 16911
+    components:
+    - type: Transform
+      pos: 55.5,-43.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16312
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 16959
     components:
     - type: Transform
@@ -76747,6 +79774,39 @@ entities:
       - 1876
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 17267
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.5,-49.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19905
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17516
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 65.5,-47.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16356
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17517
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 72.5,-47.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16343
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 17678
     components:
     - type: Transform
@@ -76758,6 +79818,82 @@ entities:
       - 17680
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 17695
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 71.5,-40.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16345
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17906
+    components:
+    - type: Transform
+      pos: 59.5,-32.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16354
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17909
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 52.5,-38.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16353
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17911
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 53.5,-34.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19911
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17926
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 66.5,-51.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16344
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17956
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 58.5,-37.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16346
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 17990
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 68.5,-33.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 17993
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 18055
     components:
     - type: Transform
@@ -76769,6 +79905,39 @@ entities:
       - 18818
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 18293
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 29.5,-26.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 7582
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18398
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 26.5,-14.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 10761
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18525
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 31.5,-19.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16362
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 18544
     components:
     - type: Transform
@@ -76780,6 +79949,38 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 364
+  - uid: 18666
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-15.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 18736
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18673
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 38.5,-24.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19856
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 18726
+    components:
+    - type: Transform
+      pos: 33.5,-14.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 16363
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
   - uid: 18782
     components:
     - type: Transform
@@ -76796,6 +79997,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -28.5,-13.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 15885
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 18797
@@ -76809,27 +80013,25 @@ entities:
       - 1075
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 18810
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 38.5,-45.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
   - uid: 18832
     components:
     - type: Transform
       pos: 79.5,-45.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19916
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#FF1212FF'
   - uid: 19267
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -28.5,-60.5
       parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 19220
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 19352
@@ -76849,14 +80051,29 @@ entities:
       - 6406
     - type: AtmosPipeColor
       color: '#FF1212FF'
-- proto: GasVolumePump
-  entities:
-  - uid: 516
+  - uid: 19873
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 49.5,-77.5
+      pos: 71.5,-22.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+    - type: DeviceNetwork
+      deviceLists:
+      - 6358
+  - uid: 20048
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -51.5,-40.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 9195
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+- proto: GasVolumePump
+  entities:
   - uid: 3342
     components:
     - type: Transform
@@ -76916,12 +80133,12 @@ entities:
   - uid: 5244
     components:
     - type: Transform
-      pos: 18.370327,-17.477331
+      pos: 18.566528,-17.330505
       parent: 2
   - uid: 14367
     components:
     - type: Transform
-      pos: 18.120327,-17.279278
+      pos: 18.363403,-17.43988
       parent: 2
 - proto: GeigerCounter
   entities:
@@ -76942,69 +80159,111 @@ entities:
       parent: 2
 - proto: Girder
   entities:
-  - uid: 4080
+  - uid: 3143
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 75.5,-39.5
+      rot: -1.5707963267948966 rad
+      pos: 58.5,-67.5
       parent: 2
-  - uid: 5810
+  - uid: 3165
     components:
     - type: Transform
-      pos: 69.5,-65.5
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-68.5
       parent: 2
-  - uid: 5814
+  - uid: 3166
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 69.5,-64.5
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-70.5
       parent: 2
-  - uid: 5827
+  - uid: 3187
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 68.5,-63.5
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-66.5
       parent: 2
-  - uid: 5828
+  - uid: 5305
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 68.5,-62.5
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-71.5
       parent: 2
-  - uid: 5831
+  - uid: 5310
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 68.5,-61.5
+      rot: -1.5707963267948966 rad
+      pos: 59.5,-66.5
       parent: 2
-  - uid: 5835
+  - uid: 5320
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 69.5,-60.5
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-67.5
       parent: 2
-  - uid: 5857
+  - uid: 5734
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 70.5,-60.5
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-69.5
       parent: 2
-  - uid: 6294
+  - uid: 5809
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 75.5,-28.5
+      rot: -1.5707963267948966 rad
+      pos: 60.5,-66.5
+      parent: 2
+  - uid: 6272
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-73.5
       parent: 2
   - uid: 6551
     components:
     - type: Transform
       pos: 78.5,-53.5
       parent: 2
-  - uid: 7116
+  - uid: 7569
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 75.5,-36.5
+      pos: 79.5,-30.5
+      parent: 2
+  - uid: 13912
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-67.5
+      parent: 2
+  - uid: 14348
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-71.5
+      parent: 2
+  - uid: 14351
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-68.5
+      parent: 2
+  - uid: 14568
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-72.5
+      parent: 2
+  - uid: 14697
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-69.5
+      parent: 2
+  - uid: 14723
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-70.5
       parent: 2
   - uid: 15846
     components:
@@ -77012,6 +80271,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 5.5,-32.5
       parent: 2
+  - uid: 17370
+    components:
+    - type: Transform
+      pos: -41.5,-76.5
+      parent: 2
 - proto: GlassBoxLaserFilled
   entities:
   - uid: 16844
@@ -77034,7 +80298,7 @@ entities:
       desc: The prophecy tells of a day in the distant future, in which the Truest Janitor will pick up this plunger and eradicate clogging from this world forever more...
       name: lubed cursed golden plunger
     - type: Transform
-      pos: -41.50827,-76.386536
+      pos: -40.50827,-77.386536
       parent: 2
     - type: WarpPoint
       location: cursed golden plunger
@@ -77604,11 +80868,6 @@ entities:
     - type: Transform
       pos: -54.5,-39.5
       parent: 2
-  - uid: 714
-    components:
-    - type: Transform
-      pos: -13.5,-75.5
-      parent: 2
   - uid: 716
     components:
     - type: Transform
@@ -77734,25 +80993,10 @@ entities:
     - type: Transform
       pos: -3.5,-15.5
       parent: 2
-  - uid: 860
+  - uid: 893
     components:
     - type: Transform
-      pos: 26.5,-15.5
-      parent: 2
-  - uid: 861
-    components:
-    - type: Transform
-      pos: 26.5,-16.5
-      parent: 2
-  - uid: 862
-    components:
-    - type: Transform
-      pos: 26.5,-19.5
-      parent: 2
-  - uid: 863
-    components:
-    - type: Transform
-      pos: 26.5,-20.5
+      pos: 60.5,-39.5
       parent: 2
   - uid: 940
     components:
@@ -78069,6 +81313,11 @@ entities:
     - type: Transform
       pos: 19.5,-41.5
       parent: 2
+  - uid: 1561
+    components:
+    - type: Transform
+      pos: 59.5,-35.5
+      parent: 2
   - uid: 1564
     components:
     - type: Transform
@@ -78249,6 +81498,11 @@ entities:
     - type: Transform
       pos: -37.5,-46.5
       parent: 2
+  - uid: 1681
+    components:
+    - type: Transform
+      pos: 60.5,-35.5
+      parent: 2
   - uid: 1682
     components:
     - type: Transform
@@ -78339,6 +81593,12 @@ entities:
     - type: Transform
       pos: -55.5,-45.5
       parent: 2
+  - uid: 1823
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 37.5,-12.5
+      parent: 2
   - uid: 1824
     components:
     - type: Transform
@@ -78504,6 +81764,12 @@ entities:
     - type: Transform
       pos: 56.5,-63.5
       parent: 2
+  - uid: 2228
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 92.5,-46.5
+      parent: 2
   - uid: 2231
     components:
     - type: Transform
@@ -79024,21 +82290,6 @@ entities:
     - type: Transform
       pos: 0.5,-39.5
       parent: 2
-  - uid: 3117
-    components:
-    - type: Transform
-      pos: 76.5,-63.5
-      parent: 2
-  - uid: 3118
-    components:
-    - type: Transform
-      pos: 76.5,-64.5
-      parent: 2
-  - uid: 3119
-    components:
-    - type: Transform
-      pos: 76.5,-65.5
-      parent: 2
   - uid: 3120
     components:
     - type: Transform
@@ -79064,15 +82315,15 @@ entities:
     - type: Transform
       pos: 75.5,-73.5
       parent: 2
-  - uid: 3128
+  - uid: 3151
     components:
     - type: Transform
-      pos: 73.5,-72.5
+      pos: 105.5,-35.5
       parent: 2
-  - uid: 3129
+  - uid: 3152
     components:
     - type: Transform
-      pos: 73.5,-73.5
+      pos: 104.5,-33.5
       parent: 2
   - uid: 3205
     components:
@@ -79099,30 +82350,20 @@ entities:
     - type: Transform
       pos: -2.5,-25.5
       parent: 2
-  - uid: 3473
-    components:
-    - type: Transform
-      pos: 78.5,-63.5
-      parent: 2
   - uid: 3483
     components:
     - type: Transform
       pos: 80.5,-22.5
       parent: 2
-  - uid: 3492
+  - uid: 3523
     components:
     - type: Transform
-      pos: 80.5,-47.5
+      pos: 57.5,-25.5
       parent: 2
-  - uid: 3495
+  - uid: 3550
     components:
     - type: Transform
-      pos: 80.5,-42.5
-      parent: 2
-  - uid: 3502
-    components:
-    - type: Transform
-      pos: 27.5,-17.5
+      pos: 61.5,-46.5
       parent: 2
   - uid: 3595
     components:
@@ -79134,26 +82375,42 @@ entities:
     - type: Transform
       pos: 51.5,-53.5
       parent: 2
-  - uid: 3620
-    components:
-    - type: Transform
-      pos: 53.5,-53.5
-      parent: 2
   - uid: 3639
     components:
     - type: Transform
       pos: -29.5,-65.5
       parent: 2
+  - uid: 3734
+    components:
+    - type: Transform
+      pos: 104.5,-57.5
+      parent: 2
+  - uid: 3775
+    components:
+    - type: Transform
+      pos: 105.5,-56.5
+      parent: 2
+  - uid: 3799
+    components:
+    - type: Transform
+      pos: 105.5,-36.5
+      parent: 2
+  - uid: 3855
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 101.5,-61.5
+      parent: 2
+  - uid: 3922
+    components:
+    - type: Transform
+      pos: 105.5,-34.5
+      parent: 2
   - uid: 3926
     components:
     - type: Transform
       pos: 37.5,-15.5
       parent: 2
-  - uid: 3927
-    components:
-    - type: Transform
-      pos: 37.5,-16.5
-      parent: 2
   - uid: 3929
     components:
     - type: Transform
@@ -79164,11 +82421,6 @@ entities:
     - type: Transform
       pos: 81.5,-33.5
       parent: 2
-  - uid: 3936
-    components:
-    - type: Transform
-      pos: 37.5,-17.5
-      parent: 2
   - uid: 3937
     components:
     - type: Transform
@@ -79229,11 +82481,6 @@ entities:
     - type: Transform
       pos: 2.5,-40.5
       parent: 2
-  - uid: 4253
-    components:
-    - type: Transform
-      pos: 31.5,-13.5
-      parent: 2
   - uid: 4256
     components:
     - type: Transform
@@ -79244,11 +82491,6 @@ entities:
     - type: Transform
       pos: -1.5,-40.5
       parent: 2
-  - uid: 4258
-    components:
-    - type: Transform
-      pos: -12.5,-75.5
-      parent: 2
   - uid: 4301
     components:
     - type: Transform
@@ -79394,11 +82636,6 @@ entities:
     - type: Transform
       pos: 40.5,-57.5
       parent: 2
-  - uid: 4465
-    components:
-    - type: Transform
-      pos: 78.5,-65.5
-      parent: 2
   - uid: 4520
     components:
     - type: Transform
@@ -79464,11 +82701,6 @@ entities:
     - type: Transform
       pos: 45.5,-55.5
       parent: 2
-  - uid: 4634
-    components:
-    - type: Transform
-      pos: 78.5,-64.5
-      parent: 2
   - uid: 4655
     components:
     - type: Transform
@@ -79524,6 +82756,11 @@ entities:
     - type: Transform
       pos: 80.5,-59.5
       parent: 2
+  - uid: 5228
+    components:
+    - type: Transform
+      pos: 29.5,-16.5
+      parent: 2
   - uid: 5229
     components:
     - type: Transform
@@ -79534,6 +82771,11 @@ entities:
     - type: Transform
       pos: 7.5,-13.5
       parent: 2
+  - uid: 5415
+    components:
+    - type: Transform
+      pos: 59.5,-25.5
+      parent: 2
   - uid: 5668
     components:
     - type: Transform
@@ -79554,21 +82796,26 @@ entities:
     - type: Transform
       pos: 80.5,-31.5
       parent: 2
+  - uid: 6023
+    components:
+    - type: Transform
+      pos: 83.5,-45.5
+      parent: 2
   - uid: 6094
     components:
     - type: Transform
       pos: 43.5,-12.5
       parent: 2
-  - uid: 6098
-    components:
-    - type: Transform
-      pos: 74.5,-53.5
-      parent: 2
   - uid: 6237
     components:
     - type: Transform
       pos: 39.5,-9.5
       parent: 2
+  - uid: 6280
+    components:
+    - type: Transform
+      pos: 56.5,-40.5
+      parent: 2
   - uid: 6302
     components:
     - type: Transform
@@ -79794,185 +83041,20 @@ entities:
     - type: Transform
       pos: 98.5,-31.5
       parent: 2
-  - uid: 6368
-    components:
-    - type: Transform
-      pos: 102.5,-32.5
-      parent: 2
-  - uid: 6369
-    components:
-    - type: Transform
-      pos: 102.5,-33.5
-      parent: 2
-  - uid: 6370
-    components:
-    - type: Transform
-      pos: 103.5,-34.5
-      parent: 2
-  - uid: 6371
-    components:
-    - type: Transform
-      pos: 103.5,-35.5
-      parent: 2
-  - uid: 6372
-    components:
-    - type: Transform
-      pos: 103.5,-36.5
-      parent: 2
   - uid: 6373
-    components:
-    - type: Transform
-      pos: 103.5,-37.5
-      parent: 2
-  - uid: 6374
-    components:
-    - type: Transform
-      pos: 104.5,-39.5
-      parent: 2
-  - uid: 6375
     components:
     - type: Transform
       pos: 104.5,-40.5
       parent: 2
-  - uid: 6376
-    components:
-    - type: Transform
-      pos: 104.5,-41.5
-      parent: 2
-  - uid: 6377
-    components:
-    - type: Transform
-      pos: 104.5,-43.5
-      parent: 2
-  - uid: 6378
-    components:
-    - type: Transform
-      pos: 104.5,-44.5
-      parent: 2
-  - uid: 6379
-    components:
-    - type: Transform
-      pos: 104.5,-45.5
-      parent: 2
-  - uid: 6380
-    components:
-    - type: Transform
-      pos: 104.5,-48.5
-      parent: 2
-  - uid: 6381
-    components:
-    - type: Transform
-      pos: 104.5,-49.5
-      parent: 2
-  - uid: 6382
-    components:
-    - type: Transform
-      pos: 104.5,-51.5
-      parent: 2
-  - uid: 6383
-    components:
-    - type: Transform
-      pos: 103.5,-52.5
-      parent: 2
-  - uid: 6384
-    components:
-    - type: Transform
-      pos: 103.5,-55.5
-      parent: 2
-  - uid: 6385
-    components:
-    - type: Transform
-      pos: 103.5,-56.5
-      parent: 2
-  - uid: 6386
-    components:
-    - type: Transform
-      pos: 102.5,-57.5
-      parent: 2
-  - uid: 6387
-    components:
-    - type: Transform
-      pos: 102.5,-58.5
-      parent: 2
-  - uid: 6388
-    components:
-    - type: Transform
-      pos: 100.5,-58.5
-      parent: 2
-  - uid: 6389
-    components:
-    - type: Transform
-      pos: 100.5,-57.5
-      parent: 2
-  - uid: 6390
-    components:
-    - type: Transform
-      pos: 101.5,-55.5
-      parent: 2
-  - uid: 6391
-    components:
-    - type: Transform
-      pos: 101.5,-54.5
-      parent: 2
-  - uid: 6392
-    components:
-    - type: Transform
-      pos: 101.5,-53.5
-      parent: 2
-  - uid: 6393
-    components:
-    - type: Transform
-      pos: 102.5,-50.5
-      parent: 2
-  - uid: 6394
-    components:
-    - type: Transform
-      pos: 102.5,-49.5
-      parent: 2
-  - uid: 6395
-    components:
-    - type: Transform
-      pos: 102.5,-46.5
-      parent: 2
-  - uid: 6396
-    components:
-    - type: Transform
-      pos: 102.5,-45.5
-      parent: 2
-  - uid: 6397
-    components:
-    - type: Transform
-      pos: 102.5,-44.5
-      parent: 2
   - uid: 6398
     components:
     - type: Transform
-      pos: 102.5,-41.5
+      pos: 58.5,-46.5
       parent: 2
-  - uid: 6399
+  - uid: 6418
     components:
     - type: Transform
-      pos: 102.5,-40.5
-      parent: 2
-  - uid: 6400
-    components:
-    - type: Transform
-      pos: 101.5,-37.5
-      parent: 2
-  - uid: 6401
-    components:
-    - type: Transform
-      pos: 101.5,-36.5
-      parent: 2
-  - uid: 6402
-    components:
-    - type: Transform
-      pos: 100.5,-34.5
-      parent: 2
-  - uid: 6403
-    components:
-    - type: Transform
-      pos: 100.5,-33.5
+      pos: 64.5,-49.5
       parent: 2
   - uid: 6427
     components:
@@ -80509,21 +83591,6 @@ entities:
     - type: Transform
       pos: 52.5,-95.5
       parent: 2
-  - uid: 6893
-    components:
-    - type: Transform
-      pos: 56.5,-99.5
-      parent: 2
-  - uid: 6894
-    components:
-    - type: Transform
-      pos: 56.5,-100.5
-      parent: 2
-  - uid: 6905
-    components:
-    - type: Transform
-      pos: 56.5,-98.5
-      parent: 2
   - uid: 6936
     components:
     - type: Transform
@@ -80534,11 +83601,6 @@ entities:
     - type: Transform
       pos: -6.5,-23.5
       parent: 2
-  - uid: 7000
-    components:
-    - type: Transform
-      pos: 80.5,-48.5
-      parent: 2
   - uid: 7107
     components:
     - type: Transform
@@ -80549,40 +83611,126 @@ entities:
     - type: Transform
       pos: -26.5,-68.5
       parent: 2
+  - uid: 7155
+    components:
+    - type: Transform
+      pos: 67.5,-38.5
+      parent: 2
+  - uid: 7195
+    components:
+    - type: Transform
+      pos: 51.5,-35.5
+      parent: 2
+  - uid: 7209
+    components:
+    - type: Transform
+      pos: 60.5,-38.5
+      parent: 2
+  - uid: 7211
+    components:
+    - type: Transform
+      pos: 55.5,-40.5
+      parent: 2
+  - uid: 7273
+    components:
+    - type: Transform
+      pos: 66.5,-49.5
+      parent: 2
   - uid: 7287
     components:
     - type: Transform
       pos: 4.5,-14.5
       parent: 2
-  - uid: 7340
+  - uid: 7438
     components:
     - type: Transform
-      pos: 81.5,-45.5
+      pos: 103.5,-36.5
       parent: 2
-  - uid: 7419
+  - uid: 7444
+    components:
+    - type: Transform
+      pos: 103.5,-37.5
+      parent: 2
+  - uid: 7445
+    components:
+    - type: Transform
+      pos: 102.5,-57.5
+      parent: 2
+  - uid: 7449
+    components:
+    - type: Transform
+      pos: 102.5,-33.5
+      parent: 2
+  - uid: 7450
+    components:
+    - type: Transform
+      pos: 103.5,-53.5
+      parent: 2
+  - uid: 7477
+    components:
+    - type: Transform
+      pos: 103.5,-55.5
+      parent: 2
+  - uid: 7478
+    components:
+    - type: Transform
+      pos: 104.5,-49.5
+      parent: 2
+  - uid: 7486
+    components:
+    - type: Transform
+      pos: 104.5,-50.5
+      parent: 2
+  - uid: 7497
+    components:
+    - type: Transform
+      pos: 104.5,-46.5
+      parent: 2
+  - uid: 7498
+    components:
+    - type: Transform
+      pos: 104.5,-44.5
+      parent: 2
+  - uid: 7500
+    components:
+    - type: Transform
+      pos: 104.5,-41.5
+      parent: 2
+  - uid: 7528
     components:
     - type: Transform
       pos: 81.5,-48.5
       parent: 2
-  - uid: 7430
+  - uid: 7530
     components:
     - type: Transform
-      pos: 90.5,-44.5
+      rot: 1.5707963267948966 rad
+      pos: 91.5,-44.5
       parent: 2
-  - uid: 7431
+  - uid: 7541
     components:
     - type: Transform
-      pos: 89.5,-44.5
+      pos: 80.5,-49.5
       parent: 2
-  - uid: 7435
+  - uid: 7557
     components:
     - type: Transform
-      pos: 89.5,-46.5
+      pos: 104.5,-45.5
       parent: 2
-  - uid: 7436
+  - uid: 7558
     components:
     - type: Transform
-      pos: 90.5,-46.5
+      pos: 103.5,-54.5
+      parent: 2
+  - uid: 7559
+    components:
+    - type: Transform
+      pos: 102.5,-58.5
+      parent: 2
+  - uid: 7562
+    components:
+    - type: Transform
+      pos: 102.5,-34.5
       parent: 2
   - uid: 7667
     components:
@@ -80609,11 +83757,28 @@ entities:
     - type: Transform
       pos: 25.5,-88.5
       parent: 2
+  - uid: 7971
+    components:
+    - type: Transform
+      pos: 58.5,-25.5
+      parent: 2
   - uid: 8039
     components:
     - type: Transform
       pos: 51.5,-58.5
       parent: 2
+  - uid: 8092
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 91.5,-46.5
+      parent: 2
+  - uid: 8093
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 92.5,-44.5
+      parent: 2
   - uid: 8232
     components:
     - type: Transform
@@ -80624,6 +83789,11 @@ entities:
     - type: Transform
       pos: 44.5,-54.5
       parent: 2
+  - uid: 8455
+    components:
+    - type: Transform
+      pos: 69.5,-57.5
+      parent: 2
   - uid: 8508
     components:
     - type: Transform
@@ -80639,25 +83809,31 @@ entities:
     - type: Transform
       pos: 22.5,-71.5
       parent: 2
-  - uid: 8802
+  - uid: 8777
     components:
     - type: Transform
-      pos: 71.5,-56.5
+      pos: 67.5,-46.5
+      parent: 2
+  - uid: 8779
+    components:
+    - type: Transform
+      pos: 63.5,-44.5
+      parent: 2
+  - uid: 8793
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 101.5,-29.5
       parent: 2
   - uid: 9282
     components:
     - type: Transform
       pos: 59.5,-22.5
       parent: 2
-  - uid: 9303
+  - uid: 9302
     components:
     - type: Transform
-      pos: 58.5,-54.5
-      parent: 2
-  - uid: 9304
-    components:
-    - type: Transform
-      pos: 61.5,-54.5
+      pos: 28.5,-15.5
       parent: 2
   - uid: 9312
     components:
@@ -80667,7 +83843,17 @@ entities:
   - uid: 9319
     components:
     - type: Transform
-      pos: 67.5,-58.5
+      pos: 104.5,-58.5
+      parent: 2
+  - uid: 9322
+    components:
+    - type: Transform
+      pos: 82.5,-47.5
+      parent: 2
+  - uid: 9412
+    components:
+    - type: Transform
+      pos: 65.5,-59.5
       parent: 2
   - uid: 9448
     components:
@@ -80679,11 +83865,37 @@ entities:
     - type: Transform
       pos: -8.5,-41.5
       parent: 2
+  - uid: 9496
+    components:
+    - type: Transform
+      pos: 66.5,-59.5
+      parent: 2
   - uid: 9583
     components:
     - type: Transform
       pos: 3.5,-47.5
       parent: 2
+  - uid: 9586
+    components:
+    - type: Transform
+      pos: 32.5,-13.5
+      parent: 2
+  - uid: 9602
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 37.5,-13.5
+      parent: 2
+  - uid: 9721
+    components:
+    - type: Transform
+      pos: 106.5,-39.5
+      parent: 2
+  - uid: 9793
+    components:
+    - type: Transform
+      pos: 105.5,-55.5
+      parent: 2
   - uid: 10240
     components:
     - type: Transform
@@ -80704,20 +83916,65 @@ entities:
     - type: Transform
       pos: 26.5,-86.5
       parent: 2
-  - uid: 10659
+  - uid: 10702
     components:
     - type: Transform
-      pos: 69.5,-41.5
+      pos: 106.5,-48.5
+      parent: 2
+  - uid: 10708
+    components:
+    - type: Transform
+      pos: 106.5,-43.5
+      parent: 2
+  - uid: 10710
+    components:
+    - type: Transform
+      pos: 106.5,-40.5
+      parent: 2
+  - uid: 10713
+    components:
+    - type: Transform
+      pos: 106.5,-41.5
+      parent: 2
+  - uid: 10756
+    components:
+    - type: Transform
+      pos: 82.5,-42.5
       parent: 2
   - uid: 10819
     components:
     - type: Transform
       pos: 27.5,-68.5
       parent: 2
-  - uid: 10842
+  - uid: 10849
     components:
     - type: Transform
-      pos: 79.5,-42.5
+      pos: 82.5,-49.5
+      parent: 2
+  - uid: 10850
+    components:
+    - type: Transform
+      pos: 81.5,-50.5
+      parent: 2
+  - uid: 10856
+    components:
+    - type: Transform
+      pos: 105.5,-52.5
+      parent: 2
+  - uid: 10860
+    components:
+    - type: Transform
+      pos: 106.5,-49.5
+      parent: 2
+  - uid: 11261
+    components:
+    - type: Transform
+      pos: 106.5,-51.5
+      parent: 2
+  - uid: 11396
+    components:
+    - type: Transform
+      pos: 106.5,-44.5
       parent: 2
   - uid: 11672
     components:
@@ -80744,11 +84001,36 @@ entities:
     - type: Transform
       pos: 47.5,-12.5
       parent: 2
+  - uid: 11830
+    components:
+    - type: Transform
+      pos: 106.5,-45.5
+      parent: 2
+  - uid: 11838
+    components:
+    - type: Transform
+      pos: 81.5,-49.5
+      parent: 2
+  - uid: 11839
+    components:
+    - type: Transform
+      pos: 82.5,-48.5
+      parent: 2
+  - uid: 11840
+    components:
+    - type: Transform
+      pos: 82.5,-43.5
+      parent: 2
   - uid: 11870
     components:
     - type: Transform
       pos: 64.5,-19.5
       parent: 2
+  - uid: 11884
+    components:
+    - type: Transform
+      pos: 73.5,-73.5
+      parent: 2
   - uid: 12846
     components:
     - type: Transform
@@ -80819,11 +84101,6 @@ entities:
     - type: Transform
       pos: -14.5,-9.5
       parent: 2
-  - uid: 13825
-    components:
-    - type: Transform
-      pos: 61.5,-46.5
-      parent: 2
   - uid: 13843
     components:
     - type: Transform
@@ -80839,6 +84116,11 @@ entities:
     - type: Transform
       pos: 58.5,-18.5
       parent: 2
+  - uid: 14028
+    components:
+    - type: Transform
+      pos: 57.5,-100.5
+      parent: 2
   - uid: 14081
     components:
     - type: Transform
@@ -80905,15 +84187,50 @@ entities:
     - type: Transform
       pos: -19.5,-73.5
       parent: 2
+  - uid: 14862
+    components:
+    - type: Transform
+      pos: 105.5,-37.5
+      parent: 2
   - uid: 14873
     components:
     - type: Transform
       pos: 9.5,-13.5
       parent: 2
-  - uid: 15147
+  - uid: 15151
     components:
     - type: Transform
-      pos: 63.5,-63.5
+      pos: 83.5,-48.5
+      parent: 2
+  - uid: 15152
+    components:
+    - type: Transform
+      pos: 73.5,-72.5
+      parent: 2
+  - uid: 15153
+    components:
+    - type: Transform
+      pos: 82.5,-41.5
+      parent: 2
+  - uid: 15154
+    components:
+    - type: Transform
+      pos: 83.5,-42.5
+      parent: 2
+  - uid: 15155
+    components:
+    - type: Transform
+      pos: 81.5,-40.5
+      parent: 2
+  - uid: 15162
+    components:
+    - type: Transform
+      pos: 81.5,-41.5
+      parent: 2
+  - uid: 15170
+    components:
+    - type: Transform
+      pos: 104.5,-32.5
       parent: 2
   - uid: 15220
     components:
@@ -80945,16 +84262,6 @@ entities:
     - type: Transform
       pos: 59.5,-18.5
       parent: 2
-  - uid: 15471
-    components:
-    - type: Transform
-      pos: 67.5,-44.5
-      parent: 2
-  - uid: 15475
-    components:
-    - type: Transform
-      pos: 66.5,-50.5
-      parent: 2
   - uid: 15791
     components:
     - type: Transform
@@ -80970,36 +84277,16 @@ entities:
     - type: Transform
       pos: 22.5,-87.5
       parent: 2
-  - uid: 16164
-    components:
-    - type: Transform
-      pos: 65.5,-44.5
-      parent: 2
   - uid: 16183
     components:
     - type: Transform
       pos: 0.5,-38.5
       parent: 2
-  - uid: 16312
-    components:
-    - type: Transform
-      pos: 56.5,-29.5
-      parent: 2
-  - uid: 16372
-    components:
-    - type: Transform
-      pos: 58.5,-25.5
-      parent: 2
   - uid: 16384
     components:
     - type: Transform
       pos: 22.5,-88.5
       parent: 2
-  - uid: 16450
-    components:
-    - type: Transform
-      pos: 58.5,-78.5
-      parent: 2
   - uid: 16621
     components:
     - type: Transform
@@ -81115,11 +84402,6 @@ entities:
     - type: Transform
       pos: 17.5,-45.5
       parent: 2
-  - uid: 16865
-    components:
-    - type: Transform
-      pos: 69.5,-43.5
-      parent: 2
   - uid: 16985
     components:
     - type: Transform
@@ -81130,26 +84412,11 @@ entities:
     - type: Transform
       pos: -4.5,-18.5
       parent: 2
-  - uid: 17212
-    components:
-    - type: Transform
-      pos: 57.5,-47.5
-      parent: 2
-  - uid: 17241
-    components:
-    - type: Transform
-      pos: 61.5,-36.5
-      parent: 2
   - uid: 17272
     components:
     - type: Transform
       pos: 61.5,-28.5
       parent: 2
-  - uid: 17285
-    components:
-    - type: Transform
-      pos: 61.5,-45.5
-      parent: 2
   - uid: 17342
     components:
     - type: Transform
@@ -81175,11 +84442,6 @@ entities:
     - type: Transform
       pos: 60.5,-18.5
       parent: 2
-  - uid: 17651
-    components:
-    - type: Transform
-      pos: 79.5,-48.5
-      parent: 2
   - uid: 17697
     components:
     - type: Transform
@@ -81200,16 +84462,6 @@ entities:
     - type: Transform
       pos: 80.5,-41.5
       parent: 2
-  - uid: 18001
-    components:
-    - type: Transform
-      pos: 80.5,-43.5
-      parent: 2
-  - uid: 18002
-    components:
-    - type: Transform
-      pos: 80.5,-49.5
-      parent: 2
   - uid: 18003
     components:
     - type: Transform
@@ -81220,11 +84472,6 @@ entities:
     - type: Transform
       pos: 52.5,-53.5
       parent: 2
-  - uid: 18366
-    components:
-    - type: Transform
-      pos: 58.5,-77.5
-      parent: 2
   - uid: 18403
     components:
     - type: Transform
@@ -81340,11 +84587,6 @@ entities:
     - type: Transform
       pos: 50.5,-63.5
       parent: 2
-  - uid: 18497
-    components:
-    - type: Transform
-      pos: 56.5,-41.5
-      parent: 2
   - uid: 18526
     components:
     - type: Transform
@@ -81355,11 +84597,6 @@ entities:
     - type: Transform
       pos: 52.5,-60.5
       parent: 2
-  - uid: 18631
-    components:
-    - type: Transform
-      pos: 59.5,-25.5
-      parent: 2
   - uid: 18876
     components:
     - type: Transform
@@ -81616,6 +84853,16 @@ entities:
     - type: Transform
       pos: -60.5,-32.5
       parent: 2
+  - uid: 19721
+    components:
+    - type: Transform
+      pos: 57.5,-99.5
+      parent: 2
+  - uid: 19722
+    components:
+    - type: Transform
+      pos: 57.5,-98.5
+      parent: 2
 - proto: GrilleBroken
   entities:
   - uid: 2496
@@ -81636,20 +84883,22 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 12.5,-81.5
       parent: 2
-  - uid: 11936
+  - uid: 14252
     components:
     - type: Transform
-      pos: 75.5,-53.5
+      rot: -1.5707963267948966 rad
+      pos: 67.5,-59.5
       parent: 2
-  - uid: 16341
+  - uid: 15472
     components:
     - type: Transform
-      pos: 77.5,-53.5
+      rot: 1.5707963267948966 rad
+      pos: 64.5,-59.5
       parent: 2
-  - uid: 16414
+  - uid: 15489
     components:
     - type: Transform
-      pos: 76.5,-53.5
+      pos: 69.5,-56.5
       parent: 2
   - uid: 16987
     components:
@@ -81860,15 +85109,30 @@ entities:
       parent: 2
 - proto: GrilleSpawner
   entities:
-  - uid: 6412
+  - uid: 3138
     components:
     - type: Transform
-      pos: 102.5,-43.5
+      pos: 105.5,-38.5
       parent: 2
-  - uid: 6423
+  - uid: 3214
     components:
     - type: Transform
-      pos: 100.5,-56.5
+      pos: 104.5,-43.5
+      parent: 2
+  - uid: 3774
+    components:
+    - type: Transform
+      pos: 106.5,-50.5
+      parent: 2
+  - uid: 5810
+    components:
+    - type: Transform
+      pos: 105.5,-53.5
+      parent: 2
+  - uid: 5812
+    components:
+    - type: Transform
+      pos: 105.5,-54.5
       parent: 2
   - uid: 6498
     components:
@@ -81890,11 +85154,89 @@ entities:
     - type: Transform
       pos: -70.5,-65.5
       parent: 2
+  - uid: 7423
+    components:
+    - type: Transform
+      pos: 102.5,-56.5
+      parent: 2
+  - uid: 7425
+    components:
+    - type: Transform
+      pos: 103.5,-52.5
+      parent: 2
+  - uid: 7426
+    components:
+    - type: Transform
+      pos: 103.5,-51.5
+      parent: 2
+  - uid: 7431
+    components:
+    - type: Transform
+      pos: 104.5,-48.5
+      parent: 2
+  - uid: 7435
+    components:
+    - type: Transform
+      pos: 103.5,-38.5
+      parent: 2
+  - uid: 7436
+    components:
+    - type: Transform
+      pos: 103.5,-39.5
+      parent: 2
+  - uid: 7550
+    components:
+    - type: Transform
+      pos: 104.5,-47.5
+      parent: 2
+  - uid: 7551
+    components:
+    - type: Transform
+      pos: 103.5,-35.5
+      parent: 2
+  - uid: 7556
+    components:
+    - type: Transform
+      pos: 104.5,-42.5
+      parent: 2
+  - uid: 7947
+    components:
+    - type: Transform
+      pos: 106.5,-47.5
+      parent: 2
+  - uid: 8746
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 100.5,-31.5
+      parent: 2
+  - uid: 8789
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 100.5,-59.5
+      parent: 2
+  - uid: 8802
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 100.5,-61.5
+      parent: 2
   - uid: 10433
     components:
     - type: Transform
       pos: -26.5,-92.5
       parent: 2
+  - uid: 13836
+    components:
+    - type: Transform
+      pos: 106.5,-42.5
+      parent: 2
+  - uid: 14404
+    components:
+    - type: Transform
+      pos: 106.5,-46.5
+      parent: 2
   - uid: 14715
     components:
     - type: Transform
@@ -81995,11 +85337,6 @@ entities:
     - type: Transform
       pos: 61.5,-7.5
       parent: 2
-  - uid: 14809
-    components:
-    - type: Transform
-      pos: 101.5,-39.5
-      parent: 2
   - uid: 14810
     components:
     - type: Transform
@@ -82010,76 +85347,6 @@ entities:
     - type: Transform
       pos: 96.5,-29.5
       parent: 2
-  - uid: 14835
-    components:
-    - type: Transform
-      pos: 101.5,-38.5
-      parent: 2
-  - uid: 14836
-    components:
-    - type: Transform
-      pos: 103.5,-38.5
-      parent: 2
-  - uid: 14837
-    components:
-    - type: Transform
-      pos: 104.5,-42.5
-      parent: 2
-  - uid: 14861
-    components:
-    - type: Transform
-      pos: 101.5,-35.5
-      parent: 2
-  - uid: 14862
-    components:
-    - type: Transform
-      pos: 102.5,-42.5
-      parent: 2
-  - uid: 14863
-    components:
-    - type: Transform
-      pos: 101.5,-51.5
-      parent: 2
-  - uid: 14864
-    components:
-    - type: Transform
-      pos: 101.5,-52.5
-      parent: 2
-  - uid: 14917
-    components:
-    - type: Transform
-      pos: 103.5,-53.5
-      parent: 2
-  - uid: 14918
-    components:
-    - type: Transform
-      pos: 103.5,-54.5
-      parent: 2
-  - uid: 14919
-    components:
-    - type: Transform
-      pos: 104.5,-50.5
-      parent: 2
-  - uid: 15595
-    components:
-    - type: Transform
-      pos: 104.5,-47.5
-      parent: 2
-  - uid: 15596
-    components:
-    - type: Transform
-      pos: 102.5,-48.5
-      parent: 2
-  - uid: 15597
-    components:
-    - type: Transform
-      pos: 102.5,-47.5
-      parent: 2
-  - uid: 15598
-    components:
-    - type: Transform
-      pos: 104.5,-46.5
-      parent: 2
   - uid: 15599
     components:
     - type: Transform
@@ -82391,31 +85658,31 @@ entities:
     - Lock
 - proto: GunSafeLaserCarbine
   entities:
-  - uid: 15461
+  - uid: 3915
     components:
     - type: Transform
-      pos: 58.5,-58.5
+      pos: 58.5,-50.5
       parent: 2
 - proto: GunSafeRifleLecter
   entities:
-  - uid: 7262
+  - uid: 2645
     components:
     - type: Transform
-      pos: 62.5,-58.5
+      pos: 62.5,-50.5
       parent: 2
 - proto: GunSafeShotgunKammerer
   entities:
-  - uid: 15460
+  - uid: 3084
     components:
     - type: Transform
-      pos: 58.5,-57.5
+      pos: 58.5,-49.5
       parent: 2
 - proto: GunSafeSubMachineGunDrozd
   entities:
-  - uid: 18162
+  - uid: 4178
     components:
     - type: Transform
-      pos: 62.5,-57.5
+      pos: 62.5,-49.5
       parent: 2
 - proto: Handcuffs
   entities:
@@ -82427,24 +85694,19 @@ entities:
   - uid: 13879
     components:
     - type: Transform
-      pos: 61.49383,-42.487232
+      pos: 57.514305,-35.453518
       parent: 2
   - uid: 19346
     components:
     - type: Transform
-      pos: 58.506886,-20.440216
+      pos: 58.428192,-20.46732
       parent: 2
 - proto: HandheldGPSBasic
   entities:
   - uid: 6984
     components:
     - type: Transform
-      pos: 52.477993,-99.26284
-      parent: 2
-  - uid: 18035
-    components:
-    - type: Transform
-      pos: -45.538082,-76.493256
+      pos: 53.64448,-99.06088
       parent: 2
 - proto: HandheldHealthAnalyzerUnpowered
   entities:
@@ -82484,7 +85746,7 @@ entities:
   - uid: 7218
     components:
     - type: Transform
-      pos: 80.20865,-27.102425
+      pos: 78.45767,-25.4561
       parent: 2
 - proto: HappyHonkMime
   entities:
@@ -82550,11 +85812,17 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FFAD4FFF'
-  - uid: 15427
+  - uid: 10661
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 48.5,-81.5
+      rot: 3.141592653589793 rad
+      pos: 47.5,-81.5
+      parent: 2
+  - uid: 10668
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 49.5,-81.5
       parent: 2
   - uid: 18101
     components:
@@ -82566,6 +85834,12 @@ entities:
     - type: Transform
       pos: 47.5,-80.5
       parent: 2
+  - uid: 19145
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 48.5,-82.5
+      parent: 2
 - proto: HeatExchangerBend
   entities:
   - uid: 4136
@@ -82583,29 +85857,29 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#03FCD3FF'
-  - uid: 14386
+  - uid: 19147
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 47.5,-81.5
+      pos: 47.5,-82.5
       parent: 2
-  - uid: 15426
+  - uid: 19151
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 49.5,-81.5
+      pos: 49.5,-82.5
       parent: 2
 - proto: HighSecArmoryLocked
   entities:
-  - uid: 4379
+  - uid: 3561
     components:
     - type: Transform
-      pos: 59.5,-54.5
+      pos: 60.5,-46.5
       parent: 2
-  - uid: 9302
+  - uid: 3778
     components:
     - type: Transform
-      pos: 60.5,-54.5
+      pos: 59.5,-46.5
       parent: 2
 - proto: HighSecCommandLocked
   entities:
@@ -82631,19 +85905,26 @@ entities:
     - type: Transform
       pos: 45.641735,-73.600204
       parent: 2
-- proto: HolopadAiCore
-  entities:
-  - uid: 10306
+  - uid: 20006
     components:
     - type: Transform
-      pos: 92.5,-45.5
+      parent: 20005
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: HolopadAiCore
+  entities:
+  - uid: 9320
+    components:
+    - type: Transform
+      pos: 94.5,-45.5
       parent: 2
 - proto: HolopadAiUpload
   entities:
-  - uid: 14323
+  - uid: 14861
     components:
     - type: Transform
-      pos: 77.5,-45.5
+      pos: 80.5,-45.5
       parent: 2
 - proto: HolopadCargoBay
   entities:
@@ -82717,10 +85998,10 @@ entities:
       parent: 2
 - proto: HolopadCommandHos
   entities:
-  - uid: 7157
+  - uid: 18027
     components:
     - type: Transform
-      pos: 68.5,-47.5
+      pos: 67.5,-52.5
       parent: 2
 - proto: HolopadCommandQm
   entities:
@@ -82834,6 +86115,13 @@ entities:
     - type: Transform
       pos: 35.5,-27.5
       parent: 2
+- proto: HolopadMedicalParamed
+  entities:
+  - uid: 17508
+    components:
+    - type: Transform
+      pos: 5.5,-27.5
+      parent: 2
 - proto: HolopadMedicalSurgery
   entities:
   - uid: 19149
@@ -82843,10 +86131,10 @@ entities:
       parent: 2
 - proto: HolopadMedicalVirology
   entities:
-  - uid: 19145
+  - uid: 18511
     components:
     - type: Transform
-      pos: 29.5,-20.5
+      pos: 32.5,-18.5
       parent: 2
 - proto: HolopadScienceArtifact
   entities:
@@ -82864,10 +86152,10 @@ entities:
       parent: 2
 - proto: HolopadSecurityArmory
   entities:
-  - uid: 5666
+  - uid: 18005
     components:
     - type: Transform
-      pos: 60.5,-58.5
+      pos: 60.5,-48.5
       parent: 2
 - proto: HolopadSecurityArrivalsCheckpoint
   entities:
@@ -82876,19 +86164,47 @@ entities:
     - type: Transform
       pos: -3.5,-14.5
       parent: 2
-- proto: HolopadSecurityFront
+- proto: HolopadSecurityBrigMed
   entities:
-  - uid: 10781
+  - uid: 18058
     components:
     - type: Transform
-      pos: 65.5,-39.5
+      pos: 51.5,-31.5
+      parent: 2
+- proto: HolopadSecurityDetective
+  entities:
+  - uid: 18010
+    components:
+    - type: Transform
+      pos: 70.5,-48.5
+      parent: 2
+- proto: HolopadSecurityFront
+  entities:
+  - uid: 18006
+    components:
+    - type: Transform
+      pos: 63.5,-34.5
+      parent: 2
+- proto: HolopadSecurityInterrogation
+  entities:
+  - uid: 18002
+    components:
+    - type: Transform
+      pos: 52.5,-37.5
+      parent: 2
+- proto: HolopadSecurityLawyer
+  entities:
+  - uid: 18028
+    components:
+    - type: Transform
+      pos: 50.5,-56.5
       parent: 2
 - proto: HolopadSecurityLockerRoom
   entities:
-  - uid: 7158
+  - uid: 18007
     components:
     - type: Transform
-      pos: 59.5,-37.5
+      pos: 70.5,-41.5
       parent: 2
 - proto: HolopadSecurityPerma
   entities:
@@ -82899,10 +86215,10 @@ entities:
       parent: 2
 - proto: HolopadSecurityWarden
   entities:
-  - uid: 7097
+  - uid: 17999
     components:
     - type: Transform
-      pos: 58.5,-43.5
+      pos: 57.5,-37.5
       parent: 2
 - proto: HolopadServiceBar
   entities:
@@ -82941,10 +86257,10 @@ entities:
       parent: 2
 - proto: HolopadServiceKitchen
   entities:
-  - uid: 19170
+  - uid: 19751
     components:
     - type: Transform
-      pos: 43.5,-44.5
+      pos: 40.5,-41.5
       parent: 2
 - proto: HolopadServiceLibrary
   entities:
@@ -82965,12 +86281,12 @@ entities:
   - uid: 3322
     components:
     - type: Transform
-      pos: 60.67577,-57.63842
+      pos: 60.61238,-49.522396
       parent: 2
   - uid: 3323
     components:
     - type: Transform
-      pos: 60.83202,-57.409096
+      pos: 60.726963,-49.366035
       parent: 2
 - proto: HospitalCurtains
   entities:
@@ -82989,6 +86305,11 @@ entities:
     - type: Transform
       pos: 40.5,-18.5
       parent: 2
+  - uid: 18823
+    components:
+    - type: Transform
+      pos: 49.5,-16.5
+      parent: 2
 - proto: HospitalCurtainsOpen
   entities:
   - uid: 2866
@@ -83008,6 +86329,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -8.5,1.5
       parent: 2
+  - uid: 9872
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 43.5,-16.5
+      parent: 2
   - uid: 14267
     components:
     - type: Transform
@@ -83032,11 +86359,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 39.5,-14.5
       parent: 2
-  - uid: 18757
-    components:
-    - type: Transform
-      pos: 42.5,-16.5
-      parent: 2
   - uid: 18758
     components:
     - type: Transform
@@ -83217,18 +86539,6 @@ entities:
     - type: Transform
       pos: -10.265891,-21.478815
       parent: 2
-  - uid: 17893
-    components:
-    - type: Transform
-      parent: 17884
-    - type: Physics
-      canCollide: False
-  - uid: 17907
-    components:
-    - type: Transform
-      parent: 17884
-    - type: Physics
-      canCollide: False
 - proto: IngotSilver
   entities:
   - uid: 3829
@@ -83340,17 +86650,6 @@ entities:
     - type: Transform
       pos: 11.5,-18.5
       parent: 2
-  - uid: 17766
-    components:
-    - type: Transform
-      pos: 27.5,-17.5
-      parent: 2
-  - uid: 17770
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 36.5,-28.5
-      parent: 2
 - proto: IntercomScience
   entities:
   - uid: 11363
@@ -83361,10 +86660,17 @@ entities:
       parent: 2
 - proto: IntercomSecurity
   entities:
-  - uid: 9335
+  - uid: 6087
     components:
     - type: Transform
-      pos: 64.5,-48.5
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-41.5
+      parent: 2
+  - uid: 19381
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 54.5,-26.5
       parent: 2
 - proto: IntercomService
   entities:
@@ -83436,7 +86742,7 @@ entities:
   - uid: 734
     components:
     - type: Transform
-      pos: 19.601612,-24.408659
+      pos: 20.640932,-24.39975
       parent: 2
   - uid: 17919
     components:
@@ -83472,7 +86778,7 @@ entities:
   - uid: 7042
     components:
     - type: Transform
-      pos: 48.430027,-40.48026
+      pos: 40.52011,-36.396408
       parent: 2
 - proto: KitchenMicrowave
   entities:
@@ -83486,11 +86792,6 @@ entities:
     - type: Transform
       pos: 8.5,-90.5
       parent: 2
-  - uid: 7031
-    components:
-    - type: Transform
-      pos: 44.5,-41.5
-      parent: 2
   - uid: 7032
     components:
     - type: Transform
@@ -83501,6 +86802,11 @@ entities:
     - type: Transform
       pos: 48.5,-15.5
       parent: 2
+  - uid: 14596
+    components:
+    - type: Transform
+      pos: 44.5,-40.5
+      parent: 2
   - uid: 18532
     components:
     - type: Transform
@@ -83518,10 +86824,10 @@ entities:
     - type: Transform
       pos: 41.5,-43.5
       parent: 2
-  - uid: 7030
+  - uid: 8451
     components:
     - type: Transform
-      pos: 44.5,-40.5
+      pos: 68.5,-63.5
       parent: 2
   - uid: 10300
     components:
@@ -83533,17 +86839,22 @@ entities:
     - type: Transform
       pos: 15.5,-67.5
       parent: 2
+  - uid: 19745
+    components:
+    - type: Transform
+      pos: 42.5,-42.5
+      parent: 2
 - proto: KitchenSpike
   entities:
-  - uid: 7035
+  - uid: 4609
     components:
     - type: Transform
-      pos: 48.5,-42.5
+      pos: 43.5,-36.5
       parent: 2
-  - uid: 7036
+  - uid: 7533
     components:
     - type: Transform
-      pos: 48.5,-41.5
+      pos: 42.5,-36.5
       parent: 2
 - proto: KnifePlastic
   entities:
@@ -83581,26 +86892,60 @@ entities:
     - type: Transform
       pos: -23.242622,-14.164716
       parent: 2
+- proto: Lamp
+  entities:
+  - uid: 10252
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 70.53382,-47.076958
+      parent: 2
 - proto: LampGold
   entities:
   - uid: 10499
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 55.5085,-56.088474
+      pos: 53.538273,-56.19024
       parent: 2
+    - type: HandheldLight
+      toggleActionEntity: 4915
+    - type: ContainerContainer
+      containers:
+        cell_slot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+        actions: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 4915
+    - type: Physics
+      canCollide: True
+    - type: ActionsContainer
 - proto: LampInterrogator
   entities:
-  - uid: 2223
-    components:
-    - type: Transform
-      pos: 69.513466,-51.10884
-      parent: 2
   - uid: 15343
     components:
     - type: Transform
-      pos: 71.46581,-42.150627
+      pos: 50.54356,-37.204014
       parent: 2
+    - type: HandheldLight
+      toggleActionEntity: 7566
+    - type: ContainerContainer
+      containers:
+        cell_slot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+        actions: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 7566
+    - type: Physics
+      canCollide: True
+    - type: ActionsContainer
 - proto: Lantern
   entities:
   - uid: 5675
@@ -83623,7 +86968,7 @@ entities:
   - uid: 7055
     components:
     - type: Transform
-      pos: 42.5,-42.5
+      pos: 42.395752,-45.319225
       parent: 2
   - uid: 17018
     components:
@@ -83635,6 +86980,16 @@ entities:
     - type: Transform
       pos: 2.5591927,-78.68594
       parent: 2
+  - uid: 19735
+    components:
+    - type: Transform
+      pos: 42.364388,-34.14802
+      parent: 2
+  - uid: 19746
+    components:
+    - type: Transform
+      pos: 42.597137,-45.117836
+      parent: 2
 - proto: LeavesCannabisDried
   entities:
   - uid: 18867
@@ -83669,27 +87024,6 @@ entities:
     - type: Transform
       pos: -25.64344,-32.075485
       parent: 2
-- proto: LightBulbBroken
-  entities:
-  - uid: 17953
-    components:
-    - type: Transform
-      parent: 17952
-    - type: Physics
-      canCollide: False
-  - uid: 17961
-    components:
-    - type: Transform
-      parent: 17960
-    - type: Physics
-      canCollide: False
-- proto: Lighter
-  entities:
-  - uid: 9356
-    components:
-    - type: Transform
-      pos: 68.51949,-38.591267
-      parent: 2
 - proto: LiquidNitrogenCanister
   entities:
   - uid: 15914
@@ -83714,30 +87048,28 @@ entities:
   - uid: 18618
     components:
     - type: Transform
-      pos: 77.18439,-43.606335
+      pos: 79.15577,-43.49481
       parent: 2
 - proto: LockableButtonArmory
   entities:
-  - uid: 3541
+  - uid: 8069
     components:
-    - type: MetaData
-      name: main armory button
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 61.5,-44.5
+      pos: 60.5,-37.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        4380:
+        4000:
         - - Pressed
           - Toggle
-        4366:
+        3548:
         - - Pressed
           - Toggle
-        13934:
+        3867:
         - - Pressed
           - Toggle
-        4377:
+        3324:
         - - Pressed
           - Toggle
 - proto: LockableButtonChiefEngineer
@@ -83843,15 +87175,15 @@ entities:
     - type: Transform
       pos: 31.5,-48.5
       parent: 2
-  - uid: 7074
+  - uid: 7347
     components:
     - type: Transform
       pos: 35.5,-48.5
       parent: 2
-  - uid: 8101
+  - uid: 14266
     components:
     - type: Transform
-      pos: 72.5,-67.5
+      pos: 58.5,-62.5
       parent: 2
 - proto: LockerBotanistFilled
   entities:
@@ -83907,10 +87239,10 @@ entities:
       parent: 2
 - proto: LockerDetectiveFilled
   entities:
-  - uid: 4810
+  - uid: 9306
     components:
     - type: Transform
-      pos: 72.5,-53.5
+      pos: 73.5,-49.5
       parent: 2
 - proto: LockerElectricalSuppliesFilled
   entities:
@@ -83919,16 +87251,16 @@ entities:
     - type: Transform
       pos: -19.5,-59.5
       parent: 2
+  - uid: 8085
+    components:
+    - type: Transform
+      pos: 34.5,-34.5
+      parent: 2
   - uid: 14741
     components:
     - type: Transform
       pos: 6.5,-63.5
       parent: 2
-  - uid: 15227
-    components:
-    - type: Transform
-      pos: 35.5,-34.5
-      parent: 2
   - uid: 16045
     components:
     - type: Transform
@@ -83978,17 +87310,17 @@ entities:
     - type: Transform
       pos: 10.5,-47.5
       parent: 2
-  - uid: 14277
+  - uid: 10236
     components:
     - type: Transform
-      pos: 57.5,-34.5
+      pos: 68.5,-41.5
       parent: 2
 - proto: LockerFreezer
   entities:
-  - uid: 7050
+  - uid: 8385
     components:
     - type: Transform
-      pos: 46.5,-44.5
+      pos: 41.5,-36.5
       parent: 2
 - proto: LockerFreezerVaultFilled
   entities:
@@ -84006,42 +87338,62 @@ entities:
       parent: 2
 - proto: LockerHeadOfSecurityFilled
   entities:
-  - uid: 15344
+  - uid: 6065
     components:
     - type: Transform
-      pos: 71.5,-45.5
+      pos: 71.5,-51.5
       parent: 2
 - proto: LockerMedical
   entities:
-  - uid: 1170
+  - uid: 8154
     components:
     - type: Transform
-      pos: 27.5,-25.5
+      pos: 27.5,-27.5
       parent: 2
 - proto: LockerMedicalFilled
   entities:
+  - uid: 2829
+    components:
+    - type: Transform
+      pos: 21.5,-15.5
+      parent: 2
   - uid: 5211
     components:
     - type: Transform
       pos: 20.5,-15.5
       parent: 2
-  - uid: 5216
-    components:
-    - type: Transform
-      pos: 18.5,-15.5
-      parent: 2
-  - uid: 5228
-    components:
-    - type: Transform
-      pos: 19.5,-15.5
-      parent: 2
   - uid: 5928
     components:
     - type: Transform
       pos: -7.5,2.5
       parent: 2
+  - uid: 7778
+    components:
+    - type: Transform
+      pos: 23.5,-17.5
+      parent: 2
+  - uid: 8377
+    components:
+    - type: Transform
+      pos: 19.5,-15.5
+      parent: 2
+  - uid: 8786
+    components:
+    - type: Transform
+      pos: 23.5,-16.5
+      parent: 2
+  - uid: 9385
+    components:
+    - type: Transform
+      pos: 22.5,-15.5
+      parent: 2
 - proto: LockerMedicineFilled
   entities:
+  - uid: 8378
+    components:
+    - type: Transform
+      pos: 18.5,-15.5
+      parent: 2
   - uid: 13992
     components:
     - type: Transform
@@ -84068,52 +87420,52 @@ entities:
       parent: 2
 - proto: LockerPrisoner
   entities:
-  - uid: 16115
-    components:
-    - type: Transform
-      pos: 67.5,-27.5
-      parent: 2
-- proto: LockerPrisoner2
-  entities:
-  - uid: 17731
+  - uid: 5386
     components:
     - type: Transform
       pos: 68.5,-27.5
       parent: 2
-- proto: LockerPrisoner3
+- proto: LockerPrisoner2
   entities:
-  - uid: 18058
+  - uid: 5388
     components:
     - type: Transform
       pos: 69.5,-27.5
       parent: 2
-- proto: LockerPrisoner4
+- proto: LockerPrisoner3
   entities:
-  - uid: 15446
+  - uid: 5403
     components:
     - type: Transform
-      pos: 66.5,-29.5
+      pos: 70.5,-27.5
+      parent: 2
+- proto: LockerPrisoner4
+  entities:
+  - uid: 5405
+    components:
+    - type: Transform
+      pos: 67.5,-30.5
       parent: 2
 - proto: LockerPrisoner5
   entities:
-  - uid: 15548
+  - uid: 5406
     components:
     - type: Transform
-      pos: 67.5,-29.5
+      pos: 68.5,-30.5
       parent: 2
 - proto: LockerPrisoner6
   entities:
-  - uid: 15448
+  - uid: 5409
     components:
     - type: Transform
-      pos: 68.5,-29.5
+      pos: 69.5,-30.5
       parent: 2
 - proto: LockerPrisoner7
   entities:
-  - uid: 15547
+  - uid: 6090
     components:
     - type: Transform
-      pos: 69.5,-29.5
+      pos: 70.5,-30.5
       parent: 2
 - proto: LockerQuarterMasterFilled
   entities:
@@ -84131,20 +87483,20 @@ entities:
       parent: 2
 - proto: LockerSalvageSpecialistFilled
   entities:
-  - uid: 6900
+  - uid: 9177
     components:
     - type: Transform
-      pos: 55.5,-98.5
+      pos: 56.5,-99.5
       parent: 2
-  - uid: 6910
+  - uid: 17329
     components:
     - type: Transform
-      pos: 55.5,-99.5
+      pos: 56.5,-100.5
       parent: 2
-  - uid: 6911
+  - uid: 18765
     components:
     - type: Transform
-      pos: 55.5,-100.5
+      pos: 56.5,-98.5
       parent: 2
 - proto: LockerScienceFilled
   entities:
@@ -84170,30 +87522,35 @@ entities:
       parent: 2
 - proto: LockerSecurityFilled
   entities:
-  - uid: 3548
-    components:
-    - type: Transform
-      pos: 57.5,-39.5
-      parent: 2
-  - uid: 3549
-    components:
-    - type: Transform
-      pos: 57.5,-38.5
-      parent: 2
-  - uid: 3550
-    components:
-    - type: Transform
-      pos: 57.5,-36.5
-      parent: 2
   - uid: 6149
     components:
     - type: Transform
       pos: 11.5,-47.5
       parent: 2
-  - uid: 10252
+  - uid: 9892
     components:
     - type: Transform
-      pos: 57.5,-37.5
+      pos: 68.5,-38.5
+      parent: 2
+  - uid: 9901
+    components:
+    - type: Transform
+      pos: 69.5,-38.5
+      parent: 2
+  - uid: 9904
+    components:
+    - type: Transform
+      pos: 70.5,-38.5
+      parent: 2
+  - uid: 9949
+    components:
+    - type: Transform
+      pos: 71.5,-38.5
+      parent: 2
+  - uid: 10036
+    components:
+    - type: Transform
+      pos: 72.5,-38.5
       parent: 2
 - proto: LockerWallMedicalFilled
   entities:
@@ -84204,10 +87561,10 @@ entities:
       parent: 2
 - proto: LockerWardenFilled
   entities:
-  - uid: 3544
+  - uid: 3453
     components:
     - type: Transform
-      pos: 57.5,-45.5
+      pos: 54.5,-36.5
       parent: 2
 - proto: LockerWeldingSuppliesFilled
   entities:
@@ -84301,12 +87658,26 @@ entities:
     - type: Physics
       canCollide: False
       bodyType: Static
-- proto: LootSpawnerIndustrialFluff
+- proto: LootSpawnerCableCoil
   entities:
-  - uid: 9697
+  - uid: 15459
     components:
     - type: Transform
-      pos: 61.5,-62.5
+      pos: 66.5,-68.5
+      parent: 2
+- proto: LootSpawnerIndustrialFluff
+  entities:
+  - uid: 15460
+    components:
+    - type: Transform
+      pos: 62.5,-65.5
+      parent: 2
+- proto: LootSpawnerMaterialsHighValue
+  entities:
+  - uid: 4983
+    components:
+    - type: Transform
+      pos: -37.5,-75.5
       parent: 2
 - proto: LootSpawnerMaterialsSupplementary
   entities:
@@ -84317,17 +87688,10 @@ entities:
       parent: 2
 - proto: LootSpawnerMedicalMinor
   entities:
-  - uid: 10738
+  - uid: 7573
     components:
     - type: Transform
-      pos: 74.5,-37.5
-      parent: 2
-- proto: LootSpawnerSecurityBasic
-  entities:
-  - uid: 14252
-    components:
-    - type: Transform
-      pos: 57.5,-28.5
+      pos: 75.5,-34.5
       parent: 2
 - proto: LuxuryPen
   entities:
@@ -84396,10 +87760,15 @@ entities:
     - type: Transform
       pos: 12.5,-67.5
       parent: 2
-  - uid: 15258
+  - uid: 4252
     components:
     - type: Transform
-      pos: 37.5,-28.5
+      pos: 36.5,-13.5
+      parent: 2
+  - uid: 14297
+    components:
+    - type: Transform
+      pos: 68.5,-62.5
       parent: 2
 - proto: MachineElectrolysisUnit
   entities:
@@ -84408,13 +87777,18 @@ entities:
     - type: Transform
       pos: 13.5,-67.5
       parent: 2
-  - uid: 3714
+  - uid: 8382
     components:
     - type: Transform
-      pos: 42.5,-30.5
+      pos: 66.5,-66.5
       parent: 2
 - proto: MachineFrame
   entities:
+  - uid: 14973
+    components:
+    - type: Transform
+      pos: 43.5,-34.5
+      parent: 2
   - uid: 17019
     components:
     - type: Transform
@@ -84447,29 +87821,35 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 3.1149855,-10.702077
       parent: 2
+  - uid: 20078
+    components:
+    - type: Transform
+      rot: -0.3490658503988659 rad
+      pos: 53.540127,-42.392376
+      parent: 2
 - proto: MagazinePistolSubMachineGun
   entities:
   - uid: 11951
     components:
     - type: Transform
-      pos: 68.56853,-31.4625
+      pos: 69.531204,-32.483376
       parent: 2
   - uid: 16049
     components:
     - type: Transform
-      pos: 68.39492,-31.455551
+      pos: 69.312454,-32.493797
       parent: 2
 - proto: MagazinePistolSubMachineGunTopMounted
   entities:
   - uid: 3532
     components:
     - type: Transform
-      pos: 65.386,-45.460392
+      pos: 64.45614,-50.54994
       parent: 2
   - uid: 3536
     components:
     - type: Transform
-      pos: 65.62211,-45.562313
+      pos: 64.62281,-50.643757
       parent: 2
 - proto: MailBag
   entities:
@@ -84480,11 +87860,6 @@ entities:
       parent: 2
 - proto: MaintenanceFluffSpawner
   entities:
-  - uid: 7207
-    components:
-    - type: Transform
-      pos: 60.5,-62.5
-      parent: 2
   - uid: 17360
     components:
     - type: Transform
@@ -84507,20 +87882,40 @@ entities:
     - type: Transform
       pos: -16.5,-46.5
       parent: 2
+  - uid: 7611
+    components:
+    - type: Transform
+      pos: 75.5,-41.5
+      parent: 2
+  - uid: 7708
+    components:
+    - type: Transform
+      pos: 75.5,-36.5
+      parent: 2
   - uid: 7770
     components:
     - type: Transform
       pos: 6.5,-74.5
       parent: 2
+  - uid: 7799
+    components:
+    - type: Transform
+      pos: 76.5,-31.5
+      parent: 2
+  - uid: 10787
+    components:
+    - type: Transform
+      pos: 48.5,-34.5
+      parent: 2
   - uid: 12407
     components:
     - type: Transform
       pos: 6.5,-75.5
       parent: 2
-  - uid: 17240
+  - uid: 15595
     components:
     - type: Transform
-      pos: 75.5,-59.5
+      pos: 70.5,-62.5
       parent: 2
   - uid: 17243
     components:
@@ -84547,21 +87942,6 @@ entities:
     - type: Transform
       pos: 54.5,-77.5
       parent: 2
-  - uid: 19580
-    components:
-    - type: Transform
-      pos: 50.5,-33.5
-      parent: 2
-  - uid: 19581
-    components:
-    - type: Transform
-      pos: 76.5,-30.5
-      parent: 2
-  - uid: 19582
-    components:
-    - type: Transform
-      pos: 75.5,-38.5
-      parent: 2
 - proto: MaintenanceToolSpawner
   entities:
   - uid: 7684
@@ -84574,6 +87954,11 @@ entities:
     - type: Transform
       pos: 30.5,-78.5
       parent: 2
+  - uid: 15427
+    components:
+    - type: Transform
+      pos: 47.5,-44.5
+      parent: 2
   - uid: 17000
     components:
     - type: Transform
@@ -84581,16 +87966,16 @@ entities:
       parent: 2
 - proto: MaintenanceWeaponSpawner
   entities:
+  - uid: 7421
+    components:
+    - type: Transform
+      pos: 74.5,-54.5
+      parent: 2
   - uid: 7683
     components:
     - type: Transform
       pos: 78.5,-19.5
       parent: 2
-  - uid: 17239
-    components:
-    - type: Transform
-      pos: 75.5,-56.5
-      parent: 2
 - proto: Matchbox
   entities:
   - uid: 5667
@@ -84613,17 +87998,22 @@ entities:
   - uid: 10675
     components:
     - type: Transform
-      pos: 79.32236,-26.715631
+      pos: 79.30142,-25.841785
+      parent: 2
+  - uid: 10843
+    components:
+    - type: Transform
+      pos: 96.498116,-44.486084
       parent: 2
   - uid: 17247
     components:
     - type: Transform
-      pos: 79.59391,-27.06205
+      pos: 79.27017,-26.060688
       parent: 2
   - uid: 17248
     components:
     - type: Transform
-      pos: 79.70907,-27.17235
+      pos: 79.44725,-26.27959
       parent: 2
   - uid: 17249
     components:
@@ -84635,11 +88025,6 @@ entities:
     - type: Transform
       pos: 12.563929,-2.5076818
       parent: 2
-  - uid: 17251
-    components:
-    - type: Transform
-      pos: 94.519135,-44.463116
-      parent: 2
   - uid: 17253
     components:
     - type: Transform
@@ -84658,7 +88043,7 @@ entities:
   - uid: 17256
     components:
     - type: Transform
-      pos: 31.284103,-12.202638
+      pos: 32.248436,-11.570349
       parent: 2
   - uid: 17257
     components:
@@ -84707,30 +88092,27 @@ entities:
       parent: 2
 - proto: MaterialWebSilk1
   entities:
-  - uid: 7220
+  - uid: 3521
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 69.36436,-48.69991
+      pos: 69.672005,-53.69275
       parent: 2
-  - uid: 7279
+  - uid: 4612
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 69.66123,-48.590458
+      pos: 69.453255,-53.61978
       parent: 2
-  - uid: 8151
+  - uid: 7103
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 69.39561,-48.51228
+      pos: 69.40117,-53.80741
       parent: 2
 - proto: MaterialWoodPlank
   entities:
   - uid: 8095
     components:
     - type: Transform
-      pos: 69.52955,-67.498146
+      pos: 59.643414,-62.438656
       parent: 2
   - uid: 19587
     components:
@@ -84742,14 +88124,14 @@ entities:
   - uid: 7336
     components:
     - type: Transform
-      pos: 80.49108,-26.808891
+      pos: 79.666,-26.185774
       parent: 2
 - proto: MaterialWoodPlank10
   entities:
   - uid: 7461
     components:
     - type: Transform
-      pos: 6.5,-76.5
+      pos: 5.5223966,-74.49242
       parent: 2
 - proto: MedicalBed
   entities:
@@ -84783,26 +88165,31 @@ entities:
     - type: Transform
       pos: -37.5,-16.5
       parent: 2
-  - uid: 7789
+  - uid: 7765
     components:
     - type: Transform
-      pos: 31.5,-11.5
+      pos: 50.5,-32.5
+      parent: 2
+  - uid: 7766
+    components:
+    - type: Transform
+      pos: 50.5,-33.5
       parent: 2
   - uid: 8733
     components:
     - type: Transform
       pos: -40.5,-14.5
       parent: 2
+  - uid: 9356
+    components:
+    - type: Transform
+      pos: 32.5,-11.5
+      parent: 2
   - uid: 11852
     components:
     - type: Transform
       pos: 15.5,-69.5
       parent: 2
-  - uid: 14254
-    components:
-    - type: Transform
-      pos: 60.5,-31.5
-      parent: 2
   - uid: 14366
     components:
     - type: Transform
@@ -84843,6 +88230,11 @@ entities:
     - type: Transform
       pos: 15.762657,-15.390333
       parent: 2
+  - uid: 5440
+    components:
+    - type: Transform
+      pos: 50.41688,-31.271675
+      parent: 2
   - uid: 5579
     components:
     - type: Transform
@@ -84853,15 +88245,20 @@ entities:
     - type: Transform
       pos: -38.568382,-16.260506
       parent: 2
+  - uid: 6279
+    components:
+    - type: Transform
+      pos: 74.49798,-53.45904
+      parent: 2
   - uid: 6953
     components:
     - type: Transform
       pos: 31.486631,-101.4452
       parent: 2
-  - uid: 8071
+  - uid: 7228
     components:
     - type: Transform
-      pos: 57.47399,-32.30945
+      pos: 50.651257,-31.365425
       parent: 2
   - uid: 8206
     components:
@@ -84873,16 +88270,6 @@ entities:
     - type: Transform
       pos: 77.57588,-20.876202
       parent: 2
-  - uid: 14240
-    components:
-    - type: Transform
-      pos: 57.56774,-32.434536
-      parent: 2
-  - uid: 15893
-    components:
-    - type: Transform
-      pos: 75.5,-55.5
-      parent: 2
   - uid: 16095
     components:
     - type: Transform
@@ -84926,30 +88313,20 @@ entities:
       parent: 2
 - proto: MicroManipulatorStockPart
   entities:
-  - uid: 7318
+  - uid: 12746
     components:
     - type: Transform
-      pos: 33.34339,-15.931184
+      pos: -42.292168,-79.426285
       parent: 2
   - uid: 17358
     components:
     - type: Transform
       pos: -32.45135,-29.305899
       parent: 2
-  - uid: 17879
+  - uid: 19739
     components:
     - type: Transform
-      pos: 33.547714,-15.508676
-      parent: 2
-  - uid: 19511
-    components:
-    - type: Transform
-      pos: 33.46839,-15.649739
-      parent: 2
-  - uid: 19512
-    components:
-    - type: Transform
-      pos: 33.37464,-15.790462
+      pos: 40.69203,-32.54189
       parent: 2
 - proto: MicrophoneInstrument
   entities:
@@ -84963,6 +88340,13 @@ entities:
     - type: Transform
       pos: 27.508257,-39.500587
       parent: 2
+- proto: MicrowaveMachineCircuitboard
+  entities:
+  - uid: 19422
+    components:
+    - type: Transform
+      pos: 41.349373,-34.246284
+      parent: 2
 - proto: Mirror
   entities:
   - uid: 6157
@@ -85015,55 +88399,15 @@ entities:
       parent: 2
 - proto: Morgue
   entities:
-  - uid: 5280
+  - uid: 1711
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 30.5,-29.5
+      pos: 30.5,-26.5
       parent: 2
-  - uid: 5281
+  - uid: 3089
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 31.5,-29.5
-      parent: 2
-  - uid: 5282
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 32.5,-29.5
-      parent: 2
-  - uid: 5283
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 33.5,-29.5
-      parent: 2
-  - uid: 5284
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 34.5,-29.5
-      parent: 2
-  - uid: 5285
-    components:
-    - type: Transform
-      pos: 30.5,-25.5
-      parent: 2
-  - uid: 5286
-    components:
-    - type: Transform
-      pos: 31.5,-25.5
-      parent: 2
-  - uid: 5287
-    components:
-    - type: Transform
-      pos: 32.5,-25.5
-      parent: 2
-  - uid: 5288
-    components:
-    - type: Transform
-      pos: 33.5,-25.5
+      pos: 31.5,-26.5
       parent: 2
   - uid: 5676
     components:
@@ -85071,18 +88415,57 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -19.5,-46.5
       parent: 2
+  - uid: 6127
+    components:
+    - type: Transform
+      pos: 33.5,-26.5
+      parent: 2
+  - uid: 7623
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 30.5,-30.5
+      parent: 2
+  - uid: 8134
+    components:
+    - type: Transform
+      pos: 32.5,-26.5
+      parent: 2
+  - uid: 8426
+    components:
+    - type: Transform
+      pos: 52.5,-31.5
+      parent: 2
+  - uid: 11908
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 31.5,-30.5
+      parent: 2
+  - uid: 11915
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 33.5,-30.5
+      parent: 2
+  - uid: 11919
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 32.5,-30.5
+      parent: 2
+  - uid: 11936
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 34.5,-30.5
+      parent: 2
   - uid: 17637
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,-28.5
       parent: 2
-  - uid: 19422
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 57.5,-31.5
-      parent: 2
 - proto: MothroachCube
   entities:
   - uid: 17238
@@ -85116,13 +88499,18 @@ entities:
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 57.50261,-42.147453
+      pos: 54.52982,-39.13904
       parent: 2
   - uid: 10555
     components:
     - type: Transform
       pos: -11.327834,-21.173048
       parent: 2
+  - uid: 15483
+    components:
+    - type: Transform
+      pos: 65.5059,-68.27459
+      parent: 2
   - uid: 17299
     components:
     - type: Transform
@@ -85138,6 +88526,12 @@ entities:
     - type: Transform
       pos: -53.37472,-43.263702
       parent: 2
+  - uid: 18575
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -37.663143,-76.5443
+      parent: 2
 - proto: MysteryFigureBox
   entities:
   - uid: 2242
@@ -85174,16 +88568,16 @@ entities:
     - type: Transform
       pos: 31.5,-33.5
       parent: 2
-  - uid: 3392
-    components:
-    - type: Transform
-      pos: 69.5,-55.5
-      parent: 2
   - uid: 5005
     components:
     - type: Transform
       pos: -2.5,-44.5
       parent: 2
+  - uid: 6907
+    components:
+    - type: Transform
+      pos: 55.5,-101.5
+      parent: 2
   - uid: 7821
     components:
     - type: Transform
@@ -85199,25 +88593,20 @@ entities:
     - type: Transform
       pos: 50.5,-77.5
       parent: 2
-  - uid: 9177
+  - uid: 10816
     components:
     - type: Transform
-      pos: 49.5,-100.5
+      pos: 61.5,-54.5
       parent: 2
-  - uid: 16290
+  - uid: 11132
     components:
     - type: Transform
-      pos: 52.5,-40.5
+      pos: -43.5,-79.5
       parent: 2
-  - uid: 16606
+  - uid: 16048
     components:
     - type: Transform
-      pos: 70.5,-24.5
-      parent: 2
-  - uid: 17370
-    components:
-    - type: Transform
-      pos: -39.5,-80.5
+      pos: 68.5,-23.5
       parent: 2
   - uid: 19351
     components:
@@ -85267,6 +88656,11 @@ entities:
     - type: Transform
       pos: -16.357931,-27.28502
       parent: 2
+  - uid: 12745
+    components:
+    - type: Transform
+      pos: -45.562008,-76.444115
+      parent: 2
   - uid: 19288
     components:
     - type: Transform
@@ -85289,7 +88683,7 @@ entities:
   - uid: 18623
     components:
     - type: Transform
-      pos: 78.38787,-47.2619
+      pos: 79.365814,-47.469414
       parent: 2
 - proto: NuclearBomb
   entities:
@@ -85303,7 +88697,7 @@ entities:
   - uid: 18619
     components:
     - type: Transform
-      pos: 77.60105,-43.356163
+      pos: 79.641716,-43.3176
       parent: 2
 - proto: OperatingTable
   entities:
@@ -85350,11 +88744,6 @@ entities:
     - type: Transform
       pos: 15.5,-82.5
       parent: 2
-  - uid: 2656
-    components:
-    - type: Transform
-      pos: -38.5,-80.5
-      parent: 2
   - uid: 6909
     components:
     - type: Transform
@@ -85375,10 +88764,15 @@ entities:
     - type: Transform
       pos: 51.5,-77.5
       parent: 2
-  - uid: 15412
+  - uid: 10814
     components:
     - type: Transform
-      pos: 68.5,-55.5
+      pos: 60.5,-54.5
+      parent: 2
+  - uid: 15413
+    components:
+    - type: Transform
+      pos: 42.5,-29.5
       parent: 2
   - uid: 15432
     components:
@@ -85390,16 +88784,16 @@ entities:
     - type: Transform
       pos: -6.5,-77.5
       parent: 2
-  - uid: 16289
-    components:
-    - type: Transform
-      pos: 40.5,-38.5
-      parent: 2
   - uid: 16313
     components:
     - type: Transform
       pos: -7.5,-58.5
       parent: 2
+  - uid: 16596
+    components:
+    - type: Transform
+      pos: -42.5,-76.5
+      parent: 2
   - uid: 18567
     components:
     - type: Transform
@@ -85415,10 +88809,10 @@ entities:
     - type: Transform
       pos: 6.5,-17.5
       parent: 2
-  - uid: 19404
+  - uid: 19405
     components:
     - type: Transform
-      pos: 55.5,-95.5
+      pos: 56.5,-95.5
       parent: 2
   - uid: 19500
     components:
@@ -85439,10 +88833,10 @@ entities:
       parent: 2
 - proto: PaintingRedBlueYellow
   entities:
-  - uid: 8126
+  - uid: 5015
     components:
     - type: Transform
-      pos: 72.5,-47.5
+      pos: 72.5,-52.5
       parent: 2
 - proto: PaintingSadClown
   entities:
@@ -85471,19 +88865,34 @@ entities:
   - uid: 18620
     components:
     - type: Transform
-      pos: 78.47605,-43.408283
+      pos: 80.3608,-43.296753
       parent: 2
 - proto: Paper
   entities:
+  - uid: 3480
+    components:
+    - type: Transform
+      pos: 66.67697,-53.468136
+      parent: 2
+  - uid: 3570
+    components:
+    - type: Transform
+      pos: 66.36447,-53.290928
+      parent: 2
+  - uid: 4165
+    components:
+    - type: Transform
+      pos: 66.5103,-53.37432
+      parent: 2
   - uid: 4186
     components:
     - type: Transform
-      pos: 54.276867,-56.4639
+      pos: 53.37837,-55.269226
       parent: 2
   - uid: 5395
     components:
     - type: Transform
-      pos: 54.524124,-56.401188
+      pos: 53.576283,-55.185833
       parent: 2
   - uid: 7024
     components:
@@ -85500,40 +88909,25 @@ entities:
     - type: Transform
       pos: 38.496128,-42.334797
       parent: 2
-  - uid: 7219
+  - uid: 10266
     components:
     - type: Transform
-      pos: 67.52061,-48.449734
+      pos: 70.50045,-46.358585
       parent: 2
-  - uid: 14317
+  - uid: 10267
     components:
     - type: Transform
-      pos: 67.72373,-48.32465
-      parent: 2
-  - uid: 14321
-    components:
-    - type: Transform
-      pos: 67.37998,-48.309013
+      pos: 70.62545,-46.452335
       parent: 2
   - uid: 15341
     components:
     - type: Transform
-      pos: 72.60022,-42.46705
-      parent: 2
-  - uid: 15387
-    components:
-    - type: Transform
-      pos: 69.470856,-50.452137
-      parent: 2
-  - uid: 15388
-    components:
-    - type: Transform
-      pos: 69.595856,-50.56159
+      pos: 51.434155,-37.362362
       parent: 2
   - uid: 15436
     components:
     - type: Transform
-      pos: 72.397095,-42.32633
+      pos: 51.29201,-37.47728
       parent: 2
   - uid: 17835
     components:
@@ -85601,23 +88995,22 @@ entities:
     - type: Transform
       pos: 0.5,-66.5
       parent: 2
+  - uid: 4560
+    components:
+    - type: Transform
+      pos: 64.5,-46.5
+      parent: 2
+  - uid: 5600
+    components:
+    - type: Transform
+      pos: 56.5,-56.5
+      parent: 2
   - uid: 6213
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 12.5,-57.5
       parent: 2
-  - uid: 9359
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 62.5,-32.5
-      parent: 2
-  - uid: 9372
-    components:
-    - type: Transform
-      pos: 54.5,-54.5
-      parent: 2
   - uid: 15424
     components:
     - type: Transform
@@ -85689,16 +89082,12 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-  - uid: 7334
-    components:
-    - type: Transform
-      pos: 80.35046,-29.185543
-      parent: 2
 - proto: ParticleAcceleratorControlBoxUnfinished
   entities:
-  - uid: 18385
+  - uid: 18576
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -24.5,-68.5
       parent: 2
 - proto: ParticleAcceleratorEmitterForeUnfinished
@@ -85748,7 +89137,7 @@ entities:
   - uid: 911
     components:
     - type: Transform
-      pos: 28.36074,-13.112216
+      pos: 29.211311,-13.129602
       parent: 2
   - uid: 2734
     components:
@@ -85763,7 +89152,7 @@ entities:
   - uid: 18994
     components:
     - type: Transform
-      pos: -9.543121,3.801337
+      pos: -9.507688,-8.41618
       parent: 2
 - proto: PartRodMetal1
   entities:
@@ -85779,6 +89168,11 @@ entities:
     - type: Transform
       pos: 0.61355364,-66.82697
       parent: 2
+  - uid: 3150
+    components:
+    - type: Transform
+      pos: 67.8974,-62.453743
+      parent: 2
   - uid: 3577
     components:
     - type: Transform
@@ -85787,7 +89181,7 @@ entities:
   - uid: 5390
     components:
     - type: Transform
-      pos: 53.839367,-56.307545
+      pos: 53.427128,-55.564804
       parent: 2
   - uid: 6069
     components:
@@ -85904,11 +89298,23 @@ entities:
       parent: 2
 - proto: PlasmaReinforcedWindowDirectional
   entities:
-  - uid: 3583
+  - uid: 1616
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 61.5,-55.5
+      pos: 61.5,-21.5
+      parent: 2
+  - uid: 3731
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 61.5,-47.5
+      parent: 2
+  - uid: 3780
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 58.5,-47.5
       parent: 2
   - uid: 4724
     components:
@@ -85946,35 +89352,34 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -61.5,-63.5
       parent: 2
+  - uid: 8805
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 80.5,-47.5
+      parent: 2
+  - uid: 8817
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 80.5,-43.5
+      parent: 2
   - uid: 9585
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 6.5,-77.5
       parent: 2
-  - uid: 10826
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 78.5,-47.5
-      parent: 2
-  - uid: 10833
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 78.5,-43.5
-      parent: 2
-  - uid: 11949
+  - uid: 11612
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 58.5,-55.5
+      pos: 89.5,-46.5
       parent: 2
-  - uid: 15234
+  - uid: 11755
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 87.5,-46.5
+      pos: 89.5,-44.5
       parent: 2
   - uid: 16336
     components:
@@ -85999,11 +89404,6 @@ entities:
     - type: Transform
       pos: 58.5,-20.5
       parent: 2
-  - uid: 19317
-    components:
-    - type: Transform
-      pos: 87.5,-44.5
-      parent: 2
 - proto: PlasmaTank
   entities:
   - uid: 7689
@@ -86078,17 +89478,18 @@ entities:
       parent: 2
 - proto: PlasmaWindoorSecureCommandLocked
   entities:
+  - uid: 529
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 81.5,-44.5
+      parent: 2
   - uid: 2378
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -37.5,-45.5
       parent: 2
-  - uid: 2480
-    components:
-    - type: Transform
-      pos: 76.5,-46.5
-      parent: 2
   - uid: 2896
     components:
     - type: Transform
@@ -86105,28 +89506,33 @@ entities:
     - type: Transform
       pos: -45.5,-37.5
       parent: 2
-  - uid: 7657
+  - uid: 7139
     components:
     - type: Transform
-      pos: 77.5,-46.5
+      rot: 3.141592653589793 rad
+      pos: 80.5,-44.5
+      parent: 2
+  - uid: 7540
+    components:
+    - type: Transform
+      pos: 80.5,-46.5
+      parent: 2
+  - uid: 7564
+    components:
+    - type: Transform
+      pos: 81.5,-46.5
+      parent: 2
+  - uid: 7606
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 92.5,-45.5
       parent: 2
   - uid: 10491
     components:
     - type: Transform
       pos: 78.5,-46.5
       parent: 2
-  - uid: 10834
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 77.5,-44.5
-      parent: 2
-  - uid: 14303
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 76.5,-44.5
-      parent: 2
   - uid: 15816
     components:
     - type: Transform
@@ -86144,12 +89550,6 @@ entities:
     - type: Transform
       pos: 79.5,-46.5
       parent: 2
-  - uid: 18554
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 90.5,-45.5
-      parent: 2
 - proto: PlasmaWindoorSecureEngineeringLocked
   entities:
   - uid: 356
@@ -86158,17 +89558,23 @@ entities:
       rot: 3.141592653589793 rad
       pos: -31.5,-74.5
       parent: 2
-  - uid: 8166
+  - uid: 10831
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 92.5,-45.5
+      pos: 94.5,-45.5
       parent: 2
-  - uid: 15288
+  - uid: 10833
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 96.5,-45.5
+      parent: 2
+  - uid: 11467
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 86.5,-45.5
+      pos: 88.5,-45.5
       parent: 2
   - uid: 17096
     components:
@@ -86176,12 +89582,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -32.5,-74.5
       parent: 2
-  - uid: 17346
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 94.5,-45.5
-      parent: 2
 - proto: PlasmaWindoorSecureScienceLocked
   entities:
   - uid: 5117
@@ -86208,11 +89608,17 @@ entities:
       parent: 2
 - proto: PlasmaWindoorSecureSecurityLocked
   entities:
-  - uid: 3327
+  - uid: 2724
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 60.5,-55.5
+      pos: 60.5,-47.5
+      parent: 2
+  - uid: 3065
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 59.5,-47.5
       parent: 2
   - uid: 6143
     components:
@@ -86220,46 +89626,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 6.5,-49.5
       parent: 2
-  - uid: 11950
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 59.5,-55.5
-      parent: 2
   - uid: 18316
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 62.5,-20.5
       parent: 2
-- proto: PlasmaWindow
-  entities:
-  - uid: 4020
-    components:
-    - type: Transform
-      pos: 27.5,-17.5
-      parent: 2
 - proto: PlasticFlapsAirtightClear
   entities:
-  - uid: 5308
+  - uid: 3692
     components:
     - type: Transform
-      pos: 42.5,-26.5
-      parent: 2
-  - uid: 5367
-    components:
-    - type: Transform
-      pos: 45.5,-25.5
-      parent: 2
-  - uid: 5371
-    components:
-    - type: Transform
-      pos: 50.5,-44.5
-      parent: 2
-  - uid: 5372
-    components:
-    - type: Transform
-      pos: 53.5,-44.5
+      pos: 45.5,-31.5
       parent: 2
   - uid: 6650
     components:
@@ -86291,36 +89669,44 @@ entities:
     - type: Transform
       pos: 32.5,-85.5
       parent: 2
-  - uid: 16451
+  - uid: 10705
     components:
     - type: Transform
-      pos: 59.5,-74.5
+      pos: 72.5,-72.5
       parent: 2
-  - uid: 16452
+  - uid: 10706
     components:
     - type: Transform
-      pos: 59.5,-77.5
+      pos: 72.5,-69.5
+      parent: 2
+  - uid: 12791
+    components:
+    - type: Transform
+      pos: 45.5,-34.5
+      parent: 2
+  - uid: 13900
+    components:
+    - type: Transform
+      pos: 44.5,-26.5
+      parent: 2
+  - uid: 14863
+    components:
+    - type: Transform
+      pos: 41.5,-27.5
       parent: 2
 - proto: PlasticFlapsAirtightOpaque
   entities:
-  - uid: 5353
+  - uid: 3716
     components:
     - type: Transform
-      pos: 36.5,-26.5
+      pos: 36.5,-28.5
       parent: 2
 - proto: PlayerStationAi
   entities:
-  - uid: 16346
+  - uid: 10852
     components:
     - type: Transform
-      pos: 89.5,-45.5
-      parent: 2
-- proto: PlushieArachind
-  entities:
-  - uid: 19381
-    components:
-    - type: Transform
-      pos: 68.46672,-46.45258
+      pos: 91.5,-45.5
       parent: 2
 - proto: PlushieAtmosian
   entities:
@@ -86347,6 +89733,13 @@ entities:
     - type: Transform
       pos: 83.57618,-18.55573
       parent: 2
+- proto: PlushieHampter
+  entities:
+  - uid: 16194
+    components:
+    - type: Transform
+      pos: 5.520261,-62.526257
+      parent: 2
 - proto: PlushieHuman
   entities:
   - uid: 17580
@@ -86354,12 +89747,12 @@ entities:
     - type: Transform
       pos: 10.276115,-44.41428
       parent: 2
-- proto: PlushieLizard
+- proto: PlushieLizardInversed
   entities:
-  - uid: 17523
+  - uid: 6922
     components:
     - type: Transform
-      pos: 83.557396,-72.530266
+      pos: 83.443275,-72.485634
       parent: 2
 - proto: PlushieLizardMirrored
   entities:
@@ -86392,7 +89785,7 @@ entities:
   - uid: 15420
     components:
     - type: Transform
-      pos: 42.419292,-16.548712
+      pos: 43.497017,-16.53401
       parent: 2
 - proto: PlushieRouny
   entities:
@@ -86430,6 +89823,15 @@ entities:
     - type: Transform
       pos: -51.020004,-60.457893
       parent: 2
+- proto: PlushieSlime
+  entities:
+  - uid: 5788
+    components:
+    - type: Transform
+      parent: 2004
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: PlushieVox
   entities:
   - uid: 19377
@@ -86451,23 +89853,23 @@ entities:
       parent: 2
 - proto: PortableFlasher
   entities:
-  - uid: 3006
+  - uid: 2164
     components:
     - type: Transform
-      pos: 58.5,-55.5
+      pos: 58.5,-47.5
       parent: 2
-  - uid: 18789
+  - uid: 7585
     components:
     - type: Transform
-      pos: 62.5,-35.5
+      pos: 57.5,-31.5
+      parent: 2
+  - uid: 9196
+    components:
+    - type: Transform
+      pos: 63.5,-36.5
       parent: 2
 - proto: PortableGeneratorJrPacman
   entities:
-  - uid: 4378
-    components:
-    - type: Transform
-      pos: 72.5,-55.5
-      parent: 2
   - uid: 8372
     components:
     - type: Transform
@@ -86478,6 +89880,16 @@ entities:
     - type: Transform
       pos: -8.5,-6.5
       parent: 2
+  - uid: 15437
+    components:
+    - type: Transform
+      pos: 78.5,-41.5
+      parent: 2
+  - uid: 15529
+    components:
+    - type: Transform
+      pos: 37.5,-91.5
+      parent: 2
   - uid: 15779
     components:
     - type: Transform
@@ -86530,6 +89942,11 @@ entities:
     - type: Transform
       pos: -11.5,-66.5
       parent: 2
+  - uid: 17727
+    components:
+    - type: Transform
+      pos: -5.5,-75.5
+      parent: 2
 - proto: PortableGeneratorSuperPacman
   entities:
   - uid: 5729
@@ -86537,11 +89954,6 @@ entities:
     - type: Transform
       pos: -11.5,-65.5
       parent: 2
-  - uid: 16979
-    components:
-    - type: Transform
-      pos: 37.5,-91.5
-      parent: 2
 - proto: PortableScrubber
   entities:
   - uid: 7976
@@ -86753,6 +90165,12 @@ entities:
       parent: 2
 - proto: PosterContrabandExoChomp
   entities:
+  - uid: 10734
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 74.5,-41.5
+      parent: 2
   - uid: 18764
     components:
     - type: Transform
@@ -86764,18 +90182,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 6.5,-26.5
       parent: 2
-  - uid: 19151
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 73.5,-43.5
-      parent: 2
-  - uid: 19191
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 61.5,-33.5
-      parent: 2
   - uid: 19202
     components:
     - type: Transform
@@ -86784,11 +90190,10 @@ entities:
       parent: 2
 - proto: PosterContrabandExoRun
   entities:
-  - uid: 19152
+  - uid: 7810
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 75.5,-43.5
+      pos: 74.5,-42.5
       parent: 2
   - uid: 19154
     components:
@@ -86808,11 +90213,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 16.5,-21.5
       parent: 2
-  - uid: 19192
+- proto: PosterContrabandHackingGuide
+  entities:
+  - uid: 19421
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 70.5,-36.5
+      pos: 39.5,-32.5
       parent: 2
 - proto: PosterContrabandLamarr
   entities:
@@ -86828,17 +90234,16 @@ entities:
     - type: Transform
       pos: -23.5,-20.5
       parent: 2
+  - uid: 3137
+    components:
+    - type: Transform
+      pos: 76.5,-38.5
+      parent: 2
   - uid: 4387
     components:
     - type: Transform
       pos: -21.5,-17.5
       parent: 2
-  - uid: 7326
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 81.5,-27.5
-      parent: 2
 - proto: PosterContrabandRouny
   entities:
   - uid: 2672
@@ -86846,10 +90251,10 @@ entities:
     - type: Transform
       pos: -23.5,-21.5
       parent: 2
-  - uid: 19218
+  - uid: 7949
     components:
     - type: Transform
-      pos: 73.5,-37.5
+      pos: 80.5,-25.5
       parent: 2
   - uid: 19219
     components:
@@ -86885,11 +90290,6 @@ entities:
       parent: 2
 - proto: PosterLegitBuild
   entities:
-  - uid: 3712
-    components:
-    - type: Transform
-      pos: 50.5,-31.5
-      parent: 2
   - uid: 17216
     components:
     - type: Transform
@@ -86908,10 +90308,10 @@ entities:
       parent: 2
 - proto: PosterLegitDickGumshue
   entities:
-  - uid: 7263
+  - uid: 16263
     components:
     - type: Transform
-      pos: 71.5,-49.5
+      pos: 71.5,-45.5
       parent: 2
 - proto: PosterLegitDoNotQuestion
   entities:
@@ -86936,15 +90336,15 @@ entities:
       parent: 2
 - proto: PosterLegitFoamForceAd
   entities:
-  - uid: 14308
+  - uid: 8428
     components:
     - type: Transform
-      pos: 64.5,-68.5
+      pos: 70.5,-60.5
       parent: 2
-  - uid: 14956
+  - uid: 8515
     components:
     - type: Transform
-      pos: 64.5,-71.5
+      pos: 68.5,-59.5
       parent: 2
 - proto: PosterLegitHelpOthers
   entities:
@@ -86956,6 +90356,11 @@ entities:
       parent: 2
 - proto: PosterLegitHereForYourSafety
   entities:
+  - uid: 16268
+    components:
+    - type: Transform
+      pos: 70.5,-37.5
+      parent: 2
   - uid: 18196
     components:
     - type: Transform
@@ -87004,6 +90409,11 @@ entities:
     - type: Transform
       pos: -1.5,-1.5
       parent: 2
+  - uid: 16287
+    components:
+    - type: Transform
+      pos: 63.5,-37.5
+      parent: 2
   - uid: 16293
     components:
     - type: Transform
@@ -87037,13 +90447,6 @@ entities:
     - type: Transform
       pos: 26.5,-9.5
       parent: 2
-- proto: PosterLegitNoERP
-  entities:
-  - uid: 7338
-    components:
-    - type: Transform
-      pos: 81.5,-28.5
-      parent: 2
 - proto: PosterLegitObey
   entities:
   - uid: 7159
@@ -87071,10 +90474,10 @@ entities:
     - type: Transform
       pos: 31.5,-47.5
       parent: 2
-  - uid: 15145
+  - uid: 16269
     components:
     - type: Transform
-      pos: 65.5,-48.5
+      pos: 63.5,-45.5
       parent: 2
 - proto: PosterLegitSafetyEyeProtection
   entities:
@@ -87107,6 +90510,11 @@ entities:
       parent: 2
 - proto: PosterLegitSafetyMothEpi
   entities:
+  - uid: 16285
+    components:
+    - type: Transform
+      pos: 49.5,-34.5
+      parent: 2
   - uid: 17233
     components:
     - type: Transform
@@ -87129,6 +90537,12 @@ entities:
       parent: 2
 - proto: PosterLegitSafetyMothMeth
   entities:
+  - uid: 6970
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 22.5,-67.5
+      parent: 2
   - uid: 17235
     components:
     - type: Transform
@@ -87150,6 +90564,11 @@ entities:
     - type: Transform
       pos: 48.5,-12.5
       parent: 2
+  - uid: 16284
+    components:
+    - type: Transform
+      pos: 57.5,-30.5
+      parent: 2
 - proto: PosterLegitSecWatch
   entities:
   - uid: 7068
@@ -87157,6 +90576,18 @@ entities:
     - type: Transform
       pos: 26.5,-39.5
       parent: 2
+  - uid: 16271
+    components:
+    - type: Transform
+      pos: 54.5,-40.5
+      parent: 2
+- proto: PosterLegitSpaceCops
+  entities:
+  - uid: 16272
+    components:
+    - type: Transform
+      pos: 68.5,-42.5
+      parent: 2
 - proto: PosterLegitStateLaws
   entities:
   - uid: 17222
@@ -87180,8 +90611,19 @@ entities:
     - type: Transform
       pos: 62.5,-15.5
       parent: 2
+  - uid: 16029
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 73.5,-60.5
+      parent: 2
 - proto: PosterLegitWorkForAFuture
   entities:
+  - uid: 16270
+    components:
+    - type: Transform
+      pos: 73.5,-40.5
+      parent: 2
   - uid: 17220
     components:
     - type: Transform
@@ -87190,10 +90632,10 @@ entities:
       parent: 2
 - proto: PottedPlant0
   entities:
-  - uid: 7795
+  - uid: 7767
     components:
     - type: Transform
-      pos: 31.5,-12.5
+      pos: 32.5,-12.5
       parent: 2
 - proto: PottedPlant13
   entities:
@@ -87227,17 +90669,24 @@ entities:
       parent: 2
 - proto: PottedPlant2
   entities:
-  - uid: 3525
+  - uid: 7052
     components:
     - type: Transform
       pos: 52.5,-54.5
       parent: 2
-- proto: PottedPlant22
+- proto: PottedPlant21
   entities:
-  - uid: 206
+  - uid: 294
     components:
     - type: Transform
-      pos: 67.5,-50.5
+      pos: 29.5,-20.5
+      parent: 2
+- proto: PottedPlant22
+  entities:
+  - uid: 9335
+    components:
+    - type: Transform
+      pos: 68.5,-46.5
       parent: 2
   - uid: 17301
     components:
@@ -87246,6 +90695,11 @@ entities:
       parent: 2
 - proto: PottedPlant7
   entities:
+  - uid: 10797
+    components:
+    - type: Transform
+      pos: 24.5,-21.5
+      parent: 2
   - uid: 17134
     components:
     - type: Transform
@@ -87258,16 +90712,21 @@ entities:
       parent: 2
 - proto: PottedPlantBioluminscent
   entities:
-  - uid: 5794
+  - uid: 8788
     components:
     - type: Transform
-      pos: 22.5,-14.5
+      pos: 24.5,-14.5
       parent: 2
   - uid: 15882
     components:
     - type: Transform
       pos: -25.5,-14.5
       parent: 2
+  - uid: 16870
+    components:
+    - type: Transform
+      pos: 26.5,-25.5
+      parent: 2
   - uid: 18317
     components:
     - type: Transform
@@ -87306,6 +90765,11 @@ entities:
     - type: Transform
       pos: 21.5,-30.5
       parent: 2
+  - uid: 348
+    components:
+    - type: Transform
+      pos: 65.5,-31.5
+      parent: 2
   - uid: 1879
     components:
     - type: Transform
@@ -87355,17 +90819,17 @@ entities:
       rot: 3.141592653589793 rad
       pos: 29.5,-90.5
       parent: 2
-  - uid: 19595
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 62.5,-40.5
-      parent: 2
   - uid: 19672
     components:
     - type: Transform
       pos: -53.5,-42.5
       parent: 2
+  - uid: 20010
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 65.5,-68.5
+      parent: 2
 - proto: PowerComputerCircuitboard
   entities:
   - uid: 18307
@@ -87381,18 +90845,41 @@ entities:
       rot: 3.141592653589793 rad
       pos: -5.5,-40.5
       parent: 2
+  - uid: 287
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 94.5,-46.5
+      parent: 2
   - uid: 468
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -40.5,-15.5
       parent: 2
+  - uid: 806
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 29.5,-30.5
+      parent: 2
   - uid: 850
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 12.5,-32.5
       parent: 2
+  - uid: 916
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 29.5,-12.5
+      parent: 2
+  - uid: 1113
+    components:
+    - type: Transform
+      pos: 41.5,-23.5
+      parent: 2
   - uid: 1449
     components:
     - type: Transform
@@ -87440,12 +90927,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 4.5,-48.5
       parent: 2
-  - uid: 2920
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 65.5,-39.5
-      parent: 2
   - uid: 2968
     components:
     - type: Transform
@@ -87458,12 +90939,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -2.5,-40.5
       parent: 2
-  - uid: 3023
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 71.5,-53.5
-      parent: 2
   - uid: 3064
     components:
     - type: Transform
@@ -87475,17 +90950,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 25.5,-30.5
       parent: 2
-  - uid: 3210
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 27.5,-26.5
-      parent: 2
-  - uid: 3280
-    components:
-    - type: Transform
-      pos: 34.5,-25.5
-      parent: 2
   - uid: 3348
     components:
     - type: Transform
@@ -87509,12 +90973,6 @@ entities:
     - type: Transform
       pos: 63.5,-16.5
       parent: 2
-  - uid: 4347
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 57.5,-52.5
-      parent: 2
   - uid: 4511
     components:
     - type: Transform
@@ -87567,12 +91025,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 35.5,-69.5
       parent: 2
-  - uid: 5403
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 65.5,-49.5
-      parent: 2
   - uid: 5780
     components:
     - type: Transform
@@ -87606,41 +91058,27 @@ entities:
       rot: 3.141592653589793 rad
       pos: 5.5,-67.5
       parent: 2
+  - uid: 6289
+    components:
+    - type: Transform
+      pos: 68.5,-32.5
+      parent: 2
+  - uid: 6390
+    components:
+    - type: Transform
+      pos: 34.5,-26.5
+      parent: 2
   - uid: 6578
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 15.5,-20.5
       parent: 2
-  - uid: 6617
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 62.5,-34.5
-      parent: 2
-  - uid: 6619
+  - uid: 7158
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 68.5,-43.5
-      parent: 2
-  - uid: 6620
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 64.5,-43.5
-      parent: 2
-  - uid: 7096
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-59.5
-      parent: 2
-  - uid: 7098
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-57.5
+      pos: 68.5,-36.5
       parent: 2
   - uid: 7199
     components:
@@ -87648,11 +91086,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -14.5,-21.5
       parent: 2
-  - uid: 7230
-    components:
-    - type: Transform
-      pos: 61.5,-48.5
-      parent: 2
   - uid: 7234
     components:
     - type: Transform
@@ -87671,6 +91104,17 @@ entities:
       rot: 3.141592653589793 rad
       pos: 49.5,-52.5
       parent: 2
+  - uid: 7568
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 27.5,-27.5
+      parent: 2
+  - uid: 7598
+    components:
+    - type: Transform
+      pos: 79.5,-43.5
+      parent: 2
   - uid: 7655
     components:
     - type: Transform
@@ -87712,12 +91156,6 @@ entities:
     - type: Transform
       pos: 40.5,-52.5
       parent: 2
-  - uid: 7970
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 28.5,-12.5
-      parent: 2
   - uid: 8037
     components:
     - type: Transform
@@ -87735,56 +91173,23 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 45.5,-51.5
       parent: 2
-  - uid: 8822
-    components:
-    - type: Transform
-      pos: 77.5,-43.5
-      parent: 2
   - uid: 9074
     components:
     - type: Transform
       pos: 11.5,-77.5
       parent: 2
-  - uid: 9297
-    components:
-    - type: Transform
-      pos: 66.5,-54.5
-      parent: 2
-  - uid: 9306
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 71.5,-46.5
-      parent: 2
-  - uid: 9336
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 63.5,-45.5
-      parent: 2
-  - uid: 9345
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 33.5,-21.5
-      parent: 2
-  - uid: 9361
-    components:
-    - type: Transform
-      pos: 56.5,-48.5
-      parent: 2
-  - uid: 9678
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-32.5
-      parent: 2
   - uid: 9679
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 65.5,-29.5
       parent: 2
+  - uid: 9822
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-60.5
+      parent: 2
   - uid: 9885
     components:
     - type: Transform
@@ -87802,11 +91207,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -10.5,-15.5
       parent: 2
-  - uid: 10338
+  - uid: 10411
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 57.5,-39.5
+      rot: 3.141592653589793 rad
+      pos: 79.5,-47.5
       parent: 2
   - uid: 10494
     components:
@@ -87818,23 +91223,17 @@ entities:
     - type: Transform
       pos: -6.5,-30.5
       parent: 2
-  - uid: 10773
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 65.5,-52.5
-      parent: 2
-  - uid: 10802
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 62.5,-52.5
-      parent: 2
-  - uid: 10804
+  - uid: 10741
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 58.5,-57.5
+      pos: 50.5,-34.5
+      parent: 2
+  - uid: 10830
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 94.5,-44.5
       parent: 2
   - uid: 11365
     components:
@@ -87852,23 +91251,6 @@ entities:
     - type: Transform
       pos: -11.5,-18.5
       parent: 2
-  - uid: 11687
-    components:
-    - type: Transform
-      pos: 50.5,-49.5
-      parent: 2
-  - uid: 11697
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 65.5,-34.5
-      parent: 2
-  - uid: 11699
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 69.5,-28.5
-      parent: 2
   - uid: 11707
     components:
     - type: Transform
@@ -87945,29 +91327,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 38.5,-71.5
       parent: 2
-  - uid: 13797
-    components:
-    - type: Transform
-      pos: 67.5,-50.5
-      parent: 2
   - uid: 13847
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 62.5,-29.5
       parent: 2
-  - uid: 13867
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 57.5,-34.5
-      parent: 2
-  - uid: 13875
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 77.5,-47.5
-      parent: 2
   - uid: 13888
     components:
     - type: Transform
@@ -88353,12 +91718,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 7.5,-56.5
       parent: 2
-  - uid: 14082
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,-59.5
-      parent: 2
   - uid: 14084
     components:
     - type: Transform
@@ -88879,24 +92238,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -2.5,-52.5
       parent: 2
-  - uid: 14275
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 27.5,-21.5
-      parent: 2
-  - uid: 14276
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 27.5,-18.5
-      parent: 2
-  - uid: 14281
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 25.5,-17.5
-      parent: 2
   - uid: 14284
     components:
     - type: Transform
@@ -88921,12 +92262,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 44.5,-72.5
       parent: 2
-  - uid: 14320
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-39.5
-      parent: 2
   - uid: 14324
     components:
     - type: Transform
@@ -88972,29 +92307,6 @@ entities:
     - type: Transform
       pos: 54.5,-13.5
       parent: 2
-  - uid: 14350
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 92.5,-46.5
-      parent: 2
-  - uid: 14351
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 92.5,-44.5
-      parent: 2
-  - uid: 14352
-    components:
-    - type: Transform
-      pos: 86.5,-43.5
-      parent: 2
-  - uid: 14353
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 86.5,-47.5
-      parent: 2
   - uid: 14412
     components:
     - type: Transform
@@ -89043,22 +92355,231 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -16.5,-15.5
       parent: 2
-  - uid: 14875
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 20.5,-23.5
-      parent: 2
   - uid: 14946
     components:
     - type: Transform
       pos: 14.5,-11.5
       parent: 2
+  - uid: 15146
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 50.5,-31.5
+      parent: 2
+  - uid: 15148
+    components:
+    - type: Transform
+      pos: 57.5,-31.5
+      parent: 2
+  - uid: 15158
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-38.5
+      parent: 2
+  - uid: 15200
+    components:
+    - type: Transform
+      pos: 56.5,-36.5
+      parent: 2
+  - uid: 15201
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 56.5,-39.5
+      parent: 2
+  - uid: 15202
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 55.5,-28.5
+      parent: 2
+  - uid: 15203
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 60.5,-29.5
+      parent: 2
+  - uid: 15204
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 70.5,-28.5
+      parent: 2
+  - uid: 15205
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 72.5,-39.5
+      parent: 2
+  - uid: 15206
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 69.5,-41.5
+      parent: 2
+  - uid: 15207
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 72.5,-42.5
+      parent: 2
+  - uid: 15208
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 71.5,-52.5
+      parent: 2
+  - uid: 15209
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 64.5,-51.5
+      parent: 2
+  - uid: 15210
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 67.5,-53.5
+      parent: 2
+  - uid: 15211
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 64.5,-47.5
+      parent: 2
+  - uid: 15212
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 57.5,-44.5
+      parent: 2
+  - uid: 15213
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 62.5,-44.5
+      parent: 2
+  - uid: 15215
+    components:
+    - type: Transform
+      pos: 52.5,-43.5
+      parent: 2
+  - uid: 15216
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 52.5,-47.5
+      parent: 2
+  - uid: 15217
+    components:
+    - type: Transform
+      pos: 49.5,-50.5
+      parent: 2
+  - uid: 15218
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 50.5,-46.5
+      parent: 2
+  - uid: 15219
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 66.5,-41.5
+      parent: 2
+  - uid: 15225
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 64.5,-41.5
+      parent: 2
+  - uid: 15226
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-35.5
+      parent: 2
+  - uid: 15227
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 65.5,-32.5
+      parent: 2
+  - uid: 15233
+    components:
+    - type: Transform
+      pos: 60.5,-31.5
+      parent: 2
+  - uid: 15234
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 53.5,-34.5
+      parent: 2
+  - uid: 15236
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 69.5,-34.5
+      parent: 2
+  - uid: 15237
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 67.5,-44.5
+      parent: 2
+  - uid: 15238
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 64.5,-38.5
+      parent: 2
+  - uid: 15247
+    components:
+    - type: Transform
+      pos: 88.5,-43.5
+      parent: 2
+  - uid: 15248
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 88.5,-47.5
+      parent: 2
+  - uid: 15251
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 58.5,-49.5
+      parent: 2
+  - uid: 15252
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-49.5
+      parent: 2
+  - uid: 15253
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 60.5,-51.5
+      parent: 2
   - uid: 15277
     components:
     - type: Transform
       pos: 49.5,-13.5
       parent: 2
+  - uid: 15394
+    components:
+    - type: Transform
+      pos: 54.5,-55.5
+      parent: 2
+  - uid: 15399
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 56.5,-57.5
+      parent: 2
   - uid: 15411
     components:
     - type: Transform
@@ -89070,12 +92591,6 @@ entities:
     - type: Transform
       pos: 53.5,-18.5
       parent: 2
-  - uid: 15458
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 68.5,-35.5
-      parent: 2
   - uid: 15877
     components:
     - type: Transform
@@ -89093,12 +92608,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -37.5,-15.5
       parent: 2
-  - uid: 16291
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 21.5,-17.5
-      parent: 2
   - uid: 16350
     components:
     - type: Transform
@@ -89117,23 +92626,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 17.5,-100.5
       parent: 2
-  - uid: 16369
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 29.5,-29.5
-      parent: 2
-  - uid: 16374
-    components:
-    - type: Transform
-      pos: 68.5,-31.5
-      parent: 2
-  - uid: 16529
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 62.5,-39.5
-      parent: 2
   - uid: 16533
     components:
     - type: Transform
@@ -89178,23 +92670,6 @@ entities:
     - type: Transform
       pos: 19.5,-27.5
       parent: 2
-  - uid: 17094
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 53.5,-29.5
-      parent: 2
-  - uid: 17260
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 25.5,-25.5
-      parent: 2
-  - uid: 17280
-    components:
-    - type: Transform
-      pos: 39.5,-23.5
-      parent: 2
   - uid: 17290
     components:
     - type: Transform
@@ -89224,6 +92699,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 10.5,-75.5
       parent: 2
+  - uid: 17785
+    components:
+    - type: Transform
+      pos: -12.5,-11.5
+      parent: 2
   - uid: 17806
     components:
     - type: Transform
@@ -89241,18 +92721,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 23.5,-89.5
       parent: 2
-  - uid: 17925
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 55.5,-55.5
-      parent: 2
-  - uid: 18066
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 23.5,-17.5
-      parent: 2
   - uid: 18069
     components:
     - type: Transform
@@ -89435,18 +92903,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 48.5,-17.5
       parent: 2
-  - uid: 18114
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 31.5,-16.5
-      parent: 2
-  - uid: 18115
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 31.5,-23.5
-      parent: 2
   - uid: 18116
     components:
     - type: Transform
@@ -89566,12 +93022,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -27.5,-22.5
       parent: 2
-  - uid: 18154
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 45.5,-23.5
-      parent: 2
   - uid: 18155
     components:
     - type: Transform
@@ -89584,12 +93034,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 40.5,-18.5
       parent: 2
-  - uid: 18158
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 57.5,-42.5
-      parent: 2
   - uid: 18176
     components:
     - type: Transform
@@ -89660,30 +93104,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 23.5,-10.5
       parent: 2
-  - uid: 18525
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 65.5,-46.5
-      parent: 2
-  - uid: 18629
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 57.5,-26.5
-      parent: 2
-  - uid: 18630
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 57.5,-32.5
-      parent: 2
   - uid: 18784
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -35.5,-15.5
       parent: 2
+  - uid: 18824
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 23.5,-19.5
+      parent: 2
   - uid: 19020
     components:
     - type: Transform
@@ -89747,6 +93179,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -31.5,-13.5
       parent: 2
+  - uid: 19472
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 30.5,-24.5
+      parent: 2
+  - uid: 19475
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 27.5,-24.5
+      parent: 2
   - uid: 19492
     components:
     - type: Transform
@@ -89758,30 +93202,115 @@ entities:
       rot: 3.141592653589793 rad
       pos: 47.5,-72.5
       parent: 2
+  - uid: 19511
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 23.5,-24.5
+      parent: 2
+  - uid: 19512
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,-20.5
+      parent: 2
   - uid: 19538
     components:
     - type: Transform
       pos: -17.5,-53.5
       parent: 2
+  - uid: 19542
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 27.5,-14.5
+      parent: 2
+  - uid: 19543
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 33.5,-20.5
+      parent: 2
+  - uid: 19544
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 29.5,-20.5
+      parent: 2
+  - uid: 19546
+    components:
+    - type: Transform
+      pos: 35.5,-11.5
+      parent: 2
+  - uid: 19547
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 34.5,-15.5
+      parent: 2
+  - uid: 19548
+    components:
+    - type: Transform
+      pos: 34.5,-17.5
+      parent: 2
+  - uid: 19549
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 35.5,-24.5
+      parent: 2
+  - uid: 19550
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 45.5,-24.5
+      parent: 2
+  - uid: 19552
+    components:
+    - type: Transform
+      pos: 39.5,-23.5
+      parent: 2
+  - uid: 19553
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 31.5,-11.5
+      parent: 2
   - uid: 19576
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -14.5,-51.5
       parent: 2
+  - uid: 19580
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 24.5,-14.5
+      parent: 2
   - uid: 19644
     components:
     - type: Transform
       pos: 62.5,-20.5
       parent: 2
-- proto: PoweredlightExterior
-  entities:
-  - uid: 3206
+  - uid: 19729
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 30.5,-9.5
+      pos: 33.5,-97.5
       parent: 2
+  - uid: 20052
+    components:
+    - type: Transform
+      pos: 84.5,-44.5
+      parent: 2
+  - uid: 20053
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 84.5,-46.5
+      parent: 2
+- proto: PoweredlightExterior
+  entities:
   - uid: 3393
     components:
     - type: Transform
@@ -89792,6 +93321,18 @@ entities:
     - type: Transform
       pos: -30.5,-74.5
       parent: 2
+  - uid: 3898
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 99.5,-48.5
+      parent: 2
+  - uid: 9388
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 99.5,-42.5
+      parent: 2
   - uid: 9953
     components:
     - type: Transform
@@ -89804,18 +93345,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -59.5,-59.5
       parent: 2
-  - uid: 10448
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 97.5,-48.5
-      parent: 2
-  - uid: 11396
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 97.5,-42.5
-      parent: 2
   - uid: 14064
     components:
     - type: Transform
@@ -89875,6 +93404,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 87.5,-19.5
       parent: 2
+  - uid: 15249
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 85.5,-50.5
+      parent: 2
+  - uid: 15250
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 85.5,-40.5
+      parent: 2
   - uid: 15286
     components:
     - type: Transform
@@ -90026,35 +93567,35 @@ entities:
       parent: 2
 - proto: PoweredSmallLight
   entities:
-  - uid: 887
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 58.5,-67.5
-      parent: 2
   - uid: 1209
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -59.5,-25.5
       parent: 2
+  - uid: 1694
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 50.5,-24.5
+      parent: 2
   - uid: 1702
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 27.5,-90.5
       parent: 2
-  - uid: 1801
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -36.5,-74.5
-      parent: 2
-  - uid: 1878
+  - uid: 1806
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 57.5,-64.5
+      pos: 52.5,-37.5
+      parent: 2
+  - uid: 2293
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 43.5,-38.5
       parent: 2
   - uid: 2882
     components:
@@ -90074,6 +93615,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 36.5,-61.5
       parent: 2
+  - uid: 3495
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 45.5,-37.5
+      parent: 2
+  - uid: 3948
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 49.5,-36.5
+      parent: 2
   - uid: 4303
     components:
     - type: Transform
@@ -90097,11 +93650,16 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 42.5,-61.5
       parent: 2
-  - uid: 4983
+  - uid: 5298
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -41.5,-77.5
+      pos: 71.5,-70.5
+      parent: 2
+  - uid: 5308
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-72.5
       parent: 2
   - uid: 6045
     components:
@@ -90120,12 +93678,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 34.5,-61.5
       parent: 2
-  - uid: 6618
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 70.5,-43.5
-      parent: 2
   - uid: 7146
     components:
     - type: Transform
@@ -90136,33 +93688,16 @@ entities:
     - type: Transform
       pos: -47.5,-64.5
       parent: 2
-  - uid: 7171
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-70.5
-      parent: 2
-  - uid: 7180
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-72.5
-      parent: 2
   - uid: 7454
     components:
     - type: Transform
       pos: -41.5,-61.5
       parent: 2
-  - uid: 8045
+  - uid: 7997
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-62.5
-      parent: 2
-  - uid: 8836
-    components:
-    - type: Transform
-      pos: -41.5,-75.5
+      rot: 1.5707963267948966 rad
+      pos: 42.5,-26.5
       parent: 2
   - uid: 9307
     components:
@@ -90175,57 +93710,46 @@ entities:
     - type: Transform
       pos: -42.5,-65.5
       parent: 2
-  - uid: 10278
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 42.5,-29.5
-      parent: 2
   - uid: 10283
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 35.5,-45.5
       parent: 2
-  - uid: 10436
+  - uid: 10743
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 65.5,-57.5
+      parent: 2
+  - uid: 10795
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 75.5,-43.5
+      parent: 2
+  - uid: 11130
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 68.5,-57.5
+      pos: -37.5,-80.5
+      parent: 2
+  - uid: 11131
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -35.5,-78.5
       parent: 2
   - uid: 11397
     components:
     - type: Transform
       pos: -54.5,-27.5
       parent: 2
-  - uid: 11755
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 74.5,-43.5
-      parent: 2
-  - uid: 12910
-    components:
-    - type: Transform
-      pos: 60.5,-65.5
-      parent: 2
-  - uid: 12912
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 56.5,-70.5
-      parent: 2
   - uid: 12915
     components:
     - type: Transform
       pos: 20.5,-63.5
       parent: 2
-  - uid: 12992
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 41.5,-32.5
-      parent: 2
   - uid: 13390
     components:
     - type: Transform
@@ -90486,34 +94010,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 17.5,-50.5
       parent: 2
-  - uid: 14237
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 46.5,-41.5
-      parent: 2
-  - uid: 14279
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 30.5,-12.5
-      parent: 2
-  - uid: 14329
-    components:
-    - type: Transform
-      pos: 71.5,-61.5
-      parent: 2
-  - uid: 14330
-    components:
-    - type: Transform
-      pos: 70.5,-67.5
-      parent: 2
-  - uid: 14331
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 72.5,-65.5
-      parent: 2
   - uid: 14332
     components:
     - type: Transform
@@ -90538,11 +94034,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -56.5,-22.5
       parent: 2
-  - uid: 14404
-    components:
-    - type: Transform
-      pos: 41.5,-37.5
-      parent: 2
   - uid: 14418
     components:
     - type: Transform
@@ -90554,60 +94045,213 @@ entities:
       rot: 3.141592653589793 rad
       pos: -37.5,-25.5
       parent: 2
-  - uid: 14428
+  - uid: 15214
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 79.5,-69.5
+      rot: -1.5707963267948966 rad
+      pos: 79.5,-58.5
       parent: 2
-  - uid: 15160
+  - uid: 15240
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 71.5,-44.5
+      parent: 2
+  - uid: 15245
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 76.5,-47.5
+      parent: 2
+  - uid: 15246
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 43.5,-25.5
+      pos: 75.5,-45.5
+      parent: 2
+  - uid: 15254
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 54.5,-50.5
+      parent: 2
+  - uid: 15255
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 58.5,-56.5
+      parent: 2
+  - uid: 15256
+    components:
+    - type: Transform
+      pos: 58.5,-68.5
+      parent: 2
+  - uid: 15257
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 58.5,-74.5
+      parent: 2
+  - uid: 15258
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 57.5,-71.5
+      parent: 2
+  - uid: 15259
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-68.5
+      parent: 2
+  - uid: 15260
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 58.5,-65.5
+      parent: 2
+  - uid: 15264
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 77.5,-66.5
       parent: 2
   - uid: 15271
     components:
     - type: Transform
       pos: 42.5,-49.5
       parent: 2
-  - uid: 15400
+  - uid: 15288
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 74.5,-49.5
+      pos: 73.5,-61.5
       parent: 2
-  - uid: 15410
+  - uid: 15331
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 67.5,-66.5
+      parent: 2
+  - uid: 15334
+    components:
+    - type: Transform
+      pos: 66.5,-62.5
+      parent: 2
+  - uid: 15336
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 74.5,-68.5
+      parent: 2
+  - uid: 15339
+    components:
+    - type: Transform
+      pos: 75.5,-60.5
+      parent: 2
+  - uid: 15340
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 65.5,-60.5
+      pos: 70.5,-64.5
       parent: 2
-  - uid: 15429
+  - uid: 15359
     components:
     - type: Transform
-      pos: 74.5,-58.5
+      rot: 3.141592653589793 rad
+      pos: 66.5,-69.5
+      parent: 2
+  - uid: 15373
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 64.5,-66.5
+      parent: 2
+  - uid: 15386
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 53.5,-75.5
+      parent: 2
+  - uid: 15387
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-76.5
+      parent: 2
+  - uid: 15388
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-55.5
       parent: 2
   - uid: 15430
     components:
     - type: Transform
       pos: 77.5,-51.5
       parent: 2
-  - uid: 15435
+  - uid: 15462
     components:
     - type: Transform
-      pos: 67.5,-65.5
+      rot: 1.5707963267948966 rad
+      pos: 57.5,-59.5
       parent: 2
-  - uid: 15437
+  - uid: 15546
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 48.5,-45.5
+      pos: 80.5,-70.5
       parent: 2
-  - uid: 15450
+  - uid: 15852
     components:
     - type: Transform
-      pos: 70.5,-40.5
+      pos: 48.5,-26.5
+      parent: 2
+  - uid: 15853
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 48.5,-32.5
+      parent: 2
+  - uid: 15856
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 47.5,-38.5
+      parent: 2
+  - uid: 15857
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 48.5,-43.5
+      parent: 2
+  - uid: 15858
+    components:
+    - type: Transform
+      pos: 51.5,-40.5
+      parent: 2
+  - uid: 15883
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 46.5,-46.5
+      parent: 2
+  - uid: 16021
+    components:
+    - type: Transform
+      pos: 41.5,-32.5
+      parent: 2
+  - uid: 16022
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 37.5,-36.5
+      parent: 2
+  - uid: 16028
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 37.5,-32.5
       parent: 2
   - uid: 16041
     components:
@@ -90615,16 +94259,22 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 36.5,-40.5
       parent: 2
+  - uid: 16118
+    components:
+    - type: Transform
+      pos: 1.5,-59.5
+      parent: 2
+  - uid: 16119
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-79.5
+      parent: 2
   - uid: 16172
     components:
     - type: Transform
       pos: 4.5,-75.5
       parent: 2
-  - uid: 16378
-    components:
-    - type: Transform
-      pos: 69.5,-37.5
-      parent: 2
   - uid: 16515
     components:
     - type: Transform
@@ -90642,30 +94292,6 @@ entities:
     - type: Transform
       pos: -33.5,-27.5
       parent: 2
-  - uid: 16538
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 80.5,-64.5
-      parent: 2
-  - uid: 16539
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 76.5,-56.5
-      parent: 2
-  - uid: 16541
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 52.5,-41.5
-      parent: 2
-  - uid: 16542
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 45.5,-31.5
-      parent: 2
   - uid: 16544
     components:
     - type: Transform
@@ -90678,12 +94304,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 34.5,-91.5
       parent: 2
-  - uid: 16551
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-59.5
-      parent: 2
   - uid: 16554
     components:
     - type: Transform
@@ -90701,34 +94321,21 @@ entities:
     - type: Transform
       pos: -34.5,-29.5
       parent: 2
-  - uid: 16563
+  - uid: 16597
     components:
     - type: Transform
-      pos: 71.5,-71.5
+      pos: -39.5,-77.5
       parent: 2
-  - uid: 16592
+  - uid: 16974
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 66.5,-63.5
-      parent: 2
-  - uid: 16861
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 57.5,-76.5
+      pos: 53.5,-96.5
       parent: 2
   - uid: 17137
     components:
     - type: Transform
       pos: -30.5,-60.5
       parent: 2
-  - uid: 17261
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 51.5,-24.5
-      parent: 2
   - uid: 17274
     components:
     - type: Transform
@@ -90762,22 +94369,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 40.5,-21.5
       parent: 2
-  - uid: 17960
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 33.5,-17.5
-      parent: 2
-    - type: PointLight
-      enabled: False
-    - type: ContainerContainer
-      containers:
-        light_bulb: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 17961
-    - type: ApcPowerReceiver
-      powerLoad: 0
   - uid: 18030
     components:
     - type: Transform
@@ -90866,12 +94457,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 29.5,-34.5
       parent: 2
-  - uid: 19243
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 37.5,-29.5
-      parent: 2
   - uid: 19273
     components:
     - type: Transform
@@ -90884,10 +94469,21 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -14.5,-70.5
       parent: 2
-  - uid: 19405
+  - uid: 19404
     components:
     - type: Transform
-      pos: 54.5,-97.5
+      pos: 55.5,-97.5
+      parent: 2
+  - uid: 19418
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 42.5,-34.5
+      parent: 2
+  - uid: 19474
+    components:
+    - type: Transform
+      pos: 51.5,-28.5
       parent: 2
   - uid: 19490
     components:
@@ -90895,29 +94491,45 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 51.5,-62.5
       parent: 2
-- proto: PoweredSmallLightEmpty
-  entities:
-  - uid: 17952
+  - uid: 19551
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 33.5,-13.5
+      pos: 35.5,-20.5
       parent: 2
-    - type: ContainerContainer
-      containers:
-        light_bulb: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 17953
-    - type: ApcPowerReceiver
-      powerLoad: 0
-- proto: PrefilledSyringe
-  entities:
-  - uid: 7785
+  - uid: 20009
     components:
     - type: Transform
-      pos: 27.5,-15.5
+      rot: 3.141592653589793 rad
+      pos: 60.5,-60.5
       parent: 2
+- proto: PoweredWarmSmallLight
+  entities:
+  - uid: 15239
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 72.5,-49.5
+      parent: 2
+  - uid: 15241
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 73.5,-47.5
+      parent: 2
+  - uid: 15242
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 68.5,-48.5
+      parent: 2
+  - uid: 17504
+    components:
+    - type: Transform
+      pos: 70.5,-46.5
+      parent: 2
+- proto: PrefilledSyringe
+  entities:
   - uid: 17022
     components:
     - type: Transform
@@ -90945,36 +94557,31 @@ entities:
       parent: 2
 - proto: PuddleBlood
   entities:
-  - uid: 1197
+  - uid: 801
     components:
     - type: Transform
-      pos: 42.5,-28.5
+      pos: 80.5,-27.5
       parent: 2
-  - uid: 1856
+  - uid: 1170
     components:
     - type: Transform
-      pos: 79.5,-29.5
+      pos: 76.5,-40.5
       parent: 2
-  - uid: 5083
+  - uid: 2499
     components:
     - type: Transform
-      pos: 74.5,-43.5
+      pos: 76.5,-41.5
+      parent: 2
+  - uid: 2767
+    components:
+    - type: Transform
+      pos: 76.5,-39.5
       parent: 2
   - uid: 5100
     components:
     - type: Transform
       pos: 75.5,-25.5
       parent: 2
-  - uid: 5101
-    components:
-    - type: Transform
-      pos: 74.5,-42.5
-      parent: 2
-  - uid: 5426
-    components:
-    - type: Transform
-      pos: 79.5,-30.5
-      parent: 2
   - uid: 5460
     components:
     - type: Transform
@@ -90985,10 +94592,30 @@ entities:
     - type: Transform
       pos: 75.5,-24.5
       parent: 2
-  - uid: 6711
+  - uid: 6372
     components:
     - type: Transform
-      pos: 41.5,-28.5
+      pos: 80.5,-26.5
+      parent: 2
+  - uid: 7579
+    components:
+    - type: Transform
+      pos: 67.5,-66.5
+      parent: 2
+  - uid: 8447
+    components:
+    - type: Transform
+      pos: 68.5,-66.5
+      parent: 2
+  - uid: 13807
+    components:
+    - type: Transform
+      pos: 79.5,-25.5
+      parent: 2
+  - uid: 13829
+    components:
+    - type: Transform
+      pos: 78.5,-25.5
       parent: 2
   - uid: 14364
     components:
@@ -91075,11 +94702,6 @@ entities:
     - type: Transform
       pos: -26.5,-43.5
       parent: 2
-  - uid: 17479
-    components:
-    - type: Transform
-      pos: 79.5,-27.5
-      parent: 2
   - uid: 17529
     components:
     - type: Transform
@@ -91120,47 +94742,42 @@ entities:
     - type: Transform
       pos: -1.5,-73.5
       parent: 2
-  - uid: 18823
+  - uid: 20054
     components:
     - type: Transform
-      pos: 56.5,-49.5
+      pos: 53.5,-42.5
       parent: 2
-  - uid: 18824
+  - uid: 20055
     components:
     - type: Transform
-      pos: 55.5,-49.5
+      pos: 53.5,-43.5
       parent: 2
-  - uid: 18825
+  - uid: 20057
     components:
     - type: Transform
-      pos: 56.5,-50.5
+      pos: 54.5,-42.5
       parent: 2
-  - uid: 18826
+  - uid: 20059
     components:
     - type: Transform
-      pos: 57.5,-49.5
-      parent: 2
-  - uid: 18835
-    components:
-    - type: Transform
-      pos: 56.5,-48.5
-      parent: 2
-  - uid: 19552
-    components:
-    - type: Transform
-      pos: 74.5,-41.5
+      pos: 54.5,-43.5
       parent: 2
 - proto: PuddleBloodSmall
   entities:
-  - uid: 7101
+  - uid: 2480
     components:
     - type: Transform
-      pos: 74.5,-46.5
+      pos: 80.5,-28.5
       parent: 2
-  - uid: 8141
+  - uid: 3309
     components:
     - type: Transform
-      pos: 77.5,-55.5
+      pos: 75.5,-54.5
+      parent: 2
+  - uid: 14315
+    components:
+    - type: Transform
+      pos: 75.5,-46.5
       parent: 2
   - uid: 16810
     components:
@@ -91297,11 +94914,6 @@ entities:
     - type: Transform
       pos: 76.5,-51.5
       parent: 2
-  - uid: 18214
-    components:
-    - type: Transform
-      pos: 79.5,-31.5
-      parent: 2
   - uid: 18552
     components:
     - type: Transform
@@ -91312,16 +94924,6 @@ entities:
     - type: Transform
       pos: 1.5,-73.5
       parent: 2
-  - uid: 18836
-    components:
-    - type: Transform
-      pos: 54.5,-50.5
-      parent: 2
-  - uid: 19553
-    components:
-    - type: Transform
-      pos: 76.5,-41.5
-      parent: 2
   - uid: 19554
     components:
     - type: Transform
@@ -91332,33 +94934,43 @@ entities:
     - type: Transform
       pos: 74.5,-23.5
       parent: 2
+  - uid: 20056
+    components:
+    - type: Transform
+      pos: 53.5,-44.5
+      parent: 2
+  - uid: 20058
+    components:
+    - type: Transform
+      pos: 52.5,-43.5
+      parent: 2
+  - uid: 20067
+    components:
+    - type: Transform
+      pos: 55.5,-42.5
+      parent: 2
+  - uid: 20068
+    components:
+    - type: Transform
+      pos: 56.5,-41.5
+      parent: 2
 - proto: PuddleFluorosulfuricAcid
   entities:
+  - uid: 3169
+    components:
+    - type: Transform
+      pos: 42.5,-26.5
+      parent: 2
   - uid: 7934
     components:
     - type: Transform
       pos: -29.5,-47.5
       parent: 2
-  - uid: 9254
-    components:
-    - type: Transform
-      pos: 63.5,-50.5
-      parent: 2
-  - uid: 15443
-    components:
-    - type: Transform
-      pos: 64.5,-50.5
-      parent: 2
   - uid: 16103
     components:
     - type: Transform
       pos: -30.5,-39.5
       parent: 2
-  - uid: 16523
-    components:
-    - type: Transform
-      pos: 43.5,-25.5
-      parent: 2
   - uid: 17454
     components:
     - type: Transform
@@ -91404,35 +95016,35 @@ entities:
     - type: Transform
       pos: -29.5,-46.5
       parent: 2
-  - uid: 18819
+  - uid: 20060
     components:
     - type: Transform
-      pos: 63.5,-51.5
+      pos: 61.5,-42.5
       parent: 2
-  - uid: 18820
+  - uid: 20061
     components:
     - type: Transform
-      pos: 63.5,-49.5
+      pos: 62.5,-42.5
       parent: 2
-  - uid: 18821
+  - uid: 20062
     components:
     - type: Transform
-      pos: 64.5,-49.5
+      pos: 62.5,-43.5
       parent: 2
-  - uid: 18822
+  - uid: 20063
     components:
     - type: Transform
-      pos: 62.5,-50.5
+      pos: 60.5,-42.5
       parent: 2
-  - uid: 18934
+  - uid: 20064
     components:
     - type: Transform
-      pos: 65.5,-50.5
+      pos: 62.5,-41.5
       parent: 2
-  - uid: 18935
+  - uid: 20065
     components:
     - type: Transform
-      pos: 65.5,-49.5
+      pos: 61.5,-43.5
       parent: 2
 - proto: PuddleFluorosulfuricAcidSmall
   entities:
@@ -91496,13 +95108,18 @@ entities:
     - type: Transform
       pos: -29.5,-48.5
       parent: 2
-- proto: Rack
-  entities:
-  - uid: 893
+  - uid: 20066
     components:
     - type: Transform
-      pos: 68.5,-31.5
+      pos: 59.5,-42.5
       parent: 2
+  - uid: 20079
+    components:
+    - type: Transform
+      pos: 57.5,-42.5
+      parent: 2
+- proto: Rack
+  entities:
   - uid: 1160
     components:
     - type: Transform
@@ -91530,10 +95147,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 4.5,-22.5
       parent: 2
-  - uid: 4516
+  - uid: 3544
     components:
     - type: Transform
-      pos: 60.5,-57.5
+      rot: -1.5707963267948966 rad
+      pos: 60.5,-49.5
       parent: 2
   - uid: 4565
     components:
@@ -91566,16 +95184,28 @@ entities:
     - type: Transform
       pos: -19.5,-52.5
       parent: 2
+  - uid: 6089
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 62.5,-48.5
+      parent: 2
+  - uid: 6555
+    components:
+    - type: Transform
+      pos: 57.5,-62.5
+      parent: 2
   - uid: 6558
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -3.5,-77.5
       parent: 2
-  - uid: 6560
+  - uid: 6620
     components:
     - type: Transform
-      pos: 46.5,-47.5
+      rot: -1.5707963267948966 rad
+      pos: 68.5,-32.5
       parent: 2
   - uid: 6642
     components:
@@ -91587,6 +95217,12 @@ entities:
     - type: Transform
       pos: 31.5,-95.5
       parent: 2
+  - uid: 7282
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 69.5,-32.5
+      parent: 2
   - uid: 7675
     components:
     - type: Transform
@@ -91629,34 +95265,11 @@ entities:
     - type: Transform
       pos: 29.5,-60.5
       parent: 2
-  - uid: 8091
+  - uid: 8035
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 69.5,-69.5
-      parent: 2
-  - uid: 8092
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 70.5,-69.5
-      parent: 2
-  - uid: 8093
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 69.5,-67.5
-      parent: 2
-  - uid: 8094
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 72.5,-69.5
-      parent: 2
-  - uid: 8132
-    components:
-    - type: Transform
-      pos: 67.5,-31.5
+      pos: 55.5,-66.5
       parent: 2
   - uid: 8169
     components:
@@ -91673,12 +95286,6 @@ entities:
     - type: Transform
       pos: -41.5,-26.5
       parent: 2
-  - uid: 8225
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -54.5,-25.5
-      parent: 2
   - uid: 8337
     components:
     - type: Transform
@@ -91701,20 +95308,26 @@ entities:
     - type: Transform
       pos: 29.5,-78.5
       parent: 2
-  - uid: 8608
+  - uid: 8427
     components:
     - type: Transform
-      pos: 36.5,-33.5
+      pos: 69.5,-60.5
       parent: 2
-  - uid: 10242
+  - uid: 8429
     components:
     - type: Transform
-      pos: 65.5,-45.5
+      pos: 69.5,-59.5
       parent: 2
-  - uid: 10411
+  - uid: 8565
     components:
     - type: Transform
-      pos: 55.5,-46.5
+      pos: 72.5,-40.5
+      parent: 2
+  - uid: 9211
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 64.5,-50.5
       parent: 2
   - uid: 10657
     components:
@@ -91727,10 +95340,15 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 29.5,-61.5
       parent: 2
-  - uid: 13649
+  - uid: 13906
     components:
     - type: Transform
-      pos: 62.5,-56.5
+      pos: 57.5,-63.5
+      parent: 2
+  - uid: 13913
+    components:
+    - type: Transform
+      pos: 59.5,-62.5
       parent: 2
   - uid: 14065
     components:
@@ -91750,10 +95368,16 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 11.5,2.5
       parent: 2
-  - uid: 15488
+  - uid: 15418
     components:
     - type: Transform
-      pos: 60.5,-36.5
+      rot: -1.5707963267948966 rad
+      pos: 47.5,-44.5
+      parent: 2
+  - uid: 15450
+    components:
+    - type: Transform
+      pos: 67.5,-68.5
       parent: 2
   - uid: 15788
     components:
@@ -91761,6 +95385,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 46.5,-73.5
       parent: 2
+  - uid: 16033
+    components:
+    - type: Transform
+      pos: 58.5,-56.5
+      parent: 2
   - uid: 16105
     components:
     - type: Transform
@@ -91788,16 +95417,6 @@ entities:
     - type: Transform
       pos: 29.5,-33.5
       parent: 2
-  - uid: 16607
-    components:
-    - type: Transform
-      pos: 52.5,-30.5
-      parent: 2
-  - uid: 17120
-    components:
-    - type: Transform
-      pos: -36.5,-78.5
-      parent: 2
   - uid: 17135
     components:
     - type: Transform
@@ -91842,26 +95461,6 @@ entities:
     - type: Transform
       pos: 45.5,-73.5
       parent: 2
-  - uid: 17792
-    components:
-    - type: Transform
-      pos: 71.5,-59.5
-      parent: 2
-  - uid: 18261
-    components:
-    - type: Transform
-      pos: 45.5,-48.5
-      parent: 2
-  - uid: 19045
-    components:
-    - type: Transform
-      pos: 64.5,-70.5
-      parent: 2
-  - uid: 19046
-    components:
-    - type: Transform
-      pos: 64.5,-69.5
-      parent: 2
   - uid: 19255
     components:
     - type: Transform
@@ -91883,6 +95482,22 @@ entities:
       rot: 3.141592653589793 rad
       pos: 50.5,-94.5
       parent: 2
+  - uid: 19737
+    components:
+    - type: Transform
+      pos: 40.5,-32.5
+      parent: 2
+  - uid: 19965
+    components:
+    - type: Transform
+      pos: -51.5,-24.5
+      parent: 2
+  - uid: 20019
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 57.5,-59.5
+      parent: 2
 - proto: RadiationCollectorFullTank
   entities:
   - uid: 13281
@@ -91920,15 +95535,20 @@ entities:
   - uid: 6985
     components:
     - type: Transform
-      pos: 51.540493,-98.731224
+      pos: 52.349415,-98.694435
       parent: 2
   - uid: 6986
     components:
     - type: Transform
-      pos: 51.837368,-98.40287
+      pos: 52.675804,-98.45121
       parent: 2
 - proto: RagItem
   entities:
+  - uid: 9575
+    components:
+    - type: Transform
+      pos: 35.66513,-42.94736
+      parent: 2
   - uid: 17438
     components:
     - type: Transform
@@ -91959,6 +95579,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 0.5,-50.5
       parent: 2
+  - uid: 1976
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 88.5,-22.5
+      parent: 2
   - uid: 2447
     components:
     - type: Transform
@@ -91975,12 +95601,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,-46.5
       parent: 2
-  - uid: 3391
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 67.5,-55.5
-      parent: 2
   - uid: 5195
     components:
     - type: Transform
@@ -92020,6 +95640,24 @@ entities:
     - type: Transform
       pos: 56.5,-14.5
       parent: 2
+  - uid: 8111
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 87.5,-20.5
+      parent: 2
+  - uid: 8781
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 88.5,-21.5
+      parent: 2
+  - uid: 10817
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 59.5,-54.5
+      parent: 2
   - uid: 11466
     components:
     - type: Transform
@@ -92060,6 +95698,23 @@ entities:
       rot: 3.141592653589793 rad
       pos: 44.5,-18.5
       parent: 2
+  - uid: 15188
+    components:
+    - type: Transform
+      pos: 87.5,-70.5
+      parent: 2
+  - uid: 15189
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 88.5,-69.5
+      parent: 2
+  - uid: 15190
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 88.5,-68.5
+      parent: 2
   - uid: 16477
     components:
     - type: Transform
@@ -92126,12 +95781,23 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -42.5,-54.5
       parent: 2
+  - uid: 8110
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 88.5,-20.5
+      parent: 2
   - uid: 11760
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 53.5,-14.5
       parent: 2
+  - uid: 15187
+    components:
+    - type: Transform
+      pos: 88.5,-70.5
+      parent: 2
 - proto: RailingCornerSmall
   entities:
   - uid: 630
@@ -92164,22 +95830,17 @@ entities:
     - type: Transform
       pos: 10.5,-40.5
       parent: 2
-  - uid: 18376
+  - uid: 15270
     components:
     - type: Transform
-      pos: -38.5,-77.5
+      pos: -37.5,-78.5
       parent: 2
 - proto: RandomDrinkBottle
   entities:
-  - uid: 3389
+  - uid: 15435
     components:
     - type: Transform
-      pos: 75.5,-62.5
-      parent: 2
-  - uid: 8154
-    components:
-    - type: Transform
-      pos: 66.5,-69.5
+      pos: 80.5,-64.5
       parent: 2
 - proto: RandomDrinkGlass
   entities:
@@ -92210,25 +95871,18 @@ entities:
     - type: Transform
       pos: -8.5,-77.5
       parent: 2
-- proto: RandomFoodBakedSingle
-  entities:
-  - uid: 3388
-    components:
-    - type: Transform
-      pos: 71.5,-61.5
-      parent: 2
 - proto: RandomFoodMeal
   entities:
-  - uid: 5235
-    components:
-    - type: Transform
-      pos: 20.5,-19.5
-      parent: 2
   - uid: 6596
     components:
     - type: Transform
       pos: 21.5,-61.5
       parent: 2
+  - uid: 8797
+    components:
+    - type: Transform
+      pos: 21.5,-20.5
+      parent: 2
   - uid: 17376
     components:
     - type: Transform
@@ -92241,45 +95895,45 @@ entities:
     - type: Transform
       pos: -9.5,-75.5
       parent: 2
-  - uid: 4343
+  - uid: 8836
     components:
     - type: Transform
-      pos: 65.5,-59.5
+      pos: -43.5,-78.5
       parent: 2
-  - uid: 4344
+  - uid: 10818
     components:
     - type: Transform
-      pos: 65.5,-58.5
+      pos: 71.5,-70.5
       parent: 2
-  - uid: 9711
+  - uid: 14262
     components:
     - type: Transform
-      pos: 56.5,-68.5
+      pos: 76.5,-58.5
       parent: 2
-  - uid: 14792
+  - uid: 15269
     components:
     - type: Transform
-      pos: -35.5,-74.5
+      pos: -43.5,-77.5
       parent: 2
-  - uid: 17353
+  - uid: 15404
     components:
     - type: Transform
-      pos: 71.5,-71.5
+      pos: 75.5,-57.5
       parent: 2
-  - uid: 17727
+  - uid: 15471
     components:
     - type: Transform
-      pos: -42.5,-79.5
+      pos: 64.5,-58.5
       parent: 2
-  - uid: 17728
+  - uid: 15478
     components:
     - type: Transform
-      pos: -36.5,-80.5
+      pos: 66.5,-60.5
       parent: 2
-  - uid: 17729
+  - uid: 16606
     components:
     - type: Transform
-      pos: -43.5,-79.5
+      pos: 76.5,-57.5
       parent: 2
   - uid: 17730
     components:
@@ -92291,56 +95945,16 @@ entities:
     - type: Transform
       pos: 72.5,-59.5
       parent: 2
-  - uid: 17733
-    components:
-    - type: Transform
-      pos: 76.5,-58.5
-      parent: 2
-  - uid: 17778
-    components:
-    - type: Transform
-      pos: 66.5,-59.5
-      parent: 2
-  - uid: 17781
-    components:
-    - type: Transform
-      pos: 77.5,-58.5
-      parent: 2
-  - uid: 17782
-    components:
-    - type: Transform
-      pos: -36.5,-74.5
-      parent: 2
   - uid: 17784
     components:
     - type: Transform
       pos: -36.5,-73.5
       parent: 2
-  - uid: 17785
-    components:
-    - type: Transform
-      pos: -35.5,-75.5
-      parent: 2
-  - uid: 18262
-    components:
-    - type: Transform
-      pos: 45.5,-49.5
-      parent: 2
-  - uid: 18509
-    components:
-    - type: Transform
-      pos: 36.5,-32.5
-      parent: 2
   - uid: 18512
     components:
     - type: Transform
       pos: 35.5,-32.5
       parent: 2
-  - uid: 19210
-    components:
-    - type: Transform
-      pos: 66.5,-60.5
-      parent: 2
   - uid: 19362
     components:
     - type: Transform
@@ -92358,11 +95972,6 @@ entities:
       parent: 2
 - proto: RandomInstruments
   entities:
-  - uid: 2249
-    components:
-    - type: Transform
-      pos: 53.5,-47.5
-      parent: 2
   - uid: 6007
     components:
     - type: Transform
@@ -92385,8 +95994,40 @@ entities:
     - type: Transform
       pos: -41.5,-60.5
       parent: 2
+- proto: RandomPosterAny
+  entities:
+  - uid: 16030
+    components:
+    - type: Transform
+      pos: 72.5,-66.5
+      parent: 2
+  - uid: 19217
+    components:
+    - type: Transform
+      pos: 38.5,-33.5
+      parent: 2
 - proto: RandomPosterContraband
   entities:
+  - uid: 6908
+    components:
+    - type: Transform
+      pos: 55.5,-96.5
+      parent: 2
+  - uid: 6911
+    components:
+    - type: Transform
+      pos: 56.5,-97.5
+      parent: 2
+  - uid: 7724
+    components:
+    - type: Transform
+      pos: 56.5,-64.5
+      parent: 2
+  - uid: 12952
+    components:
+    - type: Transform
+      pos: 47.5,-28.5
+      parent: 2
   - uid: 15134
     components:
     - type: Transform
@@ -92402,35 +96043,15 @@ entities:
     - type: Transform
       pos: 32.5,-89.5
       parent: 2
-  - uid: 17227
-    components:
-    - type: Transform
-      pos: 54.5,-96.5
-      parent: 2
-  - uid: 17228
-    components:
-    - type: Transform
-      pos: 55.5,-97.5
-      parent: 2
   - uid: 17231
     components:
     - type: Transform
       pos: 48.5,-100.5
       parent: 2
-  - uid: 19215
-    components:
-    - type: Transform
-      pos: 54.5,-29.5
-      parent: 2
   - uid: 19216
     components:
     - type: Transform
-      pos: 41.5,-27.5
-      parent: 2
-  - uid: 19217
-    components:
-    - type: Transform
-      pos: 73.5,-67.5
+      pos: 42.5,-35.5
       parent: 2
   - uid: 19239
     components:
@@ -92454,6 +96075,16 @@ entities:
     - type: Transform
       pos: 48.5,-16.5
       parent: 2
+  - uid: 19192
+    components:
+    - type: Transform
+      pos: 45.5,-44.5
+      parent: 2
+  - uid: 19210
+    components:
+    - type: Transform
+      pos: 45.5,-45.5
+      parent: 2
   - uid: 19212
     components:
     - type: Transform
@@ -92469,6 +96100,11 @@ entities:
     - type: Transform
       pos: 17.5,-14.5
       parent: 2
+  - uid: 19215
+    components:
+    - type: Transform
+      pos: 34.5,-47.5
+      parent: 2
   - uid: 19622
     components:
     - type: Transform
@@ -92476,10 +96112,25 @@ entities:
       parent: 2
 - proto: RandomProduce
   entities:
-  - uid: 3426
+  - uid: 19740
     components:
     - type: Transform
-      pos: 52.5,-47.5
+      pos: 39.5,-33.5
+      parent: 2
+  - uid: 19741
+    components:
+    - type: Transform
+      pos: 41.5,-34.5
+      parent: 2
+  - uid: 19743
+    components:
+    - type: Transform
+      pos: 43.5,-33.5
+      parent: 2
+  - uid: 20049
+    components:
+    - type: Transform
+      pos: 41.5,-42.5
       parent: 2
 - proto: RandomSnacks
   entities:
@@ -92557,16 +96208,6 @@ entities:
     - type: Transform
       pos: -10.5,-19.5
       parent: 2
-  - uid: 17164
-    components:
-    - type: Transform
-      pos: 23.5,-15.5
-      parent: 2
-  - uid: 17169
-    components:
-    - type: Transform
-      pos: 80.5,-66.5
-      parent: 2
   - uid: 17171
     components:
     - type: Transform
@@ -92592,17 +96233,22 @@ entities:
     - type: Transform
       pos: -34.5,-30.5
       parent: 2
+  - uid: 19080
+    components:
+    - type: Transform
+      pos: 80.5,-67.5
+      parent: 2
 - proto: RandomSpawner100
   entities:
-  - uid: 1111
+  - uid: 3315
     components:
     - type: Transform
-      pos: 60.5,-68.5
+      pos: 75.5,-64.5
       parent: 2
-  - uid: 16862
+  - uid: 5181
     components:
     - type: Transform
-      pos: 59.5,-70.5
+      pos: 73.5,-65.5
       parent: 2
 - proto: RandomVending
   entities:
@@ -92678,16 +96324,16 @@ entities:
     - type: Transform
       pos: 28.5,-57.5
       parent: 2
+  - uid: 10802
+    components:
+    - type: Transform
+      pos: 48.5,-50.5
+      parent: 2
   - uid: 14365
     components:
     - type: Transform
       pos: 8.5,-37.5
       parent: 2
-  - uid: 17926
-    components:
-    - type: Transform
-      pos: 51.5,-49.5
-      parent: 2
 - proto: RandomVendingSnacks
   entities:
   - uid: 595
@@ -92700,20 +96346,15 @@ entities:
     - type: Transform
       pos: 10.5,-19.5
       parent: 2
-  - uid: 6217
+  - uid: 8663
     components:
     - type: Transform
-      pos: 6.5,-60.5
+      pos: 23.5,-19.5
       parent: 2
-  - uid: 7736
+  - uid: 10800
     components:
     - type: Transform
-      pos: 52.5,-49.5
-      parent: 2
-  - uid: 12882
-    components:
-    - type: Transform
-      pos: 35.5,-75.5
+      pos: 50.5,-43.5
       parent: 2
   - uid: 13576
     components:
@@ -92730,10 +96371,15 @@ entities:
     - type: Transform
       pos: -41.5,-67.5
       parent: 2
-  - uid: 15331
+  - uid: 16051
     components:
     - type: Transform
-      pos: 21.5,-16.5
+      pos: 42.5,-75.5
+      parent: 2
+  - uid: 16117
+    components:
+    - type: Transform
+      pos: 7.5,-61.5
       parent: 2
 - proto: RCD
   entities:
@@ -92749,8 +96395,18 @@ entities:
     - type: Transform
       pos: -29.274288,-59.874645
       parent: 2
+  - uid: 20051
+    components:
+    - type: Transform
+      pos: -52.72353,-51.759876
+      parent: 2
 - proto: ReagentContainerFlour
   entities:
+  - uid: 7031
+    components:
+    - type: Transform
+      pos: 40.70177,-32.37174
+      parent: 2
   - uid: 15274
     components:
     - type: Transform
@@ -92774,14 +96430,15 @@ entities:
       parent: 2
 - proto: Recycler
   entities:
-  - uid: 9314
+  - uid: 10332
     components:
     - type: Transform
-      pos: 62.5,-68.5
+      pos: 77.5,-64.5
       parent: 2
-  - uid: 14690
+  - uid: 11474
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 50.5,-96.5
       parent: 2
 - proto: ReinforcedGirder
@@ -92893,6 +96550,11 @@ entities:
     - type: Transform
       pos: -20.5,-30.5
       parent: 2
+  - uid: 3546
+    components:
+    - type: Transform
+      pos: 58.5,-46.5
+      parent: 2
   - uid: 3590
     components:
     - type: Transform
@@ -92913,6 +96575,11 @@ entities:
     - type: Transform
       pos: -22.5,-72.5
       parent: 2
+  - uid: 3950
+    components:
+    - type: Transform
+      pos: 61.5,-46.5
+      parent: 2
   - uid: 4422
     components:
     - type: Transform
@@ -93028,26 +96695,6 @@ entities:
     - type: Transform
       pos: 20.5,-40.5
       parent: 2
-  - uid: 7444
-    components:
-    - type: Transform
-      pos: 90.5,-44.5
-      parent: 2
-  - uid: 7445
-    components:
-    - type: Transform
-      pos: 89.5,-44.5
-      parent: 2
-  - uid: 7449
-    components:
-    - type: Transform
-      pos: 89.5,-46.5
-      parent: 2
-  - uid: 7450
-    components:
-    - type: Transform
-      pos: 90.5,-46.5
-      parent: 2
   - uid: 7660
     components:
     - type: Transform
@@ -93073,15 +96720,35 @@ entities:
     - type: Transform
       pos: -8.5,-41.5
       parent: 2
-  - uid: 8749
+  - uid: 10766
     components:
     - type: Transform
-      pos: 58.5,-54.5
+      rot: 1.5707963267948966 rad
+      pos: 92.5,-44.5
       parent: 2
-  - uid: 10801
+  - uid: 10792
     components:
     - type: Transform
-      pos: 61.5,-54.5
+      rot: 1.5707963267948966 rad
+      pos: 91.5,-44.5
+      parent: 2
+  - uid: 10798
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 60.5,-21.5
+      parent: 2
+  - uid: 10823
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 92.5,-46.5
+      parent: 2
+  - uid: 10826
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 91.5,-46.5
       parent: 2
   - uid: 11401
     components:
@@ -93826,6 +97493,11 @@ entities:
     - type: Transform
       pos: -29.5,-65.5
       parent: 2
+  - uid: 3030
+    components:
+    - type: Transform
+      pos: 60.5,-38.5
+      parent: 2
   - uid: 3071
     components:
     - type: Transform
@@ -93841,11 +97513,26 @@ entities:
     - type: Transform
       pos: -20.5,-69.5
       parent: 2
+  - uid: 3399
+    components:
+    - type: Transform
+      pos: 67.5,-38.5
+      parent: 2
   - uid: 3489
     components:
     - type: Transform
       pos: 10.5,-56.5
       parent: 2
+  - uid: 3520
+    components:
+    - type: Transform
+      pos: 57.5,-25.5
+      parent: 2
+  - uid: 3571
+    components:
+    - type: Transform
+      pos: 55.5,-40.5
+      parent: 2
   - uid: 3655
     components:
     - type: Transform
@@ -93876,6 +97563,11 @@ entities:
     - type: Transform
       pos: 59.5,-18.5
       parent: 2
+  - uid: 4876
+    components:
+    - type: Transform
+      pos: 59.5,-35.5
+      parent: 2
   - uid: 5144
     components:
     - type: Transform
@@ -93906,6 +97598,11 @@ entities:
     - type: Transform
       pos: 7.5,-13.5
       parent: 2
+  - uid: 5429
+    components:
+    - type: Transform
+      pos: 58.5,-25.5
+      parent: 2
   - uid: 6095
     components:
     - type: Transform
@@ -93931,21 +97628,6 @@ entities:
     - type: Transform
       pos: 50.5,-95.5
       parent: 2
-  - uid: 6906
-    components:
-    - type: Transform
-      pos: 56.5,-98.5
-      parent: 2
-  - uid: 6907
-    components:
-    - type: Transform
-      pos: 56.5,-99.5
-      parent: 2
-  - uid: 6908
-    components:
-    - type: Transform
-      pos: 56.5,-100.5
-      parent: 2
   - uid: 6951
     components:
     - type: Transform
@@ -93956,25 +97638,41 @@ entities:
     - type: Transform
       pos: 20.5,-100.5
       parent: 2
-  - uid: 7151
+  - uid: 7040
     components:
     - type: Transform
-      pos: 61.5,-45.5
+      rot: 1.5707963267948966 rad
+      pos: 60.5,-35.5
       parent: 2
-  - uid: 7278
+  - uid: 7154
     components:
     - type: Transform
-      pos: 65.5,-44.5
+      pos: 60.5,-39.5
+      parent: 2
+  - uid: 7160
+    components:
+    - type: Transform
+      pos: 59.5,-25.5
+      parent: 2
+  - uid: 7213
+    components:
+    - type: Transform
+      pos: 64.5,-49.5
+      parent: 2
+  - uid: 7230
+    components:
+    - type: Transform
+      pos: 66.5,-49.5
       parent: 2
   - uid: 7309
     components:
     - type: Transform
       pos: 61.5,-28.5
       parent: 2
-  - uid: 7731
+  - uid: 7748
     components:
     - type: Transform
-      pos: 66.5,-50.5
+      pos: 56.5,-35.5
       parent: 2
   - uid: 8080
     components:
@@ -93986,10 +97684,20 @@ entities:
     - type: Transform
       pos: 10.5,-58.5
       parent: 2
-  - uid: 8561
+  - uid: 9893
     components:
     - type: Transform
-      pos: 67.5,-44.5
+      pos: 63.5,-44.5
+      parent: 2
+  - uid: 9898
+    components:
+    - type: Transform
+      pos: 56.5,-40.5
+      parent: 2
+  - uid: 10276
+    components:
+    - type: Transform
+      pos: 67.5,-46.5
       parent: 2
   - uid: 10654
     components:
@@ -94066,16 +97774,6 @@ entities:
     - type: Transform
       pos: 22.5,-86.5
       parent: 2
-  - uid: 16866
-    components:
-    - type: Transform
-      pos: 61.5,-36.5
-      parent: 2
-  - uid: 17311
-    components:
-    - type: Transform
-      pos: 57.5,-47.5
-      parent: 2
   - uid: 17780
     components:
     - type: Transform
@@ -94086,11 +97784,6 @@ entities:
     - type: Transform
       pos: 23.5,-88.5
       parent: 2
-  - uid: 17964
-    components:
-    - type: Transform
-      pos: 61.5,-46.5
-      parent: 2
   - uid: 18402
     components:
     - type: Transform
@@ -94111,6 +97804,21 @@ entities:
     - type: Transform
       pos: -27.5,-60.5
       parent: 2
+  - uid: 19726
+    components:
+    - type: Transform
+      pos: 57.5,-98.5
+      parent: 2
+  - uid: 19727
+    components:
+    - type: Transform
+      pos: 57.5,-99.5
+      parent: 2
+  - uid: 19728
+    components:
+    - type: Transform
+      pos: 57.5,-100.5
+      parent: 2
 - proto: RemoteSignaller
   entities:
   - uid: 8033
@@ -94130,20 +97838,20 @@ entities:
     - type: MetaData
       name: main armory remote signaller
     - type: Transform
-      pos: 59.450016,-46.424244
+      pos: 58.468006,-39.404644
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        4377:
+        3324:
         - - Pressed
           - Toggle
-        13934:
+        3867:
         - - Pressed
           - Toggle
-        4366:
+        3548:
         - - Pressed
           - Toggle
-        4380:
+        4000:
         - - Pressed
           - Toggle
 - proto: ResearchAndDevelopmentServer
@@ -94160,13 +97868,6 @@ entities:
     - type: Transform
       pos: 52.36671,-18.851082
       parent: 2
-  - uid: 6032
-    components:
-    - type: Transform
-      parent: 2004
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
   - uid: 17385
     components:
     - type: Transform
@@ -94178,38 +97879,49 @@ entities:
   - uid: 13842
     components:
     - type: Transform
-      pos: 67.68784,-31.256433
+      pos: 68.51489,-32.324493
       parent: 2
+    - type: Blocking
+      blockingToggleActionEntity: 6618
+    - type: ActionsContainer
+    - type: ContainerContainer
+      containers:
+        actions: !type:Container
+          ents:
+          - 6618
   - uid: 13901
     components:
     - type: Transform
-      pos: 67.78969,-31.31666
+      pos: 68.75447,-32.376614
       parent: 2
+    - type: Blocking
+      blockingToggleActionEntity: 6619
+    - type: ActionsContainer
+    - type: ContainerContainer
+      containers:
+        actions: !type:Container
+          ents:
+          - 6619
 - proto: RobocopCircuitBoard
   entities:
   - uid: 18624
     components:
     - type: Transform
-      pos: 78.117035,-47.564194
+      pos: 79.709564,-47.292206
       parent: 2
 - proto: RollerBed
   entities:
-  - uid: 13158
+  - uid: 7120
     components:
     - type: Transform
-      pos: 27.5,-29.5
-      parent: 2
-  - uid: 18265
-    components:
-    - type: Transform
-      pos: 34.5,-23.5
+      pos: 27.50481,-30.322935
       parent: 2
 - proto: RollingPin
   entities:
   - uid: 7200
     components:
     - type: Transform
-      pos: 42.391666,-45.264618
+      pos: 42.132645,-45.052124
       parent: 2
 - proto: RubberStampApproved
   entities:
@@ -94251,12 +97963,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 85.5,-17.5
       parent: 2
-  - uid: 15359
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 87.5,-23.5
-      parent: 2
   - uid: 15360
     components:
     - type: Transform
@@ -94335,12 +98041,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 86.5,-66.5
       parent: 2
-  - uid: 15373
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 87.5,-67.5
-      parent: 2
   - uid: 15374
     components:
     - type: Transform
@@ -94364,28 +98064,21 @@ entities:
   - uid: 8226
     components:
     - type: Transform
-      pos: -54.462643,-25.38104
+      pos: -51.49735,-24.395369
       parent: 2
 - proto: SalvageMagnet
   entities:
-  - uid: 14028
+  - uid: 17227
     components:
     - type: Transform
-      pos: 51.5,-96.5
+      pos: 53.5,-101.5
       parent: 2
 - proto: SalvageMaterialCrateSpawner
   entities:
-  - uid: 6555
+  - uid: 7392
     components:
     - type: Transform
-      pos: 78.5,-31.5
-      parent: 2
-- proto: Saw
-  entities:
-  - uid: 17913
-    components:
-    - type: Transform
-      pos: 35.48436,-18.109962
+      pos: 80.5,-29.5
       parent: 2
 - proto: Scalpel
   entities:
@@ -94394,10 +98087,10 @@ entities:
     - type: Transform
       pos: 9.503026,-25.489
       parent: 2
-  - uid: 19231
+  - uid: 7728
     components:
     - type: Transform
-      pos: 40.823505,-30.393356
+      pos: 66.53385,-63.488316
       parent: 2
   - uid: 19301
     components:
@@ -94405,23 +98098,6 @@ entities:
       rot: -0.6108652381980153 rad
       pos: -3.5512772,-24.750254
       parent: 2
-- proto: SciFlash
-  entities:
-  - uid: 17886
-    components:
-    - type: Transform
-      parent: 17884
-    - type: LimitedCharges
-      maxCharges: 1
-    - type: Physics
-      canCollide: False
-  - uid: 17947
-    components:
-    - type: Transform
-      pos: 33.300842,-15.297032
-      parent: 2
-    - type: LimitedCharges
-      maxCharges: 1
 - proto: Screen
   entities:
   - uid: 4349
@@ -94481,11 +98157,6 @@ entities:
       parent: 2
 - proto: Screwdriver
   entities:
-  - uid: 17092
-    components:
-    - type: Transform
-      pos: 52.60426,-30.606783
-      parent: 2
   - uid: 17356
     components:
     - type: Transform
@@ -94509,10 +98180,10 @@ entities:
       parent: 2
 - proto: SecurityTechFab
   entities:
-  - uid: 4118
+  - uid: 3463
     components:
     - type: Transform
-      pos: 67.5,-34.5
+      pos: 67.5,-32.5
       parent: 2
     - type: TechnologyDatabase
       supportedDisciplines:
@@ -94522,10 +98193,10 @@ entities:
       - CivilianServices
 - proto: SecurityWhistle
   entities:
-  - uid: 12805
+  - uid: 7104
     components:
     - type: Transform
-      pos: 68.0032,-48.51887
+      pos: 67.39479,-53.358547
       parent: 2
 - proto: SeedExtractor
   entities:
@@ -94551,30 +98222,35 @@ entities:
   - uid: 15273
     components:
     - type: Transform
-      pos: -39.57368,-77.000206
+      pos: -39.33327,-77.43351
       parent: 2
   - uid: 17351
     components:
     - type: Transform
-      pos: -38.745556,-76.503426
+      pos: -40.67702,-78.631874
       parent: 2
 - proto: ShardGlass
   entities:
-  - uid: 6013
+  - uid: 3171
     components:
     - type: Transform
-      pos: 40.214127,-29.462494
+      pos: 66.3737,-62.429382
+      parent: 2
+  - uid: 3737
+    components:
+    - type: Transform
+      pos: 68.50926,-64.55413
+      parent: 2
+  - uid: 10853
+    components:
+    - type: Transform
+      pos: 66.41881,-64.87421
       parent: 2
   - uid: 17021
     components:
     - type: Transform
       pos: 4.3205686,-79.307
       parent: 2
-  - uid: 19233
-    components:
-    - type: Transform
-      pos: 41.609596,-30.40589
-      parent: 2
 - proto: ShardGlassReinforced
   entities:
   - uid: 7802
@@ -94602,15 +98278,31 @@ entities:
     - type: Transform
       pos: 1.5636982,-72.57246
       parent: 2
+  - uid: 15469
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 67.617294,-59.42534
+      parent: 2
+  - uid: 15508
+    components:
+    - type: Transform
+      pos: 69.83473,-56.407314
+      parent: 2
 - proto: SheetBrass
   entities:
   - uid: 8098
     components:
     - type: Transform
-      pos: 72.46222,-69.45354
+      pos: 57.65258,-62.37854
       parent: 2
 - proto: SheetGlass
   entities:
+  - uid: 5866
+    components:
+    - type: Transform
+      pos: -42.6255,-79.322044
+      parent: 2
   - uid: 6672
     components:
     - type: Transform
@@ -94629,18 +98321,20 @@ entities:
   - uid: 8100
     components:
     - type: Transform
-      pos: 72.60134,-69.3865
-      parent: 2
-  - uid: 9847
-    components:
-    - type: Transform
-      pos: 35.358883,-11.531487
+      pos: 57.418205,-62.48799
       parent: 2
   - uid: 16647
     components:
     - type: Transform
       pos: -12.36079,-23.400194
       parent: 2
+- proto: SheetGlass10
+  entities:
+  - uid: 19738
+    components:
+    - type: Transform
+      pos: 42.067513,-34.49177
+      parent: 2
 - proto: SheetPlasma
   entities:
   - uid: 3506
@@ -94668,6 +98362,11 @@ entities:
     - type: Transform
       pos: 8.602404,-83.32435
       parent: 2
+  - uid: 5418
+    components:
+    - type: Transform
+      pos: 68.51337,-20.394669
+      parent: 2
   - uid: 5971
     components:
     - type: Transform
@@ -94697,7 +98396,7 @@ entities:
   - uid: 18408
     components:
     - type: Transform
-      pos: 28.5,-13.5
+      pos: 29.539436,-13.332727
       parent: 2
 - proto: SheetPlastic
   entities:
@@ -94782,7 +98481,7 @@ entities:
   - uid: 8096
     components:
     - type: Transform
-      pos: 69.46705,-69.43699
+      pos: 59.330914,-62.53247
       parent: 2
   - uid: 13337
     components:
@@ -94794,18 +98493,8 @@ entities:
     - type: Transform
       pos: 45.696777,-73.20621
       parent: 2
-  - uid: 17911
-    components:
-    - type: Transform
-      pos: 34.612373,-11.35557
-      parent: 2
 - proto: SheetSteel10
   entities:
-  - uid: 3384
-    components:
-    - type: Transform
-      pos: 52.432384,-30.294283
-      parent: 2
   - uid: 3911
     components:
     - type: Transform
@@ -94914,17 +98603,17 @@ entities:
       parent: 2
 - proto: ShotGunCabinetFilled
   entities:
-  - uid: 16048
+  - uid: 3609
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 69.5,-31.5
+      pos: 70.5,-32.5
       parent: 2
-  - uid: 18044
+  - uid: 7311
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 69.5,-32.5
+      pos: 70.5,-33.5
       parent: 2
 - proto: ShuttersNormal
   entities:
@@ -94982,6 +98671,16 @@ entities:
     - type: Transform
       pos: 22.5,-88.5
       parent: 2
+  - uid: 5539
+    components:
+    - type: Transform
+      pos: 64.5,-49.5
+      parent: 2
+  - uid: 5666
+    components:
+    - type: Transform
+      pos: 66.5,-49.5
+      parent: 2
   - uid: 6208
     components:
     - type: Transform
@@ -95016,16 +98715,6 @@ entities:
     - type: Transform
       pos: 26.5,-87.5
       parent: 2
-  - uid: 7052
-    components:
-    - type: Transform
-      pos: 67.5,-44.5
-      parent: 2
-  - uid: 7267
-    components:
-    - type: Transform
-      pos: 65.5,-44.5
-      parent: 2
   - uid: 7717
     components:
     - type: Transform
@@ -95206,36 +98895,6 @@ entities:
       parent: 2
 - proto: ShuttersWindowOpen
   entities:
-  - uid: 7807
-    components:
-    - type: Transform
-      pos: 23.5,-24.5
-      parent: 2
-  - uid: 8048
-    components:
-    - type: Transform
-      pos: 24.5,-24.5
-      parent: 2
-  - uid: 8663
-    components:
-    - type: Transform
-      pos: 25.5,-24.5
-      parent: 2
-  - uid: 9066
-    components:
-    - type: Transform
-      pos: 25.5,-21.5
-      parent: 2
-  - uid: 9082
-    components:
-    - type: Transform
-      pos: 24.5,-21.5
-      parent: 2
-  - uid: 9196
-    components:
-    - type: Transform
-      pos: 23.5,-21.5
-      parent: 2
   - uid: 17740
     components:
     - type: Transform
@@ -95359,22 +99018,25 @@ entities:
       parent: 2
 - proto: SignAi
   entities:
-  - uid: 16193
+  - uid: 793
     components:
     - type: Transform
-      pos: 84.5,-40.5
+      rot: -1.5707963267948966 rad
+      pos: 86.5,-50.5
       parent: 2
-  - uid: 16194
+  - uid: 15199
     components:
     - type: Transform
-      pos: 84.5,-50.5
+      rot: -1.5707963267948966 rad
+      pos: 86.5,-40.5
       parent: 2
 - proto: SignAiUpload
   entities:
-  - uid: 13878
+  - uid: 7136
     components:
     - type: Transform
-      pos: 75.5,-46.5
+      rot: -1.5707963267948966 rad
+      pos: 77.5,-46.5
       parent: 2
 - proto: SignalButton
   entities:
@@ -95401,200 +99063,6 @@ entities:
           - Toggle
         - - Pressed
           - AutoClose
-  - uid: 4717
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 36.5,-27.5
-      parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        5296:
-        - - Pressed
-          - Forward
-        5297:
-        - - Pressed
-          - Forward
-        5298:
-        - - Pressed
-          - Forward
-        5299:
-        - - Pressed
-          - Forward
-        5300:
-        - - Pressed
-          - Forward
-        5301:
-        - - Pressed
-          - Forward
-        5302:
-        - - Pressed
-          - Forward
-        5344:
-        - - Pressed
-          - Forward
-        5350:
-        - - Pressed
-          - Forward
-        5351:
-        - - Pressed
-          - Forward
-        5306:
-        - - Pressed
-          - Forward
-        5307:
-        - - Pressed
-          - Forward
-        11695:
-        - - Pressed
-          - Forward
-        8637:
-        - - Pressed
-          - Forward
-        8566:
-        - - Pressed
-          - Forward
-        11694:
-        - - Pressed
-          - Forward
-        5358:
-        - - Pressed
-          - Forward
-        11693:
-        - - Pressed
-          - Forward
-        5359:
-        - - Pressed
-          - Forward
-        5360:
-        - - Pressed
-          - Forward
-        5310:
-        - - Pressed
-          - Forward
-        5311:
-        - - Pressed
-          - Forward
-        5312:
-        - - Pressed
-          - Forward
-        5313:
-        - - Pressed
-          - Forward
-        5314:
-        - - Pressed
-          - Forward
-        5315:
-        - - Pressed
-          - Forward
-        5338:
-        - - Pressed
-          - Forward
-        5339:
-        - - Pressed
-          - Forward
-        17406:
-        - - Pressed
-          - Forward
-        5316:
-        - - Pressed
-          - Forward
-        5317:
-        - - Pressed
-          - Forward
-        5361:
-        - - Pressed
-          - Forward
-        5362:
-        - - Pressed
-          - Forward
-        5363:
-        - - Pressed
-          - Forward
-        5318:
-        - - Pressed
-          - Forward
-        5319:
-        - - Pressed
-          - Forward
-        5335:
-        - - Pressed
-          - Forward
-        5336:
-        - - Pressed
-          - Forward
-        5337:
-        - - Pressed
-          - Forward
-        5320:
-        - - Pressed
-          - Forward
-        5321:
-        - - Pressed
-          - Forward
-        5364:
-        - - Pressed
-          - Forward
-        5365:
-        - - Pressed
-          - Forward
-        5366:
-        - - Pressed
-          - Forward
-        5322:
-        - - Pressed
-          - Forward
-        5323:
-        - - Pressed
-          - Forward
-        5324:
-        - - Pressed
-          - Forward
-        5325:
-        - - Pressed
-          - Forward
-        5326:
-        - - Pressed
-          - Forward
-        5327:
-        - - Pressed
-          - Forward
-        5328:
-        - - Pressed
-          - Forward
-        5329:
-        - - Pressed
-          - Forward
-        5330:
-        - - Pressed
-          - Forward
-        5332:
-        - - Pressed
-          - Forward
-        5331:
-        - - Pressed
-          - Forward
-        5333:
-        - - Pressed
-          - Forward
-        5334:
-        - - Pressed
-          - Forward
-        5370:
-        - - Pressed
-          - Forward
-        3816:
-        - - Pressed
-          - Forward
-        3792:
-        - - Pressed
-          - Forward
-        5342:
-        - - Pressed
-          - Forward
-        5341:
-        - - Pressed
-          - Forward
   - uid: 5999
     components:
     - type: Transform
@@ -95655,226 +99123,6 @@ entities:
         18451:
         - - Pressed
           - Toggle
-  - uid: 7319
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 36.5,-25.5
-      parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        5296:
-        - - Pressed
-          - Off
-        5297:
-        - - Pressed
-          - Off
-        5298:
-        - - Pressed
-          - Off
-        5299:
-        - - Pressed
-          - Off
-        5300:
-        - - Pressed
-          - Off
-        5301:
-        - - Pressed
-          - Off
-        5302:
-        - - Pressed
-          - Off
-        5344:
-        - - Pressed
-          - Off
-        5350:
-        - - Pressed
-          - Off
-        5351:
-        - - Pressed
-          - Off
-        5306:
-        - - Pressed
-          - Off
-        5307:
-        - - Pressed
-          - Off
-        11695:
-        - - Pressed
-          - Off
-        8637:
-        - - Pressed
-          - Off
-        8566:
-        - - Pressed
-          - Off
-        11694:
-        - - Pressed
-          - Off
-        11693:
-        - - Pressed
-          - Off
-        5358:
-        - - Pressed
-          - Off
-        5359:
-        - - Pressed
-          - Off
-        5360:
-        - - Pressed
-          - Off
-        5310:
-        - - Pressed
-          - Off
-        5311:
-        - - Pressed
-          - Off
-        5312:
-        - - Pressed
-          - Off
-        5313:
-        - - Pressed
-          - Off
-        5314:
-        - - Pressed
-          - Off
-        5315:
-        - - Pressed
-          - Off
-        5338:
-        - - Pressed
-          - Off
-        5339:
-        - - Pressed
-          - Off
-        17406:
-        - - Pressed
-          - Reverse
-        5316:
-        - - Pressed
-          - Off
-        5317:
-        - - Pressed
-          - Off
-        5361:
-        - - Pressed
-          - Off
-        5362:
-        - - Pressed
-          - Off
-        5363:
-        - - Pressed
-          - Off
-        5318:
-        - - Pressed
-          - Off
-        5319:
-        - - Pressed
-          - Off
-        5335:
-        - - Pressed
-          - Off
-        5336:
-        - - Pressed
-          - Off
-        5337:
-        - - Pressed
-          - Off
-        5320:
-        - - Pressed
-          - Off
-        5321:
-        - - Pressed
-          - Off
-        5364:
-        - - Pressed
-          - Off
-        5365:
-        - - Pressed
-          - Off
-        5366:
-        - - Pressed
-          - Off
-        5322:
-        - - Pressed
-          - Off
-        5323:
-        - - Pressed
-          - Off
-        5324:
-        - - Pressed
-          - Off
-        5325:
-        - - Pressed
-          - Off
-        5326:
-        - - Pressed
-          - Off
-        5327:
-        - - Pressed
-          - Off
-        5328:
-        - - Pressed
-          - Off
-        5329:
-        - - Pressed
-          - Off
-        5330:
-        - - Pressed
-          - Off
-        5332:
-        - - Pressed
-          - Off
-        5331:
-        - - Pressed
-          - Off
-        5333:
-        - - Pressed
-          - Off
-        5334:
-        - - Pressed
-          - Off
-        5370:
-        - - Pressed
-          - Off
-        3792:
-        - - Pressed
-          - Off
-        3816:
-        - - Pressed
-          - Off
-        5342:
-        - - Pressed
-          - Off
-        5341:
-        - - Pressed
-          - Off
-  - uid: 7810
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 27.5,-24.5
-      parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        9066:
-        - - Pressed
-          - Toggle
-        9082:
-        - - Pressed
-          - Toggle
-        9196:
-        - - Pressed
-          - Toggle
-        8663:
-        - - Pressed
-          - Toggle
-        8048:
-        - - Pressed
-          - Toggle
-        7807:
-        - - Pressed
-          - Toggle
   - uid: 8850
     components:
     - type: Transform
@@ -96334,46 +99582,20 @@ entities:
         4938:
         - - Pressed
           - Toggle
-  - uid: 19185
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 21.5,-24.5
-      parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        8048:
-        - - Pressed
-          - Toggle
-        7807:
-        - - Pressed
-          - Toggle
-        9066:
-        - - Pressed
-          - Toggle
-        9196:
-        - - Pressed
-          - Toggle
-        9082:
-        - - Pressed
-          - Toggle
-        8663:
-        - - Pressed
-          - Toggle
 - proto: SignalButtonDirectional
   entities:
-  - uid: 8558
+  - uid: 5437
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 66.5,-48.5
+      pos: 65.5,-53.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        7267:
+        5666:
         - - Pressed
           - Toggle
-        7052:
+        5539:
         - - Pressed
           - Toggle
   - uid: 10224
@@ -96457,24 +99679,182 @@ entities:
       linkedPorts:
         544:
         - - Pressed
-          - Toggle
+          - Open
         546:
         - - Pressed
-          - Toggle
-  - uid: 13198
+          - Open
+  - uid: 15700
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 32.5,-14.5
+      pos: 36.5,-27.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        625:
+        3725:
         - - Pressed
-          - Toggle
-        624:
+          - Forward
+        6388:
         - - Pressed
-          - Toggle
+          - 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
+      rot: -1.5707963267948966 rad
+      pos: 36.5,-29.5
+      parent: 2
+    - 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: 16241
     components:
     - type: Transform
@@ -96595,17 +99975,15 @@ entities:
       parent: 2
 - proto: SignArmory
   entities:
-  - uid: 9673
+  - uid: 208
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 57.5,-53.5
+      pos: 66.5,-35.5
       parent: 2
-  - uid: 11955
+  - uid: 8576
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 66.5,-34.5
+      pos: 57.5,-45.5
       parent: 2
 - proto: SignAtmos
   entities:
@@ -96614,6 +99992,16 @@ entities:
     - type: Transform
       pos: 26.5,-65.5
       parent: 2
+  - uid: 16106
+    components:
+    - type: Transform
+      pos: 36.5,-74.5
+      parent: 2
+  - uid: 16109
+    components:
+    - type: Transform
+      pos: 34.5,-75.5
+      parent: 2
   - uid: 16192
     components:
     - type: Transform
@@ -96633,18 +100021,6 @@ entities:
     - type: Transform
       pos: 4.5,-74.5
       parent: 2
-- proto: SignBiohazardMed
-  entities:
-  - uid: 18890
-    components:
-    - type: Transform
-      pos: 53.5,-27.5
-      parent: 2
-  - uid: 18891
-    components:
-    - type: Transform
-      pos: 54.5,-43.5
-      parent: 2
 - proto: SignBridge
   entities:
   - uid: 200
@@ -96723,6 +100099,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 16.5,-70.5
       parent: 2
+  - uid: 9406
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 21.5,-25.5
+      parent: 2
   - uid: 14139
     components:
     - type: Transform
@@ -96734,11 +100116,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 22.5,-75.5
       parent: 2
-  - uid: 18312
-    components:
-    - type: Transform
-      pos: 20.5,-25.5
-      parent: 2
   - uid: 19281
     components:
     - type: Transform
@@ -96766,6 +100143,44 @@ entities:
     - type: Transform
       pos: -3.5,-50.5
       parent: 2
+- proto: SignDangerMed
+  entities:
+  - uid: 17782
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,6.5
+      parent: 2
+  - uid: 18269
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,13.5
+      parent: 2
+  - uid: 18374
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,5.5
+      parent: 2
+  - uid: 18375
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,13.5
+      parent: 2
+  - uid: 18376
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,5.5
+      parent: 2
+  - uid: 18377
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,6.5
+      parent: 2
 - proto: SignDirectionalAtmos
   entities:
   - uid: 9434
@@ -96865,20 +100280,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 5.5013075,-33.288094
       parent: 2
-- proto: SignDirectionalBrig
-  entities:
-  - uid: 19645
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 61.5,-40.5
-      parent: 2
-  - uid: 19648
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 61.5,-31.5
-      parent: 2
 - proto: SignDirectionalChapel
   entities:
   - uid: 12824
@@ -96900,11 +100301,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,-58.5
       parent: 2
-  - uid: 14923
+  - uid: 9290
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 19.5,-26.5
+      pos: 20.5,-26.5
       parent: 2
   - uid: 16113
     components:
@@ -97030,6 +100431,12 @@ entities:
       parent: 2
 - proto: SignDirectionalEvac
   entities:
+  - uid: 516
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.501007,-25.282156
+      parent: 2
   - uid: 1830
     components:
     - type: Transform
@@ -97042,12 +100449,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 62.5,-22.5
       parent: 2
-  - uid: 4358
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 64.5,-54.5
-      parent: 2
   - uid: 5213
     components:
     - type: Transform
@@ -97065,70 +100466,30 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 44.49919,-51.71689
       parent: 2
-  - uid: 9284
-    components:
-    - type: Transform
-      pos: 37.5,-77.5
-      parent: 2
   - uid: 9298
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 52.5,-77.5
       parent: 2
-  - uid: 10303
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 43.5,-32.5
-      parent: 2
-  - uid: 10333
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 56.5,-53.5
-      parent: 2
-  - uid: 10646
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 21.5,-14.5
-      parent: 2
   - uid: 13204
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -1.5012168,-12.284781
       parent: 2
-  - uid: 13650
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 76.5,-59.5
-      parent: 2
   - uid: 14008
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -26.501286,-54.06827
       parent: 2
-  - uid: 14046
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 44.5,-34.5
-      parent: 2
   - uid: 15790
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -15.5,-35.5
       parent: 2
-  - uid: 15909
-    components:
-    - type: Transform
-      pos: 43.5,-24.5
-      parent: 2
   - uid: 15910
     components:
     - type: Transform
@@ -97147,12 +100508,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -30.5,-15.5
       parent: 2
-  - uid: 16155
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 37.5,-32.5
-      parent: 2
   - uid: 16162
     components:
     - type: Transform
@@ -97177,6 +100532,48 @@ entities:
       rot: 3.141592653589793 rad
       pos: 26.501543,-75.28514
       parent: 2
+  - uid: 16358
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 53.499287,-25.282099
+      parent: 2
+  - uid: 16365
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 23.5,-14.5
+      parent: 2
+  - uid: 16369
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.50031,-21.283514
+      parent: 2
+  - uid: 16372
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 28.5,-14.5
+      parent: 2
+  - uid: 16414
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-45.5
+      parent: 2
+  - uid: 16432
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-75.5
+      parent: 2
+  - uid: 16979
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.4993314,-15.717761
+      parent: 2
   - uid: 17221
     components:
     - type: Transform
@@ -97213,15 +100610,21 @@ entities:
       rot: 3.141592653589793 rad
       pos: 7.5,-69.5
       parent: 2
+  - uid: 18205
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,3.5
+      parent: 2
   - uid: 18210
     components:
     - type: Transform
       pos: -5.5,-4.5
       parent: 2
-  - uid: 18315
+  - uid: 18871
     components:
     - type: Transform
-      pos: 43.5,-27.5
+      pos: 36.5,-77.5
       parent: 2
   - uid: 19406
     components:
@@ -97251,12 +100654,6 @@ entities:
     - type: Transform
       pos: -5.5,-0.5
       parent: 2
-  - uid: 19642
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 57.5,-25.5
-      parent: 2
 - proto: SignDirectionalFood
   entities:
   - uid: 5177
@@ -97330,6 +100727,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 18.498922,-55.715004
       parent: 2
+  - uid: 19736
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 39.49834,-48.28038
+      parent: 2
 - proto: SignDirectionalJanitor
   entities:
   - uid: 16166
@@ -97396,10 +100799,10 @@ entities:
     - type: Transform
       pos: -1.4999341,-12.716049
       parent: 2
-  - uid: 17821
+  - uid: 16373
     components:
     - type: Transform
-      pos: 22.5,-27.5
+      pos: 23.5,-21.5
       parent: 2
   - uid: 17984
     components:
@@ -97479,6 +100882,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 44.5,-51.5
       parent: 2
+  - uid: 10762
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 28.5,-21.5
+      parent: 2
   - uid: 16122
     components:
     - type: Transform
@@ -97501,6 +100910,12 @@ entities:
     - type: Transform
       pos: -1.5,-15.5
       parent: 2
+  - uid: 16359
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 44.5,-25.5
+      parent: 2
   - uid: 17813
     components:
     - type: Transform
@@ -97521,12 +100936,6 @@ entities:
       parent: 2
 - proto: SignDirectionalSolar
   entities:
-  - uid: 6847
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 29.5,-32.5
-      parent: 2
   - uid: 6964
     components:
     - type: Transform
@@ -97562,6 +100971,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 39.5,-77.5
       parent: 2
+  - uid: 9876
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 44.501007,-25.714556
+      parent: 2
+  - uid: 10773
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 53.5,-25.5
+      parent: 2
   - uid: 14068
     components:
     - type: Transform
@@ -97592,17 +101013,29 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 68.5,-70.5
       parent: 2
-  - uid: 16118
+  - uid: 16370
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 37.5,-33.5
+      pos: 28.499249,-21.715097
       parent: 2
-  - uid: 16119
+  - uid: 16374
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 45.5,-30.5
+      pos: 86.5,-68.5
+      parent: 2
+  - uid: 16378
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 73.5,-70.5
+      parent: 2
+  - uid: 16420
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 62.5,-73.5
       parent: 2
   - uid: 17814
     components:
@@ -97626,11 +101059,17 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -36.50103,-63.718613
       parent: 2
-  - uid: 18503
+  - uid: 18869
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 27.5,-32.5
+      pos: 77.5,-22.5
+      parent: 2
+  - uid: 18870
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 38.5,-79.5
       parent: 2
   - uid: 18905
     components:
@@ -97643,12 +101082,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -30.500843,-58.713875
       parent: 2
-  - uid: 19643
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 45.5,-24.5
-      parent: 2
 - proto: SignDirectionalSupply
   entities:
   - uid: 16112
@@ -97656,11 +101089,6 @@ entities:
     - type: Transform
       pos: 22.498564,-59.717285
       parent: 2
-  - uid: 16126
-    components:
-    - type: Transform
-      pos: -1.500161,-15.716451
-      parent: 2
   - uid: 16135
     components:
     - type: Transform
@@ -97690,6 +101118,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -11.5,-41.5
       parent: 2
+  - uid: 18035
+    components:
+    - type: Transform
+      pos: -4.500692,-12.716591
+      parent: 2
   - uid: 18202
     components:
     - type: Transform
@@ -97702,11 +101135,11 @@ entities:
       parent: 2
 - proto: SignDisposalSpace
   entities:
-  - uid: 15409
+  - uid: 19775
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-76.5
+      rot: 1.5707963267948966 rad
+      pos: 71.5,-72.5
       parent: 2
 - proto: SignDoors
   entities:
@@ -97819,12 +101252,6 @@ entities:
     - type: Transform
       pos: 11.5,-70.5
       parent: 2
-  - uid: 19649
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 57.5,-30.5
-      parent: 2
 - proto: SignGravity
   entities:
   - uid: 16203
@@ -97849,9 +101276,10 @@ entities:
       parent: 2
 - proto: SignHydro1
   entities:
-  - uid: 17987
+  - uid: 14927
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 38.5,-47.5
       parent: 2
   - uid: 18313
@@ -97861,11 +101289,10 @@ entities:
       parent: 2
 - proto: SignInterrogation
   entities:
-  - uid: 6125
+  - uid: 7095
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 69.5,-40.5
+      pos: 50.5,-35.5
       parent: 2
 - proto: SignJanitor
   entities:
@@ -97927,6 +101354,12 @@ entities:
       parent: 2
 - proto: SignMedical
   entities:
+  - uid: 8046
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-24.5
+      parent: 2
   - uid: 17923
     components:
     - type: Transform
@@ -97944,23 +101377,15 @@ entities:
       parent: 2
 - proto: SignMorgue
   entities:
-  - uid: 924
+  - uid: 9303
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 21.5,-21.5
+      pos: 30.5,-25.5
       parent: 2
-  - uid: 7775
+  - uid: 14731
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 26.5,-21.5
-      parent: 2
-  - uid: 7776
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 29.5,-24.5
+      pos: 27.5,-25.5
       parent: 2
 - proto: SignNews
   entities:
@@ -97993,6 +101418,12 @@ entities:
       parent: 2
 - proto: SignRadiationMed
   entities:
+  - uid: 10796
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -12.5,-75.5
+      parent: 2
   - uid: 16756
     components:
     - type: Transform
@@ -98022,10 +101453,10 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -14.5,-72.5
       parent: 2
-  - uid: 19257
+  - uid: 19128
     components:
     - type: Transform
-      pos: -12.5,-74.5
+      pos: -10.5,-76.5
       parent: 2
   - uid: 19258
     components:
@@ -98065,6 +101496,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 46.5,-100.5
       parent: 2
+  - uid: 19731
+    components:
+    - type: Transform
+      pos: 53.5,-104.5
+      parent: 2
 - proto: SignScience
   entities:
   - uid: 6645
@@ -98086,24 +101522,22 @@ entities:
       rot: 3.141592653589793 rad
       pos: 74.5,-24.5
       parent: 2
+  - uid: 3783
+    components:
+    - type: Transform
+      pos: 77.5,-40.5
+      parent: 2
+  - uid: 7961
+    components:
+    - type: Transform
+      pos: 75.5,-40.5
+      parent: 2
   - uid: 10775
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 76.5,-24.5
       parent: 2
-  - uid: 13829
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 75.5,-42.5
-      parent: 2
-  - uid: 18027
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 73.5,-42.5
-      parent: 2
 - proto: SignSecureMed
   entities:
   - uid: 6707
@@ -98117,6 +101551,18 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 16.5,-90.5
       parent: 2
+  - uid: 15694
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 39.5,-27.5
+      parent: 2
+  - uid: 15696
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 45.5,-28.5
+      parent: 2
   - uid: 18910
     components:
     - type: Transform
@@ -98155,17 +101601,15 @@ entities:
       parent: 2
 - proto: SignSecureSmall
   entities:
-  - uid: 11698
+  - uid: 3559
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 52.5,-22.5
+      pos: 53.5,-22.5
       parent: 2
-  - uid: 11700
+  - uid: 7151
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 50.5,-22.5
+      pos: 51.5,-22.5
       parent: 2
   - uid: 11713
     components:
@@ -98225,17 +101669,23 @@ entities:
       parent: 2
 - proto: SignSecurity
   entities:
-  - uid: 4875
+  - uid: 3616
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 61.5,-47.5
+      rot: 1.5707963267948966 rad
+      pos: 60.5,-40.5
       parent: 2
-  - uid: 5015
+  - uid: 3620
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-40.5
+      parent: 2
+  - uid: 15670
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 56.5,-47.5
+      pos: 74.5,-45.5
       parent: 2
   - uid: 18041
     components:
@@ -98349,11 +101799,17 @@ entities:
       parent: 2
 - proto: SignVirology
   entities:
-  - uid: 7774
+  - uid: 7615
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 26.5,-18.5
+      pos: 32.5,-21.5
+      parent: 2
+  - uid: 8787
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 28.5,-17.5
       parent: 2
 - proto: SingularityGenerator
   entities:
@@ -98370,29 +101826,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -7.5,-49.5
       parent: 2
-  - uid: 7053
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 39.5,-41.5
-      parent: 2
-  - uid: 7054
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 44.5,-42.5
-      parent: 2
   - uid: 7092
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 37.5,-50.5
       parent: 2
-  - uid: 8036
-    components:
-    - type: Transform
-      pos: 42.5,-40.5
-      parent: 2
   - uid: 17428
     components:
     - type: Transform
@@ -98404,12 +101843,6 @@ entities:
     - type: Transform
       pos: 20.5,-70.5
       parent: 2
-  - uid: 17883
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 33.5,-18.5
-      parent: 2
 - proto: SinkWide
   entities:
   - uid: 1875
@@ -98417,12 +101850,24 @@ entities:
     - type: Transform
       pos: -9.5,-15.5
       parent: 2
+  - uid: 4717
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-42.5
+      parent: 2
   - uid: 5357
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 45.5,-15.5
       parent: 2
+  - uid: 8160
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,-43.5
+      parent: 2
   - uid: 14036
     components:
     - type: Transform
@@ -98435,6 +101880,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: 12.5,-25.5
       parent: 2
+- proto: Skub
+  entities:
+  - uid: 16871
+    components:
+    - type: Transform
+      pos: -61.753063,-25.19519
+      parent: 2
 - proto: SmartFridge
   entities:
   - uid: 13948
@@ -98442,6 +101894,11 @@ entities:
     - type: Transform
       pos: 20.5,-27.5
       parent: 2
+  - uid: 16115
+    components:
+    - type: Transform
+      pos: 42.5,-47.5
+      parent: 2
 - proto: SMESAdvanced
   entities:
   - uid: 3092
@@ -98481,16 +101938,16 @@ entities:
       parent: 2
 - proto: SMESBasic
   entities:
+  - uid: 4344
+    components:
+    - type: Transform
+      pos: 89.5,-45.5
+      parent: 2
   - uid: 5552
     components:
     - type: Transform
       pos: -33.5,-46.5
       parent: 2
-  - uid: 11843
-    components:
-    - type: Transform
-      pos: 87.5,-45.5
-      parent: 2
   - uid: 13845
     components:
     - type: Transform
@@ -98520,6 +101977,11 @@ entities:
       parent: 2
 - proto: SodaDispenser
   entities:
+  - uid: 3742
+    components:
+    - type: Transform
+      pos: 61.5,-67.5
+      parent: 2
   - uid: 5004
     components:
     - type: Transform
@@ -98532,12 +101994,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 38.5,-45.5
       parent: 2
-  - uid: 8084
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 69.5,-61.5
-      parent: 2
 - proto: SolarControlComputerCircuitboard
   entities:
   - uid: 18308
@@ -98547,215 +102003,210 @@ entities:
       parent: 2
 - proto: SolarPanel
   entities:
-  - uid: 7425
-    components:
-    - type: Transform
-      pos: 98.5,-55.5
-      parent: 2
-  - uid: 7511
-    components:
-    - type: Transform
-      pos: 98.5,-33.5
-      parent: 2
-  - uid: 7512
-    components:
-    - type: Transform
-      pos: 98.5,-34.5
-      parent: 2
-  - uid: 7513
-    components:
-    - type: Transform
-      pos: 98.5,-35.5
-      parent: 2
-  - uid: 7514
-    components:
-    - type: Transform
-      pos: 99.5,-36.5
-      parent: 2
-  - uid: 7515
-    components:
-    - type: Transform
-      pos: 99.5,-37.5
-      parent: 2
-  - uid: 7516
-    components:
-    - type: Transform
-      pos: 99.5,-38.5
-      parent: 2
-  - uid: 7517
-    components:
-    - type: Transform
-      pos: 99.5,-39.5
-      parent: 2
-  - uid: 7518
-    components:
-    - type: Transform
-      pos: 96.5,-34.5
-      parent: 2
-  - uid: 7519
-    components:
-    - type: Transform
-      pos: 100.5,-41.5
-      parent: 2
-  - uid: 7520
-    components:
-    - type: Transform
-      pos: 100.5,-42.5
-      parent: 2
-  - uid: 7521
-    components:
-    - type: Transform
-      pos: 100.5,-43.5
-      parent: 2
-  - uid: 7522
-    components:
-    - type: Transform
-      pos: 100.5,-44.5
-      parent: 2
-  - uid: 7523
-    components:
-    - type: Transform
-      pos: 100.5,-45.5
-      parent: 2
-  - uid: 7524
-    components:
-    - type: Transform
-      pos: 100.5,-46.5
-      parent: 2
-  - uid: 7525
-    components:
-    - type: Transform
-      pos: 100.5,-47.5
-      parent: 2
-  - uid: 7526
-    components:
-    - type: Transform
-      pos: 100.5,-48.5
-      parent: 2
-  - uid: 7527
-    components:
-    - type: Transform
-      pos: 100.5,-49.5
-      parent: 2
-  - uid: 7529
-    components:
-    - type: Transform
-      pos: 99.5,-51.5
-      parent: 2
-  - uid: 7530
-    components:
-    - type: Transform
-      pos: 99.5,-52.5
-      parent: 2
-  - uid: 7531
+  - uid: 5334
     components:
     - type: Transform
       pos: 99.5,-53.5
       parent: 2
-  - uid: 7532
+  - uid: 5335
     components:
     - type: Transform
-      pos: 99.5,-54.5
+      pos: 99.5,-51.5
       parent: 2
-  - uid: 7533
+  - uid: 5336
+    components:
+    - type: Transform
+      pos: 99.5,-39.5
+      parent: 2
+  - uid: 5337
+    components:
+    - type: Transform
+      pos: 99.5,-52.5
+      parent: 2
+  - uid: 5338
+    components:
+    - type: Transform
+      pos: 99.5,-40.5
+      parent: 2
+  - uid: 5339
+    components:
+    - type: Transform
+      pos: 99.5,-38.5
+      parent: 2
+  - uid: 5341
+    components:
+    - type: Transform
+      pos: 98.5,-35.5
+      parent: 2
+  - uid: 5342
     components:
     - type: Transform
       pos: 98.5,-56.5
       parent: 2
-  - uid: 7534
+  - uid: 5344
     components:
     - type: Transform
-      pos: 98.5,-57.5
+      pos: 100.5,-42.5
       parent: 2
-  - uid: 7538
+  - uid: 5346
     components:
     - type: Transform
-      pos: 96.5,-35.5
+      pos: 100.5,-45.5
       parent: 2
-  - uid: 7539
+  - uid: 5351
     components:
     - type: Transform
-      pos: 97.5,-37.5
+      pos: 98.5,-34.5
       parent: 2
-  - uid: 7540
+  - uid: 5360
     components:
     - type: Transform
-      pos: 97.5,-38.5
+      pos: 99.5,-50.5
       parent: 2
-  - uid: 7541
+  - uid: 5361
     components:
     - type: Transform
-      pos: 97.5,-39.5
+      pos: 100.5,-47.5
       parent: 2
-  - uid: 7542
+  - uid: 5362
     components:
     - type: Transform
-      pos: 97.5,-40.5
+      pos: 100.5,-46.5
       parent: 2
-  - uid: 7543
+  - uid: 5363
     components:
     - type: Transform
-      pos: 98.5,-42.5
+      pos: 100.5,-48.5
       parent: 2
-  - uid: 7544
+  - uid: 5364
     components:
     - type: Transform
-      pos: 98.5,-43.5
+      pos: 98.5,-55.5
       parent: 2
-  - uid: 7545
+  - uid: 5365
     components:
     - type: Transform
-      pos: 98.5,-44.5
+      pos: 100.5,-43.5
+      parent: 2
+  - uid: 5366
+    components:
+    - type: Transform
+      pos: 100.5,-44.5
+      parent: 2
+  - uid: 6629
+    components:
+    - type: Transform
+      pos: 99.5,-37.5
+      parent: 2
+  - uid: 7430
+    components:
+    - type: Transform
+      pos: 100.5,-35.5
+      parent: 2
+  - uid: 7513
+    components:
+    - type: Transform
+      pos: 100.5,-34.5
+      parent: 2
+  - uid: 7514
+    components:
+    - type: Transform
+      pos: 100.5,-33.5
+      parent: 2
+  - uid: 7515
+    components:
+    - type: Transform
+      pos: 102.5,-45.5
+      parent: 2
+  - uid: 7516
+    components:
+    - type: Transform
+      pos: 102.5,-44.5
+      parent: 2
+  - uid: 7517
+    components:
+    - type: Transform
+      pos: 101.5,-39.5
+      parent: 2
+  - uid: 7518
+    components:
+    - type: Transform
+      pos: 102.5,-42.5
+      parent: 2
+  - uid: 7519
+    components:
+    - type: Transform
+      pos: 102.5,-41.5
+      parent: 2
+  - uid: 7520
+    components:
+    - type: Transform
+      pos: 101.5,-38.5
+      parent: 2
+  - uid: 7521
+    components:
+    - type: Transform
+      pos: 101.5,-37.5
+      parent: 2
+  - uid: 7522
+    components:
+    - type: Transform
+      pos: 101.5,-52.5
+      parent: 2
+  - uid: 7523
+    components:
+    - type: Transform
+      pos: 101.5,-51.5
+      parent: 2
+  - uid: 7524
+    components:
+    - type: Transform
+      pos: 100.5,-57.5
+      parent: 2
+  - uid: 7525
+    components:
+    - type: Transform
+      pos: 100.5,-56.5
       parent: 2
   - uid: 7546
     components:
     - type: Transform
-      pos: 98.5,-45.5
-      parent: 2
-  - uid: 7547
-    components:
-    - type: Transform
-      pos: 98.5,-46.5
+      pos: 102.5,-49.5
       parent: 2
   - uid: 7548
     components:
     - type: Transform
-      pos: 98.5,-47.5
+      pos: 100.5,-55.5
       parent: 2
   - uid: 7549
     components:
     - type: Transform
-      pos: 98.5,-48.5
-      parent: 2
-  - uid: 7550
-    components:
-    - type: Transform
-      pos: 97.5,-50.5
-      parent: 2
-  - uid: 7551
-    components:
-    - type: Transform
-      pos: 97.5,-51.5
+      pos: 101.5,-54.5
       parent: 2
   - uid: 7552
     components:
     - type: Transform
-      pos: 97.5,-52.5
+      pos: 101.5,-53.5
       parent: 2
   - uid: 7553
     components:
     - type: Transform
-      pos: 97.5,-53.5
+      pos: 102.5,-48.5
       parent: 2
-  - uid: 7555
+  - uid: 7554
     components:
     - type: Transform
-      pos: 96.5,-56.5
+      pos: 101.5,-36.5
       parent: 2
-  - uid: 7556
+  - uid: 7560
     components:
     - type: Transform
-      pos: 96.5,-55.5
+      pos: 102.5,-47.5
+      parent: 2
+  - uid: 7561
+    components:
+    - type: Transform
+      pos: 102.5,-46.5
       parent: 2
   - uid: 8233
     components:
@@ -98937,6 +102388,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -56.5,-18.5
       parent: 2
+  - uid: 9384
+    components:
+    - type: Transform
+      pos: 102.5,-43.5
+      parent: 2
 - proto: SpaceCash10
   entities:
   - uid: 6742
@@ -99041,10 +102497,10 @@ entities:
       parent: 2
 - proto: SpawnMobMcGriff
   entities:
-  - uid: 19038
+  - uid: 7122
     components:
     - type: Transform
-      pos: 57.5,-44.5
+      pos: 54.5,-38.5
       parent: 2
 - proto: SpawnMobMedibot
   entities:
@@ -99105,10 +102561,10 @@ entities:
       parent: 2
 - proto: SpawnMobShiva
   entities:
-  - uid: 3033
+  - uid: 1803
     components:
     - type: Transform
-      pos: 69.5,-48.5
+      pos: 69.5,-53.5
       parent: 2
 - proto: SpawnMobSmile
   entities:
@@ -99126,10 +102582,10 @@ entities:
       parent: 2
 - proto: SpawnMobXenoLonePraetorian
   entities:
-  - uid: 17410
+  - uid: 20082
     components:
     - type: Transform
-      pos: 75.5,-30.5
+      pos: 76.5,-35.5
       parent: 2
 - proto: SpawnPointAtmos
   entities:
@@ -99282,10 +102738,10 @@ entities:
       parent: 2
 - proto: SpawnPointDetective
   entities:
-  - uid: 19062
+  - uid: 18029
     components:
     - type: Transform
-      pos: 70.5,-50.5
+      pos: 71.5,-46.5
       parent: 2
 - proto: SpawnPointHeadOfPersonnel
   entities:
@@ -99296,10 +102752,10 @@ entities:
       parent: 2
 - proto: SpawnPointHeadOfSecurity
   entities:
-  - uid: 13986
+  - uid: 5474
     components:
     - type: Transform
-      pos: 71.5,-47.5
+      pos: 70.5,-53.5
       parent: 2
 - proto: SpawnPointJanitor
   entities:
@@ -99320,15 +102776,25 @@ entities:
       parent: 2
 - proto: SpawnPointLawyer
   entities:
-  - uid: 19064
+  - uid: 3459
     components:
     - type: Transform
-      pos: 54.5,-57.5
+      pos: 54.5,-55.5
       parent: 2
-  - uid: 19065
+  - uid: 18037
     components:
     - type: Transform
-      pos: 53.5,-57.5
+      pos: 54.5,-56.5
+      parent: 2
+  - uid: 18038
+    components:
+    - type: Transform
+      pos: 52.5,-56.5
+      parent: 2
+  - uid: 18044
+    components:
+    - type: Transform
+      pos: 52.5,-55.5
       parent: 2
 - proto: SpawnPointLibrarian
   entities:
@@ -99361,20 +102827,20 @@ entities:
       parent: 2
 - proto: SpawnPointMedicalIntern
   entities:
-  - uid: 474
+  - uid: 7278
     components:
     - type: Transform
-      pos: 21.5,-20.5
+      pos: 22.5,-19.5
       parent: 2
-  - uid: 9901
+  - uid: 8764
     components:
     - type: Transform
       pos: 20.5,-20.5
       parent: 2
-  - uid: 14874
+  - uid: 8861
     components:
     - type: Transform
-      pos: 21.5,-18.5
+      pos: 22.5,-20.5
       parent: 2
 - proto: SpawnPointMime
   entities:
@@ -99510,47 +102976,47 @@ entities:
       parent: 2
 - proto: SpawnPointSecurityCadet
   entities:
-  - uid: 19059
+  - uid: 908
     components:
     - type: Transform
-      pos: 58.5,-36.5
+      pos: 71.5,-39.5
       parent: 2
-  - uid: 19060
+  - uid: 4628
     components:
     - type: Transform
-      pos: 58.5,-37.5
+      pos: 69.5,-39.5
       parent: 2
-  - uid: 19061
+  - uid: 5142
     components:
     - type: Transform
-      pos: 58.5,-38.5
+      pos: 70.5,-39.5
       parent: 2
 - proto: SpawnPointSecurityOfficer
   entities:
-  - uid: 19039
+  - uid: 599
     components:
     - type: Transform
-      pos: 60.5,-31.5
+      pos: 50.5,-32.5
       parent: 2
-  - uid: 19057
+  - uid: 625
     components:
     - type: Transform
-      pos: 63.5,-39.5
+      pos: 59.5,-27.5
       parent: 2
-  - uid: 19058
+  - uid: 862
     components:
     - type: Transform
-      pos: 59.5,-35.5
+      pos: 64.5,-43.5
       parent: 2
-  - uid: 19063
+  - uid: 3578
     components:
     - type: Transform
-      pos: 58.5,-35.5
+      pos: 50.5,-33.5
       parent: 2
-  - uid: 19067
+  - uid: 4428
     components:
     - type: Transform
-      pos: 65.5,-35.5
+      pos: 58.5,-27.5
       parent: 2
 - proto: SpawnPointServiceWorker
   entities:
@@ -99615,10 +103081,10 @@ entities:
       parent: 2
 - proto: SpawnPointWarden
   entities:
-  - uid: 19037
+  - uid: 7098
     components:
     - type: Transform
-      pos: 57.5,-43.5
+      pos: 54.5,-37.5
       parent: 2
 - proto: SpawnVendingMachineRestockFoodDrink
   entities:
@@ -99642,14 +103108,14 @@ entities:
   - uid: 7337
     components:
     - type: Transform
-      pos: 80.55358,-27.356148
+      pos: 78.48892,-25.591612
       parent: 2
 - proto: SpeedLoaderMagnum
   entities:
-  - uid: 17851
+  - uid: 10259
     components:
     - type: Transform
-      pos: 67.51773,-52.43789
+      pos: 68.498024,-48.389458
       parent: 2
 - proto: SprayBottle
   entities:
@@ -99674,10 +103140,15 @@ entities:
             Quantity: 50
 - proto: SprayBottleSpaceCleaner
   entities:
-  - uid: 7182
+  - uid: 6971
     components:
     - type: Transform
-      pos: 58.312195,-71.26866
+      pos: -37.288506,-76.45576
+      parent: 2
+  - uid: 11866
+    components:
+    - type: Transform
+      pos: 72.36833,-67.33941
       parent: 2
   - uid: 17417
     components:
@@ -99860,12 +103331,6 @@ entities:
       parent: 2
 - proto: StairStageDark
   entities:
-  - uid: 2962
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -41.5,-75.5
-      parent: 2
   - uid: 17041
     components:
     - type: Transform
@@ -99878,6 +103343,23 @@ entities:
       rot: 3.141592653589793 rad
       pos: -7.5,-79.5
       parent: 2
+  - uid: 17118
+    components:
+    - type: Transform
+      pos: -40.5,-78.5
+      parent: 2
+  - uid: 17347
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -41.5,-77.5
+      parent: 2
+  - uid: 17352
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -39.5,-77.5
+      parent: 2
   - uid: 17667
     components:
     - type: Transform
@@ -99890,17 +103372,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -46.5,-13.5
       parent: 2
-  - uid: 18374
-    components:
-    - type: Transform
-      pos: -41.5,-77.5
-      parent: 2
-  - uid: 18375
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -40.5,-76.5
-      parent: 2
 - proto: StasisBed
   entities:
   - uid: 5223
@@ -99922,16 +103393,16 @@ entities:
       parent: 2
 - proto: StationAiUploadComputer
   entities:
-  - uid: 10839
-    components:
-    - type: Transform
-      pos: 79.5,-43.5
-      parent: 2
-  - uid: 17659
+  - uid: 7413
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 79.5,-47.5
+      pos: 81.5,-47.5
+      parent: 2
+  - uid: 7536
+    components:
+    - type: Transform
+      pos: 81.5,-43.5
       parent: 2
 - proto: StationAnchor
   entities:
@@ -99945,14 +103416,14 @@ entities:
   - uid: 17336
     components:
     - type: Transform
-      pos: 70.44866,-69.44586
+      pos: 57.362057,-63.55035
       parent: 2
 - proto: StationEfficiencyCircuitBoard
   entities:
   - uid: 18625
     components:
     - type: Transform
-      pos: 77.398285,-47.303596
+      pos: 78.51944,-47.473473
       parent: 2
 - proto: StationMap
   entities:
@@ -99967,10 +103438,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 16.5,-86.5
       parent: 2
-  - uid: 6628
+  - uid: 6270
     components:
     - type: Transform
-      pos: 53.5,-48.5
+      rot: 1.5707963267948966 rad
+      pos: 24.5,-19.5
       parent: 2
   - uid: 6959
     components:
@@ -99984,6 +103456,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 16.5,-92.5
       parent: 2
+  - uid: 7096
+    components:
+    - type: Transform
+      pos: 52.5,-22.5
+      parent: 2
   - uid: 13197
     components:
     - type: Transform
@@ -100006,11 +103483,6 @@ entities:
     - type: Transform
       pos: 4.5,-4.5
       parent: 2
-  - uid: 14823
-    components:
-    - type: Transform
-      pos: 51.5,-22.5
-      parent: 2
   - uid: 14827
     components:
     - type: Transform
@@ -100040,11 +103512,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 7.5,-70.5
       parent: 2
-  - uid: 18205
+  - uid: 18834
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 22.5,-32.5
+      pos: 22.5,-31.5
       parent: 2
 - proto: SteelBench
   entities:
@@ -100096,11 +103568,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -20.5,-41.5
       parent: 2
-  - uid: 13721
+  - uid: 7781
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 49.5,-15.5
+      rot: 1.5707963267948966 rad
+      pos: 21.5,-17.5
       parent: 2
   - uid: 14342
     components:
@@ -100148,6 +103620,12 @@ entities:
       parent: 2
 - proto: StoolBar
   entities:
+  - uid: 2951
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 60.5,-71.5
+      parent: 2
   - uid: 7057
     components:
     - type: Transform
@@ -100166,23 +103644,17 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 34.5,-44.5
       parent: 2
-  - uid: 8085
+  - uid: 8166
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 73.5,-63.5
+      rot: 3.141592653589793 rad
+      pos: 61.5,-71.5
       parent: 2
-  - uid: 8086
+  - uid: 10310
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 73.5,-62.5
-      parent: 2
-  - uid: 8087
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 73.5,-61.5
+      rot: 3.141592653589793 rad
+      pos: 59.5,-71.5
       parent: 2
 - proto: StorageCanister
   entities:
@@ -100228,15 +103700,15 @@ entities:
       parent: 2
 - proto: Stunbaton
   entities:
-  - uid: 15394
+  - uid: 16289
     components:
     - type: Transform
-      pos: 60.24117,-36.438633
+      pos: 72.24739,-40.467445
       parent: 2
-  - uid: 15404
+  - uid: 16290
     components:
     - type: Transform
-      pos: 60.393944,-36.61005
+      pos: 72.37239,-40.623806
       parent: 2
   - uid: 19378
     components:
@@ -100254,12 +103726,12 @@ entities:
     - type: Transform
       pos: -62.5,-65.5
       parent: 2
-  - uid: 3066
+  - uid: 3128
     components:
     - type: MetaData
-      name: Security substation
+      name: Bar & Kitchen substation
     - type: Transform
-      pos: 70.5,-38.5
+      pos: 46.5,-40.5
       parent: 2
   - uid: 4317
     components:
@@ -100303,6 +103775,13 @@ entities:
     - type: Transform
       pos: 4.5,-63.5
       parent: 2
+  - uid: 6617
+    components:
+    - type: MetaData
+      name: Security substation
+    - type: Transform
+      pos: 50.5,-28.5
+      parent: 2
   - uid: 6929
     components:
     - type: MetaData
@@ -100310,20 +103789,6 @@ entities:
     - type: Transform
       pos: 33.5,-95.5
       parent: 2
-  - uid: 7238
-    components:
-    - type: MetaData
-      name: Bar & Kitchen substation
-    - type: Transform
-      pos: 48.5,-37.5
-      parent: 2
-  - uid: 7422
-    components:
-    - type: MetaData
-      name: AI Core substation
-    - type: Transform
-      pos: 93.5,-45.5
-      parent: 2
   - uid: 8174
     components:
     - type: MetaData
@@ -100338,6 +103803,13 @@ entities:
     - type: Transform
       pos: -54.5,-23.5
       parent: 2
+  - uid: 10835
+    components:
+    - type: MetaData
+      name: AI Core substation
+    - type: Transform
+      pos: 95.5,-45.5
+      parent: 2
   - uid: 15019
     components:
     - type: MetaData
@@ -100523,10 +103995,10 @@ entities:
       parent: 2
 - proto: SuitStorageHOS
   entities:
-  - uid: 13801
+  - uid: 3446
     components:
     - type: Transform
-      pos: 70.5,-45.5
+      pos: 70.5,-51.5
       parent: 2
 - proto: SuitStorageRD
   entities:
@@ -100554,38 +104026,25 @@ entities:
       parent: 2
 - proto: SuitStorageSec
   entities:
-  - uid: 271
+  - uid: 1226
     components:
     - type: Transform
-      pos: 60.5,-59.5
+      pos: 60.5,-51.5
       parent: 2
-  - uid: 3325
+  - uid: 2219
     components:
     - type: Transform
-      pos: 61.5,-59.5
+      pos: 61.5,-51.5
       parent: 2
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14673
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-  - uid: 7223
+  - uid: 7157
     components:
     - type: Transform
-      pos: 69.5,-33.5
+      pos: 69.5,-36.5
+      parent: 2
+  - uid: 7226
+    components:
+    - type: Transform
+      pos: 59.5,-51.5
       parent: 2
   - uid: 7227
     components:
@@ -100597,42 +104056,26 @@ entities:
     - type: Transform
       pos: 69.5,-35.5
       parent: 2
-  - uid: 13857
-    components:
-    - type: Transform
-      pos: 59.5,-59.5
-      parent: 2
 - proto: SuitStorageWarden
   entities:
-  - uid: 7273
+  - uid: 5413
     components:
     - type: Transform
-      pos: 57.5,-41.5
+      pos: 55.5,-39.5
       parent: 2
 - proto: SurveillanceCameraCommand
   entities:
-  - uid: 7240
+  - uid: 7593
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 87.5,-46.5
+      pos: 89.5,-46.5
       parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraCommand
       nameSet: True
-      id: AI Core, Pathway
-  - uid: 7438
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 92.5,-53.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraCommand
-      nameSet: True
-      id: AI Core Outside, South
+      id: AI Core, Consoles
   - uid: 8044
     components:
     - type: Transform
@@ -100644,28 +104087,17 @@ entities:
       - SurveillanceCameraCommand
       nameSet: True
       id: Bridge, Telecomms
-  - uid: 16311
+  - uid: 10828
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 76.5,-46.5
+      rot: 1.5707963267948966 rad
+      pos: 94.5,-44.5
       parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraCommand
       nameSet: True
-      id: AI Upload
-  - uid: 16344
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 74.5,-45.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraCommand
-      nameSet: True
-      id: AI Upload Entrance
+      id: AI Core, Core
   - uid: 17595
     components:
     - type: Transform
@@ -100753,17 +104185,6 @@ entities:
       - SurveillanceCameraCommand
       nameSet: True
       id: Bridge, Front
-  - uid: 17661
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 92.5,-44.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraCommand
-      nameSet: True
-      id: AI Core, Core
   - uid: 17676
     components:
     - type: Transform
@@ -100775,6 +104196,17 @@ entities:
       - SurveillanceCameraCommand
       nameSet: True
       id: Nuke Containment
+  - uid: 18385
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 84.5,-49.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: AI Core, South Entrance
   - uid: 18558
     components:
     - type: Transform
@@ -100786,48 +104218,59 @@ entities:
       - SurveillanceCameraCommand
       nameSet: True
       id: Bridge, Northwest
-  - uid: 18723
+  - uid: 18872
+    components:
+    - type: Transform
+      pos: 84.5,-41.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: AI Core, North Entrance
+  - uid: 18873
+    components:
+    - type: Transform
+      pos: 94.5,-37.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: AI Core, North Outside
+  - uid: 18874
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 82.5,-49.5
+      pos: 94.5,-53.5
       parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraCommand
       nameSet: True
-      id: AI Core Entrance, South
-  - uid: 18724
-    components:
-    - type: Transform
-      pos: 82.5,-41.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraCommand
-      nameSet: True
-      id: AI Core Entrance, North
-  - uid: 18725
+      id: AI Core, South Outside
+  - uid: 18875
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 97.5,-45.5
+      pos: 99.5,-45.5
       parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraCommand
       nameSet: True
-      id: AI Core Outside, East
-  - uid: 18726
+      id: AI Core, East Outside
+  - uid: 18884
     components:
     - type: Transform
-      pos: 92.5,-37.5
+      rot: 1.5707963267948966 rad
+      pos: 76.5,-44.5
       parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraCommand
       nameSet: True
-      id: AI Core Outside, North
+      id: AI Upload Entrance
   - uid: 19040
     components:
     - type: Transform
@@ -100852,17 +104295,6 @@ entities:
       - SurveillanceCameraEngineering
       nameSet: True
       id: Singularity Chamber, North
-  - uid: 12792
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 54.5,-70.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraEngineering
-      nameSet: True
-      id: Atmos Hall, Southeast
   - uid: 12793
     components:
     - type: Transform
@@ -101066,17 +104498,6 @@ entities:
       - SurveillanceCameraEngineering
       nameSet: True
       id: Singularity Chamber, South
-  - uid: 19607
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 53.5,-65.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraEngineering
-      nameSet: True
-      id: Burn Chamber Entrance
   - uid: 19609
     components:
     - type: Transform
@@ -101111,17 +104532,16 @@ entities:
       - SurveillanceCameraGeneral
       nameSet: True
       id: Arrivals, Medical
-  - uid: 15173
+  - uid: 10778
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 23.5,-28.5
+      pos: 36.5,-24.5
       parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraGeneral
       nameSet: True
-      id: Morgue Hallway
+      id: Medical/Genpop Hallway
   - uid: 16546
     components:
     - type: Transform
@@ -101186,17 +104606,6 @@ entities:
       - SurveillanceCameraGeneral
       nameSet: True
       id: Roundabout, Southwest
-  - uid: 17646
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 25.5,-18.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraGeneral
-      nameSet: True
-      id: Virology Hallway
   - uid: 17647
     components:
     - type: Transform
@@ -101304,7 +104713,7 @@ entities:
       setupAvailableNetworks:
       - SurveillanceCameraGeneral
       nameSet: True
-      id: Security Hallway
+      id: Lawyer Hallway
   - uid: 18555
     components:
     - type: Transform
@@ -101392,16 +104801,6 @@ entities:
       - SurveillanceCameraGeneral
       nameSet: True
       id: Library Hallway
-  - uid: 18731
-    components:
-    - type: Transform
-      pos: 21.5,-13.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraGeneral
-      nameSet: True
-      id: Visitor Shuttle Dock
   - uid: 18741
     components:
     - type: Transform
@@ -101466,6 +104865,39 @@ entities:
       - SurveillanceCameraGeneral
       nameSet: True
       id: Engineering Hallway
+  - uid: 19218
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 50.5,-44.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Security Hallway
+  - uid: 19243
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 25.5,-18.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Medical/Virology Hallway
+  - uid: 19244
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 26.5,-11.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Visitor Docks
   - uid: 19608
     components:
     - type: Transform
@@ -101477,6 +104909,17 @@ entities:
       - SurveillanceCameraGeneral
       nameSet: True
       id: HoP Hallway
+  - uid: 19842
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 23.5,-27.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Medical/Morgue Hallway
 - proto: SurveillanceCameraMedical
   entities:
   - uid: 17592
@@ -101532,27 +104975,6 @@ entities:
       - SurveillanceCameraMedical
       nameSet: True
       id: CMO's Office
-  - uid: 17643
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 31.5,-16.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraMedical
-      nameSet: True
-      id: Virology Workspace
-  - uid: 17644
-    components:
-    - type: Transform
-      pos: 29.5,-23.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraMedical
-      nameSet: True
-      id: Virology Waiting Room
   - uid: 18539
     components:
     - type: Transform
@@ -101574,16 +104996,38 @@ entities:
       - SurveillanceCameraMedical
       nameSet: True
       id: Medical Outpost
-  - uid: 19022
+  - uid: 18908
     components:
     - type: Transform
-      pos: 31.5,-29.5
+      rot: 3.141592653589793 rad
+      pos: 31.5,-26.5
       parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraMedical
       nameSet: True
       id: Morgue
+  - uid: 19245
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 33.5,-17.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraMedical
+      nameSet: True
+      id: Virology Waiting Room
+  - uid: 19246
+    components:
+    - type: Transform
+      pos: 34.5,-15.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraMedical
+      nameSet: True
+      id: Virology Work Area
   - uid: 19606
     components:
     - type: Transform
@@ -101611,10 +105055,10 @@ entities:
       parent: 2
 - proto: SurveillanceCameraRouterGeneral
   entities:
-  - uid: 18007
+  - uid: 7539
     components:
     - type: Transform
-      pos: 83.5,-43.5
+      pos: 85.5,-43.5
       parent: 2
 - proto: SurveillanceCameraRouterMedical
   entities:
@@ -101632,10 +105076,10 @@ entities:
       parent: 2
 - proto: SurveillanceCameraRouterSecurity
   entities:
-  - uid: 3087
+  - uid: 7782
     components:
     - type: Transform
-      pos: 68.5,-37.5
+      pos: 52.5,-28.5
       parent: 2
 - proto: SurveillanceCameraRouterService
   entities:
@@ -101719,49 +105163,6 @@ entities:
       - SurveillanceCameraSecurity
       nameSet: True
       id: Security Outpost
-  - uid: 7212
-    components:
-    - type: Transform
-      pos: 68.5,-35.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraSecurity
-      nameSet: True
-      id: Mini-Armory
-  - uid: 11940
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 63.5,-48.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraSecurity
-      nameSet: True
-      id: Security Entrance
-  - uid: 13856
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 57.5,-44.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraSecurity
-      nameSet: True
-      id: Warden's Office
-  - uid: 14568
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 72.5,-41.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraSecurity
-      nameSet: True
-      id: Interrogation Room
   - uid: 14573
     components:
     - type: Transform
@@ -101773,17 +105174,6 @@ entities:
       - SurveillanceCameraSecurity
       nameSet: True
       id: Genpop, Exit
-  - uid: 14574
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 62.5,-27.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraSecurity
-      nameSet: True
-      id: Genpop, Lockers
   - uid: 14806
     components:
     - type: Transform
@@ -101817,28 +105207,6 @@ entities:
       - SurveillanceCameraSecurity
       nameSet: True
       id: Genpop, Containment Area
-  - uid: 15451
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 65.5,-47.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraSecurity
-      nameSet: True
-      id: HoS' Office
-  - uid: 15455
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 65.5,-36.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraSecurity
-      nameSet: True
-      id: Security Hall
   - uid: 15456
     components:
     - type: Transform
@@ -101850,62 +105218,126 @@ entities:
       - SurveillanceCameraSecurity
       nameSet: True
       id: Genpop Crossing
-  - uid: 15457
+  - uid: 19223
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 62.5,-55.5
+      pos: 59.5,-37.5
       parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraSecurity
       nameSet: True
-      id: Main Armory
-  - uid: 15459
+      id: Warden's Office
+  - uid: 19224
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 57.5,-37.5
+      pos: 58.5,-48.5
       parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraSecurity
       nameSet: True
-      id: Locker Room
-  - uid: 16285
+      id: Armory
+  - uid: 19225
     components:
     - type: Transform
-      pos: 60.5,-32.5
+      pos: 65.5,-52.5
       parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraSecurity
       nameSet: True
-      id: Brigmed
-  - uid: 18293
+      id: HoS's Office
+  - uid: 19226
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 72.5,-50.5
+      pos: 73.5,-46.5
       parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraSecurity
       nameSet: True
       id: Detective's Office
-- proto: SurveillanceCameraService
-  entities:
-  - uid: 7213
+  - uid: 19227
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 54.5,-54.5
+      pos: 67.5,-43.5
       parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
-      - SurveillanceCameraService
+      - SurveillanceCameraSecurity
       nameSet: True
-      id: Lawyer's Office
+      id: South Front Desk
+  - uid: 19228
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 72.5,-40.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Locker Room
+  - uid: 19229
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 69.5,-33.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Mini-Armory
+  - uid: 19230
+    components:
+    - type: Transform
+      pos: 53.5,-34.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Brigmed
+  - uid: 19231
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 52.5,-36.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Interrogation
+  - uid: 19232
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 64.5,-27.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: Genpop Locker Room
+  - uid: 19233
+    components:
+    - type: Transform
+      pos: 60.5,-29.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraSecurity
+      nameSet: True
+      id: North Front Desk
+- proto: SurveillanceCameraService
+  entities:
   - uid: 15171
     components:
     - type: Transform
@@ -101917,17 +105349,6 @@ entities:
       - SurveillanceCameraService
       nameSet: True
       id: Bartender Backroom
-  - uid: 15172
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 46.5,-42.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraService
-      nameSet: True
-      id: Freezer
   - uid: 17596
     components:
     - type: Transform
@@ -101959,17 +105380,6 @@ entities:
       - SurveillanceCameraService
       nameSet: True
       id: Chapel
-  - uid: 17641
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 44.5,-44.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraService
-      nameSet: True
-      id: Kitchen
   - uid: 17642
     components:
     - type: Transform
@@ -102003,6 +105413,38 @@ entities:
       - SurveillanceCameraService
       nameSet: True
       id: Library
+  - uid: 18887
+    components:
+    - type: Transform
+      pos: 54.5,-57.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Lawyer's Office
+  - uid: 18888
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 44.5,-43.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Kitchen
+  - uid: 18890
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 73.5,-61.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraService
+      nameSet: True
+      id: Disposals
   - uid: 19042
     components:
     - type: Transform
@@ -102202,20 +105644,30 @@ entities:
       parent: 2
 - proto: Syringe
   entities:
+  - uid: 4253
+    components:
+    - type: Transform
+      pos: 36.476048,-11.482354
+      parent: 2
+  - uid: 4425
+    components:
+    - type: Transform
+      pos: 36.507298,-11.763604
+      parent: 2
   - uid: 5220
     components:
     - type: Transform
-      pos: 19.309967,-24.307837
+      pos: 20.240992,-24.33725
       parent: 2
-  - uid: 15226
+  - uid: 8078
     components:
     - type: Transform
-      pos: 42.491875,-29.366682
+      pos: 68.53264,-65.37312
       parent: 2
   - uid: 15487
     components:
     - type: Transform
-      pos: 60.567352,-32.410225
+      pos: 50.556988,-34.384045
       parent: 2
   - uid: 17704
     components:
@@ -102244,20 +105696,20 @@ entities:
     - type: Transform
       pos: 21.5,-19.5
       parent: 2
-  - uid: 599
-    components:
-    - type: Transform
-      pos: 20.5,-19.5
-      parent: 2
   - uid: 1152
     components:
     - type: Transform
       pos: -14.5,-61.5
       parent: 2
-  - uid: 1681
+  - uid: 1169
     components:
     - type: Transform
-      pos: 57.5,-28.5
+      pos: 29.5,-12.5
+      parent: 2
+  - uid: 1446
+    components:
+    - type: Transform
+      pos: 29.5,-13.5
       parent: 2
   - uid: 1802
     components:
@@ -102265,6 +105717,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -3.5,-19.5
       parent: 2
+  - uid: 2294
+    components:
+    - type: Transform
+      pos: 69.5,-41.5
+      parent: 2
   - uid: 2533
     components:
     - type: Transform
@@ -102285,11 +105742,22 @@ entities:
     - type: Transform
       pos: -21.5,-64.5
       parent: 2
+  - uid: 3519
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 53.5,-54.5
+      parent: 2
   - uid: 3534
     components:
     - type: Transform
       pos: 35.5,-45.5
       parent: 2
+  - uid: 3602
+    components:
+    - type: Transform
+      pos: 53.5,-55.5
+      parent: 2
   - uid: 3895
     components:
     - type: Transform
@@ -102310,6 +105778,16 @@ entities:
     - type: Transform
       pos: 23.5,-85.5
       parent: 2
+  - uid: 4615
+    components:
+    - type: Transform
+      pos: 21.5,-20.5
+      parent: 2
+  - uid: 4616
+    components:
+    - type: Transform
+      pos: 30.5,-16.5
+      parent: 2
   - uid: 4855
     components:
     - type: Transform
@@ -102435,6 +105913,11 @@ entities:
     - type: Transform
       pos: -3.5,-47.5
       parent: 2
+  - uid: 5216
+    components:
+    - type: Transform
+      pos: 20.5,-24.5
+      parent: 2
   - uid: 5218
     components:
     - type: Transform
@@ -102480,15 +105963,10 @@ entities:
     - type: Transform
       pos: 48.5,-15.5
       parent: 2
-  - uid: 5421
+  - uid: 5416
     components:
     - type: Transform
-      pos: 28.5,-17.5
-      parent: 2
-  - uid: 5422
-    components:
-    - type: Transform
-      pos: 30.5,-17.5
+      pos: 68.5,-20.5
       parent: 2
   - uid: 5636
     components:
@@ -102545,6 +106023,18 @@ entities:
     - type: Transform
       pos: 21.5,-61.5
       parent: 2
+  - uid: 6861
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 53.5,-99.5
+      parent: 2
+  - uid: 6862
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 53.5,-98.5
+      parent: 2
   - uid: 6895
     components:
     - type: Transform
@@ -102555,16 +106045,6 @@ entities:
     - type: Transform
       pos: 52.5,-98.5
       parent: 2
-  - uid: 6915
-    components:
-    - type: Transform
-      pos: 51.5,-99.5
-      parent: 2
-  - uid: 6922
-    components:
-    - type: Transform
-      pos: 51.5,-98.5
-      parent: 2
   - uid: 6991
     components:
     - type: Transform
@@ -102625,11 +106105,6 @@ entities:
     - type: Transform
       pos: 27.5,-45.5
       parent: 2
-  - uid: 7215
-    components:
-    - type: Transform
-      pos: 62.5,-40.5
-      parent: 2
   - uid: 7280
     components:
     - type: Transform
@@ -102640,6 +106115,16 @@ entities:
     - type: Transform
       pos: -24.5,-14.5
       parent: 2
+  - uid: 7308
+    components:
+    - type: Transform
+      pos: 65.5,-31.5
+      parent: 2
+  - uid: 7586
+    components:
+    - type: Transform
+      pos: 64.5,-46.5
+      parent: 2
   - uid: 7663
     components:
     - type: Transform
@@ -102655,15 +106140,17 @@ entities:
     - type: Transform
       pos: 77.5,-21.5
       parent: 2
-  - uid: 7741
+  - uid: 7739
     components:
     - type: Transform
-      pos: 65.5,-34.5
+      rot: -1.5707963267948966 rad
+      pos: 33.5,-20.5
       parent: 2
-  - uid: 7777
+  - uid: 7779
     components:
     - type: Transform
-      pos: 28.5,-12.5
+      rot: -1.5707963267948966 rad
+      pos: 66.5,-29.5
       parent: 2
   - uid: 7879
     components:
@@ -102686,40 +106173,25 @@ entities:
     - type: Transform
       pos: -3.5,-22.5
       parent: 2
-  - uid: 8574
+  - uid: 9289
     components:
     - type: Transform
-      pos: 49.5,-25.5
+      pos: 65.5,-32.5
       parent: 2
-  - uid: 8682
+  - uid: 9333
     components:
     - type: Transform
-      pos: 27.5,-13.5
+      pos: 64.5,-45.5
       parent: 2
-  - uid: 10249
+  - uid: 9363
     components:
     - type: Transform
-      pos: 60.5,-32.5
+      pos: 32.5,-16.5
       parent: 2
-  - uid: 10409
+  - uid: 9459
     components:
     - type: Transform
-      pos: 49.5,-56.5
-      parent: 2
-  - uid: 10748
-    components:
-    - type: Transform
-      pos: 57.5,-32.5
-      parent: 2
-  - uid: 10784
-    components:
-    - type: Transform
-      pos: 55.5,-56.5
-      parent: 2
-  - uid: 10818
-    components:
-    - type: Transform
-      pos: 54.5,-56.5
+      pos: 20.5,-17.5
       parent: 2
   - uid: 11772
     components:
@@ -102741,26 +106213,11 @@ entities:
     - type: Transform
       pos: -0.5,-57.5
       parent: 2
-  - uid: 13830
-    components:
-    - type: Transform
-      pos: 62.5,-32.5
-      parent: 2
   - uid: 13860
     components:
     - type: Transform
       pos: 67.5,-35.5
       parent: 2
-  - uid: 13902
-    components:
-    - type: Transform
-      pos: 62.5,-31.5
-      parent: 2
-  - uid: 14295
-    components:
-    - type: Transform
-      pos: 60.5,-39.5
-      parent: 2
   - uid: 14624
     components:
     - type: Transform
@@ -102771,21 +106228,6 @@ entities:
     - type: Transform
       pos: 16.5,-15.5
       parent: 2
-  - uid: 14922
-    components:
-    - type: Transform
-      pos: 19.5,-24.5
-      parent: 2
-  - uid: 14925
-    components:
-    - type: Transform
-      pos: 17.5,-17.5
-      parent: 2
-  - uid: 15104
-    components:
-    - type: Transform
-      pos: 49.5,-49.5
-      parent: 2
   - uid: 15128
     components:
     - type: Transform
@@ -102836,16 +106278,6 @@ entities:
     - type: Transform
       pos: 1.5,-62.5
       parent: 2
-  - uid: 17909
-    components:
-    - type: Transform
-      pos: 34.5,-11.5
-      parent: 2
-  - uid: 17910
-    components:
-    - type: Transform
-      pos: 35.5,-11.5
-      parent: 2
   - uid: 17931
     components:
     - type: Transform
@@ -102871,11 +106303,6 @@ entities:
     - type: Transform
       pos: -21.5,-66.5
       parent: 2
-  - uid: 18272
-    components:
-    - type: Transform
-      pos: 66.5,-17.5
-      parent: 2
   - uid: 18318
     components:
     - type: Transform
@@ -102888,18 +106315,6 @@ entities:
       parent: 2
 - proto: TableCarpet
   entities:
-  - uid: 4876
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 69.5,-53.5
-      parent: 2
-  - uid: 6165
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 69.5,-50.5
-      parent: 2
   - uid: 6722
     components:
     - type: Transform
@@ -102945,11 +106360,26 @@ entities:
     - type: Transform
       pos: 13.5,-96.5
       parent: 2
-  - uid: 7984
+  - uid: 7236
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 69.5,-51.5
+      pos: 71.5,-47.5
+      parent: 2
+  - uid: 7970
+    components:
+    - type: Transform
+      pos: 68.5,-48.5
+      parent: 2
+  - uid: 8575
+    components:
+    - type: Transform
+      pos: 70.5,-46.5
+      parent: 2
+  - uid: 9295
+    components:
+    - type: Transform
+      pos: 70.5,-47.5
       parent: 2
   - uid: 14294
     components:
@@ -102961,18 +106391,6 @@ entities:
     - type: Transform
       pos: 27.5,-38.5
       parent: 2
-  - uid: 17734
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 70.5,-51.5
-      parent: 2
-  - uid: 17798
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 67.5,-52.5
-      parent: 2
 - proto: TableCounterMetal
   entities:
   - uid: 1433
@@ -103064,64 +106482,58 @@ entities:
       parent: 2
 - proto: TableFrame
   entities:
-  - uid: 7330
+  - uid: 3145
     components:
     - type: Transform
-      pos: 80.5,-29.5
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-67.5
       parent: 2
-  - uid: 8074
+  - uid: 3146
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 59.5,-70.5
+      parent: 2
+  - uid: 3164
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-70.5
+      parent: 2
+  - uid: 5312
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 60.5,-70.5
+      parent: 2
+  - uid: 5313
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 58.5,-69.5
+      parent: 2
+  - uid: 5329
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 60.5,-67.5
+      parent: 2
+  - uid: 7389
+    components:
+    - type: Transform
+      pos: 59.5,-76.5
+      parent: 2
+  - uid: 7722
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 58.5,-70.5
+      parent: 2
+  - uid: 10313
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 72.5,-64.5
-      parent: 2
-  - uid: 8075
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 72.5,-63.5
-      parent: 2
-  - uid: 8076
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 72.5,-62.5
-      parent: 2
-  - uid: 8077
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 75.5,-64.5
-      parent: 2
-  - uid: 8078
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 72.5,-61.5
-      parent: 2
-  - uid: 8081
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 69.5,-61.5
-      parent: 2
-  - uid: 8082
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 69.5,-62.5
-      parent: 2
-  - uid: 8088
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 71.5,-64.5
-      parent: 2
-  - uid: 11907
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 76.5,-61.5
+      pos: 59.5,-73.5
       parent: 2
   - uid: 17017
     components:
@@ -103131,6 +106543,11 @@ entities:
       parent: 2
 - proto: TableGlass
   entities:
+  - uid: 451
+    components:
+    - type: Transform
+      pos: 50.5,-31.5
+      parent: 2
   - uid: 458
     components:
     - type: Transform
@@ -103176,6 +106593,12 @@ entities:
     - type: Transform
       pos: 12.5,-70.5
       parent: 2
+  - uid: 8412
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 50.5,-34.5
+      parent: 2
   - uid: 17338
     components:
     - type: Transform
@@ -103193,6 +106616,11 @@ entities:
       parent: 2
 - proto: TablePlasmaGlass
   entities:
+  - uid: 455
+    components:
+    - type: Transform
+      pos: 36.5,-11.5
+      parent: 2
   - uid: 2152
     components:
     - type: Transform
@@ -103223,20 +106651,20 @@ entities:
     - type: Transform
       pos: -9.5,-77.5
       parent: 2
-  - uid: 7783
+  - uid: 7172
     components:
     - type: Transform
-      pos: 27.5,-16.5
+      pos: 32.5,-12.5
       parent: 2
-  - uid: 7784
+  - uid: 7737
     components:
     - type: Transform
-      pos: 27.5,-15.5
+      pos: 36.5,-12.5
       parent: 2
-  - uid: 7793
+  - uid: 7741
     components:
     - type: Transform
-      pos: 31.5,-12.5
+      pos: 36.5,-13.5
       parent: 2
   - uid: 9111
     components:
@@ -103248,6 +106676,11 @@ entities:
     - type: Transform
       pos: -5.5,-28.5
       parent: 2
+  - uid: 9589
+    components:
+    - type: Transform
+      pos: 34.5,-13.5
+      parent: 2
   - uid: 12416
     components:
     - type: Transform
@@ -103300,6 +106733,11 @@ entities:
       parent: 2
 - proto: TableReinforced
   entities:
+  - uid: 374
+    components:
+    - type: Transform
+      pos: 57.5,-40.5
+      parent: 2
   - uid: 736
     components:
     - type: Transform
@@ -103320,6 +106758,11 @@ entities:
     - type: Transform
       pos: 32.5,-91.5
       parent: 2
+  - uid: 1877
+    components:
+    - type: Transform
+      pos: 68.5,-53.5
+      parent: 2
   - uid: 2331
     components:
     - type: Transform
@@ -103335,15 +106778,16 @@ entities:
     - type: Transform
       pos: -31.5,-64.5
       parent: 2
-  - uid: 3083
+  - uid: 3539
     components:
     - type: Transform
-      pos: 67.5,-48.5
+      rot: -1.5707963267948966 rad
+      pos: 67.5,-51.5
       parent: 2
-  - uid: 3530
+  - uid: 3621
     components:
     - type: Transform
-      pos: 68.5,-48.5
+      pos: 58.5,-40.5
       parent: 2
   - uid: 3884
     components:
@@ -103360,6 +106804,17 @@ entities:
     - type: Transform
       pos: 31.5,-89.5
       parent: 2
+  - uid: 4187
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 67.5,-50.5
+      parent: 2
+  - uid: 4272
+    components:
+    - type: Transform
+      pos: 67.5,-53.5
+      parent: 2
   - uid: 4330
     components:
     - type: Transform
@@ -103385,6 +106840,11 @@ entities:
     - type: Transform
       pos: -44.5,-45.5
       parent: 2
+  - uid: 4711
+    components:
+    - type: Transform
+      pos: 66.5,-53.5
+      parent: 2
   - uid: 4856
     components:
     - type: Transform
@@ -103395,6 +106855,11 @@ entities:
     - type: Transform
       pos: 6.5,-49.5
       parent: 2
+  - uid: 4875
+    components:
+    - type: Transform
+      pos: 57.5,-35.5
+      parent: 2
   - uid: 5348
     components:
     - type: Transform
@@ -103465,6 +106930,11 @@ entities:
     - type: Transform
       pos: -56.5,-61.5
       parent: 2
+  - uid: 6088
+    components:
+    - type: Transform
+      pos: 56.5,-39.5
+      parent: 2
   - uid: 6150
     components:
     - type: Transform
@@ -103575,20 +107045,32 @@ entities:
     - type: Transform
       pos: 12.5,-98.5
       parent: 2
+  - uid: 7212
+    components:
+    - type: Transform
+      pos: 57.5,-28.5
+      parent: 2
+  - uid: 7266
+    components:
+    - type: Transform
+      pos: 58.5,-35.5
+      parent: 2
   - uid: 7299
     components:
     - type: Transform
       pos: -56.5,-28.5
       parent: 2
-  - uid: 7658
+  - uid: 7591
     components:
     - type: Transform
-      pos: 77.5,-47.5
+      rot: 1.5707963267948966 rad
+      pos: 80.5,-43.5
       parent: 2
-  - uid: 8167
+  - uid: 7592
     components:
     - type: Transform
-      pos: 77.5,-43.5
+      rot: 1.5707963267948966 rad
+      pos: 79.5,-43.5
       parent: 2
   - uid: 8959
     components:
@@ -103600,11 +107082,26 @@ entities:
     - type: Transform
       pos: 23.5,-89.5
       parent: 2
+  - uid: 9221
+    components:
+    - type: Transform
+      pos: 57.5,-27.5
+      parent: 2
   - uid: 9445
     components:
     - type: Transform
       pos: -48.5,-45.5
       parent: 2
+  - uid: 9889
+    components:
+    - type: Transform
+      pos: 63.5,-42.5
+      parent: 2
+  - uid: 9890
+    components:
+    - type: Transform
+      pos: 63.5,-43.5
+      parent: 2
   - uid: 10101
     components:
     - type: Transform
@@ -103615,70 +107112,32 @@ entities:
     - type: Transform
       pos: -47.5,-45.5
       parent: 2
-  - uid: 10245
-    components:
-    - type: Transform
-      pos: 57.5,-46.5
-      parent: 2
-  - uid: 10798
-    components:
-    - type: Transform
-      pos: 67.5,-45.5
-      parent: 2
-  - uid: 10815
-    components:
-    - type: Transform
-      pos: 67.5,-46.5
-      parent: 2
   - uid: 12145
     components:
     - type: Transform
       pos: 15.5,-61.5
       parent: 2
-  - uid: 13859
+  - uid: 12944
     components:
     - type: Transform
-      pos: 76.5,-47.5
+      pos: 51.5,-37.5
       parent: 2
-  - uid: 15477
+  - uid: 14918
     components:
     - type: Transform
-      pos: 61.5,-42.5
+      pos: 50.5,-37.5
       parent: 2
-  - uid: 15479
+  - uid: 15172
     components:
     - type: Transform
-      pos: 61.5,-43.5
+      rot: 1.5707963267948966 rad
+      pos: 79.5,-47.5
       parent: 2
-  - uid: 15480
+  - uid: 15174
     components:
     - type: Transform
-      pos: 58.5,-47.5
-      parent: 2
-  - uid: 15481
-    components:
-    - type: Transform
-      pos: 59.5,-47.5
-      parent: 2
-  - uid: 15484
-    components:
-    - type: Transform
-      pos: 60.5,-47.5
-      parent: 2
-  - uid: 17264
-    components:
-    - type: Transform
-      pos: 76.5,-43.5
-      parent: 2
-  - uid: 17269
-    components:
-    - type: Transform
-      pos: 72.5,-42.5
-      parent: 2
-  - uid: 17270
-    components:
-    - type: Transform
-      pos: 71.5,-42.5
+      rot: 1.5707963267948966 rad
+      pos: 80.5,-47.5
       parent: 2
   - uid: 17271
     components:
@@ -103738,25 +107197,27 @@ entities:
       parent: 2
 - proto: TableReinforcedGlass
   entities:
-  - uid: 591
+  - uid: 297
     components:
     - type: Transform
-      pos: 27.5,-27.5
+      pos: 29.5,-30.5
       parent: 2
-  - uid: 1561
+  - uid: 1809
     components:
     - type: Transform
-      pos: 29.5,-25.5
+      rot: 1.5707963267948966 rad
+      pos: 40.5,-36.5
       parent: 2
   - uid: 2387
     components:
     - type: Transform
       pos: 27.5,-28.5
       parent: 2
-  - uid: 7037
+  - uid: 8101
     components:
     - type: Transform
-      pos: 48.5,-40.5
+      rot: 3.141592653589793 rad
+      pos: 27.5,-29.5
       parent: 2
 - proto: TableWood
   entities:
@@ -103772,17 +107233,10 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 36.5,-51.5
       parent: 2
-  - uid: 3524
+  - uid: 3456
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 54.5,-54.5
-      parent: 2
-  - uid: 4178
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 55.5,-54.5
+      pos: 55.5,-56.5
       parent: 2
   - uid: 4352
     components:
@@ -103876,10 +107330,15 @@ entities:
     - type: Transform
       pos: 33.5,-50.5
       parent: 2
-  - uid: 18167
+  - uid: 7111
     components:
     - type: Transform
-      pos: 72.5,-52.5
+      pos: 56.5,-56.5
+      parent: 2
+  - uid: 9296
+    components:
+    - type: Transform
+      pos: 73.5,-48.5
       parent: 2
   - uid: 19249
     components:
@@ -103898,16 +107357,16 @@ entities:
     - type: Transform
       pos: -6.5,-18.5
       parent: 2
+  - uid: 920
+    components:
+    - type: Transform
+      pos: 42.5,-34.5
+      parent: 2
   - uid: 3438
     components:
     - type: Transform
       pos: -25.5,-32.5
       parent: 2
-  - uid: 4190
-    components:
-    - type: Transform
-      pos: 53.5,-47.5
-      parent: 2
   - uid: 5082
     components:
     - type: Transform
@@ -103918,35 +107377,68 @@ entities:
     - type: Transform
       pos: -10.5,-21.5
       parent: 2
+  - uid: 5101
+    components:
+    - type: Transform
+      pos: 72.5,-67.5
+      parent: 2
+  - uid: 5426
+    components:
+    - type: Transform
+      pos: 66.5,-63.5
+      parent: 2
+  - uid: 6129
+    components:
+    - type: Transform
+      pos: 67.5,-62.5
+      parent: 2
   - uid: 6702
     components:
     - type: Transform
       pos: -15.5,-18.5
       parent: 2
-  - uid: 7140
-    components:
-    - type: Transform
-      pos: 53.5,-29.5
-      parent: 2
-  - uid: 7292
-    components:
-    - type: Transform
-      pos: 53.5,-30.5
-      parent: 2
   - uid: 7429
     components:
     - type: Transform
       pos: 45.5,-75.5
       parent: 2
+  - uid: 7543
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 74.5,-54.5
+      parent: 2
+  - uid: 7545
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 74.5,-53.5
+      parent: 2
+  - uid: 7930
+    components:
+    - type: Transform
+      pos: 68.5,-63.5
+      parent: 2
   - uid: 7989
     components:
     - type: Transform
       pos: 56.5,-77.5
       parent: 2
-  - uid: 8347
+  - uid: 8076
     components:
     - type: Transform
-      pos: 61.5,-62.5
+      pos: 68.5,-62.5
+      parent: 2
+  - uid: 8450
+    components:
+    - type: Transform
+      pos: 68.5,-65.5
+      parent: 2
+  - uid: 8452
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 66.5,-66.5
       parent: 2
   - uid: 8833
     components:
@@ -103963,6 +107455,22 @@ entities:
     - type: Transform
       pos: 53.5,-77.5
       parent: 2
+  - uid: 10666
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 40.5,-25.5
+      parent: 2
+  - uid: 10701
+    components:
+    - type: Transform
+      pos: 66.5,-62.5
+      parent: 2
+  - uid: 11129
+    components:
+    - type: Transform
+      pos: -42.5,-79.5
+      parent: 2
   - uid: 11398
     components:
     - type: Transform
@@ -103973,26 +107481,11 @@ entities:
     - type: Transform
       pos: -23.5,-39.5
       parent: 2
-  - uid: 12886
-    components:
-    - type: Transform
-      pos: 62.5,-62.5
-      parent: 2
   - uid: 13338
     components:
     - type: Transform
       pos: -24.5,-39.5
       parent: 2
-  - uid: 13906
-    components:
-    - type: Transform
-      pos: 60.5,-62.5
-      parent: 2
-  - uid: 13907
-    components:
-    - type: Transform
-      pos: 58.5,-71.5
-      parent: 2
   - uid: 13997
     components:
     - type: Transform
@@ -104033,11 +107526,6 @@ entities:
     - type: Transform
       pos: -33.5,-25.5
       parent: 2
-  - uid: 14070
-    components:
-    - type: Transform
-      pos: 66.5,-69.5
-      parent: 2
   - uid: 14119
     components:
     - type: Transform
@@ -104048,11 +107536,54 @@ entities:
     - type: Transform
       pos: -43.5,-23.5
       parent: 2
+  - uid: 14792
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -37.5,-75.5
+      parent: 2
+  - uid: 14926
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 41.5,-34.5
+      parent: 2
   - uid: 15115
     components:
     - type: Transform
       pos: -42.5,-23.5
       parent: 2
+  - uid: 15169
+    components:
+    - type: Transform
+      pos: 62.5,-65.5
+      parent: 2
+  - uid: 15429
+    components:
+    - type: Transform
+      pos: 80.5,-64.5
+      parent: 2
+  - uid: 15455
+    components:
+    - type: Transform
+      pos: 66.5,-68.5
+      parent: 2
+  - uid: 15479
+    components:
+    - type: Transform
+      pos: 62.5,-57.5
+      parent: 2
+  - uid: 15480
+    components:
+    - type: Transform
+      pos: 61.5,-57.5
+      parent: 2
+  - uid: 15486
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 65.5,-68.5
+      parent: 2
   - uid: 16138
     components:
     - type: Transform
@@ -104073,31 +107604,11 @@ entities:
     - type: Transform
       pos: -32.5,-29.5
       parent: 2
-  - uid: 16431
-    components:
-    - type: Transform
-      pos: 33.5,-15.5
-      parent: 2
-  - uid: 16432
-    components:
-    - type: Transform
-      pos: 33.5,-16.5
-      parent: 2
-  - uid: 16433
-    components:
-    - type: Transform
-      pos: 35.5,-18.5
-      parent: 2
   - uid: 16435
     components:
     - type: Transform
       pos: -25.5,-39.5
       parent: 2
-  - uid: 16437
-    components:
-    - type: Transform
-      pos: 33.5,-17.5
-      parent: 2
   - uid: 16438
     components:
     - type: Transform
@@ -104123,51 +107634,31 @@ entities:
     - type: Transform
       pos: -11.5,-18.5
       parent: 2
-  - uid: 16608
+  - uid: 16598
     components:
     - type: Transform
-      pos: 75.5,-56.5
-      parent: 2
-  - uid: 16609
-    components:
-    - type: Transform
-      pos: 75.5,-55.5
+      pos: -40.5,-80.5
       parent: 2
   - uid: 17088
     components:
     - type: Transform
       pos: 9.5,-44.5
       parent: 2
-  - uid: 17140
-    components:
-    - type: Transform
-      pos: 40.5,-30.5
-      parent: 2
-  - uid: 17141
-    components:
-    - type: Transform
-      pos: 37.5,-29.5
-      parent: 2
-  - uid: 17142
-    components:
-    - type: Transform
-      pos: 41.5,-30.5
-      parent: 2
   - uid: 17143
     components:
     - type: Transform
       pos: 11.5,-44.5
       parent: 2
-  - uid: 17375
-    components:
-    - type: Transform
-      pos: 37.5,-28.5
-      parent: 2
   - uid: 17482
     components:
     - type: Transform
       pos: 10.5,-44.5
       parent: 2
+  - uid: 17572
+    components:
+    - type: Transform
+      pos: -37.5,-76.5
+      parent: 2
   - uid: 17603
     components:
     - type: Transform
@@ -104253,26 +107744,11 @@ entities:
     - type: Transform
       pos: -52.5,-39.5
       parent: 2
-  - uid: 18520
-    components:
-    - type: Transform
-      pos: 42.5,-30.5
-      parent: 2
-  - uid: 18521
-    components:
-    - type: Transform
-      pos: 42.5,-29.5
-      parent: 2
   - uid: 19206
     components:
     - type: Transform
       pos: -9.5,-26.5
       parent: 2
-  - uid: 19223
-    components:
-    - type: Transform
-      pos: 48.5,-29.5
-      parent: 2
   - uid: 19496
     components:
     - type: Transform
@@ -104281,10 +107757,10 @@ entities:
       parent: 2
 - proto: TargetStrange
   entities:
-  - uid: 17572
+  - uid: 8806
     components:
     - type: Transform
-      pos: -39.5,-75.5
+      pos: -35.5,-80.5
       parent: 2
 - proto: TegCenter
   entities:
@@ -104314,26 +107790,6 @@ entities:
       color: '#FF3300FF'
 - proto: TelecomServer
   entities:
-  - uid: 5607
-    components:
-    - type: Transform
-      pos: -45.5,-38.5
-      parent: 2
-    - type: ContainerContainer
-      containers:
-        key_slots: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 16387
-        machine_board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        machine_parts: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
   - uid: 6591
     components:
     - type: Transform
@@ -104401,12 +107857,19 @@ entities:
     - type: Transform
       pos: 27.421175,-62.3844
       parent: 2
-- proto: TelecomServerFilledCommon
+- proto: TelecomServerFilledCommand
   entities:
-  - uid: 5791
+  - uid: 15384
     components:
     - type: Transform
-      pos: 83.5,-47.5
+      pos: -45.5,-38.5
+      parent: 2
+- proto: TelecomServerFilledCommon
+  entities:
+  - uid: 15163
+    components:
+    - type: Transform
+      pos: 85.5,-47.5
       parent: 2
 - proto: TelecomServerFilledEngineering
   entities:
@@ -104424,42 +107887,48 @@ entities:
       parent: 2
 - proto: TelecomServerFilledSecurity
   entities:
-  - uid: 3072
+  - uid: 8865
     components:
     - type: Transform
-      pos: 67.5,-37.5
+      pos: 53.5,-28.5
       parent: 2
 - proto: TeslaCoil
   entities:
-  - uid: 18568
+  - uid: 17287
     components:
     - type: Transform
-      pos: -25.5,-83.5
+      rot: 1.5707963267948966 rad
+      pos: -24.5,-83.5
       parent: 2
-  - uid: 18569
+  - uid: 19776
     components:
     - type: Transform
-      pos: -25.5,-81.5
+      rot: 1.5707963267948966 rad
+      pos: -21.5,-82.5
       parent: 2
-  - uid: 18570
+  - uid: 19777
     components:
     - type: Transform
-      pos: -25.5,-79.5
+      rot: 1.5707963267948966 rad
+      pos: -21.5,-80.5
       parent: 2
-  - uid: 18571
+  - uid: 19778
     components:
     - type: Transform
-      pos: -21.5,-79.5
+      rot: 1.5707963267948966 rad
+      pos: -22.5,-79.5
       parent: 2
-  - uid: 18572
+  - uid: 19779
     components:
     - type: Transform
-      pos: -21.5,-81.5
+      rot: 1.5707963267948966 rad
+      pos: -25.5,-80.5
       parent: 2
-  - uid: 18573
+  - uid: 19780
     components:
     - type: Transform
-      pos: -21.5,-83.5
+      rot: 1.5707963267948966 rad
+      pos: -25.5,-82.5
       parent: 2
 - proto: TeslaGenerator
   entities:
@@ -104470,25 +107939,29 @@ entities:
       parent: 2
 - proto: TeslaGroundingRod
   entities:
-  - uid: 18487
+  - uid: 18569
     components:
     - type: Transform
-      pos: -23.5,-83.5
+      rot: 1.5707963267948966 rad
+      pos: -24.5,-79.5
+      parent: 2
+  - uid: 18570
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -22.5,-83.5
+      parent: 2
+  - uid: 18572
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -20.5,-80.5
       parent: 2
   - uid: 18574
     components:
     - type: Transform
-      pos: -26.5,-81.5
-      parent: 2
-  - uid: 18575
-    components:
-    - type: Transform
-      pos: -23.5,-79.5
-      parent: 2
-  - uid: 18576
-    components:
-    - type: Transform
-      pos: -20.5,-81.5
+      rot: 1.5707963267948966 rad
+      pos: -26.5,-82.5
       parent: 2
 - proto: Thruster
   entities:
@@ -104530,15 +108003,10 @@ entities:
       parent: 2
 - proto: TintedWindow
   entities:
-  - uid: 1451
+  - uid: 8176
     components:
     - type: Transform
-      pos: 69.5,-43.5
-      parent: 2
-  - uid: 10311
-    components:
-    - type: Transform
-      pos: 69.5,-41.5
+      pos: 51.5,-35.5
       parent: 2
 - proto: ToiletEmpty
   entities:
@@ -104553,27 +108021,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 40.5,-19.5
       parent: 2
-  - uid: 17884
-    components:
-    - type: Transform
-      pos: 36.5,-11.5
-      parent: 2
-    - type: DisposalUnit
-      nextFlush: 0
-    - type: ContainerContainer
-      containers:
-        stash: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-        disposals: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 17885
-          - 17886
-          - 17893
-          - 17907
 - proto: ToiletGoldenDirtyWater
   entities:
   - uid: 16100
@@ -104595,6 +108042,11 @@ entities:
       parent: 2
 - proto: ToolboxElectricalFilled
   entities:
+  - uid: 5425
+    components:
+    - type: Transform
+      pos: -37.51767,-76.217834
+      parent: 2
   - uid: 5581
     components:
     - type: Transform
@@ -104620,10 +108072,10 @@ entities:
     - type: Transform
       pos: 71.665375,-19.465302
       parent: 2
-  - uid: 17605
+  - uid: 15481
     components:
     - type: Transform
-      pos: 33.437138,-16.527544
+      pos: 62.51025,-57.18848
       parent: 2
   - uid: 17751
     components:
@@ -104654,11 +108106,6 @@ entities:
     - type: Transform
       pos: -46.50093,-12.413582
       parent: 2
-  - uid: 17882
-    components:
-    - type: Transform
-      pos: 35.76561,-18.532131
-      parent: 2
   - uid: 19298
     components:
     - type: Transform
@@ -104706,12 +108153,12 @@ entities:
   - uid: 7744
     components:
     - type: Transform
-      pos: 61.491913,-43.517254
+      pos: 58.46033,-35.476738
       parent: 2
-  - uid: 8133
+  - uid: 15482
     components:
     - type: Transform
-      pos: 53.37742,-30.043339
+      pos: 62.040775,-57.438656
       parent: 2
   - uid: 17842
     components:
@@ -104730,14 +108177,14 @@ entities:
   - uid: 7331
     components:
     - type: Transform
-      pos: 79.86608,-26.933979
+      pos: 78.98892,-25.47695
       parent: 2
 - proto: Tourniquet
   entities:
-  - uid: 6014
+  - uid: 10855
     components:
     - type: Transform
-      pos: 42.60125,-28.663069
+      pos: 68.40143,-66.52006
       parent: 2
 - proto: ToyAi
   entities:
@@ -104767,6 +108214,13 @@ entities:
     - type: Transform
       pos: -18.517744,-31.41124
       parent: 2
+- proto: ToyFigurineFootsoldier
+  entities:
+  - uid: 16126
+    components:
+    - type: Transform
+      pos: 49.49876,-16.490688
+      parent: 2
 - proto: ToyFigurineQueen
   entities:
   - uid: 6017
@@ -104798,7 +108252,7 @@ entities:
   - uid: 6983
     components:
     - type: Transform
-      pos: 51.993618,-98.8094
+      pos: 52.988304,-98.97241
       parent: 2
 - proto: ToyFigurineScientist
   entities:
@@ -104845,33 +108299,41 @@ entities:
     - type: Transform
       pos: 12.313462,-94.44978
       parent: 2
+- proto: ToyRubberDuck
+  entities:
+  - uid: 561
+    components:
+    - type: Transform
+      parent: 2004
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: ToySword
   entities:
   - uid: 19047
     components:
     - type: Transform
-      pos: 64.42656,-70.317154
+      pos: 69.52158,-59.52405
       parent: 2
   - uid: 19048
     components:
     - type: Transform
-      pos: 64.58922,-70.48394
+      pos: 69.46603,-59.459236
       parent: 2
 - proto: TrashBag
   entities:
-  - uid: 7197
+  - uid: 11867
     components:
     - type: Transform
-      pos: 58.57782,-71.42502
+      pos: 72.64958,-67.37068
       parent: 2
 - proto: TrashBakedBananaPeel
   entities:
-  - uid: 14733
+  - uid: 4304
     components:
     - type: Transform
-      pos: 60.409534,-66.50437
+      pos: 74.54851,-61.465183
       parent: 2
-    - type: Conveyed
 - proto: TrashBananaPeel
   entities:
   - uid: 5987
@@ -104886,11 +108348,6 @@ entities:
     - type: Transform
       pos: -20.55822,-65.533104
       parent: 2
-  - uid: 18522
-    components:
-    - type: Transform
-      pos: 45.307762,-48.38038
-      parent: 2
 - proto: TubaInstrument
   entities:
   - uid: 19532
@@ -104946,188 +108403,209 @@ entities:
       parent: 2
 - proto: TwoWayLever
   entities:
-  - uid: 3622
+  - uid: 5083
     components:
     - type: Transform
-      pos: 61.5,-67.5
+      pos: 76.5,-63.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        7704:
+        8075:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        8801:
+        8822:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        16537:
+        9301:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        8804:
+        9305:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        9314:
+        8077:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-  - uid: 3623
+        10332:
+        - - Left
+          - Reverse
+        - - Right
+          - Forward
+        - - Middle
+          - Off
+  - uid: 5089
     components:
     - type: Transform
-      pos: 60.5,-71.5
+      pos: 74.5,-67.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        7143:
+        10278:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        8219:
+        10301:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        7706:
+        10306:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        6127:
+        2883:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        7728:
+        11899:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        7727:
+        7571:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        7142:
+        11460:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        6128:
+        7408:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        7141:
+        3314:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        6129:
+        11690:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        7139:
+        11903:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        7137:
+        10704:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        7136:
+        10703:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        8580:
+        5374:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        7133:
+        6412:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        7132:
+        6403:
         - - Left
-          - Forward
-        - - Right
           - Reverse
+        - - Right
+          - Forward
         - - Middle
           - Off
-        3387:
-        - - Left
-          - Forward
-        - - Right
-          - Reverse
-        - - Middle
-          - Off
-        7730:
-        - - Left
-          - Forward
-        - - Right
-          - Reverse
-        - - Middle
-          - Off
-        7185:
+        11883:
         - - Left
           - Open
         - - Right
           - Open
         - - Middle
           - Close
+  - uid: 6910
+    components:
+    - type: Transform
+      pos: 52.5,-96.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        6868:
+        - - Left
+          - Reverse
+        - - Right
+          - Forward
+        - - Middle
+          - Off
+        11474:
+        - - Left
+          - Reverse
+        - - Right
+          - Forward
+        - - Middle
+          - Off
+        6918:
+        - - Left
+          - Reverse
+        - - Right
+          - Forward
+        - - Middle
+          - Off
   - uid: 18264
     components:
     - type: Transform
@@ -105164,17 +108642,13 @@ entities:
           - AutoClose
         - - Right
           - AutoClose
-  - uid: 18765
-    components:
-    - type: Transform
-      pos: 51.5,-97.5
-      parent: 2
 - proto: UnfinishedMachineFrame
   entities:
-  - uid: 17877
+  - uid: 8057
     components:
     - type: Transform
-      pos: 33.5,-14.5
+      rot: 3.141592653589793 rad
+      pos: -36.5,-79.5
       parent: 2
 - proto: UniformPrinter
   entities:
@@ -105199,10 +108673,10 @@ entities:
       parent: 2
 - proto: Vaccinator
   entities:
-  - uid: 7778
+  - uid: 255
     components:
     - type: Transform
-      pos: 31.5,-16.5
+      pos: 34.5,-11.5
       parent: 2
 - proto: VendingBarDrobe
   entities:
@@ -105225,10 +108699,10 @@ entities:
     - type: Transform
       pos: 38.5,-46.5
       parent: 2
-  - uid: 5813
+  - uid: 7704
     components:
     - type: Transform
-      pos: 69.5,-63.5
+      pos: 59.5,-67.5
       parent: 2
 - proto: VendingMachineCargoDrobe
   entities:
@@ -105265,10 +108739,10 @@ entities:
     - type: Transform
       pos: 44.5,-46.5
       parent: 2
-  - uid: 7039
+  - uid: 8140
     components:
     - type: Transform
-      pos: 46.5,-40.5
+      pos: 40.5,-38.5
       parent: 2
 - proto: VendingMachineChemDrobe
   entities:
@@ -105286,10 +108760,10 @@ entities:
       parent: 2
 - proto: VendingMachineCigs
   entities:
-  - uid: 3523
+  - uid: 3650
     components:
     - type: Transform
-      pos: 55.5,-48.5
+      pos: 64.5,-51.5
       parent: 2
   - uid: 4270
     components:
@@ -105306,11 +108780,6 @@ entities:
     - type: Transform
       pos: 34.5,-46.5
       parent: 2
-  - uid: 16050
-    components:
-    - type: Transform
-      pos: 65.5,-46.5
-      parent: 2
   - uid: 17443
     components:
     - type: Transform
@@ -105357,24 +108826,24 @@ entities:
       parent: 2
 - proto: VendingMachineDetDrobe
   entities:
-  - uid: 7122
+  - uid: 8048
     components:
     - type: Transform
-      pos: 68.5,-53.5
+      pos: 71.5,-49.5
       parent: 2
 - proto: VendingMachineDinnerware
   entities:
-  - uid: 7028
+  - uid: 19170
     components:
     - type: Transform
-      pos: 42.5,-47.5
+      pos: 44.5,-45.5
       parent: 2
 - proto: VendingMachineDonut
   entities:
-  - uid: 12832
+  - uid: 8610
     components:
     - type: Transform
-      pos: 68.5,-40.5
+      pos: 60.5,-31.5
       parent: 2
 - proto: VendingMachineEngiDrobe
   entities:
@@ -105409,10 +108878,10 @@ entities:
       parent: 2
 - proto: VendingMachineHappyHonk
   entities:
-  - uid: 14282
+  - uid: 8047
     components:
     - type: Transform
-      pos: 50.5,-46.5
+      pos: 46.5,-49.5
       parent: 2
 - proto: VendingMachineHydrobe
   entities:
@@ -105479,10 +108948,10 @@ entities:
       parent: 2
 - proto: VendingMachineSalvage
   entities:
-  - uid: 6924
+  - uid: 6893
     components:
     - type: Transform
-      pos: 53.5,-101.5
+      pos: 54.5,-101.5
       parent: 2
 - proto: VendingMachineSciDrobe
   entities:
@@ -105493,22 +108962,22 @@ entities:
       parent: 2
 - proto: VendingMachineSec
   entities:
-  - uid: 7269
+  - uid: 10049
     components:
     - type: Transform
-      pos: 60.5,-34.5
+      pos: 73.5,-41.5
       parent: 2
-  - uid: 10258
+  - uid: 10059
     components:
     - type: Transform
-      pos: 60.5,-35.5
+      pos: 73.5,-42.5
       parent: 2
 - proto: VendingMachineSecDrobe
   entities:
-  - uid: 10749
+  - uid: 10042
     components:
     - type: Transform
-      pos: 57.5,-35.5
+      pos: 70.5,-42.5
       parent: 2
 - proto: VendingMachineSeeds
   entities:
@@ -105531,11 +109000,6 @@ entities:
     - type: Transform
       pos: 8.5,-92.5
       parent: 2
-  - uid: 13877
-    components:
-    - type: Transform
-      pos: 57.5,-26.5
-      parent: 2
 - proto: VendingMachineSovietSoda
   entities:
   - uid: 8218
@@ -105548,6 +109012,11 @@ entities:
     - type: Transform
       pos: 43.5,-75.5
       parent: 2
+  - uid: 15461
+    components:
+    - type: Transform
+      pos: 68.5,-57.5
+      parent: 2
   - uid: 17095
     components:
     - type: Transform
@@ -105613,13 +109082,6 @@ entities:
     - type: Transform
       pos: -20.5,-49.5
       parent: 2
-- proto: VendingMachineViroDrobe
-  entities:
-  - uid: 7781
-    components:
-    - type: Transform
-      pos: 31.5,-18.5
-      parent: 2
 - proto: VendingMachineWallMedical
   entities:
   - uid: 5271
@@ -105690,21 +109152,28 @@ entities:
     - type: Transform
       pos: -15.5,-63.5
       parent: 2
-  - uid: 208
+  - uid: 206
     components:
     - type: Transform
-      pos: 66.5,-49.5
-      parent: 2
-  - uid: 209
-    components:
-    - type: Transform
-      pos: 69.5,-40.5
+      pos: 72.5,-52.5
       parent: 2
   - uid: 246
     components:
     - type: Transform
       pos: -1.5,-12.5
       parent: 2
+  - uid: 271
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-39.5
+      parent: 2
+  - uid: 275
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 66.5,-32.5
+      parent: 2
   - uid: 334
     components:
     - type: Transform
@@ -105925,6 +109394,16 @@ entities:
     - type: Transform
       pos: 13.5,-68.5
       parent: 2
+  - uid: 1062
+    components:
+    - type: Transform
+      pos: 73.5,-43.5
+      parent: 2
+  - uid: 1072
+    components:
+    - type: Transform
+      pos: 60.5,-37.5
+      parent: 2
   - uid: 1162
     components:
     - type: Transform
@@ -105935,21 +109414,11 @@ entities:
     - type: Transform
       pos: -1.5,-15.5
       parent: 2
-  - uid: 1211
-    components:
-    - type: Transform
-      pos: 61.5,-34.5
-      parent: 2
   - uid: 1221
     components:
     - type: Transform
       pos: 11.5,-70.5
       parent: 2
-  - uid: 1426
-    components:
-    - type: Transform
-      pos: 61.5,-33.5
-      parent: 2
   - uid: 1712
     components:
     - type: Transform
@@ -105970,10 +109439,16 @@ entities:
     - type: Transform
       pos: 9.5,-85.5
       parent: 2
-  - uid: 2164
+  - uid: 2230
     components:
     - type: Transform
-      pos: 64.5,-48.5
+      pos: 58.5,-51.5
+      parent: 2
+  - uid: 2279
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-52.5
       parent: 2
   - uid: 2328
     components:
@@ -106140,11 +109615,6 @@ entities:
     - type: Transform
       pos: 13.5,-90.5
       parent: 2
-  - uid: 2645
-    components:
-    - type: Transform
-      pos: 57.5,-30.5
-      parent: 2
   - uid: 2650
     components:
     - type: Transform
@@ -106540,40 +110010,141 @@ entities:
     - type: Transform
       pos: 36.5,-95.5
       parent: 2
+  - uid: 3021
+    components:
+    - type: Transform
+      pos: 72.5,-43.5
+      parent: 2
   - uid: 3047
     components:
     - type: Transform
       pos: 22.5,-100.5
       parent: 2
+  - uid: 3066
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 60.5,-52.5
+      parent: 2
+  - uid: 3094
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-51.5
+      parent: 2
+  - uid: 3101
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-49.5
+      parent: 2
   - uid: 3174
     components:
     - type: Transform
       pos: 11.5,-69.5
       parent: 2
-  - uid: 3311
+  - uid: 3217
     components:
     - type: Transform
-      pos: 66.5,-39.5
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-45.5
       parent: 2
-  - uid: 3319
+  - uid: 3287
     components:
     - type: Transform
-      pos: 63.5,-55.5
-      parent: 2
-  - uid: 3324
-    components:
-    - type: Transform
-      pos: 63.5,-56.5
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-47.5
       parent: 2
   - uid: 3349
     components:
     - type: Transform
-      pos: 58.5,-60.5
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-46.5
+      parent: 2
+  - uid: 3396
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-51.5
+      parent: 2
+  - uid: 3400
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-45.5
+      parent: 2
+  - uid: 3451
+    components:
+    - type: Transform
+      pos: 69.5,-43.5
+      parent: 2
+  - uid: 3452
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 68.5,-45.5
+      parent: 2
+  - uid: 3462
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 67.5,-37.5
+      parent: 2
+  - uid: 3470
+    components:
+    - type: Transform
+      pos: 66.5,-54.5
+      parent: 2
+  - uid: 3543
+    components:
+    - type: Transform
+      pos: 57.5,-29.5
+      parent: 2
+  - uid: 3545
+    components:
+    - type: Transform
+      pos: 69.5,-42.5
+      parent: 2
+  - uid: 3573
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-40.5
+      parent: 2
+  - uid: 3574
+    components:
+    - type: Transform
+      pos: 72.5,-50.5
+      parent: 2
+  - uid: 3580
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-41.5
+      parent: 2
+  - uid: 3583
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 71.5,-50.5
       parent: 2
   - uid: 3584
     components:
     - type: Transform
-      pos: 62.5,-53.5
+      rot: -1.5707963267948966 rad
+      pos: 70.5,-50.5
+      parent: 2
+  - uid: 3651
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-50.5
+      parent: 2
+  - uid: 3668
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-48.5
       parent: 2
   - uid: 3679
     components:
@@ -106600,6 +110171,30 @@ entities:
     - type: Transform
       pos: 38.5,-92.5
       parent: 2
+  - uid: 3768
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-47.5
+      parent: 2
+  - uid: 3777
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-49.5
+      parent: 2
+  - uid: 3811
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-50.5
+      parent: 2
+  - uid: 3869
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-48.5
+      parent: 2
   - uid: 3941
     components:
     - type: Transform
@@ -106630,6 +110225,12 @@ entities:
     - type: Transform
       pos: -17.5,-57.5
       parent: 2
+  - uid: 3961
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 58.5,-52.5
+      parent: 2
   - uid: 4082
     components:
     - type: Transform
@@ -106640,10 +110241,25 @@ entities:
     - type: Transform
       pos: 68.5,-26.5
       parent: 2
-  - uid: 4167
+  - uid: 4109
     components:
     - type: Transform
-      pos: 20.5,-25.5
+      pos: 68.5,-42.5
+      parent: 2
+  - uid: 4174
+    components:
+    - type: Transform
+      pos: 70.5,-43.5
+      parent: 2
+  - uid: 4175
+    components:
+    - type: Transform
+      pos: 67.5,-42.5
+      parent: 2
+  - uid: 4176
+    components:
+    - type: Transform
+      pos: 67.5,-41.5
       parent: 2
   - uid: 4208
     components:
@@ -106725,6 +110341,12 @@ entities:
     - type: Transform
       pos: -32.5,-60.5
       parent: 2
+  - uid: 4297
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 59.5,-52.5
+      parent: 2
   - uid: 4307
     components:
     - type: Transform
@@ -106810,10 +110432,11 @@ entities:
     - type: Transform
       pos: -11.5,-62.5
       parent: 2
-  - uid: 4346
+  - uid: 4345
     components:
     - type: Transform
-      pos: 57.5,-53.5
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-46.5
       parent: 2
   - uid: 4413
     components:
@@ -106830,26 +110453,6 @@ entities:
     - type: Transform
       pos: 70.5,-49.5
       parent: 2
-  - uid: 4710
-    components:
-    - type: Transform
-      pos: 71.5,-44.5
-      parent: 2
-  - uid: 4711
-    components:
-    - type: Transform
-      pos: 70.5,-44.5
-      parent: 2
-  - uid: 4712
-    components:
-    - type: Transform
-      pos: 69.5,-44.5
-      parent: 2
-  - uid: 4713
-    components:
-    - type: Transform
-      pos: 68.5,-44.5
-      parent: 2
   - uid: 4759
     components:
     - type: Transform
@@ -106860,11 +110463,6 @@ entities:
     - type: Transform
       pos: 68.5,-49.5
       parent: 2
-  - uid: 4912
-    components:
-    - type: Transform
-      pos: 71.5,-49.5
-      parent: 2
   - uid: 4993
     components:
     - type: Transform
@@ -106915,15 +110513,48 @@ entities:
     - type: Transform
       pos: 16.5,-25.5
       parent: 2
+  - uid: 5235
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 21.5,-26.5
+      parent: 2
   - uid: 5241
     components:
     - type: Transform
       pos: 11.5,-13.5
       parent: 2
-  - uid: 6273
+  - uid: 5435
     components:
     - type: Transform
-      pos: 20.5,-26.5
+      rot: -1.5707963267948966 rad
+      pos: 73.5,-45.5
+      parent: 2
+  - uid: 5538
+    components:
+    - type: Transform
+      pos: 72.5,-51.5
+      parent: 2
+  - uid: 5603
+    components:
+    - type: Transform
+      pos: 72.5,-53.5
+      parent: 2
+  - uid: 5615
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-45.5
+      parent: 2
+  - uid: 5957
+    components:
+    - type: Transform
+      pos: 62.5,-52.5
+      parent: 2
+  - uid: 6164
+    components:
+    - type: Transform
+      pos: 54.5,-35.5
       parent: 2
   - uid: 6462
     components:
@@ -106935,6 +110566,12 @@ entities:
     - type: Transform
       pos: 67.5,-26.5
       parent: 2
+  - uid: 6630
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-46.5
+      parent: 2
   - uid: 6673
     components:
     - type: Transform
@@ -107015,16 +110652,6 @@ entities:
     - type: Transform
       pos: 53.5,-95.5
       parent: 2
-  - uid: 6861
-    components:
-    - type: Transform
-      pos: 53.5,-103.5
-      parent: 2
-  - uid: 6862
-    components:
-    - type: Transform
-      pos: 54.5,-96.5
-      parent: 2
   - uid: 6863
     components:
     - type: Transform
@@ -107040,11 +110667,6 @@ entities:
     - type: Transform
       pos: 56.5,-101.5
       parent: 2
-  - uid: 6868
-    components:
-    - type: Transform
-      pos: 55.5,-101.5
-      parent: 2
   - uid: 6870
     components:
     - type: Transform
@@ -107108,7 +110730,7 @@ entities:
   - uid: 6888
     components:
     - type: Transform
-      pos: 55.5,-97.5
+      pos: 57.5,-97.5
       parent: 2
   - uid: 6889
     components:
@@ -107130,11 +110752,22 @@ entities:
     - type: Transform
       pos: 54.5,-102.5
       parent: 2
+  - uid: 6900
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 54.5,-104.5
+      parent: 2
   - uid: 6903
     components:
     - type: Transform
       pos: 53.5,-104.5
       parent: 2
+  - uid: 6912
+    components:
+    - type: Transform
+      pos: 56.5,-102.5
+      parent: 2
   - uid: 6928
     components:
     - type: Transform
@@ -107145,131 +110778,240 @@ entities:
     - type: Transform
       pos: 33.5,-93.5
       parent: 2
-  - uid: 7192
+  - uid: 7094
     components:
     - type: Transform
-      pos: 68.5,-39.5
+      pos: 57.5,-26.5
       parent: 2
-  - uid: 7194
+  - uid: 7215
     components:
     - type: Transform
-      pos: 69.5,-39.5
-      parent: 2
-  - uid: 7208
-    components:
-    - type: Transform
-      pos: 61.5,-60.5
-      parent: 2
-  - uid: 7209
-    components:
-    - type: Transform
-      pos: 62.5,-60.5
+      pos: 57.5,-30.5
       parent: 2
   - uid: 7268
     components:
     - type: Transform
-      pos: 62.5,-54.5
+      pos: 63.5,-51.5
       parent: 2
-  - uid: 7308
+  - uid: 7277
     components:
     - type: Transform
-      pos: 61.5,-47.5
+      rot: -1.5707963267948966 rad
+      pos: 70.5,-45.5
+      parent: 2
+  - uid: 7293
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 69.5,-45.5
+      parent: 2
+  - uid: 7301
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 71.5,-45.5
+      parent: 2
+  - uid: 7305
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 69.5,-37.5
+      parent: 2
+  - uid: 7575
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 68.5,-37.5
+      parent: 2
+  - uid: 7612
+    components:
+    - type: Transform
+      pos: 68.5,-31.5
+      parent: 2
+  - uid: 7628
+    components:
+    - type: Transform
+      pos: 67.5,-36.5
+      parent: 2
+  - uid: 7731
+    components:
+    - type: Transform
+      pos: 67.5,-31.5
+      parent: 2
+  - uid: 7745
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 70.5,-37.5
+      parent: 2
+  - uid: 7749
+    components:
+    - type: Transform
+      pos: 67.5,-54.5
+      parent: 2
+  - uid: 7751
+    components:
+    - type: Transform
+      pos: 72.5,-54.5
+      parent: 2
+  - uid: 7759
+    components:
+    - type: Transform
+      pos: 65.5,-53.5
+      parent: 2
+  - uid: 7783
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 21.5,-25.5
       parent: 2
   - uid: 7790
     components:
     - type: Transform
       pos: 26.5,-10.5
       parent: 2
+  - uid: 7939
+    components:
+    - type: Transform
+      pos: 64.5,-53.5
+      parent: 2
+  - uid: 7940
+    components:
+    - type: Transform
+      pos: 70.5,-32.5
+      parent: 2
+  - uid: 7950
+    components:
+    - type: Transform
+      pos: 70.5,-31.5
+      parent: 2
   - uid: 7962
     components:
     - type: Transform
-      pos: 72.5,-48.5
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-38.5
       parent: 2
-  - uid: 8114
+  - uid: 7963
     components:
     - type: Transform
-      pos: 63.5,-59.5
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-37.5
       parent: 2
-  - uid: 8115
+  - uid: 7984
     components:
     - type: Transform
-      pos: 63.5,-57.5
+      pos: 69.5,-54.5
       parent: 2
-  - uid: 8129
+  - uid: 7985
     components:
     - type: Transform
-      pos: 57.5,-40.5
+      pos: 70.5,-54.5
+      parent: 2
+  - uid: 7987
+    components:
+    - type: Transform
+      pos: 71.5,-54.5
+      parent: 2
+  - uid: 8068
+    components:
+    - type: Transform
+      pos: 54.5,-40.5
+      parent: 2
+  - uid: 8132
+    components:
+    - type: Transform
+      pos: 53.5,-36.5
       parent: 2
   - uid: 8143
     components:
     - type: Transform
       pos: 67.5,-49.5
       parent: 2
-  - uid: 8173
+  - uid: 8151
     components:
     - type: Transform
-      pos: 57.5,-33.5
+      pos: 53.5,-38.5
       parent: 2
-  - uid: 8176
+  - uid: 8162
     components:
     - type: Transform
-      pos: 57.5,-60.5
+      pos: 53.5,-39.5
+      parent: 2
+  - uid: 8195
+    components:
+    - type: Transform
+      pos: 50.5,-35.5
+      parent: 2
+  - uid: 8196
+    components:
+    - type: Transform
+      pos: 53.5,-40.5
       parent: 2
   - uid: 8475
     components:
     - type: Transform
       pos: -32.5,-59.5
       parent: 2
-  - uid: 9281
+  - uid: 8562
     components:
     - type: Transform
-      pos: 61.5,-39.5
+      pos: 68.5,-54.5
+      parent: 2
+  - uid: 8571
+    components:
+    - type: Transform
+      pos: 53.5,-37.5
+      parent: 2
+  - uid: 8572
+    components:
+    - type: Transform
+      pos: 53.5,-35.5
+      parent: 2
+  - uid: 8618
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 20.5,-26.5
+      parent: 2
+  - uid: 9407
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 21.5,-24.5
       parent: 2
   - uid: 9584
     components:
     - type: Transform
       pos: -13.5,-57.5
       parent: 2
-  - uid: 9795
-    components:
-    - type: Transform
-      pos: 60.5,-33.5
-      parent: 2
   - uid: 10237
     components:
     - type: Transform
       pos: 60.5,-40.5
       parent: 2
-  - uid: 10308
+  - uid: 10245
     components:
     - type: Transform
-      pos: 64.5,-46.5
+      rot: -1.5707963267948966 rad
+      pos: 67.5,-48.5
       parent: 2
-  - uid: 10309
+  - uid: 10248
     components:
     - type: Transform
-      pos: 64.5,-45.5
-      parent: 2
-  - uid: 10312
-    components:
-    - type: Transform
-      pos: 64.5,-44.5
-      parent: 2
-  - uid: 10655
-    components:
-    - type: Transform
-      pos: 61.5,-35.5
-      parent: 2
-  - uid: 10658
-    components:
-    - type: Transform
-      pos: 61.5,-40.5
+      rot: -1.5707963267948966 rad
+      pos: 67.5,-45.5
       parent: 2
   - uid: 10767
     components:
     - type: Transform
       pos: 70.5,-34.5
       parent: 2
+  - uid: 10781
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 63.5,-52.5
+      parent: 2
   - uid: 11012
     components:
     - type: Transform
@@ -107295,21 +111037,17 @@ entities:
     - type: Transform
       pos: 48.5,-16.5
       parent: 2
-  - uid: 11953
+  - uid: 12243
     components:
     - type: Transform
-      pos: 63.5,-54.5
+      rot: -1.5707963267948966 rad
+      pos: 55.5,-103.5
       parent: 2
   - uid: 12887
     components:
     - type: Transform
       pos: 69.5,-49.5
       parent: 2
-  - uid: 13436
-    components:
-    - type: Transform
-      pos: 49.5,-16.5
-      parent: 2
   - uid: 13575
     components:
     - type: Transform
@@ -107320,31 +111058,6 @@ entities:
     - type: Transform
       pos: 49.5,-17.5
       parent: 2
-  - uid: 13809
-    components:
-    - type: Transform
-      pos: 61.5,-32.5
-      parent: 2
-  - uid: 13810
-    components:
-    - type: Transform
-      pos: 63.5,-58.5
-      parent: 2
-  - uid: 13815
-    components:
-    - type: Transform
-      pos: 59.5,-60.5
-      parent: 2
-  - uid: 13841
-    components:
-    - type: Transform
-      pos: 60.5,-60.5
-      parent: 2
-  - uid: 13872
-    components:
-    - type: Transform
-      pos: 58.5,-59.5
-      parent: 2
   - uid: 13883
     components:
     - type: Transform
@@ -107375,11 +111088,6 @@ entities:
     - type: Transform
       pos: 43.5,-15.5
       parent: 2
-  - uid: 13909
-    components:
-    - type: Transform
-      pos: 63.5,-60.5
-      parent: 2
   - uid: 14271
     components:
     - type: Transform
@@ -107390,16 +111098,6 @@ entities:
     - type: Transform
       pos: 26.5,-9.5
       parent: 2
-  - uid: 14427
-    components:
-    - type: Transform
-      pos: 65.5,-48.5
-      parent: 2
-  - uid: 14585
-    components:
-    - type: Transform
-      pos: 72.5,-45.5
-      parent: 2
   - uid: 14625
     components:
     - type: Transform
@@ -107415,11 +111113,6 @@ entities:
     - type: Transform
       pos: 19.5,-32.5
       parent: 2
-  - uid: 14724
-    components:
-    - type: Transform
-      pos: 66.5,-48.5
-      parent: 2
   - uid: 14726
     components:
     - type: Transform
@@ -107480,51 +111173,11 @@ entities:
     - type: Transform
       pos: 26.5,-89.5
       parent: 2
-  - uid: 15444
-    components:
-    - type: Transform
-      pos: 66.5,-34.5
-      parent: 2
-  - uid: 15447
-    components:
-    - type: Transform
-      pos: 69.5,-32.5
-      parent: 2
-  - uid: 15472
-    components:
-    - type: Transform
-      pos: 72.5,-47.5
-      parent: 2
-  - uid: 15473
-    components:
-    - type: Transform
-      pos: 72.5,-46.5
-      parent: 2
-  - uid: 15474
-    components:
-    - type: Transform
-      pos: 68.5,-36.5
-      parent: 2
   - uid: 15476
     components:
     - type: Transform
       pos: 66.5,-35.5
       parent: 2
-  - uid: 15478
-    components:
-    - type: Transform
-      pos: 64.5,-47.5
-      parent: 2
-  - uid: 15482
-    components:
-    - type: Transform
-      pos: 72.5,-44.5
-      parent: 2
-  - uid: 15483
-    components:
-    - type: Transform
-      pos: 72.5,-49.5
-      parent: 2
   - uid: 15485
     components:
     - type: Transform
@@ -107585,41 +111238,11 @@ entities:
     - type: Transform
       pos: 9.5,13.5
       parent: 2
-  - uid: 15518
-    components:
-    - type: Transform
-      pos: 66.5,-37.5
-      parent: 2
   - uid: 15519
     components:
     - type: Transform
       pos: 69.5,-31.5
       parent: 2
-  - uid: 15883
-    components:
-    - type: Transform
-      pos: 67.5,-36.5
-      parent: 2
-  - uid: 15884
-    components:
-    - type: Transform
-      pos: 68.5,-30.5
-      parent: 2
-  - uid: 15908
-    components:
-    - type: Transform
-      pos: 69.5,-30.5
-      parent: 2
-  - uid: 15911
-    components:
-    - type: Transform
-      pos: 70.5,-39.5
-      parent: 2
-  - uid: 16051
-    components:
-    - type: Transform
-      pos: 67.5,-30.5
-      parent: 2
   - uid: 16108
     components:
     - type: Transform
@@ -107635,16 +111258,6 @@ entities:
     - type: Transform
       pos: 36.5,-94.5
       parent: 2
-  - uid: 16373
-    components:
-    - type: Transform
-      pos: 61.5,-31.5
-      parent: 2
-  - uid: 16876
-    components:
-    - type: Transform
-      pos: 62.5,-59.5
-      parent: 2
   - uid: 16982
     components:
     - type: Transform
@@ -107655,16 +111268,6 @@ entities:
     - type: Transform
       pos: 34.5,-80.5
       parent: 2
-  - uid: 17105
-    components:
-    - type: Transform
-      pos: 57.5,-54.5
-      parent: 2
-  - uid: 17106
-    components:
-    - type: Transform
-      pos: 57.5,-55.5
-      parent: 2
   - uid: 17138
     components:
     - type: Transform
@@ -107675,36 +111278,6 @@ entities:
     - type: Transform
       pos: -30.5,-58.5
       parent: 2
-  - uid: 17151
-    components:
-    - type: Transform
-      pos: 57.5,-56.5
-      parent: 2
-  - uid: 17152
-    components:
-    - type: Transform
-      pos: 57.5,-57.5
-      parent: 2
-  - uid: 17162
-    components:
-    - type: Transform
-      pos: 57.5,-58.5
-      parent: 2
-  - uid: 17166
-    components:
-    - type: Transform
-      pos: 57.5,-59.5
-      parent: 2
-  - uid: 17211
-    components:
-    - type: Transform
-      pos: 61.5,-44.5
-      parent: 2
-  - uid: 17268
-    components:
-    - type: Transform
-      pos: 69.5,-36.5
-      parent: 2
   - uid: 17277
     components:
     - type: Transform
@@ -107745,11 +111318,6 @@ entities:
     - type: Transform
       pos: 69.5,-26.5
       parent: 2
-  - uid: 17608
-    components:
-    - type: Transform
-      pos: 20.5,-24.5
-      parent: 2
   - uid: 17666
     components:
     - type: Transform
@@ -107775,11 +111343,6 @@ entities:
     - type: Transform
       pos: 66.5,-26.5
       parent: 2
-  - uid: 17993
-    components:
-    - type: Transform
-      pos: 67.5,-39.5
-      parent: 2
   - uid: 17994
     components:
     - type: Transform
@@ -107905,6 +111468,21 @@ entities:
     - type: Transform
       pos: 20.5,-32.5
       parent: 2
+  - uid: 19723
+    components:
+    - type: Transform
+      pos: 57.5,-101.5
+      parent: 2
+  - uid: 19724
+    components:
+    - type: Transform
+      pos: 56.5,-96.5
+      parent: 2
+  - uid: 19725
+    components:
+    - type: Transform
+      pos: 55.5,-95.5
+      parent: 2
 - proto: WallReinforcedChitin
   entities:
   - uid: 39
@@ -107952,11 +111530,6 @@ entities:
     - type: Transform
       pos: 66.5,-75.5
       parent: 2
-  - uid: 255
-    components:
-    - type: Transform
-      pos: 57.5,-61.5
-      parent: 2
   - uid: 259
     components:
     - type: Transform
@@ -107967,16 +111540,16 @@ entities:
     - type: Transform
       pos: -24.5,-23.5
       parent: 2
+  - uid: 284
+    components:
+    - type: Transform
+      pos: 30.5,-11.5
+      parent: 2
   - uid: 311
     components:
     - type: Transform
       pos: -16.5,-14.5
       parent: 2
-  - uid: 386
-    components:
-    - type: Transform
-      pos: 73.5,-47.5
-      parent: 2
   - uid: 388
     components:
     - type: Transform
@@ -108012,6 +111585,22 @@ entities:
     - type: Transform
       pos: -8.5,-14.5
       parent: 2
+  - uid: 452
+    components:
+    - type: Transform
+      pos: 33.5,-11.5
+      parent: 2
+  - uid: 453
+    components:
+    - type: Transform
+      pos: 28.5,-20.5
+      parent: 2
+  - uid: 467
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 79.5,-42.5
+      parent: 2
   - uid: 500
     components:
     - type: Transform
@@ -108072,6 +111661,11 @@ entities:
     - type: Transform
       pos: 12.5,-37.5
       parent: 2
+  - uid: 514
+    components:
+    - type: Transform
+      pos: 69.5,-55.5
+      parent: 2
   - uid: 521
     components:
     - type: Transform
@@ -108377,6 +111971,12 @@ entities:
     - type: Transform
       pos: 8.5,-44.5
       parent: 2
+  - uid: 792
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 71.5,-37.5
+      parent: 2
   - uid: 816
     components:
     - type: Transform
@@ -108622,25 +112222,10 @@ entities:
     - type: Transform
       pos: 28.5,-9.5
       parent: 2
-  - uid: 915
-    components:
-    - type: Transform
-      pos: 26.5,-14.5
-      parent: 2
-  - uid: 916
-    components:
-    - type: Transform
-      pos: 26.5,-17.5
-      parent: 2
   - uid: 917
     components:
     - type: Transform
-      pos: 26.5,-18.5
-      parent: 2
-  - uid: 918
-    components:
-    - type: Transform
-      pos: 26.5,-21.5
+      pos: 28.5,-17.5
       parent: 2
   - uid: 954
     components:
@@ -108697,6 +112282,12 @@ entities:
     - type: Transform
       pos: -38.5,-30.5
       parent: 2
+  - uid: 1061
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 53.5,-27.5
+      parent: 2
   - uid: 1064
     components:
     - type: Transform
@@ -111277,16 +114868,6 @@ entities:
     - type: Transform
       pos: -58.5,-68.5
       parent: 2
-  - uid: 2218
-    components:
-    - type: Transform
-      pos: 56.5,-40.5
-      parent: 2
-  - uid: 2219
-    components:
-    - type: Transform
-      pos: 56.5,-38.5
-      parent: 2
   - uid: 2222
     components:
     - type: Transform
@@ -111302,6 +114883,11 @@ entities:
     - type: Transform
       pos: -57.5,-69.5
       parent: 2
+  - uid: 2249
+    components:
+    - type: Transform
+      pos: 47.5,-40.5
+      parent: 2
   - uid: 2253
     components:
     - type: Transform
@@ -111367,11 +114953,6 @@ entities:
     - type: Transform
       pos: -15.5,-33.5
       parent: 2
-  - uid: 2294
-    components:
-    - type: Transform
-      pos: 58.5,-61.5
-      parent: 2
   - uid: 2295
     components:
     - type: Transform
@@ -111932,11 +115513,6 @@ entities:
     - type: Transform
       pos: 28.5,-80.5
       parent: 2
-  - uid: 2756
-    components:
-    - type: Transform
-      pos: 56.5,-32.5
-      parent: 2
   - uid: 2805
     components:
     - type: Transform
@@ -111987,6 +115563,11 @@ entities:
     - type: Transform
       pos: -15.5,-36.5
       parent: 2
+  - uid: 2931
+    components:
+    - type: Transform
+      pos: 63.5,-55.5
+      parent: 2
   - uid: 2946
     components:
     - type: Transform
@@ -112187,6 +115768,16 @@ entities:
     - type: Transform
       pos: 63.5,-76.5
       parent: 2
+  - uid: 3019
+    components:
+    - type: Transform
+      pos: 95.5,-44.5
+      parent: 2
+  - uid: 3020
+    components:
+    - type: Transform
+      pos: 95.5,-46.5
+      parent: 2
   - uid: 3035
     components:
     - type: Transform
@@ -112230,7 +115821,8 @@ entities:
   - uid: 3053
     components:
     - type: Transform
-      pos: 67.5,-54.5
+      rot: 1.5707963267948966 rad
+      pos: 54.5,-26.5
       parent: 2
   - uid: 3069
     components:
@@ -112242,10 +115834,29 @@ entities:
     - type: Transform
       pos: 64.5,-22.5
       parent: 2
+  - uid: 3072
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-49.5
+      parent: 2
+  - uid: 3083
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-48.5
+      parent: 2
   - uid: 3086
     components:
     - type: Transform
-      pos: 72.5,-54.5
+      rot: 1.5707963267948966 rad
+      pos: 51.5,-30.5
+      parent: 2
+  - uid: 3087
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 51.5,-27.5
       parent: 2
   - uid: 3088
     components:
@@ -112255,7 +115866,8 @@ entities:
   - uid: 3093
     components:
     - type: Transform
-      pos: 66.5,-52.5
+      rot: 1.5707963267948966 rad
+      pos: 52.5,-27.5
       parent: 2
   - uid: 3096
     components:
@@ -112327,16 +115939,6 @@ entities:
     - type: Transform
       pos: 71.5,-73.5
       parent: 2
-  - uid: 3137
-    components:
-    - type: Transform
-      pos: 72.5,-72.5
-      parent: 2
-  - uid: 3138
-    components:
-    - type: Transform
-      pos: 72.5,-73.5
-      parent: 2
   - uid: 3139
     components:
     - type: Transform
@@ -112347,45 +115949,22 @@ entities:
     - type: Transform
       pos: 78.5,-72.5
       parent: 2
-  - uid: 3162
+  - uid: 3142
     components:
     - type: Transform
-      pos: 76.5,-66.5
+      rot: -1.5707963267948966 rad
+      pos: 78.5,-40.5
       parent: 2
-  - uid: 3163
+  - uid: 3175
     components:
     - type: Transform
-      pos: 77.5,-66.5
-      parent: 2
-  - uid: 3164
-    components:
-    - type: Transform
-      pos: 78.5,-66.5
-      parent: 2
-  - uid: 3200
-    components:
-    - type: Transform
-      pos: 73.5,-43.5
+      pos: 84.5,-47.5
       parent: 2
   - uid: 3201
     components:
     - type: Transform
-      pos: 76.5,-62.5
-      parent: 2
-  - uid: 3202
-    components:
-    - type: Transform
-      pos: 73.5,-42.5
-      parent: 2
-  - uid: 3213
-    components:
-    - type: Transform
-      pos: 77.5,-62.5
-      parent: 2
-  - uid: 3214
-    components:
-    - type: Transform
-      pos: 78.5,-62.5
+      rot: 1.5707963267948966 rad
+      pos: 71.5,-30.5
       parent: 2
   - uid: 3218
     components:
@@ -112462,11 +116041,6 @@ entities:
     - type: Transform
       pos: 82.5,-65.5
       parent: 2
-  - uid: 3234
-    components:
-    - type: Transform
-      pos: 73.5,-41.5
-      parent: 2
   - uid: 3235
     components:
     - type: Transform
@@ -112662,21 +116236,6 @@ entities:
     - type: Transform
       pos: 85.5,-71.5
       parent: 2
-  - uid: 3277
-    components:
-    - type: Transform
-      pos: 75.5,-43.5
-      parent: 2
-  - uid: 3281
-    components:
-    - type: Transform
-      pos: 75.5,-47.5
-      parent: 2
-  - uid: 3282
-    components:
-    - type: Transform
-      pos: 75.5,-48.5
-      parent: 2
   - uid: 3293
     components:
     - type: Transform
@@ -112727,16 +116286,23 @@ entities:
     - type: Transform
       pos: 81.5,-56.5
       parent: 2
-  - uid: 3309
-    components:
-    - type: Transform
-      pos: 74.5,-55.5
-      parent: 2
   - uid: 3310
     components:
     - type: Transform
       pos: 73.5,-55.5
       parent: 2
+  - uid: 3311
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-51.5
+      parent: 2
+  - uid: 3319
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-47.5
+      parent: 2
   - uid: 3366
     components:
     - type: Transform
@@ -112762,6 +116328,12 @@ entities:
     - type: Transform
       pos: -37.5,-66.5
       parent: 2
+  - uid: 3397
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.5,-50.5
+      parent: 2
   - uid: 3404
     components:
     - type: Transform
@@ -112827,15 +116399,10 @@ entities:
     - type: Transform
       pos: 77.5,-48.5
       parent: 2
-  - uid: 3423
+  - uid: 3425
     components:
     - type: Transform
-      pos: 76.5,-48.5
-      parent: 2
-  - uid: 3428
-    components:
-    - type: Transform
-      pos: 76.5,-42.5
+      pos: 57.5,-74.5
       parent: 2
   - uid: 3429
     components:
@@ -112872,55 +116439,27 @@ entities:
     - type: Transform
       pos: 80.5,-39.5
       parent: 2
-  - uid: 3458
-    components:
-    - type: Transform
-      pos: 71.5,-39.5
-      parent: 2
-  - uid: 3466
-    components:
-    - type: Transform
-      pos: 64.5,-55.5
-      parent: 2
-  - uid: 3469
-    components:
-    - type: Transform
-      pos: 64.5,-53.5
-      parent: 2
   - uid: 3537
     components:
     - type: Transform
-      pos: 70.5,-29.5
+      pos: 63.5,-54.5
       parent: 2
-  - uid: 3538
+  - uid: 3547
     components:
     - type: Transform
-      pos: 70.5,-30.5
+      rot: 1.5707963267948966 rad
+      pos: 52.5,-30.5
       parent: 2
-  - uid: 3539
+  - uid: 3553
     components:
     - type: Transform
-      pos: 70.5,-31.5
+      pos: 30.5,-10.5
       parent: 2
-  - uid: 3540
+  - uid: 3557
     components:
     - type: Transform
-      pos: 70.5,-32.5
-      parent: 2
-  - uid: 3569
-    components:
-    - type: Transform
-      pos: 56.5,-42.5
-      parent: 2
-  - uid: 3570
-    components:
-    - type: Transform
-      pos: 56.5,-43.5
-      parent: 2
-  - uid: 3571
-    components:
-    - type: Transform
-      pos: 56.5,-44.5
+      rot: 1.5707963267948966 rad
+      pos: 49.5,-31.5
       parent: 2
   - uid: 3572
     components:
@@ -112937,60 +116476,133 @@ entities:
     - type: Transform
       pos: 80.5,-38.5
       parent: 2
-  - uid: 3616
+  - uid: 3612
     components:
     - type: Transform
-      pos: 56.5,-37.5
+      pos: 53.5,-22.5
       parent: 2
-  - uid: 3621
+  - uid: 3614
     components:
     - type: Transform
-      pos: 56.5,-33.5
+      rot: 1.5707963267948966 rad
+      pos: 49.5,-30.5
       parent: 2
   - uid: 3631
     components:
     - type: Transform
-      pos: 70.5,-28.5
-      parent: 2
-  - uid: 3632
-    components:
-    - type: Transform
-      pos: 70.5,-27.5
+      pos: 68.5,-55.5
       parent: 2
   - uid: 3633
     components:
     - type: Transform
       pos: 70.5,-26.5
       parent: 2
-  - uid: 3634
+  - uid: 3739
     components:
     - type: Transform
-      pos: 70.5,-25.5
+      rot: 3.141592653589793 rad
+      pos: 80.5,-42.5
       parent: 2
-  - uid: 3649
+  - uid: 3756
     components:
     - type: Transform
-      pos: 56.5,-25.5
+      pos: 83.5,-43.5
       parent: 2
-  - uid: 3650
+  - uid: 3772
     components:
     - type: Transform
-      pos: 56.5,-26.5
+      rot: 1.5707963267948966 rad
+      pos: 74.5,-46.5
       parent: 2
-  - uid: 3651
+  - uid: 3773
     components:
     - type: Transform
-      pos: 56.5,-27.5
+      rot: 1.5707963267948966 rad
+      pos: 74.5,-48.5
       parent: 2
-  - uid: 3652
+  - uid: 3797
     components:
     - type: Transform
-      pos: 56.5,-28.5
+      rot: 1.5707963267948966 rad
+      pos: 71.5,-36.5
       parent: 2
-  - uid: 3777
+  - uid: 3814
     components:
     - type: Transform
-      pos: 56.5,-30.5
+      rot: 1.5707963267948966 rad
+      pos: 94.5,-39.5
+      parent: 2
+  - uid: 3815
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 94.5,-38.5
+      parent: 2
+  - uid: 3823
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 96.5,-40.5
+      parent: 2
+  - uid: 3824
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 97.5,-41.5
+      parent: 2
+  - uid: 3825
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 96.5,-41.5
+      parent: 2
+  - uid: 3826
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 98.5,-43.5
+      parent: 2
+  - uid: 3846
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 97.5,-49.5
+      parent: 2
+  - uid: 3847
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 98.5,-48.5
+      parent: 2
+  - uid: 3848
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 96.5,-49.5
+      parent: 2
+  - uid: 3849
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 98.5,-47.5
+      parent: 2
+  - uid: 3850
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 98.5,-44.5
+      parent: 2
+  - uid: 3851
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 98.5,-45.5
+      parent: 2
+  - uid: 3852
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 98.5,-46.5
       parent: 2
   - uid: 3870
     components:
@@ -113047,6 +116659,30 @@ entities:
     - type: Transform
       pos: 81.5,-35.5
       parent: 2
+  - uid: 3902
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 95.5,-40.5
+      parent: 2
+  - uid: 3903
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 95.5,-39.5
+      parent: 2
+  - uid: 3908
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 77.5,-40.5
+      parent: 2
+  - uid: 3910
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 75.5,-40.5
+      parent: 2
   - uid: 3917
     components:
     - type: Transform
@@ -113062,6 +116698,18 @@ entities:
     - type: Transform
       pos: 82.5,-30.5
       parent: 2
+  - uid: 3924
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 74.5,-40.5
+      parent: 2
+  - uid: 3925
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 71.5,-35.5
+      parent: 2
   - uid: 3965
     components:
     - type: Transform
@@ -113447,11 +117095,6 @@ entities:
     - type: Transform
       pos: 67.5,-18.5
       parent: 2
-  - uid: 4086
-    components:
-    - type: Transform
-      pos: 50.5,-22.5
-      parent: 2
   - uid: 4087
     components:
     - type: Transform
@@ -113487,21 +117130,6 @@ entities:
     - type: Transform
       pos: 69.5,-22.5
       parent: 2
-  - uid: 4099
-    components:
-    - type: Transform
-      pos: 69.5,-54.5
-      parent: 2
-  - uid: 4100
-    components:
-    - type: Transform
-      pos: 70.5,-54.5
-      parent: 2
-  - uid: 4109
-    components:
-    - type: Transform
-      pos: 56.5,-47.5
-      parent: 2
   - uid: 4112
     components:
     - type: Transform
@@ -113667,16 +117295,6 @@ entities:
     - type: Transform
       pos: 41.5,-20.5
       parent: 2
-  - uid: 4219
-    components:
-    - type: Transform
-      pos: 32.5,-10.5
-      parent: 2
-  - uid: 4220
-    components:
-    - type: Transform
-      pos: 32.5,-9.5
-      parent: 2
   - uid: 4236
     components:
     - type: Transform
@@ -113837,6 +117455,11 @@ entities:
     - type: Transform
       pos: 30.5,-68.5
       parent: 2
+  - uid: 4305
+    components:
+    - type: Transform
+      pos: 56.5,-73.5
+      parent: 2
   - uid: 4314
     components:
     - type: Transform
@@ -114007,80 +117630,20 @@ entities:
     - type: Transform
       pos: -15.5,-28.5
       parent: 2
-  - uid: 4560
-    components:
-    - type: Transform
-      pos: 32.5,-23.5
-      parent: 2
   - uid: 4561
     components:
     - type: Transform
       pos: 32.5,-21.5
       parent: 2
-  - uid: 4562
-    components:
-    - type: Transform
-      pos: 32.5,-20.5
-      parent: 2
-  - uid: 4610
-    components:
-    - type: Transform
-      pos: 32.5,-19.5
-      parent: 2
-  - uid: 4613
-    components:
-    - type: Transform
-      pos: 32.5,-18.5
-      parent: 2
-  - uid: 4614
-    components:
-    - type: Transform
-      pos: 32.5,-17.5
-      parent: 2
-  - uid: 4615
-    components:
-    - type: Transform
-      pos: 32.5,-16.5
-      parent: 2
-  - uid: 4616
-    components:
-    - type: Transform
-      pos: 32.5,-15.5
-      parent: 2
   - uid: 4617
     components:
     - type: Transform
-      pos: 32.5,-14.5
-      parent: 2
-  - uid: 4618
-    components:
-    - type: Transform
-      pos: 32.5,-13.5
+      pos: 28.5,-21.5
       parent: 2
   - uid: 4624
     components:
     - type: Transform
-      pos: 32.5,-12.5
-      parent: 2
-  - uid: 4625
-    components:
-    - type: Transform
-      pos: 32.5,-11.5
-      parent: 2
-  - uid: 4626
-    components:
-    - type: Transform
-      pos: 29.5,-13.5
-      parent: 2
-  - uid: 4627
-    components:
-    - type: Transform
-      pos: 29.5,-12.5
-      parent: 2
-  - uid: 4628
-    components:
-    - type: Transform
-      pos: 29.5,-11.5
+      pos: 30.5,-14.5
       parent: 2
   - uid: 4629
     components:
@@ -114137,6 +117700,11 @@ entities:
     - type: Transform
       pos: 34.5,-73.5
       parent: 2
+  - uid: 4810
+    components:
+    - type: Transform
+      pos: 70.5,-55.5
+      parent: 2
   - uid: 4829
     components:
     - type: Transform
@@ -114147,26 +117715,11 @@ entities:
     - type: Transform
       pos: -10.5,-68.5
       parent: 2
-  - uid: 4907
-    components:
-    - type: Transform
-      pos: 71.5,-54.5
-      parent: 2
-  - uid: 4913
-    components:
-    - type: Transform
-      pos: 67.5,-53.5
-      parent: 2
   - uid: 4914
     components:
     - type: Transform
       pos: 39.5,-18.5
       parent: 2
-  - uid: 4915
-    components:
-    - type: Transform
-      pos: 66.5,-53.5
-      parent: 2
   - uid: 4918
     components:
     - type: Transform
@@ -114207,6 +117760,12 @@ entities:
     - type: Transform
       pos: 54.5,-60.5
       parent: 2
+  - uid: 5110
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 33.5,-21.5
+      parent: 2
   - uid: 5185
     components:
     - type: Transform
@@ -114222,20 +117781,21 @@ entities:
     - type: Transform
       pos: -62.5,-64.5
       parent: 2
-  - uid: 5381
+  - uid: 5276
     components:
     - type: Transform
-      pos: 56.5,-36.5
+      pos: 49.5,-37.5
       parent: 2
-  - uid: 5388
+  - uid: 5315
     components:
     - type: Transform
-      pos: 56.5,-34.5
+      rot: 3.141592653589793 rad
+      pos: 79.5,-48.5
       parent: 2
-  - uid: 5437
+  - uid: 5322
     components:
     - type: Transform
-      pos: 64.5,-54.5
+      pos: 84.5,-43.5
       parent: 2
   - uid: 5497
     components:
@@ -114272,6 +117832,11 @@ entities:
     - type: Transform
       pos: 74.5,-72.5
       parent: 2
+  - uid: 5607
+    components:
+    - type: Transform
+      pos: 38.5,-77.5
+      parent: 2
   - uid: 5740
     components:
     - type: Transform
@@ -114292,6 +117857,18 @@ entities:
     - type: Transform
       pos: 22.5,-63.5
       parent: 2
+  - uid: 5813
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 74.5,-49.5
+      parent: 2
+  - uid: 5814
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 74.5,-47.5
+      parent: 2
   - uid: 5819
     components:
     - type: Transform
@@ -114307,11 +117884,38 @@ entities:
     - type: Transform
       pos: -9.5,-72.5
       parent: 2
+  - uid: 5894
+    components:
+    - type: Transform
+      pos: 73.5,-37.5
+      parent: 2
+  - uid: 5895
+    components:
+    - type: Transform
+      pos: 73.5,-36.5
+      parent: 2
+  - uid: 6009
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 71.5,-29.5
+      parent: 2
+  - uid: 6012
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 71.5,-31.5
+      parent: 2
   - uid: 6037
     components:
     - type: Transform
       pos: 43.5,-61.5
       parent: 2
+  - uid: 6041
+    components:
+    - type: Transform
+      pos: 64.5,-54.5
+      parent: 2
   - uid: 6062
     components:
     - type: Transform
@@ -114382,10 +117986,11 @@ entities:
     - type: Transform
       pos: 82.5,-19.5
       parent: 2
-  - uid: 6639
+  - uid: 6638
     components:
     - type: Transform
-      pos: 82.5,-43.5
+      rot: 3.141592653589793 rad
+      pos: 80.5,-48.5
       parent: 2
   - uid: 6669
     components:
@@ -114397,30 +118002,63 @@ entities:
     - type: Transform
       pos: 39.5,-59.5
       parent: 2
-  - uid: 7124
+  - uid: 7119
     components:
     - type: Transform
-      pos: 75.5,-44.5
-      parent: 2
-  - uid: 7127
-    components:
-    - type: Transform
-      pos: 75.5,-42.5
-      parent: 2
-  - uid: 7128
-    components:
-    - type: Transform
-      pos: 75.5,-46.5
+      pos: 54.5,-31.5
       parent: 2
   - uid: 7134
     components:
     - type: Transform
       pos: 39.5,-61.5
       parent: 2
-  - uid: 7189
+  - uid: 7165
     components:
     - type: Transform
-      pos: 71.5,-38.5
+      rot: -1.5707963267948966 rad
+      pos: 88.5,-50.5
+      parent: 2
+  - uid: 7171
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 89.5,-48.5
+      parent: 2
+  - uid: 7180
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 88.5,-48.5
+      parent: 2
+  - uid: 7182
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 88.5,-40.5
+      parent: 2
+  - uid: 7185
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 87.5,-40.5
+      parent: 2
+  - uid: 7186
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 87.5,-50.5
+      parent: 2
+  - uid: 7220
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 61.5,-53.5
+      parent: 2
+  - uid: 7235
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 59.5,-53.5
       parent: 2
   - uid: 7241
     components:
@@ -114442,15 +118080,28 @@ entities:
     - type: Transform
       pos: 51.5,-79.5
       parent: 2
-  - uid: 7339
+  - uid: 7263
     components:
     - type: Transform
-      pos: 82.5,-42.5
+      rot: -1.5707963267948966 rad
+      pos: 58.5,-53.5
       parent: 2
-  - uid: 7341
+  - uid: 7269
     components:
     - type: Transform
-      pos: 83.5,-42.5
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-53.5
+      parent: 2
+  - uid: 7270
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 60.5,-53.5
+      parent: 2
+  - uid: 7326
+    components:
+    - type: Transform
+      pos: 83.5,-47.5
       parent: 2
   - uid: 7343
     components:
@@ -114467,31 +118118,11 @@ entities:
     - type: Transform
       pos: 86.5,-42.5
       parent: 2
-  - uid: 7347
-    components:
-    - type: Transform
-      pos: 84.5,-40.5
-      parent: 2
-  - uid: 7348
-    components:
-    - type: Transform
-      pos: 85.5,-40.5
-      parent: 2
   - uid: 7349
     components:
     - type: Transform
       pos: 86.5,-40.5
       parent: 2
-  - uid: 7350
-    components:
-    - type: Transform
-      pos: 85.5,-39.5
-      parent: 2
-  - uid: 7351
-    components:
-    - type: Transform
-      pos: 86.5,-39.5
-      parent: 2
   - uid: 7352
     components:
     - type: Transform
@@ -114552,116 +118183,21 @@ entities:
     - type: Transform
       pos: 88.5,-38.5
       parent: 2
-  - uid: 7364
-    components:
-    - type: Transform
-      pos: 87.5,-38.5
-      parent: 2
-  - uid: 7365
-    components:
-    - type: Transform
-      pos: 86.5,-38.5
-      parent: 2
-  - uid: 7366
-    components:
-    - type: Transform
-      pos: 92.5,-40.5
-      parent: 2
-  - uid: 7367
-    components:
-    - type: Transform
-      pos: 93.5,-40.5
-      parent: 2
   - uid: 7368
     components:
     - type: Transform
       pos: 94.5,-40.5
       parent: 2
-  - uid: 7369
-    components:
-    - type: Transform
-      pos: 93.5,-41.5
-      parent: 2
-  - uid: 7370
-    components:
-    - type: Transform
-      pos: 94.5,-41.5
-      parent: 2
   - uid: 7371
     components:
     - type: Transform
       pos: 95.5,-41.5
       parent: 2
-  - uid: 7372
-    components:
-    - type: Transform
-      pos: 94.5,-42.5
-      parent: 2
-  - uid: 7373
-    components:
-    - type: Transform
-      pos: 95.5,-42.5
-      parent: 2
   - uid: 7374
     components:
     - type: Transform
       pos: 96.5,-42.5
       parent: 2
-  - uid: 7375
-    components:
-    - type: Transform
-      pos: 95.5,-43.5
-      parent: 2
-  - uid: 7376
-    components:
-    - type: Transform
-      pos: 95.5,-44.5
-      parent: 2
-  - uid: 7377
-    components:
-    - type: Transform
-      pos: 95.5,-45.5
-      parent: 2
-  - uid: 7378
-    components:
-    - type: Transform
-      pos: 95.5,-46.5
-      parent: 2
-  - uid: 7379
-    components:
-    - type: Transform
-      pos: 95.5,-47.5
-      parent: 2
-  - uid: 7380
-    components:
-    - type: Transform
-      pos: 95.5,-48.5
-      parent: 2
-  - uid: 7381
-    components:
-    - type: Transform
-      pos: 96.5,-43.5
-      parent: 2
-  - uid: 7382
-    components:
-    - type: Transform
-      pos: 96.5,-44.5
-      parent: 2
-  - uid: 7383
-    components:
-    - type: Transform
-      pos: 96.5,-45.5
-      parent: 2
-  - uid: 7384
-    components:
-    - type: Transform
-      pos: 96.5,-46.5
-      parent: 2
-  - uid: 7385
-    components:
-    - type: Transform
-      pos: 96.5,-47.5
-      parent: 2
   - uid: 7386
     components:
     - type: Transform
@@ -114672,36 +118208,11 @@ entities:
     - type: Transform
       pos: 95.5,-49.5
       parent: 2
-  - uid: 7388
-    components:
-    - type: Transform
-      pos: 94.5,-49.5
-      parent: 2
-  - uid: 7389
-    components:
-    - type: Transform
-      pos: 93.5,-49.5
-      parent: 2
-  - uid: 7390
-    components:
-    - type: Transform
-      pos: 94.5,-48.5
-      parent: 2
   - uid: 7391
     components:
     - type: Transform
       pos: 94.5,-50.5
       parent: 2
-  - uid: 7392
-    components:
-    - type: Transform
-      pos: 93.5,-50.5
-      parent: 2
-  - uid: 7393
-    components:
-    - type: Transform
-      pos: 92.5,-50.5
-      parent: 2
   - uid: 7394
     components:
     - type: Transform
@@ -114737,16 +118248,6 @@ entities:
     - type: Transform
       pos: 87.5,-51.5
       parent: 2
-  - uid: 7401
-    components:
-    - type: Transform
-      pos: 86.5,-51.5
-      parent: 2
-  - uid: 7402
-    components:
-    - type: Transform
-      pos: 85.5,-51.5
-      parent: 2
   - uid: 7403
     components:
     - type: Transform
@@ -114772,41 +118273,11 @@ entities:
     - type: Transform
       pos: 88.5,-52.5
       parent: 2
-  - uid: 7408
-    components:
-    - type: Transform
-      pos: 87.5,-52.5
-      parent: 2
-  - uid: 7409
-    components:
-    - type: Transform
-      pos: 86.5,-52.5
-      parent: 2
-  - uid: 7410
-    components:
-    - type: Transform
-      pos: 84.5,-50.5
-      parent: 2
-  - uid: 7411
-    components:
-    - type: Transform
-      pos: 85.5,-50.5
-      parent: 2
   - uid: 7412
     components:
     - type: Transform
       pos: 86.5,-50.5
       parent: 2
-  - uid: 7413
-    components:
-    - type: Transform
-      pos: 82.5,-48.5
-      parent: 2
-  - uid: 7414
-    components:
-    - type: Transform
-      pos: 83.5,-48.5
-      parent: 2
   - uid: 7415
     components:
     - type: Transform
@@ -114822,16 +118293,6 @@ entities:
     - type: Transform
       pos: 86.5,-48.5
       parent: 2
-  - uid: 7421
-    components:
-    - type: Transform
-      pos: 93.5,-44.5
-      parent: 2
-  - uid: 7423
-    components:
-    - type: Transform
-      pos: 93.5,-46.5
-      parent: 2
   - uid: 7457
     components:
     - type: Transform
@@ -114847,35 +118308,132 @@ entities:
     - type: Transform
       pos: -63.5,-64.5
       parent: 2
+  - uid: 7529
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 90.5,-45.5
+      parent: 2
+  - uid: 7531
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 90.5,-44.5
+      parent: 2
+  - uid: 7538
+    components:
+    - type: Transform
+      pos: 59.5,-77.5
+      parent: 2
+  - uid: 7542
+    components:
+    - type: Transform
+      pos: 58.5,-78.5
+      parent: 2
+  - uid: 7544
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 73.5,-51.5
+      parent: 2
+  - uid: 7595
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 77.5,-47.5
+      parent: 2
+  - uid: 7596
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 77.5,-46.5
+      parent: 2
+  - uid: 7599
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 90.5,-46.5
+      parent: 2
+  - uid: 7607
+    components:
+    - type: Transform
+      pos: 72.5,-55.5
+      parent: 2
+  - uid: 7616
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 77.5,-43.5
+      parent: 2
+  - uid: 7618
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 77.5,-44.5
+      parent: 2
+  - uid: 7654
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 97.5,-43.5
+      parent: 2
+  - uid: 7657
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 97.5,-42.5
+      parent: 2
+  - uid: 7707
+    components:
+    - type: Transform
+      pos: 30.5,-13.5
+      parent: 2
+  - uid: 7727
+    components:
+    - type: Transform
+      pos: 74.5,-45.5
+      parent: 2
+  - uid: 7743
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-52.5
+      parent: 2
+  - uid: 7746
+    components:
+    - type: Transform
+      pos: 29.5,-21.5
+      parent: 2
   - uid: 7747
     components:
     - type: Transform
-      pos: 64.5,-59.5
+      pos: 49.5,-39.5
       parent: 2
-  - uid: 7765
+  - uid: 7776
     components:
     - type: Transform
-      pos: 31.5,-17.5
+      pos: 57.5,-76.5
+      parent: 2
+  - uid: 7787
+    components:
+    - type: Transform
+      pos: 30.5,-12.5
       parent: 2
   - uid: 7788
     components:
     - type: Transform
       pos: 29.5,-14.5
       parent: 2
-  - uid: 7794
+  - uid: 7791
     components:
     - type: Transform
-      pos: 27.5,-14.5
+      pos: 28.5,-16.5
       parent: 2
-  - uid: 7939
+  - uid: 7908
     components:
     - type: Transform
-      pos: 56.5,-56.5
-      parent: 2
-  - uid: 7940
-    components:
-    - type: Transform
-      pos: 56.5,-57.5
+      rot: 1.5707963267948966 rad
+      pos: 37.5,-17.5
       parent: 2
   - uid: 7972
     components:
@@ -114887,16 +118445,31 @@ entities:
     - type: Transform
       pos: 29.5,-64.5
       parent: 2
+  - uid: 7988
+    components:
+    - type: Transform
+      pos: 65.5,-54.5
+      parent: 2
   - uid: 7994
     components:
     - type: Transform
       pos: 71.5,-55.5
       parent: 2
+  - uid: 8003
+    components:
+    - type: Transform
+      pos: 66.5,-55.5
+      parent: 2
   - uid: 8018
     components:
     - type: Transform
       pos: -22.5,-15.5
       parent: 2
+  - uid: 8029
+    components:
+    - type: Transform
+      pos: 47.5,-39.5
+      parent: 2
   - uid: 8032
     components:
     - type: Transform
@@ -114907,10 +118480,16 @@ entities:
     - type: Transform
       pos: -44.5,-76.5
       parent: 2
-  - uid: 8127
+  - uid: 8088
     components:
     - type: Transform
-      pos: 62.5,-61.5
+      pos: 49.5,-34.5
+      parent: 2
+  - uid: 8114
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 50.5,-27.5
       parent: 2
   - uid: 8136
     components:
@@ -114922,10 +118501,10 @@ entities:
     - type: Transform
       pos: 19.5,-59.5
       parent: 2
-  - uid: 8161
+  - uid: 8173
     components:
     - type: Transform
-      pos: 61.5,-61.5
+      pos: 50.5,-39.5
       parent: 2
   - uid: 8175
     components:
@@ -114947,71 +118526,218 @@ entities:
     - type: Transform
       pos: 39.5,-77.5
       parent: 2
-  - uid: 8564
+  - uid: 8387
     components:
     - type: Transform
-      pos: 37.5,-12.5
+      pos: 48.5,-36.5
       parent: 2
-  - uid: 8565
+  - uid: 8389
     components:
     - type: Transform
-      pos: 37.5,-13.5
+      pos: 48.5,-37.5
+      parent: 2
+  - uid: 8390
+    components:
+    - type: Transform
+      pos: 48.5,-35.5
+      parent: 2
+  - uid: 8391
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 49.5,-38.5
+      parent: 2
+  - uid: 8403
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 50.5,-30.5
+      parent: 2
+  - uid: 8404
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 49.5,-28.5
+      parent: 2
+  - uid: 8405
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 97.5,-45.5
+      parent: 2
+  - uid: 8413
+    components:
+    - type: Transform
+      pos: 49.5,-35.5
       parent: 2
   - uid: 8567
     components:
     - type: Transform
       pos: 38.5,-20.5
       parent: 2
-  - uid: 8570
+  - uid: 8574
     components:
     - type: Transform
-      pos: 73.5,-46.5
+      pos: 51.5,-39.5
       parent: 2
-  - uid: 8575
+  - uid: 8578
     components:
     - type: Transform
-      pos: 33.5,-19.5
+      rot: 1.5707963267948966 rad
+      pos: 54.5,-28.5
+      parent: 2
+  - uid: 8589
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 97.5,-46.5
+      parent: 2
+  - uid: 8590
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 97.5,-44.5
+      parent: 2
+  - uid: 8591
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 97.5,-48.5
+      parent: 2
+  - uid: 8606
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 98.5,-42.5
+      parent: 2
+  - uid: 8608
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 97.5,-47.5
+      parent: 2
+  - uid: 8609
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 94.5,-52.5
+      parent: 2
+  - uid: 8611
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 74.5,-50.5
+      parent: 2
+  - uid: 8627
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 71.5,-28.5
+      parent: 2
+  - uid: 8629
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 95.5,-51.5
       parent: 2
   - uid: 8631
     components:
     - type: Transform
       pos: 60.5,-22.5
       parent: 2
+  - uid: 8634
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 71.5,-27.5
+      parent: 2
   - uid: 8635
     components:
     - type: Transform
       pos: 67.5,-22.5
       parent: 2
+  - uid: 8637
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 94.5,-51.5
+      parent: 2
+  - uid: 8651
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 71.5,-26.5
+      parent: 2
+  - uid: 8685
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 93.5,-52.5
+      parent: 2
   - uid: 8686
     components:
     - type: Transform
-      pos: 73.5,-39.5
+      rot: 1.5707963267948966 rad
+      pos: 95.5,-50.5
+      parent: 2
+  - uid: 8703
+    components:
+    - type: Transform
+      pos: 30.5,-9.5
+      parent: 2
+  - uid: 8709
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 96.5,-50.5
+      parent: 2
+  - uid: 8783
+    components:
+    - type: Transform
+      pos: 34.5,-21.5
+      parent: 2
+  - uid: 8784
+    components:
+    - type: Transform
+      pos: 36.5,-16.5
+      parent: 2
+  - uid: 8801
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 93.5,-38.5
+      parent: 2
+  - uid: 8812
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 54.5,-27.5
+      parent: 2
+  - uid: 8823
+    components:
+    - type: Transform
+      pos: 54.5,-29.5
+      parent: 2
+  - uid: 8825
+    components:
+    - type: Transform
+      pos: 54.5,-30.5
       parent: 2
   - uid: 8830
     components:
     - type: Transform
       pos: 6.5,-81.5
       parent: 2
+  - uid: 8867
+    components:
+    - type: Transform
+      pos: 33.5,-13.5
+      parent: 2
   - uid: 9245
     components:
     - type: Transform
       pos: 61.5,-22.5
       parent: 2
-  - uid: 9295
-    components:
-    - type: Transform
-      pos: 55.5,-53.5
-      parent: 2
-  - uid: 9296
-    components:
-    - type: Transform
-      pos: 56.5,-54.5
-      parent: 2
-  - uid: 9301
-    components:
-    - type: Transform
-      pos: 72.5,-57.5
-      parent: 2
   - uid: 9316
     components:
     - type: Transform
@@ -115037,35 +118763,57 @@ entities:
     - type: Transform
       pos: 55.5,-67.5
       parent: 2
-  - uid: 9342
-    components:
-    - type: Transform
-      pos: 35.5,-19.5
-      parent: 2
   - uid: 9355
     components:
     - type: Transform
       pos: 29.5,-59.5
       parent: 2
+  - uid: 9358
+    components:
+    - type: Transform
+      pos: 33.5,-12.5
+      parent: 2
+  - uid: 9361
+    components:
+    - type: Transform
+      pos: 34.5,-16.5
+      parent: 2
   - uid: 9362
     components:
     - type: Transform
       pos: 53.5,-12.5
       parent: 2
-  - uid: 9397
+  - uid: 9366
     components:
     - type: Transform
-      pos: 64.5,-58.5
+      rot: 1.5707963267948966 rad
+      pos: 37.5,-16.5
       parent: 2
-  - uid: 9416
+  - uid: 9367
     components:
     - type: Transform
-      pos: 64.5,-57.5
+      pos: 34.5,-20.5
       parent: 2
-  - uid: 9669
+  - uid: 9369
     components:
     - type: Transform
-      pos: 63.5,-53.5
+      pos: 49.5,-27.5
+      parent: 2
+  - uid: 9386
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 34.5,-19.5
+      parent: 2
+  - uid: 9413
+    components:
+    - type: Transform
+      pos: 33.5,-16.5
+      parent: 2
+  - uid: 9870
+    components:
+    - type: Transform
+      pos: 47.5,-42.5
       parent: 2
   - uid: 9959
     components:
@@ -115132,31 +118880,6 @@ entities:
     - type: Transform
       pos: 51.5,-11.5
       parent: 2
-  - uid: 10288
-    components:
-    - type: Transform
-      pos: 64.5,-56.5
-      parent: 2
-  - uid: 10299
-    components:
-    - type: Transform
-      pos: 56.5,-55.5
-      parent: 2
-  - uid: 10304
-    components:
-    - type: Transform
-      pos: 54.5,-53.5
-      parent: 2
-  - uid: 10310
-    components:
-    - type: Transform
-      pos: 73.5,-45.5
-      parent: 2
-  - uid: 10313
-    components:
-    - type: Transform
-      pos: 73.5,-44.5
-      parent: 2
   - uid: 10321
     components:
     - type: Transform
@@ -115167,10 +118890,27 @@ entities:
     - type: Transform
       pos: -50.5,-48.5
       parent: 2
-  - uid: 10674
+  - uid: 10658
     components:
     - type: Transform
-      pos: 56.5,-53.5
+      rot: -1.5707963267948966 rad
+      pos: -12.5,-75.5
+      parent: 2
+  - uid: 10659
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -13.5,-75.5
+      parent: 2
+  - uid: 10714
+    components:
+    - type: Transform
+      pos: 74.5,-42.5
+      parent: 2
+  - uid: 10723
+    components:
+    - type: Transform
+      pos: 74.5,-43.5
       parent: 2
   - uid: 10747
     components:
@@ -115182,10 +118922,17 @@ entities:
     - type: Transform
       pos: 66.5,-22.5
       parent: 2
-  - uid: 10766
+  - uid: 10783
     components:
     - type: Transform
-      pos: 73.5,-49.5
+      rot: -1.5707963267948966 rad
+      pos: 74.5,-41.5
+      parent: 2
+  - uid: 10784
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 63.5,-53.5
       parent: 2
   - uid: 10807
     components:
@@ -115222,11 +118969,6 @@ entities:
     - type: Transform
       pos: -11.5,-17.5
       parent: 2
-  - uid: 11460
-    components:
-    - type: Transform
-      pos: 78.5,-56.5
-      parent: 2
   - uid: 11462
     components:
     - type: Transform
@@ -115237,11 +118979,6 @@ entities:
     - type: Transform
       pos: -15.5,-15.5
       parent: 2
-  - uid: 11467
-    components:
-    - type: Transform
-      pos: 88.5,-46.5
-      parent: 2
   - uid: 11471
     components:
     - type: Transform
@@ -115262,31 +118999,26 @@ entities:
     - type: Transform
       pos: 50.5,-57.5
       parent: 2
-  - uid: 11842
+  - uid: 11689
     components:
     - type: Transform
-      pos: 88.5,-45.5
-      parent: 2
-  - uid: 11846
-    components:
-    - type: Transform
-      pos: 56.5,-31.5
+      pos: 71.5,-56.5
       parent: 2
   - uid: 11853
     components:
     - type: Transform
       pos: -8.5,-26.5
       parent: 2
-  - uid: 11909
-    components:
-    - type: Transform
-      pos: 49.5,-38.5
-      parent: 2
   - uid: 11945
     components:
     - type: Transform
       pos: 44.5,-73.5
       parent: 2
+  - uid: 11981
+    components:
+    - type: Transform
+      pos: 49.5,-32.5
+      parent: 2
   - uid: 12709
     components:
     - type: Transform
@@ -115302,6 +119034,26 @@ entities:
     - type: Transform
       pos: -23.5,-19.5
       parent: 2
+  - uid: 12929
+    components:
+    - type: Transform
+      pos: 47.5,-41.5
+      parent: 2
+  - uid: 12950
+    components:
+    - type: Transform
+      pos: 49.5,-33.5
+      parent: 2
+  - uid: 12994
+    components:
+    - type: Transform
+      pos: 73.5,-39.5
+      parent: 2
+  - uid: 13254
+    components:
+    - type: Transform
+      pos: 73.5,-38.5
+      parent: 2
   - uid: 13393
     components:
     - type: Transform
@@ -115357,15 +119109,10 @@ entities:
     - type: Transform
       pos: 56.5,-46.5
       parent: 2
-  - uid: 13912
+  - uid: 13932
     components:
     - type: Transform
-      pos: 63.5,-61.5
-      parent: 2
-  - uid: 13913
-    components:
-    - type: Transform
-      pos: 71.5,-57.5
+      pos: 72.5,-37.5
       parent: 2
   - uid: 14010
     components:
@@ -115387,11 +119134,6 @@ entities:
     - type: Transform
       pos: 76.5,-17.5
       parent: 2
-  - uid: 14144
-    components:
-    - type: Transform
-      pos: 78.5,-57.5
-      parent: 2
   - uid: 14157
     components:
     - type: Transform
@@ -115402,16 +119144,6 @@ entities:
     - type: Transform
       pos: -16.5,-72.5
       parent: 2
-  - uid: 14242
-    components:
-    - type: Transform
-      pos: 49.5,-37.5
-      parent: 2
-  - uid: 14250
-    components:
-    - type: Transform
-      pos: 68.5,-54.5
-      parent: 2
   - uid: 14255
     components:
     - type: Transform
@@ -115422,41 +119154,16 @@ entities:
     - type: Transform
       pos: 54.5,-64.5
       parent: 2
-  - uid: 14327
-    components:
-    - type: Transform
-      pos: 60.5,-61.5
-      parent: 2
-  - uid: 14328
-    components:
-    - type: Transform
-      pos: 59.5,-61.5
-      parent: 2
   - uid: 14337
     components:
     - type: Transform
       pos: 56.5,-61.5
       parent: 2
-  - uid: 14348
-    components:
-    - type: Transform
-      pos: 64.5,-60.5
-      parent: 2
-  - uid: 14355
-    components:
-    - type: Transform
-      pos: 64.5,-61.5
-      parent: 2
   - uid: 14388
     components:
     - type: Transform
       pos: 48.5,-54.5
       parent: 2
-  - uid: 14406
-    components:
-    - type: Transform
-      pos: 49.5,-36.5
-      parent: 2
   - uid: 14409
     components:
     - type: Transform
@@ -115505,22 +119212,29 @@ entities:
   - uid: 15125
     components:
     - type: Transform
-      pos: 48.5,-36.5
+      pos: 67.5,-55.5
       parent: 2
-  - uid: 15126
+  - uid: 15167
     components:
     - type: Transform
-      pos: 47.5,-36.5
+      pos: 58.5,-77.5
       parent: 2
-  - uid: 15127
+  - uid: 15168
     components:
     - type: Transform
-      pos: 47.5,-37.5
+      pos: 59.5,-78.5
       parent: 2
-  - uid: 15233
+  - uid: 15195
     components:
     - type: Transform
-      pos: 88.5,-44.5
+      rot: -1.5707963267948966 rad
+      pos: 88.5,-42.5
+      parent: 2
+  - uid: 15196
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 89.5,-42.5
       parent: 2
   - uid: 15272
     components:
@@ -115562,21 +119276,11 @@ entities:
     - type: Transform
       pos: -43.5,-68.5
       parent: 2
-  - uid: 16370
-    components:
-    - type: Transform
-      pos: 57.5,-25.5
-      parent: 2
   - uid: 16371
     components:
     - type: Transform
       pos: 60.5,-25.5
       parent: 2
-  - uid: 16420
-    components:
-    - type: Transform
-      pos: 71.5,-36.5
-      parent: 2
   - uid: 16446
     components:
     - type: Transform
@@ -115727,31 +119431,11 @@ entities:
     - type: Transform
       pos: 73.5,-53.5
       parent: 2
-  - uid: 17265
-    components:
-    - type: Transform
-      pos: 73.5,-48.5
-      parent: 2
   - uid: 17281
     components:
     - type: Transform
       pos: 35.5,-80.5
       parent: 2
-  - uid: 17286
-    components:
-    - type: Transform
-      pos: 72.5,-40.5
-      parent: 2
-  - uid: 17287
-    components:
-    - type: Transform
-      pos: 71.5,-35.5
-      parent: 2
-  - uid: 17288
-    components:
-    - type: Transform
-      pos: 71.5,-40.5
-      parent: 2
   - uid: 17292
     components:
     - type: Transform
@@ -115762,11 +119446,6 @@ entities:
     - type: Transform
       pos: 71.5,-33.5
       parent: 2
-  - uid: 17340
-    components:
-    - type: Transform
-      pos: 56.5,-39.5
-      parent: 2
   - uid: 17341
     components:
     - type: Transform
@@ -115842,16 +119521,6 @@ entities:
     - type: Transform
       pos: 41.5,-19.5
       parent: 2
-  - uid: 18005
-    components:
-    - type: Transform
-      pos: 82.5,-47.5
-      parent: 2
-  - uid: 18006
-    components:
-    - type: Transform
-      pos: 81.5,-47.5
-      parent: 2
   - uid: 18194
     components:
     - type: Transform
@@ -115887,11 +119556,6 @@ entities:
     - type: Transform
       pos: -22.5,-89.5
       parent: 2
-  - uid: 18474
-    components:
-    - type: Transform
-      pos: 81.5,-43.5
-      parent: 2
   - uid: 18489
     components:
     - type: Transform
@@ -116563,6 +120227,12 @@ entities:
     - type: Transform
       pos: -14.5,-22.5
       parent: 2
+  - uid: 164
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 39.5,-32.5
+      parent: 2
   - uid: 170
     components:
     - type: Transform
@@ -116588,6 +120258,12 @@ entities:
     - type: Transform
       pos: -30.5,-25.5
       parent: 2
+  - uid: 197
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 46.5,-25.5
+      parent: 2
   - uid: 198
     components:
     - type: Transform
@@ -116603,6 +120279,11 @@ entities:
     - type: Transform
       pos: -47.5,-61.5
       parent: 2
+  - uid: 209
+    components:
+    - type: Transform
+      pos: 53.5,-48.5
+      parent: 2
   - uid: 226
     components:
     - type: Transform
@@ -116643,11 +120324,6 @@ entities:
     - type: Transform
       pos: -9.5,-23.5
       parent: 2
-  - uid: 294
-    components:
-    - type: Transform
-      pos: 22.5,-16.5
-      parent: 2
   - uid: 337
     components:
     - type: Transform
@@ -116758,31 +120434,6 @@ entities:
     - type: Transform
       pos: 3.5,-23.5
       parent: 2
-  - uid: 451
-    components:
-    - type: Transform
-      pos: 22.5,-15.5
-      parent: 2
-  - uid: 452
-    components:
-    - type: Transform
-      pos: 22.5,-17.5
-      parent: 2
-  - uid: 453
-    components:
-    - type: Transform
-      pos: 22.5,-18.5
-      parent: 2
-  - uid: 455
-    components:
-    - type: Transform
-      pos: 22.5,-20.5
-      parent: 2
-  - uid: 456
-    components:
-    - type: Transform
-      pos: 22.5,-21.5
-      parent: 2
   - uid: 465
     components:
     - type: Transform
@@ -116973,15 +120624,15 @@ entities:
     - type: Transform
       pos: 17.5,-51.5
       parent: 2
-  - uid: 919
+  - uid: 885
     components:
     - type: Transform
-      pos: 26.5,-24.5
+      pos: 76.5,-60.5
       parent: 2
-  - uid: 920
+  - uid: 887
     components:
     - type: Transform
-      pos: 26.5,-25.5
+      pos: 72.5,-66.5
       parent: 2
   - uid: 925
     components:
@@ -117473,11 +121124,6 @@ entities:
     - type: Transform
       pos: 3.5,-61.5
       parent: 2
-  - uid: 1095
-    components:
-    - type: Transform
-      pos: 3.5,-59.5
-      parent: 2
   - uid: 1097
     components:
     - type: Transform
@@ -117503,11 +121149,6 @@ entities:
     - type: Transform
       pos: 5.5,-60.5
       parent: 2
-  - uid: 1104
-    components:
-    - type: Transform
-      pos: 5.5,-59.5
-      parent: 2
   - uid: 1105
     components:
     - type: Transform
@@ -117738,6 +121379,11 @@ entities:
     - type: Transform
       pos: -22.5,-43.5
       parent: 2
+  - uid: 1197
+    components:
+    - type: Transform
+      pos: 59.5,-65.5
+      parent: 2
   - uid: 1199
     components:
     - type: Transform
@@ -118089,6 +121735,11 @@ entities:
     - type: Transform
       pos: -55.5,-25.5
       parent: 2
+  - uid: 1546
+    components:
+    - type: Transform
+      pos: 46.5,-50.5
+      parent: 2
   - uid: 1548
     components:
     - type: Transform
@@ -118164,6 +121815,12 @@ entities:
     - type: Transform
       pos: -30.5,-50.5
       parent: 2
+  - uid: 1807
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 49.5,-48.5
+      parent: 2
   - uid: 1872
     components:
     - type: Transform
@@ -118174,6 +121831,12 @@ entities:
     - type: Transform
       pos: -36.5,-62.5
       parent: 2
+  - uid: 1878
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 39.5,-36.5
+      parent: 2
   - uid: 1887
     components:
     - type: Transform
@@ -118294,65 +121957,29 @@ entities:
     - type: Transform
       pos: -43.5,-62.5
       parent: 2
-  - uid: 1976
-    components:
-    - type: Transform
-      pos: 48.5,-49.5
-      parent: 2
-  - uid: 1997
-    components:
-    - type: Transform
-      pos: -37.5,-73.5
-      parent: 2
-  - uid: 1998
-    components:
-    - type: Transform
-      pos: -37.5,-74.5
-      parent: 2
   - uid: 1999
     components:
     - type: Transform
-      pos: -37.5,-75.5
+      rot: 1.5707963267948966 rad
+      pos: 78.5,-36.5
       parent: 2
   - uid: 2000
     components:
     - type: Transform
-      pos: -37.5,-77.5
+      rot: 1.5707963267948966 rad
+      pos: 72.5,-32.5
       parent: 2
   - uid: 2001
     components:
     - type: Transform
-      pos: -37.5,-78.5
+      rot: 1.5707963267948966 rad
+      pos: 73.5,-32.5
       parent: 2
   - uid: 2002
     components:
     - type: Transform
-      pos: -38.5,-78.5
-      parent: 2
-  - uid: 2005
-    components:
-    - type: Transform
-      pos: -40.5,-78.5
-      parent: 2
-  - uid: 2006
-    components:
-    - type: Transform
-      pos: -41.5,-78.5
-      parent: 2
-  - uid: 2007
-    components:
-    - type: Transform
-      pos: -42.5,-78.5
-      parent: 2
-  - uid: 2008
-    components:
-    - type: Transform
-      pos: -42.5,-77.5
-      parent: 2
-  - uid: 2009
-    components:
-    - type: Transform
-      pos: -42.5,-76.5
+      rot: 1.5707963267948966 rad
+      pos: 75.5,-50.5
       parent: 2
   - uid: 2103
     components:
@@ -118389,11 +122016,6 @@ entities:
     - type: Transform
       pos: -45.5,-66.5
       parent: 2
-  - uid: 2158
-    components:
-    - type: Transform
-      pos: 58.5,-73.5
-      parent: 2
   - uid: 2170
     components:
     - type: Transform
@@ -118409,16 +122031,6 @@ entities:
     - type: Transform
       pos: 7.5,-63.5
       parent: 2
-  - uid: 2228
-    components:
-    - type: Transform
-      pos: 58.5,-66.5
-      parent: 2
-  - uid: 2246
-    components:
-    - type: Transform
-      pos: 57.5,-67.5
-      parent: 2
   - uid: 2250
     components:
     - type: Transform
@@ -118434,16 +122046,17 @@ entities:
     - type: Transform
       pos: -4.5,-71.5
       parent: 2
-  - uid: 2269
-    components:
-    - type: Transform
-      pos: 57.5,-66.5
-      parent: 2
   - uid: 2291
     components:
     - type: Transform
       pos: -55.5,-64.5
       parent: 2
+  - uid: 2302
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 24.5,-19.5
+      parent: 2
   - uid: 2380
     components:
     - type: Transform
@@ -118719,11 +122332,6 @@ entities:
     - type: Transform
       pos: -31.5,-26.5
       parent: 2
-  - uid: 2951
-    components:
-    - type: Transform
-      pos: 74.5,-56.5
-      parent: 2
   - uid: 2952
     components:
     - type: Transform
@@ -118764,16 +122372,26 @@ entities:
     - type: Transform
       pos: 36.5,-77.5
       parent: 2
-  - uid: 2960
+  - uid: 3012
     components:
     - type: Transform
-      pos: 37.5,-77.5
+      pos: 23.5,-14.5
+      parent: 2
+  - uid: 3029
+    components:
+    - type: Transform
+      pos: 23.5,-15.5
       parent: 2
   - uid: 3034
     components:
     - type: Transform
       pos: 74.5,-24.5
       parent: 2
+  - uid: 3090
+    components:
+    - type: Transform
+      pos: 65.5,-62.5
+      parent: 2
   - uid: 3108
     components:
     - type: Transform
@@ -118789,151 +122407,21 @@ entities:
     - type: Transform
       pos: 78.5,-71.5
       parent: 2
-  - uid: 3142
-    components:
-    - type: Transform
-      pos: 78.5,-70.5
-      parent: 2
-  - uid: 3143
-    components:
-    - type: Transform
-      pos: 78.5,-69.5
-      parent: 2
-  - uid: 3144
-    components:
-    - type: Transform
-      pos: 78.5,-68.5
-      parent: 2
-  - uid: 3145
-    components:
-    - type: Transform
-      pos: 77.5,-68.5
-      parent: 2
-  - uid: 3146
-    components:
-    - type: Transform
-      pos: 76.5,-68.5
-      parent: 2
-  - uid: 3147
-    components:
-    - type: Transform
-      pos: 75.5,-68.5
-      parent: 2
-  - uid: 3148
-    components:
-    - type: Transform
-      pos: 76.5,-70.5
-      parent: 2
-  - uid: 3149
-    components:
-    - type: Transform
-      pos: 75.5,-70.5
-      parent: 2
-  - uid: 3150
-    components:
-    - type: Transform
-      pos: 74.5,-70.5
-      parent: 2
-  - uid: 3151
-    components:
-    - type: Transform
-      pos: 73.5,-70.5
-      parent: 2
-  - uid: 3152
-    components:
-    - type: Transform
-      pos: 72.5,-70.5
-      parent: 2
-  - uid: 3153
-    components:
-    - type: Transform
-      pos: 71.5,-70.5
-      parent: 2
-  - uid: 3154
-    components:
-    - type: Transform
-      pos: 70.5,-70.5
-      parent: 2
-  - uid: 3155
-    components:
-    - type: Transform
-      pos: 69.5,-70.5
-      parent: 2
   - uid: 3156
     components:
     - type: Transform
       pos: 68.5,-70.5
       parent: 2
-  - uid: 3157
-    components:
-    - type: Transform
-      pos: 73.5,-69.5
-      parent: 2
-  - uid: 3158
-    components:
-    - type: Transform
-      pos: 72.5,-66.5
-      parent: 2
-  - uid: 3159
-    components:
-    - type: Transform
-      pos: 73.5,-66.5
-      parent: 2
-  - uid: 3160
-    components:
-    - type: Transform
-      pos: 74.5,-66.5
-      parent: 2
-  - uid: 3161
-    components:
-    - type: Transform
-      pos: 75.5,-66.5
-      parent: 2
-  - uid: 3165
-    components:
-    - type: Transform
-      pos: 73.5,-67.5
-      parent: 2
-  - uid: 3166
-    components:
-    - type: Transform
-      pos: 70.5,-66.5
-      parent: 2
   - uid: 3167
     components:
     - type: Transform
       pos: 69.5,-66.5
       parent: 2
-  - uid: 3168
-    components:
-    - type: Transform
-      pos: 68.5,-66.5
-      parent: 2
-  - uid: 3169
-    components:
-    - type: Transform
-      pos: 68.5,-69.5
-      parent: 2
-  - uid: 3170
-    components:
-    - type: Transform
-      pos: 68.5,-68.5
-      parent: 2
-  - uid: 3171
-    components:
-    - type: Transform
-      pos: 68.5,-67.5
-      parent: 2
   - uid: 3173
     components:
     - type: Transform
       pos: 6.5,-62.5
       parent: 2
-  - uid: 3175
-    components:
-    - type: Transform
-      pos: 68.5,-65.5
-      parent: 2
   - uid: 3176
     components:
     - type: Transform
@@ -118944,45 +122432,10 @@ entities:
     - type: Transform
       pos: 0.5,-71.5
       parent: 2
-  - uid: 3178
-    components:
-    - type: Transform
-      pos: 67.5,-64.5
-      parent: 2
-  - uid: 3179
-    components:
-    - type: Transform
-      pos: 67.5,-63.5
-      parent: 2
-  - uid: 3180
-    components:
-    - type: Transform
-      pos: 67.5,-62.5
-      parent: 2
   - uid: 3181
     components:
     - type: Transform
-      pos: 67.5,-61.5
-      parent: 2
-  - uid: 3187
-    components:
-    - type: Transform
-      pos: 68.5,-59.5
-      parent: 2
-  - uid: 3188
-    components:
-    - type: Transform
-      pos: 69.5,-59.5
-      parent: 2
-  - uid: 3190
-    components:
-    - type: Transform
-      pos: 70.5,-59.5
-      parent: 2
-  - uid: 3193
-    components:
-    - type: Transform
-      pos: 71.5,-60.5
+      pos: 56.5,-66.5
       parent: 2
   - uid: 3195
     components:
@@ -118994,61 +122447,55 @@ entities:
     - type: Transform
       pos: 73.5,-60.5
       parent: 2
-  - uid: 3197
-    components:
-    - type: Transform
-      pos: 75.5,-60.5
-      parent: 2
   - uid: 3198
     components:
     - type: Transform
       pos: 76.5,-59.5
       parent: 2
-  - uid: 3199
+  - uid: 3202
     components:
     - type: Transform
-      pos: 76.5,-60.5
+      rot: 1.5707963267948966 rad
+      pos: 73.5,-28.5
       parent: 2
   - uid: 3203
     components:
     - type: Transform
       pos: 77.5,-60.5
       parent: 2
-  - uid: 3204
+  - uid: 3206
     components:
     - type: Transform
-      pos: 77.5,-61.5
+      pos: 24.5,-17.5
       parent: 2
-  - uid: 3285
+  - uid: 3209
+    components:
+    - type: MetaData
+      name: Visitor Docks APC
+    - type: Transform
+      pos: 24.5,-15.5
+      parent: 2
+  - uid: 3234
     components:
     - type: Transform
-      pos: 73.5,-37.5
+      pos: 77.5,-34.5
       parent: 2
   - uid: 3298
     components:
     - type: Transform
       pos: 74.5,-57.5
       parent: 2
-  - uid: 3299
-    components:
-    - type: Transform
-      pos: 75.5,-57.5
-      parent: 2
-  - uid: 3300
-    components:
-    - type: Transform
-      pos: 76.5,-57.5
-      parent: 2
-  - uid: 3362
-    components:
-    - type: Transform
-      pos: 63.5,-65.5
-      parent: 2
   - uid: 3376
     components:
     - type: Transform
       pos: -42.5,-64.5
       parent: 2
+  - uid: 3380
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 68.5,-59.5
+      parent: 2
   - uid: 3416
     components:
     - type: Transform
@@ -119059,10 +122506,54 @@ entities:
     - type: Transform
       pos: 77.5,-50.5
       parent: 2
-  - uid: 3418
+  - uid: 3428
     components:
     - type: Transform
-      pos: 75.5,-50.5
+      pos: 67.5,-67.5
+      parent: 2
+  - uid: 3442
+    components:
+    - type: Transform
+      pos: 46.5,-37.5
+      parent: 2
+  - uid: 3454
+    components:
+    - type: Transform
+      pos: 24.5,-16.5
+      parent: 2
+  - uid: 3457
+    components:
+    - type: Transform
+      pos: 55.5,-55.5
+      parent: 2
+  - uid: 3458
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 42.5,-35.5
+      parent: 2
+  - uid: 3464
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 48.5,-25.5
+      parent: 2
+  - uid: 3466
+    components:
+    - type: Transform
+      pos: 54.5,-46.5
+      parent: 2
+  - uid: 3474
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 49.5,-25.5
+      parent: 2
+  - uid: 3515
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 54.5,-54.5
       parent: 2
   - uid: 3533
     components:
@@ -119074,36 +122565,6 @@ entities:
     - type: Transform
       pos: 35.5,-46.5
       parent: 2
-  - uid: 3606
-    components:
-    - type: Transform
-      pos: 48.5,-48.5
-      parent: 2
-  - uid: 3607
-    components:
-    - type: Transform
-      pos: 49.5,-48.5
-      parent: 2
-  - uid: 3608
-    components:
-    - type: Transform
-      pos: 50.5,-48.5
-      parent: 2
-  - uid: 3609
-    components:
-    - type: Transform
-      pos: 51.5,-48.5
-      parent: 2
-  - uid: 3613
-    components:
-    - type: Transform
-      pos: 54.5,-47.5
-      parent: 2
-  - uid: 3661
-    components:
-    - type: Transform
-      pos: 27.5,-30.5
-      parent: 2
   - uid: 3662
     components:
     - type: Transform
@@ -119139,75 +122600,10 @@ entities:
     - type: Transform
       pos: 3.5,-22.5
       parent: 2
-  - uid: 3677
-    components:
-    - type: Transform
-      pos: 37.5,-30.5
-      parent: 2
-  - uid: 3678
-    components:
-    - type: Transform
-      pos: 29.5,-32.5
-      parent: 2
-  - uid: 3692
-    components:
-    - type: Transform
-      pos: 37.5,-34.5
-      parent: 2
   - uid: 3693
     components:
     - type: Transform
-      pos: 37.5,-33.5
-      parent: 2
-  - uid: 3694
-    components:
-    - type: Transform
-      pos: 37.5,-32.5
-      parent: 2
-  - uid: 3695
-    components:
-    - type: Transform
-      pos: 29.5,-30.5
-      parent: 2
-  - uid: 3696
-    components:
-    - type: Transform
-      pos: 30.5,-30.5
-      parent: 2
-  - uid: 3698
-    components:
-    - type: Transform
-      pos: 31.5,-30.5
-      parent: 2
-  - uid: 3699
-    components:
-    - type: Transform
-      pos: 32.5,-30.5
-      parent: 2
-  - uid: 3700
-    components:
-    - type: Transform
-      pos: 33.5,-30.5
-      parent: 2
-  - uid: 3701
-    components:
-    - type: Transform
-      pos: 34.5,-30.5
-      parent: 2
-  - uid: 3702
-    components:
-    - type: Transform
-      pos: 35.5,-30.5
-      parent: 2
-  - uid: 3703
-    components:
-    - type: Transform
-      pos: 36.5,-30.5
-      parent: 2
-  - uid: 3704
-    components:
-    - type: Transform
-      pos: 36.5,-28.5
+      pos: 51.5,-25.5
       parent: 2
   - uid: 3705
     components:
@@ -119219,155 +122615,52 @@ entities:
     - type: Transform
       pos: 36.5,-29.5
       parent: 2
-  - uid: 3707
-    components:
-    - type: Transform
-      pos: 37.5,-27.5
-      parent: 2
   - uid: 3708
     components:
     - type: Transform
-      pos: 38.5,-27.5
+      pos: 77.5,-68.5
       parent: 2
   - uid: 3709
     components:
     - type: Transform
-      pos: 39.5,-27.5
-      parent: 2
-  - uid: 3710
-    components:
-    - type: Transform
-      pos: 40.5,-27.5
+      pos: 76.5,-68.5
       parent: 2
   - uid: 3711
     components:
     - type: Transform
-      pos: 41.5,-27.5
+      pos: 58.5,-66.5
       parent: 2
-  - uid: 3713
+  - uid: 3723
     components:
     - type: Transform
-      pos: 50.5,-31.5
-      parent: 2
-  - uid: 3715
-    components:
-    - type: Transform
-      pos: 41.5,-31.5
-      parent: 2
-  - uid: 3716
-    components:
-    - type: Transform
-      pos: 39.5,-30.5
-      parent: 2
-  - uid: 3717
-    components:
-    - type: Transform
-      pos: 39.5,-31.5
-      parent: 2
-  - uid: 3718
-    components:
-    - type: Transform
-      pos: 39.5,-32.5
-      parent: 2
-  - uid: 3720
-    components:
-    - type: Transform
-      pos: 43.5,-30.5
-      parent: 2
-  - uid: 3721
-    components:
-    - type: Transform
-      pos: 43.5,-31.5
-      parent: 2
-  - uid: 3722
-    components:
-    - type: Transform
-      pos: 43.5,-32.5
-      parent: 2
-  - uid: 3724
-    components:
-    - type: Transform
-      pos: 41.5,-33.5
-      parent: 2
-  - uid: 3725
-    components:
-    - type: Transform
-      pos: 39.5,-34.5
-      parent: 2
-  - uid: 3726
-    components:
-    - type: Transform
-      pos: 40.5,-34.5
+      pos: 42.5,-28.5
       parent: 2
   - uid: 3727
     components:
     - type: Transform
-      pos: 41.5,-34.5
+      rot: 1.5707963267948966 rad
+      pos: 44.5,-27.5
       parent: 2
   - uid: 3728
     components:
     - type: Transform
-      pos: 42.5,-34.5
-      parent: 2
-  - uid: 3729
-    components:
-    - type: Transform
-      pos: 43.5,-34.5
+      rot: 1.5707963267948966 rad
+      pos: 44.5,-28.5
       parent: 2
   - uid: 3730
     components:
     - type: Transform
       pos: 44.5,-34.5
       parent: 2
-  - uid: 3731
-    components:
-    - type: Transform
-      pos: 45.5,-34.5
-      parent: 2
   - uid: 3732
     components:
     - type: Transform
       pos: 46.5,-34.5
       parent: 2
-  - uid: 3733
-    components:
-    - type: Transform
-      pos: 47.5,-34.5
-      parent: 2
-  - uid: 3734
-    components:
-    - type: Transform
-      pos: 48.5,-34.5
-      parent: 2
-  - uid: 3735
-    components:
-    - type: Transform
-      pos: 45.5,-33.5
-      parent: 2
-  - uid: 3736
-    components:
-    - type: Transform
-      pos: 45.5,-32.5
-      parent: 2
-  - uid: 3737
-    components:
-    - type: Transform
-      pos: 45.5,-35.5
-      parent: 2
   - uid: 3738
     components:
     - type: Transform
-      pos: 45.5,-36.5
-      parent: 2
-  - uid: 3739
-    components:
-    - type: Transform
-      pos: 41.5,-35.5
-      parent: 2
-  - uid: 3740
-    components:
-    - type: Transform
-      pos: 41.5,-36.5
+      pos: 65.5,-63.5
       parent: 2
   - uid: 3743
     components:
@@ -119384,21 +122677,6 @@ entities:
     - type: Transform
       pos: 36.5,-39.5
       parent: 2
-  - uid: 3746
-    components:
-    - type: Transform
-      pos: 39.5,-36.5
-      parent: 2
-  - uid: 3747
-    components:
-    - type: Transform
-      pos: 39.5,-37.5
-      parent: 2
-  - uid: 3748
-    components:
-    - type: Transform
-      pos: 39.5,-38.5
-      parent: 2
   - uid: 3749
     components:
     - type: Transform
@@ -119419,26 +122697,6 @@ entities:
     - type: Transform
       pos: 41.5,-39.5
       parent: 2
-  - uid: 3753
-    components:
-    - type: Transform
-      pos: 42.5,-39.5
-      parent: 2
-  - uid: 3754
-    components:
-    - type: Transform
-      pos: 43.5,-36.5
-      parent: 2
-  - uid: 3755
-    components:
-    - type: Transform
-      pos: 43.5,-37.5
-      parent: 2
-  - uid: 3756
-    components:
-    - type: Transform
-      pos: 43.5,-38.5
-      parent: 2
   - uid: 3757
     components:
     - type: Transform
@@ -119459,416 +122717,36 @@ entities:
     - type: Transform
       pos: 46.5,-39.5
       parent: 2
-  - uid: 3761
-    components:
-    - type: Transform
-      pos: 47.5,-39.5
-      parent: 2
-  - uid: 3762
-    components:
-    - type: Transform
-      pos: 48.5,-39.5
-      parent: 2
-  - uid: 3769
-    components:
-    - type: Transform
-      pos: 49.5,-39.5
-      parent: 2
-  - uid: 3770
-    components:
-    - type: Transform
-      pos: 49.5,-40.5
-      parent: 2
-  - uid: 3771
-    components:
-    - type: Transform
-      pos: 49.5,-41.5
-      parent: 2
-  - uid: 3772
-    components:
-    - type: Transform
-      pos: 49.5,-42.5
-      parent: 2
-  - uid: 3773
-    components:
-    - type: Transform
-      pos: 49.5,-43.5
-      parent: 2
-  - uid: 3774
-    components:
-    - type: Transform
-      pos: 50.5,-43.5
-      parent: 2
-  - uid: 3775
-    components:
-    - type: Transform
-      pos: 53.5,-43.5
-      parent: 2
-  - uid: 3780
-    components:
-    - type: Transform
-      pos: 54.5,-39.5
-      parent: 2
-  - uid: 3781
-    components:
-    - type: Transform
-      pos: 53.5,-39.5
-      parent: 2
-  - uid: 3782
-    components:
-    - type: Transform
-      pos: 52.5,-39.5
-      parent: 2
-  - uid: 3783
-    components:
-    - type: Transform
-      pos: 51.5,-39.5
-      parent: 2
-  - uid: 3784
-    components:
-    - type: Transform
-      pos: 51.5,-38.5
-      parent: 2
-  - uid: 3785
-    components:
-    - type: Transform
-      pos: 51.5,-37.5
-      parent: 2
-  - uid: 3786
-    components:
-    - type: Transform
-      pos: 51.5,-36.5
-      parent: 2
-  - uid: 3787
-    components:
-    - type: Transform
-      pos: 51.5,-35.5
-      parent: 2
-  - uid: 3788
-    components:
-    - type: Transform
-      pos: 51.5,-34.5
-      parent: 2
-  - uid: 3789
-    components:
-    - type: Transform
-      pos: 51.5,-33.5
-      parent: 2
   - uid: 3790
     components:
     - type: Transform
-      pos: 51.5,-32.5
+      pos: 33.5,-31.5
       parent: 2
   - uid: 3791
     components:
     - type: Transform
-      pos: 51.5,-31.5
-      parent: 2
-  - uid: 3794
-    components:
-    - type: Transform
-      pos: 53.5,-35.5
-      parent: 2
-  - uid: 3795
-    components:
-    - type: Transform
-      pos: 54.5,-35.5
-      parent: 2
-  - uid: 3796
-    components:
-    - type: Transform
-      pos: 53.5,-33.5
-      parent: 2
-  - uid: 3797
-    components:
-    - type: Transform
-      pos: 54.5,-33.5
-      parent: 2
-  - uid: 3798
-    components:
-    - type: Transform
-      pos: 55.5,-33.5
-      parent: 2
-  - uid: 3799
-    components:
-    - type: Transform
-      pos: 53.5,-37.5
-      parent: 2
-  - uid: 3800
-    components:
-    - type: Transform
-      pos: 54.5,-37.5
-      parent: 2
-  - uid: 3801
-    components:
-    - type: Transform
-      pos: 55.5,-37.5
-      parent: 2
-  - uid: 3802
-    components:
-    - type: Transform
-      pos: 52.5,-31.5
-      parent: 2
-  - uid: 3803
-    components:
-    - type: Transform
-      pos: 53.5,-31.5
-      parent: 2
-  - uid: 3804
-    components:
-    - type: Transform
-      pos: 54.5,-31.5
+      pos: 29.5,-31.5
       parent: 2
   - uid: 3805
     components:
     - type: Transform
-      pos: 54.5,-30.5
+      pos: 30.5,-31.5
       parent: 2
   - uid: 3806
     components:
     - type: Transform
-      pos: 54.5,-29.5
-      parent: 2
-  - uid: 3807
-    components:
-    - type: Transform
-      pos: 54.5,-28.5
-      parent: 2
-  - uid: 3808
-    components:
-    - type: Transform
-      pos: 53.5,-28.5
-      parent: 2
-  - uid: 3809
-    components:
-    - type: Transform
-      pos: 53.5,-27.5
-      parent: 2
-  - uid: 3814
-    components:
-    - type: Transform
-      pos: 49.5,-28.5
-      parent: 2
-  - uid: 3815
-    components:
-    - type: Transform
-      pos: 42.5,-27.5
-      parent: 2
-  - uid: 3817
-    components:
-    - type: Transform
-      pos: 43.5,-27.5
-      parent: 2
-  - uid: 3820
-    components:
-    - type: Transform
-      pos: 42.5,-31.5
-      parent: 2
-  - uid: 3821
-    components:
-    - type: Transform
-      pos: 46.5,-30.5
-      parent: 2
-  - uid: 3822
-    components:
-    - type: Transform
-      pos: 45.5,-30.5
-      parent: 2
-  - uid: 3823
-    components:
-    - type: Transform
-      pos: 45.5,-29.5
-      parent: 2
-  - uid: 3824
-    components:
-    - type: Transform
-      pos: 45.5,-28.5
-      parent: 2
-  - uid: 3825
-    components:
-    - type: Transform
-      pos: 45.5,-27.5
-      parent: 2
-  - uid: 3826
-    components:
-    - type: Transform
-      pos: 45.5,-26.5
-      parent: 2
-  - uid: 3827
-    components:
-    - type: Transform
-      pos: 45.5,-24.5
-      parent: 2
-  - uid: 3828
-    components:
-    - type: Transform
-      pos: 46.5,-24.5
-      parent: 2
-  - uid: 3830
-    components:
-    - type: Transform
-      pos: 47.5,-25.5
-      parent: 2
-  - uid: 3837
-    components:
-    - type: Transform
-      pos: 51.5,-25.5
-      parent: 2
-  - uid: 3838
-    components:
-    - type: Transform
-      pos: 52.5,-25.5
-      parent: 2
-  - uid: 3839
-    components:
-    - type: Transform
-      pos: 53.5,-25.5
-      parent: 2
-  - uid: 3840
-    components:
-    - type: Transform
-      pos: 54.5,-25.5
-      parent: 2
-  - uid: 3841
-    components:
-    - type: Transform
-      pos: 55.5,-25.5
+      pos: 35.5,-31.5
       parent: 2
   - uid: 3842
     components:
     - type: Transform
       pos: 47.5,-30.5
       parent: 2
-  - uid: 3846
-    components:
-    - type: Transform
-      pos: 43.5,-24.5
-      parent: 2
-  - uid: 3847
-    components:
-    - type: Transform
-      pos: 42.5,-25.5
-      parent: 2
-  - uid: 3848
-    components:
-    - type: Transform
-      pos: 41.5,-25.5
-      parent: 2
-  - uid: 3849
-    components:
-    - type: Transform
-      pos: 40.5,-25.5
-      parent: 2
-  - uid: 3850
-    components:
-    - type: Transform
-      pos: 39.5,-25.5
-      parent: 2
-  - uid: 3851
-    components:
-    - type: Transform
-      pos: 38.5,-25.5
-      parent: 2
-  - uid: 3852
-    components:
-    - type: Transform
-      pos: 37.5,-25.5
-      parent: 2
-  - uid: 3853
-    components:
-    - type: Transform
-      pos: 27.5,-24.5
-      parent: 2
-  - uid: 3854
-    components:
-    - type: Transform
-      pos: 29.5,-24.5
-      parent: 2
-  - uid: 3855
-    components:
-    - type: Transform
-      pos: 30.5,-24.5
-      parent: 2
-  - uid: 3856
-    components:
-    - type: Transform
-      pos: 31.5,-24.5
-      parent: 2
-  - uid: 3857
-    components:
-    - type: Transform
-      pos: 32.5,-24.5
-      parent: 2
-  - uid: 3858
-    components:
-    - type: Transform
-      pos: 33.5,-24.5
-      parent: 2
-  - uid: 3859
-    components:
-    - type: Transform
-      pos: 34.5,-24.5
-      parent: 2
-  - uid: 3860
-    components:
-    - type: Transform
-      pos: 35.5,-24.5
-      parent: 2
-  - uid: 3861
-    components:
-    - type: Transform
-      pos: 36.5,-24.5
-      parent: 2
   - uid: 3862
     components:
     - type: Transform
       pos: 36.5,-25.5
       parent: 2
-  - uid: 3863
-    components:
-    - type: Transform
-      pos: 48.5,-46.5
-      parent: 2
-  - uid: 3864
-    components:
-    - type: Transform
-      pos: 49.5,-46.5
-      parent: 2
-  - uid: 3865
-    components:
-    - type: Transform
-      pos: 49.5,-45.5
-      parent: 2
-  - uid: 3866
-    components:
-    - type: Transform
-      pos: 50.5,-45.5
-      parent: 2
-  - uid: 3867
-    components:
-    - type: Transform
-      pos: 53.5,-45.5
-      parent: 2
-  - uid: 3868
-    components:
-    - type: Transform
-      pos: 54.5,-45.5
-      parent: 2
-  - uid: 3869
-    components:
-    - type: Transform
-      pos: 55.5,-45.5
-      parent: 2
-  - uid: 3882
-    components:
-    - type: Transform
-      pos: 40.5,-31.5
-      parent: 2
-  - uid: 3898
-    components:
-    - type: Transform
-      pos: 72.5,-30.5
-      parent: 2
   - uid: 3899
     components:
     - type: Transform
@@ -119879,71 +122757,16 @@ entities:
     - type: Transform
       pos: 74.5,-30.5
       parent: 2
-  - uid: 3901
-    components:
-    - type: Transform
-      pos: 74.5,-31.5
-      parent: 2
-  - uid: 3902
-    components:
-    - type: Transform
-      pos: 74.5,-32.5
-      parent: 2
-  - uid: 3903
-    components:
-    - type: Transform
-      pos: 74.5,-33.5
-      parent: 2
-  - uid: 3904
-    components:
-    - type: Transform
-      pos: 75.5,-33.5
-      parent: 2
-  - uid: 3905
-    components:
-    - type: Transform
-      pos: 76.5,-33.5
-      parent: 2
   - uid: 3906
     components:
     - type: Transform
       pos: 77.5,-33.5
       parent: 2
-  - uid: 3907
-    components:
-    - type: Transform
-      pos: 78.5,-33.5
-      parent: 2
-  - uid: 3908
-    components:
-    - type: Transform
-      pos: 77.5,-34.5
-      parent: 2
-  - uid: 3910
-    components:
-    - type: Transform
-      pos: 73.5,-36.5
-      parent: 2
-  - uid: 3922
-    components:
-    - type: Transform
-      pos: 78.5,-30.5
-      parent: 2
   - uid: 3923
     components:
     - type: Transform
       pos: 77.5,-30.5
       parent: 2
-  - uid: 3924
-    components:
-    - type: Transform
-      pos: 77.5,-31.5
-      parent: 2
-  - uid: 3925
-    components:
-    - type: Transform
-      pos: 76.5,-31.5
-      parent: 2
   - uid: 3943
     components:
     - type: Transform
@@ -119959,11 +122782,6 @@ entities:
     - type: Transform
       pos: 71.5,-25.5
       parent: 2
-  - uid: 3950
-    components:
-    - type: Transform
-      pos: 71.5,-28.5
-      parent: 2
   - uid: 3951
     components:
     - type: Transform
@@ -119987,12 +122805,7 @@ entities:
   - uid: 3962
     components:
     - type: Transform
-      pos: 78.5,-25.5
-      parent: 2
-  - uid: 3963
-    components:
-    - type: Transform
-      pos: 79.5,-25.5
+      pos: 45.5,-45.5
       parent: 2
   - uid: 3964
     components:
@@ -120027,13 +122840,36 @@ entities:
   - uid: 4081
     components:
     - type: Transform
-      pos: 75.5,-40.5
+      rot: 3.141592653589793 rad
+      pos: 46.5,-35.5
+      parent: 2
+  - uid: 4137
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 41.5,-35.5
+      parent: 2
+  - uid: 4138
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,-35.5
+      parent: 2
+  - uid: 4168
+    components:
+    - type: Transform
+      pos: 78.5,-67.5
       parent: 2
   - uid: 4179
     components:
     - type: Transform
       pos: -64.5,-26.5
       parent: 2
+  - uid: 4185
+    components:
+    - type: Transform
+      pos: 71.5,-69.5
+      parent: 2
   - uid: 4263
     components:
     - type: Transform
@@ -120059,6 +122895,11 @@ entities:
     - type: Transform
       pos: 7.5,-77.5
       parent: 2
+  - uid: 4492
+    components:
+    - type: Transform
+      pos: 42.5,-31.5
+      parent: 2
   - uid: 4541
     components:
     - type: Transform
@@ -120217,7 +123058,8 @@ entities:
   - uid: 4603
     components:
     - type: Transform
-      pos: 46.5,-46.5
+      rot: 3.141592653589793 rad
+      pos: 43.5,-35.5
       parent: 2
   - uid: 4604
     components:
@@ -120249,26 +123091,6 @@ entities:
     - type: Transform
       pos: 45.5,-40.5
       parent: 2
-  - uid: 4623
-    components:
-    - type: Transform
-      pos: 45.5,-41.5
-      parent: 2
-  - uid: 4636
-    components:
-    - type: Transform
-      pos: 45.5,-42.5
-      parent: 2
-  - uid: 4637
-    components:
-    - type: Transform
-      pos: 45.5,-44.5
-      parent: 2
-  - uid: 4638
-    components:
-    - type: Transform
-      pos: 45.5,-45.5
-      parent: 2
   - uid: 4705
     components:
     - type: Transform
@@ -120289,26 +123111,6 @@ entities:
     - type: Transform
       pos: -60.5,-25.5
       parent: 2
-  - uid: 4919
-    components:
-    - type: Transform
-      pos: 48.5,-26.5
-      parent: 2
-  - uid: 4920
-    components:
-    - type: Transform
-      pos: 50.5,-26.5
-      parent: 2
-  - uid: 4925
-    components:
-    - type: Transform
-      pos: 49.5,-26.5
-      parent: 2
-  - uid: 4926
-    components:
-    - type: Transform
-      pos: 51.5,-26.5
-      parent: 2
   - uid: 5002
     components:
     - type: Transform
@@ -120329,35 +123131,41 @@ entities:
     - type: Transform
       pos: 9.5,-76.5
       parent: 2
-  - uid: 5110
+  - uid: 5254
     components:
     - type: Transform
-      pos: 22.5,-19.5
-      parent: 2
-  - uid: 5142
-    components:
-    - type: Transform
-      pos: 21.5,-25.5
-      parent: 2
-  - uid: 5202
-    components:
-    - type: Transform
-      pos: 21.5,-24.5
+      rot: 3.141592653589793 rad
+      pos: 40.5,-35.5
       parent: 2
   - uid: 5303
     components:
     - type: Transform
       pos: 47.5,-28.5
       parent: 2
-  - uid: 5304
+  - uid: 5316
     components:
     - type: Transform
-      pos: 48.5,-28.5
+      pos: 78.5,-68.5
       parent: 2
-  - uid: 5305
+  - uid: 5317
     components:
     - type: Transform
-      pos: 46.5,-28.5
+      pos: 68.5,-69.5
+      parent: 2
+  - uid: 5328
+    components:
+    - type: Transform
+      pos: 47.5,-49.5
+      parent: 2
+  - uid: 5330
+    components:
+    - type: Transform
+      pos: 47.5,-48.5
+      parent: 2
+  - uid: 5392
+    components:
+    - type: Transform
+      pos: 71.5,-66.5
       parent: 2
   - uid: 5393
     components:
@@ -120369,30 +123177,34 @@ entities:
     - type: Transform
       pos: 7.5,-76.5
       parent: 2
-  - uid: 5731
+  - uid: 5433
     components:
     - type: Transform
-      pos: 58.5,-65.5
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-73.5
+      parent: 2
+  - uid: 5444
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 23.5,-21.5
+      parent: 2
+  - uid: 5730
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-72.5
       parent: 2
   - uid: 5782
     components:
     - type: Transform
       pos: 7.5,-79.5
       parent: 2
-  - uid: 5812
+  - uid: 5896
     components:
     - type: Transform
-      pos: 68.5,-64.5
-      parent: 2
-  - uid: 5834
-    components:
-    - type: Transform
-      pos: 68.5,-60.5
-      parent: 2
-  - uid: 6012
-    components:
-    - type: Transform
-      pos: 36.5,-34.5
+      rot: 1.5707963267948966 rad
+      pos: 75.5,-35.5
       parent: 2
   - uid: 6015
     components:
@@ -120414,6 +123226,11 @@ entities:
     - type: Transform
       pos: -32.5,-22.5
       parent: 2
+  - uid: 6047
+    components:
+    - type: Transform
+      pos: 36.5,-31.5
+      parent: 2
   - uid: 6059
     components:
     - type: Transform
@@ -120429,10 +123246,15 @@ entities:
     - type: Transform
       pos: -31.5,-27.5
       parent: 2
+  - uid: 6098
+    components:
+    - type: Transform
+      pos: 34.5,-31.5
+      parent: 2
   - uid: 6117
     components:
     - type: Transform
-      pos: 62.5,-65.5
+      pos: 47.5,-45.5
       parent: 2
   - uid: 6119
     components:
@@ -120442,7 +123264,28 @@ entities:
   - uid: 6124
     components:
     - type: Transform
-      pos: 60.5,-64.5
+      pos: 49.5,-46.5
+      parent: 2
+  - uid: 6128
+    components:
+    - type: Transform
+      pos: 60.5,-63.5
+      parent: 2
+  - uid: 6132
+    components:
+    - type: Transform
+      pos: 66.5,-70.5
+      parent: 2
+  - uid: 6136
+    components:
+    - type: Transform
+      pos: 63.5,-63.5
+      parent: 2
+  - uid: 6230
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 36.5,-33.5
       parent: 2
   - uid: 6250
     components:
@@ -120450,30 +123293,10 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -36.5,-17.5
       parent: 2
-  - uid: 6270
+  - uid: 6268
     components:
     - type: Transform
-      pos: 73.5,-34.5
-      parent: 2
-  - uid: 6272
-    components:
-    - type: Transform
-      pos: 74.5,-36.5
-      parent: 2
-  - uid: 6277
-    components:
-    - type: Transform
-      pos: 76.5,-37.5
-      parent: 2
-  - uid: 6279
-    components:
-    - type: Transform
-      pos: 75.5,-37.5
-      parent: 2
-  - uid: 6288
-    components:
-    - type: Transform
-      pos: 78.5,-37.5
+      pos: 74.5,-34.5
       parent: 2
   - uid: 6296
     components:
@@ -120490,60 +123313,159 @@ entities:
     - type: Transform
       pos: 78.5,-29.5
       parent: 2
-  - uid: 6299
+  - uid: 6368
     components:
     - type: Transform
-      pos: 78.5,-28.5
+      rot: 1.5707963267948966 rad
+      pos: 39.5,-31.5
       parent: 2
-  - uid: 6629
+  - uid: 6371
     components:
     - type: Transform
-      pos: 50.5,-28.5
+      rot: -1.5707963267948966 rad
+      pos: 39.5,-27.5
+      parent: 2
+  - uid: 6375
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,-32.5
+      parent: 2
+  - uid: 6376
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 40.5,-31.5
+      parent: 2
+  - uid: 6377
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 75.5,-38.5
+      parent: 2
+  - uid: 6378
+    components:
+    - type: Transform
+      pos: 76.5,-69.5
+      parent: 2
+  - uid: 6383
+    components:
+    - type: Transform
+      pos: 67.5,-61.5
+      parent: 2
+  - uid: 6385
+    components:
+    - type: Transform
+      pos: 72.5,-63.5
+      parent: 2
+  - uid: 6391
+    components:
+    - type: Transform
+      pos: 36.5,-26.5
+      parent: 2
+  - uid: 6392
+    components:
+    - type: Transform
+      pos: 40.5,-29.5
+      parent: 2
+  - uid: 6393
+    components:
+    - type: Transform
+      pos: 41.5,-29.5
+      parent: 2
+  - uid: 6394
+    components:
+    - type: Transform
+      pos: 39.5,-29.5
+      parent: 2
+  - uid: 6395
+    components:
+    - type: Transform
+      pos: 38.5,-29.5
+      parent: 2
+  - uid: 6399
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 44.5,-25.5
+      parent: 2
+  - uid: 6612
+    components:
+    - type: Transform
+      pos: 60.5,-65.5
+      parent: 2
+  - uid: 6657
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 24.5,-20.5
       parent: 2
   - uid: 7006
     components:
     - type: Transform
       pos: 35.5,-40.5
       parent: 2
-  - uid: 7113
+  - uid: 7048
     components:
     - type: Transform
-      pos: 77.5,-35.5
+      rot: 1.5707963267948966 rad
+      pos: 22.5,-21.5
+      parent: 2
+  - uid: 7097
+    components:
+    - type: Transform
+      pos: 3.5,-60.5
       parent: 2
   - uid: 7115
     components:
     - type: Transform
       pos: 76.5,-28.5
       parent: 2
-  - uid: 7130
+  - uid: 7124
     components:
     - type: Transform
-      pos: 55.5,-47.5
+      pos: 35.5,-25.5
+      parent: 2
+  - uid: 7141
+    components:
+    - type: Transform
+      pos: 46.5,-36.5
       parent: 2
   - uid: 7144
     components:
     - type: Transform
-      pos: 61.5,-64.5
+      pos: 78.5,-61.5
       parent: 2
   - uid: 7147
     components:
     - type: Transform
       pos: 44.5,-77.5
       parent: 2
-  - uid: 7186
+  - uid: 7164
     components:
     - type: Transform
-      pos: 61.5,-73.5
+      rot: 1.5707963267948966 rad
+      pos: 47.5,-26.5
       parent: 2
   - uid: 7188
     components:
     - type: Transform
       pos: 79.5,-24.5
       parent: 2
+  - uid: 7192
+    components:
+    - type: Transform
+      pos: 55.5,-54.5
+      parent: 2
+  - uid: 7196
+    components:
+    - type: Transform
+      pos: 53.5,-47.5
+      parent: 2
   - uid: 7233
     components:
     - type: Transform
-      pos: 52.5,-28.5
+      pos: 31.5,-31.5
       parent: 2
   - uid: 7290
     components:
@@ -120555,76 +123477,435 @@ entities:
     - type: Transform
       pos: -15.5,-41.5
       parent: 2
-  - uid: 7997
+  - uid: 7340
     components:
     - type: Transform
-      pos: 58.5,-64.5
+      pos: 26.5,-26.5
+      parent: 2
+  - uid: 7410
+    components:
+    - type: Transform
+      pos: 78.5,-66.5
+      parent: 2
+  - uid: 7414
+    components:
+    - type: Transform
+      pos: 78.5,-64.5
+      parent: 2
+  - uid: 7419
+    components:
+    - type: Transform
+      pos: 78.5,-65.5
+      parent: 2
+  - uid: 7537
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 22.5,-14.5
+      parent: 2
+  - uid: 7567
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 36.5,-36.5
+      parent: 2
+  - uid: 7578
+    components:
+    - type: Transform
+      pos: 34.5,-25.5
+      parent: 2
+  - uid: 7581
+    components:
+    - type: Transform
+      pos: 46.5,-38.5
+      parent: 2
+  - uid: 7583
+    components:
+    - type: Transform
+      pos: 33.5,-25.5
+      parent: 2
+  - uid: 7584
+    components:
+    - type: Transform
+      pos: 32.5,-25.5
+      parent: 2
+  - uid: 7603
+    components:
+    - type: Transform
+      pos: 37.5,-29.5
+      parent: 2
+  - uid: 7610
+    components:
+    - type: Transform
+      pos: 76.5,-37.5
+      parent: 2
+  - uid: 7613
+    components:
+    - type: Transform
+      pos: 78.5,-32.5
+      parent: 2
+  - uid: 7617
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 53.5,-41.5
+      parent: 2
+  - uid: 7705
+    components:
+    - type: Transform
+      pos: 62.5,-62.5
+      parent: 2
+  - uid: 7725
+    components:
+    - type: Transform
+      pos: 72.5,-61.5
+      parent: 2
+  - uid: 7726
+    components:
+    - type: Transform
+      pos: 41.5,-28.5
+      parent: 2
+  - uid: 7730
+    components:
+    - type: Transform
+      pos: 66.5,-61.5
+      parent: 2
+  - uid: 7733
+    components:
+    - type: Transform
+      pos: 53.5,-53.5
+      parent: 2
+  - uid: 7734
+    components:
+    - type: Transform
+      pos: 53.5,-52.5
+      parent: 2
+  - uid: 7736
+    components:
+    - type: Transform
+      pos: 53.5,-50.5
+      parent: 2
+  - uid: 7740
+    components:
+    - type: Transform
+      pos: 53.5,-49.5
+      parent: 2
+  - uid: 7762
+    components:
+    - type: Transform
+      pos: 65.5,-61.5
+      parent: 2
+  - uid: 7784
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 23.5,-20.5
+      parent: 2
+  - uid: 7785
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 24.5,-18.5
+      parent: 2
+  - uid: 7793
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-26.5
+      parent: 2
+  - uid: 7797
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-25.5
+      parent: 2
+  - uid: 7909
+    components:
+    - type: Transform
+      pos: 79.5,-27.5
+      parent: 2
+  - uid: 7948
+    components:
+    - type: Transform
+      pos: 76.5,-55.5
+      parent: 2
+  - uid: 8036
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,-35.5
       parent: 2
   - uid: 8042
     components:
     - type: Transform
-      pos: 53.5,-41.5
+      pos: 66.5,-67.5
+      parent: 2
+  - uid: 8043
+    components:
+    - type: Transform
+      pos: 49.5,-45.5
+      parent: 2
+  - uid: 8115
+    components:
+    - type: Transform
+      pos: 56.5,-55.5
+      parent: 2
+  - uid: 8124
+    components:
+    - type: Transform
+      pos: 54.5,-53.5
+      parent: 2
+  - uid: 8129
+    components:
+    - type: Transform
+      pos: 57.5,-56.5
+      parent: 2
+  - uid: 8131
+    components:
+    - type: Transform
+      pos: 57.5,-55.5
       parent: 2
   - uid: 8343
     components:
     - type: Transform
       pos: -6.5,-70.5
       parent: 2
-  - uid: 8629
+  - uid: 8384
     components:
     - type: Transform
-      pos: 51.5,-28.5
+      pos: 68.5,-67.5
+      parent: 2
+  - uid: 8386
+    components:
+    - type: Transform
+      pos: 68.5,-58.5
+      parent: 2
+  - uid: 8392
+    components:
+    - type: Transform
+      pos: 70.5,-58.5
+      parent: 2
+  - uid: 8394
+    components:
+    - type: Transform
+      pos: 39.5,-35.5
+      parent: 2
+  - uid: 8395
+    components:
+    - type: Transform
+      pos: 39.5,-38.5
+      parent: 2
+  - uid: 8419
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 52.5,-41.5
+      parent: 2
+  - uid: 8423
+    components:
+    - type: Transform
+      pos: 69.5,-58.5
+      parent: 2
+  - uid: 8448
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 64.5,-71.5
+      parent: 2
+  - uid: 8454
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 65.5,-71.5
+      parent: 2
+  - uid: 8512
+    components:
+    - type: Transform
+      pos: 70.5,-61.5
+      parent: 2
+  - uid: 8513
+    components:
+    - type: Transform
+      pos: 70.5,-60.5
+      parent: 2
+  - uid: 8514
+    components:
+    - type: Transform
+      pos: 70.5,-59.5
+      parent: 2
+  - uid: 8630
+    components:
+    - type: Transform
+      pos: 54.5,-47.5
       parent: 2
   - uid: 8704
     components:
     - type: Transform
       pos: -31.5,-54.5
       parent: 2
-  - uid: 9311
+  - uid: 8813
     components:
     - type: Transform
-      pos: 63.5,-62.5
-      parent: 2
-  - uid: 9317
-    components:
-    - type: Transform
-      pos: 58.5,-72.5
-      parent: 2
-  - uid: 9322
-    components:
-    - type: Transform
-      pos: 57.5,-72.5
+      rot: 1.5707963267948966 rad
+      pos: 53.5,-25.5
       parent: 2
   - uid: 9328
     components:
     - type: Transform
       pos: 65.5,-64.5
       parent: 2
-  - uid: 9329
+  - uid: 9342
     components:
     - type: Transform
-      pos: 65.5,-65.5
+      pos: 61.5,-61.5
       parent: 2
-  - uid: 10393
+  - uid: 9345
     components:
     - type: Transform
-      pos: 52.5,-48.5
+      pos: 60.5,-61.5
       parent: 2
-  - uid: 10415
+  - uid: 9349
     components:
     - type: Transform
-      pos: 74.5,-50.5
+      pos: 70.5,-25.5
+      parent: 2
+  - uid: 9359
+    components:
+    - type: Transform
+      pos: 58.5,-61.5
+      parent: 2
+  - uid: 9360
+    components:
+    - type: Transform
+      pos: 58.5,-58.5
+      parent: 2
+  - uid: 9372
+    components:
+    - type: Transform
+      pos: 57.5,-61.5
+      parent: 2
+  - uid: 9373
+    components:
+    - type: Transform
+      pos: 59.5,-61.5
+      parent: 2
+  - uid: 9408
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 30.5,-25.5
+      parent: 2
+  - uid: 9411
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 31.5,-25.5
+      parent: 2
+  - uid: 9420
+    components:
+    - type: Transform
+      pos: 32.5,-31.5
+      parent: 2
+  - uid: 9635
+    components:
+    - type: Transform
+      pos: 63.5,-57.5
+      parent: 2
+  - uid: 9636
+    components:
+    - type: Transform
+      pos: 63.5,-59.5
+      parent: 2
+  - uid: 9637
+    components:
+    - type: Transform
+      pos: 63.5,-58.5
+      parent: 2
+  - uid: 9638
+    components:
+    - type: Transform
+      pos: 64.5,-57.5
+      parent: 2
+  - uid: 9643
+    components:
+    - type: Transform
+      pos: 57.5,-58.5
+      parent: 2
+  - uid: 9666
+    components:
+    - type: Transform
+      pos: 62.5,-58.5
+      parent: 2
+  - uid: 9672
+    components:
+    - type: Transform
+      pos: 61.5,-58.5
+      parent: 2
+  - uid: 9673
+    components:
+    - type: Transform
+      pos: 59.5,-58.5
+      parent: 2
+  - uid: 10291
+    components:
+    - type: Transform
+      pos: 73.5,-59.5
+      parent: 2
+  - uid: 10334
+    components:
+    - type: Transform
+      pos: 72.5,-62.5
+      parent: 2
+  - uid: 10425
+    components:
+    - type: Transform
+      pos: 63.5,-62.5
+      parent: 2
+  - uid: 10426
+    components:
+    - type: Transform
+      pos: 60.5,-62.5
+      parent: 2
+  - uid: 10436
+    components:
+    - type: Transform
+      pos: 65.5,-66.5
+      parent: 2
+  - uid: 10448
+    components:
+    - type: Transform
+      pos: 78.5,-55.5
+      parent: 2
+  - uid: 10503
+    components:
+    - type: Transform
+      pos: 76.5,-56.5
+      parent: 2
+  - uid: 10707
+    components:
+    - type: Transform
+      pos: 78.5,-63.5
+      parent: 2
+  - uid: 10717
+    components:
+    - type: Transform
+      pos: 75.5,-55.5
+      parent: 2
+  - uid: 10790
+    components:
+    - type: Transform
+      pos: 49.5,-42.5
+      parent: 2
+  - uid: 10804
+    components:
+    - type: Transform
+      pos: 52.5,-42.5
       parent: 2
   - uid: 10887
     components:
     - type: Transform
       pos: -31.5,-16.5
       parent: 2
-  - uid: 11261
-    components:
-    - type: Transform
-      pos: 77.5,-40.5
-      parent: 2
   - uid: 11428
     components:
     - type: Transform
@@ -120635,15 +123916,117 @@ entities:
     - type: Transform
       pos: 52.5,-75.5
       parent: 2
-  - uid: 11696
+  - uid: 11842
     components:
     - type: Transform
-      pos: 67.5,-60.5
+      pos: 27.5,-26.5
       parent: 2
-  - uid: 11937
+  - uid: 11843
     components:
     - type: Transform
-      pos: 65.5,-67.5
+      pos: 27.5,-25.5
+      parent: 2
+  - uid: 11854
+    components:
+    - type: Transform
+      pos: 74.5,-55.5
+      parent: 2
+  - uid: 11856
+    components:
+    - type: Transform
+      pos: 75.5,-69.5
+      parent: 2
+  - uid: 11857
+    components:
+    - type: Transform
+      pos: 74.5,-69.5
+      parent: 2
+  - uid: 11863
+    components:
+    - type: Transform
+      pos: 73.5,-69.5
+      parent: 2
+  - uid: 11864
+    components:
+    - type: Transform
+      pos: 71.5,-68.5
+      parent: 2
+  - uid: 11868
+    components:
+    - type: Transform
+      pos: 72.5,-65.5
+      parent: 2
+  - uid: 11886
+    components:
+    - type: Transform
+      pos: 68.5,-68.5
+      parent: 2
+  - uid: 11887
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 69.5,-67.5
+      parent: 2
+  - uid: 11890
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 69.5,-63.5
+      parent: 2
+  - uid: 11891
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 69.5,-61.5
+      parent: 2
+  - uid: 11892
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 69.5,-65.5
+      parent: 2
+  - uid: 11893
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 69.5,-64.5
+      parent: 2
+  - uid: 11895
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 68.5,-60.5
+      parent: 2
+  - uid: 11898
+    components:
+    - type: Transform
+      pos: 75.5,-59.5
+      parent: 2
+  - uid: 11900
+    components:
+    - type: Transform
+      pos: 78.5,-60.5
+      parent: 2
+  - uid: 11904
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-66.5
+      parent: 2
+  - uid: 11906
+    components:
+    - type: Transform
+      pos: 49.5,-49.5
+      parent: 2
+  - uid: 11907
+    components:
+    - type: Transform
+      pos: 48.5,-49.5
+      parent: 2
+  - uid: 11912
+    components:
+    - type: Transform
+      pos: 36.5,-30.5
       parent: 2
   - uid: 12408
     components:
@@ -120655,30 +124038,135 @@ entities:
     - type: Transform
       pos: -7.5,-46.5
       parent: 2
-  - uid: 12972
+  - uid: 12747
     components:
     - type: Transform
-      pos: 43.5,-28.5
+      pos: -37.5,-74.5
+      parent: 2
+  - uid: 12801
+    components:
+    - type: Transform
+      pos: 44.5,-31.5
+      parent: 2
+  - uid: 12841
+    components:
+    - type: Transform
+      pos: 46.5,-31.5
+      parent: 2
+  - uid: 12957
+    components:
+    - type: Transform
+      pos: 44.5,-30.5
+      parent: 2
+  - uid: 12959
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 45.5,-28.5
+      parent: 2
+  - uid: 12961
+    components:
+    - type: Transform
+      pos: 44.5,-29.5
       parent: 2
   - uid: 12973
     components:
     - type: Transform
-      pos: 43.5,-29.5
+      pos: 42.5,-25.5
+      parent: 2
+  - uid: 12974
+    components:
+    - type: Transform
+      pos: 37.5,-26.5
       parent: 2
   - uid: 12975
     components:
     - type: Transform
-      pos: 47.5,-31.5
+      pos: 41.5,-26.5
+      parent: 2
+  - uid: 12976
+    components:
+    - type: Transform
+      pos: 40.5,-26.5
+      parent: 2
+  - uid: 12977
+    components:
+    - type: Transform
+      pos: 39.5,-26.5
+      parent: 2
+  - uid: 12978
+    components:
+    - type: Transform
+      pos: 38.5,-26.5
+      parent: 2
+  - uid: 12981
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 43.5,-31.5
+      parent: 2
+  - uid: 12983
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 41.5,-31.5
       parent: 2
   - uid: 12990
     components:
     - type: Transform
-      pos: 48.5,-31.5
+      rot: 1.5707963267948966 rad
+      pos: 75.5,-31.5
+      parent: 2
+  - uid: 12991
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 75.5,-30.5
+      parent: 2
+  - uid: 12993
+    components:
+    - type: Transform
+      pos: 76.5,-32.5
+      parent: 2
+  - uid: 13650
+    components:
+    - type: Transform
+      pos: 75.5,-32.5
+      parent: 2
+  - uid: 13838
+    components:
+    - type: Transform
+      pos: 47.5,-47.5
+      parent: 2
+  - uid: 13850
+    components:
+    - type: Transform
+      pos: 45.5,-42.5
+      parent: 2
+  - uid: 13856
+    components:
+    - type: Transform
+      pos: 45.5,-44.5
+      parent: 2
+  - uid: 13858
+    components:
+    - type: Transform
+      pos: 45.5,-43.5
+      parent: 2
+  - uid: 13859
+    components:
+    - type: Transform
+      pos: 45.5,-41.5
       parent: 2
   - uid: 13873
     components:
     - type: Transform
-      pos: 48.5,-50.5
+      pos: 47.5,-27.5
+      parent: 2
+  - uid: 13874
+    components:
+    - type: Transform
+      pos: 45.5,-25.5
       parent: 2
   - uid: 13876
     components:
@@ -120703,32 +124191,71 @@ entities:
   - uid: 13908
     components:
     - type: Transform
-      pos: 62.5,-73.5
+      rot: 3.141592653589793 rad
+      pos: 68.5,-61.5
+      parent: 2
+  - uid: 13909
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,-33.5
+      parent: 2
+  - uid: 14046
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 77.5,-38.5
+      parent: 2
+  - uid: 14093
+    components:
+    - type: Transform
+      pos: 77.5,-32.5
       parent: 2
   - uid: 14104
     components:
     - type: Transform
       pos: 4.5,-64.5
       parent: 2
-  - uid: 14200
+  - uid: 14144
     components:
     - type: Transform
-      pos: 53.5,-42.5
+      pos: 50.5,-42.5
       parent: 2
   - uid: 14246
     components:
     - type: Transform
       pos: 80.5,-24.5
       parent: 2
+  - uid: 14256
+    components:
+    - type: Transform
+      pos: 49.5,-44.5
+      parent: 2
   - uid: 14259
     components:
     - type: Transform
       pos: 49.5,-54.5
       parent: 2
-  - uid: 14266
+  - uid: 14296
     components:
     - type: Transform
-      pos: 63.5,-66.5
+      pos: 49.5,-43.5
+      parent: 2
+  - uid: 14323
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 69.5,-62.5
+      parent: 2
+  - uid: 14329
+    components:
+    - type: Transform
+      pos: 65.5,-67.5
+      parent: 2
+  - uid: 14330
+    components:
+    - type: Transform
+      pos: 50.5,-25.5
       parent: 2
   - uid: 14405
     components:
@@ -120745,11 +124272,6 @@ entities:
     - type: Transform
       pos: 2.5,-71.5
       parent: 2
-  - uid: 14622
-    components:
-    - type: Transform
-      pos: 21.5,-15.5
-      parent: 2
   - uid: 14686
     components:
     - type: Transform
@@ -120765,11 +124287,6 @@ entities:
     - type: Transform
       pos: 52.5,-74.5
       parent: 2
-  - uid: 14731
-    components:
-    - type: Transform
-      pos: 54.5,-43.5
-      parent: 2
   - uid: 14740
     components:
     - type: Transform
@@ -120805,11 +124322,31 @@ entities:
     - type: Transform
       pos: -1.5,-71.5
       parent: 2
+  - uid: 14919
+    components:
+    - type: Transform
+      pos: 73.5,-34.5
+      parent: 2
   - uid: 15101
     components:
     - type: Transform
       pos: 1.5,-71.5
       parent: 2
+  - uid: 15126
+    components:
+    - type: Transform
+      pos: 78.5,-62.5
+      parent: 2
+  - uid: 15160
+    components:
+    - type: Transform
+      pos: 73.5,-70.5
+      parent: 2
+  - uid: 15161
+    components:
+    - type: Transform
+      pos: 71.5,-67.5
+      parent: 2
   - uid: 15235
     components:
     - type: Transform
@@ -120830,11 +124367,6 @@ entities:
     - type: Transform
       pos: 77.5,-24.5
       parent: 2
-  - uid: 15433
-    components:
-    - type: Transform
-      pos: 68.5,-58.5
-      parent: 2
   - uid: 15612
     components:
     - type: Transform
@@ -120845,16 +124377,6 @@ entities:
     - type: Transform
       pos: 11.5,-74.5
       parent: 2
-  - uid: 16021
-    components:
-    - type: Transform
-      pos: 76.5,-39.5
-      parent: 2
-  - uid: 16022
-    components:
-    - type: Transform
-      pos: 76.5,-40.5
-      parent: 2
   - uid: 16023
     components:
     - type: Transform
@@ -120880,46 +124402,17 @@ entities:
     - type: Transform
       pos: 47.5,-50.5
       parent: 2
-  - uid: 16269
+  - uid: 16264
     components:
     - type: Transform
-      pos: 53.5,-40.5
+      rot: 3.141592653589793 rad
+      pos: 59.5,-60.5
       parent: 2
   - uid: 16300
     components:
     - type: Transform
       pos: 11.5,-76.5
       parent: 2
-  - uid: 16568
-    components:
-    - type: Transform
-      pos: 57.5,-71.5
-      parent: 2
-  - uid: 16585
-    components:
-    - type: Transform
-      pos: 57.5,-69.5
-      parent: 2
-  - uid: 16586
-    components:
-    - type: Transform
-      pos: 57.5,-68.5
-      parent: 2
-  - uid: 16587
-    components:
-    - type: Transform
-      pos: 62.5,-72.5
-      parent: 2
-  - uid: 16588
-    components:
-    - type: Transform
-      pos: 60.5,-74.5
-      parent: 2
-  - uid: 16589
-    components:
-    - type: Transform
-      pos: 60.5,-73.5
-      parent: 2
   - uid: 16604
     components:
     - type: Transform
@@ -120940,31 +124433,11 @@ entities:
     - type: Transform
       pos: 63.5,-72.5
       parent: 2
-  - uid: 16640
-    components:
-    - type: Transform
-      pos: 65.5,-71.5
-      parent: 2
-  - uid: 16641
-    components:
-    - type: Transform
-      pos: 64.5,-71.5
-      parent: 2
   - uid: 16642
     components:
     - type: Transform
       pos: 63.5,-71.5
       parent: 2
-  - uid: 16643
-    components:
-    - type: Transform
-      pos: 64.5,-68.5
-      parent: 2
-  - uid: 16644
-    components:
-    - type: Transform
-      pos: 65.5,-68.5
-      parent: 2
   - uid: 16645
     components:
     - type: Transform
@@ -120985,16 +124458,6 @@ entities:
     - type: Transform
       pos: 63.5,-70.5
       parent: 2
-  - uid: 16809
-    components:
-    - type: Transform
-      pos: 65.5,-69.5
-      parent: 2
-  - uid: 16989
-    components:
-    - type: Transform
-      pos: 21.5,-26.5
-      parent: 2
   - uid: 16990
     components:
     - type: Transform
@@ -121015,6 +124478,18 @@ entities:
     - type: Transform
       pos: 32.5,-36.5
       parent: 2
+  - uid: 17117
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -39.5,-76.5
+      parent: 2
+  - uid: 17121
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -40.5,-76.5
+      parent: 2
   - uid: 17165
     components:
     - type: Transform
@@ -121040,11 +124515,6 @@ entities:
     - type: Transform
       pos: 26.5,-28.5
       parent: 2
-  - uid: 17283
-    components:
-    - type: Transform
-      pos: 26.5,-26.5
-      parent: 2
   - uid: 17377
     components:
     - type: Transform
@@ -121080,26 +124550,6 @@ entities:
     - type: Transform
       pos: 34.5,-33.5
       parent: 2
-  - uid: 17894
-    components:
-    - type: Transform
-      pos: 64.5,-67.5
-      parent: 2
-  - uid: 17906
-    components:
-    - type: Transform
-      pos: 58.5,-74.5
-      parent: 2
-  - uid: 17944
-    components:
-    - type: Transform
-      pos: 53.5,-48.5
-      parent: 2
-  - uid: 17962
-    components:
-    - type: Transform
-      pos: 54.5,-48.5
-      parent: 2
   - uid: 17969
     components:
     - type: Transform
@@ -121110,11 +124560,6 @@ entities:
     - type: Transform
       pos: 33.5,-34.5
       parent: 2
-  - uid: 18506
-    components:
-    - type: Transform
-      pos: 30.5,-32.5
-      parent: 2
 - proto: WardrobeCargoFilled
   entities:
   - uid: 6961
@@ -121146,6 +124591,11 @@ entities:
     - type: Transform
       pos: 66.5,-27.5
       parent: 2
+  - uid: 8231
+    components:
+    - type: Transform
+      pos: 67.5,-27.5
+      parent: 2
   - uid: 18043
     components:
     - type: Transform
@@ -121153,10 +124603,10 @@ entities:
       parent: 2
 - proto: WardrobeSalvageFilled
   entities:
-  - uid: 6918
+  - uid: 17523
     components:
     - type: Transform
-      pos: 54.5,-97.5
+      pos: 55.5,-97.5
       parent: 2
 - proto: WarningCO2
   entities:
@@ -121211,21 +124661,11 @@ entities:
     - type: Transform
       pos: -30.5,-70.5
       parent: 2
-  - uid: 4177
-    components:
-    - type: Transform
-      pos: 51.5,-54.5
-      parent: 2
   - uid: 5527
     components:
     - type: Transform
       pos: -46.4889,-48.14321
       parent: 2
-  - uid: 6275
-    components:
-    - type: Transform
-      pos: 21.5,-17.5
-      parent: 2
   - uid: 6649
     components:
     - type: Transform
@@ -121236,32 +124676,32 @@ entities:
     - type: Transform
       pos: -9.5,-18.5
       parent: 2
-  - uid: 7740
+  - uid: 7777
     components:
     - type: Transform
-      pos: 67.5,-40.5
+      pos: 23.5,-18.5
       parent: 2
-  - uid: 17956
+  - uid: 8564
     components:
     - type: Transform
-      pos: 33.5,-20.5
+      pos: 61.5,-31.5
+      parent: 2
+  - uid: 8864
+    components:
+    - type: Transform
+      pos: 51.5,-54.5
       parent: 2
 - proto: WaterTankFull
   entities:
-  - uid: 3379
-    components:
-    - type: Transform
-      pos: 55.5,-66.5
-      parent: 2
   - uid: 3764
     components:
     - type: Transform
       pos: 36.5,-37.5
       parent: 2
-  - uid: 7726
+  - uid: 5325
     components:
     - type: Transform
-      pos: 76.5,-34.5
+      pos: 78.5,-33.5
       parent: 2
   - uid: 8214
     components:
@@ -121273,6 +124713,16 @@ entities:
     - type: Transform
       pos: 10.5,0.5
       parent: 2
+  - uid: 15440
+    components:
+    - type: Transform
+      pos: 64.5,-55.5
+      parent: 2
+  - uid: 15597
+    components:
+    - type: Transform
+      pos: 6.5,-76.5
+      parent: 2
   - uid: 16978
     components:
     - type: Transform
@@ -121304,6 +124754,21 @@ entities:
       parent: 2
 - proto: WeaponCapacitorRecharger
   entities:
+  - uid: 456
+    components:
+    - type: Transform
+      pos: 65.5,-32.5
+      parent: 2
+  - uid: 3518
+    components:
+    - type: Transform
+      pos: 69.5,-41.5
+      parent: 2
+  - uid: 3524
+    components:
+    - type: Transform
+      pos: 56.5,-39.5
+      parent: 2
   - uid: 5586
     components:
     - type: Transform
@@ -121319,29 +124784,12 @@ entities:
     - type: Transform
       pos: 13.5,-63.5
       parent: 2
-  - uid: 10392
-    components:
-    - type: Transform
-      pos: 65.5,-34.5
-      parent: 2
-  - uid: 14262
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 57.5,-46.5
-      parent: 2
   - uid: 14729
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 60.5,-26.5
       parent: 2
-  - uid: 15520
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 60.5,-39.5
-      parent: 2
   - uid: 18255
     components:
     - type: Transform
@@ -121354,46 +124802,44 @@ entities:
       parent: 2
 - proto: WeaponEnergyTurretAI
   entities:
-  - uid: 18735
+  - uid: 7576
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 92.5,-41.5
+      pos: 94.5,-49.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 19418
-  - uid: 18736
+      - 10829
+  - uid: 10842
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 92.5,-49.5
+      pos: 94.5,-41.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 19418
+      - 10829
 - proto: WeaponEnergyTurretAIControlPanel
   entities:
-  - uid: 19418
+  - uid: 10829
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 93.5,-44.5
+      pos: 95.5,-44.5
       parent: 2
     - type: DeviceList
       devices:
-      - 18735
-      - 18736
+      - 10842
+      - 7576
 - proto: WeaponEnergyTurretCommand
   entities:
-  - uid: 17700
+  - uid: 7140
     components:
     - type: Transform
-      pos: 80.5,-45.5
+      pos: 82.5,-45.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 18788
+      - 15244
   - uid: 19396
     components:
     - type: Transform
@@ -121404,15 +124850,15 @@ entities:
       - 19397
 - proto: WeaponEnergyTurretCommandControlPanel
   entities:
-  - uid: 18788
+  - uid: 15244
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 73.5,-45.5
+      rot: -1.5707963267948966 rad
+      pos: 77.5,-43.5
       parent: 2
     - type: DeviceList
       devices:
-      - 17700
+      - 7140
   - uid: 19397
     components:
     - type: Transform
@@ -121424,70 +124870,62 @@ entities:
       - 19396
 - proto: WeaponEnergyTurretSecurity
   entities:
-  - uid: 12729
+  - uid: 3073
     components:
     - type: Transform
-      pos: 62.5,-55.5
+      pos: 62.5,-47.5
       parent: 2
     - type: DeviceNetwork
       deviceLists:
-      - 14760
+      - 1426
 - proto: WeaponEnergyTurretSecurityControlPanel
   entities:
-  - uid: 14760
+  - uid: 1426
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 62.5,-53.5
+      pos: 62.5,-45.5
       parent: 2
     - type: DeviceList
       devices:
-      - 12729
+      - 3073
 - proto: WeaponRifleFoam
   entities:
   - uid: 7959
     components:
     - type: Transform
-      pos: 64.55189,-69.8399
+      pos: 69.50519,-59.497322
       parent: 2
   - uid: 14307
     components:
     - type: Transform
-      pos: 64.48334,-69.54418
+      pos: 69.5538,-59.358437
       parent: 2
 - proto: WeaponSubMachineGunDrozd
   entities:
   - uid: 15876
     components:
     - type: Transform
-      pos: 68.45742,-31.538942
+      pos: 69.531204,-32.545918
       parent: 2
 - proto: WeaponSubMachineGunWt550
   entities:
   - uid: 10243
     components:
     - type: Transform
-      pos: 65.52122,-45.31295
+      pos: 64.538445,-50.39843
       parent: 2
 - proto: WeaponTurretXeno
   entities:
-  - uid: 5419
+  - uid: 12956
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 54.5,-27.5
+      pos: 37.5,-27.5
       parent: 2
-  - uid: 6268
+  - uid: 12958
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 52.5,-35.5
-      parent: 2
-  - uid: 12914
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 54.5,-42.5
+      pos: 46.5,-30.5
       parent: 2
 - proto: WeaponWaterPistol
   entities:
@@ -121498,6 +124936,11 @@ entities:
       parent: 2
 - proto: Welder
   entities:
+  - uid: 15458
+    components:
+    - type: Transform
+      pos: 67.73903,-68.491745
+      parent: 2
   - uid: 19253
     components:
     - type: Transform
@@ -121505,11 +124948,6 @@ entities:
       parent: 2
 - proto: WelderIndustrial
   entities:
-  - uid: 3765
-    components:
-    - type: Transform
-      pos: 53.37124,-29.397728
-      parent: 2
   - uid: 8007
     components:
     - type: Transform
@@ -121518,7 +124956,7 @@ entities:
   - uid: 9285
     components:
     - type: Transform
-      pos: 27.5,-13.5
+      pos: 28.519037,-13.301477
       parent: 2
 - proto: WeldingFuelTank
   entities:
@@ -121527,33 +124965,43 @@ entities:
     - type: Transform
       pos: -16.5,-49.5
       parent: 2
-  - uid: 11714
-    components:
-    - type: Transform
-      pos: 67.5,-59.5
-      parent: 2
 - proto: WeldingFuelTankFull
   entities:
-  - uid: 5368
+  - uid: 746
     components:
     - type: Transform
-      pos: 50.5,-32.5
+      pos: 38.5,-78.5
       parent: 2
   - uid: 5889
     components:
     - type: Transform
       pos: 54.5,-68.5
       parent: 2
-  - uid: 7725
+  - uid: 7862
     components:
     - type: Transform
-      pos: 75.5,-34.5
+      pos: 76.5,-33.5
       parent: 2
   - uid: 8212
     components:
     - type: Transform
       pos: -41.5,-28.5
       parent: 2
+  - uid: 8383
+    components:
+    - type: Transform
+      pos: 61.5,-62.5
+      parent: 2
+  - uid: 8456
+    components:
+    - type: Transform
+      pos: 38.5,-36.5
+      parent: 2
+  - uid: 12748
+    components:
+    - type: Transform
+      pos: -37.5,-73.5
+      parent: 2
   - uid: 13569
     components:
     - type: Transform
@@ -121564,6 +125012,11 @@ entities:
     - type: Transform
       pos: 10.5,-5.5
       parent: 2
+  - uid: 15438
+    components:
+    - type: Transform
+      pos: 65.5,-55.5
+      parent: 2
   - uid: 16390
     components:
     - type: Transform
@@ -121576,6 +125029,13 @@ entities:
     - type: Transform
       pos: 1.5116462,-46.527744
       parent: 2
+- proto: WhoopieCushion
+  entities:
+  - uid: 5367
+    components:
+    - type: Transform
+      pos: 46.5,-41.5
+      parent: 2
 - proto: Windoor
   entities:
   - uid: 6205
@@ -121590,6 +125050,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 12.5,-57.5
       parent: 2
+  - uid: 7262
+    components:
+    - type: Transform
+      pos: 58.5,-40.5
+      parent: 2
   - uid: 7671
     components:
     - type: Transform
@@ -121613,6 +125078,11 @@ entities:
     - type: Transform
       pos: 79.5,-22.5
       parent: 2
+  - uid: 7768
+    components:
+    - type: Transform
+      pos: 30.5,-16.5
+      parent: 2
   - uid: 8011
     components:
     - type: Transform
@@ -121625,20 +125095,32 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 26.5,-69.5
       parent: 2
-  - uid: 8634
+  - uid: 8577
     components:
     - type: Transform
-      pos: 60.5,-47.5
+      pos: 59.5,-40.5
       parent: 2
-  - uid: 9367
+  - uid: 8617
     components:
     - type: Transform
-      pos: 58.5,-47.5
+      pos: 32.5,-16.5
       parent: 2
-  - uid: 10670
+  - uid: 9213
     components:
     - type: Transform
-      pos: 59.5,-47.5
+      pos: 57.5,-40.5
+      parent: 2
+  - uid: 9894
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-42.5
+      parent: 2
+  - uid: 9895
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 63.5,-43.5
       parent: 2
   - uid: 11761
     components:
@@ -121651,13 +125133,13 @@ entities:
     - type: Transform
       pos: 40.5,-18.5
       parent: 2
-- proto: WindoorBarKitchenLocked
-  entities:
-  - uid: 6343
+  - uid: 16631
     components:
     - type: Transform
-      pos: 40.5,-46.5
+      pos: -38.5,-76.5
       parent: 2
+- proto: WindoorBarKitchenLocked
+  entities:
   - uid: 7018
     components:
     - type: Transform
@@ -121676,17 +125158,17 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 38.5,-42.5
       parent: 2
-  - uid: 9575
-    components:
-    - type: Transform
-      pos: 39.5,-46.5
-      parent: 2
   - uid: 18763
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 38.5,-45.5
       parent: 2
+  - uid: 19747
+    components:
+    - type: Transform
+      pos: 39.5,-46.5
+      parent: 2
 - proto: WindoorCargoLocked
   entities:
   - uid: 3041
@@ -121769,65 +125251,70 @@ entities:
       parent: 2
 - proto: WindoorSecureArmoryLocked
   entities:
-  - uid: 514
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-58.5
-      parent: 2
-  - uid: 4874
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-47.5
-      parent: 2
-  - uid: 9221
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 61.5,-42.5
-      parent: 2
-  - uid: 9225
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 58.5,-47.5
-      parent: 2
-  - uid: 9229
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 59.5,-47.5
-      parent: 2
-  - uid: 9366
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 61.5,-43.5
-      parent: 2
-  - uid: 11939
+  - uid: 1211
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 58.5,-58.5
+      pos: 58.5,-49.5
       parent: 2
-  - uid: 11941
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 58.5,-57.5
-      parent: 2
-  - uid: 16877
+  - uid: 1451
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 62.5,-57.5
+      pos: 62.5,-49.5
       parent: 2
-  - uid: 18908
+  - uid: 4100
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 58.5,-50.5
+      parent: 2
+  - uid: 4204
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 62.5,-50.5
+      parent: 2
+  - uid: 4710
+    components:
+    - type: Transform
+      pos: 58.5,-35.5
+      parent: 2
+  - uid: 4913
+    components:
+    - type: Transform
+      pos: 57.5,-35.5
+      parent: 2
+  - uid: 6165
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 57.5,-40.5
+      parent: 2
+  - uid: 6261
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 58.5,-40.5
+      parent: 2
+  - uid: 9217
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 59.5,-40.5
       parent: 2
+  - uid: 9896
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-42.5
+      parent: 2
+  - uid: 9897
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 63.5,-43.5
+      parent: 2
 - proto: WindoorSecureAtmosphericsLocked
   entities:
   - uid: 8009
@@ -121964,22 +125451,30 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 7.5,-27.5
       parent: 2
-  - uid: 2829
+  - uid: 5422
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
+      rot: 3.141592653589793 rad
+      pos: 32.5,-16.5
+      parent: 2
+  - uid: 7796
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 30.5,-16.5
+      parent: 2
+  - uid: 8691
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 33.5,-15.5
+      parent: 2
+  - uid: 9483
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 19.5,-25.5
       parent: 2
-  - uid: 3012
-    components:
-    - type: Transform
-      pos: 28.5,-17.5
-      parent: 2
-  - uid: 3527
-    components:
-    - type: Transform
-      pos: 30.5,-17.5
-      parent: 2
   - uid: 13977
     components:
     - type: Transform
@@ -121997,11 +125492,17 @@ entities:
       parent: 2
 - proto: WindoorSecureSecurityLocked
   entities:
-  - uid: 3073
+  - uid: 3579
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 69.5,-38.5
+      pos: 57.5,-28.5
+      parent: 2
+  - uid: 4086
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 51.5,-29.5
       parent: 2
   - uid: 4205
     components:
@@ -122009,6 +125510,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 41.5,-21.5
       parent: 2
+  - uid: 4377
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 57.5,-35.5
+      parent: 2
   - uid: 5960
     components:
     - type: Transform
@@ -122027,17 +125534,35 @@ entities:
       rot: 3.141592653589793 rad
       pos: -3.5,-12.5
       parent: 2
+  - uid: 6097
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 57.5,-27.5
+      parent: 2
   - uid: 6123
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 57.5,-21.5
       parent: 2
-  - uid: 7305
+  - uid: 7067
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 61.5,-43.5
+      pos: 57.5,-28.5
+      parent: 2
+  - uid: 7208
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 58.5,-35.5
+      parent: 2
+  - uid: 7952
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 57.5,-27.5
       parent: 2
   - uid: 8414
     components:
@@ -122045,18 +125570,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 61.5,-27.5
       parent: 2
-  - uid: 10319
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 61.5,-42.5
-      parent: 2
-  - uid: 19594
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 59.5,-40.5
-      parent: 2
   - uid: 19647
     components:
     - type: Transform
@@ -122131,22 +125644,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,-57.5
       parent: 2
-  - uid: 5866
+  - uid: 8058
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -40.5,-76.5
-      parent: 2
-  - uid: 6355
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 40.5,-47.5
-      parent: 2
-  - uid: 8373
-    components:
-    - type: Transform
-      pos: -41.5,-75.5
+      rot: 3.141592653589793 rad
+      pos: -40.5,-78.5
       parent: 2
   - uid: 9244
     components:
@@ -122154,12 +125656,24 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,-57.5
       parent: 2
-  - uid: 16631
+  - uid: 12744
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
+      rot: -1.5707963267948966 rad
+      pos: -39.5,-77.5
+      parent: 2
+  - uid: 17102
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -41.5,-77.5
       parent: 2
+  - uid: 19748
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 40.5,-47.5
+      parent: 2
 - proto: WindowFrostedDirectional
   entities:
   - uid: 6162
@@ -122173,46 +125687,41 @@ entities:
       rot: 3.141592653589793 rad
       pos: 13.5,-50.5
       parent: 2
-  - uid: 11685
+- proto: WindowReinforcedDirectional
+  entities:
+  - uid: 296
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 35.5,-11.5
+      pos: 76.5,-62.5
       parent: 2
-  - uid: 17908
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 34.5,-11.5
-      parent: 2
-- proto: WindowReinforcedDirectional
-  entities:
   - uid: 457
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 18.5,-31.5
       parent: 2
-  - uid: 1063
-    components:
-    - type: Transform
-      pos: 61.5,-70.5
-      parent: 2
   - uid: 1790
     components:
     - type: Transform
       pos: -19.5,-60.5
       parent: 2
-  - uid: 3068
+  - uid: 2223
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 69.5,-37.5
+      pos: 62.5,-48.5
       parent: 2
-  - uid: 4356
+  - uid: 3353
     components:
     - type: Transform
-      pos: 62.5,-56.5
+      rot: 3.141592653589793 rad
+      pos: 76.5,-62.5
+      parent: 2
+  - uid: 4610
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 52.5,-31.5
       parent: 2
   - uid: 4866
     components:
@@ -122224,6 +125733,12 @@ entities:
     - type: Transform
       pos: 30.5,-72.5
       parent: 2
+  - uid: 5944
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 52.5,-32.5
+      parent: 2
   - uid: 6703
     components:
     - type: Transform
@@ -122246,16 +125761,27 @@ entities:
     - type: Transform
       pos: 33.5,-72.5
       parent: 2
-  - uid: 8194
+  - uid: 8826
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 61.5,-70.5
+      pos: 51.5,-28.5
       parent: 2
-  - uid: 9904
+  - uid: 9092
     components:
     - type: Transform
-      pos: 19.5,-24.5
+      pos: 58.5,-48.5
+      parent: 2
+  - uid: 9304
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 33.5,-14.5
+      parent: 2
+  - uid: 9341
+    components:
+    - type: Transform
+      pos: 20.5,-24.5
       parent: 2
   - uid: 10554
     components:
@@ -122263,11 +125789,16 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -9.5,-35.5
       parent: 2
-  - uid: 13850
+  - uid: 11869
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 61.5,-67.5
+      pos: 76.5,-66.5
+      parent: 2
+  - uid: 11880
+    components:
+    - type: Transform
+      pos: 76.5,-66.5
       parent: 2
   - uid: 13991
     components:
@@ -122275,23 +125806,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 17.5,-15.5
       parent: 2
-  - uid: 14256
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 61.5,-67.5
-      parent: 2
-  - uid: 15384
-    components:
-    - type: Transform
-      pos: -47.5,-37.5
-      parent: 2
-  - uid: 15385
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -47.5,-39.5
-      parent: 2
   - uid: 16394
     components:
     - type: Transform
@@ -122319,11 +125833,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 30.5,-72.5
       parent: 2
-  - uid: 18271
-    components:
-    - type: Transform
-      pos: 58.5,-56.5
-      parent: 2
   - uid: 19483
     components:
     - type: Transform
@@ -122386,7 +125895,7 @@ entities:
   - uid: 11844
     components:
     - type: Transform
-      pos: 62.448723,-62.43725
+      pos: 62.47169,-65.33372
       parent: 2
   - uid: 14572
     components:
@@ -122413,6 +125922,18 @@ entities:
     - type: Transform
       pos: -19.471653,-51.518547
       parent: 2
+  - uid: 20008
+    components:
+    - type: Transform
+      parent: 20005
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 20020
+    components:
+    - type: Transform
+      pos: 57.496265,-59.48495
+      parent: 2
 - proto: XenoResinWindow
   entities:
   - uid: 223
@@ -122475,6 +125996,29 @@ entities:
     - type: Transform
       pos: 0.5,-37.5
       parent: 2
+  - uid: 798
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 37.5,-14.5
+      parent: 2
+  - uid: 822
+    components:
+    - type: Transform
+      pos: 75.5,-72.5
+      parent: 2
+  - uid: 860
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 37.5,-12.5
+      parent: 2
+  - uid: 861
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 37.5,-13.5
+      parent: 2
   - uid: 902
     components:
     - type: Transform
@@ -122510,16 +126054,6 @@ entities:
     - type: Transform
       pos: -1.5,-40.5
       parent: 2
-  - uid: 1446
-    components:
-    - type: Transform
-      pos: 26.5,-15.5
-      parent: 2
-  - uid: 1447
-    components:
-    - type: Transform
-      pos: 26.5,-16.5
-      parent: 2
   - uid: 1568
     components:
     - type: Transform
@@ -122545,11 +126079,6 @@ entities:
     - type: Transform
       pos: 81.5,-59.5
       parent: 2
-  - uid: 1823
-    components:
-    - type: Transform
-      pos: 80.5,-59.5
-      parent: 2
   - uid: 1827
     components:
     - type: Transform
@@ -122900,16 +126429,6 @@ entities:
     - type: Transform
       pos: 73.5,-57.5
       parent: 2
-  - uid: 3333
-    components:
-    - type: Transform
-      pos: 67.5,-58.5
-      parent: 2
-  - uid: 3334
-    components:
-    - type: Transform
-      pos: 71.5,-56.5
-      parent: 2
   - uid: 3439
     components:
     - type: Transform
@@ -123065,36 +126584,6 @@ entities:
     - type: Transform
       pos: 45.5,-78.5
       parent: 2
-  - uid: 4137
-    components:
-    - type: Transform
-      pos: 78.5,-65.5
-      parent: 2
-  - uid: 4138
-    components:
-    - type: Transform
-      pos: 78.5,-63.5
-      parent: 2
-  - uid: 4139
-    components:
-    - type: Transform
-      pos: 78.5,-64.5
-      parent: 2
-  - uid: 4147
-    components:
-    - type: Transform
-      pos: 76.5,-63.5
-      parent: 2
-  - uid: 4160
-    components:
-    - type: Transform
-      pos: 76.5,-65.5
-      parent: 2
-  - uid: 4168
-    components:
-    - type: Transform
-      pos: 76.5,-64.5
-      parent: 2
   - uid: 4195
     components:
     - type: Transform
@@ -123170,6 +126659,11 @@ entities:
     - type: Transform
       pos: 45.5,-55.5
       parent: 2
+  - uid: 4378
+    components:
+    - type: Transform
+      pos: 83.5,-45.5
+      parent: 2
   - uid: 4382
     components:
     - type: Transform
@@ -123240,11 +126734,6 @@ entities:
     - type: Transform
       pos: 18.5,-47.5
       parent: 2
-  - uid: 4399
-    components:
-    - type: Transform
-      pos: -13.5,-75.5
-      parent: 2
   - uid: 4403
     components:
     - type: Transform
@@ -123275,11 +126764,6 @@ entities:
     - type: Transform
       pos: -13.5,-77.5
       parent: 2
-  - uid: 4419
-    components:
-    - type: Transform
-      pos: -12.5,-75.5
-      parent: 2
   - uid: 4420
     components:
     - type: Transform
@@ -123295,21 +126779,6 @@ entities:
     - type: Transform
       pos: 19.5,-47.5
       parent: 2
-  - uid: 4425
-    components:
-    - type: Transform
-      pos: 26.5,-20.5
-      parent: 2
-  - uid: 4426
-    components:
-    - type: Transform
-      pos: 26.5,-19.5
-      parent: 2
-  - uid: 4428
-    components:
-    - type: Transform
-      pos: 31.5,-13.5
-      parent: 2
   - uid: 4429
     components:
     - type: Transform
@@ -123320,6 +126789,11 @@ entities:
     - type: Transform
       pos: -14.5,-10.5
       parent: 2
+  - uid: 4433
+    components:
+    - type: Transform
+      pos: 73.5,-72.5
+      parent: 2
   - uid: 4439
     components:
     - type: Transform
@@ -123830,6 +127304,11 @@ entities:
     - type: Transform
       pos: -48.5,-34.5
       parent: 2
+  - uid: 5332
+    components:
+    - type: Transform
+      pos: 82.5,-41.5
+      parent: 2
   - uid: 5375
     components:
     - type: Transform
@@ -123840,21 +127319,11 @@ entities:
     - type: Transform
       pos: -47.5,-34.5
       parent: 2
-  - uid: 5429
-    components:
-    - type: Transform
-      pos: 56.5,-35.5
-      parent: 2
   - uid: 5431
     components:
     - type: Transform
       pos: 16.5,-71.5
       parent: 2
-  - uid: 5433
-    components:
-    - type: Transform
-      pos: 81.5,-45.5
-      parent: 2
   - uid: 5434
     components:
     - type: Transform
@@ -123875,11 +127344,6 @@ entities:
     - type: Transform
       pos: 39.5,-16.5
       parent: 2
-  - uid: 5440
-    components:
-    - type: Transform
-      pos: 37.5,-16.5
-      parent: 2
   - uid: 5441
     components:
     - type: Transform
@@ -123895,16 +127359,6 @@ entities:
     - type: Transform
       pos: 47.5,-12.5
       parent: 2
-  - uid: 5444
-    components:
-    - type: Transform
-      pos: 37.5,-17.5
-      parent: 2
-  - uid: 5445
-    components:
-    - type: Transform
-      pos: 37.5,-14.5
-      parent: 2
   - uid: 5446
     components:
     - type: Transform
@@ -124055,6 +127509,16 @@ entities:
     - type: Transform
       pos: 45.5,-57.5
       parent: 2
+  - uid: 6104
+    components:
+    - type: Transform
+      pos: 80.5,-49.5
+      parent: 2
+  - uid: 6106
+    components:
+    - type: Transform
+      pos: 82.5,-42.5
+      parent: 2
   - uid: 6114
     components:
     - type: Transform
@@ -124070,6 +127534,16 @@ entities:
     - type: Transform
       pos: 33.5,-60.5
       parent: 2
+  - uid: 6386
+    components:
+    - type: Transform
+      pos: 82.5,-49.5
+      parent: 2
+  - uid: 6387
+    components:
+    - type: Transform
+      pos: 82.5,-43.5
+      parent: 2
   - uid: 6598
     components:
     - type: Transform
@@ -124095,10 +127569,15 @@ entities:
     - type: Transform
       pos: 44.5,-58.5
       parent: 2
-  - uid: 7762
+  - uid: 7320
     components:
     - type: Transform
-      pos: 75.5,-72.5
+      pos: 82.5,-47.5
+      parent: 2
+  - uid: 7409
+    components:
+    - type: Transform
+      pos: 73.5,-73.5
       parent: 2
   - uid: 7764
     components:
@@ -124110,36 +127589,16 @@ entities:
     - type: Transform
       pos: 45.5,-12.5
       parent: 2
-  - uid: 7862
+  - uid: 7794
     components:
     - type: Transform
-      pos: 80.5,-42.5
-      parent: 2
-  - uid: 7909
-    components:
-    - type: Transform
-      pos: 81.5,-42.5
-      parent: 2
-  - uid: 7925
-    components:
-    - type: Transform
-      pos: 79.5,-42.5
-      parent: 2
-  - uid: 8029
-    components:
-    - type: Transform
-      pos: 80.5,-49.5
+      pos: 32.5,-13.5
       parent: 2
   - uid: 8063
     components:
     - type: Transform
       pos: 80.5,-41.5
       parent: 2
-  - uid: 8079
-    components:
-    - type: Transform
-      pos: 79.5,-48.5
-      parent: 2
   - uid: 8144
     components:
     - type: Transform
@@ -124155,16 +127614,6 @@ entities:
     - type: Transform
       pos: 50.5,-63.5
       parent: 2
-  - uid: 8221
-    components:
-    - type: Transform
-      pos: 73.5,-73.5
-      parent: 2
-  - uid: 8345
-    components:
-    - type: Transform
-      pos: 73.5,-72.5
-      parent: 2
   - uid: 8346
     components:
     - type: Transform
@@ -124175,61 +127624,76 @@ entities:
     - type: Transform
       pos: 16.5,-72.5
       parent: 2
-  - uid: 8371
+  - uid: 8422
     components:
     - type: Transform
-      pos: 80.5,-43.5
+      pos: 66.5,-59.5
       parent: 2
-  - uid: 8510
+  - uid: 8503
     components:
     - type: Transform
-      pos: 81.5,-48.5
-      parent: 2
-  - uid: 8511
-    components:
-    - type: Transform
-      pos: 80.5,-47.5
-      parent: 2
-  - uid: 8606
-    components:
-    - type: Transform
-      pos: 80.5,-48.5
+      pos: 69.5,-57.5
       parent: 2
   - uid: 9294
     components:
     - type: Transform
       pos: 51.5,-53.5
       parent: 2
-  - uid: 9305
+  - uid: 9329
     components:
     - type: Transform
-      pos: 58.5,-77.5
+      pos: 81.5,-42.5
+      parent: 2
+  - uid: 9337
+    components:
+    - type: Transform
+      pos: 28.5,-15.5
+      parent: 2
+  - uid: 9354
+    components:
+    - type: Transform
+      pos: 29.5,-16.5
+      parent: 2
+  - uid: 9446
+    components:
+    - type: Transform
+      pos: 83.5,-42.5
       parent: 2
   - uid: 9695
     components:
     - type: Transform
-      pos: 53.5,-53.5
+      pos: 80.5,-59.5
       parent: 2
-  - uid: 10236
+  - uid: 9847
     components:
     - type: Transform
-      pos: 58.5,-25.5
+      pos: 65.5,-59.5
       parent: 2
   - uid: 10305
     components:
     - type: Transform
       pos: 52.5,-53.5
       parent: 2
+  - uid: 10516
+    components:
+    - type: Transform
+      pos: 81.5,-49.5
+      parent: 2
+  - uid: 10721
+    components:
+    - type: Transform
+      pos: 81.5,-41.5
+      parent: 2
+  - uid: 10752
+    components:
+    - type: Transform
+      pos: 81.5,-40.5
+      parent: 2
   - uid: 10889
     components:
     - type: Transform
       pos: -17.5,-73.5
       parent: 2
-  - uid: 11665
-    components:
-    - type: Transform
-      pos: 56.5,-41.5
-      parent: 2
   - uid: 11872
     components:
     - type: Transform
@@ -124265,16 +127729,31 @@ entities:
     - type: Transform
       pos: -20.5,-73.5
       parent: 2
+  - uid: 15156
+    components:
+    - type: Transform
+      pos: 83.5,-48.5
+      parent: 2
+  - uid: 15157
+    components:
+    - type: Transform
+      pos: 82.5,-48.5
+      parent: 2
+  - uid: 15164
+    components:
+    - type: Transform
+      pos: 81.5,-48.5
+      parent: 2
+  - uid: 15166
+    components:
+    - type: Transform
+      pos: 81.5,-50.5
+      parent: 2
   - uid: 15230
     components:
     - type: Transform
       pos: -19.5,-73.5
       parent: 2
-  - uid: 15434
-    components:
-    - type: Transform
-      pos: 58.5,-78.5
-      parent: 2
   - uid: 15960
     components:
     - type: Transform
@@ -124302,11 +127781,6 @@ entities:
     - type: Transform
       pos: -22.5,-53.5
       parent: 2
-  - uid: 17505
-    components:
-    - type: Transform
-      pos: 56.5,-29.5
-      parent: 2
   - uid: 17655
     components:
     - type: Transform
@@ -124317,16 +127791,6 @@ entities:
     - type: Transform
       pos: -18.5,-15.5
       parent: 2
-  - uid: 17702
-    components:
-    - type: Transform
-      pos: 59.5,-25.5
-      parent: 2
-  - uid: 17996
-    components:
-    - type: Transform
-      pos: 63.5,-63.5
-      parent: 2
   - uid: 18416
     components:
     - type: Transform
@@ -124368,11 +127832,6 @@ entities:
     - type: Transform
       pos: -16.5,-70.5
       parent: 2
-  - uid: 19044
-    components:
-    - type: Transform
-      pos: 60.5,-21.5
-      parent: 2
   - uid: 19193
     components:
     - type: Transform
diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml
index e6587ae6b8..97435c229d 100644
--- a/Resources/Prototypes/Actions/types.yml
+++ b/Resources/Prototypes/Actions/types.yml
@@ -121,7 +121,7 @@
       state: gib
 
 - type: entity
-  parent: BaseAction
+  parent: BaseImplantAction
   id: ActionActivateFreedomImplant
   name: Break Free
   description: Activating your freedom implant will free you from any hand restraints
@@ -135,8 +135,6 @@
     icon:
       sprite: Actions/Implants/implants.rsi
       state: freedom
-  - type: InstantAction
-    event: !type:UseFreedomImplantEvent
 
 - type: entity
   parent: BaseAction
@@ -171,7 +169,7 @@
       state: icon
 
 - type: entity
-  parent: BaseAction
+  parent: BaseImplantAction
   id: ActionActivateScramImplant
   name: SCRAM!
   description: Randomly teleports you within a large distance.
@@ -186,11 +184,9 @@
     icon:
       sprite: Structures/Specific/anomaly.rsi
       state: anom4
-  - type: InstantAction
-    event: !type:UseScramImplantEvent
 
 - type: entity
-  parent: BaseAction
+  parent: BaseImplantAction
   id: ActionActivateDnaScramblerImplant
   name: Scramble DNA
   description:  Randomly changes your name and appearance.
@@ -205,8 +201,6 @@
     icon:
       sprite: Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi
       state: icon
-  - type: InstantAction
-    event: !type:UseDnaScramblerImplantEvent
 
 - type: entity
   parent: BaseAction
@@ -409,12 +403,12 @@
   components:
   - type: Action
     useDelay: 8
-    icon: 
+    icon:
       sprite: Interface/Actions/jump.rsi
       state: icon
   - type: InstantAction
     event: !type:GravityJumpEvent {}
-    
+
 - type: entity
   parent: BaseToggleAction
   id: ActionToggleRootable
diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml
index ba86774f9b..719fa9379a 100644
--- a/Resources/Prototypes/Alerts/alerts.yml
+++ b/Resources/Prototypes/Alerts/alerts.yml
@@ -313,7 +313,9 @@
   id: PilotingShuttle
   category: Piloting
   clickEvent: !type:StopPilotingAlertEvent
-  icons: [ /Textures/Interface/Alerts/piloting.png ]
+  icons:
+  - sprite: /Textures/Interface/Alerts/shuttle.rsi
+    state: piloting
   name: alerts-piloting-name
   description: alerts-piloting-desc
 
diff --git a/Resources/Prototypes/Antag/changeling.yml b/Resources/Prototypes/Antag/changeling.yml
new file mode 100644
index 0000000000..b4c8b2e3dc
--- /dev/null
+++ b/Resources/Prototypes/Antag/changeling.yml
@@ -0,0 +1,35 @@
+- type: entity
+  parent: MobHuman
+  id: MobLing
+  name: Urist McLing
+  suffix: Non-Antag
+  components:
+  - type: ChangelingDevour
+  - type: ChangelingIdentity
+  - type: ChangelingTransform
+  - type: ActionGrant
+    actions:
+    - ActionRetractableItemArmBlade # Temporary addition, will inevitably be a purchasable in the bio-store
+
+- type: entity
+  id: ActionChangelingDevour
+  name: "[color=red]Devour[/color]"
+  description: Consume the essence of your victims and subsume their identity and mind into your own.
+  components:
+  - type: Action
+    icon: { sprite : Interface/Actions/changeling.rsi, state: "devour" }
+    iconOn: { sprite : Interface/Actions/changeling.rsi, state: "devour_on" }
+    priority: 1
+  - type: TargetAction
+  - type: EntityTargetAction
+    event: !type:ChangelingDevourActionEvent
+
+- type: entity
+  id: ActionChangelingTransform
+  name: "[color=red]Transform[/color]"
+  description: Transform and assume the identities of those you have devoured.
+  components:
+  - type: Action
+    icon: { sprite : Interface/Actions/changeling.rsi, state: "transform" }
+  - type: InstantAction
+    event: !type:ChangelingTransformActionEvent
diff --git a/Resources/Prototypes/Body/Organs/Animal/ruminant.yml b/Resources/Prototypes/Body/Organs/Animal/ruminant.yml
index 3b00e1a223..6b64aa4c1d 100644
--- a/Resources/Prototypes/Body/Organs/Animal/ruminant.yml
+++ b/Resources/Prototypes/Body/Organs/Animal/ruminant.yml
@@ -4,6 +4,12 @@
   name: ruminant stomach
   categories: [ HideSpawnMenu ]
   components:
+  - type: Stomach
+    specialDigestible:
+      tags:
+      - Ruminant
+      - Wheat
+      - BananaPeel
   - type: SolutionContainerManager
     solutions:
       stomach:
diff --git a/Resources/Prototypes/Body/Prototypes/Specific/mothershipcore.yml b/Resources/Prototypes/Body/Prototypes/Specific/mothershipcore.yml
new file mode 100644
index 0000000000..234f950a03
--- /dev/null
+++ b/Resources/Prototypes/Body/Prototypes/Specific/mothershipcore.yml
@@ -0,0 +1,20 @@
+- type: body
+  id: MothershipCoreBody
+  name: "core"
+  root: torso
+  slots:
+    torso:
+      part: TorsoBorg
+      connections:
+      - right2hand
+      - right1hand
+      - left1hand
+      - left2hand
+    left1hand:
+      part: LeftArmBorg
+    left2hand:
+      part: LeftArmBorg
+    right1hand:
+      part: RightArmBorg
+    right2hand:
+      part: RightArmBorg
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index 2f2e7a2c1a..056a5ce135 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -43,6 +43,7 @@
       amount: 2
     - id: RemoteSignaller
       amount: 2
+    - id: NetworkConfigurator
     - id: Binoculars
 
 - type: entityTable
diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml
index 0f023e2470..9cc79b2aaa 100644
--- a/Resources/Prototypes/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/Damage/modifier_sets.yml
@@ -145,6 +145,13 @@
   flatReductions:
     Blunt: 5
 
+- type: damageModifierSet
+  id: Card
+  coefficients:
+    Slash: 2.0
+    Piercing: 0.1 # Holes easily poked through, but do little to structural integrity 
+    Heat: 3.0
+
 - type: damageModifierSet
   id: Web # Very flammable, can be easily hacked and slashed, but shooting or hitting it is another story.
   coefficients:
diff --git a/Resources/Prototypes/DeviceLinking/sink_ports.yml b/Resources/Prototypes/DeviceLinking/sink_ports.yml
index a5313fcc4e..66e2bee27d 100644
--- a/Resources/Prototypes/DeviceLinking/sink_ports.yml
+++ b/Resources/Prototypes/DeviceLinking/sink_ports.yml
@@ -45,8 +45,8 @@
 
 - type: sinkPort
   id: Trigger
-  name: signal-port-name-trigger
-  description: signal-port-description-trigger
+  name: signal-port-name-trigger-receiver
+  description: signal-port-description-trigger-receiver
 
 - type: sinkPort
   id: Timer
diff --git a/Resources/Prototypes/DeviceLinking/source_ports.yml b/Resources/Prototypes/DeviceLinking/source_ports.yml
index 4a460e722d..302679c4d9 100644
--- a/Resources/Prototypes/DeviceLinking/source_ports.yml
+++ b/Resources/Prototypes/DeviceLinking/source_ports.yml
@@ -157,6 +157,12 @@
   name: signal-port-name-power-discharging
   description: signal-port-description-power-discharging
 
+- type: sourcePort
+  id: Trigger
+  name: signal-port-name-trigger-sender
+  description: signal-port-description-trigger-sender
+  defaultLinks: [ AutoClose, On, Open, Forward, Trigger, Timer ]
+
 - type: sourcePort
   id: ItemDetected
   name: signal-port-name-item-detected
diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
index 4d406e9508..fc3e557bea 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -339,9 +339,9 @@
     equipDelay: 5 # to avoid accidentally falling into the trap associated with SelfUnremovableClothing
   - type: SelfUnremovableClothing
   - type: ShockOnTrigger
+    targetContainer: true
     damage: 5
     duration: 3
-    cooldown: 4
   - type: TriggerOnSignal
   - type: DeviceLinkSink
     ports:
diff --git a/Resources/Prototypes/Entities/Clothing/Back/specific.yml b/Resources/Prototypes/Entities/Clothing/Back/specific.yml
index d303aa166c..005dfedba5 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/specific.yml
@@ -75,6 +75,7 @@
     solution: tank
   - type: ExaminableSolution
     solution: tank
+    exactVolume: true
 
 - type: entity
   parent: ClothingBackpack
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index 8255f0095a..ffb403534f 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -234,6 +234,7 @@
         - WetFloorSign
         - HolosignProjector
         - Plunger
+        - GoldenPlunger
         - WireBrush
       components:
         - LightReplacer
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
index 349d85da23..836ebfffda 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -196,6 +196,7 @@
     - CorgiWearable
     - WhitelistChameleon
 
+#Goliath Hardsuit
 - type: entity
   parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
   id: ClothingHeadHelmetHardsuitGoliath
@@ -249,6 +250,7 @@
     - CorgiWearable
     - WhitelistChameleon
 
+#Maxim Hardsuit
 - type: entity
   parent: ClothingHeadHardsuitBase
   id: ClothingHeadHelmetHardsuitMaxim
@@ -884,6 +886,10 @@
       - state: equipped-head
       - state: equipped-head-unshaded
         shader: unshaded
+      head-vox:
+      - state: equipped-head-vox
+      - state: equipped-head-unshaded-vox
+        shader: unshaded
   - type: PointLight
     color: orange
   - type: PressureProtection
diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
index f729ea1034..57665af04f 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -568,3 +568,25 @@
     itemIconStyle: BigItem
   - type: InstantAction
     event: !type:ToggleActionEvent
+
+#card helmet
+- type: entity
+  parent: ClothingHeadHelmetBase
+  id: CardHelmet
+  name: cardboard helmet
+  description: A medieval helmet built from cardboard.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Helmets/card_helmet.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Helmets/card_helmet.rsi
+  - type: IngestionBlocker
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.95
+  - type: StaminaResistance
+    damageCoefficient: 0.95
+  - type: Construction
+    graph: cardHelmet
+    node: cardhelmet
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
index be8727008a..96844d4017 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
@@ -315,15 +315,16 @@
   - type: Clothing
     slots:
     - HEAD
-  - type: Food
+  - type: Edible
+    edible: Drink
     solution: drink
-    useSound: /Audio/Items/drink.ogg
-    eatMessage: drink-component-try-use-drink-success-slurp
     delay: 0.5
     forceFeedDelay: 1.5
   - type: FlavorProfile
     flavors:
       - water
+  - type: DrainableSolution
+    solution: drink
   - type: SolutionContainerManager
     solutions:
       drink:
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
index a345622d85..25d963882c 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -491,3 +491,22 @@
   - type: ProtectedFromStepTriggers
     slots: WITHOUT_POCKET
 
+- type: entity
+  parent: ClothingOuterArmorBase
+  id: CardArmour
+  name: cardboard armour
+  description: A medieval chestpiece built from cardboard.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Armor/card_armour.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Armor/card_armour.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.9
+  - type: StaminaResistance
+    damageCoefficient: 0.90
+  - type: Construction
+    graph: cardArmour
+    node: cardarmour
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Effects/admin_triggers.yml b/Resources/Prototypes/Entities/Effects/admin_triggers.yml
index 52c5a6c110..df9e11bcff 100644
--- a/Resources/Prototypes/Entities/Effects/admin_triggers.yml
+++ b/Resources/Prototypes/Entities/Effects/admin_triggers.yml
@@ -7,7 +7,7 @@
     sprite: /Textures/Objects/Fun/goldbikehorn.rsi
     visible: false
     state: icon
-  - type: TriggerOnSpawn   
+  - type: TriggerOnSpawn
   - type: TimedDespawn
     lifetime: 5
 
@@ -25,7 +25,7 @@
   suffix: BluespaceFlash
   parent: AdminInstantEffectBase
   components:
-  - type: SpawnOnTrigger 
+  - type: SpawnOnTrigger
     proto: EffectFlashBluespace
 
 - type: entity
@@ -35,9 +35,9 @@
   components:
   - type: FlashOnTrigger
     range: 7
-  - type: SpawnOnTrigger 
+  - type: SpawnOnTrigger
     proto: GrenadeFlashEffect
-  
+
 - type: entity
   id: AdminInstantEffectSmoke3
   suffix: Smoke (03 sec)
@@ -46,12 +46,12 @@
   - type: SmokeOnTrigger
     duration: 3
     spreadAmount: 1
-  - type: SoundOnTrigger
+  - type: EmitSoundOnTrigger
     sound: /Audio/Effects/smoke.ogg
   - type: TimerTriggerVisuals
     primingSound:
       path: /Audio/Effects/Smoke-grenade.ogg
-  
+
 - type: entity
   id: AdminInstantEffectSmoke10
   suffix: Smoke (10 sec)
@@ -60,12 +60,12 @@
   - type: SmokeOnTrigger
     duration: 10
     spreadAmount: 30
-  - type: SoundOnTrigger
+  - type: EmitSoundOnTrigger
     sound: /Audio/Effects/smoke.ogg
   - type: TimerTriggerVisuals
     primingSound:
       path: /Audio/Effects/Smoke-grenade.ogg
-  
+
 - type: entity
   id: AdminInstantEffectSmoke30
   suffix: Smoke (30 sec)
@@ -74,7 +74,7 @@
   - type: SmokeOnTrigger
     duration: 30
     spreadAmount: 50
-  - type: SoundOnTrigger
+  - type: EmitSoundOnTrigger
     sound: /Audio/Effects/smoke.ogg
   - type: TimerTriggerVisuals
     primingSound:
@@ -97,12 +97,12 @@
   id: AdminInstantEffectGravityWell
   suffix: Gravity Well
   parent: AdminInstantEffectBase
-  components: 
-  - type: SoundOnTrigger
-    removeOnTrigger: true
+  components:
+  - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Effects/Grenades/Supermatter/supermatter_start.ogg
-      volume: 5
+      params:
+        volume: 5
   - type: AmbientSound
     enabled: true
     volume: -5
@@ -117,4 +117,4 @@
   - type: SingularityDistortion
     intensity: 10
     falloffPower: 1.5
-      
+
diff --git a/Resources/Prototypes/Entities/Effects/puddle.yml b/Resources/Prototypes/Entities/Effects/puddle.yml
index a426e7aa1c..cc3df59c55 100644
--- a/Resources/Prototypes/Entities/Effects/puddle.yml
+++ b/Resources/Prototypes/Entities/Effects/puddle.yml
@@ -201,13 +201,14 @@
   - type: EdgeSpreader
     id: Puddle
   - type: StepTrigger
-  - type: Drink
+  - type: Edible
+    edible: Drink
     delay: 3
     transferAmount: 1
     solution: puddle
-    examinable: false
   - type: ExaminableSolution
     solution: puddle
+    locVolume: "examinable-solution-on-examine-volume-puddle"
   - type: DrawableSolution
     solution: puddle
   - type: BadDrink
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml
index 88506d33a6..7d0f734acc 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml
@@ -42,6 +42,8 @@
       - FoodCakeChristmasSlice
       - FoodCakeVanillaSlice
       - FoodCakeBirthdaySlice
+      - FoodCakeBerryDelightSlice
+      - FoodCakeCottonSlice
       - FoodBakedMuffin
       - FoodBakedMuffinBerry
       - FoodBakedMuffinCherry
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml
index 7e580db980..7683f19884 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml
@@ -37,6 +37,8 @@
       - FoodCakeChristmas
       - FoodCakeBirthday
       - FoodCakeVanilla
+      - FoodCakeBerryDelight
+      - FoodCakeCotton
       - FoodPieApple
       - FoodPieBaklava
       - FoodPieBananaCream
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index 714c740cf8..cb95c231e9 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -264,7 +264,7 @@
     receiveFrequencyId: CyborgControl
     transmitFrequencyId: RoboticsConsole
     savableAddress: false
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     delay: 10
     examinable: false
     beepSound:
@@ -272,8 +272,9 @@
       params:
         volume: -4
   # prevent any funnies if someone makes a cyborg item...
-  - type: AutomatedTimer
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   # explosion does most of its damage in the center and less at the edges
   - type: Explosive
     explosionType: Minibomb
@@ -387,13 +388,15 @@
   parent: BaseBorgChassisNotIonStormable
   id: BaseXenoborgChassis
   name: xenoborg
-  description: A man-machine hybrid that aims to replicate itself. They love extracting brains to insert into fresh xenoborg chassis to grow their army.
+  description: A man-machine hybrid that aims to replicate itself. They love extracting brains to insert into fresh Xenoborg chassis to grow their army.
   save: false
   abstract: true
   components:
   - type: RandomMetadata
     nameSegments:
     - NamesXenoborg
+  - type: NameIdentifier
+    group: Xenoborg
   - type: Sprite
     sprite: Mobs/Silicon/chassis.rsi
   - type: MobThresholds
@@ -434,7 +437,7 @@
   - type: Vocal
     sounds:
       Unsexed: UnisexSiliconXenoborg
-    screamAction: null
+    wilhelmProbability: 0
   - type: DamagedSiliconAccent
   - type: UnblockableSpeech
   - type: FootstepModifier
@@ -460,7 +463,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Machines/warning_buzzer.ogg
+          path: /Audio/Machines/warning_buzzer_xenoborg.ogg
           params:
             volume: 5
     - trigger:
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml
index 5bd6929bfe..556b6ac4c4 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml
@@ -3,7 +3,7 @@
   id: XenoborgEngi
   name: engi xenoborg
   suffix: with brain
-  description: A man-machine hybrid that aims to replicate itself. They love extracting brains to insert into fresh xenoborg chassis to grow their army. This one seems to be an engineering type, as it has more tools for supporting the other xenoborgs.
+  description: A man-machine hybrid that aims to replicate itself. They love extracting brains to insert into fresh Xenoborg chassis to grow their army. This one seems to be an engineering type, as it has more tools for supporting the other Xenoborgs.
   components:
   - type: BorgTransponder
     name: engi xenoborg
@@ -30,6 +30,7 @@
       - XenoborgModuleGeneric
       - XenoborgModuleEngi
       - BorgModuleEngineering
+      - BorgModuleGeneric
   - type: ContainerFill
     containers:
       borg_brain:
@@ -57,7 +58,7 @@
   id: XenoborgHeavy
   name: heavy xenoborg
   suffix: with brain
-  description: A man-machine hybrid that aims to replicate itself. They love extracting brains to insert into fresh xenoborg chassis to grow their army. This type is has heavy lasers and is covered in thick armor plates. It may be tougher, but its speed matches its brawn.
+  description: A man-machine hybrid that aims to replicate itself. They love extracting brains to insert into fresh Xenoborg chassis to grow their army. This type is has heavy lasers and is covered in thick armor plates. It may be tougher, but its speed matches its brawn.
   components:
   - type: BorgTransponder
     name: heavy xenoborg
@@ -106,7 +107,7 @@
       behaviors:
       - !type:PlaySoundBehavior
         sound:
-          path: /Audio/Machines/warning_buzzer.ogg
+          path: /Audio/Machines/warning_buzzer_xenoborg.ogg
           params:
             volume: 5
     - trigger:
@@ -144,7 +145,7 @@
   id: XenoborgScout
   name: scout xenoborg
   suffix: with brain
-  description: A man-machine hybrid that aims to replicate itself. They love extracting brains to insert into fresh xenoborg chassis to grow their army. This is a scout type, its nimble thrusters allow it to move quickly through space.
+  description: A man-machine hybrid that aims to replicate itself. They love extracting brains to insert into fresh Xenoborg chassis to grow their army. This is a scout type, its nimble thrusters allow it to move quickly through space.
   components:
   - type: BorgTransponder
     name: scout xenoborg
@@ -197,7 +198,7 @@
   id: XenoborgStealth
   name: stealth xenoborg
   suffix: with brain
-  description: A man-machine hybrid that aims to replicate itself. They love extracting brains to insert into fresh xenoborg chassis to grow their army. This one is a stealth type. Its armor shimmers in the light like no other material you've seen.
+  description: A man-machine hybrid that aims to replicate itself. They love extracting brains to insert into fresh Xenoborg chassis to grow their army. This one is a stealth type. Its armor shimmers in the light like no other material you've seen.
   components:
   - type: BorgTransponder
     name: stealth xenoborg
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 6ecac1b922..da68ee109b 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -113,6 +113,7 @@
       10: Dead
   - type: Stamina
     critThreshold: 10
+    animationThreshold: 1
   - type: DamageStateVisuals
     states:
       Alive:
@@ -1053,10 +1054,10 @@
     growthDelay: 20
   - type: ExaminableHunger
   - type: Wooly
-  - type: Food
+  - type: Edible
+    destroyOnEmpty: false
     solution: wool
     requiresSpecialDigestion: true
-    # Wooly prevents eating wool deleting the goat so its fine
     requireDead: false
   - type: FlavorProfile
     flavors:
@@ -2369,7 +2370,8 @@
   - type: Item
     size: Normal
     sprite: Mobs/Animals/grenadepenguin.rsi
-  - type: OnUseTimerTrigger
+  - type: TriggerOnUse
+  - type: TimerTrigger
     delay: 10
     beepSound:
       path: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg #funny sfx use
@@ -2382,6 +2384,8 @@
     intensitySlope: 20
     totalIntensity: 225
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   - type: Destructible
     thresholds:
     - trigger:
@@ -2855,6 +2859,7 @@
   - type: HTN
     rootTask:
       task: RuminantHostileCompound
+  - type: MessyDrinker
   - type: Tag
     tags:
     - VimPilot
@@ -2901,6 +2906,7 @@
       gender: epicene
   - type: MobPrice
     price: 200
+  - type: MessyDrinker
 
 - type: entity
   parent: MobCorgiBase
@@ -3143,7 +3149,7 @@
     factions:
     - Syndicate
   - type: Access
-    tags: 
+    tags:
     - NuclearOperative
     - SyndicateAgent
   - type: MeleeWeapon
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
index 77bb8e1a7f..ba4c5e3698 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
@@ -53,11 +53,6 @@
     critThreshold: 120
   - type: Destructible
     thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 100
-      behaviors:
-      - !type:TriggerBehavior
     - trigger:
         !type:DamageTrigger
         damage: 120
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml b/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml
index a1bcd547a6..f3ec5ff80b 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml
@@ -42,6 +42,7 @@
       75: Dead
   - type: Stamina
     critThreshold: 50
+    animationThreshold: 25
   - type: Butcherable
     spawned:
     - id: FoodMeat
@@ -240,6 +241,7 @@
       75: Dead
   - type: Stamina
     critThreshold: 50
+    animationThreshold: 25
   - type: Butcherable
     spawned:
     - id: FoodMeat
@@ -359,4 +361,4 @@
       30: Dead
   - type: MovementSpeedModifier
     baseWalkSpeed: 2
-    baseSprintSpeed: 2.5
\ No newline at end of file
+    baseSprintSpeed: 2.5
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index 75aacadd35..dcfd6b41fc 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -370,6 +370,7 @@
     - VimPilot
   - type: StealTarget
     stealGroup: AnimalMcGriff
+  - type: MessyDrinker
 
 - type: entity
   name: Paperwork
@@ -466,6 +467,7 @@
   - type: Speech
     speechVerb: Canine
     speechSounds: Dog
+  - type: MessyDrinker
 
 - type: entity
   name: Morty
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
index 2eaf7c819f..be7c034a39 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
@@ -53,6 +53,7 @@
         recursive: false
   - type: Stamina
     critThreshold: 15
+    animationThreshold: 5
   - type: MovementAlwaysTouching
   - type: DamageStateVisuals
     states:
diff --git a/Resources/Prototypes/Entities/Mobs/Player/clone.yml b/Resources/Prototypes/Entities/Mobs/Player/clone.yml
index bdf741e58a..49c05ba3f1 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/clone.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/clone.yml
@@ -1,13 +1,12 @@
 # Settings for cloning bodies
 # If you add a new trait, job specific component or a component doing visual/examination changes for humanoids
 # then add it here to the correct prototype.
-# The datafields of the components are only shallow copied using CopyComp.
+# The datafields of the components copied using CopyComp.
 # Subscribe to CloningEvent instead if that is not enough.
 
-# for basic traits etc.
-# used by the random clone spawner
+# for basic physical traits
 - type: cloningSettings
-  id: BaseClone
+  id: Body
   components:
   # general
   - DetailExaminable
@@ -15,8 +14,9 @@
   - Fingerprint
   - NpcFactionMember
   # traits
-  # - LegsParalyzed (you get healed)
   - BlackAndWhiteOverlay
+  - Clumsy
+  # - LegsParalyzed (you get healed)
   - LightweightDrunk
   - Muted
   - Narcolepsy
@@ -26,14 +26,6 @@
   - PermanentBlindness
   - Snoring
   - Unrevivable
-  # job specific
-  - BibleUser
-  - CommandStaff
-  - Clumsy
-  - MindShield
-  - MimePowers
-  - SpaceNinja
-  - Thieving
   # accents
   - Accentless
   - BackwardsAccent
@@ -62,6 +54,30 @@
   - SouthernAccent
   - SpanishAccent
   - StutteringAccent
+
+# for job-specific traits etc.
+- type: cloningSettings
+  id: Special
+  components:
+  - BibleUser
+  - CommandStaff
+  - MindShield
+  - MimePowers
+  - SpaceNinja
+  - Thieving
+
+# antag roles
+- type: cloningSettings
+  id: Antag
+  components:
+  - HeadRevolutionary
+  - Revolutionary
+  - NukeOperative
+
+# a full clone with all traits and items, but no antag roles
+- type: cloningSettings
+  id: BaseClone
+  parent: [Body, Special]
   blacklist:
     components:
     - AttachedClothing # helmets, which are part of the suit
@@ -69,26 +85,47 @@
     - Implanter # they will spawn full again, but you already get the implant. And we can't do item slot copying yet
     - VirtualItem
 
-# all antagonist roles
-- type: cloningSettings
-  id: Antag
-  parent: BaseClone
-  components:
-  - HeadRevolutionary
-  - Revolutionary
-  - NukeOperative
-
 # for cloning pods
 - type: cloningSettings
   id: CloningPod
-  parent: Antag
+  parent: [BaseClone, Antag]
   forceCloning: false
   copyEquipment: null
   copyInternalStorage: false
   copyImplants: false
 
-# spawner
+# for paradox clones
+- type: cloningSettings
+  id: ParadoxCloningSettings
+  parent: [BaseClone, Antag]
 
+# changeling identity copying
+- type: cloningSettings
+  id: ChangelingCloningSettings
+  parent: Body
+  components:
+  # These are already part of the base species prototype that is spawned for the clone,
+  # that means we only need to copy them over when switching between species.
+  # So these don't need to be part of the Body settings, unless someone makes a trait that adjusts these components.
+  - BodyEmotes
+  - Fixtures
+  - Speech
+  - TypingIndicator
+  - ScaleVisuals # for dwarf height
+  eventComponents:
+  # these need special treatment in the event subscription
+  - Inventory # arachnid pockets and diona feet
+  - Wagging # lizard tails
+  - Vocal # voice sounds
+  - Storage # slime storage
+  - Rootable # diona
+  - Sericulture # arachnids
+  - MovementSpeedModifier # moths when weightless
+  copyEquipment: null
+  copyInternalStorage: false
+  copyImplants: false
+
+# spawner
 - type: entity
   id: RandomCloneSpawner
   name: Random Clone
diff --git a/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml b/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml
new file mode 100644
index 0000000000..4d729889c2
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml
@@ -0,0 +1,192 @@
+- type: startingGear
+  id: MothershipCoreGear
+  inhand:
+  - DoorRemoteXenoborg
+  - Omnitool
+
+- type: entity
+  parent:
+  - BaseMachinePowered
+  - BaseMob
+  id: MothershipCore
+  name: mothership core
+  description: A sentient machine that can produce Xenoborgs. Without this the Xenoborgs are doomed.
+  components:
+  - type: Appearance
+  - type: WiresVisuals
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.4,-0.4,0.4,0.4"
+        density: 190
+        mask:
+        - MachineMask
+        layer:
+          - MachineLayer
+  - type: Sprite
+    sprite: Mobs/Silicon/mothership_core.rsi
+    layers:
+    - state: core-idle
+      map: ["enum.LatheVisualLayers.IsRunning"]
+    - state: core-load
+      map: ["enum.MaterialStorageVisualLayers.Inserting"]
+    - state: core-o
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: Machine
+    board: null
+  - type: Lathe
+    idleState: core-idle
+    runningState: core-active
+    staticPacks:
+    - EmptyXenoborgs
+    - XenoborgUpgradeModules
+  - type: MaterialStorage
+    whitelist:
+      tags:
+      - Sheet
+      - RawMaterial
+      - Ingot
+  - type: PointLight
+    color: "#0033ff"
+    enabled: true
+    radius: 4
+    netsync: false
+  - type: Anchorable
+    flags:
+    - Anchorable
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalGlassBreak
+      - !type:ExplodeBehavior
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MachineFrameDestroyed:
+            min: 1
+            max: 1
+      - !type:SpawnGasBehavior
+        gasMixture:
+          volume: 1000
+          moles:
+            - 0 # oxygen
+            - 0 # nitrogen
+            - 340.5701689 # carbon dioxide
+          temperature: 373.15
+  - type: Repairable
+    doAfterDelay: 30 # you can heal the mothership core, but it takes a while
+  - type: DamagedSiliconAccent
+    enableChargeCorruption: false
+  - type: Explosive
+    explosionType: Default
+    maxIntensity: 100
+    intensitySlope: 2
+    totalIntensity: 200
+  - type: WiresPanel
+  - type: ActivatableUI
+    key: enum.LatheUiKey.Key
+  - type: ActivatableUIRequiresPower
+  - type: UserInterface
+    interfaces:
+      enum.SiliconLawsUiKey.Key:
+        type: SiliconLawBoundUserInterface
+        requireInputValidation: false
+      enum.RadarConsoleUiKey.Key:
+        type: RadarConsoleBoundUserInterface
+      enum.LatheUiKey.Key:
+        type: LatheBoundUserInterface
+      enum.ResearchClientUiKey.Key:
+        type: ResearchClientBoundUserInterface
+  - type: Transform
+    anchored: true
+  - type: Pullable
+  - type: StaticPrice
+    price: 800
+  - type: WarpPoint
+    location: Mothership Core
+    follow: true
+  - type: VoiceOverride
+    nameOverride: MOTHERSHIP CORE
+  - type: TypingIndicator
+    proto: xenoborg
+  - type: Speech
+    speechVerb: Robotic
+    speechSounds: Xenoborg
+    allowedEmotes:
+    - Laugh
+  - type: Vocal
+    sounds:
+      Unsexed: UnisexSiliconXenoborg
+    wilhelmProbability: 0
+  - type: IntrinsicRadioReceiver
+  - type: IntrinsicRadioTransmitter
+    channels:
+    - Mothership
+    - Xenoborg
+    - Binary
+  - type: ActiveRadio
+    channels:
+    - Mothership
+    - Xenoborg
+    - Binary
+  - type: XenoborgMothership
+  - type: Tag
+    tags:
+    - SiliconEmotes
+    - CanPilot
+    - Structure
+  - type: Inventory
+    templateId: borg
+  - type: Loadout
+    prototypes: [MothershipCoreGear]
+  - type: NpcFactionMember
+    factions:
+    - Xenoborg
+  - type: Body
+    prototype: MothershipCoreBody
+  - type: Hands
+  # - type: Puller # use the conveyor
+  - type: Eye
+    drawFov: false
+  # - type: StationAiOverlay # removed until is no longer buggy
+  - type: IgnoreUIRange
+  - type: ComplexInteraction
+  - type: MindContainer
+  - type: SiliconLawBound
+  - type: Actions
+  - type: ActionGrant
+    actions:
+    - ActionViewLaws
+  - type: SiliconLawProvider
+    laws: MothershipCoreLawset # custom laws here
+    subverted: true
+  - type: Stripping
+  - type: Access
+    enabled: true
+    tags:
+    - Xenoborg
+  - type: LockingWhitelist
+    blacklist:
+      components:
+      - RoboticsConsole
+    whitelist:
+      components:
+      - BorgChassis
+  - type: IntrinsicUI
+    uis:
+      enum.RadarConsoleUiKey.Key:
+        toggleAction: ActionAGhostShowRadar
+  - type: ShowElectrocutionHUD
+  - type: PowerMonitoringCableNetworks
+  - type: RadarConsole
+
+# TODO: add xenoborg control interface action (part 5)
+# TODO: add xenoborg camera monitor interface action (part 5)
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index 9ecce3904d..8fcaef42b9 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -81,6 +81,7 @@
     horizontalRotation: 90
   - type: HumanoidAppearance
     species: Human
+  - type: TypingIndicator
   - type: SlowOnDamage
     speedModifierThresholds:
       60: 0.7
diff --git a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
index e3f0e5a5c1..14a43ced63 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
@@ -17,9 +17,7 @@
     damageRecovery:
       types:
         Asphyxiation: -1.0
-  - type: Sprite
-    noRot: true
-    drawdepth: Mobs
+  - type: ScaleVisuals
     scale: 1, 0.8
   - type: Body
     prototype: Dwarf
@@ -69,7 +67,7 @@
   id: MobDwarfDummy
   categories: [ HideSpawnMenu ]
   components:
-  - type: Sprite
+  - type: ScaleVisuals
     scale: 1, 0.8
   - type: Inventory
     femaleDisplacements:
diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
index 94b5cebf26..fa22736179 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
@@ -85,11 +85,11 @@
     - map: [ "outerClothing" ]
     - map: [ "back" ]
     - map: [ "neck" ]
+    - map: [ "suitstorage" ] # This is not in the default order
     - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
     - map: [ "enum.HumanoidVisualLayers.Hair" ]
     - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
     - map: [ "enum.HumanoidVisualLayers.HeadTop" ]
-    - map: [ "suitstorage" ] # This is not in the default order
     - map: [ "enum.HumanoidVisualLayers.Tail" ]
     - map: [ "mask" ]
     - map: [ "head" ]
@@ -137,6 +137,11 @@
           32:
             sprite: Mobs/Species/Vox/displacement.rsi
             state: head
+      neck:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vox/displacement.rsi
+            state: neck
       back:
         sizeMaps:
           32:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
index c33e24ad3e..834a2c3a8e 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
@@ -17,6 +17,8 @@
         maxVol: 50
   - type: PressurizedSolution
     solution: drink
+  - type: ExaminableSolution
+    examinableWhileClosed: false
   - type: Shakeable
   - type: Sprite
     state: icon
@@ -194,7 +196,7 @@
           Quantity: 100
   - type: Sprite
     sprite: Objects/Consumable/Drinks/oatmilk.rsi
-    
+
 - type: entity
   parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull]
   id: DrinkJuiceLemonCarton
@@ -209,7 +211,7 @@
           Quantity: 50
   - type: Sprite
     sprite: Objects/Consumable/Drinks/lemonjuice.rsi
-    
+
 - type: entity
   parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull]
   id: DrinkJuicePineappleCarton
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
index aff0aa7a05..4df720d541 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -14,7 +14,10 @@
     solution: drink
   - type: SolutionTransfer
     canChangeTransferAmount: true
-  - type: Drink
+  - type: Edible
+    edible: Drink
+    solution: drink
+    destroyOnEmpty: false
   - type: Sprite
     state: icon
   - type: MeleeWeapon
@@ -31,6 +34,8 @@
     solution: drink
   - type: DrainableSolution
     solution: drink
+  - type: ExaminableSolution
+    solution: drink
   - type: UserInterface
     interfaces:
       enum.TransferAmountUiKey.Key:
@@ -75,8 +80,6 @@
   - type: PhysicalComposition
     materialComposition:
       Glass: 25
-  - type: ExaminableSolution
-    solution: drink
   - type: FitsInDispenser
     solution: drink
   - type: Tag
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
index c2ac4c606f..d432c6d9d5 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -192,6 +192,8 @@
     layers:
       - state: icon
         map: ["enum.OpenableVisuals.Layer"]
+  - type: ExaminableSolution
+    examinableWhileClosed: false # If you can't see fill levels, it's probably opaque
 
 - type: entity
   id: DrinkBottleVisualsAll
@@ -217,6 +219,7 @@
     fillBaseName: fill-
     inHandsMaxFillLevels: 3
     inHandsFillBaseName: -fill-
+  - type: ExaminableSolution
 
 # Large Glass Bottles
 
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
index d933cbcd1b..e6ba0d002e 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -46,6 +46,9 @@
     solution: drink
   - type: PressurizedSolution
     solution: drink
+  - type: ExaminableSolution
+    solution: drink
+    examinableWhileClosed: false
   - type: Appearance
   - type: GenericVisualizer
     visuals:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
index 842cf13641..d5bfdefe48 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
@@ -20,6 +20,8 @@
     solution: drink
   - type: DrainableSolution
     solution: drink
+  - type: ExaminableSolution
+    solution: drink
   - type: SolutionTransfer
     canChangeTransferAmount: true
     maxTransferAmount: 10
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
index 9e1b100dbf..8f3b9381f7 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
@@ -15,6 +15,8 @@
       Steel: 300
   - type: FitsInDispenser
     solution: drink
+  - type: ExaminableSolution
+    examinableWhileClosed: false
 
 - type: entity
   id: DrinkFlaskVisualsOpenable
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
index 02a4346ebc..e7aa6c1252 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
@@ -41,6 +41,10 @@
     mixOnInteract: false
     reactionTypes:
     - Shake
+  - type: ExaminableSolution
+    solution: drink
+    heldOnly: true
+    examinableWhileClosed: false
 
 - type: entity
   parent: DrinkGlassBase
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
index eb6b71212a..a1b69a0966 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
@@ -1190,3 +1190,143 @@
       Burger: SuppermatterBurger
   - type: Item
     heldPrefix: suppermatter-shard
+
+- type: entity
+  name: cotton cake
+  parent: FoodCakeBase
+  id: FoodCakeCotton
+  description: A cake with a fiber frosting and a wad of cotton on top.
+  components:
+  - type: Sprite
+    state: cotton
+  - type: SliceableFood
+    slice: FoodCakeCottonSlice
+  - type: Tag
+    tags:
+    - Cake
+    - ClothMade
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 55
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 30
+        - ReagentId: Vitamin
+          Quantity: 5
+        - ReagentId: Fiber
+          Quantity: 10
+  - type: Item
+    heldPrefix: cotton
+
+- type: entity
+  name: slice of cotton cake
+  parent: FoodCakeSliceBase
+  id: FoodCakeCottonSlice
+  description: A slice of cotton cake. You can just lick the frosting, it's fine.
+  components:
+  - type: Sprite
+    state: cotton-slice
+  - type: Tag
+    tags:
+    - Cake
+    - ClothMade
+    - Slice
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 15
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 8
+        - ReagentId: Vitamin
+          Quantity: 1
+        - ReagentId: Fiber
+          Quantity: 2
+  - type: Item
+    heldPrefix: cotton-slice
+
+# Motivating
+
+- type: entity
+  name: berry delight
+  parent: FoodCakeBase
+  id: FoodCakeBerryDelight
+  description: This is a cake that is approaching.
+  components:
+  - type: Sprite
+    state: berry_delight
+  - type: FlavorProfile
+    flavors:
+      - sweet
+      - berry
+      - motivating
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 55
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 40
+        - ReagentId: Vitamin
+          Quantity: 10
+        - ReagentId: Milk
+          Quantity: 10
+  - type: SliceableFood
+    slice: FoodCakeBerryDelightSlice
+  - type: Tag
+    tags:
+    - Cake
+    - Fruit
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: plain-inhand-left
+      - state: alpha-filling-inhand-left
+        color: red
+      right:
+      - state: plain-inhand-right
+      - state: alpha-filling-inhand-right
+        color: red
+
+- type: entity
+  name: berry delight slice
+  parent: FoodCakeSliceBase
+  id: FoodCakeBerryDelightSlice
+  description: Put a fork in, your hunger in isolation.
+  components:
+  - type: Sprite
+    state: berry_delight_slice
+  - type: FlavorProfile
+    flavors:
+      - sweet
+      - berry
+      - motivating
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 12
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 8
+        - ReagentId: Vitamin
+          Quantity: 2
+        - ReagentId: Milk
+          Quantity: 2
+  - type: Tag
+    tags:
+    - Cake
+    - Fruit
+    - Slice
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: alpha-slice-inhand-left
+        color: white
+      - state: alpha-slice-filling-inhand-left
+        color: red
+      right:
+      - state: alpha-slice-inhand-right
+        color: white
+      - state: alpha-slice-filling-inhand-right
+        color: red
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
index 52ac7b2fe9..c13f52194f 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
@@ -445,9 +445,9 @@
 # Tastes like jelly-donut, fizzy tutti frutti.
 
 - type: entity
-  name: slugcat jelly-donut
+  name: scurret jelly-donut
   parent: FoodDonutBase
-  id: FoodDonutJellySlugcat
+  id: FoodDonutJellyScurret
   description: No holes in this donut in case a suspicious looking pole shows up.
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
index 8dfd626ea9..0147fe496a 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
@@ -165,7 +165,7 @@
       payloadSlot:
         whitelist:
           components:
-          - OnUseTimerTrigger
+          - TimerTrigger
         insertSound:
           path: /Audio/Weapons/Guns/Empty/empty.ogg
         ejectSound:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
index c7de98b4a4..7c7df07f78 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
@@ -9,6 +9,8 @@
     solution: food
   - type: DrainableSolution
     solution: food
+  - type: ExaminableSolution
+    solution: food
   - type: Sprite
     sprite: Objects/Consumable/Food/condiments.rsi
   - type: Icon
@@ -69,6 +71,8 @@
   - type: Tag
     tags:
       - Packet
+  - type: ExaminableSolution
+    exactVolume: true
 
 - type: entity
   parent: BaseFoodCondimentPacket
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
index cadd94be58..3c55372ba8 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
@@ -95,8 +95,6 @@
     flavors:
       - bun
       - meaty
-  - type: Food
-    transferAmount: 5
   - type: Sprite
     sprite: Objects/Consumable/Food/burger.rsi
   - type: SolutionContainerManager
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/food_base.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/food_base.yml
index ddacf71a03..fedce70e79 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/food_base.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/food_base.yml
@@ -9,7 +9,7 @@
   - type: FlavorProfile
     flavors:
       - food
-  - type: Food
+  - type: Edible
   - type: Sprite
   - type: StaticPrice
     price: 0
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index 60a4ae9406..3841dc06b0 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -10,13 +10,16 @@
   - type: Sprite
     state: produce
   # let cows eat raw produce like wheat and oats
-  - type: Food
-    requiredStomachs: 2
+  - type: Edible
+    requiresSpecialDigestion: true
   - type: Produce
   - type: PotencyVisuals
   - type: Appearance
   - type: Extractable
     grindableSolutionName: food
+  - type: Tag
+    tags:
+    - Ruminant
 
 # For produce that can be immediately eaten
 
@@ -57,6 +60,7 @@
   - type: Tag
     tags:
     - Wheat
+    - Ruminant
 
 - type: entity
   name: meatwheat bushel
@@ -176,6 +180,7 @@
   - type: Tag
     tags:
     - Vegetable
+    - Ruminant
 
 - type: entity
   name: tower-cap log
@@ -323,7 +328,7 @@
   - type: FlavorProfile
     flavors:
       - banana
-  - type: Food
+  - type: Edible
     trash:
     - TrashBananaPeel
   - type: SolutionContainerManager
@@ -365,7 +370,7 @@
     flavors:
       - banana
       - nothing
-  - type: Food
+  - type: Edible
     trash:
     - TrashMimanaPeel
   - type: SolutionContainerManager
@@ -437,6 +442,7 @@
     - Recyclable
     - Trash
     - BananaPeel
+    - Ruminant
     - WhitelistChameleon
     - HamsterWearable
   - type: SolutionContainerManager
@@ -449,7 +455,7 @@
   - type: Extractable
     grindableSolutionName: food
   - type: SpaceGarbage
-  - type: Food
+  - type: Edible
     requiresSpecialDigestion: true
   - type: Clothing
     sprite: Objects/Specific/Hydroponics/banana.rsi
@@ -1190,7 +1196,7 @@
   - type: FlavorProfile
     flavors:
       - corn
-  - type: Food
+  - type: Edible
     trash:
     - FoodCornTrash
   - type: SolutionContainerManager
@@ -1895,7 +1901,7 @@
     sprite: Objects/Specific/Hydroponics/gatfruit.rsi
   - type: Produce
     seedId: gatfruit
-  - type: Food
+  - type: Edible
     trash:
     - WeaponRevolverPython
   - type: Tag
@@ -1930,7 +1936,7 @@
     heldPrefix: produce
   - type: Produce
     seedId: realCapfruit
-  - type: Food
+  - type: Edible
     trash:
     - RevolverCapGun
   - type: Tag
@@ -1949,7 +1955,7 @@
   components:
   - type: Produce
     seedId: fakeCapfruit
-  - type: Food
+  - type: Edible
     trash:
     - RevolverCapGunFake
 
@@ -2353,7 +2359,7 @@
   - type: FlavorProfile
     flavors:
       - bungo
-  - type: Food
+  - type: Edible
     trash:
     - FoodBungoPit
   - type: SolutionContainerManager
@@ -2588,7 +2594,7 @@
   - type: FlavorProfile
     flavors:
       - cotton
-  - type: Food
+  - type: Edible
     requiresSpecialDigestion: true
   - type: SolutionContainerManager
     solutions:
@@ -2620,7 +2626,7 @@
   - type: FlavorProfile
     flavors:
       - pyrotton
-  - type: Food
+  - type: Edible
     requiresSpecialDigestion: true
   - type: SolutionContainerManager
     solutions:
@@ -2654,7 +2660,7 @@
   - type: FlavorProfile
     flavors:
       - cherry
-  - type: Food
+  - type: Edible
     trash:
     - TrashCherryPit
   - type: SolutionContainerManager
@@ -2694,6 +2700,7 @@
   - type: Item
     sprite: Objects/Specific/Hydroponics/cherry.rsi
     heldPrefix: pit
+    size: Tiny
   - type: Tag
     tags:
     - Recyclable
@@ -2728,7 +2735,7 @@
     heldPrefix: produce
   - type: Produce
     seedId: anomalyBerry
-  - type: Food
+  - type: Edible
     trash:
     - EffectAnomalyFloraBulb # Random loot
   - type: SolutionContainerManager
@@ -2749,3 +2756,78 @@
     entries:
       Taco: AnomalyBerry
       Burger: AnomalyBerryBurger
+
+- type: entity
+  name: bloonion bulb
+  description: A strange floating bulb.. Nothing worth crying over.
+  parent: BaseStructureDynamic
+  id: FoodBloonion
+  components:
+  - type: Appearance
+  - type: Sprite
+    drawdepth: Items
+    noRot: true
+    sprite: Objects/Specific/Hydroponics/bloonion.rsi
+    state: produce
+  - type: Item
+    size: Small
+    sprite: Objects/Specific/Hydroponics/bloonion.rsi
+    heldPrefix: produce
+  - type: Produce
+    seedId: bloonion
+  - type: Tag
+    tags:
+    - Vegetable
+  - type: PotencyVisuals
+  - type: FlavorProfile
+    flavors:
+    - onion
+    - strange
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 7
+        canReact: false
+        reagents:
+        - ReagentId: Potassium
+          Quantity: 1
+        - ReagentId: Phosphorus
+          Quantity: 1
+        - ReagentId: Sugar
+          Quantity: 1
+        - ReagentId: Allicin
+          Quantity: 4
+  - type: Extractable
+    grindableSolutionName: food
+  - type: ExplodeOnTrigger
+  - type: Explosive
+    explosionType: Default
+    maxIntensity: 0.001
+    intensitySlope: 1
+    totalIntensity: 0.1
+  - type: Damageable
+    damageContainer: Biological
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 1
+      behaviors:
+      - !type:SpillBehavior
+        solution: food
+      - !type:TriggerBehavior
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: InteractionOutline
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.20
+          position: 0, 0.35
+        density: 80
+        mask:
+        - MobMask
+        layer:
+        - MobLayer
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/igniter.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/igniter.yml
index 24843f608a..87bef747d8 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/igniter.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/igniter.yml
@@ -10,6 +10,11 @@
   - type: IgnitionSource
     temperature: 800
   - type: IgniteOnTrigger
+  - type: EmitSoundOnTrigger
+    sound:
+      collection: WelderOn
+  - type: UseDelayOnTrigger
+  - type: UseDelayTriggerCondition
   - type: TriggerOnSignal
   - type: DeviceNetwork
     deviceNetId: Wireless
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml
index 0a975702aa..4b3d98f198 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml
@@ -10,6 +10,10 @@
     sprite: Objects/Devices/signaller.rsi
     state: signaller
   - type: Signaller
+  - type: SignalOnTrigger
+    port: Pressed
+  - type: UseDelayOnTrigger
+  - type: UseDelayTriggerCondition
   - type: UseDelay
   - type: StaticPrice
     price: 40
@@ -43,4 +47,4 @@
   - type: WirelessNetworkConnection
     range: 50
   - type: StaticPrice
-    price: 30
\ No newline at end of file
+    price: 30
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml
index 67374a81f1..c6943a63e3 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml
@@ -22,7 +22,13 @@
     price: 40
   - type: PayloadTrigger
     components:
-    - type: OnUseTimerTrigger
+    - type: TriggerOnUse
+      keyOut: startTimer
+    - type: TimerTrigger
+      keysIn:
+      - startTimer
+      # use the default trigger key so it can activate any inserted payload
+      keyOut: trigger
       delay: 5
       delayOptions: [3, 5, 10, 15, 30]
       initialBeepDelay: 0
@@ -47,14 +53,19 @@
     - SignalTrigger
   - type: PayloadTrigger
     components:
-    - type: TimerStartOnSignal
     - type: DeviceNetwork
       deviceNetId: Wireless
       receiveFrequencyId: BasicDevice
     - type: WirelessNetworkConnection
       range: 200
     - type: DeviceLinkSink
-    - type: OnUseTimerTrigger
+    - type: TriggerOnSignal
+      keyOut: startTimer
+    - type: TimerTrigger
+      keysIn:
+      - startTimer
+      # use the default trigger key so it can activate any inserted payload
+      keyOut: trigger
       delay: 3
       initialBeepDelay: 0
       beepSound:
diff --git a/Resources/Prototypes/Entities/Objects/Devices/desynchronizer.yml b/Resources/Prototypes/Entities/Objects/Devices/desynchronizer.yml
index d5f8352baa..526d297f60 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/desynchronizer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/desynchronizer.yml
@@ -9,6 +9,7 @@
     state: icon
   - type: TriggerOnUse
   - type: PolymorphOnTrigger
+    targetUser: true
     polymorph: VoidPocket
   - type: UseDelay
     delay: 220 # long delay to ensure it can't be spammed, use it wisely
diff --git a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
index 8acac47133..e1a15b7493 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
@@ -52,6 +52,27 @@
         disableEject: true
         swap: false
 
+- type: entity
+  parent: Holoprojector
+  id: HoloprojectorClownBorg
+  name: holopeel projector
+  description: A holopeel projector that creates a slippery, hard light banana peel. It recharges, so that the fun never ends!
+  suffix: borg
+  components:
+  - type: HolosignProjector
+    signProto: HoloPeel
+    chargeUse: 240
+  - type: Sprite
+    sprite: Objects/Devices/Holoprojectors/peel.rsi
+    state: icon
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellMicroreactor
+        disableEject: true
+        swap: false
+
 - type: entity
   parent: Holoprojector
   id: HolofanProjector
@@ -89,7 +110,7 @@
   parent: HolofanProjector
   id: HolofanProjectorBorg
   name: integrated holofan
-  description: Stops idiots from causing more crew harm during atmospheric emergencies. Installed directly into an engineering cyborg, it  recharges over time.
+  description: Stops idiots from causing more crew harm during atmospheric emergencies. Installed directly into an engineering cyborg, it recharges over time.
   components:
   - type: ItemSlots
     slots:
diff --git a/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml b/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
index 04349c3a1c..f7be194370 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
@@ -8,32 +8,37 @@
       sprite: Objects/Devices/mousetrap.rsi
       drawdepth: SmallMobs # if mice can hide under tables, so can mousetraps
       layers:
-        - state: mousetrap
-          map: ["base"]
+      - state: mousetrap
+        map: ["enum.ToggleableVisuals.Layer"]
     - type: StepTrigger
       intersectRatio: 0.2
       requiredTriggeredSpeed: 2
     - type: Mousetrap
+    - type: ItemToggle
+      soundActivate: "/Audio/Items/Handcuffs/cuff_end.ogg"
+      soundDeactivate: "/Audio/Items/snap.ogg"
+      popupActivate: mousetrap-on-activate
+      popupDeactivate: mousetrap-on-deactivate
+    - type: UseDelay
+    - type: ItemToggleOnTrigger
+      canActivate: false
+      showPopup: false # only show the popup when arming/disarming the trap in your hand
     - type: TriggerOnStepTrigger
     - type: PreventableStepTrigger
-    - type: DamageUserOnTrigger
+    - type: DamageOnTrigger
+      targetUser: true
       damage:
         types:
           Blunt: 2 # base damage, scales based on mass
-    - type: EmitSoundOnUse
-      sound: "/Audio/Items/Handcuffs/cuff_end.ogg"
-      handle: false
-    - type: EmitSoundOnTrigger
-      sound: "/Audio/Items/snap.ogg"
     - type: Item
       sprite: Objects/Devices/mousetrap.rsi
     - type: Appearance
     - type: GenericVisualizer
       visuals:
-        enum.MousetrapVisuals.Visual:
-          base:
-            Armed: { state: mousetraparmed }
-            Unarmed: { state: mousetrap }
+        enum.ToggleableVisuals.Enabled:
+          enum.ToggleableVisuals.Layer:
+            True: {state: mousetraparmed}
+            False: {state: mousetrap}
     - type: Physics
       bodyType: Dynamic
     - type: CollisionWake
@@ -66,6 +71,6 @@
   - type: Sprite
     layers:
     - state: mousetraparmed
-      map: ["base"]
-  - type: Mousetrap
-    isActive: true
+      map: ["enum.ToggleableVisuals.Layer"]
+  - type: ItemToggle
+    activated: true
diff --git a/Resources/Prototypes/Entities/Objects/Devices/payload.yml b/Resources/Prototypes/Entities/Objects/Devices/payload.yml
index c161b2a028..e5dc07c7c1 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/payload.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/payload.yml
@@ -94,3 +94,4 @@
     - type: EmitSoundOnTrigger
       sound:
         path: "/Audio/Effects/flash_bang.ogg"
+      positional: true
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml
index 58f0a31a05..c85358663e 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml
@@ -169,7 +169,7 @@
   id: PinpointerMothership
   name: core pinpointer
   suffix: Mothership
-  description: A handheld tracking device that leads to the direction of the mothership core.
+  description: A handheld tracking device that leads to the direction of the Mothership core.
   components:
   - type: Sprite
     layers:
@@ -197,4 +197,4 @@
     state: pinpointer-station
   - type: Pinpointer
     component: XenoborgMothership
-    targetName: the mothership
+    targetName: the Mothership
diff --git a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
index c4be0aa453..f124be8a42 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
@@ -229,3 +229,4 @@
       - MobMover
   - type: SpawnOnTrigger
     proto: EffectGravityPulse
+    predicted: true
diff --git a/Resources/Prototypes/Entities/Objects/Fun/dice.yml b/Resources/Prototypes/Entities/Objects/Fun/dice.yml
index 32df1f402d..132f92212e 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/dice.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/dice.yml
@@ -127,7 +127,8 @@
       path: /Audio/Effects/glass_step.ogg
     slipData:
       launchForwardsMultiplier: 0
-  - type: DamageUserOnTrigger
+  - type: DamageOnTrigger
+    targetUser: true
     damage:
       types:
         Piercing: 5
diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
index c99df854d2..7575457f4d 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
@@ -19,6 +19,8 @@
     - Figurine
   - type: UseDelay
     delay: 5
+  - type: UseDelayOnTrigger
+  - type: UseDelayTriggerCondition # prevent spam
   - type: TriggerOnActivate
   - type: TriggerOnSignal
   - type: Speech
diff --git a/Resources/Prototypes/Entities/Objects/Fun/plushies.yml b/Resources/Prototypes/Entities/Objects/Fun/plushies.yml
index dc9976502a..c0718d022b 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/plushies.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/plushies.yml
@@ -6,26 +6,24 @@
   id: BasePlushie
   components:
   - type: EmitSoundOnUse
-    sound:
+    sound: &BasePlushieSound
       collection: ToySqueak
+      params:
+        volume: -4
   - type: EmitSoundOnActivate
-    sound:
-      collection: ToySqueak
+    sound: *BasePlushieSound
   - type: EmitSoundOnCollide
-    sound:
-      collection: ToySqueak
+    sound: *BasePlushieSound
   - type: EmitSoundOnLand
-    sound:
-      collection: ToyFall
+    sound: *BasePlushieSound
   - type: EmitSoundOnTrigger
-    sound:
-      collection: ToySqueak
+    sound: *BasePlushieSound
   - type: UseDelay
-    delay: 1.0
+    delay: 3.0
   - type: MeleeWeapon
+    attackRate: 0.333
     wideAnimationRotation: 180
-    soundHit:
-      collection: ToySqueak
+    soundHit: *BasePlushieSound
     damage:
       types:
         Blunt: 0
@@ -37,8 +35,7 @@
     price: 5
   - type: Food
     requiresSpecialDigestion: true
-    useSound:
-      collection: ToySqueak
+    useSound: *BasePlushieSound
     delay: 2
   - type: SolutionContainerManager
     solutions:
@@ -356,28 +353,24 @@
   - type: Item
     sprite: Objects/Fun/Plushies/lizard.rsi
   - type: EmitSoundOnUse
-    sound:
+    sound: &PlushieLizardSound
       path: /Audio/Items/Toys/weh.ogg
+      params:
+        volume: -5
   - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/Toys/weh.ogg
+    sound: *PlushieLizardSound
   - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Items/Toys/weh.ogg
+    sound: *PlushieLizardSound
   - type: EmitSoundOnTrigger
-    sound:
-      path: /Audio/Items/Toys/weh.ogg
+    sound: *PlushieLizardSound
   - type: EmitSoundOnCollide
-    sound:
-      path: /Audio/Items/Toys/weh.ogg
+    sound: *PlushieLizardSound
   - type: Food
     requiresSpecialDigestion: true
-    useSound:
-      path: /Audio/Items/Toys/weh.ogg
+    useSound: *PlushieLizardSound
   - type: MeleeWeapon
     wideAnimationRotation: 180
-    soundHit:
-      path: /Audio/Items/Toys/weh.ogg
+    soundHit: *PlushieLizardSound
   - type: Extractable
     juiceSolution:
       reagents:
@@ -427,28 +420,24 @@
       - state: inhand-right
         shader: shaded
   - type: EmitSoundOnUse
-    sound:
+    sound: &PlushieExperimentSound
       path: /Audio/Items/Toys/arf.ogg
+      params:
+        volume: -5
   - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/Toys/arf.ogg
+    sound: *PlushieExperimentSound
   - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Items/Toys/arf.ogg
+    sound: *PlushieExperimentSound
   - type: EmitSoundOnTrigger
-    sound:
-      path: /Audio/Items/Toys/arf.ogg
+    sound: *PlushieExperimentSound
   - type: EmitSoundOnCollide
-    sound:
-      path: /Audio/Items/Toys/arf.ogg
+    sound: *PlushieExperimentSound
   - type: Food
     requiresSpecialDigestion: true
-    useSound:
-      path: /Audio/Items/Toys/arf.ogg
+    useSound: *PlushieExperimentSound
   - type: MeleeWeapon
     wideAnimationRotation: 180
-    soundHit:
-      path: /Audio/Items/Toys/arf.ogg
+    soundHit: *PlushieExperimentSound
   - type: Clothing
     clothingVisuals:
       head:
@@ -515,28 +504,24 @@
     sprite: Objects/Fun/Plushies/lizard.rsi
     heldPrefix: spacelizard
   - type: EmitSoundOnUse
-    sound:
+    sound: &PlushieSpaceLizardSound
       path: /Audio/Items/Toys/muffled_weh.ogg
+      params:
+        volume: -5
   - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/Toys/muffled_weh.ogg
+    sound: *PlushieSpaceLizardSound
   - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Items/Toys/muffled_weh.ogg
+    sound: *PlushieSpaceLizardSound
   - type: EmitSoundOnTrigger
-    sound:
-      path: /Audio/Items/Toys/muffled_weh.ogg
+    sound: *PlushieSpaceLizardSound
   - type: EmitSoundOnCollide
-    sound:
-      path: /Audio/Items/Toys/muffled_weh.ogg
+    sound: *PlushieSpaceLizardSound
   - type: Food
     requiresSpecialDigestion: true
-    useSound:
-      path: /Audio/Items/Toys/muffled_weh.ogg
+    useSound: *PlushieSpaceLizardSound
   - type: MeleeWeapon
     wideAnimationRotation: 180
-    soundHit:
-      path: /Audio/Items/Toys/muffled_weh.ogg
+    soundHit: *PlushieSpaceLizardSound
   - type: Clothing
     sprite: Objects/Fun/Plushies/lizard.rsi
     slots:
@@ -561,25 +546,22 @@
   - type: Item
     heldPrefix: plushielizardinversed
   - type: EmitSoundOnUse
-    sound:
+    sound: &PlushieLizardInversedSound
       path: /Audio/Items/Toys/hew.ogg
+      params:
+        volume: -5
   - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/Toys/hew.ogg
+    sound: *PlushieLizardInversedSound
   - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Items/Toys/hew.ogg
+    sound: *PlushieLizardInversedSound
   - type: EmitSoundOnTrigger
-    sound:
-      path: /Audio/Items/Toys/hew.ogg
+    sound: *PlushieLizardInversedSound
   - type: Food
     requiresSpecialDigestion: true
-    useSound:
-      path: /Audio/Items/Toys/hew.ogg
+    useSound: *PlushieLizardInversedSound
   - type: MeleeWeapon
     wideAnimationRotation: 180
-    soundHit:
-      path: /Audio/Items/Toys/hew.ogg
+    soundHit: *PlushieLizardInversedSound
   - type: Extractable
     juiceSolution:
       reagents:
@@ -619,28 +601,24 @@
       map: [ "enum.SolutionContainerLayers.Fill" ]
       visible: false
   - type: EmitSoundOnUse
-    sound:
+    sound: &PlushieDionaSound
       path: /Audio/Items/Toys/toy_rustle.ogg
+      params:
+        volume: -5
   - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/Toys/toy_rustle.ogg
+    sound: *PlushieDionaSound
   - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Items/Toys/toy_rustle.ogg
+    sound: *PlushieDionaSound
   - type: EmitSoundOnTrigger
-    sound:
-      path: /Audio/Items/Toys/toy_rustle.ogg
+    sound: *PlushieDionaSound
   - type: EmitSoundOnCollide
-    sound:
-      path: /Audio/Items/Toys/toy_rustle.ogg
+    sound: *PlushieDionaSound
   - type: MeleeWeapon
     wideAnimationRotation: 180
-    soundHit:
-      path: /Audio/Items/Toys/toy_rustle.ogg
+    soundHit: *PlushieDionaSound
   - type: Food
     requiresSpecialDigestion: true
-    useSound:
-      path: /Audio/Items/Toys/toy_rustle.ogg
+    useSound: *PlushieDionaSound
   - type: SolutionContainerManager
     solutions:
       plushie:
@@ -1066,28 +1044,24 @@
     sprite: Objects/Fun/Plushies/vox.rsi
     state: icon
   - type: EmitSoundOnUse
-    sound:
+    sound: &PlushieVoxSound
       path: /Audio/Voice/Vox/shriek1.ogg
+      params:
+        volume: -5
   - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Voice/Vox/shriek1.ogg
+    sound: *PlushieVoxSound
   - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Voice/Vox/shriek1.ogg
+    sound: *PlushieVoxSound
   - type: EmitSoundOnTrigger
-    sound:
-      path: /Audio/Voice/Vox/shriek1.ogg
+    sound: *PlushieVoxSound
   - type: EmitSoundOnCollide
-    sound:
-      path: /Audio/Voice/Vox/shriek1.ogg
+    sound: *PlushieVoxSound
   - type: Food
     requiresSpecialDigestion: true
-    useSound:
-      path: /Audio/Voice/Vox/shriek1.ogg
+    useSound: *PlushieVoxSound
   - type: MeleeWeapon
     wideAnimationRotation: 180
-    soundHit:
-      path: /Audio/Voice/Vox/shriek1.ogg
+    soundHit: *PlushieVoxSound
   - type: Clothing
     quickEquip: false
     sprite: Objects/Fun/Plushies/vox.rsi
@@ -1135,28 +1109,24 @@
   - type: Item
     size: Normal
   - type: EmitSoundOnUse
-    sound:
+    sound: &PlushieXenoSound
       path: /Audio/Weapons/Xeno/alien_spitacid.ogg
+      params:
+        volume: -8
   - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Weapons/Xeno/alien_spitacid.ogg
+    sound: *PlushieXenoSound
   - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Weapons/Xeno/alien_spitacid.ogg
+    sound: *PlushieXenoSound
   - type: EmitSoundOnTrigger
-    sound:
-      path: /Audio/Weapons/Xeno/alien_spitacid.ogg
+    sound: *PlushieXenoSound
   - type: EmitSoundOnCollide
-    sound:
-      path: /Audio/Weapons/Xeno/alien_spitacid.ogg
+    sound: *PlushieXenoSound
   - type: Food
     requiresSpecialDigestion: true
-    useSound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
+    useSound: *PlushieXenoSound
   - type: MeleeWeapon
     wideAnimationRotation: 180
-    soundHit:
-      path: /Audio/Weapons/Xeno/alien_spitacid.ogg
+    soundHit: *PlushieXenoSound
   - type: Clothing
     quickEquip: false
     sprite: Objects/Fun/Plushies/xeno.rsi
@@ -1198,27 +1168,41 @@
     sprite: Objects/Fun/Plushies/human.rsi
     state: icon
   - type: EmitSoundOnUse
-    sound:
+    sound: &PlushieHuman
       path: /Audio/Voice/Human/malescream_1.ogg
+      params:
+        volume: -8
   - type: EmitSoundOnLand
     sound:
       path: /Audio/Voice/Human/malescream_2.ogg
+      params:
+        volume: -8
   - type: EmitSoundOnActivate
     sound:
       path: /Audio/Voice/Human/malescream_3.ogg
+      params:
+        volume: -8
   - type: EmitSoundOnCollide
     sound:
       path: /Audio/Voice/Human/malescream_4.ogg
+      params:
+        volume: -8
   - type: Food
     requiresSpecialDigestion: true
     useSound:
       path: /Audio/Voice/Human/malescream_1.ogg
+      params:
+        volume: -8
   - type: MeleeWeapon
     soundHit:
       path: /Audio/Voice/Human/malescream_4.ogg
+      params:
+        volume: -8
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Voice/Human/malescream_5.ogg
+      params:
+        volume: -8
   - type: Clothing
     quickEquip: false
     sprite: Objects/Fun/Plushies/human.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index d0be38d504..81b09be659 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -769,6 +769,44 @@
     shape:
     - 0,0,0,2
 
+- type: entity
+  parent: BaseItem
+  id: CardSword
+  name: cardboard sword
+  description: A cardboard tube thats been fashioned into a sword.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/card_sword.rsi
+    state: icon
+  - type: Clothing
+    sprite: Objects/Fun/card_sword.rsi
+    slots:
+    - Back
+    - SuitStorage
+  - type: StaminaDamageOnHit
+    damage: 6
+  - type: Appearance
+  - type: DisarmMalus
+    malus: 0
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+    attackRate: 1.25
+    damage:
+      types:
+        Blunt: 0.3
+    soundHit:
+      path: /Audio/Items/Toys/card_tube_bonk.ogg
+  - type: Construction
+    graph: CardSword
+    node: cardSword
+  - type: Item
+    size: Normal
+    storedSprite:
+      state: icon
+      sprite: Objects/Fun/card_sword.rsi
+    shape:
+    - 0,0,1,3
+
 - type: entity
   parent: BaseItem
   id: ClownRecorder
@@ -892,7 +930,7 @@
   - type: StepTrigger
     intersectRatio: 0.2
     requiredTriggeredSpeed: 2
-  - type: TriggerOnStepTrigger
+  - type: TriggerOnStepTrigger # for payloads
   - type: Appearance
   - type: CollisionWake
     enabled: false
diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index 5e04ac55dc..969dc5997a 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -56,6 +56,13 @@
           Quantity: 6
   - type: Item
     heldPrefix: cardboard
+  - type: FloorTile
+    outputs:
+    - Plating
+  - type: SpawnAfterInteract #Nuke after convert to FloorTile
+    prototype: CarpetCard
+    doAfter: 0.5
+    removeOnInteract: true
 
 - type: entity
   parent: MaterialCardboard
@@ -123,7 +130,7 @@
     - state: cloth_3
       map: ["base"]
   - type: Appearance
-  - type: Food
+  - type: Edible
     requiresSpecialDigestion: true
   - type: FlavorProfile
     flavors:
@@ -192,7 +199,7 @@
   - type: Construction
     graph: Durathread
     node: MaterialDurathread
-  - type: Food
+  - type: Edible
     requiresSpecialDigestion: true
   - type: SolutionContainerManager
     solutions:
@@ -421,7 +428,7 @@
     - state: cotton_3
       map: ["base"]
   - type: Appearance
-  - type: Food
+  - type: Edible
     requiresSpecialDigestion: true
   - type: FlavorProfile
     flavors:
@@ -480,7 +487,7 @@
     - state: pyrotton_3
       map: ["base"]
   - type: Appearance
-  - type: Food
+  - type: Edible
     requiresSpecialDigestion: true
   - type: SolutionContainerManager
     solutions:
@@ -540,7 +547,7 @@
   - type: FlavorProfile
     flavors:
       - banana
-  - type: Food
+  - type: Edible
     trash:
     - TrashBananiumPeel
   - type: BadFood
@@ -592,7 +599,7 @@
   - type: Stack
     count: 50
     stackType: WebSilk
-  - type: Food
+  - type: Edible
     requiresSpecialDigestion: true
   - type: FlavorProfile
     flavors:
@@ -735,7 +742,7 @@
     - state: cotton_3
       map: ["base"]
   - type: Appearance
-  - type: Food
+  - type: Edible
   - type: BadFood
   - type: SolutionContainerManager
     solutions:
diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
index 2457404b48..c649ef921c 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -72,7 +72,8 @@
     slipData:
       launchForwardsMultiplier: 0
   - type: TriggerOnStepTrigger
-  - type: DamageUserOnTrigger
+  - type: DamageOnTrigger
+    targetUser: true
     damage:
       types:
         Piercing: 5
@@ -91,7 +92,7 @@
   - type: ToolRefinable
     refineResult:
     - id: SheetGlass1
-  - type: DamageUserOnTrigger
+  - type: DamageOnTrigger
     damage:
       types:
         Piercing: 4.5
@@ -127,7 +128,7 @@
     refineResult:
     - id: SheetGlass1
     - id: PartRodMetal1
-  - type: DamageUserOnTrigger
+  - type: DamageOnTrigger
     damage:
       types:
         Piercing: 5.5
@@ -163,7 +164,7 @@
     refineResult:
     - id: SheetGlass1
     - id: SheetPlasma1
-  - type: DamageUserOnTrigger
+  - type: DamageOnTrigger
     damage:
       types:
         Piercing: 6.5
@@ -202,7 +203,7 @@
     refineResult:
     - id: SheetGlass1
     - id: SheetUranium1
-  - type: DamageUserOnTrigger
+  - type: DamageOnTrigger
     damage:
       types:
         Piercing: 5
@@ -237,7 +238,7 @@
     refineResult:
     - id: SheetGlass1
     - id: SheetBrass1
-  - type: DamageUserOnTrigger
+  - type: DamageOnTrigger
     damage:
       types:
         Piercing: 5
diff --git a/Resources/Prototypes/Entities/Objects/Misc/arabianlamp.yml b/Resources/Prototypes/Entities/Objects/Misc/arabianlamp.yml
index 2b1c2940fe..2a289a95f8 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/arabianlamp.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/arabianlamp.yml
@@ -110,6 +110,8 @@
     solution: Welder
   - type: ExaminableSolution
     solution: Welder
+    heldOnly: true
+    exactVolume: true
   - type: SolutionRegeneration
     solution: Welder
     generated:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml
index 79432e6fc1..e1918ef5e6 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml
@@ -13,7 +13,7 @@
     - type: Implanter
       whitelist:
         components:
-        - Body # no chair microbomb
+        - MobState # no chair microbomb
       blacklist:
         components:
         - Guardian # no holoparasite macrobomb wombo combo
diff --git a/Resources/Prototypes/Entities/Objects/Misc/killtome.yml b/Resources/Prototypes/Entities/Objects/Misc/killtome.yml
deleted file mode 100644
index 41339a9281..0000000000
--- a/Resources/Prototypes/Entities/Objects/Misc/killtome.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-- type: entity
-  name: black tome
-  parent: BasePaper
-  id: KillTome
-  suffix: KillTome, Admeme # To stay true to the lore, please never make this accessible outside of divine intervention (admeme).
-  description: A worn black tome. It smells like old paper.
-  components:
-  - type: Sprite
-    sprite: Objects/Misc/killtome.rsi
-    state: icon
-  - type: KillTome
-    defaultKillDelay: 40
-    damage:
-      types:
-        Blunt: 200
-  - type: Paper
-    content: killtome-rules
-  - type: ActivatableUI
-    key: enum.PaperUiKey.Key
-    requiresComplex: false
-  - type: UserInterface
-    interfaces:
-      enum.PaperUiKey.Key:
-        type: PaperBoundUserInterface
diff --git a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
index e35e915b09..6c01a2a8dd 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
@@ -90,7 +90,7 @@
         components:
         - IgnoreKudzu
     - type: Food
-      requiredStomachs: 2 # ruminants have 4 stomachs but i dont care to give them literally 4 stomachs. 2 is good
+      requiresSpecialDigestion: true
       delay: 0.5
     - type: FlavorProfile
       flavors:
@@ -101,6 +101,9 @@
           reagents:
           - ReagentId: Nutriment
             Quantity: 2
+    - type: Tag
+      tags:
+      - Ruminant
 
 - type: entity
   id: WeakKudzu
diff --git a/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml b/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
index 7ed1b657ea..a3a2b60401 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/land_mine.yml
@@ -64,7 +64,8 @@
   name: kick mine
   parent: BaseLandMine
   components:
-  - type: GhostKickUserOnTrigger
+  - type: GhostKickOnTrigger
+    targetUser: true
   - type: DeleteOnTrigger
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
index 7ddf4945d0..6a4ad24664 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
@@ -61,17 +61,18 @@
   description: This implant lets the user honk anywhere at any time.
   categories: [ HideSpawnMenu ]
   components:
-    - type: SubdermalImplant
-      implantAction: ActionActivateHonkImplant
-    - type: TriggerImplantAction
-    - type: EmitSoundOnTrigger
-      sound:
-        collection: BikeHorn
-        params:
-          variation: 0.125
-    - type: Tag
-      tags:
-      - BikeHorn
+  - type: SubdermalImplant
+    implantAction: ActionActivateHonkImplant
+  - type: TriggerOnActivateImplant
+  - type: EmitSoundOnTrigger
+    predicted: true
+    sound:
+      collection: BikeHorn
+      params:
+        variation: 0.125
+  - type: Tag
+    tags:
+    - BikeHorn
 
 #Security implants
 
@@ -134,11 +135,14 @@
   description: This implant lets the user break out of hand restraints up to three times before ceasing to function anymore.
   categories: [ HideSpawnMenu ]
   components:
-    - type: SubdermalImplant
-      implantAction: ActionActivateFreedomImplant
-      whitelist:
-        components:
-        - Cuffable # useless if you cant be cuffed
+  - type: SubdermalImplant
+    implantAction: ActionActivateFreedomImplant
+    whitelist:
+      components:
+      - Cuffable # useless if you cant be cuffed
+  - type: TriggerOnActivateImplant
+  - type: UncuffOnTrigger
+    targetUser: true
 
 - type: entity
   parent: BaseSubdermalImplant
@@ -179,13 +183,13 @@
   description: This implant creates an electromagnetic pulse when activated.
   categories: [ HideSpawnMenu ]
   components:
-    - type: SubdermalImplant
-      implantAction: ActionActivateEmpImplant
-    - type: TriggerImplantAction
-    - type: EmpOnTrigger
-      range: 2.75
-      energyConsumption: 50000
-      disableDuration: 10
+  - type: SubdermalImplant
+    implantAction: ActionActivateEmpImplant
+  - type: TriggerOnActivateImplant
+  - type: EmpOnTrigger
+    range: 2.75
+    energyConsumption: 50000
+    disableDuration: 10
 
 - type: entity
   parent: BaseSubdermalImplant
@@ -194,10 +198,11 @@
   description: This implant randomly teleports the user within a large radius when activated.
   categories: [ HideSpawnMenu ]
   components:
-    - type: SubdermalImplant
-      implantAction: ActionActivateScramImplant
-    - type: TriggerImplantAction
-    - type: ScramImplant
+  - type: SubdermalImplant
+    implantAction: ActionActivateScramImplant
+  - type: TriggerOnActivateImplant
+  - type: ScramOnTrigger
+    targetUser: true
 
 - type: entity
   parent: BaseSubdermalImplant
@@ -206,11 +211,15 @@
   description: This implant lets the user randomly change their appearance and name once.
   categories: [ HideSpawnMenu ]
   components:
-    - type: SubdermalImplant
-      implantAction: ActionActivateDnaScramblerImplant
-      whitelist:
-        components:
-        - HumanoidAppearance # syndies cant turn hamlet into a human
+  - type: SubdermalImplant
+    implantAction: ActionActivateDnaScramblerImplant
+    whitelist:
+      components:
+      - HumanoidAppearance # syndies cant turn hamlet into a human
+  - type: TriggerOnActivateImplant
+  - type: DnaScrambleOnTrigger
+    targetUser: true
+  - type: DeleteOnTrigger
 
 - type: entity
   categories: [ HideSpawnMenu, Spawner ]
@@ -238,27 +247,28 @@
   description: This implant detonates the user upon activation or upon death.
   categories: [ HideSpawnMenu ]
   components:
-    - type: SubdermalImplant
-      permanent: true
-      implantAction: ActionActivateMicroBomb
-    - type: TriggerOnMobstateChange
-      mobState:
-      - Dead
-    - type: TriggerImplantAction
-    - type: ExplodeOnTrigger
-    - type: GibOnTrigger
-      deleteItems: true
-    - type: Explosive
-      explosionType: MicroBomb
-      totalIntensity: 120
-      intensitySlope: 5
-      maxIntensity: 30
-      canCreateVacuum: false
-    - type: Tag
-      tags:
-        - SubdermalImplant
-        - HideContextMenu
-        - MicroBomb
+  - type: SubdermalImplant
+    permanent: true
+    implantAction: ActionActivateMicroBomb
+  - type: TriggerOnMobstateChange
+    mobState:
+    - Dead
+  - type: TriggerOnActivateImplant
+  - type: ExplodeOnTrigger
+  - type: GibOnTrigger
+    targetUser: true
+    deleteItems: true
+  - type: Explosive
+    explosionType: MicroBomb
+    totalIntensity: 120
+    intensitySlope: 5
+    maxIntensity: 30
+    canCreateVacuum: false
+  - type: Tag
+    tags:
+    - SubdermalImplant
+    - HideContextMenu
+    - MicroBomb
 
 
 - type: entity
@@ -270,20 +280,24 @@
   components:
     - type: SubdermalImplant
       permanent: true
-    - type: TriggerOnMobstateChange #Chains with OnUseTimerTrigger
+    - type: TriggerOnMobstateChange #activates the timer
       mobState:
       - Dead
       preventSuicide: true
-    - type: OnUseTimerTrigger
+    - type: TimerTrigger
       delay: 7
-      initialBeepDelay: 0
       beepSound:
         path: /Audio/Machines/Nuke/general_beep.ogg
         params:
           volume: -2
     - type: ExplodeOnTrigger
+      keysIn:
+      - timer
     - type: GibOnTrigger
+      targetUser: true
       deleteItems: true
+      keysIn:
+      - timer
     - type: Explosive
       explosionType: Default
       totalIntensity: 3500
@@ -309,11 +323,13 @@
   - type: TriggerOnMobstateChange
     mobState:
     - Dead
-  - type: TriggerImplantAction
+  - type: TriggerOnActivateImplant
   - type: GibOnTrigger
+    targetUser: true
     deleteItems: true
   - type: SpawnOnTrigger
     proto: Acidifier
+    predicted: true
   - type: Tag
     tags:
     - SubdermalImplant
@@ -336,7 +352,8 @@
       mobState:
       - Critical
       - Dead
-    - type: Rattle
+    - type: RattleOnTrigger
+      targetUser: true
 
 - type: entity
   parent: BaseSubdermalImplant
@@ -382,5 +399,5 @@
   description: This implant will inform the Centcomm radio channel should the user fall into critical condition or die.
   categories: [ HideSpawnMenu ]
   components:
-  - type: Rattle
+  - type: RattleOnTrigger
     radioChannel: CentCom
diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
index c461b5683b..3b64f0c4b1 100644
--- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml
+++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@@ -180,6 +180,61 @@
     - type: StaticPrice
       price: 150
 
+- type: entity
+  name: cardboard shield
+  parent: BaseShield
+  id: CardShield
+  description: A shield that wont shield you from much.
+  components:
+    - type: Sprite
+      state: cardshield-icon
+    - type: Item
+      heldPrefix: cardshield
+    - type: StaminaResistance
+      damageCoefficient: 0.95
+      worn: true
+    - type: Blocking
+      passiveBlockModifier:
+        coefficients:
+          Blunt: 1
+          Slash: 2
+          Piercing: 0.6
+          Heat: 3
+      activeBlockModifier:
+        coefficients:
+          Blunt: 0.9
+          Slash: 1.8
+          Piercing: 0.5
+          Heat: 2.5
+        flatReductions:
+          Blunt: 0.5
+    - type: Construction
+      graph: CardShield
+      node: cardShield
+    - type: Destructible
+      thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 25
+        behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+      - trigger:
+          !type:DamageTrigger
+          damage: 10 #Very very weak shield
+        behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+        - !type:PlaySoundBehavior
+          sound: /Audio/Items/Toys/ToyFall2.ogg
+        - !type:SpawnEntitiesBehavior
+          spawn:
+            MaterialCardboard:
+              min: 2
+              max: 4
+    - type: StaticPrice
+      price: 20
+
 - type: entity
   name: makeshift shield
   parent: BaseShield
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
index 1777d8675c..ca6270ab64 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
@@ -762,3 +762,13 @@
       seedId: anomalyBerry
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/anomaly_berry.rsi
+
+- type: entity
+  parent: SeedBase
+  name: packet of bloonion seeds
+  id: BloonionSeeds
+  components:
+  - type: Seed
+    seedId: bloonion
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/bloonion.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index d9d4851158..fb740f1cd6 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -181,24 +181,31 @@
       path: /Audio/Effects/beep_landmine.ogg
       params:
         maxDistance: 10
-  - type: ExplodeOnTrigger
   - type: Explosive
     explosionType: HardBomb  # normally Default and max 5 total 60
     maxIntensity: 10 # about a ~67.5 total damage
     totalIntensity: 30 # about a ~3 tile radius
     canCreateVacuum: false
+  - type: ExplodeOnTrigger
+    keysIn:
+    - timer
+    - trigger # directly explode from the landmine
   - type: DeleteOnTrigger
-  - type: OnUseTimerTrigger
-    useVerbInstead: true
+    keysIn:
+    - timer
+    - trigger
+  - type: TimerTrigger
     beepInterval: .25
     beepSound:
       path: /Audio/Items/Janitor/floor_sign_beep.ogg
       params:
         volume: 1
     examinable: false
+  - type: TriggerOnVerb
+    text: trigger-on-verb-detonation
   - type: Tag
     tags: # ignore "WhitelistChameleon" tag
-      - WetFloorSign
+    - WetFloorSign
 
 - type: entity
   name: plunger
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
index 01283128e6..9f33e3c239 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
@@ -158,6 +158,7 @@
   - type: Slippery
   - type: StepTrigger
     intersectRatio: 0.04
+  - type: TriggerOnStepTrigger
   - type: Item
     heldPrefix: syndie
   - type: Fixtures
@@ -178,10 +179,12 @@
         - ItemMask
   - type: DeleteOnTrigger
   - type: EmitSoundOnTrigger
+    predicted: true
+    positional: true
     sound:
       path: "/Audio/Effects/Fluids/splat.ogg"
       params:
-        volume: -20
+        volume: -8
 
 - type: entity
   name: soap
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
index b692f20dd9..9ed5972754 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
@@ -42,6 +42,7 @@
     solution: spray
   - type: ExaminableSolution
     solution: spray
+    exactVolume: true
 
 - type: entity
   name: mega spray bottle
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index bd8e78dd9a..bc0cf16e8e 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -22,6 +22,7 @@
     solution: hypospray
   - type: ExaminableSolution
     solution: hypospray
+    exactVolume: true
   - type: Hypospray
     onlyAffectsMobs: false
   - type: UseDelay
@@ -63,6 +64,7 @@
     solution: hypospray
   - type: ExaminableSolution
     solution: hypospray
+    exactVolume: true
   - type: Hypospray
     onlyAffectsMobs: false
   - type: UseDelay
@@ -142,6 +144,7 @@
         maxVol: 15
   - type: ExaminableSolution
     solution: pen
+    exactVolume: true
   - type: Hypospray
     solutionName: pen
     transferAmount: 15
@@ -661,6 +664,7 @@
   - type: ExaminableSolution
     solution: hypospray
     heldOnly: true # Allow examination only when held in hand.
+    exactVolume: true
   - type: Hypospray
     onlyAffectsMobs: false
   - type: UseDelay
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index 96780dda80..dee6033a5b 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -899,6 +899,26 @@
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: clowning-module }
 
+- type: entity
+  id: BorgModuleAdvancedClowning
+  parent: [ BaseBorgModuleService, BaseProviderBorgModule ]
+  name: advanced clowning cyborg module
+  description: Advanced service module for only the silliest cyborgs! Comes with a built-in oven that bakes pies automatically over time, a holopeel projector, and a push horn.
+  components:
+  - type: Sprite
+    layers:
+    - state: service
+    - state: icon-clown-adv
+  - type: ItemBorgModule
+    items:
+    - HoloprojectorClownBorg
+    - BorgLauncherCreamPie
+    - ClownRecorder
+    - PushHorn
+    - BikeHornInstrument
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: adv-clowning-module }
+
 #syndicate modules
 - type: entity
   id: BorgModuleSyndicateWeapon
@@ -1030,7 +1050,7 @@
   parent: [ BaseXenoborgModuleGeneric, BaseProviderBorgModule, BaseXenoborgContraband ]
   id: XenoborgModuleBasic
   name: basic xenoborg module
-  description: Essential items for any xenoborg.
+  description: Essential items for any Xenoborg.
   components:
   - type: Sprite
     layers:
@@ -1048,7 +1068,7 @@
   parent: [ BaseXenoborgModuleGeneric, BaseProviderBorgModule, BaseXenoborgContraband ]
   id: XenoborgModuleTool
   name: tool xenoborg module
-  description: Simple tools for most xenoborgs.
+  description: Simple tools for most Xenoborgs.
   components:
   - type: Sprite
     layers:
@@ -1149,7 +1169,7 @@
   parent: [ BaseXenoborgModuleScout, BaseProviderBorgModule, BaseXenoborgContraband ]
   id: XenoborgModuleSpaceMovement
   name: space movement xenoborg module
-  description: Module that helps a xenoborg move better in space.
+  description: Module that helps a Xenoborg move better in space.
   components:
   - type: Sprite
     layers:
@@ -1246,3 +1266,19 @@
     - CloakingDevice
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: xenoborg-eye-module }
+
+- type: entity
+  parent: [ BaseXenoborgModuleStealth, BaseProviderBorgModule, BaseXenoborgContraband ]
+  id: XenoborgModuleSuperCloakDevice
+  name: cloaking device xenoborg module
+  description: Module with a device that allows xenoborgs to become truly invisible for less time.
+  components:
+  - type: Sprite
+    layers:
+    - state: xenoborg_stealth
+    - state: icon-xenoborg-cloak2
+  - type: ItemBorgModule
+    items:
+    - SuperCloakingDevice
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: xenoborg-eye2-module }
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoborg/cloaking_device.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoborg/cloaking_device.yml
index 6550e21923..02036b6463 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoborg/cloaking_device.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoborg/cloaking_device.yml
@@ -2,7 +2,7 @@
   parent: [ BaseItem, BaseXenoborgContraband ]
   id: CloakingDevice
   name: cloaking device
-  description: A device that allows xenoborgs to go invisible.
+  description: A device that allows Xenoborgs to go invisible.
   components:
   - type: Sprite
     sprite: Objects/Specific/Research/anomalyscanner.rsi
@@ -29,3 +29,18 @@
         startingItem: PowerCellSmallNuclear
         disableEject: true
         swap: false
+
+- type: entity
+  parent: CloakingDevice
+  id: SuperCloakingDevice
+  name: super cloaking device
+  description: A device that allows Xenoborgs to go truly invisible.
+  components:
+  - type: ComponentToggler
+    parent: true
+    components:
+    - type: Stealth
+      minVisibility: -1
+      lastVisibility: -1
+  - type: PowerCellDraw
+    drawRate: 12 # 30 seconds
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoborg/material_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoborg/material_bag.yml
index 79042fb561..d075e37a5d 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoborg/material_bag.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoborg/material_bag.yml
@@ -2,7 +2,7 @@
   parent: [ BaseStorageItem, BaseXenoborgContraband ]
   id: MaterialBag
   name: material bag
-  description: A robust bag for xenoborgs to carry large amounts of materials.
+  description: A robust bag for Xenoborgs to carry large amounts of materials.
   components:
   - type: MagnetPickup
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
index 1bbe05944f..84990b10be 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
@@ -26,6 +26,7 @@
       solution: beaker
     - type: ExaminableSolution
       solution: beaker
+      exactVolume: true
     - type: DrawableSolution
       solution: beaker
     - type: InjectableSolution
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
index a892ee6395..0c0c1cf172 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
@@ -37,6 +37,7 @@
     solution: drink
   - type: ExaminableSolution
     solution: drink
+    exactVolume: true
   - type: DrawableSolution
     solution: drink
   - type: SolutionTransfer
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml
index 60441bb475..bc8207b673 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml
@@ -43,6 +43,7 @@
     solution: beaker
   - type: ExaminableSolution
     solution: beaker
+    exactVolume: true
   - type: DrawableSolution
     solution: beaker
   - type: SolutionTransfer
@@ -137,6 +138,7 @@
     solution: beaker
   - type: ExaminableSolution
     solution: beaker
+    exactVolume: true
   - type: DrawableSolution
     solution: beaker
   - type: SolutionTransfer
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
index ebd785ab7e..70ea8080ae 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -35,6 +35,7 @@
     solution: beaker
   - type: ExaminableSolution
     solution: beaker
+    exactVolume: true
   - type: DrawableSolution
     solution: beaker
   - type: InjectableSolution
@@ -133,6 +134,7 @@
     solution: beaker
   - type: ExaminableSolution
     solution: beaker
+    exactVolume: true
   - type: DrawableSolution
     solution: beaker
   - type: InjectableSolution
@@ -189,6 +191,7 @@
     solution: beaker
   - type: ExaminableSolution
     solution: beaker
+    exactVolume: true
   - type: DrawableSolution
     solution: beaker
   - type: InjectableSolution
@@ -348,6 +351,7 @@
     toggleState: 1 # draw
   - type: ExaminableSolution
     solution: dropper
+    exactVolume: true
   - type: UserInterface
     interfaces:
       enum.TransferAmountUiKey.Key:
@@ -420,6 +424,7 @@
     injectOnly: false
   - type: ExaminableSolution
     solution: injector
+    exactVolume: true
   - type: Spillable
     solution: injector
   - type: TrashOnSolutionEmpty
@@ -597,12 +602,11 @@
     size: Tiny
     sprite: Objects/Specific/Chemistry/pills.rsi
   - type: Pill
-  - type: Food
+  - type: Edible
     delay: 0.6
     forceFeedDelay: 2
     transferAmount: null
-    eatMessage: food-swallow
-    useSound: /Audio/Items/pill.ogg
+    edible: Pill
   - type: BadFood
   - type: FlavorProfile
     ignoreReagents: []
diff --git a/Resources/Prototypes/Entities/Objects/Tools/bucket.yml b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
index 992c3313e2..d77e6cd2b8 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
@@ -1,13 +1,14 @@
 - type: entity
-  parent: BaseItem
+  parent: DrinkBase
   id: Bucket
   name: bucket
   description: It's a boring old bucket.
   components:
-  - type: Drink
-    solution: bucket
-    ignoreEmpty: true
   - type: Clickable
+  - type: Edible
+    edible: Drink
+    solution: bucket
+    destroyOnEmpty: false
   - type: Sprite
     sprite: Objects/Tools/bucket.rsi
     layers:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml
index 23f5cc4362..fec2cca3ab 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml
@@ -16,7 +16,8 @@
     - state: wires
   - type: Item
     sprite: Objects/Weapons/Bombs/ied.rsi
-  - type: OnUseTimerTrigger
+  - type: TriggerOnUse
+  - type: TimerTrigger
     delay: 5
     examinable: false
     initialBeepDelay: 0
@@ -34,6 +35,8 @@
     maxIntensity: 3
     canCreateVacuum: false
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   - type: Appearance
   - type: AnimationPlayer
   - type: TimerTriggerVisuals
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
index 73c021748c..298b9d7c12 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml
@@ -23,13 +23,16 @@
       damage:
         types:
           Blunt: 5
-    - type: OnUseTimerTrigger
+    - type: TriggerOnUse
+    - type: TimerTrigger
       delay: 120
       beepSound:
         path: /Audio/Machines/Nuke/general_beep.ogg
         params:
           volume: -2
     - type: ExplodeOnTrigger
+      keysIn:
+      - timer
     - type: Explosive
       explosionType: Default
       maxIntensity: 50
@@ -37,6 +40,8 @@
       totalIntensity: 100
       canCreateVacuum: false
     - type: DeleteOnTrigger
+      keysIn:
+      - timer
     - type: HotPotato
     - type: DamageOnHolding
       enabled: false
@@ -49,7 +54,7 @@
         enum.Trigger.TriggerVisuals.VisualState:
           base:
             Primed: { state: activated }
-            Unprimed: { state: complete }
+            Unprimed: { state: icon }
 
 - type: entity
   id: HotPotatoEffect
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml
index d553b2b2a4..8de013afff 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml
@@ -5,7 +5,7 @@
   description: A dark ink pen.
   id: PenExploding
   components:
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     delay: 4
     examinable: false
   - type: Explosive
@@ -16,8 +16,11 @@
     canCreateVacuum: false
   - type: ActivateOnPaperOpened
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
+  - type: TriggerOnUse
   - type: TriggerOnSignal
-  - type: DeviceLinkSink # This should be changed into separate behavior where triggering via signal makes beep, while triggering manually is quiet, when that functionality is supported.
+  - type: DeviceLinkSink # This should be changed into separate behavior where triggering via signal makes beep, while triggering manually is quiet.
     ports:
     - Trigger
   - type: EmitSoundOnUse
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pipebomb.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pipebomb.yml
index a39a1de671..a661224f31 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pipebomb.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pipebomb.yml
@@ -10,7 +10,8 @@
     - state: base
       map: ["enum.TriggerVisualLayers.Base"]
     - state: wires
-  - type: OnUseTimerTrigger # todo: make it activate through welder/lighter/fire instead
+  - type: TriggerOnActivate # todo: make it activate through welder/lighter/fire instead
+  - type: TimerTrigger
     delay: 5
     examinable: false
     initialBeepDelay: 0
@@ -19,6 +20,8 @@
     min: 1
     max: 10
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   - type: Explosive # Weak explosion in a very small radius. Doesn't break underplating.
     explosionType: Default
     totalIntensity: 50
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml
index 7e3b3b9e83..b1bfdeef9a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml
@@ -33,7 +33,7 @@
       enum.Trigger.TriggerVisuals.VisualState:
         base:
           Primed: { state: primed }
-          Unprimed: { state: complete }
+          Unprimed: { state: icon }
 
 - type: entity
   name: composition C-4
@@ -54,17 +54,27 @@
     quickEquip: false
     equipDelay: 3
     unequipDelay: 6
-  - type: OnUseTimerTrigger
+  - type: TriggerOnActivate
+  - type: TriggerOnSignal
+  - type: TriggerOnStuck
+    keyOut: stuck
+  - type: ToggleTriggerCondition # for toggling the start on stuck ability
+    keys:
+    - stuck
+    toggleVerb: toggle-trigger-condition-stick-verb
+    toggleOn: toggle-trigger-condition-stick-on
+    toggleOff: toggle-trigger-condition-stick-off
+  - type: TimerTrigger
+    keysIn:
+    - trigger
+    - stuck
     delay: 10
     delayOptions: [10, 30, 60, 120, 300]
     initialBeepDelay: 0
     beepSound: /Audio/Machines/Nuke/general_beep.ogg
-    startOnStick: true
-    canToggleStartOnStick: true
-  - type: TimerStartOnSignal
   - type: DeviceLinkSink
     ports:
-    - Timer
+    - Trigger
   - type: Explosive # Powerful explosion in a very small radius. Doesn't break underplating.
     explosionType: DemolitionCharge
     totalIntensity: 60
@@ -72,6 +82,8 @@
     maxIntensity: 30
     canCreateVacuum: false
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   - type: HolidayVisuals
     holidays:
       festive:
@@ -94,7 +106,20 @@
     layers:
     - state: icon
       map: ["base"]
-  - type: OnUseTimerTrigger
+  - type: TriggerOnActivate
+  - type: TriggerOnSignal
+  - type: TriggerOnStuck
+    keyOut: stuck
+  - type: ToggleTriggerCondition # for toggling the start on stuck ability
+    keys:
+    - stuck
+    toggleVerb: toggle-trigger-condition-stick-verb
+    toggleOn: toggle-trigger-condition-stick-on
+    toggleOff: toggle-trigger-condition-stick-off
+  - type: TimerTrigger
+    keysIn:
+    - trigger
+    - stuck
     delay: 5
     delayOptions: [5, 10, 15, 20]
     initialBeepDelay: 0
@@ -102,12 +127,9 @@
       path: /Audio/Effects/Cargo/buzz_two.ogg
       params:
         volume: -6
-    startOnStick: false
-    canToggleStartOnStick: true
-  - type: TimerStartOnSignal
   - type: DeviceLinkSink
     ports:
-    - Timer
+    - Trigger
   - type: Explosive
     explosionType: Cryo
     totalIntensity: 120
@@ -115,3 +137,5 @@
     maxIntensity: 30
     canCreateVacuum: false
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/spider.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/spider.yml
index 2ac23f8c3f..3d7991cf0f 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/spider.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/spider.yml
@@ -12,13 +12,12 @@
     sprite: Objects/Weapons/Bombs/spidercharge.rsi
     size: Small
   - type: SpiderCharge
-  - type: OnUseTimerTrigger
+  - type: TriggerOnStuck
+  - type: TimerTrigger
     delay: 10
     delayOptions: [5, 10, 30, 60]
     initialBeepDelay: 0
     beepSound: /Audio/Machines/Nuke/general_beep.ogg
-    startOnStick: true
-  - type: AutomatedTimer
   - type: Sticky
     stickDelay: 5
     stickPopupStart: comp-sticky-start-stick-bomb
@@ -29,7 +28,7 @@
       components:
       - Anchorable
       - Item
-      - Body
+      - MobState
   - type: Explosive # Powerful explosion in a large radius. Will break underplating.
     explosionType: DemolitionCharge
     totalIntensity: 360
@@ -37,6 +36,8 @@
     maxIntensity: 120
     canCreateVacuum: true
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   - type: StickyVisualizer
   - type: Appearance
   - type: GenericVisualizer
@@ -44,4 +45,4 @@
       enum.Trigger.TriggerVisuals.VisualState:
         base:
           Primed: { state: primed }
-          Unprimed: { state: complete }
+          Unprimed: { state: icon }
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml
index e9a0c6a381..1e61fa3295 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml
@@ -185,3 +185,28 @@
   - type: Construction
     graph: ImprovisedArrowCarp
     node: ImprovisedArrowCarp
+
+- type: entity
+  parent: BaseArrow
+  id: ArrowCard
+  name: cardboard arrow
+  description: Cant kill no matter how hard you try.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/arrows.rsi
+    layers:
+    - state: tail
+      color: white
+    - state: rod
+      color: brown
+    - state: tip
+      color: brown
+  - type: Projectile
+    damage:
+      types:
+        Blunt: 1
+  - type: StaminaDamageOnCollide
+    damage: 10
+  - type: Construction
+    graph: CardArrow
+    node: CardArrow
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
index c587787d48..d1b50429f9 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
@@ -93,7 +93,7 @@
     disableWhenFirstOpened: true
     whitelist:
       components:
-        - Body
+        - MobState
   - type: LockVisuals
     stateLocked: cursed_door
     stateUnlocked: decursed_door
@@ -161,6 +161,7 @@
 
 - type: entity
   id: ProjectilePolyboltBase
+  abstract: true
   parent: BaseBullet
   categories: [ HideSpawnMenu ]
   components:
@@ -175,6 +176,8 @@
         Poison: 5
   - type: TriggerOnCollide
     fixtureID: projectile
+  - type: PolymorphOnTrigger
+    targetUser: true
 
 - type: entity
   id: ProjectilePolyboltCarp
@@ -185,10 +188,10 @@
   components:
   - type: PolymorphOnTrigger
     polymorph: WizardForcedCarp
-  - type: TriggerWhitelist
-    whitelist:
+  - type: WhitelistTriggerCondition
+    userWhitelist:
       components:
-      - Body
+      - MobState
 
 - type: entity
   id: ProjectilePolyboltMonkey
@@ -199,10 +202,10 @@
   components:
   - type: PolymorphOnTrigger
     polymorph: WizardForcedMonkey
-  - type: TriggerWhitelist
-    whitelist:
+  - type: WhitelistTriggerCondition
+    userWhitelist:
       components:
-      - Body
+      - MobState
 
 - type: entity
   id: ProjectilePolyboltDoor
@@ -218,8 +221,8 @@
       color: brown
   - type: PolymorphOnTrigger
     polymorph: WizardWallDoor
-  - type: TriggerWhitelist
-    whitelist:
+  - type: WhitelistTriggerCondition
+    userWhitelist:
       components:
       - Airlock
       - Firelock
@@ -269,10 +272,10 @@
   components:
   - type: PolymorphOnTrigger
     polymorph: WizardForcedCluwne
-  - type: TriggerWhitelist
-    whitelist:
+  - type: WhitelistTriggerCondition
+    userWhitelist:
       components:
-      - Body
+      - MobState
 
 - type: entity
   id: ProjectileIcicle
@@ -299,7 +302,7 @@
   components:
   - type: PolymorphOnTrigger
     polymorph: BreadMorph
-  - type: TriggerWhitelist
-    whitelist:
+  - type: WhitelistTriggerCondition
+    userWhitelist:
       components:
-      - Body
+      - MobState
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index e89792694d..1cf6ab9a94 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -879,8 +879,6 @@
     range: 7
   - type: SpawnOnTrigger
     proto: GrenadeFlashEffect
-  - type: ActiveTimerTrigger
-    timeRemaining: 0.3
   - type: DeleteOnTrigger
 
 - type: entity
@@ -917,8 +915,6 @@
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
     layers:
     - state: cleanade
-  - type: ActiveTimerTrigger
-    timeRemaining: 0.3
   - type: SmokeOnTrigger
     duration: 3.5
     spreadAmount: 30
@@ -927,7 +923,7 @@
       reagents:
       - ReagentId: SpaceCleaner
         Quantity: 30
-  - type: SoundOnTrigger
+  - type: EmitSoundOnTrigger
     sound: /Audio/Items/smoke_grenade_smoke.ogg
   - type: ExplodeOnTrigger
   - type: Explosive
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_ballistic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_ballistic.yml
index c5dbb1b216..5259f71f58 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_ballistic.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_ballistic.yml
@@ -47,7 +47,7 @@
   - type: Repairable
     qualityNeeded: "Anchoring"
     doAfterDelay: 3
-  - type: TriggerWhenEmpty
+  - type: TriggerOnEmptyGunshot
   - type: ExplodeOnTrigger
   - type: Explosive
     explosionType: Default
@@ -135,4 +135,4 @@
     interactSuccessString: petting-success-generic
     interactFailureString: petting-failure-generic
     interactSuccessSound:
-      path: /Audio/Animals/snake_hiss.ogg
\ No newline at end of file
+      path: /Audio/Animals/snake_hiss.ogg
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml
index 63a7acd257..cadc0f478a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml
@@ -103,6 +103,40 @@
     containers:
       storagebase: !type:Container
         ents: []
+
+- type: entity
+  name: experimental pie cannon
+  parent: BaseWeaponBattery
+  id: BorgLauncherCreamPie
+  description: Deliver a generous portion of cream directly to the crew! Automatically bakes pies over time.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Cannons/pie_cannon.rsi
+    layers:
+    - state: piecannon
+  - type: Gun
+    fireRate: 2
+    selectedMode: SemiAuto
+    availableModes:
+    - SemiAuto
+    - FullAuto
+    soundGunshot:
+      path: /Audio/Effects/thunk.ogg
+    soundEmpty:
+      path: /Audio/Items/hiss.ogg
+    clumsyProof: true
+  - type: ProjectileBatteryAmmoProvider
+    proto: FoodPieBananaCream
+    fireCost: 30
+  - type: Battery
+    maxCharge: 90
+    startingCharge: 90
+  - type: BatterySelfRecharger
+    autoRecharge: true
+    autoRechargeRate: 1
+  - type: AmmoCounter
+  - type: Item
+    size: Normal
         
 - type: entity
   name: syringe gun
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
index b09dfee840..3aa5b041f8 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
@@ -23,6 +23,11 @@
         Structural: 10
   - type: Item
     size: Normal
+    shape:
+    - 0,0,0,3
+    storedSprite:
+      state: storage
+      sprite: Objects/Weapons/Melee/baseball_bat.rsi
   - type: Tool
     qualities:
     - Rolling
@@ -54,6 +59,11 @@
     state: icon
   - type: Item
     size: Normal
+    shape:
+    - 0,0,0,3
+    storedSprite:
+      state: storage
+      sprite: Objects/Weapons/Melee/incomplete_bat.rsi
     sprite: Objects/Weapons/Melee/incomplete_bat.rsi
   - type: Construction
     graph: WoodenBat
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/offset_cane.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/offset_cane.yml
new file mode 100644
index 0000000000..1d2081fe93
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/offset_cane.yml
@@ -0,0 +1,85 @@
+- type: entity
+  parent: BaseItem
+  id: OffsetCane
+  name: standard offset cane
+  description: A standard offset cane, essential for getting around when your legs aren't up to the task. May or may not grant you the wisdom of the elderly.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/offset_canes/standard.rsi
+    state: icon
+  - type: Item
+    size: Normal
+    sprite: Objects/Weapons/Melee/offset_canes/standard.rsi
+#  - type: RandomSprite # Ideally I'd rather these be their own selectable item instead of randomly picked.
+#    available:
+#    - color: "#91949C"  # standard gray
+#    - color: "#000000"  # black
+#    - color: "#406BDE"  # blue
+#    - color: "#00FFFF"  # cyan
+#    - color: "#00FF00"  # green
+#    - color: "#FF69B4"  # pink
+#    - color: "#800080"  # purple
+#    - color: "#FF0000"  # red
+#    - color: "#FFFF00"  # yellow
+  - type: MeleeWeapon
+    wideAnimationRotation: 45
+    damage:
+      types:
+        Blunt: 5
+  - type: StaminaDamageOnHit
+    damage: 5
+  - type: Wieldable
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Blunt: 3
+  - type: UseDelay
+    delay: 1
+
+- type: entity
+  parent: OffsetCane
+  id: OffsetCaneClown
+  name: rainbow offset cane
+  description: A rainbow offset cane, perfect for clowns and those who enjoy a splash of color in their lives.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/offset_canes/clown.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Weapons/Melee/offset_canes/clown.rsi
+
+- type: entity
+  parent: OffsetCane
+  id: OffsetCaneMime
+  name: striped offset cane
+  description: A black and white striped cane, perfect for silent performances.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/offset_canes/mime.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Weapons/Melee/offset_canes/mime.rsi
+
+- type: entity
+  parent: OffsetCane
+  id: OffsetCaneNT
+  name: nanotrasen offset cane
+  description: A nanotrasen standard issue offset cane with the NT logo, favored by those who prefer a more corporate look.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/offset_canes/nanotrasen.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Weapons/Melee/offset_canes/nanotrasen.rsi
+
+- type: entity
+  parent: OffsetCane
+  id: OffsetCaneWood
+  name: wooden offset cane
+  description: A wooden offset cane, a classic choice for those who appreciate natural materials and a sturdy grip.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/offset_canes/wood.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Weapons/Melee/offset_canes/wood.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
index 4d65cc0806..d843463886 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -14,7 +14,8 @@
     quickEquip: false
     slots:
     - Belt
-  - type: OnUseTimerTrigger
+  - type: TriggerOnUse
+  - type: TimerTrigger
     delay: 3
   - type: Damageable
     damageContainer: Inorganic
@@ -25,6 +26,7 @@
         damage: 10
       behaviors:
       - !type:TriggerBehavior
+        keyOut: timer # explode immediately
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: Appearance
@@ -56,13 +58,15 @@
   id: ExGrenade
   components:
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   - type: Explosive
     explosionType: Default
     maxIntensity: 10
     intensitySlope: 3
     totalIntensity: 120 # about a ~4 tile radius
     canCreateVacuum: false
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     beepSound:
       path: "/Audio/Effects/beep1.ogg"
       params:
@@ -79,13 +83,22 @@
   - type: Sprite
     sprite: Objects/Weapons/Grenades/flashbang.rsi
   - type: FlashOnTrigger
+    keysIn:
+    - timer
     range: 7
-  - type: SoundOnTrigger
+  - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: "/Audio/Effects/flash_bang.ogg"
   - type: DeleteOnTrigger
+    keysIn:
+    - timer
   - type: SpawnOnTrigger
+    keysIn:
+    - timer
     proto: GrenadeFlashEffect
+    predicted: true
   - type: Appearance
   - type: TimerTriggerVisuals
     primingSound:
@@ -137,11 +150,14 @@
         damage: 45
       behaviors:
       - !type:TriggerBehavior
+        keyOut: timer # immediately explode
       - !type:DoActsBehavior
         acts: ["Destruction"]
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     delay: 5
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   - type: Explosive
     explosionType: Minibomb
     totalIntensity: 200
@@ -164,13 +180,15 @@
   categories: [ HideSpawnMenu ]
   components:
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   - type: Explosive
     explosionType: Minibomb
     totalIntensity: 400
     intensitySlope: 30
     maxIntensity: 125
     canCreateVacuum: true
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     delay: 4.5
     beepSound:
       path: /Audio/Effects/Grenades/SelfDestruct/SDS_Charge2.ogg
@@ -188,7 +206,7 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Grenades/singularitygrenade.rsi
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     delay: 3
     beepInterval: 0.46
     beepSound:
@@ -200,14 +218,20 @@
       path: /Audio/Effects/Grenades/Supermatter/smbeep.ogg
       params:
         volume: -5
-  - type: SoundOnTrigger
-    removeOnTrigger: true
+  - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: /Audio/Effects/Grenades/Supermatter/supermatter_start.ogg
-      volume: 5
+      params:
+        volume: 5
   - type: AnchorOnTrigger
+    keysIn:
+    - timer
     removeOnTrigger: true
   - type: TwoStageTrigger
+    keysIn:
+    - timer
     triggerDelay: 10.45
     components:
       - type: AmbientSound
@@ -231,12 +255,16 @@
         radius: 6
         softness: 1
         offset: "0, 0"
-      - type: SoundOnTrigger
+      - type: EmitSoundOnTrigger
         sound:
           path: /Audio/Effects/Grenades/Supermatter/supermatter_end.ogg
           params:
             volume: 5
+        keysIn:
+        - stageTwo
       - type: DeleteOnTrigger
+        keysIn:
+        - stageTwo
   - type: StaticPrice
     price: 1000
 
@@ -248,14 +276,20 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Grenades/whiteholegrenade.rsi
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     delay: 3
     beepInterval: 0.69
-  - type: SoundOnTrigger
-    removeOnTrigger: true
+  - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: /Audio/Effects/Grenades/Supermatter/whitehole_start.ogg
-      volume: 5
+      params:
+        volume: 5
+  - type: AnchorOnTrigger
+    keysIn:
+    - timer
+    removeOnTrigger: true
   - type: TwoStageTrigger
     triggerDelay: 11.14
     components:
@@ -280,12 +314,17 @@
         radius: 6
         softness: 1
         offset: "0, 0"
-      - type: SoundOnTrigger
+      - type: EmitSoundOnTrigger
+        keysIn:
+        - stageTwo
         sound:
           path: /Audio/Effects/Grenades/Supermatter/supermatter_end.ogg
           params:
             volume: 15
+        positional: true
       - type: DeleteOnTrigger
+        keysIn:
+        - stageTwo
   - type: StaticPrice
     price: 1000
 
@@ -297,9 +336,11 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Grenades/nukenade.rsi
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     delay: 5
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   - type: Explosive
     explosionType: Default
     totalIntensity: 20000 # ~15 tile radius.
@@ -312,6 +353,7 @@
         damage: 50
       behaviors:
       - !type:TriggerBehavior
+        keyOut: timer # immediately explode
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: Appearance
@@ -376,9 +418,13 @@
   - type: Sprite
     sprite: Objects/Weapons/Grenades/empgrenade.rsi
   - type: EmpOnTrigger
+    keysIn:
+    - timer
     range: 5.5
     energyConsumption: 50000
   - type: DeleteOnTrigger
+    keysIn:
+    - timer
   - type: Appearance
   - type: TimerTriggerVisuals
     primingSound:
@@ -395,13 +441,15 @@
   - type: Sprite
     sprite: Objects/Weapons/Grenades/holyhandgrenade.rsi
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   - type: Explosive
     explosionType: Default # same as macrobomb
     totalIntensity: 3500
     intensitySlope: 15
     maxIntensity: 70
     canCreateVacuum: true
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     delay: 3 # by canon
   - type: PointLight
     radius: 7
@@ -422,11 +470,17 @@
   - type: Sprite
     sprite: Objects/Weapons/Grenades/smoke.rsi
   - type: SmokeOnTrigger
+    keysIn:
+    - timer
     duration: 30
     spreadAmount: 50
-  - type: SoundOnTrigger
+  - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound: /Audio/Items/smoke_grenade_smoke.ogg
   - type: DeleteOnTrigger
+    keysIn:
+    - timer
   - type: TimerTriggerVisuals
     primingSound:
       path: /Audio/Items/smoke_grenade_prime.ogg
@@ -440,6 +494,8 @@
   - type: Sprite
     sprite: Objects/Weapons/Grenades/janitor.rsi
   - type: SmokeOnTrigger
+    keysIn:
+    - timer
     duration: 15
     spreadAmount: 50
     smokePrototype: Foam
@@ -457,6 +513,8 @@
   - type: Sprite
     sprite: Objects/Weapons/Grenades/tear_gas.rsi
   - type: SmokeOnTrigger
+    keysIn:
+    - timer
     duration: 10
     spreadAmount: 30
     smokePrototype: TearGasSmokeWhite
@@ -473,9 +531,11 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Grenades/metalfoam.rsi
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     delay: 5
   - type: SmokeOnTrigger
+    keysIn:
+    - timer
     duration: 10
     spreadAmount: 20
     smokePrototype: AluminiumMetalFoam
@@ -490,14 +550,18 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Grenades/airboom.rsi
-  - type: SoundOnTrigger
+  - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound: /Audio/Items/smoke_grenade_smoke.ogg
   - type: TimerTriggerVisuals
     primingSound:
       path: /Audio/Items/smoke_grenade_prime.ogg
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     delay: 3
   - type: ReleaseGasOnTrigger
+    keysIn:
+    - timer
     removeFraction: 0.25
     air:
       volume: 1000
@@ -525,9 +589,16 @@
   - type: Sprite
     sprite: Objects/Weapons/Grenades/grenade.rsi
   - type: DeleteOnTrigger
+    keysIn:
+    - timer
   - type: SpawnOnTrigger
+    keysIn:
+    - timer
     proto: GrenadeFlashEffect
-  - type: SoundOnTrigger
+    predicted: true
+  - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: /Audio/Effects/Emotes/parp1.ogg
   - type: Appearance
@@ -543,9 +614,11 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Grenades/syndgrenade.rsi
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     delay: 5
-  - type: SoundOnTrigger
+  - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: /Audio/Effects/Emotes/parp1.ogg
   - type: Appearance
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml
index bdd8370b10..f9ce11a3b9 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml
@@ -7,6 +7,8 @@
   - type: Damageable
     damageContainer: Inorganic
   - type: DeleteOnTrigger
+    keysIn:
+    - timer
   - type: Destructible
     thresholds:
     - trigger:
@@ -14,6 +16,7 @@
         damage: 10
       behaviors:
       - !type:TriggerBehavior
+        keyOut: timer # explode immediately
   - type: ContainerContainer
     containers:
       cluster-payload: !type:Container
@@ -54,11 +57,17 @@
     fillPrototype: PelletClusterRubber
     capacity: 30
   - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: "/Audio/Effects/flash_bang.ogg"
   - type: SpawnOnTrigger
+    keysIn:
+    - timer
     proto: GrenadeFlashEffect
-  - type: OnUseTimerTrigger
+    predicted: true
+  - type: TriggerOnUse
+  - type: TimerTrigger
     initialBeepDelay: 0
     beepInterval: 2
     delay: 3.5
@@ -80,7 +89,8 @@
   - type: ProjectileGrenade
     fillPrototype: PelletClusterIncendiary
     capacity: 30
-  - type: OnUseTimerTrigger
+  - type: TriggerOnUse
+  - type: TimerTrigger
     beepSound:
       path: "/Audio/Effects/beep1.ogg"
       params:
@@ -89,6 +99,8 @@
     beepInterval: 2
     delay: 3.5
   - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: "/Audio/Weapons/Guns/Gunshots/batrifle.ogg"
   - type: StaticPrice
@@ -108,7 +120,8 @@
   - type: ProjectileGrenade
     fillPrototype: PelletClusterLethal
     capacity: 30
-  - type: OnUseTimerTrigger
+  - type: TriggerOnUse
+  - type: TimerTrigger
     beepSound:
       path: "/Audio/Effects/beep1.ogg"
       params:
@@ -117,6 +130,8 @@
     beepInterval: 2
     delay: 3.5
   - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: "/Audio/Weapons/Guns/Gunshots/batrifle.ogg"
   - type: StaticPrice
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml
index 9038df13e0..ce031ba6ff 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml
@@ -17,8 +17,10 @@
         damage: 10
       behaviors:
       - !type:TriggerBehavior
+        keyOut: timer # explode immediately
   - type: ScatteringGrenade
-  - type: OnUseTimerTrigger
+  - type: TriggerOnUse
+  - type: TimerTrigger
     delay: 3
   - type: Tag
     tags:
@@ -81,6 +83,8 @@
           Primed: { state: primed }
           Unprimed: { state: icon }
   - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: "/Audio/Machines/door_lock_off.ogg"
 
@@ -98,7 +102,7 @@
   - type: ScatteringGrenade
     fillPrototype: ExGrenade
     distance: 4
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     beepSound:
       path: "/Audio/Effects/beep1.ogg"
       params:
@@ -106,6 +110,8 @@
     initialBeepDelay: 0
     beepInterval: 0.5
   - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: "/Audio/Machines/door_lock_off.ogg"
   - type: StaticPrice
@@ -130,6 +136,8 @@
       types:
         Blunt: 10
   - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: "/Audio/Items/bikehorn.ogg"
 
@@ -155,6 +163,8 @@
       types:
         Blunt: 10
   - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: "/Audio/Effects/flash_bang.ogg"
   - type: StaticPrice
@@ -177,7 +187,7 @@
     fillPrototype: BulletFoam
     capacity: 30
     velocity: 30
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     beepSound:
       path: "/Audio/Effects/beep1.ogg"
       params:
@@ -185,5 +195,7 @@
     initialBeepDelay: 0
     beepInterval: 2
   - type: EmitSoundOnTrigger
+    keysIn:
+    - timer
     sound:
       path: "/Audio/Weapons/Guns/Gunshots/batrifle.ogg"
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
index 7f69d77f93..2f6ac834ba 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
@@ -192,6 +192,7 @@
   description: An ultrabright flashbulb with a proximity trigger, useful for making an area security-only.
   components:
     - type: EmitSoundOnTrigger
+      predicted: true
       sound:
         path: /Audio/Weapons/flash.ogg
     - type: FlashOnTrigger
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml b/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
index ea394c3c1b..4f03403e25 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
@@ -1,7 +1,7 @@
 - type: entity
-  id: BoozeDispenser
+  id: BoozeDispenserEmpty
   name: booze dispenser
-  suffix: Filled
+  suffix: Empty
   description: A booze dispenser with a single slot for a container to be filled.
   parent: ReagentDispenserBase
   components:
@@ -15,6 +15,22 @@
     whitelist:
       tags:
       - DrinkBottle
+  - type: Transform
+    noRot: false
+  - type: Machine
+    board: BoozeDispenserMachineCircuitboard
+  - type: GuideHelp
+    guides:
+    - Bartender
+    - Drinks
+  - type: StealTarget
+    stealGroup: BoozeDispenser
+
+- type: entity
+  id: BoozeDispenser
+  suffix: Filled
+  parent: BoozeDispenserEmpty
+  components:
   - type: StorageFill
     contents:
     - id: DrinkAleBottleFullGrowler
@@ -29,23 +45,3 @@
     - id: DrinkVodkaBottleFull
     - id: DrinkWhiskeyBottleFull
     - id: DrinkWineBottleFull
-  - type: Transform
-    noRot: false
-  - type: Machine
-    board: BoozeDispenserMachineCircuitboard
-  - type: GuideHelp
-    guides:
-    - Bartender
-    - Drinks
-  - type: StealTarget
-    stealGroup: BoozeDispenser
-
-- type: entity
-  id: BoozeDispenserEmpty
-  suffix: Empty
-  parent: BoozeDispenser
-  components:
-  - type: Storage
-    whitelist:
-      tags:
-      - DrinkBottle
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml b/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
index 75a1a485aa..6df6d595d2 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
@@ -1,9 +1,9 @@
 - type: entity
   parent: ReagentDispenserBase
-  id: SodaDispenser
+  id: SodaDispenserEmpty
   name: soda dispenser
   description: A beverage dispenser with a selection of soda and several other common beverages. Has a single fill slot for containers.
-  suffix: Filled
+  suffix: Empty
   components:
   - type: Rotatable
   - type: Sprite
@@ -15,6 +15,20 @@
     whitelist:
       tags:
       - DrinkBottle
+  - type: Transform
+    noRot: false
+  - type: Machine
+    board: SodaDispenserMachineCircuitboard
+  - type: GuideHelp
+    guides:
+    - Bartender
+    - Drinks
+
+- type: entity
+  parent: SodaDispenserEmpty
+  id: SodaDispenser
+  suffix: Filled
+  components:
   - type: StorageFill
     contents:
     - id: DrinkCoconutWaterJug
@@ -36,16 +50,3 @@
     - id: DrinkTeaJug
     - id: DrinkTonicWaterBottleFull
     - id: DrinkWaterMelonJuiceJug
-  - type: Transform
-    noRot: false
-  - type: Machine
-    board: SodaDispenserMachineCircuitboard
-  - type: GuideHelp
-    guides:
-    - Bartender
-    - Drinks
-
-- type: entity
-  parent: SodaDispenser
-  id: SodaDispenserEmpty
-  suffix: Empty
diff --git a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
index 5d6a87ea6b..d22687faec 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
@@ -261,3 +261,82 @@
       path: /Audio/Effects/rustle1.ogg
     openSound:
       path: /Audio/Effects/rustle2.ogg
+
+
+- type: entity
+  id: CardDoor
+  parent: BaseStructure
+  name: cardboard door
+  description: A door, where will it lead?
+  components:
+  - type: InteractionOutline
+  - type: Sprite
+    sprite: Structures/Doors/MineralDoors/card_door.rsi
+    layers:
+    - state: closed
+      map: ["enum.DoorVisualLayers.Base"]
+  - type: AnimationPlayer
+  - type: Physics
+    bodyType: Static
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.49,-0.49,0.49,0.49"
+        density: 100
+        mask:
+        - FullTileMask
+        layer:
+        - FlimsyLayer
+  - type: Door
+    bumpOpen: false
+    clickOpen: true
+    canCrush: false
+    closeTimeOne: 0.2
+    closeTimeTwo: 0.6
+    openTimeOne: 0.6
+    openTimeTwo: 0.2
+    openingAnimationTime: 1.2
+    closingAnimationTime: 1.2
+    openSound:
+      path: /Audio/Effects/card_drag.ogg 
+    closeSound:
+      path: /Audio/Effects/card_drag.ogg
+  - type: MeleeSound
+    soundGroups:
+      Brute:
+        path:
+          "/Audio/Weapons/pierce.ogg"
+  - type: Appearance
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: Card
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 60 #excess damage (nuke?). avoid computational cost of spawning entities.
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 30
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MaterialCardboard:
+            min: 2
+            max: 4
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Icon
+    sprite: Structures/Doors/MineralDoors/card_door.rsi
+    state: closed
+  - type: Construction
+    graph: DoorGraph
+    node: cardDoor
+  - type: NavMapDoor
+  - type: Occluder
+  - type: BlockWeather
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
index 132d87a969..fda2ac5e18 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
@@ -300,6 +300,61 @@
     footstepSoundCollection:
       collection: FootstepTile
 
+- type: entity
+  id: TableCard
+  parent: TableBase
+  name: cardboard table
+  description: Cardboard sheets wrapped around a metal table frame.
+  components:
+  - type: Sprite
+    sprite: Structures/Furniture/Tables/card.rsi
+  - type: Icon
+    sprite: Structures/Furniture/Tables/card.rsi
+  - type: GlassTable #they named it that cause 'it would never be used elsewhere' or something, smh
+    climberDamage:
+      types:
+        Blunt: 6
+    tableDamage:
+      types:
+        Blunt: 15
+    tableMassLimit: 40
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Card
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 45 #excess damage (nuke?). avoid computational cost of spawning entities.
+      behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+        - !type:PlaySoundBehavior
+          sound: /Audio//Weapons/pierce.ogg
+    - trigger:
+        !type:DamageTrigger
+        damage: 15
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound: /Audio//Weapons/pierce.ogg
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MaterialCardboard:
+            min: 1
+            max: 2
+      - !type:ChangeConstructionNodeBehavior
+        node: TableFrame
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: IconSmooth
+    key: cardtable
+  - type: Construction
+    graph: Table
+    node: TableCard
+  - type: FootstepModifier
+    footstepSoundCollection:
+      collection: FootstepTile
+
 - type: entity
   id: TableReinforcedGlass
   parent: TableBase
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml b/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml
index d82ba95d76..b6e6a7ca9a 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml
@@ -366,3 +366,60 @@
           - !type:DoActsBehavior
             acts: [ "Destruction" ]
   - type: TrayScanReveal
+
+#cardpet
+
+- type: entity
+  id: CarpetCard
+  parent: BaseStructure
+  name: cardboard "carpet"
+  description: "Even lino is better."
+  components:
+  - type: Sprite
+    drawdepth: FloorTiles
+    sprite: Structures/Furniture/Carpets/card_carpet.rsi
+  - type: Icon
+    sprite: Structures/Furniture/Carpets/card_carpet.rsi
+    state: full
+  - type: IconSmooth
+    key: cardpets
+    additionalKeys:
+    - cards
+    base: carpet_
+  - type: Tag
+    tags:
+    - Carpet
+    - ForceFixRotations
+  - type: Physics
+    canCollide: false
+  - type: Clickable
+  - type: Fixtures
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Card
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 40
+        behaviors: #excess damage (nuke?). avoid computational cost of spawning entities.
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+      - trigger:
+          !type:DamageTrigger
+          damage: 10
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+          - !type:SpawnEntitiesBehavior
+            spawn:
+              MaterialCardboard:
+                min: 1
+                max: 1
+  - type: Butcherable
+    butcheringType: Knife
+    butcherDelay: 1
+    spawned:
+    - id: MaterialCardboard1
+      amount: 1
+  - type: TrayScanReveal
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
index 584c80132e..4a680de3d3 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
@@ -401,6 +401,40 @@
     graph: Seat
     node: chairSteelBench
 
+- type: entity
+  name: cardboard stool
+  id: CardStool
+  parent: UnanchoredChairBase
+  description: Make sure you sit *really* gently.
+  components:
+  - type: Sprite
+    state: card-stool
+  - type: Construction
+    graph: Seat
+    node: stoolCard
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Card
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 40
+      behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 10
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MaterialCardboard:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+
 - type: entity
   name: wooden bench
   id: WoodenBench
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
index 1b5ac30a9c..a6753766d5 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
@@ -75,6 +75,9 @@
     autoDrain: false
   - type: StaticPrice
     price: 100
+  - type: ActivatableUI
+    key: enum.DisposalUnitUiKey.Key
+    verbOnly: true # Not strictly needed, but we want E to toggle lid
   - type: UserInterface
     interfaces:
       enum.DisposalUnitUiKey.Key:
diff --git a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
index f9bf81695e..4867fc84d8 100644
--- a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
+++ b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
@@ -46,6 +46,44 @@
   - type: Airtight
     noAirWhenFullyAirBlocked: false
 
+- type: entity
+  id: HoloPeel
+  parent: HolosignWetFloor
+  name: holopeel
+  description: A banana peel made of slippery hard light, watch your step!
+  components:
+  - type: Sprite
+    sprite: Structures/Holo/peel.rsi
+    state: icon
+  - type: Physics
+    bodyType: Static
+    canCollide: true
+  - type: Slippery
+  - type: StepTrigger
+    intersectRatio: 0.2
+  - type: CollisionWake
+    enabled: false
+  - type: Fixtures
+    fixtures:
+      slips:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.2,-0.2,0.2,0.2"
+        hard: false
+        layer:
+        - SlipLayer
+  - type: TimedDespawn
+    lifetime: 30
+  - type: Clickable
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 10
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+
 - type: entity
   id: HolosignSecurity
   parent: HolosignWetFloor
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/service_light.yml b/Resources/Prototypes/Entities/Structures/Lighting/service_light.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/service_light.yml
rename to Resources/Prototypes/Entities/Structures/Lighting/service_light.yml
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
index bc50c4fe39..6635e5698f 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -665,6 +665,7 @@
   - type: CommunicationsConsole
     title: comms-console-announcement-title-station
   - type: DeviceNetwork
+    deviceNetId: Wireless    
     transmitFrequencyId: ShuttleTimer
   - type: ActivatableUI
     key: enum.CommunicationsConsoleUiKey.Key
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/wooden_television.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/wooden_television.yml
new file mode 100644
index 0000000000..b542687b57
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/wooden_television.yml
@@ -0,0 +1,31 @@
+- type: entity
+  parent: ComputerSurveillanceWirelessCameraMonitor
+  id: ComputerTelevision
+  name: wooden television
+  description: Finally, some decent reception around here...
+  components:
+  - type: Sprite
+    noRot: true
+    drawdepth: SmallObjects
+    layers:
+    - map: ["computerLayerBody"]
+      state: television
+    - map: ["computerLayerScreen"]
+      state: detective_television
+  - type: Computer
+    board: ComputerTelevisionCircuitboard
+  - type: PointLight
+    radius: 1.5
+    energy: 1.6
+    color: "#b89f25"
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.25,-0.25,0.25,0.25"
+        density: 200
+        mask:
+          - TabletopMachineMask
+        layer:
+          - TabletopMachineLayer
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml b/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
index 7bcb9fc3c6..d147417f9e 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
@@ -87,7 +87,6 @@
         whitelist:
           components:
             - FitsInDispenser
-  - type: ItemToggle
   - type: HealthAnalyzer
     scanDelay: 0
   - type: UserInterface
@@ -110,6 +109,8 @@
       - scanner-body
   - type: CryoPod
   - type: CryoPodAir
+  - type: Climbable # so that ejected bodies don't get stuck
+    vaultable: false
   - type: ContainerTemperatureDamageThresholds
     coldDamageThreshold: 10
   - type: GuideHelp
diff --git a/Resources/Prototypes/Entities/Structures/Machines/bombs.yml b/Resources/Prototypes/Entities/Structures/Machines/bombs.yml
index 65eb07f064..dc3aa359f4 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/bombs.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/bombs.yml
@@ -23,9 +23,11 @@
       intensitySlope: 5
       maxIntensity: 4
     - type: ExplodeOnTrigger
+      keysIn:
+      - timer
     # If you nerf the syndicate bomb in any major way, this should probably drop down to at least 100s (not 90s to compensate for slower movement speed & less lag in SS14)
     # Unless, of course, you want the 90 seconds regardless. I can't stop you.
-    - type: OnUseTimerTrigger
+    - type: TimerTrigger
       delay: 180
       delayOptions: [180, 240, 300, 600, 900]
       initialBeepDelay: 0
@@ -150,6 +152,6 @@
   components:
     - type: Defusable
       disposable: true
-    - type: OnUseTimerTrigger
+    - type: TimerTrigger
       delay: 10
       delayOptions: [10, 20, 30, 60, 90, 120, 150, 180, 210, 240, 270, 300]
diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index 9cc83cf32c..fe921e9a04 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -1,3 +1,5 @@
+# base
+
 - type: entity
   id: VendingMachine
   parent: BaseMachinePowered
@@ -105,6 +107,72 @@
   - type: Appearance
   - type: WiresVisuals
 
+- type: entity
+  id: VendingMachineWallmount
+  parent: BaseWallmountMachine
+  name: vending machine
+  abstract: true
+  components:
+  - type: StationAiWhitelist
+  - type: AmbientOnPowered
+  - type: AmbientSound
+    volume: -9
+    range: 3
+    enabled: false
+    sound:
+      path: /Audio/Ambience/Objects/vending_machine_hum.ogg
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Breakage"]
+      - !type:EjectVendorItems
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalGlassBreak
+  - type: Repairable
+    doAfterDelay: 8
+  - type: ActivatableUI
+    key: enum.VendingMachineUiKey.Key
+  - type: ActivatableUIRequiresPower
+  - type: UserInterface
+    interfaces:
+      enum.VendingMachineUiKey.Key:
+        type: VendingMachineBoundUserInterface
+      enum.WiresUiKey.Key:
+        type: WiresBoundUserInterface
+  - type: WiresPanel
+  - type: Wires
+    boardName: wires-board-name-vendingmachine
+    layoutId: Vending
+  - type: PointLight
+    enabled: false
+    castShadows: false
+    radius: 1.5
+  - type: LitOnPowered
+  - type: Appearance
+  - type: WiresVisuals
+  - type: Electrified
+    enabled: false
+    usesApcPower: true
+  - type: Rotatable
+
+# Vending machines
+
 - type: entity
   parent: VendingMachine
   id: VendingMachineCondiments
@@ -1436,59 +1504,6 @@
     energy: 1.6
     color: "#d4ab33"
 
-# wallmounted machines
-
-- type: entity
-  id: VendingMachineWallmount
-  parent: VendingMachine
-  name: vending machine
-  abstract: true
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
-  components:
-  - type: Sprite
-    drawdepth: WallMountedItems
-    snapCardinals: false
-  - type: Rotatable
-  - type: WallMount
-    arc: 175
-  - type: Transform
-    noRot: false
-
-- type: entity
-  parent: VendingMachineWallmount
-  id: VendingMachineWallMedical
-  name: NanoMed
-  description: "It's a wall-mounted medical equipment dispenser. Natural chemicals only!"
-  components:
-  - type: VendingMachine
-    pack: NanoMedInventory
-    offState: off
-    brokenState: broken
-    normalState: normal-unshaded
-    denyState: deny-unshaded
-  - type: Sprite
-    sprite: Structures/Machines/VendingMachines/wallmed.rsi
-    layers:
-    - state: "off"
-      map: ["enum.VendingMachineVisualLayers.Base"]
-    - state: "off"
-      map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
-      shader: unshaded
-    - texture: Structures/Machines/VendingMachines/maintenance_panel.png
-      map: ["enum.WiresVisualLayers.MaintenancePanel"]
-  - type: PointLight
-    radius: 1.3
-    energy: 1.6
-    color: "#43ccb5"
-  - type: AccessReader
-    access: [["Medical"]]
-  - type: GuideHelp
-    guides:
-    - Medical
-
 # job clothing
 
 - type: entity
@@ -2225,3 +2240,35 @@
   - type: AccessReader
     access: [["SyndicateAgent"]]
 
+# wallmount
+- type: entity
+  parent: VendingMachineWallmount
+  id: VendingMachineWallMedical
+  name: NanoMed
+  description: "It's a wall-mounted medical equipment dispenser. Natural chemicals only!"
+  components:
+  - type: VendingMachine
+    pack: NanoMedInventory
+    offState: off
+    brokenState: broken
+    normalState: normal-unshaded
+    denyState: deny-unshaded
+  - type: Sprite
+    sprite: Structures/Machines/VendingMachines/wallmed.rsi
+    layers:
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.Base"]
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
+      shader: unshaded
+    - texture: Structures/Machines/VendingMachines/maintenance_panel.png
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: PointLight
+    radius: 1.3
+    energy: 1.6
+    color: "#43ccb5"
+  - type: AccessReader
+    access: [["Medical"]]
+  - type: GuideHelp
+    guides:
+    - Medical
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
index 2be509e8e6..410df05021 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
@@ -96,11 +96,9 @@
 - type: entity
   abstract: true
   id: BaseGeneratorWallmount
-  parent: BaseGenerator
+  parent: [ BaseGenerator, BaseWallmount ]
   name: wallmount generator
   description: A high efficiency thermoelectric generator stuffed in a wall cabinet.
-  placement:
-    mode: SnapgridCenter
   components:
   - type: AmbientOnPowered
   - type: AmbientSound
@@ -114,12 +112,6 @@
     color: "#3db83b"
     castShadows: false
     netsync: false
-  - type: Fixtures
-  - type: Transform
-    anchored: true
-  - type: Physics
-    bodyType: Static
-    canCollide: false
   - type: Sprite
     drawdepth: WallMountedItems
     sprite: Structures/Power/Generation/wallmount_generator.rsi
@@ -142,7 +134,6 @@
     supplyRate: 3000
     supplyRampRate: 500
     supplyRampTolerance: 500
-  - type: WallMount
   - type: GuideHelp
     guides:
     - ShuttleCraft
@@ -150,20 +141,12 @@
 # Construction Frames
 
 - type: entity
+  parent: BaseWallmountMetallic
   categories: [ HideSpawnMenu ]
   id: BaseGeneratorWallmountFrame
   name: wallmount generator frame
   description: A construction frame for a wallmount generator.
-  placement:
-    mode: SnapgridCenter
   components:
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Physics
-    canCollide: false
-  - type: Fixtures
-  - type: Transform
-    anchored: true
   - type: Sprite
     drawdepth: WallMountedItems
     sprite: Structures/Power/Generation/wallmount_generator.rsi
@@ -172,7 +155,6 @@
   - type: Construction
     graph: WallmountGenerator
     node: frame
-  - type: WallMount
 
 # Generators in use
 
diff --git a/Resources/Prototypes/Entities/Structures/Power/apc.yml b/Resources/Prototypes/Entities/Structures/Power/apc.yml
index 018cf2a2f1..75f61e7534 100644
--- a/Resources/Prototypes/Entities/Structures/Power/apc.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/apc.yml
@@ -1,4 +1,5 @@
 - type: entity
+  parent: BaseWallmount
   categories: [ HideSpawnMenu ]
   id: BaseAPC
   name: APC
@@ -19,12 +20,8 @@
     color: "#3db83b"
     castShadows: false
     netsync: false
-  - type: Clickable
   - type: AccessReader
     access: [["Engineering"]]
-  - type: InteractionOutline
-  - type: Transform
-    anchored: true
   - type: Sprite
     drawdepth: WallMountedItems
     sprite: Structures/Power/apc.rsi
@@ -156,6 +153,7 @@
 
 # APC under construction
 - type: entity
+  parent: BaseWallmountMetallic
   categories: [ HideSpawnMenu ]
   id: APCFrame
   name: APC frame
@@ -163,21 +161,12 @@
   placement:
     mode: SnapgridCenter
   components:
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Transform
-    anchored: true
   - type: Sprite
-    drawdepth: WallMountedItems
     sprite: Structures/Power/apc.rsi
     state: frame
   - type: Construction
     graph: APC
     node: apcFrame
-  - type: WallMount
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Power/chargers.yml b/Resources/Prototypes/Entities/Structures/Power/chargers.yml
index e529708abb..75e38f1187 100644
--- a/Resources/Prototypes/Entities/Structures/Power/chargers.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/chargers.yml
@@ -193,7 +193,7 @@
           - PotatoBattery
 
 - type: entity
-  parent: BaseItemRecharger
+  parent: [ BaseItemRecharger, BaseWallmount ]
   id: WallWeaponCapacitorRecharger
   name: wall recharger
   components:
@@ -205,7 +205,6 @@
     - map: ["enum.PowerChargerVisualLayers.Light"]
       state: "light-off"
       shader: "unshaded"
-  - type: WallMount
   - type: Charger
     chargeRate: 25
   - type: ItemSlots
diff --git a/Resources/Prototypes/Entities/Structures/Power/debug_power.yml b/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
index a102516ce6..d2fa8d08a3 100644
--- a/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
@@ -125,31 +125,88 @@
   - type: Anchorable
 
 - type: entity
-  id: DebugSMES
   parent: BaseSMES
-  suffix: DEBUG
+  id: DebugSMES
+  suffix: DEBUG, Empty
   components:
   - type: Tag
     tags:
-      - Debug
+    - Debug
+
+- type: entity
+  parent: BaseSMES
+  id: DebugSMESRecharging
+  suffix: DEBUG, AutoRecharge
+  components:
+  - type: BatterySelfRecharger
+    autoRechargeRate: 50000
+    autoRecharge: True
+  - type: Tag
+    tags:
+    - Debug
 
 - type: entity
-  id: DebugSubstation
   parent: BaseSubstation
-  suffix: DEBUG
+  id: DebugSubstation
+  suffix: DEBUG, Empty
   components:
   - type: Tag
     tags:
-      - Debug
+    - Debug
 
 - type: entity
-  id: DebugAPC
-  parent: BaseAPC
-  suffix: DEBUG
+  parent: BaseSubstation
+  id: DebugSubstationRecharging
+  suffix: DEBUG, AutoRecharge
+  components:
+  - type: BatterySelfRecharger
+    autoRechargeRate: 50000
+    autoRecharge: True
+  - type: Tag
+    tags:
+    - Debug
+
+- type: entity
+  parent: BaseSubstationWall
+  id: DebugSubstationWall
+  suffix: DEBUG, Empty
   components:
   - type: Tag
     tags:
-      - Debug
+    - Debug
+
+- type: entity
+  parent: BaseSubstationWall
+  id: DebugSubstationWallRecharging
+  suffix: DEBUG, AutoRecharge
+  components:
+  - type: BatterySelfRecharger
+    autoRechargeRate: 50000
+    autoRecharge: True
+  - type: Tag
+    tags:
+    - Debug
+
+- type: entity
+  parent: BaseAPC
+  id: DebugAPC
+  suffix: DEBUG, Empty
+  components:
+  - type: Tag
+    tags:
+    - Debug
+
+- type: entity
+  parent: BaseAPC
+  id: DebugAPCRecharging
+  suffix: DEBUG, AutoRecharge
+  components:
+  - type: BatterySelfRecharger
+    autoRechargeRate: 50000
+    autoRecharge: True
+  - type: Tag
+    tags:
+    - Debug
 
 - type: entity
   id: DebugPowerReceiver
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
index 638947af75..cb25f9199b 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
@@ -979,6 +979,8 @@
     solution: anomaly
   - type: ExaminableSolution
     solution: anomaly
+    exactVolume: true
+    locVolume: "examinable-solution-on-examine-volume-no-max"
   - type: RefillableSolution
     solution: anomaly
   - type: InjectableSolution
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
index c38a20a698..ba1ecfd749 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
@@ -129,23 +129,16 @@
 
 #Wall Closet
 - type: entity
+  parent: BaseWallmountMetallic
   id: BaseWallCloset
-  placement:
-    mode: SnapgridCenter
   abstract: true
   name: wall closet
   description: A standard-issue Nanotrasen storage unit, now on walls.
   components:
-  - type: InteractionOutline
-  - type: Clickable
   - type: ResistLocker
   - type: Weldable
-  - type: WallMount
-    arc: 175
   - type: StaticPrice
     price: 75
-  - type: Transform
-    noRot: false
   - type: Sprite
     drawdepth: WallMountedItems
     noRot: false
@@ -170,9 +163,6 @@
     containers:
       entity_storage: !type:Container
         ents: []
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: Metallic
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/bell.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/bell.yml
similarity index 66%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/bell.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Misc/bell.yml
index 24e5cfda2a..c8d5840889 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/bell.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/bell.yml
@@ -1,15 +1,9 @@
 - type: entity
+  parent: BaseWallmountMetallic
   id: BoxingBell
   name: boxing bell
   description: Ding ding!
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
   components:
-  - type: Transform
-    anchored: true
-  - type: WallMount
   - type: Sprite
     sprite: Structures/Wallmounts/bell.rsi
     layers:
@@ -18,22 +12,12 @@
     successChance: 1
     interactSuccessSound:
       path: /Audio/Weapons/boxingbell.ogg
-  - type: Clickable
   - type: MeleeSound
     soundGroups:
       Brute:
         path:
           "/Audio/Weapons/boxingbell.ogg"
   - type: Appearance
-  - type: Rotatable
-  - type: CollisionWake
-    enabled: false
-  - type: Physics
-    canCollide: false
-    bodyType: Static
-  - type: Fixtures
-  - type: Damageable
-    damageContainer: Inorganic
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/mirror.yml
similarity index 71%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Misc/mirror.yml
index 619e74e564..c32a2731cd 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/mirror.yml
@@ -1,18 +1,14 @@
 - type: entity
+  parent: BaseWallmountGlass
   id: Mirror
   name: mirror
   description: 'Mirror mirror on the wall , who''s the most robust of them all?'
   placement:
     mode: SnapgridCenter
   components:
-  - type: WallMount
   - type: Sprite
     sprite: Structures/Wallmounts/mirror.rsi
     state: mirror
-  - type: InteractionOutline
-  - type: Clickable
-  - type: Transform
-    anchored: true
   - type: MagicMirror #instant and silent
     changeHairSound: null
     addSlotTime: 0
@@ -26,6 +22,17 @@
     interfaces:
       enum.MagicMirrorUiKey.Key:
         type: MagicMirrorBoundUserInterface
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalGlassBreak
 
 - type: entity
   parent: Mirror
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/noticeboard.yml
similarity index 90%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Misc/noticeboard.yml
index 76e17b3040..7f38f6c5ab 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/noticeboard.yml
@@ -1,11 +1,9 @@
 - type: entity
+  parent: BaseWallmount
   id: NoticeBoard
   name: notice board
   description: Is there a job for a witcher?
-  placement:
-    mode: SnapgridCenter
   components:
-  - type: WallMount
   - type: Sprite
     drawdepth: WallMountedItems
     sprite: Structures/Wallmounts/noticeboard.rsi
@@ -17,10 +15,6 @@
     maxFillLevels: 6
     fillBaseName: notice
   - type: Appearance
-  - type: InteractionOutline
-  - type: Clickable
-  - type: Transform
-    anchored: true
   - type: Damageable
     damageModifierSet: Wood
     damageContainer: StructuralInorganic
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
index f00216393b..320a251218 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
@@ -1,23 +1,15 @@
 - type: entity
   id: BaseBarSign
-  parent: BaseStructure
+  parent: [ BaseWallmountGlass, BaseWallmountMetallic ]
   name: bar sign
   abstract: true
   components:
-  - type: MeleeSound
-    soundGroups:
-      Brute:
-        collection: GlassSmash
   - type: WallMount
     arc: 360
   - type: Sprite
-    drawdepth: WallMountedItems
     sprite: Structures/Wallmounts/barsign.rsi
     state: empty
-  - type: ApcPowerReceiver
-  - type: ExtensionCableReceiver
   - type: BarSign
-  - type: InteractionOutline
   - type: AccessReader
     access: [["Bar"]]
   - type: ActivatableUIRequiresPower
@@ -31,8 +23,6 @@
       enum.WiresUiKey.Key:
         type: WiresBoundUserInterface
   - type: Appearance
-  - type: Damageable
-    damageContainer: StructuralInorganic
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml
index 35281d0383..041a93e935 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml
@@ -1,26 +1,12 @@
 - type: entity
+  parent: BaseWallmountMetallic
   id: BaseSign
   name: base sign
   abstract: true
-  placement:
-    mode: SnapgridCenter
   components:
   - type: WallMount
     arc: 360
-  - type: Clickable
-  - type: InteractionOutline
   - type: Rotatable
-  - type: Physics
-    bodyType: Static
-    canCollide: false
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb {}
-  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
   - type: Destructible
     thresholds:
     - trigger:
@@ -30,7 +16,6 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: Sprite
-    drawdepth: WallMountedItems
     sprite: Structures/Wallmounts/signs.rsi
     snapCardinals: true
   - type: StaticPrice
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml
index 992f7a71e6..21076f9f07 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml
@@ -3,10 +3,7 @@
   id: BaseFlag
   abstract: true
   components:
-  - type: WallMount
-    arc: 360
   - type: Sprite
-    drawdepth: WallMountedItems
     sprite: Structures/Wallmounts/flags.rsi
 
 - type: entity
@@ -35,7 +32,7 @@
   components:
   - type: Sprite
     state: syndie_flag
-    
+
 - type: entity
   parent: BaseFlag
   id: LGBTQFlag
@@ -44,7 +41,7 @@
   components:
   - type: Sprite
     state: lgbtq_flag
-    
+
 - type: entity
   parent: BaseFlag
   id: PirateFlag
@@ -52,4 +49,4 @@
   description: Raise the jolly roger, scallywags!
   components:
   - type: Sprite
-    state: pirate_flag
\ No newline at end of file
+    state: pirate_flag
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml
index 4f26432c60..cc43241d83 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml
@@ -3,10 +3,7 @@
   id: PaintingBase
   abstract: true
   components:
-  - type: WallMount
-    arc: 360
   - type: Sprite
-    drawdepth: WallMountedItems
     sprite: Structures/Wallmounts/paintings.rsi
 
 - type: entity
@@ -187,4 +184,4 @@
   description: This painting is a sad clown! It sparks joy.
   components:
   - type: Sprite
-    state: painting19  
+    state: painting19
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
index d4f8e29aa4..774667ce66 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
@@ -3,12 +3,8 @@
   id: PosterBase
   abstract: true
   components:
-  - type: WallMount
-    arc: 360
   - type: Sprite
-    drawdepth: WallMountedItems
     sprite: Structures/Wallmounts/posters.rsi
-    snapCardinals: true
   - type: Destructible
     thresholds:
     - trigger: # Excess damage, don't spawn entities
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/base_wallmount_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/base_wallmount_cabinet.yml
new file mode 100644
index 0000000000..69433c3a7d
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/base_wallmount_cabinet.yml
@@ -0,0 +1,9 @@
+- type: entity
+  parent: [BaseWallmountMetallic, BaseItemCabinet]
+  id: BaseWallmountCabinet
+  abstract: true
+
+- type: entity
+  parent: [BaseWallmountGlass, BaseItemCabinetGlass]
+  id: BaseWallmountCabinetGlass
+  abstract: true
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/defib_cabinet.yml
similarity index 86%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/defib_cabinet.yml
index 3e5c2486ea..0ca51b5c78 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/defib_cabinet.yml
@@ -1,18 +1,12 @@
 # TODO: same as other wallmount cabinets they should use a base structure prototype
 - type: entity
-  parent: BaseItemCabinet
+  parent: BaseWallmountCabinet
   id: DefibrillatorCabinet
   name: defibrillator cabinet
   description: A small wall mounted cabinet designed to hold a defibrillator.
   placement:
     mode: SnapgridCenter
   components:
-  - type: WallMount
-    arc: 175
-  - type: Transform
-    anchored: true
-  - type: Clickable
-  - type: InteractionOutline
   - type: Sprite
     sprite: Structures/Wallmounts/defib_cabinet.rsi
     noRot: false
@@ -30,9 +24,6 @@
         whitelist:
           components:
           - Defibrillator
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: Metallic
   - type: Destructible
     thresholds:
     - trigger: !type:DamageTrigger
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/extinguisher_cabinet.yml
similarity index 79%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/extinguisher_cabinet.yml
index 30db2d8e4d..1e051ed75e 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/extinguisher_cabinet.yml
@@ -1,19 +1,9 @@
-# TODO: this could probably use some kind of base structure prototype
-# every wallmount cabinet copypastes placement and like 8 components
 - type: entity
-  parent: BaseItemCabinet
+  parent: BaseWallmountCabinet
   id: ExtinguisherCabinet
   name: extinguisher cabinet
   description: A small wall mounted cabinet designed to hold a fire extinguisher.
-  placement:
-    mode: SnapgridCenter
   components:
-    - type: WallMount
-      arc: 360
-    - type: Transform
-      anchored: true
-    - type: Clickable
-    - type: InteractionOutline
     - type: Sprite
       sprite: Structures/Wallmounts/extinguisher_cabinet.rsi
       snapCardinals: true
@@ -31,9 +21,6 @@
           whitelist:
             components:
             - SpraySafety
-    - type: Damageable
-      damageContainer: StructuralInorganic
-      damageModifierSet: Metallic
     - type: Destructible
       thresholds:
         - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/fireaxe_cabinet.yml
similarity index 81%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/fireaxe_cabinet.yml
index c2d3c6767f..0c97f046e7 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/fireaxe_cabinet.yml
@@ -1,15 +1,11 @@
-# TODO: same as fire extinguisher make it use a base structure theres lots of copy paste
 - type: entity
-  parent: BaseItemCabinetGlass
+  parent: BaseWallmountCabinetGlass
   id: FireAxeCabinet
   name: fire axe cabinet
   description: There is a small label that reads "For Emergency use only" along with details for safe use of the axe. As if.
   placement:
     mode: SnapgridCenter
   components:
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: Glass
   - type: Destructible
     thresholds:
     - trigger:
@@ -28,13 +24,6 @@
       - !type:PlaySoundBehavior
         sound:
           collection: MetalGlassBreak
-  - type: MeleeSound
-    soundGroups:
-      Brute:
-        collection: GlassSmash
-  - type: WallMount
-  - type: Clickable
-  - type: InteractionOutline
   - type: Sprite
     sprite: Structures/Wallmounts/fireaxe_cabinet.rsi
     layers:
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/shotgun_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/shotgun_cabinet.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/shotgun_cabinet.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/shotgun_cabinet.yml
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/shelfs.yml
similarity index 98%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Storage/shelfs.yml
index 892a5ebb92..aeceba8f2e 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/shelfs.yml
@@ -1,23 +1,15 @@
 # Parents
 - type: entity
-  abstract: true
+  parent: BaseWallmount
   id: ShelfBase
+  abstract: true
   name: shelf
   description: A strange place to place, well, anything really. You feel like you shouldn't be seeing this.
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
   components:
-  - type: Clickable
-  - type: Tag
-    tags:
-    - Structure
   - type: Sprite
     drawdepth: WallMountedItems
     sprite: Structures/Storage/Shelfs/wood.rsi
     state: base
-  - type: Transform
   - type: Damageable
     damageModifierSet: Wood
     damageContainer: StructuralInorganic
@@ -32,7 +24,6 @@
           collection: WoodDestroyHeavy
       - !type:DoActsBehavior
         acts: ["Destruction"]
-  - type: WallMount
   - type: Storage
     grid:
     - 0,0,3,1
@@ -42,7 +33,6 @@
     interfaces:
      enum.StorageUiKey.Key:
       type: StorageBoundUserInterface
-  - type: InteractionOutline
   - type: ContainerContainer
     containers:
       storagebase: !type:Container
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/wall_dispensers.yml
similarity index 82%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Storage/wall_dispensers.yml
index 945bfb1a6c..962963c341 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/wall_dispensers.yml
@@ -1,25 +1,12 @@
 - type: entity
-  id: CleanerDispenser
-  name: space cleaner dispenser
-  description: Wallmount reagent dispenser.
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
+  parent: BaseWallmountMetallic
+  id: BaseDispenser
+  abstract: true
   components:
-  - type: WallMount
-    arc: 175
   - type: Sprite
     sprite: Structures/Storage/tanks.rsi
     state: cleanerdispenser
   - type: Appearance
-  - type: InteractionOutline
-  - type: Clickable
-  - type: Transform
-    anchored: true
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: Metallic
   - type: Destructible
     thresholds:
     - trigger:
@@ -53,12 +40,6 @@
           collection: MetalBreak
       - !type:DoActsBehavior
         acts: ["Destruction"]
-  - type: SolutionContainerManager
-    solutions:
-      tank:
-        reagents:
-        - ReagentId: SpaceCleaner
-          Quantity: 5000
   - type: DrainableSolution
     solution: tank
   - type: ReagentTank
@@ -66,7 +47,7 @@
     solution: tank
 
 - type: entity
-  parent: CleanerDispenser
+  parent: BaseDispenser
   id: FuelDispenser
   name: fuel dispenser
   components:
@@ -86,3 +67,16 @@
     weldingDamage:
       types:
         Heat: 20
+
+- type: entity
+  parent: BaseDispenser
+  id: CleanerDispenser
+  name: space cleaner dispenser
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+        - ReagentId: SpaceCleaner
+          Quantity: 5000
+  - type: ReagentTank
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Switches/switch.yml
similarity index 79%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Switches/switch.yml
index c19c73eb89..bbc6733441 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Switches/switch.yml
@@ -1,19 +1,12 @@
 - type: entity
+  parent: BaseWallmountMetallic
   id: SignalSwitch
   name: signal switch
   description: It's a switch for toggling power to things.
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
   components:
-  - type: StationAiWhitelist
   - type: WallMount
     arc: 360
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Physics
-    canCollide: false
+  - type: StationAiWhitelist
   - type: Sprite
     drawdepth: SmallObjects
     sprite: Structures/Wallmounts/switch.rsi
@@ -25,7 +18,6 @@
   - type: Construction
     graph: SignalSwitchGraph
     node: SignalSwitchNode
-  - type: Fixtures
   - type: DeviceNetwork
     deviceNetId: Wireless
   - type: WirelessNetworkConnection
@@ -37,51 +29,6 @@
     - Status
     lastSignals:
       Status: false
-  - type: Tag
-    tags:
-    - Structure
-
-- type: entity
-  id: SignalButton
-  name: signal button
-  description: It's a button for activating something.
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
-  components:
-  - type: StationAiWhitelist
-  - type: WallMount
-    arc: 360
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Physics
-    canCollide: false
-  - type: Sprite
-    drawdepth: SmallObjects
-    sprite: Structures/Wallmounts/switch.rsi
-    state: dead
-  - type: UseDelay
-    delay: 0.5 # prevent light-toggling auto-clickers.
-  - type: SignalSwitch
-    onPort: Pressed
-    offPort: Pressed
-    statusPort: Pressed
-  - type: Rotatable
-  - type: Construction
-    graph: SignalButtonGraph
-    node: SignalButtonNode
-  - type: Fixtures
-  - type: DeviceNetwork
-    deviceNetId: Wireless
-  - type: WirelessNetworkConnection
-    range: 200
-  - type: DeviceLinkSource
-    ports:
-      - Pressed
-  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
   - type: Destructible
     thresholds:
       - trigger:
@@ -101,100 +48,79 @@
               collection: MetalBreak
               params:
                 volume: -8
-  - type: Tag
-    tags:
-    - Structure
 
 - type: entity
+  parent: BaseWallmountMetallic
+  id: SignalButton
+  name: signal button
+  description: It's a button for activating something.
+  components:
+  - type: WallMount
+    arc: 360
+  - type: StationAiWhitelist
+  - type: Sprite
+    drawdepth: SmallObjects
+    sprite: Structures/Wallmounts/switch.rsi
+    state: dead
+  - type: UseDelay
+    delay: 0.5 # prevent light-toggling auto-clickers.
+  - type: SignalSwitch
+    onPort: Pressed
+    offPort: Pressed
+    statusPort: Pressed
+  - type: Rotatable
+  - type: Construction
+    graph: SignalButtonGraph
+    node: SignalButtonNode
+  - type: DeviceNetwork
+    deviceNetId: Wireless
+  - type: WirelessNetworkConnection
+    range: 200
+  - type: DeviceLinkSource
+    ports:
+      - Pressed
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 80
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+      - trigger:
+          !type:DamageTrigger
+          damage: 40
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+          - !type:PlaySoundBehavior
+            sound:
+              collection: MetalBreak
+              params:
+                volume: -8
+
+- type: entity
+  parent: BaseWallmountMetallic
   id: ApcNetSwitch
   name: apc net switch
   description: It's a switch for toggling lights that are connected to the same apc.
-  placement:
-    mode: SnapgridCenter
-    snap:
-      - Wallmount
   components:
-    - type: WallMount
-      arc: 360
-    - type: Clickable
-    - type: InteractionOutline
-    - type: Physics
-      canCollide: false
-    - type: Transform
-      anchored: true
-    - type: Sprite
-      drawdepth: SmallObjects
-      sprite: Structures/Wallmounts/switch.rsi
-      state: on
-    - type: Rotatable
-    - type: ExtensionCableReceiver
-    - type: DeviceNetwork
-      deviceNetId: Apc
-      transmitFrequencyId: SmartLight # assuming people want to use it for light switches.
-    - type: ApcNetworkConnection
-    - type: ApcNetSwitch
-    - type: Construction
-      graph: LightSwitchGraph
-      node: LightSwitchNode
-    - type: Fixtures
-    - type: Tag
-      tags:
-      - Structure
-
-- type: entity
-  id: TwoWayLever
-  name: two way lever
-  description: A two way lever.
-  placement:
-    mode: SnapgridCenter
-  components:
-    - type: StationAiWhitelist
-    - type: Clickable
-    - type: InteractionOutline
-    - type: Sprite
-      drawdepth: HighFloorObjects
-      sprite: Structures/conveyor.rsi
-      noRot: true
-      layers:
-        - state: switch-off
-          map: ["enabled", "enum.TwoWayLeverState.Middle"]
-    - type: TwoWayLever
-    - type: UseDelay
-      delay: 0.2 # prevent light-toggling auto-clickers.
-    - type: Appearance
-    - type: GenericVisualizer
-      visuals:
-        enum.TwoWayLeverVisuals.State:
-          enabled:
-            Right: { state: switch-fwd }
-            Middle: { state: switch-off }
-            Left: { state: switch-rev }
-    - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
-    - type: Destructible
-      thresholds:
-      - trigger:
-          !type:DamageTrigger
-          damage: 100
-        behaviors:
-        - !type:DoActsBehavior
-          acts: [ "Destruction" ]
-    - type: Construction
-      graph: LeverGraph
-      node: LeverNode
-    - type: DeviceNetwork
-      deviceNetId: Wireless
-    - type: WirelessNetworkConnection
-      range: 200
-    - type: DeviceLinkSource
-      ports:
-        - Left
-        - Right
-        - Middle
-    - type: Tag
-      tags:
-      - Structure
+  - type: WallMount
+    arc: 360
+  - type: Sprite
+    drawdepth: SmallObjects
+    sprite: Structures/Wallmounts/switch.rsi
+    state: on
+  - type: Rotatable
+  - type: ExtensionCableReceiver
+  - type: DeviceNetwork
+    deviceNetId: Apc
+    transmitFrequencyId: SmartLight # assuming people want to use it for light switches.
+  - type: ApcNetworkConnection
+  - type: ApcNetSwitch
+  - type: Construction
+    graph: LightSwitchGraph
+    node: LightSwitchNode
 
 #directional
 
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/switch_autolink.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Switches/switch_autolink.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/switch_autolink.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Switches/switch_autolink.yml
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/Monitors/telescreens.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/Monitors/telescreens.yml
new file mode 100644
index 0000000000..ed585aa185
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/Monitors/telescreens.yml
@@ -0,0 +1,83 @@
+- type: entity
+  parent: BaseWallmountMachine
+  id: WallmountTelescreen
+  suffix: camera monitor
+  name: telescreen
+  description: Finally, some decent reception around here...
+  components:
+  - type: Sprite
+    sprite: Structures/Machines/computers.rsi
+    layers:
+      - map: ["computerLayerBody"]
+        state: telescreen_frame
+      - map: ["computerLayerScreen"]
+        state: telescreen
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalGlassBreak
+  - type: Construction
+    graph: WallmountTelescreen
+    node: Telescreen
+  - type: PointLight
+    radius: 1.5
+    energy: 1.6
+    color: "#b89f25"
+  - type: DeviceNetwork
+    deviceNetId: Wired
+    receiveFrequencyId: SurveillanceCamera
+    transmitFrequencyId: SurveillanceCamera
+  - type: WiredNetworkConnection
+  - type: DeviceNetworkRequiresPower
+  - type: SurveillanceCameraMonitor
+  - type: ActivatableUI
+    key: enum.SurveillanceCameraMonitorUiKey.Key
+  - type: ActivatableUIRequiresPower
+  - type: ActivatableUIRequiresVision
+  - type: UserInterface
+    interfaces:
+        enum.SurveillanceCameraMonitorUiKey.Key:
+          type: SurveillanceCameraMonitorBoundUserInterface
+
+- type: entity
+  parent: BaseWallmountMetallic
+  id: WallmountTelescreenFrame
+  name: telescreen frame
+  description: Finally, some decent reception around here...
+  components:
+  - type: Construction
+    graph: WallmountTelescreen
+    node: TelescreenFrame
+  - type: Sprite
+    sprite: Structures/Machines/computers.rsi
+    layers:
+      - map: ["computerLayerBody"]
+        state: telescreen_frame
+      - map: ["computerLayerScreen"]
+        state: telescreen
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors: #excess damage, don't spawn entities.
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/Monitors/televisions.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/Monitors/televisions.yml
new file mode 100644
index 0000000000..b600ece985
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/Monitors/televisions.yml
@@ -0,0 +1,96 @@
+- type: entity
+  parent: BaseWallmountMachine
+  id: WallmountTelevision
+  suffix: entertainment
+  name: television
+  description: Finally, some decent reception around here...
+  components:
+  - type: Construction
+    graph: WallmountTelevision
+    node: Television
+  - type: Sprite
+    sprite: Structures/Wallmounts/flatscreentv.rsi
+    layers:
+      - map: ["computerLayerBody"]
+        state: television_wall
+      - map: ["computerLayerScreen"]
+        state: television_wallscreen
+  - type: DeviceNetwork
+    deviceNetId: Wireless
+    receiveFrequencyId: SurveillanceCamera
+    transmitFrequencyId: SurveillanceCamera
+  - type: WirelessNetworkConnection
+    range: 200
+  - type: DeviceNetworkRequiresPower
+  - type: Speech
+  - type: SurveillanceCameraSpeaker
+  - type: SurveillanceCameraMonitor
+  - type: ActivatableUI
+    key: enum.SurveillanceCameraMonitorUiKey.Key
+  - type: ActivatableUIRequiresPower
+  - type: ActivatableUIRequiresVision
+  - type: UserInterface
+    interfaces:
+        enum.SurveillanceCameraMonitorUiKey.Key:
+          type: SurveillanceCameraMonitorBoundUserInterface
+  - type: PointLight
+    radius: 1.5
+    energy: 1.6
+    color: "#b89f25"
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 200
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+      - trigger:
+          !type:DamageTrigger
+          damage: 100
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+          - !type:PlaySoundBehavior
+            sound:
+              collection: MetalGlassBreak
+              params:
+                volume: -4
+  - type: StationAiWhitelist
+
+- type: entity
+  parent: BaseWallmountGlass
+  id: WallmountTelevisionFrame
+  name: television frame
+  description: Finally, some decent reception around here...
+  components:
+  - type: Construction
+    graph: WallmountTelevision
+    node: TelevisionFrame
+  - type: Sprite
+    drawdepth: WallMountedItems
+    sprite: Structures/Wallmounts/flatscreentv.rsi
+    layers:
+      - map: ["computerLayerBody"]
+        state: television_wall
+      - map: ["computerLayerScreen"]
+        state: television_wallscreen
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 20
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+      - trigger:
+          !type:DamageTrigger
+          damage: 15
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+          - !type:PlaySoundBehavior
+            sound:
+              collection: MetalGlassBreak
+              params:
+                volume: -4
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/air_alarm.yml
similarity index 87%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/air_alarm.yml
index d8c50211cc..609f6e21ea 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/air_alarm.yml
@@ -1,19 +1,13 @@
 - type: entity
+  parent: BaseWallmountMachine
   id: AirAlarm
   name: air alarm
   description: An air alarm. Alarms... air?
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
   components:
   - type: StationAiWhitelist
-  - type: WallMount
-  - type: ApcPowerReceiver
   - type: Electrified
     enabled: false
     usesApcPower: true
-  - type: ExtensionCableReceiver
   - type: DeviceNetwork
     deviceNetId: AtmosDevices
     receiveFrequencyId: AtmosMonitor
@@ -86,8 +80,6 @@
       map: ["airAlarmState"] # TODO: fire alarm enum
     - state: alarmx
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
-  - type: Transform
-    anchored: true
   - type: Construction
     graph: AirAlarm
     node: air_alarm
@@ -119,17 +111,11 @@
     - DeviceMonitoringAndControl
 
 - type: entity
+  parent: BaseWallmountMetallic
   id: AirAlarmAssembly
   name: air alarm assembly
   description: An air alarm. Doesn't look like it'll be alarming air any time soon.
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
   components:
-  - type: WallMount
-  - type: Clickable
-  - type: InteractionOutline
   - type: Sprite
     sprite: Structures/Wallmounts/air_monitors.rsi
     layers:
@@ -147,6 +133,25 @@
     node: assembly
   - type: Transform
     anchored: true
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 20
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+      - trigger:
+          !type:DamageTrigger
+          damage: 15
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+          - !type:PlaySoundBehavior
+            sound:
+              collection: MetalGlassBreak
+              params:
+                volume: -4
 
 - type: entity
   id: AirAlarmXeno
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/fire_alarm.yml
similarity index 85%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/fire_alarm.yml
index 93e398a974..1f2a20dc30 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/fire_alarm.yml
@@ -1,10 +1,11 @@
 - type: entity
+  parent: BaseWallmountMachine
   id: FireAlarm
   name: fire alarm
   description: A fire alarm. Spicy!
   components:
-  - type: WallMount
-  - type: ApcPowerReceiver
+  - type: LightningTarget
+    priority: 0
   - type: Electrified
     enabled: false
     usesApcPower: true
@@ -39,8 +40,6 @@
   - type: Tag
     tags:
       - FireAlarm
-  - type: Clickable
-  - type: InteractionOutline
   - type: FireAlarm
   - type: AtmosAlertsDevice
     group: FireAlarm
@@ -108,19 +107,13 @@
               params:
                 volume: -4
   - type: StationAiWhitelist
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
 
 - type: entity
+  parent: BaseWallmountMetallic
   id: FireAlarmAssembly
   name: fire alarm assembly
   description: A fire alarm assembly. Very mild.
   components:
-  - type: WallMount
-  - type: Clickable
-  - type: InteractionOutline
   - type: Sprite
     sprite: Structures/Wallmounts/air_monitors.rsi
     layers:
@@ -136,12 +129,25 @@
   - type: Construction
     graph: FireAlarm
     node: assembly
-  - type: Transform
-    anchored: true
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 20
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+      - trigger:
+          !type:DamageTrigger
+          damage: 15
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+          - !type:PlaySoundBehavior
+            sound:
+              collection: MetalGlassBreak
+              params:
+                volume: -4
 
 - type: entity
   id: FireAlarmXeno
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/intercom.yml
similarity index 93%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/intercom.yml
index 7a343ab6ad..6d04ada47c 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/intercom.yml
@@ -1,12 +1,11 @@
 - type: entity
+  parent: BaseWallmountMachine
   id: BaseIntercom
   name: intercom
   description: An intercom. For when the station just needs to know something.
   abstract: true
   components:
   - type: StationAiWhitelist
-  - type: WallMount
-  - type: ApcPowerReceiver
   - type: Electrified
     enabled: false
     usesApcPower: true
@@ -27,9 +26,6 @@
   - type: VoiceOverride # This is for the wire that makes an electricity zapping noise.
     speechVerbOverride: Electricity
     enabled: false
-  - type: ExtensionCableReceiver
-  - type: Clickable
-  - type: InteractionOutline
   - type: Appearance
   - type: WiresVisuals
   - type: WiresPanelSecurity
@@ -60,9 +56,6 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
       visible: false
-  - type: Transform
-    noRot: false
-    anchored: true
   - type: WiresPanel
   - type: Wires
     boardName: wires-board-name-intercom
@@ -83,9 +76,6 @@
     containers:
     - board
     - key_slots
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
       - trigger:
@@ -123,19 +113,12 @@
         enum.RadioDeviceVisualLayers.Speaker:
           True: { visible: true }
           False: { visible: false }
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
 
 - type: entity
   id: IntercomAssembly
   name: intercom assembly
   description: An intercom. It doesn't seem very helpful right now.
   components:
-  - type: WallMount
-  - type: Clickable
-  - type: InteractionOutline
   - type: Sprite
     drawdepth: SmallObjects
     sprite: Structures/Wallmounts/intercom.rsi
@@ -154,12 +137,6 @@
   - type: Construction
     graph: Intercom
     node: assembly
-  - type: Transform
-    anchored: true
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
 
 # this weird inheritance BS exists for construction shitcode
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/screen.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/screen.yml
similarity index 67%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/screen.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/screen.yml
index 9d5cf06d51..6c41f8d39b 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/screen.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/screen.yml
@@ -1,19 +1,9 @@
 - type: entity
+  parent: BaseWallmountMachine
   id: Screen
   name: screen
   description: Displays text or time.
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
   components:
-  - type: Transform
-    anchored: true
-  - type: WallMount
-    arc: 360
-  - type: InteractionOutline
-  - type: Clickable
-  - type: Appearance
   - type: Rotatable
   - type: TextScreenVisuals
     textOffset: 0,3
@@ -24,14 +14,20 @@
     sprite: Structures/Wallmounts/screen.rsi
     state: screen
     noRot: true
-  - type: Construction
-    graph: Timer
-    node: screen
+  - type: Appearance
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalGlassBreak
   - type: ApcPowerReceiver
     powerLoad: 100
-  - type: Electrified
-    enabled: false
-    usesApcPower: true
   - type: ExtensionCableReceiver
   - type: Screen
   - type: DeviceNetwork
@@ -42,6 +38,7 @@
   id: ArrivalsShuttleTimer
   parent: Screen
   name: arrivals screen
+  description: Displays time of arrivals shuttle ETA.
   components:
   - type: DeviceNetwork
     deviceNetId: Private
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/station_map.yml
similarity index 62%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/station_map.yml
index becdfc7f65..39643fb850 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/station_map.yml
@@ -1,22 +1,15 @@
 - type: entity
+  parent: BaseWallmountMetallic
   id: StationMapBroken
   name: station map
   description: A virtual map of the surrounding station.
   suffix: Wall broken
-  placement:
-    mode: SnapgridCenter
   components:
-    - type: InteractionOutline
-    - type: Clickable
-    - type: Transform
-      anchored: true
     - type: Sprite
       sprite: Structures/Machines/station_map.rsi
       drawdepth: WallMountedItems
       layers:
         - state: station_map_broken
-    - type: Damageable
-      damageContainer: StructuralInorganic
     - type: Destructible
       thresholds:
         - trigger:
@@ -30,24 +23,22 @@
               acts: [ "Destruction" ]
 
 - type: entity
+  parent: BaseWallmountMachine
   id: StationMap
   name: station map
-  parent: BaseComputer
   description: A virtual map of the surrounding station.
   suffix: Wall
-  placement:
-    mode: SnapgridCenter
   components:
+    - type: WallMount
+      arc: 360
+    - type: Appearance
     - type: StationMap
-    - type: Transform
-      anchored: true
     - type: Sprite
       sprite: Structures/Machines/station_map.rsi
       layers:
-      - map: ["computerLayerBody"]
-        state: station_map0
-      - map: ["computerLayerScreen"]
-        state: unshaded
+      - state: station_map0
+      - state: unshaded
+        shader: unshaded
     - type: Icon
       sprite: Structures/Machines/station_map.rsi
       state: station_map0
@@ -59,9 +50,6 @@
         board: !type:Container
     - type: ApcPowerReceiver
       powerLoad: 200
-    - type: WallMount
-      arc: 360
-    - type: ExtensionCableReceiver
     - type: Construction
       graph: StationMap
       node: station_map
@@ -70,42 +58,52 @@
       key: enum.StationMapUiKey.Key
     - type: Destructible
       thresholds:
-        - trigger: # Excess damage, don't spawn entities
-            !type:DamageTrigger
-            damage: 200
-          behaviors:
-            - !type:PlaySoundBehavior
-              sound:
-                collection: GlassBreak
-            - !type:DoActsBehavior
-              acts: [ "Destruction" ]
-        - trigger:
-            !type:DamageTrigger
-            damage: 100
-          behaviors:
-            - !type:PlaySoundBehavior
-              sound:
-                collection: GlassBreak
-            - !type:SpawnEntitiesBehavior
-              spawn:
-                StationMapBroken:
-                  min: 1
-                  max: 1
-            - !type:DoActsBehavior
-              acts: [ "Destruction" ]
+      - trigger: # Excess damage, don't spawn entities
+          !type:DamageTrigger
+          damage: 200
+        behaviors:
+        - !type:PlaySoundBehavior
+          sound:
+            collection: GlassBreak
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+      - trigger:
+          !type:DamageTrigger
+          damage: 100
+        behaviors:
+        - !type:PlaySoundBehavior
+          sound:
+            collection: GlassBreak
+        - !type:SpawnEntitiesBehavior
+          spawn:
+            StationMapBroken:
+              min: 1
+              max: 1
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
     - type: UserInterface
       interfaces:
         enum.StationMapUiKey.Key:
           type: StationMapBoundUserInterface
+    - type: EmitSoundOnUIOpen
+      sound:
+        collection: Keyboard
+        params:
+          volume: -1
+          variation: 0.10
+          pitch: 1.10  # low pitch keyboard sounds feel kinda weird
+      blacklist:
+        tags:
+        - NoConsoleSound
 
 - type: entity
+  parent: BaseWallmountMetallic
   id: StationMapAssembly
   name: station map assembly
   description: A station map assembly.
   components:
   - type: WallMount
-  - type: Clickable
-  - type: InteractionOutline
+    arc: 360
   - type: Sprite
     sprite: Structures/Machines/station_map.rsi
     layers:
@@ -122,9 +120,3 @@
   - type: Construction
     graph: StationMap
     node: assembly
-  - type: Transform
-    anchored: true
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/surveillance_camera.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/surveillance_camera.yml
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/timer.yml
similarity index 85%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/timer.yml
index 278d93df68..a9003f7e79 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/timer.yml
@@ -1,24 +1,28 @@
 - type: entity
+  parent: BaseWallmountMachine
   id: SignalTimer
   name: signal timer
   description: It's a timer for sending timed signals to things.
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
   components:
   - type: StationAiWhitelist
-  - type: Transform
-    anchored: true
   - type: WallMount
     arc: 360
-  - type: Clickable
-  - type: InteractionOutline
   - type: Sprite
     drawdepth: SmallObjects
     sprite: Structures/Wallmounts/switch.rsi
     state: on
   - type: Appearance
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalGlassBreak
   - type: Rotatable
   - type: SignalTimer
     canEditLabel: false
@@ -35,12 +39,9 @@
     interfaces:
       enum.SignalTimerUiKey.Key:
         type: SignalTimerBoundUserInterface
-  - type: ApcPowerReceiver
-    powerLoad: 100
   - type: Electrified
     enabled: false
     usesApcPower: true
-  - type: ExtensionCableReceiver
   - type: ActivatableUIRequiresPower
   - type: Construction
     graph: Timer
@@ -102,17 +103,10 @@
 # Construction Frame
 
 - type: entity
-  categories: [ HideSpawnMenu ]
   id: TimerFrame
   name: timer frame
   description: A construction frame for a timer.
-  placement:
-    mode: SnapgridCenter
   components:
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Transform
-    anchored: true
   - type: Sprite
     drawdepth: WallMountedItems
     sprite: Structures/Wallmounts/signalscreen.rsi
@@ -121,3 +115,4 @@
     graph: Timer
     node: frame
   - type: WallMount
+    arc: 360
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/base_wallmount.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/base_wallmount.yml
new file mode 100644
index 0000000000..824a446013
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/base_wallmount.yml
@@ -0,0 +1,51 @@
+- type: entity
+  id: BaseWallmount
+  abstract: true
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Wallmount
+  components:
+  - type: Clickable
+  - type: WallMount
+  - type: InteractionOutline
+  - type: Transform
+    anchored: true
+  - type: Tag
+    tags:
+    - Structure
+  - type: Sprite
+    drawdepth: WallMountedItems
+
+- type: entity
+  parent: BaseWallmount
+  id: BaseWallmountGlass
+  abstract: true
+  components:
+  - type: MeleeSound
+    soundGroups:
+      Brute:
+        collection: GlassSmash
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: Glass
+
+- type: entity
+  parent: BaseWallmount
+  id: BaseWallmountMetallic
+  abstract: true
+  components:
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
+
+- type: entity
+  parent: BaseWallmountMetallic
+  id: BaseWallmountMachine
+  abstract: true
+  components:
+  - type: ApcPowerReceiver
+    powerLoad: 100
+  - type: ExtensionCableReceiver
+  - type: LightningTarget
+    priority: 1
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml
deleted file mode 100644
index 8c98831e1f..0000000000
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml
+++ /dev/null
@@ -1,179 +0,0 @@
-- type: entity
-  parent: ComputerSurveillanceWirelessCameraMonitor
-  id: ComputerTelevision
-  name: wooden television
-  description: Finally, some decent reception around here...
-  components:
-  - type: Sprite
-    noRot: true
-    drawdepth: SmallObjects
-    layers:
-    - map: ["computerLayerBody"]
-      state: television
-    - map: ["computerLayerScreen"]
-      state: detective_television
-  - type: Computer
-    board: ComputerTelevisionCircuitboard
-  - type: PointLight
-    radius: 1.5
-    energy: 1.6
-    color: "#b89f25"
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.25,-0.25,0.25,0.25"
-        density: 200
-        mask:
-          - TabletopMachineMask
-        layer:
-          - TabletopMachineLayer
-
-- type: entity
-  parent: BaseComputer
-  id: WallmountTelescreenFrame
-  name: telescreen frame
-  description: Finally, some decent reception around here...
-  components:
-  - type: Construction
-    graph: WallmountTelescreen
-    node: TelescreenFrame
-  - type: Sprite
-    drawdepth: WallMountedItems
-    sprite: Structures/Machines/computers.rsi
-    layers:
-      - map: ["computerLayerBody"]
-        state: telescreen_frame
-      - map: ["computerLayerScreen"]
-        state: telescreen
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.20,-0.10,0.25,0.35"
-        density: 250
-        mask:
-          - FullTileMask
-        layer:
-          - WallLayer
-  - type: WallMount
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: Metallic
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 200
-      behaviors: #excess damage, don't spawn entities.
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-    - trigger:
-        !type:DamageTrigger
-        damage: 50
-      behaviors:
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          SheetSteel1:
-            min: 1
-            max: 1
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-  - type: Transform
-    anchored: true
-
-- type: entity
-  parent: WallmountTelescreenFrame
-  id: WallmountTelescreen
-  suffix: camera monitor
-  name: telescreen
-  description: Finally, some decent reception around here...
-  components:
-  - type: Construction
-    graph: WallmountTelescreen
-    node: Telescreen
-  - type: PointLight
-    radius: 1.5
-    energy: 1.6
-    color: "#b89f25"
-  - type: DeviceNetwork
-    deviceNetId: Wired
-    receiveFrequencyId: SurveillanceCamera
-    transmitFrequencyId: SurveillanceCamera
-  - type: WiredNetworkConnection
-  - type: DeviceNetworkRequiresPower
-  - type: SurveillanceCameraMonitor
-  - type: ActivatableUI
-    key: enum.SurveillanceCameraMonitorUiKey.Key
-  - type: ActivatableUIRequiresPower
-  - type: ActivatableUIRequiresVision
-  - type: UserInterface
-    interfaces:
-        enum.SurveillanceCameraMonitorUiKey.Key:
-          type: SurveillanceCameraMonitorBoundUserInterface
-
-# Wall Televisions
-
-- type: entity
-  parent: WallmountTelescreenFrame
-  id: WallmountTelevisionFrame
-  name: television frame
-  description: Finally, some decent reception around here...
-  components:
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.75,-0.10,0.75,0.35"
-        density: 75
-        mask:
-          - FullTileMask
-        layer:
-          - WallLayer
-  - type: Construction
-    graph: WallmountTelevision
-    node: TelevisionFrame
-  - type: Sprite
-    drawdepth: WallMountedItems
-    sprite: Structures/Wallmounts/flatscreentv.rsi
-    layers:
-      - map: ["computerLayerBody"]
-        state: television_wall
-      - map: ["computerLayerScreen"]
-        state: television_wallscreen
-
-- type: entity
-  parent: WallmountTelevisionFrame
-  id: WallmountTelevision
-  suffix: entertainment
-  name: television
-  description: Finally, some decent reception around here...
-  components:
-  - type: Construction
-    graph: WallmountTelevision
-    node: Television
-  - type: DeviceNetwork
-    deviceNetId: Wireless
-    receiveFrequencyId: SurveillanceCamera
-    transmitFrequencyId: SurveillanceCamera
-  - type: WirelessNetworkConnection
-    range: 200
-  - type: DeviceNetworkRequiresPower
-  - type: Speech
-  - type: SurveillanceCameraSpeaker
-  - type: SurveillanceCameraMonitor
-  - type: ActivatableUI
-    key: enum.SurveillanceCameraMonitorUiKey.Key
-  - type: ActivatableUIRequiresPower
-  - type: ActivatableUIRequiresVision
-  - type: UserInterface
-    interfaces:
-        enum.SurveillanceCameraMonitorUiKey.Key:
-          type: SurveillanceCameraMonitorBoundUserInterface
-  - type: PointLight
-    radius: 1.5
-    energy: 1.6
-    color: "#b89f25"
diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
index 2070635676..d3f0d0e2cb 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
@@ -77,7 +77,7 @@
           Unprimed:
             state: gibtonite_inactive
             visible: false
-  - type: OnUseTimerTrigger
+  - type: TimerTrigger
     examinable: false
     beepInterval: 0.4
     beepSound:
@@ -86,6 +86,8 @@
     min: 8
     max: 10
   - type: ExplodeOnTrigger
+    keysIn:
+    - timer
   - type: Explosive
     explosionType: DemolitionCharge
     totalIntensity: 450
@@ -109,6 +111,7 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
       - !type:TriggerBehavior
+        keyOut: timer # explode immediately
 
 # Ore veins
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
index af828c9020..f3c2eaafe4 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -1628,3 +1628,74 @@
   - type: IconSmooth
     key: cobblebricks
     base: cobblebrick
+
+# Cardboard
+
+- type: entity
+  id: Cardwall
+  parent: BaseStructure
+  name: cardboard wall
+  description: Budget cuts are hitting hard.
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Wall
+  components:
+  - type: MeleeSound
+    soundGroups:
+      Brute:
+        path:
+          "/Audio/Weapons/pierce.ogg"
+  - type: Tag
+    tags:
+    - Wall
+  - type: Sprite
+    drawdepth: SmallObjects #so bullets pass 'through'
+    sprite: Structures/Walls/card.rsi
+  - type: Icon
+    sprite: Structures/Walls/card.rsi
+    state: full
+  - type: Construction
+    graph: Cardwall
+    node: cardwall
+    deconstructionTarget: start
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: Card
+  - type: Physics
+    bodyType: Static
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.5,-0.5,0.5,0.5"
+        mask:
+        - FullTileMask
+        layer:
+        - FlimsyLayer
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 80 #excess damage (nuke?). avoid computational cost of spawning entities.
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 40
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MaterialCardboard:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: IconSmooth
+    key: cards
+    base: card
+  - type: Occluder 
+  - type: BlockWeather
+  - type: SunShadowCast
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/lever.yml b/Resources/Prototypes/Entities/Structures/lever.yml
new file mode 100644
index 0000000000..7efb4cea57
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/lever.yml
@@ -0,0 +1,53 @@
+- type: entity
+  id: TwoWayLever
+  name: two way lever
+  description: A two way lever.
+  placement:
+    mode: SnapgridCenter
+  components:
+    - type: StationAiWhitelist
+    - type: Clickable
+    - type: InteractionOutline
+    - type: Sprite
+      drawdepth: FloorObjects
+      sprite: Structures/conveyor.rsi
+      layers:
+        - state: switch-off
+          map: ["enabled", "enum.TwoWayLeverState.Middle"]
+    - type: TwoWayLever
+    - type: UseDelay
+      delay: 0.2 # prevent light-toggling auto-clickers.
+    - type: Appearance
+    - type: GenericVisualizer
+      visuals:
+        enum.TwoWayLeverVisuals.State:
+          enabled:
+            Right: { state: switch-fwd }
+            Middle: { state: switch-off }
+            Left: { state: switch-rev }
+    - type: Damageable
+      damageContainer: Inorganic
+      damageModifierSet: Metallic
+    - type: Destructible
+      thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 100
+        behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+    - type: Construction
+      graph: LeverGraph
+      node: LeverNode
+    - type: DeviceNetwork
+      deviceNetId: Wireless
+    - type: WirelessNetworkConnection
+      range: 200
+    - type: DeviceLinkSource
+      ports:
+        - Left
+        - Right
+        - Middle
+    - type: Tag
+      tags:
+      - Structure
diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml
index e4348b4efb..8eef7e1cb5 100644
--- a/Resources/Prototypes/Flavors/flavors.yml
+++ b/Resources/Prototypes/Flavors/flavors.yml
@@ -1483,3 +1483,8 @@
   id: artifactglue
   flavorType: Complex
   description: flavor-complex-artifact-glue
+
+- type: flavor
+  id: motivating
+  flavorType: Base
+  description: flavor-base-motivating
diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml
index 6056ac98d6..71a249ed48 100644
--- a/Resources/Prototypes/GameRules/roundstart.yml
+++ b/Resources/Prototypes/GameRules/roundstart.yml
@@ -225,6 +225,30 @@
       mindRoles:
       - MindRoleTraitorReinforcement
 
+- type: entity
+  id: Changeling
+  parent: BaseGameRule
+  components:
+  - type: GameRule
+    minPlayers: 25
+  - type: AntagSelection
+    definitions:
+    - prefRoles: [ Changeling ]
+      max: 3
+      playerRatio: 15
+      briefing:
+        text: changeling-role-greeting
+        color: Red
+      components:
+      - type: ChangelingDevour
+      - type: ChangelingIdentity
+      - type: ChangelingTransform
+      - type: ActionGrant
+        actions:
+        - ActionRetractableItemArmBlade # Temporary addition, will inevitably be a purchasable in the bio-store
+      mindRoles:
+      - MindRoleChangeling
+
 - type: entity
   id: Revolutionary
   parent: BaseGameRule
@@ -271,7 +295,7 @@
     - WizardSurviveObjective
     - WizardDemonstrateObjective
   - type: LoadMapRule
-    gridPath: /Maps/Shuttles/wizard.yml
+    mapPath: /Maps/Nonstations/wizardsden.yml
   - type: RuleGrids
   - type: AntagSelection
   - type: AntagLoadProfileRule
diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml
index 55cec210af..37e8a1beb3 100644
--- a/Resources/Prototypes/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Hydroponics/seeds.yml
@@ -832,6 +832,7 @@
     - FoodOnion
   mutationPrototypes:
     - onionred
+    - bloonion
   lifespan: 25
   maturation: 8
   production: 6
@@ -1994,3 +1995,38 @@
       Min: 1
       Max: 2
       PotencyDivisor: 40
+
+- type: seed
+  id: bloonion
+  name: seeds-bloonion-name
+  noun: seeds-noun-seeds
+  displayName: seeds-bloonion-display-name
+  plantRsi: Objects/Specific/Hydroponics/bloonion.rsi
+  packetPrototype: BloonionSeeds
+  productPrototypes:
+  - FoodBloonion
+  lifespan: 25
+  maturation: 15
+  production: 3
+  yield: 3
+  potency: 10
+  growthStages: 4
+  waterConsumption: 0.60
+  nutrientConsumption: 0.50
+  chemicals:
+    Potassium:
+      Min: 1
+      Max: 5
+      PotencyDivisor: 20
+    Phosphorus:
+      Min: 1
+      Max: 5
+      PotencyDivisor: 20
+    Sugar:
+      Min: 1
+      Max: 5
+      PotencyDivisor: 20
+    Allicin:
+      Min: 1
+      Max: 10
+      PotencyDivisor: 10
diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
index 2649dfa958..ccaf3abe42 100644
--- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
@@ -233,6 +233,74 @@
     - ClothingNeckGenderfluidPin
   groupBy: "pin"
 
+# Canes
+# The white cane is intentionally not included here. Thats for the blind.
+- type: loadout
+  id: OffsetCane
+  storage:
+    back:
+    - OffsetCane
+  groupBy: "canes"
+
+- type: loadout
+  id: OffsetCaneWood
+  storage:
+    back:
+    - OffsetCaneWood
+  groupBy: "canes"
+
+- type: loadout
+  id: OffsetCaneClown
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobClown
+      time: 3600 # 1hr
+  storage:
+    back:
+    - OffsetCaneClown
+  groupBy: "canes"
+
+- type: loadout
+  id: OffsetCaneMime
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobMime
+      time: 3600 # 1hr
+  storage:
+    back:
+    - OffsetCaneMime
+  groupBy: "canes"
+
+- type: loadout
+  id: OffsetCaneNT
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:DepartmentTimeRequirement
+      department: Command
+      time: 18000 # 5hr
+  storage:
+    back:
+    - OffsetCaneNT
+  groupBy: "canes"
+
+- type: loadout
+  id: Cane
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobLibrarian
+      time: 3600 # 1hr same as Jamjar.
+  storage:
+    back:
+    - Cane
+  groupBy: "canes"
+
 # Towels
 - type: loadout
   id: TowelColorWhite
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index 32f73bbf83..333d914225 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -36,6 +36,12 @@
   - ClothingNeckTransPin
   - ClothingNeckAutismPin
   - ClothingNeckGoldAutismPin
+  - OffsetCane
+  - OffsetCaneWood
+  - OffsetCaneClown
+  - OffsetCaneMime
+  - OffsetCaneNT
+  - Cane
   - TowelColorBlack
   - TowelColorDarkBlue
   - TowelColorDarkGreen
diff --git a/Resources/Prototypes/Magic/mindswap_spell.yml b/Resources/Prototypes/Magic/mindswap_spell.yml
index 8039f12074..0a28a9683b 100644
--- a/Resources/Prototypes/Magic/mindswap_spell.yml
+++ b/Resources/Prototypes/Magic/mindswap_spell.yml
@@ -14,7 +14,7 @@
   - type: EntityTargetAction
     whitelist:
       components:
-      - Body # this also allows borgs because that supercode uses Body for no reason
+      - MobState
       - PAI # intended to mindswap pAIs and AIs
       - StationAiCore
     event: !type:MindSwapSpellEvent
diff --git a/Resources/Prototypes/Magic/touch_spells.yml b/Resources/Prototypes/Magic/touch_spells.yml
index ba62a76421..f3b44eabb1 100644
--- a/Resources/Prototypes/Magic/touch_spells.yml
+++ b/Resources/Prototypes/Magic/touch_spells.yml
@@ -12,7 +12,7 @@
   - type: EntityTargetAction
     whitelist:
       components:
-      - Body
+      - MobState
     canTargetSelf: false
 
 - type: entity
diff --git a/Resources/Prototypes/NPCs/utility_queries.yml b/Resources/Prototypes/NPCs/utility_queries.yml
index 23ad7a59a1..3274bdf977 100644
--- a/Resources/Prototypes/NPCs/utility_queries.yml
+++ b/Resources/Prototypes/NPCs/utility_queries.yml
@@ -31,7 +31,7 @@
   query:
     - !type:ComponentQuery
       components:
-      - type: Food
+      - type: Edible
   considerations:
     - !type:TargetIsAliveCon
       curve: !type:InverseBoolCurve
@@ -50,7 +50,7 @@
   query:
   - !type:ComponentQuery
     components:
-    - type: Drink
+    - type: Edible
   considerations:
   - !type:TargetIsAliveCon
     curve: !type:InverseBoolCurve
diff --git a/Resources/Prototypes/Nutrition/edible.yml b/Resources/Prototypes/Nutrition/edible.yml
new file mode 100644
index 0000000000..3dd11521ef
--- /dev/null
+++ b/Resources/Prototypes/Nutrition/edible.yml
@@ -0,0 +1,50 @@
+# 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
+
+- type: edible
+  id: Food
+  useSound: !type:SoundCollectionSpecifier
+    params:
+      variation: 0.2
+      volume: -1
+    collection: eating # I think this *should* grab the sound specifier...
+  message: edible-nom
+  otherMessage: edible-nom-other
+  verb: edible-verb-food
+  noun: edible-noun-food
+  verbName: ingestion-verb-food
+  verbIcon: /Textures/Interface/VerbIcons/cutlery.svg.192dpi.png
+
+# Drink
+
+- type: edible
+  id: Drink
+  useSound: !type:SoundPathSpecifier
+    params:
+      variation: 0.25
+      volume: -2
+    path: /Audio/Items/drink.ogg
+  message: edible-slurp
+  otherMessage: edible-slurp-other
+  verb: edible-verb-drink
+  noun: edible-noun-drink
+  verbName: ingestion-verb-drink
+  verbIcon: /Textures/Interface/VerbIcons/drink.svg.192dpi.png
+
+# Pills!
+
+- type: edible
+  id: Pill
+  useSound: !type:SoundPathSpecifier
+    params:
+      variation: 0.2
+      volume: -1
+    path: /Audio/Items/pill.ogg
+  message: edible-swallow
+  otherMessage: edible-gulp-other
+  verb: edible-verb-pill
+  noun: edible-noun-pill
+  verbName: ingestion-verb-food
+  verbIcon: /Textures/Interface/VerbIcons/cutlery.svg.192dpi.png
diff --git a/Resources/Prototypes/Parallaxes/wizard.yml b/Resources/Prototypes/Parallaxes/wizard.yml
new file mode 100644
index 0000000000..0fd482a485
--- /dev/null
+++ b/Resources/Prototypes/Parallaxes/wizard.yml
@@ -0,0 +1,14 @@
+- type: parallax
+  id: Wizard
+  layers:
+    - texture:
+        !type:ImageParallaxTextureSource
+        path: "/Textures/Parallaxes/purple_nebula.png"
+      slowness: 0.98
+      scale: 1,1
+    - texture:
+        !type:ImageParallaxTextureSource
+        path: "/Textures/Parallaxes/KettleParallaxNeb.png"
+      slowness: 0.95
+      scale: "1.5, 1.5"
+      scrolling: "0.1, -0.05"
diff --git a/Resources/Prototypes/Polymorphs/admin.yml b/Resources/Prototypes/Polymorphs/admin.yml
index cb274ec7d4..3739175c8a 100644
--- a/Resources/Prototypes/Polymorphs/admin.yml
+++ b/Resources/Prototypes/Polymorphs/admin.yml
@@ -6,7 +6,7 @@
     transferName: true
     transferHumanoidAppearance: true
     inventory: Transfer
-    allowRepeatedMorphs: true
+    ignoreAllowRepeatedMorphs: true
 
 - type: polymorph
   id: AdminMonkeySmite
@@ -14,7 +14,7 @@
     entity: MobMonkey
     forced: true
     inventory: Drop
-    allowRepeatedMorphs: true
+    ignoreAllowRepeatedMorphs: true
 
 - type: polymorph
   id: AdminBreadSmite
@@ -22,7 +22,7 @@
     entity: FoodBreadPlain
     forced: true
     inventory: Drop
-    allowRepeatedMorphs: true
+    ignoreAllowRepeatedMorphs: true
 
 - type: polymorph
   id: AdminInstrumentSmite
@@ -30,7 +30,7 @@
     entity: SuperSynthesizerInstrument
     forced: true
     inventory: Drop
-    allowRepeatedMorphs: true
+    ignoreAllowRepeatedMorphs: true
 
 - type: polymorph
   id: AdminMouseSmite
@@ -38,7 +38,7 @@
     entity: MobMouse
     forced: true
     inventory: Drop
-    allowRepeatedMorphs: true
+    ignoreAllowRepeatedMorphs: true
 
 - type: polymorph
   id: AdminDisposalsSmite
@@ -46,4 +46,4 @@
     entity: DisposalUnit
     forced: true
     inventory: Drop
-    allowRepeatedMorphs: true
+    ignoreAllowRepeatedMorphs: true
diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
index dfecb112d5..f0ea5581ae 100644
--- a/Resources/Prototypes/Reagents/medicine.yml
+++ b/Resources/Prototypes/Reagents/medicine.yml
@@ -142,10 +142,9 @@
   metabolisms:
     Medicine:
       effects:
-      - !type:HealthChange
+      - !type:EvenHealthChange
         damage:
-          groups:
-            Brute: -2
+          Brute: -1.5
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold
@@ -845,6 +844,7 @@
   color: "#520e30"
   metabolisms:
     Medicine:
+      metabolismRate: 0.25
       effects:
       - !type:HealthChange
         conditions:
@@ -853,15 +853,15 @@
           max: 30
         damage:
           groups:
-            Toxin: -3
-            Brute: 0.5
+            Toxin: -1.5
+            Brute: 0.25
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold
           min: 30
         damage:
           groups:
-            Toxin: -1
+            Toxin: -0.5
             Brute: 3
       - !type:AdjustReagent
         conditions:
@@ -971,18 +971,19 @@
   color: "#e0a5b9"
   metabolisms:
     Medicine:
+      metabolismRate: 0.1
       effects:
       - !type:HealthChange
         damage:
           types:
-            Caustic: -3
+            Caustic: -0.6 # 6 per u
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold
-          min: 16
+          min: 21
         damage:
           types:
-            Heat: 2
+            Heat: 0.2
       - !type:Jitter
         conditions:
         - !type:ReagentThreshold
@@ -1026,18 +1027,19 @@
   color: "#283332"
   metabolisms:
     Medicine:
+      metabolismRate: 0.1
       effects:
       - !type:HealthChange
         damage:
           types:
-            Slash: -3
+            Slash: -0.6 # 6 Per u
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold
-          min: 12
+          min: 21
         damage:
           types:
-            Cold: 3
+            Cold: 1.5 #15 per u
 
 - type: reagent
   id: Puncturase
@@ -1049,19 +1051,20 @@
   color: "#b9bf93"
   metabolisms:
     Medicine:
+      metabolismRate: 0.1
       effects:
       - !type:HealthChange
         damage:
           types:
-            Piercing: -4
-            Blunt: 0.1
+            Piercing: -0.6 # 6 per u
+            Blunt: 0.05 # 0.5 per u
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold
-          min: 11
+          min: 21
         damage:
           types:
-            Blunt: 5
+            Blunt: 1 # 10 per u plus base effect
 
 - type: reagent
   id: Bruizine
@@ -1073,18 +1076,19 @@
   color: "#ff3636"
   metabolisms:
     Medicine:
+      metabolismRate: 0.1
       effects:
       - !type:HealthChange
         damage:
           types:
-            Blunt: -3.5
+            Blunt: -0.6 # 6 per u
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold
-          min: 10.5
+          min: 19
         damage:
           types:
-            Poison: 4
+            Poison: 1.5 # 15 per u
 
 - type: reagent
   id: Holywater
@@ -1179,12 +1183,13 @@
   color: "#8147ff"
   metabolisms:
     Medicine:
+      metabolismRate: 0.1
       effects:
       # heals shocks and removes shock chems
       - !type:HealthChange
         damage:
           types:
-            Shock: -4
+            Shock: -0.5 # 5 per u
       - !type:AdjustReagent
         reagent: Licoxide
         amount: -4
@@ -1198,14 +1203,14 @@
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold
-          min: 12
+          min: 15.5
         damage:
           types:
-            Cold: 2
+            Cold: 0.2 # 2 per u but lethal with cooling OD effect below
       - !type:AdjustTemperature
         conditions:
         - !type:ReagentThreshold
-          min: 12
+          min: 15.5
         amount: -30000
       - !type:Jitter
         conditions:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/armor.yml b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/armor.yml
index e597d7cdc4..269dd615f7 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/armor.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/armor.yml
@@ -25,3 +25,31 @@
         doAfter: 1
   - node: helmet
     entity: ClothingHeadHelmetBone
+
+- type: constructionGraph
+  id: cardArmour
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: cardarmour
+      steps:
+      - material: Cardboard
+        amount: 10
+        doAfter: 4
+  - node: cardarmour
+    entity: CardArmour
+
+- type: constructionGraph
+  id: cardHelmet
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: cardhelmet
+      steps:
+      - material: Cardboard
+        amount: 5
+        doAfter: 2
+  - node: cardhelmet
+    entity: CardHelmet
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml
index c587e47efb..08ac6e45d7 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml
@@ -68,6 +68,11 @@
             - material: Steel
               amount: 2
               doAfter: 1
+        - to: stoolCard
+          steps:
+            - material: Cardboard
+              amount: 3
+              doAfter: 1
         - to: chairWoodBench
           steps:
             - material: WoodPlank
@@ -231,6 +236,20 @@
             - tool: Screwing
               doAfter: 1
 
+    - node: stoolCard
+      entity: CardStool
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: MaterialCardboard1
+              amount: 3
+            - !type:PlaySound
+              sound: /Audio/Items/Toys/ToyFall2.ogg
+          steps:
+            - tool: Slicing
+              doAfter: 1
+
     - node: chairWoodBench
       entity: WoodenBench
       edges:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml
index 37c94f0b39..c0721cf154 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml
@@ -64,6 +64,12 @@
               amount: 1
               doAfter: 1
 
+        - to: TableCard
+          steps:
+            - material: Cardboard
+              amount: 3
+              doAfter: 1
+
         - to: TableReinforcedGlass
           steps:
             - material: ReinforcedGlass
@@ -162,6 +168,18 @@
             - tool: Anchoring
               doAfter: 1
 
+    - node: TableCard
+      entity: TableCard
+      edges:
+        - to: TableFrame
+          completed:
+            - !type:SpawnPrototype
+              prototype: MaterialCardboard1
+              amount: 3
+          steps:
+            - tool: Slicing
+              doAfter: 2
+
     - node: TableReinforcedGlass
       entity: TableReinforcedGlass
       edges:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/cardwall.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/cardwall.yml
new file mode 100644
index 0000000000..493982b617
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/cardwall.yml
@@ -0,0 +1,25 @@
+- type: constructionGraph
+  id: Cardwall
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: cardwall
+      steps:
+        - material: Cardboard
+          amount: 3
+          doAfter: 3
+  - node: cardwall
+    entity: Cardwall
+    edges:
+    - to: start
+      completed:
+      - !type:PlaySound
+        sound: /Audio/Items/Toys/ToyFall2.ogg
+      - !type:SpawnPrototype
+            prototype: MaterialCardboard1
+            amount: 3
+      - !type:DeleteEntity {}
+      steps:
+      - tool: Slicing
+        doAfter: 1.2
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/doors.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/doors.yml
index e15f4a644a..2c8260269f 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/doors.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/doors.yml
@@ -55,6 +55,13 @@
             - material: Paper
               amount: 20
               doAfter: 15
+        - to: cardDoor
+          completed:
+            - !type:SnapToGrid { }
+          steps:
+            - material: Cardboard
+              amount: 5
+              doAfter: 6
     - node: metalDoor
       entity: MetalDoor
       edges:
@@ -121,6 +128,20 @@
           steps:
             - tool: Anchoring
               doAfter: 15
+    - node: cardDoor
+      entity: CardDoor
+      edges:
+        - to: start
+          completed:
+          - !type:PlaySound
+            sound: /Audio/Items/Toys/ToyFall2.ogg
+          - !type:SpawnPrototype
+                prototype: MaterialCardboard1
+                amount: 5
+          - !type:DeleteEntity {}
+          steps:
+            - tool: Slicing
+              doAfter: 2
     - node: bananiumDoor
       entity: BananiumDoor
       edges:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/card_shield.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/card_shield.yml
new file mode 100644
index 0000000000..3cc3219c15
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/card_shield.yml
@@ -0,0 +1,17 @@
+- type: constructionGraph
+  id: CardShield
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: cardShield
+      steps:
+      - material: Cable
+        amount: 2
+        doAfter: 2
+      - material: Cardboard
+        amount: 6
+        doAfter: 2
+
+  - node: cardShield
+    entity: CardShield
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/card_sword.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/card_sword.yml
new file mode 100644
index 0000000000..d63aa855e4
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/card_sword.yml
@@ -0,0 +1,14 @@
+- type: constructionGraph
+  id: CardSword
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: cardSword
+      steps:
+      - material: Cardboard
+        amount: 6
+        doAfter: 3
+
+  - node: cardSword
+    entity: CardSword
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml
index e04e359b50..bac533a06f 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml
@@ -90,3 +90,22 @@
 
   - node: ImprovisedArrowCarp
     entity: ArrowImprovisedCarp
+
+- type: constructionGraph
+  id: CardArrow
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: CardArrow
+      steps:
+      - material: Cloth
+        amount: 1
+        doAfter: 0.5
+      - material: Cardboard
+        amount: 1
+        doAfter: 0.5
+
+  - node: CardArrow
+    entity: ArrowCard
+
diff --git a/Resources/Prototypes/Recipes/Construction/clothing.yml b/Resources/Prototypes/Recipes/Construction/clothing.yml
index 0a23bc8648..abd2911ecb 100644
--- a/Resources/Prototypes/Recipes/Construction/clothing.yml
+++ b/Resources/Prototypes/Recipes/Construction/clothing.yml
@@ -30,6 +30,22 @@
   category: construction-category-clothing
   objectType: Item
 
+- type: construction
+  id: cardHelmet
+  graph: cardHelmet
+  startNode: start
+  targetNode: cardhelmet
+  category: construction-category-clothing
+  objectType: Item
+
+- type: construction
+  id: cardArmour
+  graph: cardArmour
+  startNode: start
+  targetNode: cardarmour
+  category: construction-category-clothing
+  objectType: Item
+
 - type: construction
   id: BananaClownMask
   graph: BananaClownMask
diff --git a/Resources/Prototypes/Recipes/Construction/furniture.yml b/Resources/Prototypes/Recipes/Construction/furniture.yml
index f9b810731e..80ddd7d2dc 100644
--- a/Resources/Prototypes/Recipes/Construction/furniture.yml
+++ b/Resources/Prototypes/Recipes/Construction/furniture.yml
@@ -155,6 +155,18 @@
   conditions:
     - !type:TileNotBlocked
 
+- type: construction
+  id: StoolCard
+  graph: Seat
+  startNode: start
+  targetNode: stoolCard
+  category: construction-category-furniture
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked
+
 - type: construction
   id: ChairWoodBench
   graph: Seat
@@ -230,6 +242,18 @@
   conditions:
     - !type:TileNotBlocked
 
+- type: construction
+  id: TableCard
+  graph: Table
+  startNode: start
+  targetNode: TableCard
+  category: construction-category-furniture
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked
+
 - type: construction
   id: TableReinforcedGlass
   graph: Table
diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml
index 1335c6400c..ed533bcc52 100644
--- a/Resources/Prototypes/Recipes/Construction/structures.yml
+++ b/Resources/Prototypes/Recipes/Construction/structures.yml
@@ -207,6 +207,19 @@
   conditions:
   - !type:TileNotBlocked
 
+- type: construction
+  id: Cardwall
+  graph: Cardwall
+  startNode: start
+  targetNode: cardwall
+  category: construction-category-structures
+  conditions:
+  - !type:TileNotBlocked
+    failIfSpace: false
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canRotate: false
+
 - type: construction
   id: Grille
   graph: Grille
@@ -1192,6 +1205,16 @@
   placementMode: SnapgridCenter
   canBuildInImpassable: false
 
+- type: construction
+  id: CardDoor
+  graph: DoorGraph
+  startNode: start
+  targetNode: cardDoor
+  category: construction-category-structures
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+
 - type: construction
   id: PlasticFlapsClear
   name: construction-recipe-plastic-flaps-clear
diff --git a/Resources/Prototypes/Recipes/Construction/weapons.yml b/Resources/Prototypes/Recipes/Construction/weapons.yml
index 290dc30099..d1ecbc552d 100644
--- a/Resources/Prototypes/Recipes/Construction/weapons.yml
+++ b/Resources/Prototypes/Recipes/Construction/weapons.yml
@@ -102,6 +102,14 @@
   category: construction-category-weapons
   objectType: Item
 
+- type: construction
+  id: CardShield
+  graph: CardShield
+  startNode: start
+  targetNode: cardShield
+  category: construction-category-weapons
+  objectType: Item
+
 - type: construction
   id: MakeshiftShield
   graph: MakeshiftShield
@@ -142,6 +150,14 @@
   category: construction-category-weapons
   objectType: Item
 
+- type: construction
+  id: CardArrow
+  graph: CardArrow
+  startNode: start
+  targetNode: CardArrow
+  category: construction-category-weapons
+  objectType: Item
+
 - type: construction
   id: ImprovisedBow
   graph: ImprovisedBow
@@ -165,3 +181,11 @@
   targetNode: icon
   category: construction-category-weapons
   objectType: Item
+
+- type: construction
+  id: CardSword
+  graph: CardSword
+  startNode: start
+  targetNode: cardSword
+  category: construction-category-weapons
+  objectType: Item
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index d576d5789e..7e3cca3fa4 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -1700,6 +1700,18 @@
     FoodSnackRaisins: 1
     OrganAnimalHeart: 1
 
+- type: microwaveMealRecipe
+  id: RecipeBerryDelight
+  name: berry delight recipe
+  result: FoodCakeBerryDelight
+  time: 5
+  group: Cake
+  solids:
+    FoodCakePlain: 1
+    FoodBerries: 5
+  reagents:
+    Milk: 10
+
 - type: microwaveMealRecipe
   id: RecipeBreadDog
   name: bread dog recipe
@@ -2435,3 +2447,15 @@
     MobMothroach: 1
     OrganAnimalHeart: 1
     MoproachShoes: 1
+
+- type: microwaveMealRecipe
+  id: RecipeCottonCake
+  name: cotton cake recipe
+  result: FoodCakeCotton
+  time: 5
+  group: Cake
+  reagents:
+    Fiber: 10
+  solids:
+    FoodCakePlain: 1
+    
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml b/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml
index 6e855f393d..0b6cccf78b 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml
@@ -44,6 +44,8 @@
   - DiseaseSwab
   - BodyBag
   - WhiteCane
+  - OffsetCane
+  - OffsetCaneWood
 
 - type: latheRecipePack
   id: RollerBedsStatic
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml b/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
index 74483c4ebe..f22cde9c52 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
@@ -37,6 +37,7 @@
   recipes:
   - BorgModuleAdvancedCleaning
   - BorgModuleAdvancedTool
+  - BorgModuleAdvancedClowning
   - BorgModuleAdvancedChemical
   - BorgModuleAdvancedMining
 
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/xenoborgs.yml b/Resources/Prototypes/Recipes/Lathes/Packs/xenoborgs.yml
new file mode 100644
index 0000000000..31efc63265
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/xenoborgs.yml
@@ -0,0 +1,16 @@
+## Static
+
+- type: latheRecipePack
+  id: EmptyXenoborgs
+  recipes:
+  - XenoborgEngiRecipe
+  - XenoborgHeavyRecipe
+  - XenoborgScoutRecipe
+  - XenoborgStealthRecipe
+
+- type: latheRecipePack
+  id: XenoborgUpgradeModules
+  recipes:
+  - XenoborgModuleHeavyLaserRecipe
+  - XenoborgModuleEnergySwordRecipe
+  - XenoborgModuleSuperCloakDeviceRecipe
diff --git a/Resources/Prototypes/Recipes/Lathes/medical.yml b/Resources/Prototypes/Recipes/Lathes/medical.yml
index 2f968893b1..bd3ee3773d 100644
--- a/Resources/Prototypes/Recipes/Lathes/medical.yml
+++ b/Resources/Prototypes/Recipes/Lathes/medical.yml
@@ -217,6 +217,22 @@
     Steel: 100
     Plastic: 100
 
+- type: latheRecipe
+  id: OffsetCane
+  result: OffsetCane
+  completetime: 2
+  materials:
+    Steel: 100
+    Plastic: 100
+
+- type: latheRecipe
+  id: OffsetCaneWood
+  result: OffsetCaneWood
+  completetime: 2
+  materials:
+    Steel: 100
+    Wood: 100
+
 - type: latheRecipe
   id: LauncherSyringe
   result: LauncherSyringe
diff --git a/Resources/Prototypes/Recipes/Lathes/robot_modules.yml b/Resources/Prototypes/Recipes/Lathes/robot_modules.yml
index d7d112bba0..9210529a1d 100644
--- a/Resources/Prototypes/Recipes/Lathes/robot_modules.yml
+++ b/Resources/Prototypes/Recipes/Lathes/robot_modules.yml
@@ -68,3 +68,13 @@
 # Science Modules
 
 # Service Modules
+
+- type: latheRecipe
+  parent: BaseGoldBorgModuleRecipe
+  id: BorgModuleAdvancedClowning
+  result: BorgModuleAdvancedClowning
+  materials:
+    Steel: 500
+    Glass: 500
+    Plastic: 250
+    Bananium: 375
diff --git a/Resources/Prototypes/Recipes/Lathes/xenoborgs.yml b/Resources/Prototypes/Recipes/Lathes/xenoborgs.yml
new file mode 100644
index 0000000000..9b150a502b
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Lathes/xenoborgs.yml
@@ -0,0 +1,67 @@
+# Base prototypes
+
+- type: latheRecipe
+  abstract: true
+  id: BaseXenoborgRecipe
+  categories:
+  - Robotics
+  completetime: 10
+
+- type: latheRecipe
+  abstract: true
+  id: BaseXenoborgModulesRecipe
+  categories:
+  - Modules
+  completetime: 2
+  materials:
+    Glass: 3000
+
+# xenoborgs
+
+- type: latheRecipe
+  parent: BaseXenoborgRecipe
+  id: XenoborgEngiRecipe
+  result: XenoborgEngiPrinted
+  materials:
+    Steel: 3000
+
+- type: latheRecipe
+  parent: BaseXenoborgRecipe
+  id: XenoborgHeavyRecipe
+  result: XenoborgHeavyPrinted
+  materials:
+    Steel: 2000
+    Plasteel: 1000
+
+- type: latheRecipe
+  parent: BaseXenoborgRecipe
+  id: XenoborgScoutRecipe
+  result: XenoborgScoutPrinted
+  materials:
+    Steel: 2000
+    Plastic: 1000
+
+- type: latheRecipe
+  parent: BaseXenoborgRecipe
+  id: XenoborgStealthRecipe
+  result: XenoborgStealthPrinted
+  materials:
+    Steel: 2000
+    Glass: 1000
+
+# modules
+
+- type: latheRecipe
+  parent: BaseXenoborgModulesRecipe
+  id: XenoborgModuleHeavyLaserRecipe
+  result: XenoborgModuleHeavyLaser
+
+- type: latheRecipe
+  parent: BaseXenoborgModulesRecipe
+  id: XenoborgModuleEnergySwordRecipe
+  result: XenoborgModuleEnergySword
+
+- type: latheRecipe
+  parent: BaseXenoborgModulesRecipe
+  id: XenoborgModuleSuperCloakDeviceRecipe
+  result: XenoborgModuleSuperCloakDevice
diff --git a/Resources/Prototypes/Recipes/Reactions/medicine.yml b/Resources/Prototypes/Recipes/Reactions/medicine.yml
index f710f5c471..10508fc48b 100644
--- a/Resources/Prototypes/Recipes/Reactions/medicine.yml
+++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml
@@ -445,39 +445,6 @@
   products:
     Bruizine: 2
 
-- type: reaction
-  id: BicarLacerinol # mixing any two brute medications will make Razorium
-  impact: Medium
-  reactants:
-    Lacerinol:
-      amount: 1
-    Bicaridine:
-      amount: 1
-  products:
-    Razorium: 1
-
-- type: reaction
-  id: BicarPuncturase # mixing any two brute medications will make Razorium
-  impact: Medium
-  reactants:
-    Puncturase:
-      amount: 1
-    Bicaridine:
-      amount: 1
-  products:
-    Razorium: 1
-
-- type: reaction
-  id: BicarBruizine # mixing any two brute medications will make Razorium
-  impact: Medium
-  reactants:
-    Bruizine:
-      amount: 1
-    Bicaridine:
-      amount: 1
-  products:
-    Razorium: 1
-
 - type: reaction
   id: BruizineLacerinol # mixing any two brute medications will make Razorium
   impact: Medium
diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
index d06b7c1ce5..c32169051c 100644
--- a/Resources/Prototypes/Research/civilianservices.yml
+++ b/Resources/Prototypes/Research/civilianservices.yml
@@ -199,6 +199,7 @@
   cost: 4000
   recipeUnlocks:
   - PushHorn
+  - BorgModuleAdvancedClowning
 
 # Tier 3
 
diff --git a/Resources/Prototypes/Roles/Antags/changeling.yml b/Resources/Prototypes/Roles/Antags/changeling.yml
new file mode 100644
index 0000000000..3b19c993e6
--- /dev/null
+++ b/Resources/Prototypes/Roles/Antags/changeling.yml
@@ -0,0 +1,6 @@
+- type: antag
+  id: Changeling
+  name: roles-antag-changeling-name
+  antagonist: true
+  setPreference: false # TODO: set this to true once Changeling exits WIP status
+  objective: roles-antag-changeling-objective
diff --git a/Resources/Prototypes/Roles/MindRoles/mind_roles.yml b/Resources/Prototypes/Roles/MindRoles/mind_roles.yml
index 79223ed67d..95d49c1b83 100644
--- a/Resources/Prototypes/Roles/MindRoles/mind_roles.yml
+++ b/Resources/Prototypes/Roles/MindRoles/mind_roles.yml
@@ -307,3 +307,16 @@
     exclusiveAntag: true
     subtype: role-subtype-zombie
   - type: ZombieRole
+
+# Changeling
+- type: entity
+  parent: BaseMindRoleAntag
+  id: MindRoleChangeling
+  name: Changeling Role
+  components:
+  - type: MindRole
+    antagPrototype: Changeling
+    exclusiveAntag: true
+    roleType: SoloAntagonist
+    subtype: role-subtype-changeling
+  - type: ChangelingRole
diff --git a/Resources/Prototypes/SoundCollections/changeling.yml b/Resources/Prototypes/SoundCollections/changeling.yml
new file mode 100644
index 0000000000..4edb07dc16
--- /dev/null
+++ b/Resources/Prototypes/SoundCollections/changeling.yml
@@ -0,0 +1,14 @@
+- type: soundCollection
+  id: ChangelingDevourConsume
+  files:
+  - /Audio/Effects/Changeling/devour_consume.ogg
+
+- type: soundCollection
+  id: ChangelingDevourWindup
+  files:
+  - /Audio/Effects/Changeling/devour_windup.ogg
+
+- type: soundCollection
+  id: ChangelingTransformAttempt
+  files:
+  - /Audio/Effects/Changeling/changeling_transform.ogg
diff --git a/Resources/Prototypes/SoundCollections/emotes.yml b/Resources/Prototypes/SoundCollections/emotes.yml
index 0762c68cff..6d50120110 100644
--- a/Resources/Prototypes/SoundCollections/emotes.yml
+++ b/Resources/Prototypes/SoundCollections/emotes.yml
@@ -103,6 +103,11 @@
   files:
   - /Audio/Items/Toys/hew.ogg
 
+- type: soundCollection
+  id: XenoborgScream
+  files:
+  - /Audio/Voice/Xenoborg/xenoborg_scream.ogg
+
 - type: soundCollection
   id: XenoborgLaugh
   files:
diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml
index 0edd18d3ff..ee2b1e0d5f 100644
--- a/Resources/Prototypes/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml
@@ -441,6 +441,8 @@
   params:
     variation: 0.05
   sounds:
+    Scream:
+      collection: XenoborgScream
     Laugh:
       collection: XenoborgLaugh
     Beep:
diff --git a/Resources/Prototypes/name_identifier_groups.yml b/Resources/Prototypes/name_identifier_groups.yml
index 9777e84243..1928e11281 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
@@ -29,6 +29,12 @@
   minValue: 1000
   maxValue: 9999
 
+- type: nameIdentifierGroup
+  id: Xenoborg
+  format: name-identifier-format-xenoborg
+  minValue: 1000
+  maxValue: 9999
+
 - type: nameIdentifierGroup
   id: StationAi
   format: name-identifier-format-station-ai
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 24e21742c3..5d34f0f30c 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -1199,6 +1199,9 @@
 - type: Tag
   id: RollingPin
 
+- type: Tag
+  id: Ruminant
+
 - type: Tag
   id: SaltShaker
 
diff --git a/Resources/ServerInfo/Guidebook/Security/Defusal.xml b/Resources/ServerInfo/Guidebook/Security/Defusal.xml
index 8ebd71a346..4d6880d0b8 100644
--- a/Resources/ServerInfo/Guidebook/Security/Defusal.xml
+++ b/Resources/ServerInfo/Guidebook/Security/Defusal.xml
@@ -29,7 +29,7 @@
   To arm a bomb, you can either [color=yellow]right click[/color] and click [color=yellow]Begin countdown[/click], or [color=yellow]alt-click[/color] the bomb. It will begin beeping.
 
   ## Time
-  A bomb has a limited time, at a minimum of [protodata="SyndicateBomb" comp="OnUseTimerTrigger" member="ShortestDelayOption"/] seconds and a maximum of [protodata="SyndicateBomb" comp="OnUseTimerTrigger" member="LongestDelayOption"/] seconds. You can view the timer by examining it, unless the Proceed wire is cut. Once the timer hits zero, the bomb will detonate.
+  A bomb has a limited time, at a minimum of [protodata="SyndicateBomb" comp="TimerTrigger" member="ShortestDelayOption"/] seconds and a maximum of [protodata="SyndicateBomb" comp="TimerTrigger" member="LongestDelayOption"/] seconds. You can view the timer by examining it, unless the Proceed wire is cut. Once the timer hits zero, the bomb will detonate.
 
   ## Bolts
   By default, once armed, a bomb will bolt itself to the ground. You must find the BOLT wire and cut it to disable the bolts, after which you can unwrench it and throw it into space.
diff --git a/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/equipped-HELMET-vox.png
new file mode 100644
index 0000000000..c335b6bbdc
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..0ff496c88e
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/icon.png
new file mode 100644
index 0000000000..adf3c2807a
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/meta.json
new file mode 100644
index 0000000000..6027df662b
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Helmets/card_helmet.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+	"version": 1,
+	"license": "CC-BY-SA-3.0",
+	"copyright": "Sprites by TaoNewt (github)",
+	"size": {
+		"x": 32,
+		"y": 32
+	},
+	"states": [
+		{
+		"name": "icon"
+		},
+		{
+		"name": "equipped-HELMET",
+		"directions": 4
+		},
+		{
+		"name": "equipped-HELMET-vox",
+		"directions": 4
+		}
+	]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..a0d570b468
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..4605c87ea4
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/icon.png
new file mode 100644
index 0000000000..2fac5a732e
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/meta.json
new file mode 100644
index 0000000000..85b68f67c8
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Armor/card_armour.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites by TaoNewt (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-vox",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Effects/crayondecals.rsi/Sleeping Carp.png b/Resources/Textures/Effects/crayondecals.rsi/SleepingCarp.png
similarity index 100%
rename from Resources/Textures/Effects/crayondecals.rsi/Sleeping Carp.png
rename to Resources/Textures/Effects/crayondecals.rsi/SleepingCarp.png
diff --git a/Resources/Textures/Effects/crayondecals.rsi/meta.json b/Resources/Textures/Effects/crayondecals.rsi/meta.json
index eb33bb4909..b76fec05bf 100644
--- a/Resources/Textures/Effects/crayondecals.rsi/meta.json
+++ b/Resources/Textures/Effects/crayondecals.rsi/meta.json
@@ -108,7 +108,7 @@
 
         },
         {
-            "name": "Sleeping Carp"
+            "name": "SleepingCarp"
 
         },
         {
diff --git a/Resources/Textures/Interface/Actions/actions_borg.rsi/adv-clowning-module.png b/Resources/Textures/Interface/Actions/actions_borg.rsi/adv-clowning-module.png
new file mode 100644
index 0000000000..3f546f2adb
Binary files /dev/null and b/Resources/Textures/Interface/Actions/actions_borg.rsi/adv-clowning-module.png differ
diff --git a/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json b/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
index fde2ab63a6..ac631e0294 100644
--- a/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
+++ b/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/cdbcb1e858b11f083994a7a269ed67ef5b452ce9, Module actions by Scarky0. chem, adv-chem, and adv-mining by mubururu_, xenoborg actions by Samuka-C (github)",
+    "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/cdbcb1e858b11f083994a7a269ed67ef5b452ce9, Module actions by Scarky0. chem, adv-chem, and adv-mining by mubururu_, xenoborg actions by Samuka-C (github), advclown by ThatGuyUSA",
     "size": {
         "x": 32,
         "y": 32
@@ -97,6 +97,9 @@
         {
             "name":"clowning-module"
         },
+        {
+            "name":"adv-clowning-module"
+        },
         {
             "name":"syndicate-weapon-module"
         },
@@ -124,6 +127,9 @@
         {
             "name":"xenoborg-eye-module"
         },
+        {
+            "name":"xenoborg-eye2-module"
+        },
         {
             "name":"xenoborg-hypo-module"
         },
diff --git a/Resources/Textures/Interface/Actions/actions_borg.rsi/xenoborg-eye2-module.png b/Resources/Textures/Interface/Actions/actions_borg.rsi/xenoborg-eye2-module.png
new file mode 100644
index 0000000000..8011403508
Binary files /dev/null and b/Resources/Textures/Interface/Actions/actions_borg.rsi/xenoborg-eye2-module.png differ
diff --git a/Resources/Textures/Interface/Actions/changeling.rsi/devour.png b/Resources/Textures/Interface/Actions/changeling.rsi/devour.png
new file mode 100644
index 0000000000..f5acc7dcee
Binary files /dev/null and b/Resources/Textures/Interface/Actions/changeling.rsi/devour.png differ
diff --git a/Resources/Textures/Interface/Actions/changeling.rsi/devour_on.png b/Resources/Textures/Interface/Actions/changeling.rsi/devour_on.png
new file mode 100644
index 0000000000..65d63eb250
Binary files /dev/null and b/Resources/Textures/Interface/Actions/changeling.rsi/devour_on.png differ
diff --git a/Resources/Textures/Interface/Actions/changeling.rsi/meta.json b/Resources/Textures/Interface/Actions/changeling.rsi/meta.json
index babe776612..20c9ed1720 100644
--- a/Resources/Textures/Interface/Actions/changeling.rsi/meta.json
+++ b/Resources/Textures/Interface/Actions/changeling.rsi/meta.json
@@ -7,6 +7,15 @@
         "y": 32
     },
     "states": [
+        {
+            "name": "transform"
+        },
+        {
+            "name": "devour"
+        },
+        {
+            "name": "devour_on"
+        },
         {
             "name": "armblade"
         }
diff --git a/Resources/Textures/Interface/Actions/changeling.rsi/transform.png b/Resources/Textures/Interface/Actions/changeling.rsi/transform.png
new file mode 100644
index 0000000000..6657790012
Binary files /dev/null and b/Resources/Textures/Interface/Actions/changeling.rsi/transform.png differ
diff --git a/Resources/Textures/Interface/Alerts/shuttle.rsi/meta.json b/Resources/Textures/Interface/Alerts/shuttle.rsi/meta.json
new file mode 100644
index 0000000000..e806b9afdc
--- /dev/null
+++ b/Resources/Textures/Interface/Alerts/shuttle.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "not sure",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+          "name": "piloting"
+        }
+      ]
+}
diff --git a/Resources/Textures/Interface/Alerts/piloting.png b/Resources/Textures/Interface/Alerts/shuttle.rsi/piloting.png
similarity index 100%
rename from Resources/Textures/Interface/Alerts/piloting.png
rename to Resources/Textures/Interface/Alerts/shuttle.rsi/piloting.png
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/QuarterMaster.png b/Resources/Textures/Interface/Misc/job_icons.rsi/QuarterMaster.png
index 2e2e6fdcd6..07a5f1619f 100644
Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/QuarterMaster.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/QuarterMaster.png differ
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
index 8dd3bacec6..2578a6c254 100644
--- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
+++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github) | paradoxClone taken from tg station at commit https://github.com/tgstation/tgstation/commit/d0db1ff267557017ae7bde68e6490e70cbb6e42f and modifed by slarticodefast (Github) | Boxer, Chaplain, Janitor, Lawyer, Librarian recoloured by K-Dynamic (github) | Cluwne icon by Professor Renderer (Discord)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github) | paradoxClone taken from tg station at commit https://github.com/tgstation/tgstation/commit/d0db1ff267557017ae7bde68e6490e70cbb6e42f and modifed by slarticodefast (Github) | Boxer, Chaplain, Janitor, Lawyer, Librarian recoloured by K-Dynamic (github) | Cluwne icon by Professor Renderer (Discord) | QuarterMaster modified by K-Dynamic (github)",
     "size": {
         "x": 8,
         "y": 8
diff --git a/Resources/Textures/Mobs/Silicon/mothership_core.rsi/core-active.png b/Resources/Textures/Mobs/Silicon/mothership_core.rsi/core-active.png
new file mode 100644
index 0000000000..1b64de18a2
Binary files /dev/null and b/Resources/Textures/Mobs/Silicon/mothership_core.rsi/core-active.png differ
diff --git a/Resources/Textures/Mobs/Silicon/mothership_core.rsi/core-idle.png b/Resources/Textures/Mobs/Silicon/mothership_core.rsi/core-idle.png
new file mode 100644
index 0000000000..5cafcef584
Binary files /dev/null and b/Resources/Textures/Mobs/Silicon/mothership_core.rsi/core-idle.png differ
diff --git a/Resources/Textures/Mobs/Silicon/mothership_core.rsi/core-load.png b/Resources/Textures/Mobs/Silicon/mothership_core.rsi/core-load.png
new file mode 100644
index 0000000000..138e9eebcf
Binary files /dev/null and b/Resources/Textures/Mobs/Silicon/mothership_core.rsi/core-load.png differ
diff --git a/Resources/Textures/Mobs/Silicon/mothership_core.rsi/core-o.png b/Resources/Textures/Mobs/Silicon/mothership_core.rsi/core-o.png
new file mode 100644
index 0000000000..439b25217f
Binary files /dev/null and b/Resources/Textures/Mobs/Silicon/mothership_core.rsi/core-o.png differ
diff --git a/Resources/Textures/Mobs/Silicon/mothership_core.rsi/meta.json b/Resources/Textures/Mobs/Silicon/mothership_core.rsi/meta.json
new file mode 100644
index 0000000000..0f8bb69530
--- /dev/null
+++ b/Resources/Textures/Mobs/Silicon/mothership_core.rsi/meta.json
@@ -0,0 +1,199 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by Samuka",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "core-active",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          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.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          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.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          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.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          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": "core-idle",
+      "directions": 4
+    },
+    {
+      "name": "core-o",
+      "directions": 4
+    },
+    {
+      "name": "core-load",
+      "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
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/hand_r.png b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/hand_r.png
index c10c6abe66..2988b27a54 100644
Binary files a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/hand_r.png and b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/hand_r.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/jumpsuit.png b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/jumpsuit.png
index 2c938634eb..18ce524dbb 100644
Binary files a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/jumpsuit.png and b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/jumpsuit.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json
index 0c910f85e5..e46ca56024 100644
--- a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json
+++ b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json
@@ -26,6 +26,10 @@
             "name": "head",
             "directions": 4
         },
+        {
+            "name": "neck",
+            "directions": 4
+        },
         {
             "name": "ears",
             "directions": 4
diff --git a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/neck.png b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/neck.png
new file mode 100644
index 0000000000..8783d770ea
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/neck.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/berry_delight.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/berry_delight.png
new file mode 100644
index 0000000000..765507a014
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/berry_delight.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/berry_delight_slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/berry_delight_slice.png
new file mode 100644
index 0000000000..51dd6aa1e8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/berry_delight_slice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-inhand-left.png
new file mode 100644
index 0000000000..623d36ba28
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-inhand-right.png
new file mode 100644
index 0000000000..117e4559b0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice-inhand-left.png
new file mode 100644
index 0000000000..db53efc5a9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice-inhand-right.png
new file mode 100644
index 0000000000..883083e177
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice.png
new file mode 100644
index 0000000000..dbcc9f262b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton.png
new file mode 100644
index 0000000000..eeee2e200a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json
index f54a9cfcc9..c8d773339d 100644
--- a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, inhands by mubururu_ (github)",
+    "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, inhands by mubururu_ (github), cotton cake sprites by DispenserG0inUp, berry delighht sprites by FairlySadPanda (Github)",
     "size": {
         "x": 32,
         "y": 32
@@ -308,6 +308,34 @@
         {
             "name": "lemoon-slice"
 
+        },
+		{
+            "name": "cotton"
+        },
+        {
+            "name": "cotton-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "cotton-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "cotton-slice"
+        },
+        {
+            "name": "cotton-slice-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "cotton-slice-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "berry_delight"
+        },
+        {
+            "name": "berry_delight_slice"
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Devices/Holoprojectors/peel.rsi/icon.png b/Resources/Textures/Objects/Devices/Holoprojectors/peel.rsi/icon.png
new file mode 100644
index 0000000000..193b35c603
Binary files /dev/null and b/Resources/Textures/Objects/Devices/Holoprojectors/peel.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Devices/Holoprojectors/peel.rsi/inhand-left.png b/Resources/Textures/Objects/Devices/Holoprojectors/peel.rsi/inhand-left.png
new file mode 100644
index 0000000000..3124ab63b2
Binary files /dev/null and b/Resources/Textures/Objects/Devices/Holoprojectors/peel.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Devices/Holoprojectors/peel.rsi/inhand-right.png b/Resources/Textures/Objects/Devices/Holoprojectors/peel.rsi/inhand-right.png
new file mode 100644
index 0000000000..1858c5a779
Binary files /dev/null and b/Resources/Textures/Objects/Devices/Holoprojectors/peel.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Devices/Holoprojectors/peel.rsi/meta.json b/Resources/Textures/Objects/Devices/Holoprojectors/peel.rsi/meta.json
new file mode 100644
index 0000000000..0ad72a5acd
--- /dev/null
+++ b/Resources/Textures/Objects/Devices/Holoprojectors/peel.rsi/meta.json
@@ -0,0 +1,82 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+     "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/f4017da82ae4de7bfaf8ebdbba33d0de81c15587, and resprited by ThatGuyUSA (github). Inhands by TiniestShark (github)",
+    "states": [
+        {
+            "name": "icon",
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ],
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.3
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Fun/card_sword.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Fun/card_sword.rsi/equipped-BACKPACK.png
new file mode 100644
index 0000000000..e7ae945d84
Binary files /dev/null and b/Resources/Textures/Objects/Fun/card_sword.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/Objects/Fun/card_sword.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Fun/card_sword.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..e7ae945d84
Binary files /dev/null and b/Resources/Textures/Objects/Fun/card_sword.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Fun/card_sword.rsi/icon.png b/Resources/Textures/Objects/Fun/card_sword.rsi/icon.png
new file mode 100644
index 0000000000..281d243a52
Binary files /dev/null and b/Resources/Textures/Objects/Fun/card_sword.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Fun/card_sword.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/card_sword.rsi/inhand-left.png
new file mode 100644
index 0000000000..b5dc4c4116
Binary files /dev/null and b/Resources/Textures/Objects/Fun/card_sword.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/card_sword.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/card_sword.rsi/inhand-right.png
new file mode 100644
index 0000000000..706e11ef32
Binary files /dev/null and b/Resources/Textures/Objects/Fun/card_sword.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Fun/card_sword.rsi/meta.json b/Resources/Textures/Objects/Fun/card_sword.rsi/meta.json
new file mode 100644
index 0000000000..dfbec476c3
--- /dev/null
+++ b/Resources/Textures/Objects/Fun/card_sword.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites by TaoNewt (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idquartermaster.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idquartermaster.png
index bfdd067872..e1fb5e5f62 100644
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idquartermaster.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idquartermaster.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
index 0a5a37d802..2c402c0282 100644
--- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/id_cards.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/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github), idvisitor by IProduceWidgets (Github), idintern-service by spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github), wizard and idwizard by ScarKy0 | idboxer and idlawyer recoloured by K-Dynamic (github).",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github), idvisitor by IProduceWidgets (Github), idintern-service by spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github), wizard and idwizard by ScarKy0 | idboxer and idlawyer recoloured by K-Dynamic (github) | idquartermaster modified by K-Dynamic (github)",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Misc/killtome.rsi/icon.png b/Resources/Textures/Objects/Misc/killtome.rsi/icon.png
deleted file mode 100644
index b3f5427ebe..0000000000
Binary files a/Resources/Textures/Objects/Misc/killtome.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Misc/killtome.rsi/meta.json b/Resources/Textures/Objects/Misc/killtome.rsi/meta.json
deleted file mode 100644
index b418b2056f..0000000000
--- a/Resources/Textures/Objects/Misc/killtome.rsi/meta.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "alexmactep",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-      {
-          "name": "icon"
-      }
-  ]
-}
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/dead.png
new file mode 100644
index 0000000000..eb068364b5
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/dead.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/harvest.png
new file mode 100644
index 0000000000..d02cb9ce15
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/harvest.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/meta.json
new file mode 100644
index 0000000000..79a691f5a6
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/meta.json
@@ -0,0 +1,43 @@
+{
+    "version": 1,
+    "license": "CC0-1.0",
+    "copyright": "Made by Thinbug for space station 14 :33",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "dead"
+        },
+        {
+            "name": "harvest"
+        },
+        {
+            "name": "produce"
+        },
+        {
+            "name": "produce-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "produce-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "seed"
+        },
+        {
+            "name": "stage-1"
+        },
+        {
+            "name": "stage-2"
+        },
+        {
+            "name": "stage-3"
+        },
+        {
+            "name": "stage-4"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/produce-inhand-left.png
new file mode 100644
index 0000000000..44094d23e4
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/produce-inhand-right.png
new file mode 100644
index 0000000000..d5955e0196
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/produce.png
new file mode 100644
index 0000000000..53cd9e2f9a
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/produce.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/seed.png
new file mode 100644
index 0000000000..c370b26cf5
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/seed.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/stage-1.png
new file mode 100644
index 0000000000..283c44be21
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/stage-1.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/stage-2.png
new file mode 100644
index 0000000000..5362406d00
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/stage-2.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/stage-3.png
new file mode 100644
index 0000000000..c4947b625c
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/stage-3.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/stage-4.png b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/stage-4.png
new file mode 100644
index 0000000000..9fa575c033
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/bloonion.rsi/stage-4.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-clown-adv.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-clown-adv.png
new file mode 100644
index 0000000000..fa925395f1
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-clown-adv.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-xenoborg-cloak2.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-xenoborg-cloak2.png
new file mode 100644
index 0000000000..77819e93e8
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-xenoborg-cloak2.png differ
diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
index 6819aedeba..ae64caaa15 100644
--- a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
@@ -37,6 +37,9 @@
         {
             "name": "icon-clown"
         },
+        {
+            "name": "icon-clown-adv"
+        },
         {
             "name": "icon-construction"
         },
@@ -115,6 +118,9 @@
         {
             "name": "icon-xenoborg-cloak"
         },
+        {
+            "name": "icon-xenoborg-cloak2"
+        },
         {
             "name": "icon-xenoborg-fire-extinguisher"
         },
@@ -174,10 +180,10 @@
         },
         {
             "name": "xenoborg_engi"
-        }, 
+        },
         {
             "name": "xenoborg_generic"
-        }, 
+        },
         {
             "name": "xenoborg_heavy"
         },
diff --git a/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/activated.png b/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/activated.png
index 07785ce832..81815fa4e7 100644
Binary files a/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/activated.png and b/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/activated.png differ
diff --git a/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/icon.png b/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/icon.png
index 426106d046..1856cc3fe5 100644
Binary files a/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/meta.json b/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/meta.json
index 664e16d42c..5a890d67d5 100644
--- a/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/meta.json
@@ -1,23 +1,23 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "icon from potato.rsi & modified activated by Prole0 (GitHub)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "activated",
-      "delays": [
-        [
-          0.1,
-          0.1
-        ]
-      ]
-    }
-  ]
-}
\ No newline at end of file
+    "states": [
+        {
+      "name": "icon"
+        },
+        {
+            "name": "activated",
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json
index 6eb88a0dff..d22ea9b629 100644
--- a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-NC-SA-3.0",
-  "copyright": "Taken from goonstation and modified by Swept at commit https://github.com/goonstation/goonstation/pull/3555/commits/b24eb6260647c0fcfe858268a26b6160bc50017a, wielded version by Easypoll",
+  "copyright": "Taken from goonstation and modified by Swept at commit https://github.com/goonstation/goonstation/pull/3555/commits/b24eb6260647c0fcfe858268a26b6160bc50017a, wielded version by Easypoll, vertical icon sprite by TiniestShark",
   "size": {
       "x": 32,
       "y": 32
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+     {
+      "name": "storage"
+     },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/storage.png b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/storage.png
new file mode 100644
index 0000000000..eac5bb8b4d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/baseball_bat.rsi/storage.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/meta.json
index 5b19648740..d435ae235f 100644
--- a/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-NC-SA-3.0",
-    "copyright": "Taken from goonstation and modified by Swept at commit https://github.com/goonstation/goonstation/pull/3555/commits/b24eb6260647c0fcfe858268a26b6160bc50017a, modified into incomplete version by Vermidia, in-hands by SeamLesss (GitHub)",
+    "copyright": "Taken from goonstation and modified by Swept at commit https://github.com/goonstation/goonstation/pull/3555/commits/b24eb6260647c0fcfe858268a26b6160bc50017a, modified into incomplete version by Vermidia, in-hands by SeamLesss (GitHub), vertical icon sprite by TiniestShark",
     "size": {
         "x": 32,
         "y": 32
@@ -10,6 +10,9 @@
         {
             "name": "icon"
         },
+        {
+            "name": "storage"
+        },
         {
             "name": "inhand-left",
             "directions": 4
diff --git a/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/storage.png b/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/storage.png
new file mode 100644
index 0000000000..6148f3943e
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/storage.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/icon.png
new file mode 100644
index 0000000000..de4d7464b3
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/inhand-left.png
new file mode 100644
index 0000000000..1b40dcead8
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/inhand-right.png
new file mode 100644
index 0000000000..5cb35c758f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/meta.json
new file mode 100644
index 0000000000..374d6f5ef4
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by TrixxedHeart",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/wielded-inhand-left.png
new file mode 100644
index 0000000000..3d344d5a7a
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/wielded-inhand-right.png
new file mode 100644
index 0000000000..0225536fcf
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/clown.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/icon.png
new file mode 100644
index 0000000000..3ec82b7eba
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/inhand-left.png
new file mode 100644
index 0000000000..5dc2b7a9dc
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/inhand-right.png
new file mode 100644
index 0000000000..8167b11d60
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/meta.json
new file mode 100644
index 0000000000..374d6f5ef4
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by TrixxedHeart",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/wielded-inhand-left.png
new file mode 100644
index 0000000000..ac06155cf4
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/wielded-inhand-right.png
new file mode 100644
index 0000000000..97746848d3
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/mime.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/icon.png
new file mode 100644
index 0000000000..6b72ff66f0
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/inhand-left.png
new file mode 100644
index 0000000000..aebfbf90e1
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/inhand-right.png
new file mode 100644
index 0000000000..285aa5541a
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/meta.json
new file mode 100644
index 0000000000..374d6f5ef4
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by TrixxedHeart",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/wielded-inhand-left.png
new file mode 100644
index 0000000000..2bec441eb6
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/wielded-inhand-right.png
new file mode 100644
index 0000000000..069f7b670c
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/nanotrasen.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/icon.png
new file mode 100644
index 0000000000..2b989d4377
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/inhand-left.png
new file mode 100644
index 0000000000..37c5475b2a
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/inhand-right.png
new file mode 100644
index 0000000000..85141438af
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/meta.json
new file mode 100644
index 0000000000..374d6f5ef4
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by TrixxedHeart",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/wielded-inhand-left.png
new file mode 100644
index 0000000000..0e2843d85b
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/wielded-inhand-right.png
new file mode 100644
index 0000000000..18929e8323
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/standard.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/icon.png
new file mode 100644
index 0000000000..abb71c7476
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/inhand-left.png
new file mode 100644
index 0000000000..4a6f784d2d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/inhand-right.png
new file mode 100644
index 0000000000..7388db8476
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/meta.json
new file mode 100644
index 0000000000..8bfbd3140d
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by TrixxedHeart, inspiration from ps3moira#9488 on discord",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/wielded-inhand-left.png
new file mode 100644
index 0000000000..c7cd397457
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/wielded-inhand-right.png
new file mode 100644
index 0000000000..1fbea1b96d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/offset_canes/wood.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/shields.rsi/cardshield-icon.png b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/cardshield-icon.png
new file mode 100644
index 0000000000..f73eb51293
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/cardshield-icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/shields.rsi/cardshield-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/cardshield-inhand-left.png
new file mode 100644
index 0000000000..bed0d999c0
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/cardshield-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/shields.rsi/cardshield-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/cardshield-inhand-right.png
new file mode 100644
index 0000000000..06c7c32cc4
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/cardshield-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/shields.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/meta.json
index 2d2663c158..307cb4bb4a 100644
--- a/Resources/Textures/Objects/Weapons/Melee/shields.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13/commit/84223c65f5caf667a84f3c0f49bc2a41cdc6c4e3",
+  "copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13/commit/84223c65f5caf667a84f3c0f49bc2a41cdc6c4e3, card shield sprites by TaoNewt (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -51,6 +51,18 @@
       "name": "ratvarian-inhand-left",
       "directions": 4
     },
+    {
+      "name": "cardshield-icon"
+    },
+    {
+      "name": "cardshield-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "cardshield-inhand-left",
+      "directions": 4
+    },
+
     {
       "name": "mirror-icon",
       "delays": [
diff --git a/Resources/Textures/Parallaxes/attributions.yml b/Resources/Textures/Parallaxes/attributions.yml
index f980eafaec..ec4b2d8e05 100644
--- a/Resources/Textures/Parallaxes/attributions.yml
+++ b/Resources/Textures/Parallaxes/attributions.yml
@@ -3,7 +3,7 @@
   copyright: "by Adipemdragon for tgstation, taken at commit 3839e860a7f3102b1488285d3319f61bbfe1fa51 from parallax.dmi"
   source: "https://github.com/tgstation/tgstation"
 
-- files: ["KettleParallaxNeb.png", "KettleParallaxBG.png", "AspidParallaxBG.png", "AspidParallaxBG.png"]
+- files: ["KettleParallaxNeb.png", "KettleParallaxBG.png", "AspidParallaxBG.png", "AspidParallaxBG.png", "purple_nebula.png"]
   license: "CC0-1.0"
   copyright: "adapted from Screaming Brain Studios"
   source: "https://opengameart.org/content/seamless-space-backgrounds"
diff --git a/Resources/Textures/Parallaxes/purple_nebula.png b/Resources/Textures/Parallaxes/purple_nebula.png
new file mode 100644
index 0000000000..f4d187b7a1
Binary files /dev/null and b/Resources/Textures/Parallaxes/purple_nebula.png differ
diff --git a/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/closed.png b/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/closed.png
new file mode 100644
index 0000000000..442e1df8b6
Binary files /dev/null and b/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/closing.png b/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/closing.png
new file mode 100644
index 0000000000..bc769ff0df
Binary files /dev/null and b/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/closing.png differ
diff --git a/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/meta.json b/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/meta.json
new file mode 100644
index 0000000000..d50a2a8397
--- /dev/null
+++ b/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/meta.json
@@ -0,0 +1,57 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites by TaoNewt (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "closed",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "closing",
+            "directions": 1,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "open",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "opening",
+            "directions": 1,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/open.png b/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/open.png
new file mode 100644
index 0000000000..c773a61cd1
Binary files /dev/null and b/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/opening.png b/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/opening.png
new file mode 100644
index 0000000000..c26d93225e
Binary files /dev/null and b/Resources/Textures/Structures/Doors/MineralDoors/card_door.rsi/opening.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_0.png b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_0.png
new file mode 100644
index 0000000000..f165ae6673
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_0.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_1.png b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_1.png
new file mode 100644
index 0000000000..842e29f0f3
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_1.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_2.png b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_2.png
new file mode 100644
index 0000000000..2975c479be
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_2.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_3.png b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_3.png
new file mode 100644
index 0000000000..842e29f0f3
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_3.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_4.png b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_4.png
new file mode 100644
index 0000000000..7ecec5ee70
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_4.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_5.png b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_5.png
new file mode 100644
index 0000000000..3fd87a6de3
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_5.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_6.png b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_6.png
new file mode 100644
index 0000000000..7ecec5ee70
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_6.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_7.png b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_7.png
new file mode 100644
index 0000000000..a6e84b4d43
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/carpet_7.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/full.png b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/full.png
new file mode 100644
index 0000000000..43fbf2fbe7
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/meta.json b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/meta.json
new file mode 100644
index 0000000000..b67903f65e
--- /dev/null
+++ b/Resources/Textures/Structures/Furniture/Carpets/card_carpet.rsi/meta.json
@@ -0,0 +1,46 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites by TaoNewt (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "full"
+        },
+        {
+            "name": "carpet_0",
+            "directions": 4
+        },
+        {
+            "name": "carpet_1",
+            "directions": 4
+        },
+        {
+            "name": "carpet_2",
+            "directions": 4
+        },
+        {
+            "name": "carpet_3",
+            "directions": 4
+        },
+        {
+            "name": "carpet_4",
+            "directions": 4
+        },
+        {
+            "name": "carpet_5",
+            "directions": 4
+        },
+        {
+            "name": "carpet_6",
+            "directions": 4
+        },
+        {
+            "name": "carpet_7",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Structures/Furniture/Tables/card.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/card.rsi/full.png
new file mode 100644
index 0000000000..dde5d4d9c7
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/card.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/card.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/card.rsi/meta.json
new file mode 100644
index 0000000000..1f73612ec2
--- /dev/null
+++ b/Resources/Textures/Structures/Furniture/Tables/card.rsi/meta.json
@@ -0,0 +1,163 @@
+{
+	"version": 1,
+	"size": {
+		"x": 32,
+		"y": 32
+	},
+	"license": "CC-BY-SA-3.0",
+	"copyright": "Sprites by TaoNewt (github)",
+	"states": [
+		{
+		"name": "full",
+		"delays": [
+			[
+			1
+			]
+		]
+		},
+		{
+		"name": "state_0",
+		"directions": 4,
+		"delays": [
+			[
+			1.0
+			],
+			[
+			1.0
+			],
+			[
+			1.0
+			],
+			[
+			1.0
+			]
+		]
+		},
+		{
+		"name": "state_1",
+		"directions": 4,
+		"delays": [
+			[
+			1.0
+			],
+			[
+			1.0
+			],
+			[
+			1.0
+			],
+			[
+			1.0
+			]
+		]
+		},
+		{
+		"name": "state_2",
+		"directions": 4,
+		"delays": [
+			[
+			1.0
+			],
+			[
+			1.0
+			],
+			[
+			1.0
+			],
+			[
+			1.0
+			]
+		]
+		},
+		{
+		"name": "state_3",
+		"directions": 4,
+		"delays": [
+			[
+			1.0
+			],
+			[
+			1.0
+			],
+			[
+			1.0
+			],
+			[
+			1.0
+			]
+		]
+		},
+		{
+		"name": "state_4",
+		"directions": 4,
+		"delays": [
+			[
+			1.0
+			],
+			[
+			1.0
+			],
+			[
+			1.0
+			],
+			[
+			1.0
+			]
+		]
+		},
+		{
+		"name": "state_5",
+		"directions": 4,
+		"delays": [
+			[
+			1.0
+			],
+			[
+			1.0
+			],
+			[
+			1.0
+			],
+			[
+			1.0
+			]
+		]
+		},
+		{
+		"name": "state_6",
+		"directions": 4,
+		"delays": [
+			[
+			1.0
+			],
+			[
+			1.0
+			],
+			[
+			1.0
+			],
+			[
+			1.0
+			]
+		]
+		},
+		{
+		"name": "state_7",
+		"directions": 4,
+		"delays": [
+			[
+			1.0
+			],
+			[
+			1.0
+			],
+			[
+			1.0
+			],
+			[
+			1.0
+			]
+		]
+		}
+	]
+}
diff --git a/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_0.png
new file mode 100644
index 0000000000..7234b73890
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_0.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_1.png
new file mode 100644
index 0000000000..f2f8df413b
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_1.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_2.png
new file mode 100644
index 0000000000..7234b73890
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_2.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_3.png
new file mode 100644
index 0000000000..42273c1071
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_3.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_4.png
new file mode 100644
index 0000000000..f280789f09
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_4.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_5.png
new file mode 100644
index 0000000000..b1fad514ec
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_5.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_6.png
new file mode 100644
index 0000000000..16cd343dfc
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_6.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_7.png
new file mode 100644
index 0000000000..1bdaad3abe
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/card.rsi/state_7.png differ
diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/card-stool.png b/Resources/Textures/Structures/Furniture/chairs.rsi/card-stool.png
new file mode 100644
index 0000000000..7e7ca14b74
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/chairs.rsi/card-stool.png differ
diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json b/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
index 435b686c72..1616f665c8 100644
--- a/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
+++ b/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
@@ -102,6 +102,10 @@
         {
             "name": "xeno-chair",
             "directions": 4
+        },
+        {
+            "name": "card-stool",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Structures/Holo/peel.rsi/icon.png b/Resources/Textures/Structures/Holo/peel.rsi/icon.png
new file mode 100644
index 0000000000..c3fc629126
Binary files /dev/null and b/Resources/Textures/Structures/Holo/peel.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Holo/peel.rsi/meta.json b/Resources/Textures/Structures/Holo/peel.rsi/meta.json
new file mode 100644
index 0000000000..d6d84c40e6
--- /dev/null
+++ b/Resources/Textures/Structures/Holo/peel.rsi/meta.json
@@ -0,0 +1,33 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by thatguyusa (discord) / ThatGuyUSA (github) for SS14",
+    "states": [
+        {
+            "name": "icon",
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Structures/Walls/card.rsi/card0.png b/Resources/Textures/Structures/Walls/card.rsi/card0.png
new file mode 100644
index 0000000000..aca7f7cc5d
Binary files /dev/null and b/Resources/Textures/Structures/Walls/card.rsi/card0.png differ
diff --git a/Resources/Textures/Structures/Walls/card.rsi/card1.png b/Resources/Textures/Structures/Walls/card.rsi/card1.png
new file mode 100644
index 0000000000..f0550405f6
Binary files /dev/null and b/Resources/Textures/Structures/Walls/card.rsi/card1.png differ
diff --git a/Resources/Textures/Structures/Walls/card.rsi/card2.png b/Resources/Textures/Structures/Walls/card.rsi/card2.png
new file mode 100644
index 0000000000..aca7f7cc5d
Binary files /dev/null and b/Resources/Textures/Structures/Walls/card.rsi/card2.png differ
diff --git a/Resources/Textures/Structures/Walls/card.rsi/card3.png b/Resources/Textures/Structures/Walls/card.rsi/card3.png
new file mode 100644
index 0000000000..e9760a8a0d
Binary files /dev/null and b/Resources/Textures/Structures/Walls/card.rsi/card3.png differ
diff --git a/Resources/Textures/Structures/Walls/card.rsi/card4.png b/Resources/Textures/Structures/Walls/card.rsi/card4.png
new file mode 100644
index 0000000000..a51edee25d
Binary files /dev/null and b/Resources/Textures/Structures/Walls/card.rsi/card4.png differ
diff --git a/Resources/Textures/Structures/Walls/card.rsi/card5.png b/Resources/Textures/Structures/Walls/card.rsi/card5.png
new file mode 100644
index 0000000000..6741c5e94e
Binary files /dev/null and b/Resources/Textures/Structures/Walls/card.rsi/card5.png differ
diff --git a/Resources/Textures/Structures/Walls/card.rsi/card6.png b/Resources/Textures/Structures/Walls/card.rsi/card6.png
new file mode 100644
index 0000000000..b26b5feb57
Binary files /dev/null and b/Resources/Textures/Structures/Walls/card.rsi/card6.png differ
diff --git a/Resources/Textures/Structures/Walls/card.rsi/card7.png b/Resources/Textures/Structures/Walls/card.rsi/card7.png
new file mode 100644
index 0000000000..c70786eabf
Binary files /dev/null and b/Resources/Textures/Structures/Walls/card.rsi/card7.png differ
diff --git a/Resources/Textures/Structures/Walls/card.rsi/full.png b/Resources/Textures/Structures/Walls/card.rsi/full.png
new file mode 100644
index 0000000000..6170c2a04a
Binary files /dev/null and b/Resources/Textures/Structures/Walls/card.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Walls/card.rsi/meta.json b/Resources/Textures/Structures/Walls/card.rsi/meta.json
new file mode 100644
index 0000000000..baafe2f140
--- /dev/null
+++ b/Resources/Textures/Structures/Walls/card.rsi/meta.json
@@ -0,0 +1,46 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprites by TaoNewt (github)",
+    "states": [
+        {
+        "name": "full"
+        },
+        {
+            "name": "card0",
+        "directions": 4
+        },
+        {
+            "name": "card1",
+        "directions": 4
+        },
+        {
+            "name": "card2",
+        "directions": 4
+        },
+        {
+            "name": "card3",
+        "directions": 4
+        },
+        {
+            "name": "card4",
+        "directions": 4
+        },
+        {
+            "name": "card5",
+        "directions": 4
+        },
+        {
+            "name": "card6",
+        "directions": 4
+        },
+        {
+            "name": "card7",
+        "directions": 4
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/full.png b/Resources/Textures/Structures/Walls/xeno.rsi/full.png
index 87736f62bb..6f3b32380a 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/full.png and b/Resources/Textures/Structures/Walls/xeno.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-0.png b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-0.png
index 855fd627d1..06dbdbda78 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-0.png and b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-0.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-1.png b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-1.png
index 30e7761524..c0bb43fe4a 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-1.png and b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-1.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-2.png b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-2.png
index 15d5260504..9335eeb3fc 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-2.png and b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-2.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-3.png b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-3.png
index 45695889c1..ee7d6d9e65 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-3.png and b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-3.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-4.png b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-4.png
index efff8fb7c5..ea58ac1b24 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-4.png and b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-4.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-5.png b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-5.png
index a0bd36488c..04f2e5c0d1 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-5.png and b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_construct-5.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over0.png b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over0.png
index bc67f6f320..62fd651b98 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over0.png and b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over0.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over1.png b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over1.png
index 9360115ce3..65e38b0e10 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over1.png and b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over1.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over2.png b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over2.png
index f305f6e313..8ea18b0250 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over2.png and b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over2.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over3.png b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over3.png
index 2cadcc167b..1bb8b234b0 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over3.png and b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over3.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over4.png b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over4.png
index 80c1ebdd06..d574d331e5 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over4.png and b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over4.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over5.png b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over5.png
index d82867b21d..fcbf410d52 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over5.png and b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over5.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over6.png b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over6.png
index 5abb5b7277..64ea9dbfe4 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over6.png and b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over6.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over7.png b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over7.png
index 8f744092f8..a5f75d2d8c 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over7.png and b/Resources/Textures/Structures/Walls/xeno.rsi/reinf_over7.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/rgeneric.png b/Resources/Textures/Structures/Walls/xeno.rsi/rgeneric.png
index dfce6981eb..40a317c7cd 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/rgeneric.png and b/Resources/Textures/Structures/Walls/xeno.rsi/rgeneric.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/solid0.png b/Resources/Textures/Structures/Walls/xeno.rsi/solid0.png
index c0f433f215..26fde39dde 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/solid0.png and b/Resources/Textures/Structures/Walls/xeno.rsi/solid0.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/solid1.png b/Resources/Textures/Structures/Walls/xeno.rsi/solid1.png
index f8a199e6c7..9aa5ad8aa1 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/solid1.png and b/Resources/Textures/Structures/Walls/xeno.rsi/solid1.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/solid2.png b/Resources/Textures/Structures/Walls/xeno.rsi/solid2.png
index c0f433f215..c65fb281e0 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/solid2.png and b/Resources/Textures/Structures/Walls/xeno.rsi/solid2.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/solid3.png b/Resources/Textures/Structures/Walls/xeno.rsi/solid3.png
index 183ee85ff3..3c930e3744 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/solid3.png and b/Resources/Textures/Structures/Walls/xeno.rsi/solid3.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/solid4.png b/Resources/Textures/Structures/Walls/xeno.rsi/solid4.png
index da4032a78b..4398cd511e 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/solid4.png and b/Resources/Textures/Structures/Walls/xeno.rsi/solid4.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/solid5.png b/Resources/Textures/Structures/Walls/xeno.rsi/solid5.png
index 7f1139ebb9..72a0dcfd93 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/solid5.png and b/Resources/Textures/Structures/Walls/xeno.rsi/solid5.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/solid6.png b/Resources/Textures/Structures/Walls/xeno.rsi/solid6.png
index da4032a78b..dcafcbed38 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/solid6.png and b/Resources/Textures/Structures/Walls/xeno.rsi/solid6.png differ
diff --git a/Resources/Textures/Structures/Walls/xeno.rsi/solid7.png b/Resources/Textures/Structures/Walls/xeno.rsi/solid7.png
index db071a86bb..e5552dbf2c 100644
Binary files a/Resources/Textures/Structures/Walls/xeno.rsi/solid7.png and b/Resources/Textures/Structures/Walls/xeno.rsi/solid7.png differ
diff --git a/Resources/Textures/Tiles/Planet/dirt.rsi/meta.json b/Resources/Textures/Tiles/Planet/dirt.rsi/meta.json
index 57ea3f50a5..dc93307bc3 100644
--- a/Resources/Textures/Tiles/Planet/dirt.rsi/meta.json
+++ b/Resources/Textures/Tiles/Planet/dirt.rsi/meta.json
@@ -6,6 +6,7 @@
     "x": 32,
     "y": 32
   },
+  "rsic": false,
   "states": [
     {
       "name": "dirt"
diff --git a/Resources/Textures/Tiles/xeno_flooring.png b/Resources/Textures/Tiles/xeno_flooring.png
index 89bf169d7a..334376c4ae 100644
Binary files a/Resources/Textures/Tiles/xeno_flooring.png and b/Resources/Textures/Tiles/xeno_flooring.png differ
diff --git a/Resources/Textures/Tiles/xeno_steel.png b/Resources/Textures/Tiles/xeno_steel.png
index 37e5c829d6..9777ad598d 100644
Binary files a/Resources/Textures/Tiles/xeno_steel.png and b/Resources/Textures/Tiles/xeno_steel.png differ
diff --git a/Resources/Textures/Tiles/xeno_steel_corner.png b/Resources/Textures/Tiles/xeno_steel_corner.png
index 7a8ee1fb2c..dfe147ebec 100644
Binary files a/Resources/Textures/Tiles/xeno_steel_corner.png and b/Resources/Textures/Tiles/xeno_steel_corner.png differ
diff --git a/Resources/engineCommandPerms.yml b/Resources/engineCommandPerms.yml
index a41e945615..5af33603f9 100644
--- a/Resources/engineCommandPerms.yml
+++ b/Resources/engineCommandPerms.yml
@@ -8,7 +8,6 @@
   - vvread
   - vvwrite
   - vvinvoke
-  - scale
   - spin
 
 - Flags: DEBUG
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 78d9959c57..5f1077da01 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -700,3 +700,6 @@ BarSignWhiskeyEchoesAlignTile: BarSignWhiskeyEchoes
 
 # 2025-06-21
 ClothingNeckHeadphones: ClothingMultipleHeadphones
+
+# 2025-08-01
+FoodDonutJellySlugcat: FoodDonutJellyScurret
diff --git a/RobustToolbox b/RobustToolbox
index 51c929c8ec..a1cdd60602 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 51c929c8ecb08e84aa695012dabc0b25bd71b8ca
+Subproject commit a1cdd60602e44e5fa1130cb3982133c24a4f8760