diff --git a/.github/labeler.yml b/.github/labeler.yml
index 694c83b602..eb01eeecc4 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,4 +1,7 @@
-"Changes: C#":
+"Changes: Audio":
+  - "**/*.ogg"
+ 
+"Changes: C#":
   - "**/*.cs"
 
 "Changes: Config":
diff --git a/.github/workflows/build-docfx.yml b/.github/workflows/build-docfx.yml
index ca1a6f0af1..d37e37026d 100644
--- a/.github/workflows/build-docfx.yml
+++ b/.github/workflows/build-docfx.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 8.0.100
 
     - name: Install dependencies
       run: dotnet restore
diff --git a/.github/workflows/build-map-renderer.yml b/.github/workflows/build-map-renderer.yml
index 45c807b362..c1790feadb 100644
--- a/.github/workflows/build-map-renderer.yml
+++ b/.github/workflows/build-map-renderer.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v3.2.0
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 8.0.100
 
       - name: Install dependencies
         run: dotnet restore
diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml
index c3b766f8de..bb0624e3ba 100644
--- a/.github/workflows/build-test-debug.yml
+++ b/.github/workflows/build-test-debug.yml
@@ -36,7 +36,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 8.0.100
 
     - name: Install dependencies
       run: dotnet restore
diff --git a/.github/workflows/close-master-pr.yml b/.github/workflows/close-master-pr.yml
index 66843d35dd..a74e838099 100644
--- a/.github/workflows/close-master-pr.yml
+++ b/.github/workflows/close-master-pr.yml
@@ -1,4 +1,4 @@
-name: Close PR's on master
+name: Close PRs on master
 
 on:
   pull_request_target:
@@ -12,7 +12,7 @@ jobs:
     steps:    
     - uses: superbrothers/close-pull-request@v3
       with:
-        comment: "Thank you for contributing to the Space Station 14 repository. Unfortunately, it looks like you submitted your pull request from the master branch. We suggest you follow [our git usage documentation](https://docs.spacestation14.com/en/general-development/setup/git-for-the-ss14-developer.html) \n\n You can move your current work from the master branch to another branch by doing `git branch <branch_name` and resetting the master branch."
+        comment: "Thank you for contributing to our repository. Unfortunately, it looks like you submitted your pull request from the master branch. We suggest you follow [the git usage documentation](https://docs.spacestation14.com/en/general-development/setup/git-for-the-ss14-developer.html). \n\n You can move your current work from the master branch to another branch by [branching](https://git-scm.com/docs/git-branch) from and [resetting](https://git-scm.com/docs/git-reset) the master branch."
 
     # If you prefer to just comment on the pr and not close it, uncomment the bellow and comment the above
       
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 74a975be5c..177e6a0fe6 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -22,7 +22,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 8.0.100
 
     - name: Get Engine Tag
       run: |
diff --git a/.github/workflows/test-packaging.yml b/.github/workflows/test-packaging.yml
index b35a609220..27cf5d2d7b 100644
--- a/.github/workflows/test-packaging.yml
+++ b/.github/workflows/test-packaging.yml
@@ -51,7 +51,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v3.2.0
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 8.0.100
 
       - name: Install dependencies
         run: dotnet restore
diff --git a/.github/workflows/yaml-linter.yml b/.github/workflows/yaml-linter.yml
index f60945ae7c..8660ccc040 100644
--- a/.github/workflows/yaml-linter.yml
+++ b/.github/workflows/yaml-linter.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v3.2.0
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 8.0.100
       - name: Install dependencies
         run: dotnet restore
       - name: Build
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 83bca6f97b..737b90563e 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,6 +1,12 @@
 {
     "recommendations": [
         "ms-dotnettools.csharp",
-        "editorconfig.editorconfig"
+        "editorconfig.editorconfig",
+        "aaron-bond.better-comments",
+        "tamasfe.even-better-toml",
+        "slava0135.robust-yaml",
+        "slevesque.shader",
+        "macabeus.vscode-fluent",
+        "redhat.vscode-yaml"
     ]
 }
diff --git a/Content.Client/Actions/ActionsSystem.cs b/Content.Client/Actions/ActionsSystem.cs
index 31d092b25d..b992e77256 100644
--- a/Content.Client/Actions/ActionsSystem.cs
+++ b/Content.Client/Actions/ActionsSystem.cs
@@ -95,6 +95,7 @@ private void BaseHandleState<T>(EntityUid uid, BaseActionComponent component, Ba
             component.Container = EnsureEntity<T>(state.Container, uid);
             component.EntityIcon = EnsureEntity<T>(state.EntityIcon, uid);
             component.CheckCanInteract = state.CheckCanInteract;
+            component.CheckConsciousness = state.CheckConsciousness;
             component.ClientExclusive = state.ClientExclusive;
             component.Priority = state.Priority;
             component.AttachedEntity = EnsureEntity<T>(state.AttachedEntity, uid);
diff --git a/Content.Client/Administration/UI/AdminRemarks/AdminMessageEui.cs b/Content.Client/Administration/UI/AdminRemarks/AdminMessageEui.cs
index 06eace118d..502c56a5a6 100644
--- a/Content.Client/Administration/UI/AdminRemarks/AdminMessageEui.cs
+++ b/Content.Client/Administration/UI/AdminRemarks/AdminMessageEui.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Administration.Notes;
 using Content.Shared.Eui;
 using JetBrains.Annotations;
+using Robust.Client.UserInterface.Controls;
 using static Content.Shared.Administration.Notes.AdminMessageEuiMsg;
 
 namespace Content.Client.Administration.UI.AdminRemarks;
@@ -14,9 +15,8 @@ public sealed class AdminMessageEui : BaseEui
     public AdminMessageEui()
     {
         _popup = new AdminMessagePopupWindow();
-        _popup.OnAcceptPressed += () => SendMessage(new Accept());
-        _popup.OnDismissPressed += () => SendMessage(new Dismiss());
-        _popup.OnClose += () => SendMessage(new CloseEuiMessage());
+        _popup.OnAcceptPressed += () => SendMessage(new Dismiss(true));
+        _popup.OnDismissPressed += () => SendMessage(new Dismiss(false));
     }
 
     public override void HandleState(EuiStateBase state)
@@ -26,13 +26,17 @@ public override void HandleState(EuiStateBase state)
             return;
         }
 
-        _popup.SetMessage(s.Message);
-        _popup.SetDetails(s.AdminName, s.AddedOn);
-        _popup.Timer = s.Time;
+        _popup.SetState(s);
     }
 
     public override void Opened()
     {
-        _popup.OpenCentered();
+        _popup.UserInterfaceManager.WindowRoot.AddChild(_popup);
+        LayoutContainer.SetAnchorPreset(_popup, LayoutContainer.LayoutPreset.Wide);
+    }
+
+    public override void Closed()
+    {
+        _popup.Orphan();
     }
 }
diff --git a/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupMessage.xaml b/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupMessage.xaml
new file mode 100644
index 0000000000..9a60a6f72a
--- /dev/null
+++ b/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupMessage.xaml
@@ -0,0 +1,6 @@
+<Control xmlns="https://spacestation14.io" Margin="0 0 0 8">
+    <BoxContainer Orientation="Vertical">
+        <RichTextLabel Name="Admin" Margin="0 0 0 4" />
+        <RichTextLabel Name="Message" Margin="2 0 0 0" />
+    </BoxContainer>
+</Control>
diff --git a/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupMessage.xaml.cs b/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupMessage.xaml.cs
new file mode 100644
index 0000000000..7bb425f618
--- /dev/null
+++ b/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupMessage.xaml.cs
@@ -0,0 +1,23 @@
+using Content.Shared.Administration.Notes;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Administration.UI.AdminRemarks;
+
+[GenerateTypedNameReferences]
+public sealed partial class AdminMessagePopupMessage : Control
+{
+    public AdminMessagePopupMessage(AdminMessageEuiState.Message message)
+    {
+        RobustXamlLoader.Load(this);
+
+        Admin.SetMessage(FormattedMessage.FromMarkup(Loc.GetString(
+            "admin-notes-message-admin",
+            ("admin", message.AdminName),
+            ("date", message.AddedOn.ToLocalTime()))));
+
+        Message.SetMessage(message.Text);
+    }
+}
diff --git a/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml b/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml
index 311829e8b2..cc5207bb3a 100644
--- a/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml
+++ b/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml
@@ -1,22 +1,36 @@
-<ui:FancyWindow xmlns="https://spacestation14.io"
-                xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
-                VerticalExpand="True" HorizontalExpand="True"
-                Title="{Loc admin-notes-message-window-title}"
-                MinSize="600 170">
-    <PanelContainer VerticalExpand="True" HorizontalExpand="True" StyleClasses="BackgroundDark">
-        <ScrollContainer HScrollEnabled="False" VerticalExpand="True" HorizontalExpand="True" Margin="4">
-            <BoxContainer Orientation="Vertical" SeparationOverride="10" VerticalAlignment="Bottom">
-                <Label Name="AdminLabel" Text="Loading..." />
-                <RichTextLabel Name="MessageLabel" />
+<Control xmlns="https://spacestation14.io"
+         xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
+    <PanelContainer MouseFilter="Stop">
+        <PanelContainer.PanelOverride>
+            <!-- semi-transparent background -->
+            <gfx:StyleBoxFlat BackgroundColor="#000000AA" />
+        </PanelContainer.PanelOverride>
+
+        <Control HorizontalAlignment="Center" VerticalAlignment="Center" MaxWidth="600">
+            <PanelContainer StyleClasses="AngleRect" />
+
+            <BoxContainer Orientation="Vertical" Margin="4">
+                <RichTextLabel Name="Description" />
+
+                <!-- Contains actual messages -->
+                <ScrollContainer HScrollEnabled="False" Margin="4" VerticalExpand="True" ReturnMeasure="True" MaxHeight="400">
+                    <BoxContainer Orientation="Vertical" Name="MessageContainer" Margin="0 2 0 0" />
+                </ScrollContainer>
+
                 <Label Name="WaitLabel" />
                 <BoxContainer Orientation="Horizontal">
                     <Button Name="DismissButton"
-                            Text="{Loc 'admin-notes-message-dismiss'}" />
+                            Text="{Loc 'admin-notes-message-dismiss'}"
+                            Disabled="True"
+                            HorizontalExpand="True"
+                            StyleClasses="OpenRight" />
                     <Button Name="AcceptButton"
                             Text="{Loc 'admin-notes-message-accept'}"
-                            Disabled="True" />
+                            Disabled="True"
+                            HorizontalExpand="True"
+                            StyleClasses="OpenLeft" />
                 </BoxContainer>
             </BoxContainer>
-        </ScrollContainer>
+        </Control>
     </PanelContainer>
-</ui:FancyWindow>
+</Control>
diff --git a/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml.cs b/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml.cs
index f28fd1b60b..bf2ca9bec4 100644
--- a/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml.cs
+++ b/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml.cs
@@ -1,56 +1,65 @@
-using Content.Client.UserInterface.Controls;
+using Content.Client.Stylesheets;
+using Content.Shared.Administration.Notes;
 using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Timing;
+using Robust.Shared.Utility;
 
 namespace Content.Client.Administration.UI.AdminRemarks;
 
 [GenerateTypedNameReferences]
-public sealed partial class AdminMessagePopupWindow : FancyWindow
+public sealed partial class AdminMessagePopupWindow : Control
 {
     private float _timer = float.MaxValue;
-    public float Timer
-    {
-        get => _timer;
-        set
-        {
-            WaitLabel.Text = Loc.GetString("admin-notes-message-wait", ("time", MathF.Floor(value)));
-            _timer = value;
-        }
-    }
 
     public event Action? OnDismissPressed;
+
     public event Action? OnAcceptPressed;
 
     public AdminMessagePopupWindow()
     {
         RobustXamlLoader.Load(this);
 
+        Stylesheet = IoCManager.Resolve<IStylesheetManager>().SheetSpace;
+
         AcceptButton.OnPressed += OnAcceptButtonPressed;
         DismissButton.OnPressed += OnDismissButtonPressed;
     }
 
-    public void SetMessage(string message)
+    public float Timer
     {
-        MessageLabel.SetMessage(message);
+        get => _timer;
+        private set
+        {
+            WaitLabel.Text = Loc.GetString("admin-notes-message-wait", ("time", MathF.Floor(value)));
+            _timer = value;
+        }
     }
 
-    public void SetDetails(string adminName, DateTime addedOn)
+    public void SetState(AdminMessageEuiState state)
     {
-        AdminLabel.Text = Loc.GetString("admin-notes-message-admin", ("admin", adminName), ("date", addedOn));
+        Timer = (float) state.Time.TotalSeconds;
+
+        MessageContainer.RemoveAllChildren();
+
+        foreach (var message in state.Messages)
+        {
+            MessageContainer.AddChild(new AdminMessagePopupMessage(message));
+        }
+
+        Description.SetMessage(FormattedMessage.FromMarkup(Loc.GetString("admin-notes-message-desc", ("count", state.Messages.Length))));
     }
 
     private void OnDismissButtonPressed(BaseButton.ButtonEventArgs obj)
     {
         OnDismissPressed?.Invoke();
-        Close();
     }
 
     private void OnAcceptButtonPressed(BaseButton.ButtonEventArgs obj)
     {
         OnAcceptPressed?.Invoke();
-        Close();
     }
 
     protected override void FrameUpdate(FrameEventArgs args)
@@ -70,6 +79,7 @@ protected override void FrameUpdate(FrameEventArgs args)
         else
         {
             AcceptButton.Disabled = false;
+            DismissButton.Disabled = false;
         }
     }
 }
diff --git a/Content.Client/Alerts/ClientAlertsSystem.cs b/Content.Client/Alerts/ClientAlertsSystem.cs
index ab296a9619..237f24e3ea 100644
--- a/Content.Client/Alerts/ClientAlertsSystem.cs
+++ b/Content.Client/Alerts/ClientAlertsSystem.cs
@@ -33,7 +33,7 @@ protected override void LoadPrototypes()
 
         AlertOrder = _prototypeManager.EnumeratePrototypes<AlertOrderPrototype>().FirstOrDefault();
         if (AlertOrder == null)
-            Log.Error("alert", "no alertOrder prototype found, alerts will be in random order");
+            Log.Error("No alertOrder prototype found, alerts will be in random order");
     }
 
     public IReadOnlyDictionary<AlertKey, AlertState>? ActiveAlerts
diff --git a/Content.Client/Antag/AntagStatusIconSystem.cs b/Content.Client/Antag/AntagStatusIconSystem.cs
index 5d87837893..804ae21ad4 100644
--- a/Content.Client/Antag/AntagStatusIconSystem.cs
+++ b/Content.Client/Antag/AntagStatusIconSystem.cs
@@ -22,6 +22,7 @@ public override void Initialize()
         SubscribeLocalEvent<RevolutionaryComponent, GetStatusIconsEvent>(GetRevIcon);
         SubscribeLocalEvent<ZombieComponent, GetStatusIconsEvent>(GetIcon);
         SubscribeLocalEvent<HeadRevolutionaryComponent, GetStatusIconsEvent>(GetIcon);
+        SubscribeLocalEvent<InitialInfectedComponent, GetStatusIconsEvent>(GetIcon);
     }
 
     /// <summary>
diff --git a/Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs b/Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs
index fcf3b04e53..6dfbc326ec 100644
--- a/Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs
+++ b/Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs
@@ -256,6 +256,8 @@ private void DrawTooltip(DrawingHandleScreen handle, Vector2 pos, AtmosDebugOver
         handle.DrawString(_font, pos, $"Map: {data.MapAtmosphere}");
         pos += offset;
         handle.DrawString(_font, pos, $"NoGrid: {data.NoGrid}");
+        pos += offset;
+        handle.DrawString(_font, pos, $"Immutable: {data.Immutable}");
     }
 
     private void GetGrids(MapId mapId, Box2Rotated box)
diff --git a/Content.Client/Atmos/Overlays/GasTileOverlay.cs b/Content.Client/Atmos/Overlays/GasTileOverlay.cs
index ef65d43fe8..f4dc274a4e 100644
--- a/Content.Client/Atmos/Overlays/GasTileOverlay.cs
+++ b/Content.Client/Atmos/Overlays/GasTileOverlay.cs
@@ -8,7 +8,6 @@
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Shared.Enums;
-using Robust.Shared.Graphics;
 using Robust.Shared.Graphics.RSI;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
@@ -23,7 +22,7 @@ public sealed class GasTileOverlay : Overlay
         private readonly IEntityManager _entManager;
         private readonly IMapManager _mapManager;
 
-        public override OverlaySpace Space => OverlaySpace.WorldSpaceEntities;
+        public override OverlaySpace Space => OverlaySpace.WorldSpaceEntities | OverlaySpace.WorldSpaceBelowWorld;
         private readonly ShaderInstance _shader;
 
         // Gas overlays
@@ -79,7 +78,8 @@ public GasTileOverlay(GasTileOverlaySystem system, IEntityManager entManager, IR
                         var rsi = resourceCache.GetResource<RSIResource>(animated.RsiPath).RSI;
                         var stateId = animated.RsiState;
 
-                        if (!rsi.TryGetState(stateId, out var state)) continue;
+                        if (!rsi.TryGetState(stateId, out var state))
+                            continue;
 
                         _frames[i] = state.GetFrames(RsiDirection.South);
                         _frameDelays[i] = state.GetDelays();
@@ -111,7 +111,8 @@ protected override void FrameUpdate(FrameEventArgs args)
             for (var i = 0; i < _gasCount; i++)
             {
                 var delays = _frameDelays[i];
-                if (delays.Length == 0) continue;
+                if (delays.Length == 0)
+                    continue;
 
                 var frameCount = _frameCounter[i];
                 _timer[i] += args.DeltaSeconds;
@@ -127,7 +128,8 @@ protected override void FrameUpdate(FrameEventArgs args)
             for (var i = 0; i < FireStates; i++)
             {
                 var delays = _fireFrameDelays[i];
-                if (delays.Length == 0) continue;
+                if (delays.Length == 0)
+                    continue;
 
                 var frameCount = _fireFrameCounter[i];
                 _fireTimer[i] += args.DeltaSeconds;
@@ -161,26 +163,10 @@ protected override void Draw(in OverlayDrawArgs args)
             var mapUid = _mapManager.GetMapEntityId(args.MapId);
 
             if (_entManager.TryGetComponent<MapAtmosphereComponent>(mapUid, out var atmos))
-            {
-                var bottomLeft = args.WorldAABB.BottomLeft.Floored();
-                var topRight = args.WorldAABB.TopRight.Ceiled();
-
-                for (var x = bottomLeft.X; x <= topRight.X; x++)
-                {
-                    for (var y = bottomLeft.Y; y <= topRight.Y; y++)
-                    {
-                        var tilePosition = new Vector2(x, y);
-
-                        for (var i = 0; i < atmos.OverlayData.Opacity.Length; i++)
-                        {
-                            var opacity = atmos.OverlayData.Opacity[i];
+                DrawMapOverlay(drawHandle, args, mapUid, atmos);
 
-                            if (opacity > 0)
-                                args.WorldHandle.DrawTexture(_frames[i][_frameCounter[i]], tilePosition, Color.White.WithAlpha(opacity));
-                        }
-                    }
-                }
-            }
+            if (args.Space != OverlaySpace.WorldSpaceEntities)
+                return;
 
             // TODO: WorldBounds callback.
             _mapManager.FindGridsIntersecting(args.MapId, args.WorldAABB, ref gridState,
@@ -265,5 +251,41 @@ protected override void Draw(in OverlayDrawArgs args)
             drawHandle.UseShader(null);
             drawHandle.SetTransform(Matrix3.Identity);
         }
+
+        private void DrawMapOverlay(
+            DrawingHandleWorld handle,
+            OverlayDrawArgs args,
+            EntityUid map,
+            MapAtmosphereComponent atmos)
+        {
+            var mapGrid = _entManager.HasComponent<MapGridComponent>(map);
+
+            // map-grid atmospheres get drawn above grids
+            if (mapGrid && args.Space != OverlaySpace.WorldSpaceEntities)
+                return;
+
+            // Normal map atmospheres get drawn below grids
+            if (!mapGrid && args.Space != OverlaySpace.WorldSpaceBelowWorld)
+                return;
+
+            var bottomLeft = args.WorldAABB.BottomLeft.Floored();
+            var topRight = args.WorldAABB.TopRight.Ceiled();
+
+            for (var x = bottomLeft.X; x <= topRight.X; x++)
+            {
+                for (var y = bottomLeft.Y; y <= topRight.Y; y++)
+                {
+                    var tilePosition = new Vector2(x, y);
+
+                    for (var i = 0; i < atmos.OverlayData.Opacity.Length; i++)
+                    {
+                        var opacity = atmos.OverlayData.Opacity[i];
+
+                        if (opacity > 0)
+                            handle.DrawTexture(_frames[i][_frameCounter[i]], tilePosition, Color.White.WithAlpha(opacity));
+                    }
+                }
+            }
+        }
     }
 }
diff --git a/Content.Client/Audio/ContentAudioSystem.cs b/Content.Client/Audio/ContentAudioSystem.cs
index c7fc7bcf73..f62b34b492 100644
--- a/Content.Client/Audio/ContentAudioSystem.cs
+++ b/Content.Client/Audio/ContentAudioSystem.cs
@@ -107,7 +107,7 @@ public void FadeIn(EntityUid? stream, AudioComponent? component = null, float du
 
         _fadingOut.Remove(stream.Value);
         var curVolume = component.Volume;
-        var change = (curVolume - MinVolume) / duration;
+        var change = (MinVolume - curVolume) / duration;
         _fadingIn.Add(stream.Value, (change, component.Volume));
         component.Volume = MinVolume;
     }
@@ -151,8 +151,8 @@ private void UpdateFades(float frameTime)
                 continue;
             }
 
-            var volume = component.Volume + change * frameTime;
-            volume = MathF.Max(target, volume);
+            var volume = component.Volume - change * frameTime;
+            volume = MathF.Min(target, volume);
             _audio.SetVolume(stream, volume, component);
 
             if (component.Volume.Equals(target))
diff --git a/Content.Client/CardboardBox/CardboardBoxSystem.cs b/Content.Client/CardboardBox/CardboardBoxSystem.cs
index 50f9de239d..90a21d8e41 100644
--- a/Content.Client/CardboardBox/CardboardBoxSystem.cs
+++ b/Content.Client/CardboardBox/CardboardBoxSystem.cs
@@ -1,4 +1,4 @@
-using System.Numerics;
+using System.Numerics;
 using Content.Shared.CardboardBox;
 using Content.Shared.CardboardBox.Components;
 using Content.Shared.Examine;
@@ -11,6 +11,7 @@ public sealed class CardboardBoxSystem : SharedCardboardBoxSystem
 {
     [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
     [Dependency] private readonly TransformSystem _transform = default!;
+    [Dependency] private readonly ExamineSystemShared _examine = default!;
 
     public override void Initialize()
     {
@@ -55,7 +56,7 @@ private void OnBoxEffect(PlayBoxEffectMessage msg)
         foreach (var mob in mobMoverEntities)
         {
             var mapPos = _transform.GetMapCoordinates(mob);
-            if (!ExamineSystemShared.InRangeUnOccluded(sourcePos, mapPos, box.Distance, null))
+            if (!_examine.InRangeUnOccluded(sourcePos, mapPos, box.Distance, null))
                 continue;
 
             var ent = Spawn(box.Effect, mapPos);
diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
index baf0d31f1f..e60335bc45 100644
--- a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
@@ -93,7 +93,7 @@ public void PopulateProducts()
                 if (search.Length == 0 && _category == null ||
                     search.Length != 0 && prototype.Name.ToLowerInvariant().Contains(search) ||
                     search.Length != 0 && prototype.Description.ToLowerInvariant().Contains(search) ||
-                    search.Length == 0 && _category != null && prototype.Category.Equals(_category))
+                    search.Length == 0 && _category != null && Loc.GetString(prototype.Category).Equals(_category))
                 {
                     var button = new CargoProductRow
                     {
@@ -122,7 +122,7 @@ public void PopulateCategories()
 
             foreach (var prototype in ProductPrototypes)
             {
-                if (!_categoryStrings.Contains(prototype.Category))
+                if (!_categoryStrings.Contains(Loc.GetString(prototype.Category)))
                 {
                     _categoryStrings.Add(Loc.GetString(prototype.Category));
                 }
diff --git a/Content.Client/Chat/UI/SpeechBubble.cs b/Content.Client/Chat/UI/SpeechBubble.cs
index 82eccbcec8..68c937a788 100644
--- a/Content.Client/Chat/UI/SpeechBubble.cs
+++ b/Content.Client/Chat/UI/SpeechBubble.cs
@@ -252,7 +252,8 @@ protected override Control BuildBubble(ChatMessage message, string speechStyleCl
             var bubbleContent = new RichTextLabel
             {
                 MaxWidth = SpeechMaxWidth,
-                Margin = new Thickness(2, 6, 2, 2)
+                Margin = new Thickness(2, 6, 2, 2),
+                StyleClasses = { "bubbleContent" }
             };
 
             //We'll be honest. *Yes* this is hacky. Doing this in a cleaner way would require a bottom-up refactor of how saycode handles sending chat messages. -Myr
diff --git a/Content.Client/Clothing/ClientClothingSystem.cs b/Content.Client/Clothing/ClientClothingSystem.cs
index 979f7430e1..fbe9d5ec5b 100644
--- a/Content.Client/Clothing/ClientClothingSystem.cs
+++ b/Content.Client/Clothing/ClientClothingSystem.cs
@@ -271,7 +271,7 @@ private void RenderEquipment(EntityUid equipee, EntityUid equipment, string slot
         {
             if (!revealedLayers.Add(key))
             {
-                Logger.Warning($"Duplicate key for clothing visuals: {key}. Are multiple components attempting to modify the same layer? Equipment: {ToPrettyString(equipment)}");
+                Log.Warning($"Duplicate key for clothing visuals: {key}. Are multiple components attempting to modify the same layer? Equipment: {ToPrettyString(equipment)}");
                 continue;
             }
 
@@ -281,6 +281,9 @@ private void RenderEquipment(EntityUid equipee, EntityUid equipment, string slot
                 // note that every insertion requires reshuffling & remapping all the existing layers.
                 sprite.AddBlankLayer(index);
                 sprite.LayerMapSet(key, index);
+
+                if (layerData.Color != null)
+                    sprite.LayerSetColor(key, layerData.Color.Value);
             }
             else
                 index = sprite.LayerMapReserveBlank(key);
diff --git a/Content.Client/Construction/ConstructionSystem.cs b/Content.Client/Construction/ConstructionSystem.cs
index ae1724c3bf..66000a8457 100644
--- a/Content.Client/Construction/ConstructionSystem.cs
+++ b/Content.Client/Construction/ConstructionSystem.cs
@@ -27,6 +27,7 @@ public sealed class ConstructionSystem : SharedConstructionSystem
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
+        [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
         [Dependency] private readonly PopupSystem _popupSystem = default!;
 
         private readonly Dictionary<int, EntityUid> _ghosts = new();
@@ -195,7 +196,7 @@ public bool TrySpawnGhost(
                 return false;
 
             // This InRangeUnobstructed should probably be replaced with "is there something blocking us in that tile?"
-            var predicate = GetPredicate(prototype.CanBuildInImpassable, loc.ToMap(EntityManager));
+            var predicate = GetPredicate(prototype.CanBuildInImpassable, loc.ToMap(EntityManager, _transformSystem));
             if (!_interactionSystem.InRangeUnobstructed(user, loc, 20f, predicate: predicate))
                 return false;
 
diff --git a/Content.Client/ContextMenu/UI/EntityMenuUIController.cs b/Content.Client/ContextMenu/UI/EntityMenuUIController.cs
index ae1b3ec3bf..a60619baa3 100644
--- a/Content.Client/ContextMenu/UI/EntityMenuUIController.cs
+++ b/Content.Client/ContextMenu/UI/EntityMenuUIController.cs
@@ -170,7 +170,7 @@ private bool HandleOpenEntityMenu(in PointerInputCmdHandler.PointerInputCmdArgs
             if (_combatMode.IsInCombatMode(args.Session?.AttachedEntity))
                 return false;
 
-            var coords = args.Coordinates.ToMap(_entityManager);
+            var coords = args.Coordinates.ToMap(_entityManager, _xform);
 
             if (_verbSystem.TryGetEntityMenuEntities(coords, out var entities))
                 OpenRootMenu(entities);
diff --git a/Content.Client/CriminalRecords/CriminalRecordsConsoleBoundUserInterface.cs b/Content.Client/CriminalRecords/CriminalRecordsConsoleBoundUserInterface.cs
index 88b9c90c2f..9047624f49 100644
--- a/Content.Client/CriminalRecords/CriminalRecordsConsoleBoundUserInterface.cs
+++ b/Content.Client/CriminalRecords/CriminalRecordsConsoleBoundUserInterface.cs
@@ -37,8 +37,8 @@ protected override void Open()
             SendMessage(new SetStationRecordFilter(type, filterValue));
         _window.OnStatusSelected += status =>
             SendMessage(new CriminalRecordChangeStatus(status, null));
-        _window.OnDialogConfirmed += (_, reason) =>
-            SendMessage(new CriminalRecordChangeStatus(SecurityStatus.Wanted, reason));
+        _window.OnDialogConfirmed += (status, reason) =>
+            SendMessage(new CriminalRecordChangeStatus(status, reason));
         _window.OnHistoryUpdated += UpdateHistory;
         _window.OnHistoryClosed += () => _historyWindow?.Close();
         _window.OnClose += Close;
diff --git a/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs b/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs
index 61b5c38331..b259e08e72 100644
--- a/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs
+++ b/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs
@@ -219,16 +219,16 @@ private void FilterListingOfRecords(string text = "")
 
     private void SetStatus(SecurityStatus status)
     {
-        if (status == SecurityStatus.Wanted)
+        if (status == SecurityStatus.Wanted || status == SecurityStatus.Suspected)
         {
-            GetWantedReason();
+            GetReason(status);
             return;
         }
 
         OnStatusSelected?.Invoke(status);
     }
 
-    private void GetWantedReason()
+    private void GetReason(SecurityStatus status)
     {
         if (_reasonDialog != null)
         {
@@ -237,7 +237,7 @@ private void GetWantedReason()
         }
 
         var field = "reason";
-        var title = Loc.GetString("criminal-records-status-wanted");
+        var title = Loc.GetString("criminal-records-status-" + status.ToString().ToLower());
         var placeholders = _proto.Index<DatasetPrototype>(ReasonPlaceholders);
         var placeholder = Loc.GetString("criminal-records-console-reason-placeholder", ("placeholder", _random.Pick(placeholders.Values))); // just funny it doesn't actually get used
         var prompt = Loc.GetString("criminal-records-console-reason");
@@ -251,7 +251,7 @@ private void GetWantedReason()
             if (reason.Length < 1 || reason.Length > _maxLength)
                 return;
 
-            OnDialogConfirmed?.Invoke(SecurityStatus.Wanted, reason);
+            OnDialogConfirmed?.Invoke(status, reason);
         };
 
         _reasonDialog.OnClose += () => { _reasonDialog = null; };
diff --git a/Content.Client/DiscordAuth/DiscordAuthGui.xaml b/Content.Client/DiscordAuth/DiscordAuthGui.xaml
new file mode 100644
index 0000000000..9528e63cfb
--- /dev/null
+++ b/Content.Client/DiscordAuth/DiscordAuthGui.xaml
@@ -0,0 +1,28 @@
+<Control xmlns="https://spacestation14.io"
+         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+         xmlns:parallax="clr-namespace:Content.Client.Parallax"
+         xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
+    <parallax:ParallaxControl />
+    <Control HorizontalAlignment="Center" VerticalAlignment="Center">
+        <PanelContainer StyleClasses="AngleRect" />
+        <BoxContainer Orientation="Vertical">
+            <BoxContainer Orientation="Horizontal">
+                <Label Margin="8 0 0 0" Text="{Loc 'discord-auth-title'}"
+                       StyleClasses="LabelHeading" VAlign="Center" />
+                <Button Name="QuitButton" Text="{Loc 'discord-auth-quit-btn'}"
+                        HorizontalAlignment="Right" HorizontalExpand="True" />
+            </BoxContainer>
+            <controls:HighDivider />
+            <BoxContainer Orientation="Vertical" Margin="50 20 50 20">
+                <Label Text="{Loc 'discord-auth-info'}" Align="Center" />
+                <Label Text="{Loc 'discord-auth-warn'}" Margin="0 5 0 0" Align="Center" StyleClasses="LabelSubText" />
+            </BoxContainer>
+            <BoxContainer Orientation="Horizontal" VerticalAlignment="Bottom" Margin="10 0 0 0">
+                <Label Text="{Loc 'discord-auth-link'}" Align="Center" />
+                <Label Text=" " />
+                <LineEdit Name="UrlEdit" HorizontalExpand="True" Editable="False"></LineEdit>
+            </BoxContainer>
+            <Button Name="OpenUrlButton" Text="{Loc 'discord-auth-browser-btn'}" HorizontalExpand="True" StyleClasses="OpenRight" />
+        </BoxContainer>
+    </Control>
+</Control>
diff --git a/Content.Client/DiscordAuth/DiscordAuthGui.xaml.cs b/Content.Client/DiscordAuth/DiscordAuthGui.xaml.cs
new file mode 100644
index 0000000000..36c5fb25c1
--- /dev/null
+++ b/Content.Client/DiscordAuth/DiscordAuthGui.xaml.cs
@@ -0,0 +1,36 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.Console;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.DiscordAuth;
+
+[GenerateTypedNameReferences]
+public sealed partial class DiscordAuthGui : Control
+{
+    [Dependency] private readonly DiscordAuthManager _discordAuth = default!;
+    [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
+
+
+    public DiscordAuthGui()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+        LayoutContainer.SetAnchorPreset(this, LayoutContainer.LayoutPreset.Wide);
+
+        QuitButton.OnPressed += (_) =>
+        {
+            _consoleHost.ExecuteCommand("quit");
+        };
+
+        UrlEdit.Text = _discordAuth.AuthUrl;
+        OpenUrlButton.OnPressed += (_) =>
+        {
+            if (_discordAuth.AuthUrl != string.Empty)
+            {
+                IoCManager.Resolve<IUriOpener>().OpenUri(_discordAuth.AuthUrl);
+            }
+        };
+    }
+}
diff --git a/Content.Client/DiscordAuth/DiscordAuthManager.cs b/Content.Client/DiscordAuth/DiscordAuthManager.cs
new file mode 100644
index 0000000000..50d7f54c29
--- /dev/null
+++ b/Content.Client/DiscordAuth/DiscordAuthManager.cs
@@ -0,0 +1,31 @@
+using Content.Shared.DiscordAuth;
+using Robust.Client.State;
+using Robust.Shared.Network;
+
+namespace Content.Client.DiscordAuth;
+
+public sealed class DiscordAuthManager
+{
+    [Dependency] private readonly IClientNetManager _net = default!;
+    [Dependency] private readonly IStateManager _state = default!;
+
+
+    public string AuthUrl { get; private set; } = string.Empty;
+
+
+    public void Initialize()
+    {
+        _net.RegisterNetMessage<DiscordAuthCheckMessage>();
+        _net.RegisterNetMessage<DiscordAuthRequiredMessage>(OnDiscordAuthRequired);
+    }
+
+
+    private void OnDiscordAuthRequired(DiscordAuthRequiredMessage message)
+    {
+        if (_state.CurrentState is not DiscordAuthState)
+        {
+            AuthUrl = message.AuthUrl;
+            _state.RequestStateChange<DiscordAuthState>();
+        }
+    }
+}
diff --git a/Content.Client/DiscordAuth/DiscordAuthState.cs b/Content.Client/DiscordAuth/DiscordAuthState.cs
new file mode 100644
index 0000000000..785e14e7f2
--- /dev/null
+++ b/Content.Client/DiscordAuth/DiscordAuthState.cs
@@ -0,0 +1,36 @@
+using System.Threading;
+using Content.Shared.DiscordAuth;
+using Robust.Client.State;
+using Robust.Client.UserInterface;
+using Robust.Shared.Network;
+using Timer = Robust.Shared.Timing.Timer;
+
+namespace Content.Client.DiscordAuth;
+
+public sealed class DiscordAuthState : State
+{
+    [Dependency] private readonly IUserInterfaceManager _userInterface = default!;
+    [Dependency] private readonly IClientNetManager _net = default!;
+
+
+    private DiscordAuthGui? _gui;
+    private readonly CancellationTokenSource _checkTimerCancel = new();
+
+
+    protected override void Startup()
+    {
+        _gui = new DiscordAuthGui();
+        _userInterface.StateRoot.AddChild(_gui);
+
+        Timer.SpawnRepeating(TimeSpan.FromSeconds(5), () =>
+        {
+            _net.ClientSendMessage(new DiscordAuthCheckMessage());
+        }, _checkTimerCancel.Token);
+    }
+
+    protected override void Shutdown()
+    {
+        _checkTimerCancel.Cancel();
+        _gui!.Dispose();
+    }
+}
diff --git a/Content.Client/Disposal/Systems/DisposalUnitSystem.cs b/Content.Client/Disposal/Systems/DisposalUnitSystem.cs
index 344bd2ec97..8c40c78421 100644
--- a/Content.Client/Disposal/Systems/DisposalUnitSystem.cs
+++ b/Content.Client/Disposal/Systems/DisposalUnitSystem.cs
@@ -22,6 +22,9 @@ public sealed class DisposalUnitSystem : SharedDisposalUnitSystem
 
     private const string AnimationKey = "disposal_unit_animation";
 
+    private const string DefaultFlushState = "disposal-flush";
+    private const string DefaultChargeState = "disposal-charging";
+
     public override void Initialize()
     {
         base.Initialize();
@@ -101,12 +104,18 @@ private void UpdateState(EntityUid uid, SharedDisposalUnitComponent unit, Sprite
         sprite.LayerSetVisible(DisposalUnitVisualLayers.Base, state == VisualState.Anchored);
         sprite.LayerSetVisible(DisposalUnitVisualLayers.BaseFlush, state is VisualState.Flushing or VisualState.Charging);
 
+        var chargingState = sprite.LayerMapTryGet(DisposalUnitVisualLayers.BaseCharging, out var chargingLayer)
+            ? sprite.LayerGetState(chargingLayer)
+            : new RSI.StateId(DefaultChargeState);
+
         // This is a transient state so not too worried about replaying in range.
         if (state == VisualState.Flushing)
         {
             if (!_animationSystem.HasRunningAnimation(uid, AnimationKey))
             {
-                var flushState = new RSI.StateId("disposal-flush");
+                var flushState = sprite.LayerMapTryGet(DisposalUnitVisualLayers.BaseFlush, out var flushLayer)
+                    ? sprite.LayerGetState(flushLayer)
+                    : new RSI.StateId(DefaultFlushState);
 
                 // Setup the flush animation to play
                 var anim = new Animation
@@ -124,7 +133,7 @@ private void UpdateState(EntityUid uid, SharedDisposalUnitComponent unit, Sprite
                                 // Return to base state (though, depending on how the unit is
                                 // configured we might get an appearance change event telling
                                 // us to go to charging state)
-                                new AnimationTrackSpriteFlick.KeyFrame("disposal-charging", (float) unit.FlushDelay.TotalSeconds)
+                                new AnimationTrackSpriteFlick.KeyFrame(chargingState, (float) unit.FlushDelay.TotalSeconds)
                             }
                         },
                     }
@@ -147,7 +156,7 @@ private void UpdateState(EntityUid uid, SharedDisposalUnitComponent unit, Sprite
         }
         else if (state == VisualState.Charging)
         {
-            sprite.LayerSetState(DisposalUnitVisualLayers.BaseFlush, new RSI.StateId("disposal-charging"));
+            sprite.LayerSetState(DisposalUnitVisualLayers.BaseFlush, chargingState);
         }
         else
         {
diff --git a/Content.Client/DoAfter/DoAfterOverlay.cs b/Content.Client/DoAfter/DoAfterOverlay.cs
index 2957dafdb7..2e23dd44ca 100644
--- a/Content.Client/DoAfter/DoAfterOverlay.cs
+++ b/Content.Client/DoAfter/DoAfterOverlay.cs
@@ -1,9 +1,9 @@
 using System.Numerics;
 using Content.Shared.DoAfter;
+using Content.Client.UserInterface.Systems;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
-using Robust.Shared.Graphics;
 using Robust.Client.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
@@ -18,6 +18,7 @@ public sealed class DoAfterOverlay : Overlay
     private readonly IPlayerManager _player;
     private readonly SharedTransformSystem _transform;
     private readonly MetaDataSystem _meta;
+    private readonly ProgressColorSystem _progressColor;
 
     private readonly Texture _barTexture;
     private readonly ShaderInstance _shader;
@@ -40,6 +41,7 @@ public DoAfterOverlay(IEntityManager entManager, IPrototypeManager protoManager,
         _player = player;
         _transform = _entManager.EntitySysManager.GetEntitySystem<SharedTransformSystem>();
         _meta = _entManager.EntitySysManager.GetEntitySystem<MetaDataSystem>();
+        _progressColor = _entManager.System<ProgressColorSystem>();
         var sprite = new SpriteSpecifier.Rsi(new("/Textures/Interface/Misc/progress_bar.rsi"), "icon");
         _barTexture = _entManager.EntitySysManager.GetEntitySystem<SpriteSystem>().Frame0(sprite);
 
@@ -125,7 +127,7 @@ protected override void Draw(in OverlayDrawArgs args)
                     elapsedRatio = (float) Math.Min(1, elapsed.TotalSeconds / doAfter.Args.Delay.TotalSeconds);
                     var cancelElapsed = (time - doAfter.CancelledTime.Value).TotalSeconds;
                     var flash = Math.Floor(cancelElapsed / FlashTime) % 2 == 0;
-                    color = new Color(1f, 0f, 0f, flash ? alpha : 0f);
+                    color = GetProgressColor(0, flash ? alpha : 0);
                 }
                 else
                 {
@@ -146,14 +148,8 @@ protected override void Draw(in OverlayDrawArgs args)
         handle.SetTransform(Matrix3.Identity);
     }
 
-    public static Color GetProgressColor(float progress, float alpha = 1f)
+    public Color GetProgressColor(float progress, float alpha = 1f)
     {
-        if (progress >= 1.0f)
-        {
-            return new Color(0f, 1f, 0f, alpha);
-        }
-        // lerp
-        var hue = (5f / 18f) * progress;
-        return Color.FromHsv((hue, 1f, 0.75f, alpha));
+        return _progressColor.GetProgressColor(progress).WithAlpha(alpha);
     }
 }
diff --git a/Content.Client/Drugs/DrugOverlaySystem.cs b/Content.Client/Drugs/DrugOverlaySystem.cs
index 9bfa4fdf82..60fdf12f5e 100644
--- a/Content.Client/Drugs/DrugOverlaySystem.cs
+++ b/Content.Client/Drugs/DrugOverlaySystem.cs
@@ -38,6 +38,7 @@ private void OnPlayerAttached(EntityUid uid, SeeingRainbowsComponent component,
     private void OnPlayerDetached(EntityUid uid, SeeingRainbowsComponent component, LocalPlayerDetachedEvent args)
     {
         _overlay.Intoxication = 0;
+        _overlay.TimeTicker = 0;
         _overlayMan.RemoveOverlay(_overlay);
     }
 
@@ -52,6 +53,7 @@ private void OnShutdown(EntityUid uid, SeeingRainbowsComponent component, Compon
         if (_player.LocalEntity == uid)
         {
             _overlay.Intoxication = 0;
+            _overlay.TimeTicker = 0;
             _overlayMan.RemoveOverlay(_overlay);
         }
     }
diff --git a/Content.Client/Drugs/RainbowOverlay.cs b/Content.Client/Drugs/RainbowOverlay.cs
index 6ef5d0f65c..e62b0dfa66 100644
--- a/Content.Client/Drugs/RainbowOverlay.cs
+++ b/Content.Client/Drugs/RainbowOverlay.cs
@@ -20,6 +20,7 @@ public sealed class RainbowOverlay : Overlay
     private readonly ShaderInstance _rainbowShader;
 
     public float Intoxication = 0.0f;
+    public float TimeTicker = 0.0f;
 
     private const float VisualThreshold = 10.0f;
     private const float PowerDivisor = 250.0f;
@@ -48,7 +49,17 @@ protected override void FrameUpdate(FrameEventArgs args)
             return;
 
         var timeLeft = (float) (time.Value.Item2 - time.Value.Item1).TotalSeconds;
-        Intoxication += (timeLeft - Intoxication) * args.DeltaSeconds / 16f;
+
+        TimeTicker += args.DeltaSeconds;
+
+        if (timeLeft - TimeTicker > timeLeft / 16f)
+        {
+            Intoxication += (timeLeft - Intoxication) * args.DeltaSeconds / 16f;
+        }
+        else
+        {
+            Intoxication -= Intoxication/(timeLeft - TimeTicker) * args.DeltaSeconds;
+        }
     }
 
     protected override bool BeforeDraw(in OverlayDrawArgs args)
diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
index dd8f6032f6..10707ab93d 100644
--- a/Content.Client/Entry/EntryPoint.cs
+++ b/Content.Client/Entry/EntryPoint.cs
@@ -1,6 +1,8 @@
 using Content.Client.Administration.Managers;
 using Content.Client.Changelog;
 using Content.Client.Chat.Managers;
+using Content.Client.DiscordAuth;
+using Content.Client.JoinQueue;
 using Content.Client.Eui;
 using Content.Client.Flash;
 using Content.Client.Fullscreen;
@@ -70,6 +72,8 @@ public sealed class EntryPoint : GameClient
         [Dependency] private readonly IResourceManager _resourceManager = default!;
         [Dependency] private readonly IReplayLoadManager _replayLoad = default!;
         [Dependency] private readonly ILogManager _logManager = default!;
+        [Dependency] private readonly JoinQueueManager _joinQueue = default!;
+        [Dependency] private readonly DiscordAuthManager _discordAuth = default!;
 
         public override void Init()
         {
@@ -163,6 +167,8 @@ public override void PostInit()
             _userInterfaceManager.SetDefaultTheme("SS14DefaultTheme");
             _userInterfaceManager.SetActiveTheme(_configManager.GetCVar(CVars.InterfaceTheme));
             _documentParsingManager.Initialize();
+            _joinQueue.Initialize();
+            _discordAuth.Initialize();
 
             _baseClient.RunLevelChanged += (_, args) =>
             {
diff --git a/Content.Client/Gameplay/GameplayStateBase.cs b/Content.Client/Gameplay/GameplayStateBase.cs
index bdbd69d108..6236cd8e95 100644
--- a/Content.Client/Gameplay/GameplayStateBase.cs
+++ b/Content.Client/Gameplay/GameplayStateBase.cs
@@ -104,7 +104,7 @@ private bool HandleInspect(ICommonSession? session, EntityCoordinates coords, En
 
         public IEnumerable<EntityUid> GetClickableEntities(EntityCoordinates coordinates)
         {
-            return GetClickableEntities(coordinates.ToMap(_entityManager));
+            return GetClickableEntities(coordinates.ToMap(_entityManager, _entitySystemManager.GetEntitySystem<SharedTransformSystem>()));
         }
 
         public IEnumerable<EntityUid> GetClickableEntities(MapCoordinates coordinates)
diff --git a/Content.Client/Humanoid/MarkingPicker.xaml.cs b/Content.Client/Humanoid/MarkingPicker.xaml.cs
index 43333439f0..0e0b9dd384 100644
--- a/Content.Client/Humanoid/MarkingPicker.xaml.cs
+++ b/Content.Client/Humanoid/MarkingPicker.xaml.cs
@@ -124,17 +124,16 @@ public MarkingPicker()
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
 
-        SetupCategoryButtons();
         CMarkingCategoryButton.OnItemSelected +=  OnCategoryChange;
         CMarkingsUnused.OnItemSelected += item =>
             _selectedUnusedMarking = CMarkingsUnused[item.ItemIndex];
 
-        CMarkingAdd.OnPressed += args =>
+        CMarkingAdd.OnPressed += _ =>
             MarkingAdd();
 
         CMarkingsUsed.OnItemSelected += OnUsedMarkingSelected;
 
-        CMarkingRemove.OnPressed += args =>
+        CMarkingRemove.OnPressed += _ =>
             MarkingRemove();
 
         CMarkingRankUp.OnPressed += _ => SwapMarkingUp();
@@ -146,16 +145,34 @@ public MarkingPicker()
     private void SetupCategoryButtons()
     {
         CMarkingCategoryButton.Clear();
+
+        var validCategories = new List<MarkingCategories>();
         for (var i = 0; i < _markingCategories.Count; i++)
         {
-            if (_ignoreCategories.Contains(_markingCategories[i]))
+            var category = _markingCategories[i];
+            var markings = GetMarkings(category);
+            if (_ignoreCategories.Contains(category) ||
+                markings.Count == 0)
             {
                 continue;
             }
 
-            CMarkingCategoryButton.AddItem(Loc.GetString($"markings-category-{_markingCategories[i].ToString()}"), i);
+            validCategories.Add(category);
+            CMarkingCategoryButton.AddItem(Loc.GetString($"markings-category-{category.ToString()}"), i);
+        }
+
+        if (validCategories.Contains(_selectedMarkingCategory))
+        {
+            CMarkingCategoryButton.SelectId(_markingCategories.IndexOf(_selectedMarkingCategory));
+        }
+        else if (validCategories.Count > 0)
+        {
+            _selectedMarkingCategory = validCategories[0];
+        }
+        else
+        {
+            _selectedMarkingCategory = MarkingCategories.Chest;
         }
-        CMarkingCategoryButton.SelectId(_markingCategories.IndexOf(_selectedMarkingCategory));
     }
 
     private string GetMarkingName(MarkingPrototype marking) => Loc.GetString($"marking-{marking.ID}");
@@ -179,16 +196,21 @@ private List<string> GetMarkingStateNames(MarkingPrototype marking)
         return result;
     }
 
+    private IReadOnlyDictionary<string, MarkingPrototype> GetMarkings(MarkingCategories category)
+    {
+        return IgnoreSpecies
+            ? _markingManager.MarkingsByCategoryAndSex(category, _currentSex)
+            : _markingManager.MarkingsByCategoryAndSpeciesAndSex(category, _currentSpecies, _currentSex);
+    }
+
     public void Populate(string filter)
     {
+        SetupCategoryButtons();
+
         CMarkingsUnused.Clear();
         _selectedUnusedMarking = null;
 
-        var markings = IgnoreSpecies
-            ? _markingManager.MarkingsByCategoryAndSex(_selectedMarkingCategory, _currentSex)
-            : _markingManager.MarkingsByCategoryAndSpeciesAndSex(_selectedMarkingCategory, _currentSpecies, _currentSex);
-
-        var sortedMarkings = markings.Values.Where(m =>
+        var sortedMarkings = GetMarkings(_selectedMarkingCategory).Values.Where(m =>
             m.ID.ToLower().Contains(filter.ToLower()) ||
             GetMarkingName(m).ToLower().Contains(filter.ToLower())
         ).OrderBy(p => Loc.GetString(GetMarkingName(p)));
diff --git a/Content.Client/IconSmoothing/IconSmoothSystem.cs b/Content.Client/IconSmoothing/IconSmoothSystem.cs
index 7334c2fd43..0ab33c6520 100644
--- a/Content.Client/IconSmoothing/IconSmoothSystem.cs
+++ b/Content.Client/IconSmoothing/IconSmoothSystem.cs
@@ -231,7 +231,7 @@ private void CalculateNewSprite(EntityUid uid,
 
             if (!spriteQuery.TryGetComponent(uid, out var sprite))
             {
-                Logger.Error($"Encountered a icon-smoothing entity without a sprite: {ToPrettyString(uid)}");
+                Log.Error($"Encountered a icon-smoothing entity without a sprite: {ToPrettyString(uid)}");
                 RemCompDeferred(uid, smooth);
                 return;
             }
@@ -242,7 +242,7 @@ private void CalculateNewSprite(EntityUid uid,
             {
                 if (!_mapManager.TryGetGrid(xform.GridUid, out grid))
                 {
-                    Logger.Error($"Failed to calculate IconSmoothComponent sprite in {uid} because grid {xform.GridUid} was missing.");
+                    Log.Error($"Failed to calculate IconSmoothComponent sprite in {uid} because grid {xform.GridUid} was missing.");
                     return;
                 }
             }
diff --git a/Content.Client/Info/InfoSystem.cs b/Content.Client/Info/InfoSystem.cs
index 4572f3afdc..b697994981 100644
--- a/Content.Client/Info/InfoSystem.cs
+++ b/Content.Client/Info/InfoSystem.cs
@@ -12,13 +12,13 @@ public override void Initialize()
     {
         base.Initialize();
         SubscribeNetworkEvent<RulesMessage>(OnRulesReceived);
-        Logger.DebugS("info", "Requested server info.");
+        Log.Debug("Requested server info.");
         RaiseNetworkEvent(new RequestRulesMessage());
     }
 
     private void OnRulesReceived(RulesMessage message, EntitySessionEventArgs eventArgs)
     {
-        Logger.DebugS("info", "Received server rules.");
+        Log.Debug("Received server rules.");
         Rules = message;
         _rules.UpdateRules();
     }
diff --git a/Content.Client/IoC/ClientContentIoC.cs b/Content.Client/IoC/ClientContentIoC.cs
index 70fe191658..92b10fe049 100644
--- a/Content.Client/IoC/ClientContentIoC.cs
+++ b/Content.Client/IoC/ClientContentIoC.cs
@@ -2,6 +2,8 @@
 using Content.Client.Changelog;
 using Content.Client.Chat.Managers;
 using Content.Client.Clickable;
+using Content.Client.DiscordAuth;
+using Content.Client.JoinQueue;
 using Content.Client.Options;
 using Content.Client.Eui;
 using Content.Client.GhostKick;
@@ -49,6 +51,8 @@ public static void Register()
             IoCManager.Register<JobRequirementsManager>();
             IoCManager.Register<DocumentParsingManager>();
             IoCManager.Register<ContentReplayPlaybackManager, ContentReplayPlaybackManager>();
+            IoCManager.Register<JoinQueueManager>();
+            IoCManager.Register<DiscordAuthManager>();
         }
     }
 }
diff --git a/Content.Client/JoinQueue/JoinQueueManager.cs b/Content.Client/JoinQueue/JoinQueueManager.cs
new file mode 100644
index 0000000000..2cfe51fd7e
--- /dev/null
+++ b/Content.Client/JoinQueue/JoinQueueManager.cs
@@ -0,0 +1,26 @@
+using Content.Shared.JoinQueue;
+using Robust.Client.State;
+using Robust.Shared.Network;
+
+namespace Content.Client.JoinQueue;
+
+public sealed class JoinQueueManager
+{
+    [Dependency] private readonly IClientNetManager _net = default!;
+    [Dependency] private readonly IStateManager _state = default!;
+
+
+    public void Initialize()
+    {
+        _net.RegisterNetMessage<QueueUpdateMessage>(OnQueueUpdate);
+    }
+
+
+    private void OnQueueUpdate(QueueUpdateMessage msg)
+    {
+        if (_state.CurrentState is not QueueState)
+            _state.RequestStateChange<QueueState>();
+
+        ((QueueState) _state.CurrentState).OnQueueUpdate(msg);
+    }
+}
diff --git a/Content.Client/JoinQueue/QueueGui.xaml b/Content.Client/JoinQueue/QueueGui.xaml
new file mode 100644
index 0000000000..0aeb5d3758
--- /dev/null
+++ b/Content.Client/JoinQueue/QueueGui.xaml
@@ -0,0 +1,31 @@
+<Control xmlns="https://spacestation14.io"
+         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+         xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+         xmlns:parallax="clr-namespace:Content.Client.Parallax"
+         xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
+    <parallax:ParallaxControl />
+    <Control HorizontalAlignment="Center" VerticalAlignment="Center">
+        <PanelContainer StyleClasses="AngleRect" />
+        <BoxContainer Orientation="Vertical" MinSize="200 200">
+            <BoxContainer Orientation="Horizontal">
+                <Label Margin="8 0 0 0" Text="{Loc 'queue-title'}"
+                       StyleClasses="LabelHeading" VAlign="Center" />
+                <Button Name="QuitButton" Text="{Loc 'queue-quit'}"
+                        HorizontalAlignment="Right" HorizontalExpand="True" />
+            </BoxContainer>
+            <controls:HighDivider />
+            <BoxContainer Orientation="Vertical" VerticalExpand="True" Margin="0 20 0 0">
+                <BoxContainer Orientation="Vertical">
+                    <BoxContainer Orientation="Vertical" VerticalExpand="True">
+                        <Label Text="{Loc 'queue-position'}" Align="Center" />
+                        <Label Name="QueuePosition" StyleClasses="LabelHeading" Align="Center" />
+                    </BoxContainer>
+                    <BoxContainer Orientation="Vertical" VerticalExpand="True" Margin="0 10 0 0">
+                        <Label Text="{Loc 'queue-total'}" Align="Center" />
+                        <Label Name="QueueTotal" StyleClasses="LabelHeading" Align="Center" />
+                    </BoxContainer>
+                </BoxContainer>
+            </BoxContainer>
+        </BoxContainer>
+    </Control>
+</Control>
diff --git a/Content.Client/JoinQueue/QueueGui.xaml.cs b/Content.Client/JoinQueue/QueueGui.xaml.cs
new file mode 100644
index 0000000000..49c6e0d180
--- /dev/null
+++ b/Content.Client/JoinQueue/QueueGui.xaml.cs
@@ -0,0 +1,29 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.JoinQueue;
+
+[GenerateTypedNameReferences]
+public sealed partial class QueueGui : Control
+{
+    public event Action? QuitPressed;
+
+
+    public QueueGui()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+        LayoutContainer.SetAnchorPreset(this, LayoutContainer.LayoutPreset.Wide);
+
+        QuitButton.OnPressed += (_) => QuitPressed?.Invoke();
+    }
+
+
+    public void UpdateInfo(int total, int position)
+    {
+        QueueTotal.Text = total.ToString();
+        QueuePosition.Text = position.ToString();
+    }
+}
diff --git a/Content.Client/JoinQueue/QueueState.cs b/Content.Client/JoinQueue/QueueState.cs
new file mode 100644
index 0000000000..2e047b2735
--- /dev/null
+++ b/Content.Client/JoinQueue/QueueState.cs
@@ -0,0 +1,54 @@
+using Content.Shared.JoinQueue;
+using Robust.Client.Audio;
+using Robust.Client.Console;
+using Robust.Client.State;
+using Robust.Client.UserInterface;
+using Robust.Shared.Player;
+
+namespace Content.Client.JoinQueue;
+
+public sealed class QueueState : State
+{
+    [Dependency] private readonly IUserInterfaceManager _userInterface = default!;
+    [Dependency] private readonly IClientConsoleHost _console = default!;
+
+
+    private const string JoinSoundPath = "/Audio/Effects/newplayerping.ogg";
+
+    private QueueGui? _gui;
+
+
+    protected override void Startup()
+    {
+        _gui = new QueueGui();
+        _userInterface.StateRoot.AddChild(_gui);
+
+        _gui.QuitPressed += OnQuitPressed;
+    }
+
+    protected override void Shutdown()
+    {
+        _gui!.QuitPressed -= OnQuitPressed;
+        _gui.Dispose();
+
+        Ding();
+    }
+
+
+    public void OnQueueUpdate(QueueUpdateMessage msg)
+    {
+        _gui?.UpdateInfo(msg.Total, msg.Position);
+    }
+
+    private void OnQuitPressed()
+    {
+        _console.ExecuteCommand("quit");
+    }
+
+
+    private void Ding()
+    {
+        if (IoCManager.Resolve<IEntityManager>().TrySystem<AudioSystem>(out var audio))
+            audio.PlayGlobal(JoinSoundPath, Filter.Local(), false);
+    }
+}
diff --git a/Content.Client/Light/RgbLightControllerSystem.cs b/Content.Client/Light/RgbLightControllerSystem.cs
index ad8ca47582..7d55bcebf1 100644
--- a/Content.Client/Light/RgbLightControllerSystem.cs
+++ b/Content.Client/Light/RgbLightControllerSystem.cs
@@ -146,7 +146,7 @@ private void GetOriginalColors(EntityUid uid, RgbLightControllerComponent? rgb =
                 else
                 {
                     // admeme fuck-ups or bad yaml?
-                    Logger.Warning($"RGB light attempted to use invalid sprite index {index} on entity {ToPrettyString(uid)}");
+                    Log.Warning($"RGB light attempted to use invalid sprite index {index} on entity {ToPrettyString(uid)}");
                     rgb.Layers.Remove(index);
                 }
             }
diff --git a/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs b/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs
index f9481caa3b..59a518f269 100644
--- a/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs
+++ b/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs
@@ -1,16 +1,14 @@
 using System.Linq;
 using System.Numerics;
-using Content.Client.Alerts;
 using Content.Client.Humanoid;
 using Content.Client.Inventory;
 using Content.Client.Preferences;
 using Content.Client.UserInterface.Controls;
+using Content.Shared.Clothing.Loadouts.Systems;
 using Content.Shared.GameTicking;
 using Content.Shared.Humanoid.Prototypes;
-using Content.Shared.Inventory;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
-using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Map;
@@ -126,6 +124,7 @@ public void UpdateUI()
                     _summaryLabel.Text = selectedCharacter.Summary;
                     _entityManager.System<HumanoidAppearanceSystem>().LoadProfile(_previewDummy.Value, selectedCharacter);
                     GiveDummyJobClothes(_previewDummy.Value, selectedCharacter);
+                    GiveDummyLoadoutItems(_previewDummy.Value, selectedCharacter);
                 }
             }
         }
@@ -162,5 +161,13 @@ public static void GiveDummyJobClothes(EntityUid dummy, HumanoidCharacterProfile
                 }
             }
         }
+
+        public static void GiveDummyLoadoutItems(EntityUid dummy, HumanoidCharacterProfile profile)
+        {
+            var highPriorityJobId = profile.JobPriorities.FirstOrDefault(j => j.Value == JobPriority.High).Key;
+            var highPriorityJob = IoCManager.Resolve<IPrototypeManager>().Index<JobPrototype>(highPriorityJobId ?? SharedGameTicker.FallbackOverflowJob);
+
+            EntitySystem.Get<LoadoutSystem>().ApplyCharacterLoadout(dummy, highPriorityJob, profile);
+        }
     }
 }
diff --git a/Content.Client/Mapping/MappingSystem.cs b/Content.Client/Mapping/MappingSystem.cs
index 4456be36a6..8daf193dfe 100644
--- a/Content.Client/Mapping/MappingSystem.cs
+++ b/Content.Client/Mapping/MappingSystem.cs
@@ -83,7 +83,7 @@ private void OnFillActionSlot(FillActionSlotEvent ev)
             if (tileDef is not ContentTileDefinition contentTileDef)
                 return;
 
-            var tileIcon = contentTileDef.IsSpace
+            var tileIcon = contentTileDef.MapAtmosphere
                 ? _spaceIcon
                 : new Texture(contentTileDef.Sprite!.Value);
 
diff --git a/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml.cs b/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml.cs
index 2918faa83d..7f98e3e0c3 100644
--- a/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml.cs
+++ b/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml.cs
@@ -56,11 +56,17 @@ private void OnTextChanged(long length, Control control, long maxLength)
         {
             control.ModulateSelfOverride = Color.Red;
             control.ToolTip = Loc.GetString("news-writer-text-length-exceeded");
+
+            ButtonPublish.Disabled = true;
+            ButtonPreview.Disabled = true;
         }
         else
         {
             control.ModulateSelfOverride = null;
             control.ToolTip = string.Empty;
+
+            ButtonPublish.Disabled = false;
+            ButtonPreview.Disabled = false;
         }
     }
 
diff --git a/Content.Client/Movement/Systems/FloorOcclusionSystem.cs b/Content.Client/Movement/Systems/FloorOcclusionSystem.cs
index 27ba99b3aa..5c75f25ca2 100644
--- a/Content.Client/Movement/Systems/FloorOcclusionSystem.cs
+++ b/Content.Client/Movement/Systems/FloorOcclusionSystem.cs
@@ -43,9 +43,14 @@ protected override void SetEnabled(EntityUid uid, FloorOcclusionComponent compon
 
     private void SetShader(SpriteComponent sprite, bool enabled)
     {
+        var shader = _proto.Index<ShaderPrototype>("HorizontalCut").Instance();
+
+        if (sprite.PostShader is not null && sprite.PostShader != shader)
+            return;
+
         if (enabled)
         {
-            sprite.PostShader = _proto.Index<ShaderPrototype>("HorizontalCut").Instance();
+            sprite.PostShader = shader;
         }
         else
         {
diff --git a/Content.Client/NPC/PathfindingSystem.cs b/Content.Client/NPC/PathfindingSystem.cs
index 548edd601c..7bf3df1f0b 100644
--- a/Content.Client/NPC/PathfindingSystem.cs
+++ b/Content.Client/NPC/PathfindingSystem.cs
@@ -23,6 +23,7 @@ public sealed class PathfindingSystem : SharedPathfindingSystem
         [Dependency] private readonly IResourceCache _cache = default!;
         [Dependency] private readonly NPCSteeringSystem _steering = default!;
         [Dependency] private readonly MapSystem _mapSystem = default!;
+        [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
 
         public PathfindingDebugMode Modes
         {
@@ -39,7 +40,7 @@ public PathfindingDebugMode Modes
                 }
                 else if (!overlayManager.HasOverlay<PathfindingOverlay>())
                 {
-                    overlayManager.AddOverlay(new PathfindingOverlay(EntityManager, _eyeManager, _inputManager, _mapManager, _cache, this, _mapSystem));
+                    overlayManager.AddOverlay(new PathfindingOverlay(EntityManager, _eyeManager, _inputManager, _mapManager, _cache, this, _mapSystem, _transformSystem));
                 }
 
                 if ((value & PathfindingDebugMode.Steering) != 0x0)
@@ -140,6 +141,7 @@ public sealed class PathfindingOverlay : Overlay
         private readonly IMapManager _mapManager;
         private readonly PathfindingSystem _system;
         private readonly MapSystem _mapSystem;
+        private readonly SharedTransformSystem _transformSystem;
 
         public override OverlaySpace Space => OverlaySpace.ScreenSpace | OverlaySpace.WorldSpace;
 
@@ -153,7 +155,8 @@ public PathfindingOverlay(
             IMapManager mapManager,
             IResourceCache cache,
             PathfindingSystem system,
-            MapSystem mapSystem)
+            MapSystem mapSystem,
+            SharedTransformSystem transformSystem)
         {
             _entManager = entManager;
             _eyeManager = eyeManager;
@@ -161,6 +164,7 @@ public PathfindingOverlay(
             _mapManager = mapManager;
             _system = system;
             _mapSystem = mapSystem;
+            _transformSystem = transformSystem;
             _font = new VectorFont(cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Regular.ttf"), 10);
         }
 
@@ -480,7 +484,7 @@ private void DrawWorld(OverlayDrawArgs args, DrawingHandleWorld worldHandle)
                                     if (neighborPoly.NetEntity != poly.GraphUid)
                                     {
                                         color = Color.Green;
-                                        var neighborMap = _entManager.GetCoordinates(neighborPoly).ToMap(_entManager);
+                                        var neighborMap = _entManager.GetCoordinates(neighborPoly).ToMap(_entManager, _transformSystem);
 
                                         if (neighborMap.MapId != args.MapId)
                                             continue;
diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
index ce5cf421ae..f0537079b9 100644
--- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
@@ -403,7 +403,7 @@ private void InputManagerOnFirstChanceOnKeyEvent(KeyEventArgs keyEvent, KeyEvent
                 Mod1 = mods[0],
                 Mod2 = mods[1],
                 Mod3 = mods[2],
-                Priority = 0,
+                Priority = _currentlyRebinding.Binding?.Priority ?? 0,
                 Type = bindType,
                 CanFocus = key == Keyboard.Key.MouseLeft
                            || key == Keyboard.Key.MouseRight
diff --git a/Content.Client/Options/UI/Tabs/MiscTab.xaml b/Content.Client/Options/UI/Tabs/MiscTab.xaml
index fc94ab7b0a..2ee59910f7 100644
--- a/Content.Client/Options/UI/Tabs/MiscTab.xaml
+++ b/Content.Client/Options/UI/Tabs/MiscTab.xaml
@@ -4,57 +4,59 @@
                   xmlns:xNamespace="http://schemas.microsoft.com/winfx/2006/xaml"
                   xmlns:s="clr-namespace:Content.Client.Stylesheets">
     <BoxContainer Orientation="Vertical">
-        <BoxContainer Orientation="Vertical" Margin="8 8 8 8" VerticalExpand="True">
-            <Label Text="{Loc 'ui-options-general-ui-style'}"
-                   FontColorOverride="{xNamespace:Static s:StyleNano.NanoGold}"
-                   StyleClasses="LabelKeyText"/>
-            <BoxContainer Orientation="Horizontal">
-                <Label Text="{Loc 'ui-options-hud-theme'}" />
-                <Control MinSize="4 0" />
-                <OptionButton Name="HudThemeOption" />
+        <ScrollContainer VerticalExpand="True" HorizontalExpand="True">
+            <BoxContainer Orientation="Vertical" Margin="8 8 8 8" VerticalExpand="True">
+                <Label Text="{Loc 'ui-options-general-ui-style'}"
+                       FontColorOverride="{xNamespace:Static s:StyleNano.NanoGold}"
+                       StyleClasses="LabelKeyText"/>
+                <BoxContainer Orientation="Horizontal">
+                    <Label Text="{Loc 'ui-options-hud-theme'}" />
+                    <Control MinSize="4 0" />
+                    <OptionButton Name="HudThemeOption" />
+                </BoxContainer>
+                <BoxContainer Orientation="Horizontal">
+                    <Label Text="{Loc 'ui-options-hud-layout'}" />
+                    <Control MinSize="4 0" />
+                    <OptionButton Name="HudLayoutOption" />
+                </BoxContainer>
+                <Label Text="{Loc 'ui-options-general-accessibility'}"
+                       FontColorOverride="{xNamespace:Static s:StyleNano.NanoGold}"
+                       StyleClasses="LabelKeyText"/>
+                <CheckBox Name="ReducedMotionCheckBox" Text="{Loc 'ui-options-reduced-motion'}" />
+                <CheckBox Name="EnableColorNameCheckBox" Text="{Loc 'ui-options-enable-color-name'}" />
+                <CheckBox Name="ColorblindFriendlyCheckBox" Text="{Loc 'ui-options-colorblind-friendly'}" />
+                <BoxContainer Orientation="Horizontal">
+                    <Label Text="{Loc 'ui-options-screen-shake-intensity'}" Margin="8 0" />
+                    <Slider Name="ScreenShakeIntensitySlider"
+                            MinValue="0"
+                            MaxValue="100"
+                            Rounded="True"
+                            MinWidth="200" />
+                    <Label Name="ScreenShakeIntensityLabel" Margin="8 0" />
+                </BoxContainer>
+                <Label Text="{Loc 'ui-options-general-discord'}"
+                       FontColorOverride="{xNamespace:Static s:StyleNano.NanoGold}"
+                       StyleClasses="LabelKeyText"/>
+                <CheckBox Name="DiscordRich" Text="{Loc 'ui-options-discordrich'}" />
+                <Label Text="{Loc 'ui-options-general-speech'}"
+                       FontColorOverride="{xNamespace:Static s:StyleNano.NanoGold}"
+                       StyleClasses="LabelKeyText"/>
+                <CheckBox Name="ShowLoocAboveHeadCheckBox" Text="{Loc 'ui-options-show-looc-on-head'}" />
+                <CheckBox Name="FancySpeechBubblesCheckBox" Text="{Loc 'ui-options-fancy-speech'}" />
+                <CheckBox Name="FancyNameBackgroundsCheckBox" Text="{Loc 'ui-options-fancy-name-background'}" />
+                <Label Text="{Loc 'ui-options-general-cursor'}"
+                       FontColorOverride="{xNamespace:Static s:StyleNano.NanoGold}"
+                       StyleClasses="LabelKeyText"/>
+                <CheckBox Name="ShowHeldItemCheckBox" Text="{Loc 'ui-options-show-held-item'}" />
+                <CheckBox Name="ShowCombatModeIndicatorsCheckBox" Text="{Loc 'ui-options-show-combat-mode-indicators'}" />
+                <Label Text="{Loc 'ui-options-general-storage'}"
+                       FontColorOverride="{xNamespace:Static s:StyleNano.NanoGold}"
+                       StyleClasses="LabelKeyText"/>
+                <CheckBox Name="OpaqueStorageWindowCheckBox" Text="{Loc 'ui-options-opaque-storage-window'}" />
+                <CheckBox Name="StaticStorageUI" Text="{Loc 'ui-options-static-storage-ui'}" />
+                <!-- <CheckBox Name="ToggleWalk" Text="{Loc 'ui-options-hotkey-toggle-walk'}" /> -->
             </BoxContainer>
-            <BoxContainer Orientation="Horizontal">
-                <Label Text="{Loc 'ui-options-hud-layout'}" />
-                <Control MinSize="4 0" />
-                <OptionButton Name="HudLayoutOption" />
-            </BoxContainer>
-            <Label Text="{Loc 'ui-options-general-accessibility'}"
-                   FontColorOverride="{xNamespace:Static s:StyleNano.NanoGold}"
-                   StyleClasses="LabelKeyText"/>
-            <CheckBox Name="ReducedMotionCheckBox" Text="{Loc 'ui-options-reduced-motion'}" />
-            <CheckBox Name="EnableColorNameCheckBox" Text="{Loc 'ui-options-enable-color-name'}" />
-            <BoxContainer Orientation="Horizontal">
-                <Label Text="{Loc 'ui-options-screen-shake-intensity'}" Margin="8 0" />
-                <Slider Name="ScreenShakeIntensitySlider"
-                        MinValue="0"
-                        MaxValue="100"
-                        Rounded="True"
-                        MinWidth="200" />
-                <Label Name="ScreenShakeIntensityLabel" Margin="8 0" />
-            </BoxContainer>
-            <Label Text="{Loc 'ui-options-general-discord'}"
-                   FontColorOverride="{xNamespace:Static s:StyleNano.NanoGold}"
-                   StyleClasses="LabelKeyText"/>
-            <CheckBox Name="DiscordRich" Text="{Loc 'ui-options-discordrich'}" />
-            <Label Text="{Loc 'ui-options-general-speech'}"
-                   FontColorOverride="{xNamespace:Static s:StyleNano.NanoGold}"
-                   StyleClasses="LabelKeyText"/>
-            <CheckBox Name="ShowLoocAboveHeadCheckBox" Text="{Loc 'ui-options-show-looc-on-head'}" />
-            <CheckBox Name="FancySpeechBubblesCheckBox" Text="{Loc 'ui-options-fancy-speech'}" />
-            <CheckBox Name="FancyNameBackgroundsCheckBox" Text="{Loc 'ui-options-fancy-name-background'}" />
-            <Label Text="{Loc 'ui-options-general-cursor'}"
-                   FontColorOverride="{xNamespace:Static s:StyleNano.NanoGold}"
-                   StyleClasses="LabelKeyText"/>
-            <CheckBox Name="ShowHeldItemCheckBox" Text="{Loc 'ui-options-show-held-item'}" />
-            <CheckBox Name="ShowCombatModeIndicatorsCheckBox" Text="{Loc 'ui-options-show-combat-mode-indicators'}" />
-            <Label Text="{Loc 'ui-options-general-storage'}"
-                   FontColorOverride="{xNamespace:Static s:StyleNano.NanoGold}"
-                   StyleClasses="LabelKeyText"/>
-            <CheckBox Name="OpaqueStorageWindowCheckBox" Text="{Loc 'ui-options-opaque-storage-window'}" />
-            <CheckBox Name="StaticStorageUI" Text="{Loc 'ui-options-static-storage-ui'}" />
-            <!-- <CheckBox Name="ToggleWalk" Text="{Loc 'ui-options-hotkey-toggle-walk'}" /> -->
-
-        </BoxContainer>
+        </ScrollContainer>
         <controls:StripeBack HasBottomEdge="False" HasMargins="False">
             <Button Name="ApplyButton"
                     Text="{Loc 'ui-options-apply'}"
diff --git a/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs b/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
index d7a600dd79..3b9c41efdf 100644
--- a/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
@@ -64,6 +64,7 @@ public MiscTab()
             FancySpeechBubblesCheckBox.OnToggled += OnCheckBoxToggled;
             FancyNameBackgroundsCheckBox.OnToggled += OnCheckBoxToggled;
             EnableColorNameCheckBox.OnToggled += OnCheckBoxToggled;
+            ColorblindFriendlyCheckBox.OnToggled += OnCheckBoxToggled;
             ReducedMotionCheckBox.OnToggled += OnCheckBoxToggled;
             ScreenShakeIntensitySlider.OnValueChanged += OnScreenShakeIntensitySliderChanged;
             // ToggleWalk.OnToggled += OnCheckBoxToggled;
@@ -78,6 +79,7 @@ public MiscTab()
             FancySpeechBubblesCheckBox.Pressed = _cfg.GetCVar(CCVars.ChatEnableFancyBubbles);
             FancyNameBackgroundsCheckBox.Pressed = _cfg.GetCVar(CCVars.ChatFancyNameBackground);
             EnableColorNameCheckBox.Pressed = _cfg.GetCVar(CCVars.ChatEnableColorName);
+            ColorblindFriendlyCheckBox.Pressed = _cfg.GetCVar(CCVars.AccessibilityColorblindFriendly);
             ReducedMotionCheckBox.Pressed = _cfg.GetCVar(CCVars.ReducedMotion);
             ScreenShakeIntensitySlider.Value = _cfg.GetCVar(CCVars.ScreenShakeIntensity) * 100f;
             // ToggleWalk.Pressed = _cfg.GetCVar(CCVars.ToggleWalk);
@@ -123,6 +125,7 @@ private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args)
             _cfg.SetCVar(CCVars.ChatEnableFancyBubbles, FancySpeechBubblesCheckBox.Pressed);
             _cfg.SetCVar(CCVars.ChatFancyNameBackground, FancyNameBackgroundsCheckBox.Pressed);
             _cfg.SetCVar(CCVars.ChatEnableColorName, EnableColorNameCheckBox.Pressed);
+            _cfg.SetCVar(CCVars.AccessibilityColorblindFriendly, ColorblindFriendlyCheckBox.Pressed);
             _cfg.SetCVar(CCVars.ReducedMotion, ReducedMotionCheckBox.Pressed);
             _cfg.SetCVar(CCVars.ScreenShakeIntensity, ScreenShakeIntensitySlider.Value / 100f);
             // _cfg.SetCVar(CCVars.ToggleWalk, ToggleWalk.Pressed);
@@ -149,6 +152,7 @@ private void UpdateApplyButton()
             var isFancyChatSame = FancySpeechBubblesCheckBox.Pressed == _cfg.GetCVar(CCVars.ChatEnableFancyBubbles);
             var isFancyBackgroundSame = FancyNameBackgroundsCheckBox.Pressed == _cfg.GetCVar(CCVars.ChatFancyNameBackground);
             var isEnableColorNameSame = EnableColorNameCheckBox.Pressed == _cfg.GetCVar(CCVars.ChatEnableColorName);
+            var isColorblindFriendly = ColorblindFriendlyCheckBox.Pressed == _cfg.GetCVar(CCVars.AccessibilityColorblindFriendly);
             var isReducedMotionSame = ReducedMotionCheckBox.Pressed == _cfg.GetCVar(CCVars.ReducedMotion);
             var isScreenShakeIntensitySame = Math.Abs(ScreenShakeIntensitySlider.Value / 100f - _cfg.GetCVar(CCVars.ScreenShakeIntensity)) < 0.01f;
             // var isToggleWalkSame = ToggleWalk.Pressed == _cfg.GetCVar(CCVars.ToggleWalk);
@@ -164,6 +168,7 @@ private void UpdateApplyButton()
                                    isFancyChatSame &&
                                    isFancyBackgroundSame &&
                                    isEnableColorNameSame &&
+                                   isColorblindFriendly &&
                                    isReducedMotionSame &&
                                    isScreenShakeIntensitySame &&
                                    // isToggleWalkSame &&
diff --git a/Content.Client/Overlays/EntityHealthBarOverlay.cs b/Content.Client/Overlays/EntityHealthBarOverlay.cs
index 11bec13539..9e562b5dd3 100644
--- a/Content.Client/Overlays/EntityHealthBarOverlay.cs
+++ b/Content.Client/Overlays/EntityHealthBarOverlay.cs
@@ -8,6 +8,8 @@
 using Robust.Shared.Enums;
 using System.Numerics;
 using Content.Shared.StatusIcon.Components;
+using Content.Client.UserInterface.Systems;
+using Robust.Shared.Prototypes;
 using static Robust.Shared.Maths.Color;
 
 namespace Content.Client.Overlays;
@@ -17,19 +19,25 @@ namespace Content.Client.Overlays;
 /// </summary>
 public sealed class EntityHealthBarOverlay : Overlay
 {
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
     private readonly IEntityManager _entManager;
     private readonly SharedTransformSystem _transform;
     private readonly MobStateSystem _mobStateSystem;
     private readonly MobThresholdSystem _mobThresholdSystem;
+    private readonly ProgressColorSystem _progressColor;
     public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowFOV;
     public HashSet<string> DamageContainers = new();
+    private readonly ShaderInstance _shader;
 
     public EntityHealthBarOverlay(IEntityManager entManager)
     {
+        IoCManager.InjectDependencies(this);
         _entManager = entManager;
-        _transform = _entManager.EntitySysManager.GetEntitySystem<SharedTransformSystem>();
-        _mobStateSystem = _entManager.EntitySysManager.GetEntitySystem<MobStateSystem>();
-        _mobThresholdSystem = _entManager.EntitySysManager.GetEntitySystem<MobThresholdSystem>();
+        _transform = _entManager.System<SharedTransformSystem>();
+        _mobStateSystem = _entManager.System<MobStateSystem>();
+        _mobThresholdSystem = _entManager.System<MobThresholdSystem>();
+        _progressColor = _entManager.System<ProgressColorSystem>();
+        _shader = _prototype.Index<ShaderPrototype>("unshaded").Instance();
     }
 
     protected override void Draw(in OverlayDrawArgs args)
@@ -42,6 +50,8 @@ protected override void Draw(in OverlayDrawArgs args)
         var scaleMatrix = Matrix3.CreateScale(new Vector2(scale, scale));
         var rotationMatrix = Matrix3.CreateRotation(-rotation);
 
+        handle.UseShader(_shader);
+
         var query = _entManager.AllEntityQueryEnumerator<MobThresholdsComponent, MobStateComponent, DamageableComponent, SpriteComponent>();
         while (query.MoveNext(out var uid,
             out var mobThresholdsComponent,
@@ -147,26 +157,11 @@ protected override void Draw(in OverlayDrawArgs args)
         return (0, true);
     }
 
-    public static Color GetProgressColor(float progress, bool crit)
+    public Color GetProgressColor(float progress, bool crit)
     {
-        if (progress >= 1.0f)
-        {
-            return SeaBlue;
-        }
-
-        if (!crit)
-        {
-            switch (progress)
-            {
-                case > 0.90F:
-                    return SeaBlue;
-                case > 0.50F:
-                    return Violet;
-                case > 0.15F:
-                    return Ruber;
-            }
-        }
+        if (crit)
+            progress = 0;
 
-        return VividGamboge;
+        return _progressColor.GetProgressColor(progress);
     }
 }
diff --git a/Content.Client/Overlays/ShowHealthIconsSystem.cs b/Content.Client/Overlays/ShowHealthIconsSystem.cs
index 6ed9d6a41d..a546cf4d82 100644
--- a/Content.Client/Overlays/ShowHealthIconsSystem.cs
+++ b/Content.Client/Overlays/ShowHealthIconsSystem.cs
@@ -1,5 +1,7 @@
+using Content.Shared.Atmos.Rotting;
 using Content.Shared.Damage;
 using Content.Shared.Inventory.Events;
+using Content.Shared.Mobs.Components;
 using Content.Shared.Overlays;
 using Content.Shared.StatusIcon;
 using Content.Shared.StatusIcon.Components;
@@ -17,9 +19,6 @@ public sealed class ShowHealthIconsSystem : EquipmentHudSystem<ShowHealthIconsCo
 
     public HashSet<string> DamageContainers = new();
 
-    [ValidatePrototypeId<StatusIconPrototype>]
-    private const string HealthIconFine = "HealthIconFine";
-
     public override void Initialize()
     {
         base.Initialize();
@@ -45,18 +44,20 @@ protected override void DeactivateInternal()
         DamageContainers.Clear();
     }
 
-    private void OnGetStatusIconsEvent(EntityUid uid, DamageableComponent damageableComponent, ref GetStatusIconsEvent args)
+    private void OnGetStatusIconsEvent(Entity<DamageableComponent> entity, ref GetStatusIconsEvent args)
     {
         if (!IsActive || args.InContainer)
             return;
 
-        var healthIcons = DecideHealthIcons(damageableComponent);
+        var healthIcons = DecideHealthIcons(entity);
 
         args.StatusIcons.AddRange(healthIcons);
     }
 
-    private IReadOnlyList<StatusIconPrototype> DecideHealthIcons(DamageableComponent damageableComponent)
+    private IReadOnlyList<StatusIconPrototype> DecideHealthIcons(Entity<DamageableComponent> entity)
     {
+        var damageableComponent = entity.Comp;
+
         if (damageableComponent.DamageContainerID == null ||
             !DamageContainers.Contains(damageableComponent.DamageContainerID))
         {
@@ -66,10 +67,16 @@ private IReadOnlyList<StatusIconPrototype> DecideHealthIcons(DamageableComponent
         var result = new List<StatusIconPrototype>();
 
         // Here you could check health status, diseases, mind status, etc. and pick a good icon, or multiple depending on whatever.
-        if (damageableComponent?.DamageContainerID == "Biological" &&
-            _prototypeMan.TryIndex<StatusIconPrototype>(HealthIconFine, out var healthyIcon))
+        if (damageableComponent?.DamageContainerID == "Biological")
         {
-            result.Add(healthyIcon);
+            if (TryComp<MobStateComponent>(entity, out var state))
+            {
+                // Since there is no MobState for a rotting mob, we have to deal with this case first.
+                if (HasComp<RottingComponent>(entity) && _prototypeMan.TryIndex(damageableComponent.RottingIcon, out var rottingIcon))
+                    result.Add(rottingIcon);
+                else if (damageableComponent.HealthIcons.TryGetValue(state.CurrentState, out var value) && _prototypeMan.TryIndex(value, out var icon))
+                    result.Add(icon);
+            }
         }
 
         return result;
diff --git a/Content.Client/Overlays/ShowSecurityIconsSystem.cs b/Content.Client/Overlays/ShowSecurityIconsSystem.cs
index 77c14c5ef0..7a4abd05e0 100644
--- a/Content.Client/Overlays/ShowSecurityIconsSystem.cs
+++ b/Content.Client/Overlays/ShowSecurityIconsSystem.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Mindshield.Components;
 using Content.Shared.Overlays;
 using Content.Shared.PDA;
+using Content.Shared.Security.Components;
 using Content.Shared.StatusIcon;
 using Content.Shared.StatusIcon.Components;
 using Robust.Shared.Prototypes;
@@ -74,7 +75,11 @@ private IReadOnlyList<StatusIconPrototype> DecideSecurityIcon(EntityUid uid)
                 result.Add(icon);
         }
 
-        // Add arrest icons here, WYCI.
+        if (TryComp<CriminalRecordComponent>(uid, out var record))
+        {
+            if(_prototypeMan.TryIndex<StatusIconPrototype>(record.StatusIcon.Id, out var criminalIcon))
+                result.Add(criminalIcon);
+        }
 
         return result;
     }
diff --git a/Content.Client/Paint/PaintVisualizerSystem.cs b/Content.Client/Paint/PaintVisualizerSystem.cs
new file mode 100644
index 0000000000..6c99b2d35f
--- /dev/null
+++ b/Content.Client/Paint/PaintVisualizerSystem.cs
@@ -0,0 +1,120 @@
+using System.Linq;
+using Robust.Client.GameObjects;
+using static Robust.Client.GameObjects.SpriteComponent;
+using Content.Shared.Clothing;
+using Content.Shared.Hands;
+using Content.Shared.Paint;
+using Robust.Client.Graphics;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.Paint
+{
+    public sealed class PaintedVisualizerSystem : VisualizerSystem<PaintedComponent>
+    {
+        /// <summary>
+        /// Visualizer for Paint which applies a shader and colors the entity.
+        /// </summary>
+
+        [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+        [Dependency] private readonly IPrototypeManager _protoMan = default!;
+
+        public ShaderInstance? Shader; // in Robust.Client.Graphics so cannot move to shared component.
+
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            SubscribeLocalEvent<PaintedComponent, HeldVisualsUpdatedEvent>(OnHeldVisualsUpdated);
+            SubscribeLocalEvent<PaintedComponent, ComponentShutdown>(OnShutdown);
+            SubscribeLocalEvent<PaintedComponent, EquipmentVisualsUpdatedEvent>(OnEquipmentVisualsUpdated);
+        }
+
+        protected override void OnAppearanceChange(EntityUid uid, PaintedComponent component, ref AppearanceChangeEvent args)
+        {
+            // ShaderPrototype sadly in Robust.Client, cannot move to shared component.
+            Shader = _protoMan.Index<ShaderPrototype>(component.ShaderName).Instance();
+
+            if (args.Sprite == null)
+                return;
+
+            if (!_appearance.TryGetData<bool>(uid, PaintVisuals.Painted, out bool isPainted))
+                return;
+
+            var sprite = args.Sprite;
+
+
+            foreach (var spriteLayer in sprite.AllLayers)
+            {
+                if (spriteLayer is not Layer layer)
+                    continue;
+
+                if (layer.Shader == null) // If shader isn't null we dont want to replace the original shader.
+                {
+                    layer.Shader = Shader;
+                    layer.Color = component.Color;
+                }
+            }
+        }
+
+        private void OnHeldVisualsUpdated(EntityUid uid, PaintedComponent component, HeldVisualsUpdatedEvent args)
+        {
+            if (args.RevealedLayers.Count == 0)
+                return;
+
+            if (!TryComp(args.User, out SpriteComponent? sprite))
+                return;
+
+            foreach (var revealed in args.RevealedLayers)
+            {
+                if (!sprite.LayerMapTryGet(revealed, out var layer) || sprite[layer] is not Layer notlayer)
+                    continue;
+
+                sprite.LayerSetShader(layer, component.ShaderName);
+                sprite.LayerSetColor(layer, component.Color);
+            }
+        }
+
+        private void OnEquipmentVisualsUpdated(EntityUid uid, PaintedComponent component, EquipmentVisualsUpdatedEvent args)
+        {
+            if (args.RevealedLayers.Count == 0)
+                return;
+
+            if (!TryComp(args.Equipee, out SpriteComponent? sprite))
+                return;
+
+            foreach (var revealed in args.RevealedLayers)
+            {
+                if (!sprite.LayerMapTryGet(revealed, out var layer) || sprite[layer] is not Layer notlayer)
+                    continue;
+
+                sprite.LayerSetShader(layer, component.ShaderName);
+                sprite.LayerSetColor(layer, component.Color);
+            }
+        }
+
+        private void OnShutdown(EntityUid uid, PaintedComponent component, ref ComponentShutdown args)
+        {
+            if (!TryComp(uid, out SpriteComponent? sprite))
+                return;
+
+            component.BeforeColor = sprite.Color;
+            Shader = _protoMan.Index<ShaderPrototype>(component.ShaderName).Instance();
+
+            if (!Terminating(uid))
+            {
+                foreach (var spriteLayer in sprite.AllLayers)
+                {
+                    if (spriteLayer is not Layer layer)
+                        continue;
+
+                    if (layer.Shader == Shader) // If shader isn't same as one in component we need to ignore it.
+                    {
+                        layer.Shader = null;
+                        if (layer.Color == component.Color) // If color isn't the same as one in component we don't want to change it.
+                            layer.Color = component.BeforeColor;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
index 3b1e65c34e..7688a3b3aa 100644
--- a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
+++ b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
@@ -21,7 +21,7 @@ public sealed partial class JobRequirementsManager
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypes = default!;
 
-    private readonly Dictionary<string, TimeSpan> _roles = new();
+    public readonly Dictionary<string, TimeSpan> PlayTimes = new();
     private readonly List<string> _roleBans = new();
 
     private ISawmill _sawmill = default!;
@@ -45,7 +45,7 @@ private void ClientOnRunLevelChanged(object? sender, RunLevelChangedEventArgs e)
         if (e.NewLevel == ClientRunLevel.Initialize)
         {
             // Reset on disconnect, just in case.
-            _roles.Clear();
+            PlayTimes.Clear();
         }
     }
 
@@ -63,12 +63,12 @@ private void RxRoleBans(MsgRoleBans message)
 
     private void RxPlayTime(MsgPlayTime message)
     {
-        _roles.Clear();
+        PlayTimes.Clear();
 
         // NOTE: do not assign _roles = message.Trackers due to implicit data sharing in integration tests.
         foreach (var (tracker, time) in message.Trackers)
         {
-            _roles[tracker] = time;
+            PlayTimes[tracker] = time;
         }
 
         /*var sawmill = Logger.GetSawmill("play_time");
@@ -89,12 +89,6 @@ public bool IsAllowed(JobPrototype job, [NotNullWhen(false)] out FormattedMessag
             return false;
         }
 
-        if (job.Requirements == null ||
-            !_cfg.GetCVar(CCVars.GameRoleTimers))
-        {
-            return true;
-        }
-
         var player = _playerManager.LocalSession;
         if (player == null)
             return true;
@@ -102,17 +96,17 @@ public bool IsAllowed(JobPrototype job, [NotNullWhen(false)] out FormattedMessag
         return CheckRoleTime(job.Requirements, out reason);
     }
 
-    public bool CheckRoleTime(HashSet<JobRequirement>? requirements, [NotNullWhen(false)] out FormattedMessage? reason)
+    public bool CheckRoleTime(HashSet<JobRequirement>? requirements, [NotNullWhen(false)] out FormattedMessage? reason, string? localePrefix = null)
     {
         reason = null;
 
-        if (requirements == null)
+        if (requirements == null || !_cfg.GetCVar(CCVars.GameRoleTimers))
             return true;
 
         var reasons = new List<string>();
         foreach (var requirement in requirements)
         {
-            if (JobRequirements.TryRequirementMet(requirement, _roles, out var jobReason, _entManager, _prototypes, _whitelisted))
+            if (JobRequirements.TryRequirementMet(requirement, PlayTimes, out var jobReason, _entManager, _prototypes, _whitelisted, localePrefix))
                 continue;
 
             reasons.Add(jobReason.ToMarkup());
@@ -124,7 +118,7 @@ public bool CheckRoleTime(HashSet<JobRequirement>? requirements, [NotNullWhen(fa
 
     public TimeSpan FetchOverallPlaytime()
     {
-        return _roles.TryGetValue("Overall", out var overallPlaytime) ? overallPlaytime : TimeSpan.Zero;
+        return PlayTimes.TryGetValue("Overall", out var overallPlaytime) ? overallPlaytime : TimeSpan.Zero;
     }
 
     public IEnumerable<KeyValuePair<string, TimeSpan>> FetchPlaytimeByRoles()
@@ -133,7 +127,7 @@ public IEnumerable<KeyValuePair<string, TimeSpan>> FetchPlaytimeByRoles()
 
         foreach (var job in jobsToMap)
         {
-            if (_roles.TryGetValue(job.PlayTimeTracker, out var locJobName))
+            if (PlayTimes.TryGetValue(job.PlayTimeTracker, out var locJobName))
             {
                 yield return new KeyValuePair<string, TimeSpan>(job.Name, locJobName);
             }
diff --git a/Content.Client/Popups/PopupOverlay.cs b/Content.Client/Popups/PopupOverlay.cs
index 1305d8bb94..fb6bb3bf56 100644
--- a/Content.Client/Popups/PopupOverlay.cs
+++ b/Content.Client/Popups/PopupOverlay.cs
@@ -21,7 +21,8 @@ public sealed class PopupOverlay : Overlay
     private readonly IUserInterfaceManager _uiManager;
     private readonly PopupSystem _popup;
     private readonly PopupUIController _controller;
-
+    private readonly ExamineSystemShared _examine;
+    private readonly SharedTransformSystem _transform;
     private readonly ShaderInstance _shader;
 
     public override OverlaySpace Space => OverlaySpace.ScreenSpace;
@@ -33,12 +34,16 @@ public PopupOverlay(
         IPrototypeManager protoManager,
         IUserInterfaceManager uiManager,
         PopupUIController controller,
+        ExamineSystemShared examine,
+        SharedTransformSystem transform,
         PopupSystem popup)
     {
         _configManager = configManager;
         _entManager = entManager;
         _playerMgr = playerMgr;
         _uiManager = uiManager;
+        _examine = examine;
+        _transform = transform;
         _popup = popup;
         _controller = controller;
 
@@ -73,7 +78,7 @@ private void DrawWorld(DrawingHandleScreen worldHandle, OverlayDrawArgs args, fl
 
         foreach (var popup in _popup.WorldLabels)
         {
-            var mapPos = popup.InitialPos.ToMap(_entManager);
+            var mapPos = popup.InitialPos.ToMap(_entManager, _transform);
 
             if (mapPos.MapId != args.MapId)
                 continue;
@@ -81,7 +86,7 @@ private void DrawWorld(DrawingHandleScreen worldHandle, OverlayDrawArgs args, fl
             var distance = (mapPos.Position - args.WorldBounds.Center).Length();
 
             // Should handle fade here too wyci.
-            if (!args.WorldBounds.Contains(mapPos.Position) || !ExamineSystemShared.InRangeUnOccluded(viewPos, mapPos, distance,
+            if (!args.WorldBounds.Contains(mapPos.Position) || !_examine.InRangeUnOccluded(viewPos, mapPos, distance,
                     e => e == popup.InitialPos.EntityId || e == ourEntity, entMan: _entManager))
                 continue;
 
diff --git a/Content.Client/Popups/PopupSystem.cs b/Content.Client/Popups/PopupSystem.cs
index cf96c41241..479fb02906 100644
--- a/Content.Client/Popups/PopupSystem.cs
+++ b/Content.Client/Popups/PopupSystem.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using Content.Shared.Examine;
 using Content.Shared.GameTicking;
 using Content.Shared.Popups;
 using Robust.Client.Graphics;
@@ -26,6 +27,8 @@ public sealed class PopupSystem : SharedPopupSystem
         [Dependency] private readonly IGameTiming _timing = default!;
         [Dependency] private readonly IUserInterfaceManager _uiManager = default!;
         [Dependency] private readonly IReplayRecordingManager _replayRecording = default!;
+        [Dependency] private readonly ExamineSystemShared _examine = default!;
+        [Dependency] private readonly SharedTransformSystem _transform = default!;
 
         public IReadOnlyList<WorldPopupLabel> WorldLabels => _aliveWorldLabels;
         public IReadOnlyList<CursorPopupLabel> CursorLabels => _aliveCursorLabels;
@@ -51,6 +54,8 @@ public override void Initialize()
                     _prototype,
                     _uiManager,
                     _uiManager.GetUIController<PopupUIController>(),
+                    _examine,
+                    _transform,
                     this));
         }
 
diff --git a/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs b/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
index f1052086de..dba96d74b6 100644
--- a/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
+++ b/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
@@ -181,6 +181,7 @@ public CharacterPickerButton(
                 if (humanoid != null)
                 {
                     LobbyCharacterPreviewPanel.GiveDummyJobClothes(_previewDummy, humanoid);
+                    LobbyCharacterPreviewPanel.GiveDummyLoadoutItems(_previewDummy, humanoid);
                 }
 
                 var isSelectedCharacter = profile == preferencesManager.Preferences?.SelectedCharacter;
@@ -229,10 +230,8 @@ public CharacterPickerButton(
                 };
                 deleteButton.OnPressed += _ =>
                 {
-
                     deleteButton.Visible = false;
                     confirmDeleteButton.Visible = true;
-
                 };
 
                 var internalHBox = new BoxContainer
diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
index d0dd02a58a..9a70d67831 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
@@ -85,6 +85,12 @@
                                     <Control HorizontalExpand="True"/>
                                     <Button Name="ShowClothes" Pressed="True" ToggleMode="True" Text="{Loc 'humanoid-profile-editor-clothing-show'}" HorizontalAlignment="Right" />
                                 </BoxContainer>
+                                <!-- Show loadouts -->
+                                <BoxContainer HorizontalExpand="True">
+                                    <Label Text="{Loc 'humanoid-profile-editor-loadouts'}" />
+                                    <Control HorizontalExpand="True"/>
+                                    <Button Name="ShowLoadouts" Pressed="True" ToggleMode="True" Text="{Loc 'Show'}" HorizontalAlignment="Right" />
+                                </BoxContainer>
                                 <!-- Clothing -->
                                 <BoxContainer HorizontalExpand="True">
                                     <Label Text="{Loc 'humanoid-profile-editor-clothing-label'}" />
@@ -142,6 +148,15 @@
                         <BoxContainer Name="CTraitsList" Orientation="Vertical" />
                     </ScrollContainer>
                 </BoxContainer>
+                <BoxContainer Name="CLoadoutsTab" Orientation="Vertical" Margin="10">
+                    <!-- Loadouts -->
+                    <Label Name="LoadoutPointsLabel" HorizontalAlignment="Stretch" Align="Center" />
+                    <ProgressBar Name="LoadoutPointsBar" MaxValue="1" Value="1" MaxHeight="8" Margin="0 5" />
+
+                    <Button Name="CHideShowUnusableButton" Text="{Loc 'humanoid-profile-editor-loadouts-show-unusable-button'}" ToolTip="{Loc 'humanoid-profile-editor-loadouts-show-unusable-button-tooltip'}" ToggleMode="True" Margin="0 0 0 5" />
+
+                    <TabContainer Name="CLoadoutsTabs" VerticalExpand="True" />
+                </BoxContainer>
                 <BoxContainer Name="CMarkingsTab" Orientation="Vertical" Margin="10">
                     <!-- Markings -->
                     <ScrollContainer VerticalExpand="True">
diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
index 3e2e379328..8b88fc1e9b 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using System.Numerics;
+using System.Text;
 using Content.Client.Guidebook;
 using Content.Client.Humanoid;
 using Content.Client.Lobby.UI;
@@ -9,17 +10,17 @@
 using Content.Client.UserInterface.Controls;
 using Content.Client.UserInterface.Systems.Guidebook;
 using Content.Shared.CCVar;
+using Content.Shared.Clothing.Loadouts.Prototypes;
+using Content.Shared.Clothing.Loadouts.Systems;
 using Content.Shared.GameTicking;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Humanoid.Prototypes;
-using Content.Shared.Inventory;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
 using Content.Shared.StatusIcon;
 using Content.Shared.Traits;
 using Robust.Client.AutoGenerated;
-using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -30,7 +31,6 @@
 using Robust.Shared.Enums;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using static Robust.Client.UserInterface.Controls.BoxContainer;
@@ -61,6 +61,7 @@ public sealed partial class HumanoidProfileEditor : Control
         private readonly IConfigurationManager _configurationManager;
         private readonly MarkingManager _markingManager;
         private readonly JobRequirementsManager _requirements;
+        private readonly LoadoutSystem _loadoutSystem;
 
         private LineEdit _ageEdit => CAgeEdit;
         private LineEdit _nameEdit => CNameEdit;
@@ -83,6 +84,11 @@ public sealed partial class HumanoidProfileEditor : Control
         private BoxContainer _jobList => CJobList;
         private BoxContainer _antagList => CAntagList;
         private BoxContainer _traitsList => CTraitsList;
+        private Label _loadoutPointsLabel => LoadoutPointsLabel;
+        private ProgressBar _loadoutPointsBar => LoadoutPointsBar;
+        private Button _loadoutsShowUnusableButton => CHideShowUnusableButton;
+        private BoxContainer _loadoutsTab => CLoadoutsTab;
+        private TabContainer _loadoutsTabs => CLoadoutsTabs;
         private readonly List<JobPrioritySelector> _jobPriorities;
         private OptionButton _preferenceUnavailableButton => CPreferenceUnavailableButton;
         private readonly Dictionary<string, BoxContainer> _jobCategories;
@@ -90,6 +96,7 @@ public sealed partial class HumanoidProfileEditor : Control
         private readonly List<SpeciesPrototype> _speciesList;
         private readonly List<AntagPreferenceSelector> _antagPreferences;
         private readonly List<TraitPreferenceSelector> _traitPreferences;
+        private readonly List<LoadoutPreferenceSelector> _loadoutPreferences;
 
         private SpriteView _previewSpriteView => CSpriteView;
         private Button _previewRotateLeftButton => CSpriteRotateLeft;
@@ -117,6 +124,7 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             _preferencesManager = preferencesManager;
             _configurationManager = configurationManager;
             _markingManager = IoCManager.Resolve<MarkingManager>();
+            _loadoutSystem = EntitySystem.Get<LoadoutSystem>();
 
             SpeciesInfoButton.ToolTip = Loc.GetString("humanoid-profile-editor-guidebook-button-tooltip");
 
@@ -140,6 +148,7 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             _tabContainer.SetTabTitle(0, Loc.GetString("humanoid-profile-editor-appearance-tab"));
 
             ShowClothes.OnPressed += ToggleClothes;
+            ShowLoadouts.OnPressed += ToggleClothes;
 
             #region Sex
 
@@ -465,6 +474,22 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
 
             #endregion
 
+            #region Loadouts
+
+            // Set up the loadouts tab
+            _tabContainer.SetTabTitle(4, Loc.GetString("humanoid-profile-editor-loadouts-tab"));
+            _loadoutPreferences = new List<LoadoutPreferenceSelector>();
+
+            // Show/Hide loadouts tab if they ever get enabled/disabled
+            var loadoutsEnabled = _configurationManager.GetCVar(CCVars.GameLoadoutsEnabled);
+            _tabContainer.SetTabVisible(4, loadoutsEnabled);
+            ShowLoadouts.Visible = loadoutsEnabled;
+            _configurationManager.OnValueChanged(CCVars.GameLoadoutsEnabled, enabled => LoadoutsChanged(enabled));
+
+            _loadoutsShowUnusableButton.OnToggled += args => UpdateLoadouts(args.Pressed);
+
+            #endregion
+
             #region Save
 
             _saveButton.OnPressed += _ => { Save(); };
@@ -472,7 +497,7 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             #endregion Save
 
             #region Markings
-            _tabContainer.SetTabTitle(4, Loc.GetString("humanoid-profile-editor-markings-tab"));
+            _tabContainer.SetTabTitle(5, Loc.GetString("humanoid-profile-editor-markings-tab"));
 
             CMarkings.OnMarkingAdded += OnMarkingChange;
             CMarkings.OnMarkingRemoved += OnMarkingChange;
@@ -516,6 +541,9 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
 
             _previewDummy = _entMan.SpawnEntity(dollProto, MapCoordinates.Nullspace);
             _previewSpriteView.SetEntity(_previewDummy);
+
+            UpdateLoadouts(false); // Initial UpdateLoadouts call has to have a dummy to get information from
+
             #endregion Dummy
 
             #endregion Left
@@ -534,6 +562,12 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             IsDirty = false;
         }
 
+        private void LoadoutsChanged(bool enabled)
+        {
+            _tabContainer.SetTabVisible(4, enabled);
+            ShowLoadouts.Visible = enabled;
+        }
+
         private void OnSpeciesInfoButtonPressed(BaseButton.ButtonEventArgs args)
         {
             var guidebookController = UserInterfaceManager.GetUIController<GuidebookUIController>();
@@ -781,6 +815,8 @@ protected override void Dispose(bool disposing)
 
             _requirements.Updated -= UpdateRoleRequirements;
             _preferencesManager.OnServerDataLoaded -= LoadServerData;
+
+            _configurationManager.UnsubValueChanged(CCVars.GameLoadoutsEnabled, enabled => LoadoutsChanged(enabled));
         }
 
         private void RebuildSpriteView()
@@ -1203,6 +1239,8 @@ private void UpdatePreview()
 
             if (ShowClothes.Pressed)
                 LobbyCharacterPreviewPanel.GiveDummyJobClothes(_previewDummy!.Value, Profile);
+            if (ShowLoadouts.Pressed)
+                LobbyCharacterPreviewPanel.GiveDummyLoadoutItems(_previewDummy!.Value, Profile);
 
             _previewSpriteView.OverrideDirection = (Direction) ((int) _previewRotation % 4 * 2);
         }
@@ -1225,6 +1263,8 @@ public void UpdateControls()
             UpdateJobPriorities();
             UpdateAntagPreferences();
             UpdateTraitPreferences();
+            UpdateLoadouts(_loadoutsShowUnusableButton.Pressed);
+            UpdateLoadoutPreferences();
             UpdateMarkings();
             RebuildSpriteView();
             UpdateHairPickers();
@@ -1418,6 +1458,253 @@ private void UpdateTraitPreferences()
             }
         }
 
+        private void UpdateLoadoutPreferences()
+        {
+            var points = _configurationManager.GetCVar(CCVars.GameLoadoutsPoints);
+            _loadoutPointsBar.Value = points;
+            _loadoutPointsLabel.Text = Loc.GetString("humanoid-profile-editor-loadouts-points-label", ("points", points), ("max", points));
+
+            foreach (var preferenceSelector in _loadoutPreferences)
+            {
+                var loadoutId = preferenceSelector.Loadout.ID;
+                var preference = Profile?.LoadoutPreferences.Contains(loadoutId) ?? false;
+
+                preferenceSelector.Preference = preference;
+
+                if (preference)
+                {
+                    points -= preferenceSelector.Loadout.Cost;
+                    _loadoutPointsBar.Value = points;
+                    _loadoutPointsLabel.Text = Loc.GetString("humanoid-profile-editor-loadouts-points-label", ("points", points), ("max", _loadoutPointsBar.MaxValue));
+                }
+            }
+        }
+
+        private void UpdateLoadouts(bool showUnusable)
+        {
+            // Reset loadout points so you don't get -14 points or something for no reason
+            var points = _configurationManager.GetCVar(CCVars.GameLoadoutsPoints);
+            _loadoutPointsLabel.Text = Loc.GetString("humanoid-profile-editor-loadouts-points-label", ("points", points), ("max", points));
+            _loadoutPointsBar.MaxValue = points;
+            _loadoutPointsBar.Value = points;
+
+            // Clear current listings
+            _loadoutPreferences.Clear();
+            _loadoutsTabs.DisposeAllChildren();
+
+
+            // Get the highest priority job to use for loadout filtering
+            var highJob = _jobPriorities.FirstOrDefault(j => j.Priority == JobPriority.High);
+
+            // Get all loadout prototypes
+            var enumeratedLoadouts = _prototypeManager.EnumeratePrototypes<LoadoutPrototype>().ToList();
+
+            // If showUnusable is false filter out loadouts that are unusable based on your current character setup
+            var loadouts = enumeratedLoadouts.Where(loadout =>
+                showUnusable || // Ignore everything if this is true
+                _loadoutSystem.CheckRequirementsValid(
+                    loadout.Requirements,
+                    highJob?.Proto ?? new JobPrototype(),
+                    Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
+                    new Dictionary<string, TimeSpan>(),
+                    _entMan,
+                    _prototypeManager,
+                    _configurationManager,
+                    out _
+                )
+            ).ToList();
+
+            // Loadouts to highlight red when showUnusable is true
+            var loadoutsUnusable = enumeratedLoadouts.Where(loadout =>
+                _loadoutSystem.CheckRequirementsValid(
+                    loadout.Requirements,
+                    highJob?.Proto ?? new JobPrototype(),
+                    Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
+                    new Dictionary<string, TimeSpan>(),
+                    _entMan,
+                    _prototypeManager,
+                    _configurationManager,
+                    out _
+                )
+            ).ToList();
+
+            // Every loadout not in the loadouts list
+            var otherLoadouts = enumeratedLoadouts.Where(loadout => !loadouts.Contains(loadout)).ToList();
+
+
+            if (loadouts.Count == 0)
+            {
+                _loadoutsTab.AddChild(new Label { Text = Loc.GetString("humanoid-profile-editor-loadouts-no-loadouts") });
+                return;
+            }
+
+            // Make Uncategorized category
+            var uncategorized = new BoxContainer
+            {
+                Orientation = LayoutOrientation.Vertical,
+                VerticalExpand = true,
+                Name = "Uncategorized_0",
+            };
+
+            _loadoutsTabs.AddChild(uncategorized);
+            _loadoutsTabs.SetTabTitle(0, Loc.GetString("humanoid-profile-editor-loadouts-uncategorized-tab"));
+
+            // Make categories
+            var currentCategory = 1; // 1 because we already made 0 as Uncategorized, I am not not zero-indexing :)
+            foreach (var loadout in loadouts.OrderBy(l => l.Category))
+            {
+                // Check for existing category
+                BoxContainer? match = null;
+                foreach (var child in _loadoutsTabs.Children)
+                {
+                    if (match != null || child.Name == null)
+                        continue;
+                    if (child.Name.Split("_")[0] == loadout.Category)
+                        match = (BoxContainer) child;
+                }
+
+                // If there is a category do nothing
+                if (match != null)
+                    continue;
+
+                // If not, make it
+                var box = new BoxContainer
+                {
+                    Orientation = LayoutOrientation.Vertical,
+                    VerticalExpand = true,
+                    Name = $"{loadout.Category}_{currentCategory}",
+                    // I hate ScrollContainers
+                    Children =
+                    {
+                        new ScrollContainer
+                        {
+                            HScrollEnabled = false,
+                            HorizontalExpand = true,
+                            VerticalExpand = true,
+                            Children =
+                            {
+                                new BoxContainer
+                                {
+                                    Orientation = LayoutOrientation.Vertical,
+                                    HorizontalExpand = true,
+                                    VerticalExpand = true,
+                                },
+                            },
+                        },
+                    },
+                };
+
+                _loadoutsTabs.AddChild(box);
+                _loadoutsTabs.SetTabTitle(currentCategory, Loc.GetString($"loadout-category-{loadout.Category}"));
+                currentCategory++;
+            }
+
+            // Fill categories
+            foreach (var loadout in loadouts.OrderBy(l => l.ID))
+            {
+                var selector = new LoadoutPreferenceSelector(loadout, highJob?.Proto ?? new JobPrototype(),
+                    Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(),
+                    loadoutsUnusable.Contains(loadout) ? "" : "ButtonColorRed", _entMan, _prototypeManager,
+                    _configurationManager, _loadoutSystem);
+
+                // Look for an existing loadout category
+                BoxContainer? match = null;
+                foreach (var child in _loadoutsTabs.Children)
+                {
+                    if (match != null || child.Name == null)
+                        continue;
+
+                    if (child.Name.Split("_")[0] == loadout.Category)
+                        match = (BoxContainer) child.Children.First().Children.First();
+                }
+
+                // If there is no category put it in Uncategorized
+                if (match?.Parent?.Parent?.Name == null)
+                    uncategorized.AddChild(selector);
+                else
+                    match.AddChild(selector);
+
+                _loadoutPreferences.Add(selector);
+                selector.PreferenceChanged += preference =>
+                {
+                    // Make sure they have enough loadout points
+                    if (preference)
+                    {
+                        var temp = _loadoutPointsBar.Value - loadout.Cost;
+                        if (temp < 0)
+                            preference = false;
+                        else
+                        {
+                            _loadoutPointsLabel.Text = Loc.GetString("humanoid-profile-editor-loadouts-points-label",
+                                ("points", temp), ("max", _loadoutPointsBar.MaxValue));
+                            _loadoutPointsBar.Value = temp;
+                        }
+                    }
+                    else
+                    {
+                        _loadoutPointsLabel.Text = Loc.GetString("humanoid-profile-editor-loadouts-points-label",
+                            ("points", _loadoutPointsBar.Value), ("max", _loadoutPointsBar.MaxValue));
+                        _loadoutPointsBar.Value += loadout.Cost;
+                    }
+                    // Update Preference
+                    Profile = Profile?.WithLoadoutPreference(loadout.ID, preference);
+                    IsDirty = true;
+                    UpdateLoadoutPreferences();
+                };
+            }
+
+            // Add the selected unusable loadouts to the point counter
+            foreach (var loadout in otherLoadouts.OrderBy(l => l.ID))
+            {
+                var selector = new LoadoutPreferenceSelector(loadout, highJob?.Proto ?? new JobPrototype(),
+                    Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(), "", _entMan, _prototypeManager,
+                    _configurationManager, _loadoutSystem);
+
+                _loadoutPreferences.Add(selector);
+                selector.PreferenceChanged += preference =>
+                {
+                    // Make sure they have enough loadout points
+                    if (preference)
+                    {
+                        var temp = _loadoutPointsBar.Value - loadout.Cost;
+                        if (temp < 0)
+                            preference = false;
+                        else
+                        {
+                            _loadoutPointsLabel.Text = Loc.GetString("humanoid-profile-editor-loadouts-points-label",
+                                ("points", temp), ("max", _loadoutPointsBar.MaxValue));
+                            _loadoutPointsBar.Value = temp;
+                        }
+                    }
+                    else
+                    {
+                        _loadoutPointsLabel.Text = Loc.GetString("humanoid-profile-editor-loadouts-points-label",
+                            ("points", _loadoutPointsBar.Value), ("max", _loadoutPointsBar.MaxValue));
+                        _loadoutPointsBar.Value += loadout.Cost;
+                    }
+                    // Update Preference
+                    Profile = Profile?.WithLoadoutPreference(loadout.ID, preference);
+                    IsDirty = true;
+                    UpdateLoadoutPreferences();
+                };
+            }
+
+
+            // Hide Uncategorized tab if it's empty, other tabs already shouldn't exist if they're empty
+            if (!uncategorized.Children.Any())
+                _loadoutsTabs.SetTabVisible(0, false);
+
+            // Add fake tabs until tab container is happy
+            for (var i = _loadoutsTabs.ChildCount - 1; i < _loadoutsTabs.CurrentTab; i++)
+            {
+                _loadoutsTabs.AddChild(new BoxContainer());
+                _loadoutsTabs.SetTabVisible(i + 1, false);
+            }
+
+            UpdateLoadoutPreferences();
+        }
+
+
         private sealed class AntagPreferenceSelector : RequirementsSelector<AntagPrototype>
         {
             // 0 is yes and 1 is no
@@ -1456,12 +1743,12 @@ public AntagPreferenceSelector(AntagPrototype proto)
         private sealed class TraitPreferenceSelector : Control
         {
             public TraitPrototype Trait { get; }
-            private readonly CheckBox _checkBox;
+            private readonly Button _button;
 
             public bool Preference
             {
-                get => _checkBox.Pressed;
-                set => _checkBox.Pressed = value;
+                get => _button.Pressed;
+                set => _button.Pressed = value;
             }
 
             public event Action<bool>? PreferenceChanged;
@@ -1470,22 +1757,108 @@ public TraitPreferenceSelector(TraitPrototype trait)
             {
                 Trait = trait;
 
-                _checkBox = new CheckBox {Text = Loc.GetString(trait.Name)};
-                _checkBox.OnToggled += OnCheckBoxToggled;
+                _button = new Button {Text = Loc.GetString(trait.Name)};
+                _button.ToggleMode = true;
+                _button.OnToggled += OnButtonToggled;
 
                 if (trait.Description is { } desc)
                 {
-                    _checkBox.ToolTip = Loc.GetString(desc);
+                    _button.ToolTip = Loc.GetString(desc);
                 }
 
                 AddChild(new BoxContainer
                 {
                     Orientation = LayoutOrientation.Horizontal,
-                    Children = { _checkBox },
+                    Children = { _button },
+                });
+            }
+
+            private void OnButtonToggled(BaseButton.ButtonToggledEventArgs args)
+            {
+                PreferenceChanged?.Invoke(Preference);
+            }
+        }
+
+        private sealed class LoadoutPreferenceSelector : Control
+        {
+            public LoadoutPrototype Loadout { get; }
+            private readonly Button _button;
+
+            public bool Preference
+            {
+                get => _button.Pressed;
+                set => _button.Pressed = value;
+            }
+
+            public event Action<bool>? PreferenceChanged;
+
+            public LoadoutPreferenceSelector(LoadoutPrototype loadout, JobPrototype highJob,
+                HumanoidCharacterProfile profile, string style, IEntityManager entityManager, IPrototypeManager prototypeManager,
+                IConfigurationManager configManager, LoadoutSystem loadoutSystem)
+            {
+                Loadout = loadout;
+
+                // Display the first item in the loadout as a preview
+                // TODO: Maybe allow custom icons to be specified in the prototype?
+                var dummyLoadoutItem = entityManager.SpawnEntity(loadout.Items.First(), MapCoordinates.Nullspace);
+
+                // Create a sprite preview of the loadout item
+                var previewLoadout = new SpriteView
+                {
+                    Scale = new Vector2(1, 1),
+                    OverrideDirection = Direction.South,
+                    VerticalAlignment = VAlignment.Center,
+                    SizeFlagsStretchRatio = 1,
+                };
+                previewLoadout.SetEntity(dummyLoadoutItem);
+
+
+                // Create a checkbox to get the loadout
+                _button = new Button
+                {
+                    Text = $"[{loadout.Cost}] {(Loc.GetString($"loadout-name-{loadout.ID}") == $"loadout-name-{loadout.ID}"
+                        ? entityManager.GetComponent<MetaDataComponent>(dummyLoadoutItem).EntityName
+                        : Loc.GetString($"loadout-name-{loadout.ID}"))}",
+                    VerticalAlignment = VAlignment.Center,
+                    ToggleMode = true,
+                };
+                _button.OnToggled += OnButtonToggled;
+                _button.AddStyleClass(style);
+
+                var tooltip = new StringBuilder();
+                // Add the loadout description to the tooltip if there is one
+                var desc = !Loc.TryGetString($"loadout-description-{loadout.ID}", out var description)
+                    ? entityManager.GetComponent<MetaDataComponent>(dummyLoadoutItem).EntityDescription
+                    : description;
+                if (!string.IsNullOrEmpty(desc))
+                    tooltip.Append($"{Loc.GetString(desc)}");
+
+
+                // Get requirement reasons
+                loadoutSystem.CheckRequirementsValid(loadout.Requirements, highJob, profile, new Dictionary<string, TimeSpan>(), entityManager, prototypeManager, configManager, out var reasons);
+
+                // Add requirement reasons to the tooltip
+                foreach (var reason in reasons)
+                    tooltip.Append($"\n{reason.ToMarkup()}");
+
+                // Combine the tooltip and format it in the checkbox supplier
+                if (tooltip.Length > 0)
+                {
+                    var formattedTooltip = new Tooltip();
+                    formattedTooltip.SetMessage(FormattedMessage.FromMarkupPermissive(tooltip.ToString()));
+                    _button.TooltipSupplier = _ => formattedTooltip;
+                }
+
+
+                // Add the loadout preview and the checkbox to the control
+                AddChild(new BoxContainer
+                {
+                    Orientation = LayoutOrientation.Horizontal,
+                    Children = { previewLoadout, _button },
                 });
             }
 
-            private void OnCheckBoxToggled(BaseButton.ButtonToggledEventArgs args)
+            private void OnButtonToggled(BaseButton.ButtonToggledEventArgs args)
             {
                 PreferenceChanged?.Invoke(Preference);
             }
diff --git a/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs b/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs
index adc535b268..9012767ef3 100644
--- a/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs
+++ b/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs
@@ -121,7 +121,10 @@ private void RadiationQuery(IEye? currentEye)
 
         private bool PulseQualifies(EntityUid pulseEntity, MapCoordinates currentEyeLoc)
         {
-            return _entityManager.GetComponent<TransformComponent>(pulseEntity).MapID == currentEyeLoc.MapId && _entityManager.GetComponent<TransformComponent>(pulseEntity).Coordinates.InRange(_entityManager, EntityCoordinates.FromMap(_entityManager, _entityManager.GetComponent<TransformComponent>(pulseEntity).ParentUid, currentEyeLoc), MaxDist);
+            var transformComponent = _entityManager.GetComponent<TransformComponent>(pulseEntity);
+            var transformSystem = _entityManager.System<SharedTransformSystem>();
+            return transformComponent.MapID == currentEyeLoc.MapId
+                && transformComponent.Coordinates.InRange(_entityManager, transformSystem, EntityCoordinates.FromMap(transformComponent.ParentUid, currentEyeLoc, transformSystem, _entityManager), MaxDist);
         }
 
         private sealed record RadiationShaderInstance(MapCoordinates CurrentMapCoords, float Range, TimeSpan Start, float Duration)
diff --git a/Content.Client/Sandbox/SandboxSystem.cs b/Content.Client/Sandbox/SandboxSystem.cs
index d16751e371..6a1129bb75 100644
--- a/Content.Client/Sandbox/SandboxSystem.cs
+++ b/Content.Client/Sandbox/SandboxSystem.cs
@@ -16,6 +16,7 @@ public sealed class SandboxSystem : SharedSandboxSystem
         [Dependency] private readonly IMapManager _map = default!;
         [Dependency] private readonly IPlacementManager _placement = default!;
         [Dependency] private readonly ContentEyeSystem _contentEye = default!;
+        [Dependency] private readonly SharedTransformSystem _transform = default!;
 
         private bool _sandboxEnabled;
         public bool SandboxAllowed { get; private set; }
@@ -108,7 +109,7 @@ public bool Copy(ICommonSession? session, EntityCoordinates coords, EntityUid ui
             }
 
             // Try copy tile.
-            if (!_map.TryFindGridAt(coords.ToMap(EntityManager), out _, out var grid) || !grid.TryGetTileRef(coords, out var tileRef))
+            if (!_map.TryFindGridAt(coords.ToMap(EntityManager, _transform), out _, out var grid) || !grid.TryGetTileRef(coords, out var tileRef))
                 return false;
 
             if (_placement.Eraser)
diff --git a/Content.Client/Shuttles/UI/MapScreen.xaml.cs b/Content.Client/Shuttles/UI/MapScreen.xaml.cs
index 65a11d345d..8430699bae 100644
--- a/Content.Client/Shuttles/UI/MapScreen.xaml.cs
+++ b/Content.Client/Shuttles/UI/MapScreen.xaml.cs
@@ -318,10 +318,13 @@ private void RebuildMapObjects()
 
             foreach (var grid in _mapManager.GetAllMapGrids(mapComp.MapId))
             {
+                _entManager.TryGetComponent(grid.Owner, out IFFComponent? iffComp);
+
                 var gridObj = new GridMapObject()
                 {
                     Name = _entManager.GetComponent<MetaDataComponent>(grid.Owner).EntityName,
-                    Entity = grid.Owner
+                    Entity = grid.Owner,
+                    HideButton = iffComp != null && (iffComp.Flags & IFFFlags.HideLabel) != 0x0,
                 };
 
                 // Always show our shuttle immediately
@@ -329,7 +332,8 @@ private void RebuildMapObjects()
                 {
                     AddMapObject(mapComp.MapId, gridObj);
                 }
-                else
+                else if (iffComp == null ||
+                         (iffComp.Flags & IFFFlags.Hide) == 0x0)
                 {
                     _pendingMapObjects.Add((mapComp.MapId, gridObj));
                 }
@@ -423,10 +427,14 @@ public void SetMap(MapId mapId, Vector2 position)
     /// </summary>
     private void AddMapObject(MapId mapId, IMapObject mapObj)
     {
-        var gridContents = _mapHeadings[mapId];
         var existing = _mapObjects.GetOrNew(mapId);
         existing.Add(mapObj);
 
+        if (mapObj.HideButton)
+            return;
+
+        var gridContents = _mapHeadings[mapId];
+
         var gridButton = new Button()
         {
             Text = mapObj.Name,
diff --git a/Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs b/Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs
index 55ef55a6c7..2ce1906d3d 100644
--- a/Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs
+++ b/Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs
@@ -345,7 +345,7 @@ protected override void Draw(DrawingHandleScreen handle)
             // Rudimentary IFF for now, if IFF hiding on then we don't show on the map at all
             if (grid.Owner != _shuttleEntity &&
                 EntManager.TryGetComponent(grid, out iffComp) &&
-                (iffComp.Flags & (IFFFlags.Hide | IFFFlags.HideLabel)) != 0x0)
+                (iffComp.Flags & IFFFlags.Hide) != 0x0)
             {
                 continue;
             }
@@ -367,6 +367,9 @@ protected override void Draw(DrawingHandleScreen handle)
             AddMapObject(existingEdges, existingVerts, mapObject);
 
             // Text
+            if (iffComp != null && (iffComp.Flags & IFFFlags.HideLabel) != 0x0)
+                continue;
+
             // Force drawing it at this point.
             var iffText = _shuttles.GetIFFLabel(grid, self: true, component: iffComp);
 
diff --git a/Content.Client/Sprite/RandomSpriteSystem.cs b/Content.Client/Sprite/RandomSpriteSystem.cs
index 04f6681136..b9be2a44b4 100644
--- a/Content.Client/Sprite/RandomSpriteSystem.cs
+++ b/Content.Client/Sprite/RandomSpriteSystem.cs
@@ -1,3 +1,5 @@
+using Content.Client.Clothing;
+using Content.Shared.Clothing.Components;
 using Content.Shared.Sprite;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameStates;
@@ -8,6 +10,7 @@ namespace Content.Client.Sprite;
 public sealed class RandomSpriteSystem : SharedRandomSpriteSystem
 {
     [Dependency] private readonly IReflectionManager _reflection = default!;
+    [Dependency] private readonly ClientClothingSystem _clothing = default!;
 
     public override void Initialize()
     {
@@ -31,10 +34,29 @@ private void OnHandleState(EntityUid uid, RandomSpriteComponent component, ref C
             component.Selected.Add(layer.Key, layer.Value);
         }
 
-        UpdateAppearance(uid, component);
+        UpdateSpriteComponentAppearance(uid, component);
+        UpdateClothingComponentAppearance(uid, component);
     }
 
-    private void UpdateAppearance(EntityUid uid, RandomSpriteComponent component, SpriteComponent? sprite = null)
+    private void UpdateClothingComponentAppearance(EntityUid uid, RandomSpriteComponent component, ClothingComponent? clothing = null)
+    {
+        if (!Resolve(uid, ref clothing, false))
+            return;
+
+        if (clothing.ClothingVisuals == null)
+            return;
+
+        foreach (var slotPair in clothing.ClothingVisuals)
+        {
+            foreach (var keyColorPair in component.Selected)
+            {
+                _clothing.SetLayerColor(clothing, slotPair.Key, keyColorPair.Key, keyColorPair.Value.Color);
+                _clothing.SetLayerState(clothing, slotPair.Key, keyColorPair.Key, keyColorPair.Value.State);
+            }
+        }
+    }
+
+    private void UpdateSpriteComponentAppearance(EntityUid uid, RandomSpriteComponent component, SpriteComponent? sprite = null)
     {
         if (!Resolve(uid, ref sprite, false))
             return;
@@ -51,11 +73,10 @@ private void UpdateAppearance(EntityUid uid, RandomSpriteComponent component, Sp
             {
                 if (layer.Key is not { } strKey || !int.TryParse(strKey, out index))
                 {
-                    Logger.Error($"Invalid key `{layer.Key}` for entity with random sprite {ToPrettyString(uid)}");
+                    Log.Error($"Invalid key `{layer.Key}` for entity with random sprite {ToPrettyString(uid)}");
                     continue;
                 }
             }
-
             sprite.LayerSetState(index, layer.Value.State);
             sprite.LayerSetColor(index, layer.Value.Color ?? Color.White);
         }
diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs
index e1f32a9e5e..13ba259dbc 100644
--- a/Content.Client/Stylesheets/StyleNano.cs
+++ b/Content.Client/Stylesheets/StyleNano.cs
@@ -926,6 +926,14 @@ public StyleNano(IResourceCache resCache) : base(resCache)
                     new StyleProperty(PanelContainer.StylePropertyPanel, whisperBox)
                 }),
 
+                new StyleRule(new SelectorChild(
+                    new SelectorElement(typeof(PanelContainer), new[] {"speechBox", "whisperBox"}, null, null),
+                    new SelectorElement(typeof(RichTextLabel), new[] {"bubbleContent"}, null, null)),
+                    new[]
+                {
+                    new StyleProperty("font", notoSansItalic12),
+                }),
+
                 new StyleRule(new SelectorChild(
                     new SelectorElement(typeof(PanelContainer), new[] {"speechBox", "emoteBox"}, null, null),
                     new SelectorElement(typeof(RichTextLabel), null, null, null)),
diff --git a/Content.Client/UserInterface/Controls/ProgressTextureRect.cs b/Content.Client/UserInterface/Controls/ProgressTextureRect.cs
index 3f422e371f..2b8d93a5d4 100644
--- a/Content.Client/UserInterface/Controls/ProgressTextureRect.cs
+++ b/Content.Client/UserInterface/Controls/ProgressTextureRect.cs
@@ -1,5 +1,5 @@
 using System.Numerics;
-using Content.Client.DoAfter;
+using Content.Client.UserInterface.Systems;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
 
@@ -9,11 +9,13 @@ public sealed class ProgressTextureRect : TextureRect
     {
         public float Progress;
 
+        private readonly ProgressColorSystem _progressColor = IoCManager.Resolve<IEntityManager>().System<ProgressColorSystem>();
+
         protected override void Draw(DrawingHandleScreen handle)
         {
             var dims = Texture != null ? GetDrawDimensions(Texture) : UIBox2.FromDimensions(Vector2.Zero, PixelSize);
             dims.Top = Math.Max(dims.Bottom - dims.Bottom * Progress,0);
-            handle.DrawRect(dims, DoAfterOverlay.GetProgressColor(Progress));
+            handle.DrawRect(dims, _progressColor.GetProgressColor(Progress));
 
             base.Draw(handle);
         }
diff --git a/Content.Client/UserInterface/Systems/Actions/Controls/ActionButtonContainer.cs b/Content.Client/UserInterface/Systems/Actions/Controls/ActionButtonContainer.cs
index a2aa972625..c5f8adbdea 100644
--- a/Content.Client/UserInterface/Systems/Actions/Controls/ActionButtonContainer.cs
+++ b/Content.Client/UserInterface/Systems/Actions/Controls/ActionButtonContainer.cs
@@ -42,11 +42,12 @@ ActionButton MakeButton(int index)
         {
             var button = new ActionButton(_entity);
 
-            if (keys.TryGetValue(index, out var boundKey))
-            {
-                button.KeyBind = boundKey;
+            if (!keys.TryGetValue(index, out var boundKey))
+                return button;
 
-                var binding = _input.GetKeyBinding(boundKey);
+            button.KeyBind = boundKey;
+            if (_input.TryGetKeyBinding(boundKey, out var binding))
+            {
                 button.Label.Text = binding.GetKeyString();
             }
 
diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
index ff4972d9d0..0ad78f974e 100644
--- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
+++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
@@ -627,7 +627,7 @@ private void UpdateQueuedSpeechBubbles(FrameEventArgs delta)
 
             var otherPos = EntityManager.GetComponent<TransformComponent>(ent).MapPosition;
 
-            if (occluded && !ExamineSystemShared.InRangeUnOccluded(
+            if (occluded && !_examine.InRangeUnOccluded(
                     playerPos,
                     otherPos, 0f,
                     (ent, player), predicate))
diff --git a/Content.Client/UserInterface/Systems/ProgressColorSystem.cs b/Content.Client/UserInterface/Systems/ProgressColorSystem.cs
new file mode 100644
index 0000000000..e5579801ec
--- /dev/null
+++ b/Content.Client/UserInterface/Systems/ProgressColorSystem.cs
@@ -0,0 +1,77 @@
+using Content.Shared.CCVar;
+using Robust.Shared.Configuration;
+
+namespace Content.Client.UserInterface.Systems;
+
+/// <summary>
+/// This system handles getting an interpolated color based on the value of a cvar.
+/// </summary>
+public sealed class ProgressColorSystem : EntitySystem
+{
+    [Dependency] private readonly IConfigurationManager _configuration = default!;
+
+    private bool _colorBlindFriendly;
+
+    private static readonly Color[] Plasma =
+    {
+        new(240, 249, 33),
+        new(248, 149, 64),
+        new(204, 71, 120),
+        new(126, 3, 168),
+        new(13, 8, 135)
+    };
+
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        Subs.CVar(_configuration, CCVars.AccessibilityColorblindFriendly, OnColorBlindFriendlyChanged, true);
+    }
+
+    private void OnColorBlindFriendlyChanged(bool value, in CVarChangeInfo info)
+    {
+        _colorBlindFriendly = value;
+    }
+
+    public Color GetProgressColor(float progress)
+    {
+        if (!_colorBlindFriendly)
+        {
+            if (progress >= 1.0f)
+            {
+                return new Color(0f, 1f, 0f);
+            }
+
+            // lerp
+            var hue = 5f / 18f * progress;
+            return Color.FromHsv((hue, 1f, 0.75f, 1f));
+        }
+
+        return InterpolateColorGaussian(Plasma, progress);
+    }
+
+    /// <summary>
+    /// Interpolates between multiple colors based on a gaussian distribution.
+    /// Taken from https://stackoverflow.com/a/26103117
+    /// </summary>
+    public static Color InterpolateColorGaussian(Color[] colors, double x)
+    {
+        double r = 0.0, g = 0.0, b = 0.0;
+        var total = 0f;
+        var step = 1.0 / (colors.Length - 1);
+        var mu = 0.0;
+        const double sigma2 = 0.035;
+
+        foreach(var color in colors)
+        {
+            var percent = Math.Exp(-(x - mu) * (x - mu) / (2.0 * sigma2)) / Math.Sqrt(2.0 * Math.PI * sigma2);
+            total += (float) percent;
+            mu += step;
+
+            r += color.R * percent;
+            g += color.G * percent;
+            b += color.B * percent;
+        }
+
+        return new Color((float) r / total, (float) g / total, (float) b / total);
+    }
+}
diff --git a/Content.Client/Verbs/VerbSystem.cs b/Content.Client/Verbs/VerbSystem.cs
index 329a8977a6..77f46a3fc9 100644
--- a/Content.Client/Verbs/VerbSystem.cs
+++ b/Content.Client/Verbs/VerbSystem.cs
@@ -20,7 +20,7 @@ namespace Content.Client.Verbs
     public sealed class VerbSystem : SharedVerbSystem
     {
         [Dependency] private readonly PopupSystem _popupSystem = default!;
-        [Dependency] private readonly ExamineSystem _examineSystem = default!;
+        [Dependency] private readonly ExamineSystem _examine = default!;
         [Dependency] private readonly TagSystem _tagSystem = default!;
         [Dependency] private readonly IStateManager _stateManager = default!;
         [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
@@ -77,7 +77,7 @@ public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true
                 bool Predicate(EntityUid e) => e == player || entitiesUnderMouse.Contains(e);
 
                 // first check the general location.
-                if (!_examineSystem.CanExamine(player.Value, targetPos, Predicate))
+                if (!_examine.CanExamine(player.Value, targetPos, Predicate))
                     return false;
 
                 TryComp(player.Value, out ExaminerComponent? examiner);
@@ -86,7 +86,7 @@ public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true
                 entities = new();
                 foreach (var ent in _entityLookup.GetEntitiesInRange(targetPos, EntityMenuLookupSize))
                 {
-                    if (_examineSystem.CanExamine(player.Value, targetPos, Predicate, ent, examiner))
+                    if (_examine.CanExamine(player.Value, targetPos, Predicate, ent, examiner))
                         entities.Add(ent);
                 }
             }
@@ -147,7 +147,7 @@ public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true
                 {
                     var entity = entities[i];
 
-                    if (!ExamineSystemShared.InRangeUnOccluded(
+                    if (!_examine.InRangeUnOccluded(
                         playerPos,
                         xformQuery.GetComponent(entity).MapPosition,
                         ExamineSystemShared.ExamineRange,
diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.Magazine.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.Magazine.cs
index eaab8401bc..0df95e4c02 100644
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.Magazine.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.Magazine.cs
@@ -8,6 +8,7 @@ protected override void InitializeMagazine()
     {
         base.InitializeMagazine();
         SubscribeLocalEvent<MagazineAmmoProviderComponent, UpdateAmmoCounterEvent>(OnMagazineAmmoUpdate);
+        SubscribeLocalEvent<MagazineAmmoProviderComponent, AmmoCounterControlEvent>(OnMagazineControl);
     }
 
     private void OnMagazineAmmoUpdate(EntityUid uid, MagazineAmmoProviderComponent component, UpdateAmmoCounterEvent args)
@@ -26,4 +27,12 @@ private void OnMagazineAmmoUpdate(EntityUid uid, MagazineAmmoProviderComponent c
 
         RaiseLocalEvent(ent.Value, args, false);
     }
+
+    private void OnMagazineControl(EntityUid uid, MagazineAmmoProviderComponent component, AmmoCounterControlEvent args)
+    {
+        var ent = GetMagazineEntity(uid);
+        if (ent == null)
+            return;
+        RaiseLocalEvent(ent.Value, args, false);
+    }
 }
diff --git a/Content.Client/Zombies/ZombieSystem.cs b/Content.Client/Zombies/ZombieSystem.cs
index bd89e978c7..7c1fb38e74 100644
--- a/Content.Client/Zombies/ZombieSystem.cs
+++ b/Content.Client/Zombies/ZombieSystem.cs
@@ -15,6 +15,7 @@ public override void Initialize()
 
         SubscribeLocalEvent<ZombieComponent, ComponentStartup>(OnStartup);
         SubscribeLocalEvent<ZombieComponent, CanDisplayStatusIconsEvent>(OnCanDisplayStatusIcons);
+        SubscribeLocalEvent<InitialInfectedComponent, CanDisplayStatusIconsEvent>(OnCanDisplayStatusIcons);
     }
 
     private void OnStartup(EntityUid uid, ZombieComponent component, ComponentStartup args)
@@ -36,7 +37,18 @@ private void OnStartup(EntityUid uid, ZombieComponent component, ComponentStartu
     /// </summary>
     private void OnCanDisplayStatusIcons(EntityUid uid, ZombieComponent component, ref CanDisplayStatusIconsEvent args)
     {
-        if (HasComp<ZombieComponent>(args.User) || HasComp<ShowZombieIconsComponent>(args.User))
+        if (HasComp<ZombieComponent>(args.User) || HasComp<InitialInfectedComponent>(args.User) || HasComp<ShowZombieIconsComponent>(args.User))
+            return;
+
+        if (component.IconVisibleToGhost && HasComp<GhostComponent>(args.User))
+            return;
+
+        args.Cancelled = true;
+    }
+
+    private void OnCanDisplayStatusIcons(EntityUid uid, InitialInfectedComponent component, CanDisplayStatusIconsEvent args)
+    {
+        if (HasComp<InitialInfectedComponent>(args.User) && !HasComp<ZombieComponent>(args.User))
             return;
 
         if (component.IconVisibleToGhost && HasComp<GhostComponent>(args.User))
diff --git a/Content.IntegrationTests/Tests/Body/LungTest.cs b/Content.IntegrationTests/Tests/Body/LungTest.cs
index d0325480ac..f2e19849b0 100644
--- a/Content.IntegrationTests/Tests/Body/LungTest.cs
+++ b/Content.IntegrationTests/Tests/Body/LungTest.cs
@@ -128,7 +128,7 @@ await server.WaitAssertion(() =>
                     metaSys.Update(1.0f);
                     metaSys.Update(1.0f);
                     respSys.Update(2.0f);
-                    Assert.That(GetMapMoles(), Is.EqualTo(startingMoles).Within(0.0001));
+                    Assert.That(GetMapMoles(), Is.EqualTo(startingMoles).Within(0.0002));
                 });
             }
 
diff --git a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
index 739bd54906..6e2a080370 100644
--- a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
+++ b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
@@ -101,7 +101,7 @@ await server.WaitAssertion(() =>
                     Assert.That(buckle.Buckled);
 
                     Assert.That(actionBlocker.CanMove(human), Is.False);
-                    Assert.That(actionBlocker.CanChangeDirection(human), Is.False);
+                    Assert.That(actionBlocker.CanChangeDirection(human));
                     Assert.That(standingState.Down(human), Is.False);
                     Assert.That(
                         (xformSystem.GetWorldPosition(human) - xformSystem.GetWorldPosition(chair)).LengthSquared,
diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
index 84e1afaf45..88448e7b80 100644
--- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
@@ -1006,15 +1006,10 @@ protected async Task AddAtmosphere(EntityUid? uid = null)
         await Server.WaitPost(() =>
         {
             var atmosSystem = SEntMan.System<AtmosphereSystem>();
-            var atmos = SEntMan.EnsureComponent<MapAtmosphereComponent>(target);
             var moles = new float[Atmospherics.AdjustedNumberOfGases];
             moles[(int) Gas.Oxygen] = 21.824779f;
             moles[(int) Gas.Nitrogen] = 82.10312f;
-            atmosSystem.SetMapAtmosphere(target, false, new GasMixture(2500)
-            {
-                Temperature = 293.15f,
-                Moles = moles,
-            }, atmos);
+            atmosSystem.SetMapAtmosphere(target, false, new GasMixture(moles, Atmospherics.T20C));
         });
     }
 
diff --git a/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs b/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
index c57504764d..2845e45147 100644
--- a/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
+++ b/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
@@ -61,8 +61,9 @@ private static HumanoidCharacterProfile CharlieCharlieson()
                     {SharedGameTicker.FallbackOverflowJob, JobPriority.High}
                 },
                 PreferenceUnavailableMode.StayInLobby,
-                new List<string> (),
-                new List<string>()
+                antagPreferences: new List<string>(),
+                traitPreferences: new List<string>(),
+                loadoutPreferences: new List<string>()
             );
         }
 
diff --git a/Content.IntegrationTests/Tests/Wires/WireLayoutTest.cs b/Content.IntegrationTests/Tests/Wires/WireLayoutTest.cs
new file mode 100644
index 0000000000..920dc08818
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Wires/WireLayoutTest.cs
@@ -0,0 +1,103 @@
+using Content.Server.Doors;
+using Content.Server.Power;
+using Content.Server.Wires;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Map;
+
+namespace Content.IntegrationTests.Tests.Wires;
+
+[TestFixture]
+[Parallelizable(ParallelScope.All)]
+[TestOf(typeof(WiresSystem))]
+public sealed class WireLayoutTest
+{
+    [TestPrototypes]
+    public const string Prototypes = """
+        - type: wireLayout
+          id: WireLayoutTest
+          dummyWires: 2
+          wires:
+          - !type:PowerWireAction
+          - !type:DoorBoltWireAction
+
+        - type: wireLayout
+          id: WireLayoutTest2
+          parent: WireLayoutTest
+          wires:
+          - !type:PowerWireAction
+
+        - type: wireLayout
+          id: WireLayoutTest3
+          parent: WireLayoutTest
+
+        - type: entity
+          id: WireLayoutTest
+          components:
+          - type: Wires
+            layoutId: WireLayoutTest
+
+        - type: entity
+          id: WireLayoutTest2
+          components:
+          - type: Wires
+            layoutId: WireLayoutTest2
+
+        - type: entity
+          id: WireLayoutTest3
+          components:
+          - type: Wires
+            layoutId: WireLayoutTest3
+        """;
+
+    [Test]
+    public async Task TestLayoutInheritance()
+    {
+        await using var pair = await PoolManager.GetServerClient();
+        var server = pair.Server;
+        var testMap = await pair.CreateTestMap();
+
+        await server.WaitAssertion(() =>
+        {
+            var wires = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<WiresSystem>();
+
+            // Need to spawn these entities to make sure the wire layouts are initialized.
+            var ent1 = SpawnWithComp<WiresComponent>(server.EntMan, "WireLayoutTest", testMap.MapCoords);
+            var ent2 = SpawnWithComp<WiresComponent>(server.EntMan, "WireLayoutTest2", testMap.MapCoords);
+            var ent3 = SpawnWithComp<WiresComponent>(server.EntMan, "WireLayoutTest3", testMap.MapCoords);
+
+            // Assert.That(wires.TryGetLayout("WireLayoutTest", out var layout1));
+            // Assert.That(wires.TryGetLayout("WireLayoutTest2", out var layout2));
+            // Assert.That(wires.TryGetLayout("WireLayoutTest3", out var layout3));
+
+            Assert.Multiple(() =>
+            {
+                // Entity 1.
+                Assert.That(ent1.Comp.WiresList, Has.Count.EqualTo(4));
+                Assert.That(ent1.Comp.WiresList, Has.Exactly(2).With.Property("Action").Null, "2 dummy wires");
+                Assert.That(ent1.Comp.WiresList, Has.One.With.Property("Action").InstanceOf<PowerWireAction>(), "1 power wire");
+                Assert.That(ent1.Comp.WiresList, Has.One.With.Property("Action").InstanceOf<DoorBoltWireAction>(), "1 door bolt wire");
+
+                Assert.That(ent2.Comp.WiresList, Has.Count.EqualTo(5));
+                Assert.That(ent2.Comp.WiresList, Has.Exactly(2).With.Property("Action").Null, "2 dummy wires");
+                Assert.That(ent2.Comp.WiresList, Has.Exactly(2).With.Property("Action").InstanceOf<PowerWireAction>(), "2 power wire");
+                Assert.That(ent2.Comp.WiresList, Has.One.With.Property("Action").InstanceOf<DoorBoltWireAction>(), "1 door bolt wire");
+
+                Assert.That(ent3.Comp.WiresList, Has.Count.EqualTo(4));
+                Assert.That(ent3.Comp.WiresList, Has.Exactly(2).With.Property("Action").Null, "2 dummy wires");
+                Assert.That(ent3.Comp.WiresList, Has.One.With.Property("Action").InstanceOf<PowerWireAction>(), "1 power wire");
+                Assert.That(ent3.Comp.WiresList, Has.One.With.Property("Action").InstanceOf<DoorBoltWireAction>(), "1 door bolt wire");
+            });
+        });
+
+        await pair.CleanReturnAsync();
+    }
+
+    private static Entity<T> SpawnWithComp<T>(IEntityManager entityManager, string prototype, MapCoordinates coords)
+        where T : IComponent, new()
+    {
+        var ent = entityManager.Spawn(prototype, coords);
+        var comp = entityManager.EnsureComponent<T>(ent);
+        return new Entity<T>(ent, comp);
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/20240318022005_AdminMessageDismiss.Designer.cs b/Content.Server.Database/Migrations/Postgres/20240318022005_AdminMessageDismiss.Designer.cs
new file mode 100644
index 0000000000..1a47a51b94
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20240318022005_AdminMessageDismiss.Designer.cs
@@ -0,0 +1,1768 @@
+// <auto-generated />
+using System;
+using System.Net;
+using System.Text.Json;
+using Content.Server.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using NpgsqlTypes;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    [DbContext(typeof(PostgresServerDbContext))]
+    [Migration("20240318022005_AdminMessageDismiss")]
+    partial class AdminMessageDismiss
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.0")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<int?>("AdminRankId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text")
+                        .HasColumnName("title");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_admin");
+
+                    b.HasIndex("AdminRankId")
+                        .HasDatabaseName("IX_admin_admin_rank_id");
+
+                    b.ToTable("admin", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_flag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("AdminId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("admin_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flag");
+
+                    b.Property<bool>("Negative")
+                        .HasColumnType("boolean")
+                        .HasColumnName("negative");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_flag");
+
+                    b.HasIndex("AdminId")
+                        .HasDatabaseName("IX_admin_flag_admin_id");
+
+                    b.HasIndex("Flag", "AdminId")
+                        .IsUnique();
+
+                    b.ToTable("admin_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date");
+
+                    b.Property<short>("Impact")
+                        .HasColumnType("smallint")
+                        .HasColumnName("impact");
+
+                    b.Property<JsonDocument>("Json")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("json");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("message");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer")
+                        .HasColumnName("type");
+
+                    b.HasKey("RoundId", "Id")
+                        .HasName("PK_admin_log");
+
+                    b.HasIndex("Date");
+
+                    b.HasIndex("Message")
+                        .HasAnnotation("Npgsql:TsVectorConfig", "english");
+
+                    NpgsqlIndexBuilderExtensions.HasMethod(b.HasIndex("Message"), "GIN");
+
+                    b.HasIndex("Type")
+                        .HasDatabaseName("IX_admin_log_type");
+
+                    b.ToTable("admin_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("LogId")
+                        .HasColumnType("integer")
+                        .HasColumnName("log_id");
+
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.HasKey("RoundId", "LogId", "PlayerUserId")
+                        .HasName("PK_admin_log_player");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_log_player_player_user_id");
+
+                    b.ToTable("admin_log_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_messages_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<bool>("Dismissed")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dismissed");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Seen")
+                        .HasColumnType("boolean")
+                        .HasColumnName("seen");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_messages");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_messages_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_messages_round_id");
+
+                    b.ToTable("admin_messages", null, t =>
+                        {
+                            t.HasCheckConstraint("NotDismissedAndSeen", "NOT dismissed OR seen");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_notes_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Secret")
+                        .HasColumnType("boolean")
+                        .HasColumnName("secret");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_notes");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_notes_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_notes_round_id");
+
+                    b.ToTable("admin_notes", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank");
+
+                    b.ToTable("admin_rank", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_flag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("AdminRankId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flag");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank_flag");
+
+                    b.HasIndex("AdminRankId");
+
+                    b.HasIndex("Flag", "AdminRankId")
+                        .IsUnique();
+
+                    b.ToTable("admin_rank_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_watchlists_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_watchlists");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_watchlists_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_watchlists_round_id");
+
+                    b.ToTable("admin_watchlists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("antag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AntagName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("antag_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_antag");
+
+                    b.HasIndex("ProfileId", "AntagName")
+                        .IsUnique();
+
+                    b.ToTable("antag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("assigned_user_id_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_assigned_user_id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.HasIndex("UserName")
+                        .IsUnique();
+
+                    b.ToTable("assigned_user_id", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("connection_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<IPAddress>("Address")
+                        .IsRequired()
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<byte?>("Denied")
+                        .HasColumnType("smallint")
+                        .HasColumnName("denied");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("hwid");
+
+                    b.Property<int>("ServerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasDefaultValue(0)
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("time");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_connection_log");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_connection_log_server_id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("connection_log", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("job_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("integer")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job");
+
+                    b.HasIndex("ProfileId");
+
+                    b.HasIndex("ProfileId", "JobName")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
+                        .IsUnique()
+                        .HasFilter("priority = 3");
+
+                    b.ToTable("job", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("play_time_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("PlayerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_id");
+
+                    b.Property<TimeSpan>("TimeSpent")
+                        .HasColumnType("interval")
+                        .HasColumnName("time_spent");
+
+                    b.Property<string>("Tracker")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("tracker");
+
+                    b.HasKey("Id")
+                        .HasName("PK_play_time");
+
+                    b.HasIndex("PlayerId", "Tracker")
+                        .IsUnique();
+
+                    b.ToTable("play_time", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("player_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("FirstSeenTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("first_seen_time");
+
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_read_rules");
+
+                    b.Property<IPAddress>("LastSeenAddress")
+                        .IsRequired()
+                        .HasColumnType("inet")
+                        .HasColumnName("last_seen_address");
+
+                    b.Property<byte[]>("LastSeenHWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("last_seen_hwid");
+
+                    b.Property<DateTime>("LastSeenTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_seen_time");
+
+                    b.Property<string>("LastSeenUserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("last_seen_user_name");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_player");
+
+                    b.HasAlternateKey("UserId")
+                        .HasName("ak_player_user_id");
+
+                    b.HasIndex("LastSeenUserName");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("player", null, t =>
+                        {
+                            t.HasCheckConstraint("LastSeenAddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= last_seen_address");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("preference_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AdminOOCColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("admin_ooc_color");
+
+                    b.Property<int>("SelectedCharacterSlot")
+                        .HasColumnType("integer")
+                        .HasColumnName("selected_character_slot");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_preference");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("preference", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Age")
+                        .HasColumnType("integer")
+                        .HasColumnName("age");
+
+                    b.Property<string>("Backpack")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("backpack");
+
+                    b.Property<string>("CharacterName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("char_name");
+
+                    b.Property<string>("Clothing")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("clothing");
+
+                    b.Property<string>("EyeColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("eye_color");
+
+                    b.Property<string>("FacialHairColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("facial_hair_color");
+
+                    b.Property<string>("FacialHairName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("facial_hair_name");
+
+                    b.Property<string>("FlavorText")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flavor_text");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("gender");
+
+                    b.Property<string>("HairColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("hair_color");
+
+                    b.Property<string>("HairName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("hair_name");
+
+                    b.Property<JsonDocument>("Markings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("markings");
+
+                    b.Property<int>("PreferenceId")
+                        .HasColumnType("integer")
+                        .HasColumnName("preference_id");
+
+                    b.Property<int>("PreferenceUnavailable")
+                        .HasColumnType("integer")
+                        .HasColumnName("pref_unavailable");
+
+                    b.Property<string>("Sex")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("sex");
+
+                    b.Property<string>("SkinColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("skin_color");
+
+                    b.Property<int>("Slot")
+                        .HasColumnType("integer")
+                        .HasColumnName("slot");
+
+                    b.Property<int>("SpawnPriority")
+                        .HasColumnType("integer")
+                        .HasColumnName("spawn_priority");
+
+                    b.Property<string>("Species")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("species");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile");
+
+                    b.HasIndex("PreferenceId")
+                        .HasDatabaseName("IX_profile_preference_id");
+
+                    b.HasIndex("Slot", "PreferenceId")
+                        .IsUnique();
+
+                    b.ToTable("profile", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("integer")
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("StartDate")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValue(new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified))
+                        .HasColumnName("start_date");
+
+                    b.HasKey("Id")
+                        .HasName("PK_round");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_round_server_id");
+
+                    b.HasIndex("StartDate");
+
+                    b.ToTable("round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server");
+
+                    b.ToTable("server", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_ban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<NpgsqlInet?>("Address")
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("boolean")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("integer")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_ban_round_id");
+
+                    b.ToTable("server_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("integer")
+                        .HasColumnName("flags");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_server_ban_exemption");
+
+                    b.ToTable("server_ban_exemption", null, t =>
+                        {
+                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_ban_hit_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("ConnectionId")
+                        .HasColumnType("integer")
+                        .HasColumnName("connection_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban_hit");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_server_ban_hit_ban_id");
+
+                    b.HasIndex("ConnectionId")
+                        .HasDatabaseName("IX_server_ban_hit_connection_id");
+
+                    b.ToTable("server_ban_hit", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_role_ban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<NpgsqlInet?>("Address")
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("role_id");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_role_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_role_ban_round_id");
+
+                    b.ToTable("server_role_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("role_unban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_role_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("unban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("trait_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("TraitName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("trait_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_trait");
+
+                    b.HasIndex("ProfileId", "TraitName")
+                        .IsUnique();
+
+                    b.ToTable("trait", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("uploaded_resource_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("data");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_uploaded_resource_log");
+
+                    b.ToTable("uploaded_resource_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_whitelist");
+
+                    b.ToTable("whitelist", (string)null);
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.Property<int>("PlayersId")
+                        .HasColumnType("integer")
+                        .HasColumnName("players_id");
+
+                    b.Property<int>("RoundsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("rounds_id");
+
+                    b.HasKey("PlayersId", "RoundsId")
+                        .HasName("PK_player_round");
+
+                    b.HasIndex("RoundsId")
+                        .HasDatabaseName("IX_player_round_rounds_id");
+
+                    b.ToTable("player_round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
+                        .WithMany("Admins")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
+
+                    b.Navigation("AdminRank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Admin", "Admin")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_flag_admin_admin_id");
+
+                    b.Navigation("Admin");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_round_round_id");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.AdminLog", "Log")
+                        .WithMany("Players")
+                        .HasForeignKey("RoundId", "LogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_admin_log_round_id_log_id");
+
+                    b.Navigation("Log");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminMessagesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminMessagesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminMessagesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminMessagesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_messages_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_messages_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminNotesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminNotesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminNotesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminNotesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_notes_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_notes_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
+
+                    b.Navigation("Rank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminWatchlistsCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminWatchlistsDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminWatchlistsLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminWatchlistsReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_watchlists_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_watchlists_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Antags")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_antag_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("ConnectionLogs")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .IsRequired()
+                        .HasConstraintName("FK_connection_log_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Jobs")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("Rounds")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_round_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
+                        .WithMany("BanHits")
+                        .HasForeignKey("ConnectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Connection");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerRoleBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerRoleBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_role_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Traits")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_trait_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", null)
+                        .WithMany()
+                        .HasForeignKey("PlayersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_player_players_id");
+
+                    b.HasOne("Content.Server.Database.Round", null)
+                        .WithMany()
+                        .HasForeignKey("RoundsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_round_rounds_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Navigation("Players");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Navigation("AdminLogs");
+
+                    b.Navigation("AdminMessagesCreated");
+
+                    b.Navigation("AdminMessagesDeleted");
+
+                    b.Navigation("AdminMessagesLastEdited");
+
+                    b.Navigation("AdminMessagesReceived");
+
+                    b.Navigation("AdminNotesCreated");
+
+                    b.Navigation("AdminNotesDeleted");
+
+                    b.Navigation("AdminNotesLastEdited");
+
+                    b.Navigation("AdminNotesReceived");
+
+                    b.Navigation("AdminServerBansCreated");
+
+                    b.Navigation("AdminServerBansLastEdited");
+
+                    b.Navigation("AdminServerRoleBansCreated");
+
+                    b.Navigation("AdminServerRoleBansLastEdited");
+
+                    b.Navigation("AdminWatchlistsCreated");
+
+                    b.Navigation("AdminWatchlistsDeleted");
+
+                    b.Navigation("AdminWatchlistsLastEdited");
+
+                    b.Navigation("AdminWatchlistsReceived");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Navigation("Profiles");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Navigation("Antags");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("Traits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Navigation("AdminLogs");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Navigation("ConnectionLogs");
+
+                    b.Navigation("Rounds");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Navigation("Unban");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/20240318022005_AdminMessageDismiss.cs b/Content.Server.Database/Migrations/Postgres/20240318022005_AdminMessageDismiss.cs
new file mode 100644
index 0000000000..9911aeffe2
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20240318022005_AdminMessageDismiss.cs
@@ -0,0 +1,40 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    /// <inheritdoc />
+    public partial class AdminMessageDismiss : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "dismissed",
+                table: "admin_messages",
+                type: "boolean",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.Sql("UPDATE admin_messages SET dismissed = seen");
+
+            migrationBuilder.AddCheckConstraint(
+                name: "NotDismissedAndSeen",
+                table: "admin_messages",
+                sql: "NOT dismissed OR seen");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropCheckConstraint(
+                name: "NotDismissedAndSeen",
+                table: "admin_messages");
+
+            migrationBuilder.DropColumn(
+                name: "dismissed",
+                table: "admin_messages");
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/20240505230501_Loadouts.Designer.cs b/Content.Server.Database/Migrations/Postgres/20240505230501_Loadouts.Designer.cs
new file mode 100644
index 0000000000..4b9e52006a
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20240505230501_Loadouts.Designer.cs
@@ -0,0 +1,1802 @@
+// <auto-generated />
+using System;
+using System.Net;
+using System.Text.Json;
+using Content.Server.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using NpgsqlTypes;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    [DbContext(typeof(PostgresServerDbContext))]
+    [Migration("20240505230501_Loadouts")]
+    partial class Loadouts
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.0")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<int?>("AdminRankId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text")
+                        .HasColumnName("title");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_admin");
+
+                    b.HasIndex("AdminRankId")
+                        .HasDatabaseName("IX_admin_admin_rank_id");
+
+                    b.ToTable("admin", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_flag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("AdminId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("admin_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flag");
+
+                    b.Property<bool>("Negative")
+                        .HasColumnType("boolean")
+                        .HasColumnName("negative");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_flag");
+
+                    b.HasIndex("AdminId")
+                        .HasDatabaseName("IX_admin_flag_admin_id");
+
+                    b.HasIndex("Flag", "AdminId")
+                        .IsUnique();
+
+                    b.ToTable("admin_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Id")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date");
+
+                    b.Property<short>("Impact")
+                        .HasColumnType("smallint")
+                        .HasColumnName("impact");
+
+                    b.Property<JsonDocument>("Json")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("json");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("message");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer")
+                        .HasColumnName("type");
+
+                    b.HasKey("RoundId", "Id")
+                        .HasName("PK_admin_log");
+
+                    b.HasIndex("Date");
+
+                    b.HasIndex("Message")
+                        .HasAnnotation("Npgsql:TsVectorConfig", "english");
+
+                    NpgsqlIndexBuilderExtensions.HasMethod(b.HasIndex("Message"), "GIN");
+
+                    b.HasIndex("Type")
+                        .HasDatabaseName("IX_admin_log_type");
+
+                    b.ToTable("admin_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("LogId")
+                        .HasColumnType("integer")
+                        .HasColumnName("log_id");
+
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.HasKey("RoundId", "LogId", "PlayerUserId")
+                        .HasName("PK_admin_log_player");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_log_player_player_user_id");
+
+                    b.ToTable("admin_log_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_messages_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Seen")
+                        .HasColumnType("boolean")
+                        .HasColumnName("seen");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_messages");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_messages_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_messages_round_id");
+
+                    b.ToTable("admin_messages", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_notes_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Secret")
+                        .HasColumnType("boolean")
+                        .HasColumnName("secret");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_notes");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_notes_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_notes_round_id");
+
+                    b.ToTable("admin_notes", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank");
+
+                    b.ToTable("admin_rank", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_flag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("AdminRankId")
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flag");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank_flag");
+
+                    b.HasIndex("AdminRankId");
+
+                    b.HasIndex("Flag", "AdminRankId")
+                        .IsUnique();
+
+                    b.ToTable("admin_rank_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("admin_watchlists_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("boolean")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("character varying(4096)")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_watchlists");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_watchlists_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_watchlists_round_id");
+
+                    b.ToTable("admin_watchlists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("antag_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AntagName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("antag_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_antag");
+
+                    b.HasIndex("ProfileId", "AntagName")
+                        .IsUnique();
+
+                    b.ToTable("antag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("assigned_user_id_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_assigned_user_id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.HasIndex("UserName")
+                        .IsUnique();
+
+                    b.ToTable("assigned_user_id", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("connection_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<IPAddress>("Address")
+                        .IsRequired()
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<byte?>("Denied")
+                        .HasColumnType("smallint")
+                        .HasColumnName("denied");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("hwid");
+
+                    b.Property<int>("ServerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasDefaultValue(0)
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("time");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_connection_log");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_connection_log_server_id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("connection_log", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("job_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("integer")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job");
+
+                    b.HasIndex("ProfileId");
+
+                    b.HasIndex("ProfileId", "JobName")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
+                        .IsUnique()
+                        .HasFilter("priority = 3");
+
+                    b.ToTable("job", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Loadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("loadout_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("LoadoutName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("loadout_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_loadout");
+
+                    b.HasIndex("ProfileId", "LoadoutName")
+                        .IsUnique();
+
+                    b.ToTable("loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("play_time_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<Guid>("PlayerId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_id");
+
+                    b.Property<TimeSpan>("TimeSpent")
+                        .HasColumnType("interval")
+                        .HasColumnName("time_spent");
+
+                    b.Property<string>("Tracker")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("tracker");
+
+                    b.HasKey("Id")
+                        .HasName("PK_play_time");
+
+                    b.HasIndex("PlayerId", "Tracker")
+                        .IsUnique();
+
+                    b.ToTable("play_time", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("player_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<DateTime>("FirstSeenTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("first_seen_time");
+
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_read_rules");
+
+                    b.Property<IPAddress>("LastSeenAddress")
+                        .IsRequired()
+                        .HasColumnType("inet")
+                        .HasColumnName("last_seen_address");
+
+                    b.Property<byte[]>("LastSeenHWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("last_seen_hwid");
+
+                    b.Property<DateTime>("LastSeenTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_seen_time");
+
+                    b.Property<string>("LastSeenUserName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("last_seen_user_name");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_player");
+
+                    b.HasAlternateKey("UserId")
+                        .HasName("ak_player_user_id");
+
+                    b.HasIndex("LastSeenUserName");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("player", null, t =>
+                        {
+                            t.HasCheckConstraint("LastSeenAddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= last_seen_address");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("preference_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("AdminOOCColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("admin_ooc_color");
+
+                    b.Property<int>("SelectedCharacterSlot")
+                        .HasColumnType("integer")
+                        .HasColumnName("selected_character_slot");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_preference");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("preference", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("Age")
+                        .HasColumnType("integer")
+                        .HasColumnName("age");
+
+                    b.Property<string>("Backpack")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("backpack");
+
+                    b.Property<string>("CharacterName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("char_name");
+
+                    b.Property<string>("Clothing")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("clothing");
+
+                    b.Property<string>("EyeColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("eye_color");
+
+                    b.Property<string>("FacialHairColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("facial_hair_color");
+
+                    b.Property<string>("FacialHairName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("facial_hair_name");
+
+                    b.Property<string>("FlavorText")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("flavor_text");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("gender");
+
+                    b.Property<string>("HairColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("hair_color");
+
+                    b.Property<string>("HairName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("hair_name");
+
+                    b.Property<JsonDocument>("Markings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("markings");
+
+                    b.Property<int>("PreferenceId")
+                        .HasColumnType("integer")
+                        .HasColumnName("preference_id");
+
+                    b.Property<int>("PreferenceUnavailable")
+                        .HasColumnType("integer")
+                        .HasColumnName("pref_unavailable");
+
+                    b.Property<string>("Sex")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("sex");
+
+                    b.Property<string>("SkinColor")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("skin_color");
+
+                    b.Property<int>("Slot")
+                        .HasColumnType("integer")
+                        .HasColumnName("slot");
+
+                    b.Property<int>("SpawnPriority")
+                        .HasColumnType("integer")
+                        .HasColumnName("spawn_priority");
+
+                    b.Property<string>("Species")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("species");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile");
+
+                    b.HasIndex("PreferenceId")
+                        .HasDatabaseName("IX_profile_preference_id");
+
+                    b.HasIndex("Slot", "PreferenceId")
+                        .IsUnique();
+
+                    b.ToTable("profile", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("integer")
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("StartDate")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("timestamp with time zone")
+                        .HasDefaultValue(new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified))
+                        .HasColumnName("start_date");
+
+                    b.HasKey("Id")
+                        .HasName("PK_round");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_round_server_id");
+
+                    b.HasIndex("StartDate");
+
+                    b.ToTable("round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server");
+
+                    b.ToTable("server", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_ban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<NpgsqlInet?>("Address")
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("boolean")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("integer")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_ban_round_id");
+
+                    b.ToTable("server_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("integer")
+                        .HasColumnName("flags");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_server_ban_exemption");
+
+                    b.ToTable("server_ban_exemption", null, t =>
+                        {
+                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_ban_hit_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("ConnectionId")
+                        .HasColumnType("integer")
+                        .HasColumnName("connection_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban_hit");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_server_ban_hit_ban_id");
+
+                    b.HasIndex("ConnectionId")
+                        .HasDatabaseName("IX_server_ban_hit_connection_id");
+
+                    b.ToTable("server_ban_hit", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("server_role_ban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<NpgsqlInet?>("Address")
+                        .HasColumnType("inet")
+                        .HasColumnName("address");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("bytea")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("boolean")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("uuid")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("interval")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("reason");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("role_id");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("integer")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("integer")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_role_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_role_ban_round_id");
+
+                    b.ToTable("server_role_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("AddressNotIPv6MappedIPv4", "NOT inet '::ffff:0.0.0.0/96' >>= address");
+
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("role_unban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_role_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("unban_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("integer")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("uuid")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("trait_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("TraitName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("trait_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_trait");
+
+                    b.HasIndex("ProfileId", "TraitName")
+                        .IsUnique();
+
+                    b.ToTable("trait", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("uploaded_resource_log_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("data");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("date");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("path");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_uploaded_resource_log");
+
+                    b.ToTable("uploaded_resource_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_whitelist");
+
+                    b.ToTable("whitelist", (string)null);
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.Property<int>("PlayersId")
+                        .HasColumnType("integer")
+                        .HasColumnName("players_id");
+
+                    b.Property<int>("RoundsId")
+                        .HasColumnType("integer")
+                        .HasColumnName("rounds_id");
+
+                    b.HasKey("PlayersId", "RoundsId")
+                        .HasName("PK_player_round");
+
+                    b.HasIndex("RoundsId")
+                        .HasDatabaseName("IX_player_round_rounds_id");
+
+                    b.ToTable("player_round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
+                        .WithMany("Admins")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
+
+                    b.Navigation("AdminRank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Admin", "Admin")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_flag_admin_admin_id");
+
+                    b.Navigation("Admin");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_round_round_id");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.AdminLog", "Log")
+                        .WithMany("Players")
+                        .HasForeignKey("RoundId", "LogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_admin_log_round_id_log_id");
+
+                    b.Navigation("Log");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminMessagesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminMessagesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminMessagesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminMessagesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_messages_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_messages_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminNotesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminNotesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminNotesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminNotesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_notes_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_notes_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
+
+                    b.Navigation("Rank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminWatchlistsCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminWatchlistsDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminWatchlistsLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminWatchlistsReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_watchlists_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_watchlists_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Antags")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_antag_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("ConnectionLogs")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .IsRequired()
+                        .HasConstraintName("FK_connection_log_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Jobs")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Loadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_loadout_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("Rounds")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_round_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
+                        .WithMany("BanHits")
+                        .HasForeignKey("ConnectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Connection");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerRoleBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerRoleBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_role_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Traits")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_trait_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", null)
+                        .WithMany()
+                        .HasForeignKey("PlayersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_player_players_id");
+
+                    b.HasOne("Content.Server.Database.Round", null)
+                        .WithMany()
+                        .HasForeignKey("RoundsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_round_rounds_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Navigation("Players");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Navigation("AdminLogs");
+
+                    b.Navigation("AdminMessagesCreated");
+
+                    b.Navigation("AdminMessagesDeleted");
+
+                    b.Navigation("AdminMessagesLastEdited");
+
+                    b.Navigation("AdminMessagesReceived");
+
+                    b.Navigation("AdminNotesCreated");
+
+                    b.Navigation("AdminNotesDeleted");
+
+                    b.Navigation("AdminNotesLastEdited");
+
+                    b.Navigation("AdminNotesReceived");
+
+                    b.Navigation("AdminServerBansCreated");
+
+                    b.Navigation("AdminServerBansLastEdited");
+
+                    b.Navigation("AdminServerRoleBansCreated");
+
+                    b.Navigation("AdminServerRoleBansLastEdited");
+
+                    b.Navigation("AdminWatchlistsCreated");
+
+                    b.Navigation("AdminWatchlistsDeleted");
+
+                    b.Navigation("AdminWatchlistsLastEdited");
+
+                    b.Navigation("AdminWatchlistsReceived");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Navigation("Profiles");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Navigation("Antags");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("Loadouts");
+
+                    b.Navigation("Traits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Navigation("AdminLogs");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Navigation("ConnectionLogs");
+
+                    b.Navigation("Rounds");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Navigation("Unban");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/20240505230501_Loadouts.cs b/Content.Server.Database/Migrations/Postgres/20240505230501_Loadouts.cs
new file mode 100644
index 0000000000..32b46f53fc
--- /dev/null
+++ b/Content.Server.Database/Migrations/Postgres/20240505230501_Loadouts.cs
@@ -0,0 +1,48 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Postgres
+{
+    /// <inheritdoc />
+    public partial class Loadouts : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "loadout",
+                columns: table => new
+                {
+                    loadout_id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    profile_id = table.Column<int>(type: "integer", nullable: false),
+                    loadout_name = table.Column<string>(type: "text", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_loadout", x => x.loadout_id);
+                    table.ForeignKey(
+                        name: "FK_loadout_profile_profile_id",
+                        column: x => x.profile_id,
+                        principalTable: "profile",
+                        principalColumn: "profile_id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_loadout_profile_id_loadout_name",
+                table: "loadout",
+                columns: new[] { "profile_id", "loadout_name" },
+                unique: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "loadout");
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
index ae40e1228e..79e478006b 100644
--- a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs
@@ -183,6 +183,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("uuid")
                         .HasColumnName("deleted_by_id");
 
+                    b.Property<bool>("Dismissed")
+                        .HasColumnType("boolean")
+                        .HasColumnName("dismissed");
+
                     b.Property<DateTime?>("ExpirationTime")
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("expiration_time");
@@ -232,7 +236,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.HasIndex("RoundId")
                         .HasDatabaseName("IX_admin_messages_round_id");
 
-                    b.ToTable("admin_messages", (string)null);
+                    b.ToTable("admin_messages", null, t =>
+                        {
+                            t.HasCheckConstraint("NotDismissedAndSeen", "NOT dismissed OR seen");
+                        });
                 });
 
             modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
@@ -597,6 +604,33 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("job", (string)null);
                 });
 
+            modelBuilder.Entity("Content.Server.Database.Loadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasColumnName("loadout_id");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("LoadoutName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("loadout_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("integer")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_loadout");
+
+                    b.HasIndex("ProfileId", "LoadoutName")
+                        .IsUnique();
+
+                    b.ToTable("loadout", (string)null);
+                });
+
             modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
                 {
                     b.Property<int>("Id")
@@ -1502,6 +1536,18 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Navigation("Profile");
                 });
 
+            modelBuilder.Entity("Content.Server.Database.Loadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_loadout_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
             modelBuilder.Entity("Content.Server.Database.Profile", b =>
                 {
                     b.HasOne("Content.Server.Database.Preference", "Preference")
@@ -1726,6 +1772,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.Navigation("Jobs");
 
+                    b.Navigation("Loadouts");
+
                     b.Navigation("Traits");
                 });
 
diff --git a/Content.Server.Database/Migrations/Sqlite/20240318021959_AdminMessageDismiss.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20240318021959_AdminMessageDismiss.Designer.cs
new file mode 100644
index 0000000000..f4d6990356
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20240318021959_AdminMessageDismiss.Designer.cs
@@ -0,0 +1,1699 @@
+// <auto-generated />
+using System;
+using Content.Server.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    [DbContext(typeof(SqliteServerDbContext))]
+    [Migration("20240318021959_AdminMessageDismiss")]
+    partial class AdminMessageDismiss
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.0");
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int?>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("title");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_admin");
+
+                    b.HasIndex("AdminRankId")
+                        .HasDatabaseName("IX_admin_admin_rank_id");
+
+                    b.ToTable("admin", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_flag_id");
+
+                    b.Property<Guid>("AdminId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("admin_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.Property<bool>("Negative")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("negative");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_flag");
+
+                    b.HasIndex("AdminId")
+                        .HasDatabaseName("IX_admin_flag_admin_id");
+
+                    b.HasIndex("Flag", "AdminId")
+                        .IsUnique();
+
+                    b.ToTable("admin_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Id")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<sbyte>("Impact")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("impact");
+
+                    b.Property<string>("Json")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("json");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("type");
+
+                    b.HasKey("RoundId", "Id")
+                        .HasName("PK_admin_log");
+
+                    b.HasIndex("Date");
+
+                    b.HasIndex("Type")
+                        .HasDatabaseName("IX_admin_log_type");
+
+                    b.ToTable("admin_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("LogId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("log_id");
+
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.HasKey("RoundId", "LogId", "PlayerUserId")
+                        .HasName("PK_admin_log_player");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_log_player_player_user_id");
+
+                    b.ToTable("admin_log_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_messages_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<bool>("Dismissed")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("dismissed");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Seen")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("seen");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_messages");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_messages_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_messages_round_id");
+
+                    b.ToTable("admin_messages", null, t =>
+                        {
+                            t.HasCheckConstraint("NotDismissedAndSeen", "NOT dismissed OR seen");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_notes_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Secret")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("secret");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_notes");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_notes_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_notes_round_id");
+
+                    b.ToTable("admin_notes", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank");
+
+                    b.ToTable("admin_rank", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_flag_id");
+
+                    b.Property<int>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank_flag");
+
+                    b.HasIndex("AdminRankId");
+
+                    b.HasIndex("Flag", "AdminRankId")
+                        .IsUnique();
+
+                    b.ToTable("admin_rank_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_watchlists_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_watchlists");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_watchlists_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_watchlists_round_id");
+
+                    b.ToTable("admin_watchlists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("antag_id");
+
+                    b.Property<string>("AntagName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("antag_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_antag");
+
+                    b.HasIndex("ProfileId", "AntagName")
+                        .IsUnique();
+
+                    b.ToTable("antag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("assigned_user_id_id");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_assigned_user_id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.HasIndex("UserName")
+                        .IsUnique();
+
+                    b.ToTable("assigned_user_id", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("connection_log_id");
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<byte?>("Denied")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("denied");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<int>("ServerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasDefaultValue(0)
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_connection_log");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_connection_log_server_id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("connection_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("job_id");
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job");
+
+                    b.HasIndex("ProfileId");
+
+                    b.HasIndex("ProfileId", "JobName")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
+                        .IsUnique()
+                        .HasFilter("priority = 3");
+
+                    b.ToTable("job", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("play_time_id");
+
+                    b.Property<Guid>("PlayerId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_id");
+
+                    b.Property<TimeSpan>("TimeSpent")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time_spent");
+
+                    b.Property<string>("Tracker")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("tracker");
+
+                    b.HasKey("Id")
+                        .HasName("PK_play_time");
+
+                    b.HasIndex("PlayerId", "Tracker")
+                        .IsUnique();
+
+                    b.ToTable("play_time", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("player_id");
+
+                    b.Property<DateTime>("FirstSeenTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("first_seen_time");
+
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_read_rules");
+
+                    b.Property<string>("LastSeenAddress")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_address");
+
+                    b.Property<byte[]>("LastSeenHWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("last_seen_hwid");
+
+                    b.Property<DateTime>("LastSeenTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_time");
+
+                    b.Property<string>("LastSeenUserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_user_name");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_player");
+
+                    b.HasAlternateKey("UserId")
+                        .HasName("ak_player_user_id");
+
+                    b.HasIndex("LastSeenUserName");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("preference_id");
+
+                    b.Property<string>("AdminOOCColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("admin_ooc_color");
+
+                    b.Property<int>("SelectedCharacterSlot")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("selected_character_slot");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_preference");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("preference", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<int>("Age")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("age");
+
+                    b.Property<string>("Backpack")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("backpack");
+
+                    b.Property<string>("CharacterName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("char_name");
+
+                    b.Property<string>("Clothing")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("clothing");
+
+                    b.Property<string>("EyeColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("eye_color");
+
+                    b.Property<string>("FacialHairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_color");
+
+                    b.Property<string>("FacialHairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_name");
+
+                    b.Property<string>("FlavorText")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flavor_text");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("gender");
+
+                    b.Property<string>("HairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_color");
+
+                    b.Property<string>("HairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_name");
+
+                    b.Property<byte[]>("Markings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("markings");
+
+                    b.Property<int>("PreferenceId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("preference_id");
+
+                    b.Property<int>("PreferenceUnavailable")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("pref_unavailable");
+
+                    b.Property<string>("Sex")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("sex");
+
+                    b.Property<string>("SkinColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("skin_color");
+
+                    b.Property<int>("Slot")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("slot");
+
+                    b.Property<int>("SpawnPriority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("spawn_priority");
+
+                    b.Property<string>("Species")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("species");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile");
+
+                    b.HasIndex("PreferenceId")
+                        .HasDatabaseName("IX_profile_preference_id");
+
+                    b.HasIndex("Slot", "PreferenceId")
+                        .IsUnique();
+
+                    b.ToTable("profile", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("StartDate")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasDefaultValue(new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified))
+                        .HasColumnName("start_date");
+
+                    b.HasKey("Id")
+                        .HasName("PK_round");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_round_server_id");
+
+                    b.HasIndex("StartDate");
+
+                    b.ToTable("round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server");
+
+                    b.ToTable("server", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_ban_round_id");
+
+                    b.ToTable("server_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("flags");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_server_ban_exemption");
+
+                    b.ToTable("server_ban_exemption", null, t =>
+                        {
+                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_hit_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("ConnectionId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("connection_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban_hit");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_server_ban_hit_ban_id");
+
+                    b.HasIndex("ConnectionId")
+                        .HasDatabaseName("IX_server_ban_hit_connection_id");
+
+                    b.ToTable("server_ban_hit", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_role_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_id");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_role_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_role_ban_round_id");
+
+                    b.ToTable("server_role_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("role_unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_role_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("trait_id");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("TraitName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("trait_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_trait");
+
+                    b.HasIndex("ProfileId", "TraitName")
+                        .IsUnique();
+
+                    b.ToTable("trait", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("uploaded_resource_log_id");
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasColumnType("BLOB")
+                        .HasColumnName("data");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("path");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_uploaded_resource_log");
+
+                    b.ToTable("uploaded_resource_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_whitelist");
+
+                    b.ToTable("whitelist", (string)null);
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.Property<int>("PlayersId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("players_id");
+
+                    b.Property<int>("RoundsId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("rounds_id");
+
+                    b.HasKey("PlayersId", "RoundsId")
+                        .HasName("PK_player_round");
+
+                    b.HasIndex("RoundsId")
+                        .HasDatabaseName("IX_player_round_rounds_id");
+
+                    b.ToTable("player_round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
+                        .WithMany("Admins")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
+
+                    b.Navigation("AdminRank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Admin", "Admin")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_flag_admin_admin_id");
+
+                    b.Navigation("Admin");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_round_round_id");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.AdminLog", "Log")
+                        .WithMany("Players")
+                        .HasForeignKey("RoundId", "LogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_admin_log_round_id_log_id");
+
+                    b.Navigation("Log");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminMessagesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminMessagesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminMessagesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminMessagesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_messages_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_messages_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminNotesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminNotesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminNotesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminNotesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_notes_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_notes_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
+
+                    b.Navigation("Rank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminWatchlistsCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminWatchlistsDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminWatchlistsLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminWatchlistsReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_watchlists_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_watchlists_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Antags")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_antag_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("ConnectionLogs")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .IsRequired()
+                        .HasConstraintName("FK_connection_log_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Jobs")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("Rounds")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_round_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
+                        .WithMany("BanHits")
+                        .HasForeignKey("ConnectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Connection");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerRoleBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerRoleBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_role_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Traits")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_trait_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", null)
+                        .WithMany()
+                        .HasForeignKey("PlayersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_player_players_id");
+
+                    b.HasOne("Content.Server.Database.Round", null)
+                        .WithMany()
+                        .HasForeignKey("RoundsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_round_rounds_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Navigation("Players");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Navigation("AdminLogs");
+
+                    b.Navigation("AdminMessagesCreated");
+
+                    b.Navigation("AdminMessagesDeleted");
+
+                    b.Navigation("AdminMessagesLastEdited");
+
+                    b.Navigation("AdminMessagesReceived");
+
+                    b.Navigation("AdminNotesCreated");
+
+                    b.Navigation("AdminNotesDeleted");
+
+                    b.Navigation("AdminNotesLastEdited");
+
+                    b.Navigation("AdminNotesReceived");
+
+                    b.Navigation("AdminServerBansCreated");
+
+                    b.Navigation("AdminServerBansLastEdited");
+
+                    b.Navigation("AdminServerRoleBansCreated");
+
+                    b.Navigation("AdminServerRoleBansLastEdited");
+
+                    b.Navigation("AdminWatchlistsCreated");
+
+                    b.Navigation("AdminWatchlistsDeleted");
+
+                    b.Navigation("AdminWatchlistsLastEdited");
+
+                    b.Navigation("AdminWatchlistsReceived");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Navigation("Profiles");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Navigation("Antags");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("Traits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Navigation("AdminLogs");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Navigation("ConnectionLogs");
+
+                    b.Navigation("Rounds");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Navigation("Unban");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/20240318021959_AdminMessageDismiss.cs b/Content.Server.Database/Migrations/Sqlite/20240318021959_AdminMessageDismiss.cs
new file mode 100644
index 0000000000..4cad4b8136
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20240318021959_AdminMessageDismiss.cs
@@ -0,0 +1,40 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    /// <inheritdoc />
+    public partial class AdminMessageDismiss : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "dismissed",
+                table: "admin_messages",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.Sql("UPDATE admin_messages SET dismissed = seen");
+
+            migrationBuilder.AddCheckConstraint(
+                name: "NotDismissedAndSeen",
+                table: "admin_messages",
+                sql: "NOT dismissed OR seen");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropCheckConstraint(
+                name: "NotDismissedAndSeen",
+                table: "admin_messages");
+
+            migrationBuilder.DropColumn(
+                name: "dismissed",
+                table: "admin_messages");
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/20240505230431_Loadouts.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20240505230431_Loadouts.Designer.cs
new file mode 100644
index 0000000000..167090095a
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20240505230431_Loadouts.Designer.cs
@@ -0,0 +1,1731 @@
+// <auto-generated />
+using System;
+using Content.Server.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    [DbContext(typeof(SqliteServerDbContext))]
+    [Migration("20240505230431_Loadouts")]
+    partial class Loadouts
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.0");
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int?>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("title");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_admin");
+
+                    b.HasIndex("AdminRankId")
+                        .HasDatabaseName("IX_admin_admin_rank_id");
+
+                    b.ToTable("admin", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_flag_id");
+
+                    b.Property<Guid>("AdminId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("admin_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.Property<bool>("Negative")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("negative");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_flag");
+
+                    b.HasIndex("AdminId")
+                        .HasDatabaseName("IX_admin_flag_admin_id");
+
+                    b.HasIndex("Flag", "AdminId")
+                        .IsUnique();
+
+                    b.ToTable("admin_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Id")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_log_id");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<sbyte>("Impact")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("impact");
+
+                    b.Property<string>("Json")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasColumnName("json");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("type");
+
+                    b.HasKey("RoundId", "Id")
+                        .HasName("PK_admin_log");
+
+                    b.HasIndex("Date");
+
+                    b.HasIndex("Type")
+                        .HasDatabaseName("IX_admin_log_type");
+
+                    b.ToTable("admin_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.Property<int>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("LogId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("log_id");
+
+                    b.Property<Guid>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.HasKey("RoundId", "LogId", "PlayerUserId")
+                        .HasName("PK_admin_log_player");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_log_player_player_user_id");
+
+                    b.ToTable("admin_log_player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_messages_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Seen")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("seen");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_messages");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_messages_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_messages_round_id");
+
+                    b.ToTable("admin_messages", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_notes_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<bool>("Secret")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("secret");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_notes");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_notes_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_notes_round_id");
+
+                    b.ToTable("admin_notes", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank");
+
+                    b.ToTable("admin_rank", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_flag_id");
+
+                    b.Property<int>("AdminRankId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_rank_id");
+
+                    b.Property<string>("Flag")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flag");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_rank_flag");
+
+                    b.HasIndex("AdminRankId");
+
+                    b.HasIndex("Flag", "AdminRankId")
+                        .IsUnique();
+
+                    b.ToTable("admin_rank_flag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("admin_watchlists_id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_at");
+
+                    b.Property<Guid?>("CreatedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("created_by_id");
+
+                    b.Property<bool>("Deleted")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("deleted");
+
+                    b.Property<DateTime?>("DeletedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_at");
+
+                    b.Property<Guid?>("DeletedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("deleted_by_id");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(4096)
+                        .HasColumnType("TEXT")
+                        .HasColumnName("message");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_admin_watchlists");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("DeletedById");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_admin_watchlists_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_admin_watchlists_round_id");
+
+                    b.ToTable("admin_watchlists", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("antag_id");
+
+                    b.Property<string>("AntagName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("antag_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_antag");
+
+                    b.HasIndex("ProfileId", "AntagName")
+                        .IsUnique();
+
+                    b.ToTable("antag", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AssignedUserId", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("assigned_user_id_id");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_assigned_user_id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.HasIndex("UserName")
+                        .IsUnique();
+
+                    b.ToTable("assigned_user_id", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("connection_log_id");
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<byte?>("Denied")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("denied");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<int>("ServerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasDefaultValue(0)
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_connection_log");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_connection_log_server_id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("connection_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("job_id");
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("priority");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_job");
+
+                    b.HasIndex("ProfileId");
+
+                    b.HasIndex("ProfileId", "JobName")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "ProfileId" }, "IX_job_one_high_priority")
+                        .IsUnique()
+                        .HasFilter("priority = 3");
+
+                    b.ToTable("job", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Loadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("loadout_id");
+
+                    b.Property<string>("LoadoutName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("loadout_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_loadout");
+
+                    b.HasIndex("ProfileId", "LoadoutName")
+                        .IsUnique();
+
+                    b.ToTable("loadout", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("play_time_id");
+
+                    b.Property<Guid>("PlayerId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_id");
+
+                    b.Property<TimeSpan>("TimeSpent")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("time_spent");
+
+                    b.Property<string>("Tracker")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("tracker");
+
+                    b.HasKey("Id")
+                        .HasName("PK_play_time");
+
+                    b.HasIndex("PlayerId", "Tracker")
+                        .IsUnique();
+
+                    b.ToTable("play_time", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("player_id");
+
+                    b.Property<DateTime>("FirstSeenTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("first_seen_time");
+
+                    b.Property<DateTime?>("LastReadRules")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_read_rules");
+
+                    b.Property<string>("LastSeenAddress")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_address");
+
+                    b.Property<byte[]>("LastSeenHWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("last_seen_hwid");
+
+                    b.Property<DateTime>("LastSeenTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_time");
+
+                    b.Property<string>("LastSeenUserName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_seen_user_name");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_player");
+
+                    b.HasAlternateKey("UserId")
+                        .HasName("ak_player_user_id");
+
+                    b.HasIndex("LastSeenUserName");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("player", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("preference_id");
+
+                    b.Property<string>("AdminOOCColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("admin_ooc_color");
+
+                    b.Property<int>("SelectedCharacterSlot")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("selected_character_slot");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_preference");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("preference", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<int>("Age")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("age");
+
+                    b.Property<string>("Backpack")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("backpack");
+
+                    b.Property<string>("CharacterName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("char_name");
+
+                    b.Property<string>("Clothing")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("clothing");
+
+                    b.Property<string>("EyeColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("eye_color");
+
+                    b.Property<string>("FacialHairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_color");
+
+                    b.Property<string>("FacialHairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("facial_hair_name");
+
+                    b.Property<string>("FlavorText")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("flavor_text");
+
+                    b.Property<string>("Gender")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("gender");
+
+                    b.Property<string>("HairColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_color");
+
+                    b.Property<string>("HairName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("hair_name");
+
+                    b.Property<byte[]>("Markings")
+                        .HasColumnType("jsonb")
+                        .HasColumnName("markings");
+
+                    b.Property<int>("PreferenceId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("preference_id");
+
+                    b.Property<int>("PreferenceUnavailable")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("pref_unavailable");
+
+                    b.Property<string>("Sex")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("sex");
+
+                    b.Property<string>("SkinColor")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("skin_color");
+
+                    b.Property<int>("Slot")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("slot");
+
+                    b.Property<int>("SpawnPriority")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("spawn_priority");
+
+                    b.Property<string>("Species")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("species");
+
+                    b.HasKey("Id")
+                        .HasName("PK_profile");
+
+                    b.HasIndex("PreferenceId")
+                        .HasDatabaseName("IX_profile_preference_id");
+
+                    b.HasIndex("Slot", "PreferenceId")
+                        .IsUnique();
+
+                    b.ToTable("profile", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("ServerId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.Property<DateTime>("StartDate")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasDefaultValue(new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified))
+                        .HasColumnName("start_date");
+
+                    b.HasKey("Id")
+                        .HasName("PK_round");
+
+                    b.HasIndex("ServerId")
+                        .HasDatabaseName("IX_round_server_id");
+
+                    b.HasIndex("StartDate");
+
+                    b.ToTable("round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server");
+
+                    b.ToTable("server", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<bool>("AutoDelete")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("auto_delete");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<int>("ExemptFlags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("exempt_flags");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_ban_round_id");
+
+                    b.ToTable("server_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanExemption", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.Property<int>("Flags")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("flags");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_server_ban_exemption");
+
+                    b.ToTable("server_ban_exemption", null, t =>
+                        {
+                            t.HasCheckConstraint("FlagsNotZero", "flags != 0");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_ban_hit_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<int>("ConnectionId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("connection_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_ban_hit");
+
+                    b.HasIndex("BanId")
+                        .HasDatabaseName("IX_server_ban_hit_ban_id");
+
+                    b.HasIndex("ConnectionId")
+                        .HasDatabaseName("IX_server_ban_hit_connection_id");
+
+                    b.ToTable("server_ban_hit", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("server_role_ban_id");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("address");
+
+                    b.Property<DateTime>("BanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("ban_time");
+
+                    b.Property<Guid?>("BanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("banning_admin");
+
+                    b.Property<DateTime?>("ExpirationTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("expiration_time");
+
+                    b.Property<byte[]>("HWId")
+                        .HasColumnType("BLOB")
+                        .HasColumnName("hwid");
+
+                    b.Property<bool>("Hidden")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("hidden");
+
+                    b.Property<DateTime?>("LastEditedAt")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_at");
+
+                    b.Property<Guid?>("LastEditedById")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("last_edited_by_id");
+
+                    b.Property<Guid?>("PlayerUserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("player_user_id");
+
+                    b.Property<TimeSpan>("PlaytimeAtNote")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("playtime_at_note");
+
+                    b.Property<string>("Reason")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("reason");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("role_id");
+
+                    b.Property<int?>("RoundId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("round_id");
+
+                    b.Property<int>("Severity")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("severity");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_ban");
+
+                    b.HasIndex("Address");
+
+                    b.HasIndex("BanningAdmin");
+
+                    b.HasIndex("LastEditedById");
+
+                    b.HasIndex("PlayerUserId")
+                        .HasDatabaseName("IX_server_role_ban_player_user_id");
+
+                    b.HasIndex("RoundId")
+                        .HasDatabaseName("IX_server_role_ban_round_id");
+
+                    b.ToTable("server_role_ban", null, t =>
+                        {
+                            t.HasCheckConstraint("HaveEitherAddressOrUserIdOrHWId", "address IS NOT NULL OR player_user_id IS NOT NULL OR hwid IS NOT NULL");
+                        });
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("role_unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_role_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_role_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("unban_id");
+
+                    b.Property<int>("BanId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("ban_id");
+
+                    b.Property<DateTime>("UnbanTime")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unban_time");
+
+                    b.Property<Guid?>("UnbanningAdmin")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("unbanning_admin");
+
+                    b.HasKey("Id")
+                        .HasName("PK_server_unban");
+
+                    b.HasIndex("BanId")
+                        .IsUnique();
+
+                    b.ToTable("server_unban", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("trait_id");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.Property<string>("TraitName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("trait_name");
+
+                    b.HasKey("Id")
+                        .HasName("PK_trait");
+
+                    b.HasIndex("ProfileId", "TraitName")
+                        .IsUnique();
+
+                    b.ToTable("trait", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.UploadedResourceLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("uploaded_resource_log_id");
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasColumnType("BLOB")
+                        .HasColumnName("data");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("date");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("path");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_uploaded_resource_log");
+
+                    b.ToTable("uploaded_resource_log", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Whitelist", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("user_id");
+
+                    b.HasKey("UserId")
+                        .HasName("PK_whitelist");
+
+                    b.ToTable("whitelist", (string)null);
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.Property<int>("PlayersId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("players_id");
+
+                    b.Property<int>("RoundsId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("rounds_id");
+
+                    b.HasKey("PlayersId", "RoundsId")
+                        .HasName("PK_player_round");
+
+                    b.HasIndex("RoundsId")
+                        .HasDatabaseName("IX_player_round_rounds_id");
+
+                    b.ToTable("player_round", (string)null);
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "AdminRank")
+                        .WithMany("Admins")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_admin_rank_admin_rank_id");
+
+                    b.Navigation("AdminRank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Admin", "Admin")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_flag_admin_admin_id");
+
+                    b.Navigation("Admin");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("RoundId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_round_round_id");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLogPlayer", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminLogs")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.AdminLog", "Log")
+                        .WithMany("Players")
+                        .HasForeignKey("RoundId", "LogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_log_player_admin_log_round_id_log_id");
+
+                    b.Navigation("Log");
+
+                    b.Navigation("Player");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminMessage", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminMessagesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminMessagesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminMessagesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_messages_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminMessagesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_messages_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_messages_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminNotesCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminNotesDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminNotesLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_notes_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminNotesReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_notes_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_notes_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRankFlag", b =>
+                {
+                    b.HasOne("Content.Server.Database.AdminRank", "Rank")
+                        .WithMany("Flags")
+                        .HasForeignKey("AdminRankId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_admin_rank_flag_admin_rank_admin_rank_id");
+
+                    b.Navigation("Rank");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminWatchlist", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminWatchlistsCreated")
+                        .HasForeignKey("CreatedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_created_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "DeletedBy")
+                        .WithMany("AdminWatchlistsDeleted")
+                        .HasForeignKey("DeletedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_deleted_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminWatchlistsLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_admin_watchlists_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Player", "Player")
+                        .WithMany("AdminWatchlistsReceived")
+                        .HasForeignKey("PlayerUserId")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .HasConstraintName("FK_admin_watchlists_player_player_user_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_admin_watchlists_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("DeletedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Player");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Antag", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Antags")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_antag_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("ConnectionLogs")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .IsRequired()
+                        .HasConstraintName("FK_connection_log_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Job", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Jobs")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_job_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Loadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_loadout_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.HasOne("Content.Server.Database.Preference", "Preference")
+                        .WithMany("Profiles")
+                        .HasForeignKey("PreferenceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_profile_preference_preference_id");
+
+                    b.Navigation("Preference");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.HasOne("Content.Server.Database.Server", "Server")
+                        .WithMany("Rounds")
+                        .HasForeignKey("ServerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_round_server_server_id");
+
+                    b.Navigation("Server");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBanHit", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithMany("BanHits")
+                        .HasForeignKey("BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_server_ban_ban_id");
+
+                    b.HasOne("Content.Server.Database.ConnectionLog", "Connection")
+                        .WithMany("BanHits")
+                        .HasForeignKey("ConnectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_ban_hit_connection_log_connection_id");
+
+                    b.Navigation("Ban");
+
+                    b.Navigation("Connection");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", "CreatedBy")
+                        .WithMany("AdminServerRoleBansCreated")
+                        .HasForeignKey("BanningAdmin")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_banning_admin");
+
+                    b.HasOne("Content.Server.Database.Player", "LastEditedBy")
+                        .WithMany("AdminServerRoleBansLastEdited")
+                        .HasForeignKey("LastEditedById")
+                        .HasPrincipalKey("UserId")
+                        .OnDelete(DeleteBehavior.SetNull)
+                        .HasConstraintName("FK_server_role_ban_player_last_edited_by_id");
+
+                    b.HasOne("Content.Server.Database.Round", "Round")
+                        .WithMany()
+                        .HasForeignKey("RoundId")
+                        .HasConstraintName("FK_server_role_ban_round_round_id");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("LastEditedBy");
+
+                    b.Navigation("Round");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerRoleBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerRoleUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_role_unban_server_role_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerUnban", b =>
+                {
+                    b.HasOne("Content.Server.Database.ServerBan", "Ban")
+                        .WithOne("Unban")
+                        .HasForeignKey("Content.Server.Database.ServerUnban", "BanId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_server_unban_server_ban_ban_id");
+
+                    b.Navigation("Ban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Trait", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Traits")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_trait_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
+            modelBuilder.Entity("PlayerRound", b =>
+                {
+                    b.HasOne("Content.Server.Database.Player", null)
+                        .WithMany()
+                        .HasForeignKey("PlayersId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_player_players_id");
+
+                    b.HasOne("Content.Server.Database.Round", null)
+                        .WithMany()
+                        .HasForeignKey("RoundsId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_player_round_round_rounds_id");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Admin", b =>
+                {
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminLog", b =>
+                {
+                    b.Navigation("Players");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.AdminRank", b =>
+                {
+                    b.Navigation("Admins");
+
+                    b.Navigation("Flags");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ConnectionLog", b =>
+                {
+                    b.Navigation("BanHits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Player", b =>
+                {
+                    b.Navigation("AdminLogs");
+
+                    b.Navigation("AdminMessagesCreated");
+
+                    b.Navigation("AdminMessagesDeleted");
+
+                    b.Navigation("AdminMessagesLastEdited");
+
+                    b.Navigation("AdminMessagesReceived");
+
+                    b.Navigation("AdminNotesCreated");
+
+                    b.Navigation("AdminNotesDeleted");
+
+                    b.Navigation("AdminNotesLastEdited");
+
+                    b.Navigation("AdminNotesReceived");
+
+                    b.Navigation("AdminServerBansCreated");
+
+                    b.Navigation("AdminServerBansLastEdited");
+
+                    b.Navigation("AdminServerRoleBansCreated");
+
+                    b.Navigation("AdminServerRoleBansLastEdited");
+
+                    b.Navigation("AdminWatchlistsCreated");
+
+                    b.Navigation("AdminWatchlistsDeleted");
+
+                    b.Navigation("AdminWatchlistsLastEdited");
+
+                    b.Navigation("AdminWatchlistsReceived");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Preference", b =>
+                {
+                    b.Navigation("Profiles");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Profile", b =>
+                {
+                    b.Navigation("Antags");
+
+                    b.Navigation("Jobs");
+
+                    b.Navigation("Loadouts");
+
+                    b.Navigation("Traits");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Round", b =>
+                {
+                    b.Navigation("AdminLogs");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.Server", b =>
+                {
+                    b.Navigation("ConnectionLogs");
+
+                    b.Navigation("Rounds");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerBan", b =>
+                {
+                    b.Navigation("BanHits");
+
+                    b.Navigation("Unban");
+                });
+
+            modelBuilder.Entity("Content.Server.Database.ServerRoleBan", b =>
+                {
+                    b.Navigation("Unban");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/20240505230431_Loadouts.cs b/Content.Server.Database/Migrations/Sqlite/20240505230431_Loadouts.cs
new file mode 100644
index 0000000000..b610190556
--- /dev/null
+++ b/Content.Server.Database/Migrations/Sqlite/20240505230431_Loadouts.cs
@@ -0,0 +1,47 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Content.Server.Database.Migrations.Sqlite
+{
+    /// <inheritdoc />
+    public partial class Loadouts : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "loadout",
+                columns: table => new
+                {
+                    loadout_id = table.Column<int>(type: "INTEGER", nullable: false)
+                        .Annotation("Sqlite:Autoincrement", true),
+                    profile_id = table.Column<int>(type: "INTEGER", nullable: false),
+                    loadout_name = table.Column<string>(type: "TEXT", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_loadout", x => x.loadout_id);
+                    table.ForeignKey(
+                        name: "FK_loadout_profile_profile_id",
+                        column: x => x.profile_id,
+                        principalTable: "profile",
+                        principalColumn: "profile_id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_loadout_profile_id_loadout_name",
+                table: "loadout",
+                columns: new[] { "profile_id", "loadout_name" },
+                unique: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "loadout");
+        }
+    }
+}
diff --git a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
index c9a36ebc5e..89ca243fae 100644
--- a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
+++ b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
@@ -166,6 +166,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("TEXT")
                         .HasColumnName("deleted_by_id");
 
+                    b.Property<bool>("Dismissed")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("dismissed");
+
                     b.Property<DateTime?>("ExpirationTime")
                         .HasColumnType("TEXT")
                         .HasColumnName("expiration_time");
@@ -215,7 +219,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.HasIndex("RoundId")
                         .HasDatabaseName("IX_admin_messages_round_id");
 
-                    b.ToTable("admin_messages", (string)null);
+                    b.ToTable("admin_messages", null, t =>
+                        {
+                            t.HasCheckConstraint("NotDismissedAndSeen", "NOT dismissed OR seen");
+                        });
                 });
 
             modelBuilder.Entity("Content.Server.Database.AdminNote", b =>
@@ -561,6 +568,31 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("job", (string)null);
                 });
 
+            modelBuilder.Entity("Content.Server.Database.Loadout", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("loadout_id");
+
+                    b.Property<string>("LoadoutName")
+                        .IsRequired()
+                        .HasColumnType("TEXT")
+                        .HasColumnName("loadout_name");
+
+                    b.Property<int>("ProfileId")
+                        .HasColumnType("INTEGER")
+                        .HasColumnName("profile_id");
+
+                    b.HasKey("Id")
+                        .HasName("PK_loadout");
+
+                    b.HasIndex("ProfileId", "LoadoutName")
+                        .IsUnique();
+
+                    b.ToTable("loadout", (string)null);
+                });
+
             modelBuilder.Entity("Content.Server.Database.PlayTime", b =>
                 {
                     b.Property<int>("Id")
@@ -1433,6 +1465,18 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Navigation("Profile");
                 });
 
+            modelBuilder.Entity("Content.Server.Database.Loadout", b =>
+                {
+                    b.HasOne("Content.Server.Database.Profile", "Profile")
+                        .WithMany("Loadouts")
+                        .HasForeignKey("ProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired()
+                        .HasConstraintName("FK_loadout_profile_profile_id");
+
+                    b.Navigation("Profile");
+                });
+
             modelBuilder.Entity("Content.Server.Database.Profile", b =>
                 {
                     b.HasOne("Content.Server.Database.Preference", "Preference")
@@ -1657,6 +1701,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.Navigation("Jobs");
 
+                    b.Navigation("Loadouts");
+
                     b.Navigation("Traits");
                 });
 
diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs
index f9ec7811f5..eb9581b21e 100644
--- a/Content.Server.Database/Model.cs
+++ b/Content.Server.Database/Model.cs
@@ -56,8 +56,12 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .IsUnique();
 
             modelBuilder.Entity<Trait>()
-                        .HasIndex(p => new {HumanoidProfileId = p.ProfileId, p.TraitName})
-                        .IsUnique();
+                .HasIndex(p => new {HumanoidProfileId = p.ProfileId, p.TraitName})
+                .IsUnique();
+
+            modelBuilder.Entity<Loadout>()
+                .HasIndex(p => new {HumanoidProfileId = p.ProfileId, p.LoadoutName})
+                .IsUnique();
 
             modelBuilder.Entity<Job>()
                 .HasIndex(j => j.ProfileId);
@@ -268,6 +272,11 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .HasPrincipalKey(author => author.UserId)
                 .OnDelete(DeleteBehavior.SetNull);
 
+            // A message cannot be "dismissed" without also being "seen".
+            modelBuilder.Entity<AdminMessage>().ToTable(t =>
+                t.HasCheckConstraint("NotDismissedAndSeen",
+                    "NOT dismissed OR seen"));
+
             modelBuilder.Entity<ServerBan>()
                 .HasOne(ban => ban.CreatedBy)
                 .WithMany(author => author.AdminServerBansCreated)
@@ -342,6 +351,7 @@ public class Profile
         public List<Job> Jobs { get; } = new();
         public List<Antag> Antags { get; } = new();
         public List<Trait> Traits { get; } = new();
+        public List<Loadout> Loadouts { get; } = new();
 
         [Column("pref_unavailable")] public DbPreferenceUnavailableMode PreferenceUnavailable { get; set; }
 
@@ -386,6 +396,15 @@ public class Trait
         public string TraitName { get; set; } = null!;
     }
 
+    public class Loadout
+    {
+        public int Id { get; set; }
+        public Profile Profile { get; set; } = null!;
+        public int ProfileId { get; set; }
+
+        public string LoadoutName { get; set; } = null!;
+    }
+
     public enum DbPreferenceUnavailableMode
     {
         // These enum values HAVE to match the ones in PreferenceUnavailableMode in Shared.
@@ -969,6 +988,15 @@ public class AdminMessage
         [ForeignKey("DeletedBy")] public Guid? DeletedById { get; set; }
         public Player? DeletedBy { get; set; }
         public DateTime? DeletedAt { get; set; }
+
+        /// <summary>
+        /// Whether the message has been seen at least once by the player.
+        /// </summary>
         public bool Seen { get; set; }
+
+        /// <summary>
+        /// Whether the message has been dismissed permanently by the player.
+        /// </summary>
+        public bool Dismissed { get; set; }
     }
 }
diff --git a/Content.Server.Database/SnakeCaseNaming.cs b/Content.Server.Database/SnakeCaseNaming.cs
index ca1a966584..27ce392cd5 100644
--- a/Content.Server.Database/SnakeCaseNaming.cs
+++ b/Content.Server.Database/SnakeCaseNaming.cs
@@ -301,14 +301,14 @@ public void ProcessModelFinalizing(IConventionModelBuilder modelBuilder, IConven
         private static void RewriteColumnName(IConventionPropertyBuilder propertyBuilder)
         {
             var property = propertyBuilder.Metadata;
-            var entityType = property.DeclaringEntityType;
+            var entityType = (IConventionEntityType)property.DeclaringType;
 
             if (entityType.ClrType == typeof(Microsoft.EntityFrameworkCore.Migrations.HistoryRow))
                 return;
 
             property.Builder.HasNoAnnotation(RelationalAnnotationNames.ColumnName);
 
-            var baseColumnName = StoreObjectIdentifier.Create(property.DeclaringEntityType, StoreObjectType.Table) is { } tableIdentifier
+            var baseColumnName = StoreObjectIdentifier.Create(entityType, StoreObjectType.Table) is { } tableIdentifier
                 ? property.GetDefaultColumnName(tableIdentifier)
                 : property.GetDefaultColumnName();
 
diff --git a/Content.Server/Access/Systems/PresetIdCardSystem.cs b/Content.Server/Access/Systems/PresetIdCardSystem.cs
index 4073b4baa2..696b7a1dcf 100644
--- a/Content.Server/Access/Systems/PresetIdCardSystem.cs
+++ b/Content.Server/Access/Systems/PresetIdCardSystem.cs
@@ -50,8 +50,10 @@ private void OnMapInit(EntityUid uid, PresetIdCardComponent id, MapInitEvent arg
 
         var station = _stationSystem.GetOwningStation(uid);
         var extended = false;
-        if (station != null)
-            extended = Comp<StationJobsComponent>(station.Value).ExtendedAccess;
+
+        // Station not guaranteed to have jobs (e.g. nukie outpost).
+        if (TryComp(station, out StationJobsComponent? stationJobs))
+            extended = stationJobs.ExtendedAccess;
 
         SetupIdAccess(uid, id, extended);
         SetupIdName(uid, id);
diff --git a/Content.Server/Administration/Managers/AdminManager.Metrics.cs b/Content.Server/Administration/Managers/AdminManager.Metrics.cs
new file mode 100644
index 0000000000..2fea931f1b
--- /dev/null
+++ b/Content.Server/Administration/Managers/AdminManager.Metrics.cs
@@ -0,0 +1,98 @@
+using System.Diagnostics.Metrics;
+using System.Runtime.InteropServices;
+using Content.Server.Afk;
+using Robust.Server.DataMetrics;
+
+namespace Content.Server.Administration.Managers;
+
+// Handles metrics reporting for active admin count and such.
+
+public sealed partial class AdminManager
+{
+    private Dictionary<int, (int active, int afk, int deadminned)>? _adminOnlineCounts;
+
+    private const int SentinelRankId = -1;
+
+    [Dependency] private readonly IMetricsManager _metrics = default!;
+    [Dependency] private readonly IAfkManager _afkManager = default!;
+    [Dependency] private readonly IMeterFactory _meterFactory = default!;
+
+    private void InitializeMetrics()
+    {
+        _metrics.UpdateMetrics += MetricsOnUpdateMetrics;
+
+        var meter = _meterFactory.Create("SS14.AdminManager");
+
+        meter.CreateObservableGauge(
+            "admins_online_count",
+            MeasureAdminCount,
+            null,
+            "The count of online admins");
+    }
+
+    private void MetricsOnUpdateMetrics()
+    {
+        _sawmill.Verbose("Updating metrics");
+
+        var dict = new Dictionary<int, (int active, int afk, int deadminned)>();
+
+        foreach (var (session, reg) in _admins)
+        {
+            var rankId = reg.RankId ?? SentinelRankId;
+
+            ref var counts = ref CollectionsMarshal.GetValueRefOrAddDefault(dict, rankId, out _);
+
+            if (reg.Data.Active)
+            {
+                if (_afkManager.IsAfk(session))
+                    counts.afk += 1;
+                else
+                    counts.active += 1;
+            }
+            else
+            {
+                counts.deadminned += 1;
+            }
+        }
+
+        // Neither prometheus-net nor dotnet-counters seem to handle stuff well if we STOP returning measurements.
+        // i.e. if the last admin with a rank disconnects.
+        // So if we have EVER reported a rank, always keep reporting it.
+        if (_adminOnlineCounts != null)
+        {
+            foreach (var rank in _adminOnlineCounts.Keys)
+            {
+                CollectionsMarshal.GetValueRefOrAddDefault(dict, rank, out _);
+            }
+        }
+
+        // Make sure "no rank" is always available. Avoid "no data".
+        CollectionsMarshal.GetValueRefOrAddDefault(dict, SentinelRankId, out _);
+
+        _adminOnlineCounts = dict;
+    }
+
+    private IEnumerable<Measurement<int>> MeasureAdminCount()
+    {
+        if (_adminOnlineCounts == null)
+            yield break;
+
+        foreach (var (rank, (active, afk, deadminned)) in _adminOnlineCounts)
+        {
+            yield return new Measurement<int>(
+                active,
+                new KeyValuePair<string, object?>("state", "active"),
+                new KeyValuePair<string, object?>("rank", rank == SentinelRankId ? "none" : rank.ToString()));
+
+            yield return new Measurement<int>(
+                afk,
+                new KeyValuePair<string, object?>("state", "afk"),
+                new KeyValuePair<string, object?>("rank", rank == SentinelRankId ? "none" : rank.ToString()));
+
+            yield return new Measurement<int>(
+                deadminned,
+                new KeyValuePair<string, object?>("state", "deadminned"),
+                new KeyValuePair<string, object?>("rank", rank == SentinelRankId ? "none" : rank.ToString()));
+        }
+    }
+}
diff --git a/Content.Server/Administration/Managers/AdminManager.cs b/Content.Server/Administration/Managers/AdminManager.cs
index 4eaa08fe9d..b1cca46e63 100644
--- a/Content.Server/Administration/Managers/AdminManager.cs
+++ b/Content.Server/Administration/Managers/AdminManager.cs
@@ -23,7 +23,7 @@
 
 namespace Content.Server.Administration.Managers
 {
-    public sealed class AdminManager : IAdminManager, IPostInjectInit, IConGroupControllerImplementation
+    public sealed partial class AdminManager : IAdminManager, IPostInjectInit, IConGroupControllerImplementation
     {
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IServerDbManager _dbManager = default!;
@@ -34,6 +34,7 @@ public sealed class AdminManager : IAdminManager, IPostInjectInit, IConGroupCont
         [Dependency] private readonly IServerConsoleHost _consoleHost = default!;
         [Dependency] private readonly IChatManager _chat = default!;
         [Dependency] private readonly ToolshedManager _toolshed = default!;
+        [Dependency] private readonly ILogManager _logManager = default!;
 
         private readonly Dictionary<ICommonSession, AdminReg> _admins = new();
         private readonly HashSet<NetUserId> _promotedPlayers = new();
@@ -49,6 +50,8 @@ public sealed class AdminManager : IAdminManager, IPostInjectInit, IConGroupCont
         private readonly AdminCommandPermissions _commandPermissions = new();
         private readonly AdminCommandPermissions _toolshedCommandPermissions = new();
 
+        private ISawmill _sawmill = default!;
+
         public bool IsAdmin(ICommonSession session, bool includeDeAdmin = false)
         {
             return GetAdminData(session, includeDeAdmin) != null;
@@ -181,6 +184,8 @@ public void ReloadAdminsWithRank(int rankId)
 
         public void Initialize()
         {
+            _sawmill = _logManager.GetSawmill("admin");
+
             _netMgr.RegisterNetMessage<MsgUpdateAdminStatus>();
 
             // Cache permissions for loaded console commands with the requisite attributes.
@@ -234,6 +239,8 @@ public void Initialize()
             }
 
             _toolshed.ActivePermissionController = this;
+
+            InitializeMetrics();
         }
 
         public void PromoteHost(ICommonSession player)
diff --git a/Content.Server/Administration/Notes/AdminMessageEui.cs b/Content.Server/Administration/Notes/AdminMessageEui.cs
index c5e0b60172..e53394ab47 100644
--- a/Content.Server/Administration/Notes/AdminMessageEui.cs
+++ b/Content.Server/Administration/Notes/AdminMessageEui.cs
@@ -1,9 +1,11 @@
+using System.Linq;
 using Content.Server.Database;
 using Content.Server.EUI;
 using Content.Shared.Administration.Notes;
 using Content.Shared.CCVar;
 using Content.Shared.Eui;
 using Robust.Shared.Configuration;
+using Robust.Shared.Timing;
 using static Content.Shared.Administration.Notes.AdminMessageEuiMsg;
 
 namespace Content.Server.Administration.Notes;
@@ -12,32 +14,33 @@ public sealed class AdminMessageEui : BaseEui
 {
     [Dependency] private readonly IAdminNotesManager _notesMan = default!;
     [Dependency] private readonly IConfigurationManager _cfg = default!;
-    private readonly float _closeWait;
-    private AdminMessageRecord? _message;
-    private DateTime _startTime;
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
 
-    public AdminMessageEui()
+    private readonly TimeSpan _closeWait;
+    private readonly TimeSpan _endTime;
+    private readonly AdminMessageRecord[] _messages;
+
+    public AdminMessageEui(AdminMessageRecord[] messages)
     {
         IoCManager.InjectDependencies(this);
-        _closeWait = _cfg.GetCVar(CCVars.MessageWaitTime);
+        _closeWait = TimeSpan.FromSeconds(_cfg.GetCVar(CCVars.MessageWaitTime));
+        _endTime = _gameTiming.RealTime + _closeWait;
+        _messages = messages;
     }
 
-    public void SetMessage(AdminMessageRecord message)
+    public override void Opened()
     {
-        _message = message;
-        _startTime = DateTime.UtcNow;
         StateDirty();
     }
 
     public override EuiStateBase GetNewState()
     {
-        if (_message == null)
-            return new AdminMessageEuiState(float.MaxValue, "An error has occurred.", string.Empty, DateTime.MinValue);
         return new AdminMessageEuiState(
             _closeWait,
-            _message.Message,
-            _message.CreatedBy?.LastSeenUserName ?? "[System]",
-            _message.CreatedAt.UtcDateTime
+            _messages.Select(x => new AdminMessageEuiState.Message(
+                x.Message,
+                x.CreatedBy?.LastSeenUserName ?? Loc.GetString("admin-notes-fallback-admin-name"),
+                x.CreatedAt.UtcDateTime)).ToArray()
         );
     }
 
@@ -47,15 +50,14 @@ public override async void HandleMessage(EuiMessageBase msg)
 
         switch (msg)
         {
-            case Accept:
-                if (_message == null)
-                    break;
-                // No escape
-                if (DateTime.UtcNow - _startTime >= TimeSpan.FromSeconds(_closeWait))
-                    await _notesMan.MarkMessageAsSeen(_message.Id);
-                Close();
-                break;
-            case Dismiss:
+            case Dismiss dismiss:
+                if (_gameTiming.RealTime < _endTime)
+                    return;
+
+                foreach (var message in _messages)
+                {
+                    await _notesMan.MarkMessageAsSeen(message.Id, dismiss.Permanent);
+                }
                 Close();
                 break;
         }
diff --git a/Content.Server/Administration/Notes/AdminNotesManager.cs b/Content.Server/Administration/Notes/AdminNotesManager.cs
index e09e190648..412b191171 100644
--- a/Content.Server/Administration/Notes/AdminNotesManager.cs
+++ b/Content.Server/Administration/Notes/AdminNotesManager.cs
@@ -331,9 +331,9 @@ public async Task<List<AdminMessageRecord>> GetNewMessages(Guid player)
         return await _db.GetMessages(player);
     }
 
-    public async Task MarkMessageAsSeen(int id)
+    public async Task MarkMessageAsSeen(int id, bool dismissedToo)
     {
-        await _db.MarkMessageAsSeen(id);
+        await _db.MarkMessageAsSeen(id, dismissedToo);
     }
 
     public void PostInject()
diff --git a/Content.Server/Administration/Notes/AdminNotesSystem.cs b/Content.Server/Administration/Notes/AdminNotesSystem.cs
index 069b8603ce..613591817b 100644
--- a/Content.Server/Administration/Notes/AdminNotesSystem.cs
+++ b/Content.Server/Administration/Notes/AdminNotesSystem.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Server.Administration.Commands;
 using Content.Server.Chat.Managers;
 using Content.Server.EUI;
@@ -52,7 +53,7 @@ private void AddVerbs(GetVerbsEvent<Verb> ev)
 
     private async void OnPlayerStatusChanged(object? sender, SessionStatusEventArgs e)
     {
-        if (e.NewStatus != SessionStatus.Connected)
+        if (e.NewStatus != SessionStatus.InGame)
             return;
 
         var messages = await _notes.GetNewMessages(e.Session.UserId);
@@ -69,19 +70,11 @@ private async void OnPlayerStatusChanged(object? sender, SessionStatusEventArgs
             _chat.SendAdminAlert(Loc.GetString("admin-notes-watchlist", ("player", username), ("message", watchlist.Message)));
         }
 
-        foreach (var message in messages)
-        {
-            var messageString = Loc.GetString("admin-notes-new-message", ("admin", message.CreatedBy?.LastSeenUserName ?? "[System]"), ("message", message.Message));
-            // Only open the popup if the user hasn't seen it yet
-            if (!message.Seen)
-            {
-                var ui = new AdminMessageEui();
-                _euis.OpenEui(ui, e.Session);
-                ui.SetMessage(message);
+        var messagesToShow = messages.OrderBy(x => x.CreatedAt).Where(x => !x.Dismissed).ToArray();
+        if (messagesToShow.Length == 0)
+            return;
 
-				// Only send the message if they haven't seen it yet
-				_chat.DispatchServerMessage(e.Session, messageString);
-            }
-        }
+        var ui = new AdminMessageEui(messagesToShow);
+        _euis.OpenEui(ui, e.Session);
     }
 }
diff --git a/Content.Server/Administration/Notes/IAdminNotesManager.cs b/Content.Server/Administration/Notes/IAdminNotesManager.cs
index 81ebd3e716..f54f8a21bd 100644
--- a/Content.Server/Administration/Notes/IAdminNotesManager.cs
+++ b/Content.Server/Administration/Notes/IAdminNotesManager.cs
@@ -45,5 +45,13 @@ public interface IAdminNotesManager
     /// <param name="player">Desired player's <see cref="Guid"/></param>
     /// <returns>All unread messages</returns>
     Task<List<AdminMessageRecord>> GetNewMessages(Guid player);
-    Task MarkMessageAsSeen(int id);
+
+    /// <summary>
+    /// Mark an admin message as being seen by the target player.
+    /// </summary>
+    /// <param name="id">The database ID of the admin message.</param>
+    /// <param name="dismissedToo">
+    /// If true, the message is "permanently dismissed" and will not be shown to the player again when they join.
+    /// </param>
+    Task MarkMessageAsSeen(int id, bool dismissedToo);
 }
diff --git a/Content.Server/Administration/Systems/AdminSystem.cs b/Content.Server/Administration/Systems/AdminSystem.cs
index 5760f83001..53eabb1a48 100644
--- a/Content.Server/Administration/Systems/AdminSystem.cs
+++ b/Content.Server/Administration/Systems/AdminSystem.cs
@@ -134,7 +134,7 @@ public void UpdatePlayerList(ICommonSession player)
             return value ?? null;
         }
 
-        private void OnIdentityChanged(IdentityChangedEvent ev)
+        private void OnIdentityChanged(ref IdentityChangedEvent ev)
         {
             if (!TryComp<ActorComponent>(ev.CharacterEntity, out var actor))
                 return;
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
index 8a819f5942..8ee52ad03e 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
@@ -409,7 +409,7 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
                     var fixtures = Comp<FixturesComponent>(args.Target);
                     xform.Anchored = false; // Just in case.
                     _physics.SetBodyType(args.Target, BodyType.Dynamic, manager: fixtures, body: physics);
-                    _physics.SetBodyStatus(physics, BodyStatus.InAir);
+                    _physics.SetBodyStatus(args.Target, physics, BodyStatus.InAir);
                     _physics.WakeBody(args.Target, manager: fixtures, body: physics);
 
                     foreach (var fixture in fixtures.Fixtures.Values)
@@ -424,8 +424,8 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
 
                     _physics.SetLinearVelocity(args.Target, _random.NextVector2(1.5f, 1.5f), manager: fixtures, body: physics);
                     _physics.SetAngularVelocity(args.Target, MathF.PI * 12, manager: fixtures, body: physics);
-                    _physics.SetLinearDamping(physics, 0f);
-                    _physics.SetAngularDamping(physics, 0f);
+                    _physics.SetLinearDamping(args.Target, physics, 0f);
+                    _physics.SetAngularDamping(args.Target, physics, 0f);
                 },
                 Impact = LogImpact.Extreme,
                 Message = Loc.GetString("admin-smite-pinball-description")
@@ -444,7 +444,7 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
                     xform.Anchored = false; // Just in case.
 
                     _physics.SetBodyType(args.Target, BodyType.Dynamic, body: physics);
-                    _physics.SetBodyStatus(physics, BodyStatus.InAir);
+                    _physics.SetBodyStatus(args.Target, physics, BodyStatus.InAir);
                     _physics.WakeBody(args.Target, manager: fixtures, body: physics);
 
                     foreach (var fixture in fixtures.Fixtures.Values)
@@ -454,8 +454,8 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
 
                     _physics.SetLinearVelocity(args.Target, _random.NextVector2(8.0f, 8.0f), manager: fixtures, body: physics);
                     _physics.SetAngularVelocity(args.Target, MathF.PI * 12, manager: fixtures, body: physics);
-                    _physics.SetLinearDamping(physics, 0f);
-                    _physics.SetAngularDamping(physics, 0f);
+                    _physics.SetLinearDamping(args.Target, physics, 0f);
+                    _physics.SetAngularDamping(args.Target, physics, 0f);
                 },
                 Impact = LogImpact.Extreme,
                 Message = Loc.GetString("admin-smite-yeet-description")
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
index c68336deab..9d66338c8b 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
@@ -718,9 +718,21 @@ private void AddTricksVerbs(GetVerbsEvent<Verb> args)
                 Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Fun/caps.rsi"), "mag-6"),
                 Act = () =>
                 {
-                    _quickDialog.OpenDialog(player, "Set Bullet Amount", $"Amount (max {ballisticAmmo.Capacity}):", (int amount) =>
+                    _quickDialog.OpenDialog(player, "Set Bullet Amount", $"Amount (standard {ballisticAmmo.Capacity}):", (string amount) =>
                     {
-                        ballisticAmmo.UnspawnedCount = amount;
+                        if (!int.TryParse(amount, out var result))
+                            return;
+
+                        if (result > 0)
+                        {
+                            ballisticAmmo.UnspawnedCount = result;
+                        }
+                        else
+                        {
+                            ballisticAmmo.UnspawnedCount = 0;
+                        }
+
+                        _gun.UpdateBallisticAppearance(args.Target, ballisticAmmo);
                     });
                 },
                 Impact = LogImpact.Medium,
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.cs b/Content.Server/Administration/Systems/AdminVerbSystem.cs
index e678abb0c4..f5b237b449 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.cs
@@ -66,8 +66,9 @@ public sealed partial class AdminVerbSystem : EntitySystem
         [Dependency] private readonly SharedPopupSystem _popup = default!;
         [Dependency] private readonly StationSystem _stations = default!;
         [Dependency] private readonly StationSpawningSystem _spawning = default!;
+        [Dependency] private readonly ExamineSystemShared _examine = default!;
 
-        private readonly Dictionary<ICommonSession, EditSolutionsEui> _openSolutionUis = new();
+        private readonly Dictionary<ICommonSession, List<EditSolutionsEui>> _openSolutionUis = new();
 
         public override void Initialize()
         {
@@ -416,7 +417,7 @@ private void AddDebugVerbs(GetVerbsEvent<Verb> args)
                     Act = () =>
                     {
 
-                        var message = ExamineSystemShared.InRangeUnOccluded(args.User, args.Target)
+                        var message = _examine.InRangeUnOccluded(args.User, args.Target)
                             ? Loc.GetString("in-range-unoccluded-verb-on-activate-not-occluded")
                             : Loc.GetString("in-range-unoccluded-verb-on-activate-occluded");
 
@@ -486,10 +487,13 @@ private void AddDebugVerbs(GetVerbsEvent<Verb> args)
         #region SolutionsEui
         private void OnSolutionChanged(Entity<SolutionContainerManagerComponent> entity, ref SolutionContainerChangedEvent args)
         {
-            foreach (var eui in _openSolutionUis.Values)
+            foreach (var list in _openSolutionUis.Values)
             {
-                if (eui.Target == entity.Owner)
-                    eui.StateDirty();
+                foreach (var eui in list)
+                {
+                    if (eui.Target == entity.Owner)
+                        eui.StateDirty();
+                }
             }
         }
 
@@ -498,21 +502,33 @@ public void OpenEditSolutionsEui(ICommonSession session, EntityUid uid)
             if (session.AttachedEntity == null)
                 return;
 
-            if (_openSolutionUis.ContainsKey(session))
-                _openSolutionUis[session].Close();
-
-            var eui = _openSolutionUis[session] = new EditSolutionsEui(uid);
+            var eui = new EditSolutionsEui(uid);
             _euiManager.OpenEui(eui, session);
             eui.StateDirty();
+
+            if (!_openSolutionUis.ContainsKey(session)) {
+                _openSolutionUis[session] = new List<EditSolutionsEui>();
+            }
+
+            _openSolutionUis[session].Add(eui);
         }
 
-        public void OnEditSolutionsEuiClosed(ICommonSession session)
+        public void OnEditSolutionsEuiClosed(ICommonSession session, EditSolutionsEui eui)
         {
-            _openSolutionUis.Remove(session, out var eui);
+            _openSolutionUis[session].Remove(eui);
+            if (_openSolutionUis[session].Count == 0)
+              _openSolutionUis.Remove(session);
         }
 
         private void Reset(RoundRestartCleanupEvent ev)
         {
+            foreach (var euis in _openSolutionUis.Values)
+            {
+                foreach (var eui in euis.ToList())
+                {
+                    eui.Close();
+                }
+            }
             _openSolutionUis.Clear();
         }
         #endregion
diff --git a/Content.Server/Administration/UI/EditSolutionsEui.cs b/Content.Server/Administration/UI/EditSolutionsEui.cs
index 2a78a27bc0..b4904d969e 100644
--- a/Content.Server/Administration/UI/EditSolutionsEui.cs
+++ b/Content.Server/Administration/UI/EditSolutionsEui.cs
@@ -36,7 +36,7 @@ public override void Opened()
         public override void Closed()
         {
             base.Closed();
-            _entityManager.System<AdminVerbSystem>().OnEditSolutionsEuiClosed(Player);
+            _entityManager.System<AdminVerbSystem>().OnEditSolutionsEuiClosed(Player, this);
         }
 
         public override EuiStateBase GetNewState()
diff --git a/Content.Server/Ame/AmeNodeGroup.cs b/Content.Server/Ame/AmeNodeGroup.cs
index 608356f760..96b88114eb 100644
--- a/Content.Server/Ame/AmeNodeGroup.cs
+++ b/Content.Server/Ame/AmeNodeGroup.cs
@@ -182,7 +182,7 @@ public float CalculatePower(int fuel, int cores)
         // Fuel is squared so more fuel vastly increases power and efficiency
         // We divide by the number of cores so a larger AME is less efficient at the same fuel settings
         // this results in all AMEs having the same efficiency at the same fuel-per-core setting
-        return 2000000f * fuel * fuel / cores;
+        return 20000f * fuel * fuel / cores; // Delta V - Revert upstream buff for normal AME operation
     }
 
     public int GetTotalStability()
diff --git a/Content.Server/Atmos/Commands/SetMapAtmosCommand.cs b/Content.Server/Atmos/Commands/SetMapAtmosCommand.cs
new file mode 100644
index 0000000000..6f04cfb2da
--- /dev/null
+++ b/Content.Server/Atmos/Commands/SetMapAtmosCommand.cs
@@ -0,0 +1,94 @@
+using Content.Server.Administration;
+using Content.Server.Atmos.Components;
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.Administration;
+using Content.Shared.Atmos;
+using Robust.Shared.Console;
+using Robust.Shared.Map;
+
+namespace Content.Server.Atmos.Commands;
+
+[AdminCommand(AdminFlags.Admin)]
+public sealed class AddMapAtmosCommand : LocalizedCommands
+{
+    [Dependency] private readonly IEntityManager _entities = default!;
+    [Dependency] private readonly IMapManager _map = default!;
+
+    private const string _cmd = "cmd-set-map-atmos";
+    public override string Command => "setmapatmos";
+    public override string Description => Loc.GetString($"{_cmd}-desc");
+    public override string Help => Loc.GetString($"{_cmd}-help");
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        if (args.Length < 2)
+        {
+            shell.WriteLine(Help);
+            return;
+        }
+
+        int.TryParse(args[0], out var id);
+        var map = _map.GetMapEntityId(new MapId(id));
+        if (!map.IsValid())
+        {
+            shell.WriteError(Loc.GetString("cmd-parse-failure-mapid",  ("arg", args[0])));
+            return;
+        }
+
+        if (!bool.TryParse(args[1], out var space))
+        {
+            shell.WriteError(Loc.GetString("cmd-parse-failure-bool", ("arg", args[1])));
+            return;
+        }
+
+        if (space || args.Length < 4)
+        {
+            _entities.RemoveComponent<MapAtmosphereComponent>(map);
+            shell.WriteLine(Loc.GetString($"{_cmd}-removed", ("map", id)));
+            return;
+        }
+
+        if (!float.TryParse(args[2], out var temp))
+        {
+            shell.WriteError(Loc.GetString("cmd-parse-failure-float", ("arg", args[2])));
+            return;
+        }
+
+        var mix = new GasMixture(Atmospherics.CellVolume) {Temperature = Math.Min(temp, Atmospherics.TCMB)};
+        for (var i = 0; i < Atmospherics.TotalNumberOfGases; i++)
+        {
+            if (args.Length == 3 + i)
+                break;
+
+            if (!float.TryParse(args[3+i], out var moles))
+            {
+                shell.WriteError(Loc.GetString("cmd-parse-failure-float", ("arg", args[3+i])));
+                return;
+            }
+
+            mix.AdjustMoles(i, moles);
+        }
+
+        var atmos = _entities.EntitySysManager.GetEntitySystem<AtmosphereSystem>();
+        atmos.SetMapAtmosphere(map, space, mix);
+        shell.WriteLine(Loc.GetString($"{_cmd}-updated", ("map", id)));
+    }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        if (args.Length == 1)
+            return CompletionResult.FromHintOptions(CompletionHelper.MapIds(_entities), Loc.GetString($"{_cmd}-hint-map"));
+
+        if (args.Length == 2)
+            return CompletionResult.FromHintOptions(new[]{ "false", "true"}, Loc.GetString($"{_cmd}-hint-space"));
+
+        if (!bool.TryParse(args[1], out var space) || space)
+            return CompletionResult.Empty;
+
+        if (args.Length == 3)
+            return CompletionResult.FromHint(Loc.GetString($"{_cmd}-hint-temp"));
+
+        var gas = (Gas) args.Length - 4;
+        return CompletionResult.FromHint(Loc.GetString($"{_cmd}-hint-gas" , ("gas", gas.ToString())));
+    }
+}
diff --git a/Content.Server/Atmos/Components/AirtightComponent.cs b/Content.Server/Atmos/Components/AirtightComponent.cs
index 897981724c..ca107eafbe 100644
--- a/Content.Server/Atmos/Components/AirtightComponent.cs
+++ b/Content.Server/Atmos/Components/AirtightComponent.cs
@@ -1,9 +1,10 @@
+using Content.Server.Atmos.EntitySystems;
 using Content.Shared.Atmos;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Server.Atmos.Components
 {
-    [RegisterComponent]
+    [RegisterComponent, Access(typeof(AirtightSystem))]
     public sealed partial class AirtightComponent : Component
     {
         public (EntityUid Grid, Vector2i Tile) LastPosition { get; set; }
@@ -29,6 +30,7 @@ public sealed partial class AirtightComponent : Component
         [DataField("noAirWhenFullyAirBlocked")]
         public bool NoAirWhenFullyAirBlocked { get; set; } = true;
 
+        [Access(Other = AccessPermissions.ReadWriteExecute)]
         public AtmosDirection AirBlockedDirection => (AtmosDirection)CurrentAirBlockedDirection;
     }
 }
diff --git a/Content.Server/Atmos/Components/GridAtmosphereComponent.cs b/Content.Server/Atmos/Components/GridAtmosphereComponent.cs
index 7fcd63bc5d..e682fd0964 100644
--- a/Content.Server/Atmos/Components/GridAtmosphereComponent.cs
+++ b/Content.Server/Atmos/Components/GridAtmosphereComponent.cs
@@ -28,6 +28,9 @@ public sealed partial class GridAtmosphereComponent : Component
         [IncludeDataField(customTypeSerializer:typeof(TileAtmosCollectionSerializer))]
         public Dictionary<Vector2i, TileAtmosphere> Tiles = new(1000);
 
+        [ViewVariables]
+        public HashSet<TileAtmosphere> MapTiles = new(1000);
+
         [ViewVariables]
         public readonly HashSet<TileAtmosphere> ActiveTiles = new(1000);
 
@@ -80,7 +83,10 @@ public sealed partial class GridAtmosphereComponent : Component
         public readonly HashSet<Vector2i> InvalidatedCoords = new(1000);
 
         [ViewVariables]
-        public readonly Queue<Vector2i> CurrentRunInvalidatedCoordinates = new();
+        public readonly Queue<TileAtmosphere> CurrentRunInvalidatedTiles = new();
+
+        [ViewVariables]
+        public readonly List<TileAtmosphere> PossiblyDisconnectedTiles = new(100);
 
         [ViewVariables]
         public int InvalidatedCoordsCount => InvalidatedCoords.Count;
diff --git a/Content.Server/Atmos/Components/MapAtmosphereComponent.cs b/Content.Server/Atmos/Components/MapAtmosphereComponent.cs
index bbf5ea6403..6bdef901d4 100644
--- a/Content.Server/Atmos/Components/MapAtmosphereComponent.cs
+++ b/Content.Server/Atmos/Components/MapAtmosphereComponent.cs
@@ -12,12 +12,14 @@ public sealed partial class MapAtmosphereComponent : SharedMapAtmosphereComponen
     /// <summary>
     ///     The default GasMixture a map will have. Space mixture by default.
     /// </summary>
-    [DataField("mixture"), ViewVariables(VVAccess.ReadWrite)]
-    public GasMixture? Mixture = GasMixture.SpaceGas;
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public GasMixture Mixture = GasMixture.SpaceGas;
 
     /// <summary>
     ///     Whether empty tiles will be considered space or not.
     /// </summary>
-    [DataField("space"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
     public bool Space = true;
+
+    public SharedGasTileOverlaySystem.GasOverlayData Overlay;
 }
diff --git a/Content.Server/Atmos/EntitySystems/AirtightSystem.cs b/Content.Server/Atmos/EntitySystems/AirtightSystem.cs
index 97dccbaabb..548d6a3692 100644
--- a/Content.Server/Atmos/EntitySystems/AirtightSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/AirtightSystem.cs
@@ -2,7 +2,6 @@
 using Content.Server.Explosion.EntitySystems;
 using Content.Shared.Atmos;
 using JetBrains.Annotations;
-using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 
 namespace Content.Server.Atmos.EntitySystems
@@ -10,7 +9,7 @@ namespace Content.Server.Atmos.EntitySystems
     [UsedImplicitly]
     public sealed class AirtightSystem : EntitySystem
     {
-        [Dependency] private readonly IMapManager _mapManager = default!;
+        [Dependency] private readonly SharedTransformSystem _transform = default!;
         [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
         [Dependency] private readonly ExplosionSystem _explosionSystem = default!;
 
@@ -121,19 +120,16 @@ public void UpdatePosition(Entity<AirtightComponent> ent, TransformComponent? xf
             if (!xform.Anchored || !TryComp(xform.GridUid, out MapGridComponent? grid))
                 return;
 
-            airtight.LastPosition = (xform.GridUid.Value, grid.TileIndicesFor(xform.Coordinates));
-            InvalidatePosition(airtight.LastPosition.Item1, airtight.LastPosition.Item2, airtight.FixVacuum && !airtight.AirBlocked);
+            var indices = _transform.GetGridTilePositionOrDefault((ent, xform), grid);
+            airtight.LastPosition = (xform.GridUid.Value, indices);
+            InvalidatePosition((xform.GridUid.Value, grid), indices);
         }
 
-        public void InvalidatePosition(EntityUid gridId, Vector2i pos, bool fixVacuum = false)
+        public void InvalidatePosition(Entity<MapGridComponent?> grid, Vector2i pos)
         {
-            if (!TryComp(gridId, out MapGridComponent? grid))
-                return;
-
             var query = EntityManager.GetEntityQuery<AirtightComponent>();
-            _explosionSystem.UpdateAirtightMap(gridId, pos, grid, query);
-            // TODO make atmos system use query
-            _atmosphereSystem.InvalidateTile(gridId, pos);
+            _explosionSystem.UpdateAirtightMap(grid, pos, grid, query);
+            _atmosphereSystem.InvalidateTile(grid.Owner, pos);
         }
 
         private AtmosDirection Rotate(AtmosDirection myDirection, Angle myAngle)
diff --git a/Content.Server/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs b/Content.Server/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs
index 4af32fce58..505c4a3b38 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs
@@ -97,22 +97,20 @@ private void OnPlayerStatusChanged(object? sender, SessionStatusEventArgs e)
             }
         }
 
-        private AtmosDebugOverlayData ConvertTileToData(TileAtmosphere? tile)
+        private AtmosDebugOverlayData? ConvertTileToData(TileAtmosphere tile)
         {
-            if (tile == null)
-                return default;
-
             return new AtmosDebugOverlayData(
                 tile.GridIndices,
                 tile.Air?.Temperature ?? default,
                 tile.Air?.Moles,
                 tile.PressureDirection,
                 tile.LastPressureDirection,
-                tile.BlockedAirflow,
+                tile.AirtightData.BlockedDirections,
                 tile.ExcitedGroup?.GetHashCode(),
                 tile.Space,
-                false,
-                false);
+                tile.MapAtmosphere,
+                tile.NoGridTile,
+                tile.Air?.Immutable ?? false);
         }
 
         public override void Update(float frameTime)
diff --git a/Content.Server/Atmos/EntitySystems/AtmosObstructionEnumerator.cs b/Content.Server/Atmos/EntitySystems/AtmosObstructionEnumerator.cs
deleted file mode 100644
index aed009e9a1..0000000000
--- a/Content.Server/Atmos/EntitySystems/AtmosObstructionEnumerator.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using Content.Server.Atmos.Components;
-using Robust.Shared.Map;
-using Robust.Shared.Map.Enumerators;
-
-namespace Content.Server.Atmos.EntitySystems;
-
-public struct AtmosObstructionEnumerator
-{
-    private AnchoredEntitiesEnumerator _enumerator;
-    private EntityQuery<AirtightComponent> _query;
-
-    public AtmosObstructionEnumerator(AnchoredEntitiesEnumerator enumerator, EntityQuery<AirtightComponent> query)
-    {
-        _enumerator = enumerator;
-        _query = query;
-    }
-
-    public bool MoveNext([NotNullWhen(true)] out AirtightComponent? airtight)
-    {
-        if (!_enumerator.MoveNext(out var uid))
-        {
-            airtight = null;
-            return false;
-        }
-
-        // No rider, it makes it uglier.
-        // ReSharper disable once ConvertIfStatementToReturnStatement
-        if (!_query.TryGetComponent(uid.Value, out airtight))
-        {
-            // ReSharper disable once TailRecursiveCall
-            return MoveNext(out airtight);
-        }
-
-        return true;
-    }
-}
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs
index 310e602336..cece99cacf 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs
@@ -85,10 +85,10 @@ public IEnumerable<GasMixture> GetAllMixtures(EntityUid gridUid, bool excite = f
         return ev.Mixtures!;
     }
 
-    public void InvalidateTile(EntityUid gridUid, Vector2i tile)
+    public void InvalidateTile(Entity<GridAtmosphereComponent?> entity, Vector2i tile)
     {
-        var ev = new InvalidateTileMethodEvent(gridUid, tile);
-        RaiseLocalEvent(gridUid, ref ev);
+        if (_atmosQuery.Resolve(entity.Owner, ref entity.Comp, false))
+            entity.Comp.InvalidatedCoords.Add(tile);
     }
 
     public GasMixture?[]? GetTileMixtures(EntityUid? gridUid, EntityUid? mapUid, List<Vector2i> tiles, bool excite = false)
@@ -176,11 +176,11 @@ public ReactionResult ReactTile(EntityUid gridId, Vector2i tile)
 
     public bool IsTileAirBlocked(EntityUid gridUid, Vector2i tile, AtmosDirection directions = AtmosDirection.All, MapGridComponent? mapGridComp = null)
     {
-        var ev = new IsTileAirBlockedMethodEvent(gridUid, tile, directions, mapGridComp);
-        RaiseLocalEvent(gridUid, ref ev);
+        if (!Resolve(gridUid, ref mapGridComp))
+            return false;
 
-        // If nothing handled the event, it'll default to true.
-        return ev.Result;
+        var data = GetAirtightData(gridUid, mapGridComp, tile);
+        return data.BlockedDirections.IsFlagSet(directions);
     }
 
     public bool IsTileSpace(EntityUid? gridUid, EntityUid? mapUid, Vector2i tile, MapGridComponent? mapGridComp = null)
@@ -231,12 +231,6 @@ public IEnumerable<GasMixture> GetAdjacentTileMixtures(EntityUid gridUid, Vector
         return ev.Result ?? Enumerable.Empty<GasMixture>();
     }
 
-    public void UpdateAdjacent(EntityUid gridUid, Vector2i tile, MapGridComponent? mapGridComp = null)
-    {
-        var ev = new UpdateAdjacentMethodEvent(gridUid, tile, mapGridComp);
-        RaiseLocalEvent(gridUid, ref ev);
-    }
-
     public void HotspotExpose(EntityUid gridUid, Vector2i tile, float exposedTemperature, float exposedVolume,
         EntityUid? sparkSourceUid = null, bool soh = false)
     {
@@ -259,12 +253,6 @@ public bool IsHotspotActive(EntityUid gridUid, Vector2i tile)
         return ev.Result;
     }
 
-    public void FixTileVacuum(EntityUid gridUid, Vector2i tile)
-    {
-        var ev = new FixTileVacuumMethodEvent(gridUid, tile);
-        RaiseLocalEvent(gridUid, ref ev);
-    }
-
     public void AddPipeNet(EntityUid gridUid, PipeNet pipeNet)
     {
         var ev = new AddPipeNetMethodEvent(gridUid, pipeNet);
@@ -307,9 +295,6 @@ [ByRefEvent] private record struct IsSimulatedGridMethodEvent
     [ByRefEvent] private record struct GetAllMixturesMethodEvent
         (EntityUid Grid, bool Excite = false, IEnumerable<GasMixture>? Mixtures = null, bool Handled = false);
 
-    [ByRefEvent] private record struct InvalidateTileMethodEvent
-        (EntityUid Grid, Vector2i Tile, bool Handled = false);
-
     [ByRefEvent] private record struct GetTileMixturesMethodEvent
         (EntityUid? GridUid, EntityUid? MapUid, List<Vector2i> Tiles, bool Excite = false, GasMixture?[]? Mixtures = null, bool Handled = false);
 
@@ -319,16 +304,6 @@ [ByRefEvent] private record struct GetTileMixtureMethodEvent
     [ByRefEvent] private record struct ReactTileMethodEvent
         (EntityUid GridId, Vector2i Tile, ReactionResult Result = default, bool Handled = false);
 
-    [ByRefEvent] private record struct IsTileAirBlockedMethodEvent
-        (EntityUid Grid, Vector2i Tile, AtmosDirection Direction = AtmosDirection.All, MapGridComponent? MapGridComponent = null, bool Result = false, bool Handled = false)
-    {
-        /// <summary>
-        ///     True if one of the enabled blockers has <see cref="AirtightComponent.NoAirWhenFullyAirBlocked"/>. Note
-        ///     that this does not actually check if all directions are blocked.
-        /// </summary>
-        public bool NoAir = false;
-    }
-
     [ByRefEvent] private record struct IsTileSpaceMethodEvent
         (EntityUid? Grid, EntityUid? Map, Vector2i Tile, MapGridComponent? MapGridComponent = null, bool Result = true, bool Handled = false);
 
@@ -339,9 +314,6 @@ [ByRefEvent] private record struct GetAdjacentTileMixturesMethodEvent
         (EntityUid Grid, Vector2i Tile, bool IncludeBlocked, bool Excite,
             IEnumerable<GasMixture>? Result = null, bool Handled = false);
 
-    [ByRefEvent] private record struct UpdateAdjacentMethodEvent
-        (EntityUid Grid, Vector2i Tile, MapGridComponent? MapGridComponent = null, bool Handled = false);
-
     [ByRefEvent] private record struct HotspotExposeMethodEvent
         (EntityUid Grid, EntityUid? SparkSourceUid, Vector2i Tile, float ExposedTemperature, float ExposedVolume, bool soh, bool Handled = false);
 
@@ -351,9 +323,6 @@ [ByRefEvent] private record struct HotspotExtinguishMethodEvent
     [ByRefEvent] private record struct IsHotspotActiveMethodEvent
         (EntityUid Grid, Vector2i Tile, bool Result = false, bool Handled = false);
 
-    [ByRefEvent] private record struct FixTileVacuumMethodEvent
-        (EntityUid Grid, Vector2i Tile, bool Handled = false);
-
     [ByRefEvent] private record struct AddPipeNetMethodEvent
         (EntityUid Grid, PipeNet PipeNet, bool Handled = false);
 
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs
index 6fbd638844..1c18b8fe29 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs
@@ -92,6 +92,12 @@ private void FixGridAtmosCommand(IConsoleShell shell, string argstr, string[] ar
                if (tile == null)
                    continue;
 
+               if (!_mapSystem.TryGetTile(gridComp, indices, out var gTile) || gTile.IsEmpty)
+               {
+                   gridAtmosphere.Tiles.Remove(indices);
+                   continue;
+               }
+
                if (tile.Immutable && !IsTileSpace(euid, transform.MapUid, indices, gridComp))
                {
                    tile = new GasMixture(tile.Volume) { Temperature = tile.Temperature };
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.ExcitedGroup.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.ExcitedGroup.cs
index 1d809dcd03..de4c9199cf 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.ExcitedGroup.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.ExcitedGroup.cs
@@ -72,7 +72,8 @@ private void ExcitedGroupSelfBreakdown(GridAtmosphereComponent gridAtmosphere, E
 
             var tileSize = excitedGroup.Tiles.Count;
 
-            if (excitedGroup.Disposed) return;
+            if (excitedGroup.Disposed)
+                return;
 
             if (tileSize == 0)
             {
@@ -98,7 +99,9 @@ private void ExcitedGroupSelfBreakdown(GridAtmosphereComponent gridAtmosphere, E
 
             foreach (var tile in excitedGroup.Tiles)
             {
-                if (tile?.Air == null) continue;
+                if (tile?.Air == null)
+                    continue;
+
                 tile.Air.CopyFromMutable(combined);
                 InvalidateVisuals(tile.GridIndex, tile.GridIndices);
             }
@@ -106,21 +109,23 @@ private void ExcitedGroupSelfBreakdown(GridAtmosphereComponent gridAtmosphere, E
             excitedGroup.BreakdownCooldown = 0;
         }
 
-        private void ExcitedGroupDismantle(GridAtmosphereComponent gridAtmosphere, ExcitedGroup excitedGroup, bool unexcite = true)
+        /// <summary>
+        /// This de-activates and removes all tiles in an excited group.
+        /// </summary>
+        private void DeactivateGroupTiles(GridAtmosphereComponent gridAtmosphere, ExcitedGroup excitedGroup)
         {
             foreach (var tile in excitedGroup.Tiles)
             {
                 tile.ExcitedGroup = null;
-
-                if (!unexcite)
-                    continue;
-
                 RemoveActiveTile(gridAtmosphere, tile);
             }
 
             excitedGroup.Tiles.Clear();
         }
 
+        /// <summary>
+        /// This removes an excited group without de-activating its tiles.
+        /// </summary>
         private void ExcitedGroupDispose(GridAtmosphereComponent gridAtmosphere, ExcitedGroup excitedGroup)
         {
             if (excitedGroup.Disposed)
@@ -129,9 +134,14 @@ private void ExcitedGroupDispose(GridAtmosphereComponent gridAtmosphere, Excited
             DebugTools.Assert(gridAtmosphere.ExcitedGroups.Contains(excitedGroup), "Grid Atmosphere does not contain Excited Group!");
 
             excitedGroup.Disposed = true;
-
             gridAtmosphere.ExcitedGroups.Remove(excitedGroup);
-            ExcitedGroupDismantle(gridAtmosphere, excitedGroup, false);
+
+            foreach (var tile in excitedGroup.Tiles)
+            {
+                tile.ExcitedGroup = null;
+            }
+
+            excitedGroup.Tiles.Clear();
         }
     }
 }
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.GridAtmosphere.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.GridAtmosphere.cs
index 1f1a208b24..d43cc81b0f 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.GridAtmosphere.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.GridAtmosphere.cs
@@ -14,6 +14,7 @@ public sealed partial class AtmosphereSystem
     private void InitializeGridAtmosphere()
     {
         SubscribeLocalEvent<GridAtmosphereComponent, ComponentInit>(OnGridAtmosphereInit);
+        SubscribeLocalEvent<GridAtmosphereComponent, ComponentStartup>(OnGridAtmosphereStartup);
         SubscribeLocalEvent<GridAtmosphereComponent, ComponentRemove>(OnAtmosphereRemove);
         SubscribeLocalEvent<GridAtmosphereComponent, GridSplitEvent>(OnGridSplit);
 
@@ -22,19 +23,15 @@ private void InitializeGridAtmosphere()
         SubscribeLocalEvent<GridAtmosphereComponent, HasAtmosphereMethodEvent>(GridHasAtmosphere);
         SubscribeLocalEvent<GridAtmosphereComponent, IsSimulatedGridMethodEvent>(GridIsSimulated);
         SubscribeLocalEvent<GridAtmosphereComponent, GetAllMixturesMethodEvent>(GridGetAllMixtures);
-        SubscribeLocalEvent<GridAtmosphereComponent, InvalidateTileMethodEvent>(GridInvalidateTile);
         SubscribeLocalEvent<GridAtmosphereComponent, GetTileMixtureMethodEvent>(GridGetTileMixture);
         SubscribeLocalEvent<GridAtmosphereComponent, GetTileMixturesMethodEvent>(GridGetTileMixtures);
         SubscribeLocalEvent<GridAtmosphereComponent, ReactTileMethodEvent>(GridReactTile);
-        SubscribeLocalEvent<GridAtmosphereComponent, IsTileAirBlockedMethodEvent>(GridIsTileAirBlocked);
         SubscribeLocalEvent<GridAtmosphereComponent, IsTileSpaceMethodEvent>(GridIsTileSpace);
         SubscribeLocalEvent<GridAtmosphereComponent, GetAdjacentTilesMethodEvent>(GridGetAdjacentTiles);
         SubscribeLocalEvent<GridAtmosphereComponent, GetAdjacentTileMixturesMethodEvent>(GridGetAdjacentTileMixtures);
-        SubscribeLocalEvent<GridAtmosphereComponent, UpdateAdjacentMethodEvent>(GridUpdateAdjacent);
         SubscribeLocalEvent<GridAtmosphereComponent, HotspotExposeMethodEvent>(GridHotspotExpose);
         SubscribeLocalEvent<GridAtmosphereComponent, HotspotExtinguishMethodEvent>(GridHotspotExtinguish);
         SubscribeLocalEvent<GridAtmosphereComponent, IsHotspotActiveMethodEvent>(GridIsHotspotActive);
-        SubscribeLocalEvent<GridAtmosphereComponent, FixTileVacuumMethodEvent>(GridFixTileVacuum);
         SubscribeLocalEvent<GridAtmosphereComponent, AddPipeNetMethodEvent>(GridAddPipeNet);
         SubscribeLocalEvent<GridAtmosphereComponent, RemovePipeNetMethodEvent>(GridRemovePipeNet);
         SubscribeLocalEvent<GridAtmosphereComponent, AddAtmosDeviceMethodEvent>(GridAddAtmosDevice);
@@ -56,22 +53,23 @@ private void OnAtmosphereRemove(EntityUid uid, GridAtmosphereComponent component
         }
     }
 
-    private void OnGridAtmosphereInit(EntityUid uid, GridAtmosphereComponent gridAtmosphere, ComponentInit args)
+    private void OnGridAtmosphereInit(EntityUid uid, GridAtmosphereComponent component, ComponentInit args)
     {
         base.Initialize();
 
-        if (!TryComp(uid, out MapGridComponent? mapGrid))
-            return;
-
         EnsureComp<GasTileOverlayComponent>(uid);
-
-        foreach (var (indices, tile) in gridAtmosphere.Tiles)
+        foreach (var tile in component.Tiles.Values)
         {
-            gridAtmosphere.InvalidatedCoords.Add(indices);
             tile.GridIndex = uid;
         }
+    }
+
+    private void OnGridAtmosphereStartup(EntityUid uid, GridAtmosphereComponent component, ComponentStartup args)
+    {
+        if (!TryComp(uid, out MapGridComponent? mapGrid))
+            return;
 
-        GridRepopulateTiles((uid, mapGrid, gridAtmosphere));
+        InvalidateAllTiles((uid, mapGrid, component));
     }
 
     private void OnGridSplit(EntityUid uid, GridAtmosphereComponent originalGridAtmos, ref GridSplitEvent args)
@@ -104,8 +102,7 @@ private void OnGridSplit(EntityUid uid, GridAtmosphereComponent originalGridAtmo
                     continue;
 
                 // Copy a bunch of data over... Not great, maybe put this in TileAtmosphere?
-                newTileAtmosphere.Air = tileAtmosphere.Air?.Clone() ?? null;
-                newTileAtmosphere.MolesArchived = newTileAtmosphere.Air == null ? null : new float[Atmospherics.AdjustedNumberOfGases];
+                newTileAtmosphere.Air = tileAtmosphere.Air?.Clone();
                 newTileAtmosphere.Hotspot = tileAtmosphere.Hotspot;
                 newTileAtmosphere.HeatCapacity = tileAtmosphere.HeatCapacity;
                 newTileAtmosphere.Temperature = tileAtmosphere.Temperature;
@@ -170,15 +167,6 @@ IEnumerable<GasMixture> EnumerateMixtures(EntityUid gridUid, GridAtmosphereCompo
         args.Handled = true;
     }
 
-    private void GridInvalidateTile(EntityUid uid, GridAtmosphereComponent component, ref InvalidateTileMethodEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        component.InvalidatedCoords.Add(args.Tile);
-        args.Handled = true;
-    }
-
     private void GridGetTileMixture(EntityUid uid, GridAtmosphereComponent component,
         ref GetTileMixtureMethodEvent args)
     {
@@ -233,43 +221,6 @@ private void GridReactTile(EntityUid uid, GridAtmosphereComponent component, ref
         args.Handled = true;
     }
 
-    private void GridIsTileAirBlocked(EntityUid uid, GridAtmosphereComponent component,
-        ref IsTileAirBlockedMethodEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        var mapGridComp = args.MapGridComponent;
-
-        if (!Resolve(uid, ref mapGridComp))
-            return;
-
-        var directions = AtmosDirection.Invalid;
-
-        var enumerator = GetObstructingComponentsEnumerator(mapGridComp, args.Tile);
-
-        while (enumerator.MoveNext(out var obstructingComponent))
-        {
-            if (!obstructingComponent.AirBlocked)
-                continue;
-
-            // We set the directions that are air-blocked so far,
-            // as you could have a full obstruction with only 4 directional air blockers.
-            directions |= obstructingComponent.AirBlockedDirection;
-            args.NoAir |= obstructingComponent.NoAirWhenFullyAirBlocked;
-
-            if (directions.IsFlagSet(args.Direction))
-            {
-                args.Result = true;
-                args.Handled = true;
-                return;
-            }
-        }
-
-        args.Result = false;
-        args.Handled = true;
-    }
-
     private void GridIsTileSpace(EntityUid uid, GridAtmosphereComponent component, ref IsTileSpaceMethodEvent args)
     {
         if (args.Handled)
@@ -331,71 +282,58 @@ IEnumerable<GasMixture> EnumerateAdjacent(GridAtmosphereComponent grid, TileAtmo
         args.Handled = true;
     }
 
-    private void GridUpdateAdjacent(EntityUid uid, GridAtmosphereComponent component,
-        ref UpdateAdjacentMethodEvent args)
+    /// <summary>
+    /// Update array of adjacent tiles and the adjacency flags. Optionally activates all tiles with modified adjacencies.
+    /// </summary>
+    private void UpdateAdjacentTiles(
+        Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent> ent,
+        TileAtmosphere tile,
+        bool activate = false)
     {
-        if (args.Handled)
-            return;
-
-        var mapGridComp = args.MapGridComponent;
-
-        if (!Resolve(uid, ref mapGridComp))
-            return;
-
-        var xform = Transform(uid);
-        EntityUid? mapUid = _mapManager.MapExists(xform.MapID) ? _mapManager.GetMapEntityId(xform.MapID) : null;
-
-        if (!component.Tiles.TryGetValue(args.Tile, out var tile))
-            return;
+        var uid = ent.Owner;
+        var atmos = ent.Comp1;
+        var blockedDirs = tile.AirtightData.BlockedDirections;
+        if (activate)
+            AddActiveTile(atmos, tile);
 
         tile.AdjacentBits = AtmosDirection.Invalid;
-        tile.BlockedAirflow = GetBlockedDirections(mapGridComp, tile.GridIndices);
-
         for (var i = 0; i < Atmospherics.Directions; i++)
         {
             var direction = (AtmosDirection) (1 << i);
+            var adjacentIndices = tile.GridIndices.Offset(direction);
 
-            var otherIndices = tile.GridIndices.Offset(direction);
-
-            if (!component.Tiles.TryGetValue(otherIndices, out var adjacent))
+            TileAtmosphere? adjacent;
+            if (!tile.NoGridTile)
             {
-                adjacent = new TileAtmosphere(tile.GridIndex, otherIndices,
-                    GetTileMixture(null, mapUid, otherIndices),
-                    space: IsTileSpace(null, mapUid, otherIndices, mapGridComp));
+                adjacent = GetOrNewTile(uid, atmos, adjacentIndices);
             }
-
-            var oppositeDirection = direction.GetOpposite();
-
-            adjacent.BlockedAirflow = GetBlockedDirections(mapGridComp, adjacent.GridIndices);
-
-            // Pass in MapGridComponent so we don't have to resolve it for every adjacent direction.
-            var tileBlockedEv = new IsTileAirBlockedMethodEvent(uid, tile.GridIndices, direction, mapGridComp);
-            GridIsTileAirBlocked(uid, component, ref tileBlockedEv);
-
-            var adjacentBlockedEv =
-                new IsTileAirBlockedMethodEvent(uid, adjacent.GridIndices, oppositeDirection, mapGridComp);
-            GridIsTileAirBlocked(uid, component, ref adjacentBlockedEv);
-
-            if (!adjacent.BlockedAirflow.IsFlagSet(oppositeDirection) && !tileBlockedEv.Result)
+            else if (!atmos.Tiles.TryGetValue(adjacentIndices, out adjacent))
             {
-                adjacent.AdjacentBits |= oppositeDirection;
-                adjacent.AdjacentTiles[oppositeDirection.ToIndex()] = tile;
+                tile.AdjacentBits &= ~direction;
+                tile.AdjacentTiles[i] = null;
+                continue;
             }
-            else
+
+            var adjBlockDirs = adjacent.AirtightData.BlockedDirections;
+            if (activate)
+                AddActiveTile(atmos, adjacent);
+
+            var oppositeDirection = direction.GetOpposite();
+            if (adjBlockDirs.IsFlagSet(oppositeDirection) || blockedDirs.IsFlagSet(direction))
             {
+                // Adjacency is blocked by some airtight entity.
+                tile.AdjacentBits &= ~direction;
                 adjacent.AdjacentBits &= ~oppositeDirection;
+                tile.AdjacentTiles[i] = null;
                 adjacent.AdjacentTiles[oppositeDirection.ToIndex()] = null;
             }
-
-            if (!tile.BlockedAirflow.IsFlagSet(direction) && !adjacentBlockedEv.Result)
-            {
-                tile.AdjacentBits |= direction;
-                tile.AdjacentTiles[direction.ToIndex()] = adjacent;
-            }
             else
             {
-                tile.AdjacentBits &= ~direction;
-                tile.AdjacentTiles[direction.ToIndex()] = null;
+                // No airtight entity in the way.
+                tile.AdjacentBits |= direction;
+                adjacent.AdjacentBits |= oppositeDirection;
+                tile.AdjacentTiles[i] = adjacent;
+                adjacent.AdjacentTiles[oppositeDirection.ToIndex()] = tile;
             }
 
             DebugTools.Assert(!(tile.AdjacentBits.IsFlagSet(direction) ^
@@ -409,6 +347,16 @@ private void GridUpdateAdjacent(EntityUid uid, GridAtmosphereComponent component
             tile.MonstermosInfo.CurrentTransferDirection = AtmosDirection.Invalid;
     }
 
+    private (GasMixture Air, bool IsSpace) GetDefaultMapAtmosphere(MapAtmosphereComponent? map)
+    {
+        if (map == null)
+            return (GasMixture.SpaceGas, true);
+
+        var air = map.Mixture;
+        DebugTools.Assert(air.Immutable);
+        return (air, map.Space);
+    }
+
     private void GridHotspotExpose(EntityUid uid, GridAtmosphereComponent component, ref HotspotExposeMethodEvent args)
     {
         if (args.Handled)
@@ -451,54 +399,50 @@ private void GridIsHotspotActive(EntityUid uid, GridAtmosphereComponent componen
         args.Handled = true;
     }
 
-    private void GridFixTileVacuum(EntityUid uid, GridAtmosphereComponent component, ref FixTileVacuumMethodEvent args)
+    private void GridFixTileVacuum(
+        Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent> ent,
+        TileAtmosphere tile,
+        float volume)
     {
-        if (args.Handled)
-            return;
-
-        var adjEv = new GetAdjacentTileMixturesMethodEvent(uid, args.Tile, false, true);
-        GridGetAdjacentTileMixtures(uid, component, ref adjEv);
-
-        if (!adjEv.Handled || !component.Tiles.TryGetValue(args.Tile, out var tile))
-            return;
-
-        if (!TryComp<MapGridComponent>(uid, out var mapGridComp))
-            return;
-
-        var adjacent = adjEv.Result!.ToArray();
-
-        // Return early, let's not cause any funny NaNs or needless vacuums.
-        if (adjacent.Length == 0)
-            return;
+        DebugTools.AssertNotNull(tile.Air);
+        DebugTools.Assert(tile.Air?.Immutable == false );
+        Array.Clear(tile.MolesArchived);
+        tile.ArchivedCycle = 0;
 
-        tile.Air = new GasMixture
+        var count = 0;
+        foreach (var adj in tile.AdjacentTiles)
         {
-            Volume = GetVolumeForTiles(mapGridComp, 1),
-            Temperature = Atmospherics.T20C
-        };
-
-        tile.MolesArchived = new float[Atmospherics.AdjustedNumberOfGases];
-        tile.ArchivedCycle = 0;
+            if (adj?.Air != null)
+                count++;
+        }
 
-        var ratio = 1f / adjacent.Length;
+        var ratio = 1f / count;
         var totalTemperature = 0f;
 
-        foreach (var adj in adjacent)
+        foreach (var adj in tile.AdjacentTiles)
         {
+            if (adj?.Air == null)
+                continue;
+
             totalTemperature += adj.Temperature;
 
+            // TODO ATMOS. Why is this removing and then re-adding air to the neighbouring tiles?
+            // Is it some rounding issue to do with Atmospherics.GasMinMoles? because otherwise this is just unnecessary.
+            // if we get rid of this, then this could also just add moles and then multiply by ratio at the end, rather
+            // than having to iterate over adjacent tiles twice.
+
             // Remove a bit of gas from the adjacent ratio...
-            var mix = adj.RemoveRatio(ratio);
+            var mix = adj.Air.RemoveRatio(ratio);
 
             // And merge it to the new tile air.
             Merge(tile.Air, mix);
 
             // Return removed gas to its original mixture.
-            Merge(adj, mix);
+            Merge(adj.Air, mix);
         }
 
         // New temperature is the arithmetic mean of the sum of the adjacent temperatures...
-        tile.Air.Temperature = totalTemperature / adjacent.Length;
+        tile.Air.Temperature = totalTemperature / count;
     }
 
     private void GridAddPipeNet(EntityUid uid, GridAtmosphereComponent component, ref AddPipeNetMethodEvent args)
@@ -547,30 +491,21 @@ private void GridRemoveAtmosDevice(EntityUid uid, GridAtmosphereComponent compon
     /// <summary>
     ///     Repopulates all tiles on a grid atmosphere.
     /// </summary>
-    /// <param name="mapGrid">The grid where to get all valid tiles from.</param>
-    /// <param name="gridAtmosphere">The grid atmosphere where the tiles will be repopulated.</param>
-    private void GridRepopulateTiles(Entity<MapGridComponent, GridAtmosphereComponent> grid)
+    public void InvalidateAllTiles(Entity<MapGridComponent?, GridAtmosphereComponent?> entity)
     {
-        var (uid, mapGrid, gridAtmosphere) = grid;
-        var volume = GetVolumeForTiles(mapGrid, 1);
+        var (uid, grid, atmos) = entity;
+        if (!Resolve(uid, ref grid, ref atmos))
+            return;
 
-        foreach (var tile in mapGrid.GetAllTiles())
+        foreach (var indices in atmos.Tiles.Keys)
         {
-            if (!gridAtmosphere.Tiles.ContainsKey(tile.GridIndices))
-                gridAtmosphere.Tiles[tile.GridIndices] = new TileAtmosphere(tile.GridUid, tile.GridIndices,
-                    new GasMixture(volume) { Temperature = Atmospherics.T20C });
-
-            gridAtmosphere.InvalidatedCoords.Add(tile.GridIndices);
+            atmos.InvalidatedCoords.Add(indices);
         }
 
-        TryComp(uid, out GasTileOverlayComponent? overlay);
-
-        // Gotta do this afterwards so we can properly update adjacent tiles.
-        foreach (var (position, _) in gridAtmosphere.Tiles.ToArray())
+        var enumerator = _map.GetAllTilesEnumerator(uid, grid);
+        while (enumerator.MoveNext(out var tile))
         {
-            var ev = new UpdateAdjacentMethodEvent(uid, position);
-            GridUpdateAdjacent(uid, gridAtmosphere, ref ev);
-            InvalidateVisuals(uid, position, overlay);
+            atmos.InvalidatedCoords.Add(tile.Value.GridIndices);
         }
     }
 
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
index 53035e1ed3..cb50ff114e 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
@@ -1,13 +1,11 @@
 using Content.Server.Atmos.Components;
 using Content.Shared.Atmos;
-using Content.Shared.Audio;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Physics;
 using Robust.Shared.Audio;
 using Robust.Shared.Map;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
-using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 
@@ -54,7 +52,7 @@ private void UpdateHighPressure(float frameTime)
                 if (HasComp<MobStateComponent>(uid) &&
                     TryComp<PhysicsComponent>(uid, out var body))
                 {
-                    _physics.SetBodyStatus(body, BodyStatus.OnGround);
+                    _physics.SetBodyStatus(uid, body, BodyStatus.OnGround);
                 }
 
                 if (TryComp<FixturesComponent>(uid, out var fixtures))
@@ -77,7 +75,7 @@ private void AddMobMovedByPressure(EntityUid uid, MovedByPressureComponent compo
             if (!TryComp<FixturesComponent>(uid, out var fixtures))
                 return;
 
-            _physics.SetBodyStatus(body, BodyStatus.InAir);
+            _physics.SetBodyStatus(uid, body, BodyStatus.InAir);
 
             foreach (var (id, fixture) in fixtures.Fixtures)
             {
@@ -96,9 +94,9 @@ private void HighPressureMovements(Entity<GridAtmosphereComponent> gridAtmospher
             // TODO ATMOS finish this
 
             // Don't play the space wind sound on tiles that are on fire...
-            if(tile.PressureDifference > 15 && !tile.Hotspot.Valid)
+            if (tile.PressureDifference > 15 && !tile.Hotspot.Valid)
             {
-                if(_spaceWindSoundCooldown == 0 && !string.IsNullOrEmpty(SpaceWindSound))
+                if (_spaceWindSoundCooldown == 0 && !string.IsNullOrEmpty(SpaceWindSound))
                 {
                     var coordinates = _mapSystem.ToCenterCoordinates(tile.GridIndex, tile.GridIndices);
                     _audio.PlayPvs(SpaceWindSound, coordinates, AudioParams.Default.WithVariation(0.125f).WithVolume(MathHelper.Clamp(tile.PressureDifference / 10, 10, 100)));
@@ -238,7 +236,7 @@ public void ExperiencePressureDifference(
                     // TODO: Technically these directions won't be correct but uhh I'm just here for optimisations buddy not to fix my old bugs.
                     if (throwTarget != EntityCoordinates.Invalid)
                     {
-                        var pos = ((throwTarget.ToMap(EntityManager).Position - xform.WorldPosition).Normalized() + dirVec).Normalized();
+                        var pos = ((throwTarget.ToMap(EntityManager, _transformSystem).Position - xform.WorldPosition).Normalized() + dirVec).Normalized();
                         _physics.ApplyLinearImpulse(uid, pos * moveForce, body: physics);
                     }
                     else
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.LINDA.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.LINDA.cs
index 795c6e0547..c27e18b55b 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.LINDA.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.LINDA.cs
@@ -1,12 +1,13 @@
 using Content.Server.Atmos.Components;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
+using Robust.Shared.Utility;
 
 namespace Content.Server.Atmos.EntitySystems
 {
     public sealed partial class AtmosphereSystem
     {
-        private void ProcessCell(GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile, int fireCount, GasTileOverlayComponent? visuals)
+        private void ProcessCell(GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile, int fireCount, GasTileOverlayComponent visuals)
         {
             // Can't process a tile without air
             if (tile.Air == null)
@@ -116,15 +117,9 @@ private void ProcessCell(GridAtmosphereComponent gridAtmosphere, TileAtmosphere
         private void Archive(TileAtmosphere tile, int fireCount)
         {
             if (tile.Air != null)
-            {
                 tile.Air.Moles.AsSpan().CopyTo(tile.MolesArchived.AsSpan());
-                tile.TemperatureArchived = tile.Air.Temperature;
-            }
-            else
-            {
-                tile.TemperatureArchived = tile.Temperature;
-            }
 
+            tile.TemperatureArchived = tile.Temperature;
             tile.ArchivedCycle = fireCount;
         }
 
@@ -166,6 +161,12 @@ private void AddActiveTile(GridAtmosphereComponent gridAtmosphere, TileAtmospher
         /// <param name="disposeExcitedGroup">Whether to dispose of the tile's <see cref="ExcitedGroup"/></param>
         private void RemoveActiveTile(GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile, bool disposeExcitedGroup = true)
         {
+            DebugTools.Assert(tile.Excited == gridAtmosphere.ActiveTiles.Contains(tile));
+            DebugTools.Assert(tile.Excited || tile.ExcitedGroup == null);
+
+            if (!tile.Excited)
+                return;
+
             tile.Excited = false;
             gridAtmosphere.ActiveTiles.Remove(tile);
 
@@ -186,7 +187,6 @@ public float GetHeatCapacityArchived(TileAtmosphere tile)
             if (tile.Air == null)
                 return tile.HeatCapacity;
 
-            // Moles archived is not null if air is not null.
             return GetHeatCapacityCalculation(tile.MolesArchived!, tile.Space);
         }
 
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Map.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Map.cs
index 916191cb05..ed105c8d33 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Map.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Map.cs
@@ -1,6 +1,8 @@
 using Content.Server.Atmos.Components;
 using Content.Shared.Atmos.Components;
 using Robust.Shared.GameStates;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Utility;
 
 namespace Content.Server.Atmos.EntitySystems;
 
@@ -8,10 +10,25 @@ public partial class AtmosphereSystem
 {
     private void InitializeMap()
     {
+        SubscribeLocalEvent<MapAtmosphereComponent, ComponentInit>(OnMapStartup);
+        SubscribeLocalEvent<MapAtmosphereComponent, ComponentRemove>(OnMapRemove);
         SubscribeLocalEvent<MapAtmosphereComponent, IsTileSpaceMethodEvent>(MapIsTileSpace);
         SubscribeLocalEvent<MapAtmosphereComponent, GetTileMixtureMethodEvent>(MapGetTileMixture);
         SubscribeLocalEvent<MapAtmosphereComponent, GetTileMixturesMethodEvent>(MapGetTileMixtures);
         SubscribeLocalEvent<MapAtmosphereComponent, ComponentGetState>(OnMapGetState);
+        SubscribeLocalEvent<GridAtmosphereComponent, EntParentChangedMessage>(OnGridParentChanged);
+    }
+
+    private void OnMapStartup(EntityUid uid, MapAtmosphereComponent component, ComponentInit args)
+    {
+        component.Mixture.MarkImmutable();
+        component.Overlay = _gasTileOverlaySystem.GetOverlayData(component.Mixture);
+    }
+
+    private void OnMapRemove(EntityUid uid, MapAtmosphereComponent component, ComponentRemove args)
+    {
+        if (!TerminatingOrDeleted(uid))
+            RefreshAllGridMapAtmospheres(uid);
     }
 
     private void MapIsTileSpace(EntityUid uid, MapAtmosphereComponent component, ref IsTileSpaceMethodEvent args)
@@ -28,54 +45,115 @@ private void MapGetTileMixture(EntityUid uid, MapAtmosphereComponent component,
         if (args.Handled)
             return;
 
-        // Clone the mixture, if possible.
-        args.Mixture = component.Mixture?.Clone();
+        args.Mixture = component.Mixture;
         args.Handled = true;
     }
 
     private void MapGetTileMixtures(EntityUid uid, MapAtmosphereComponent component, ref GetTileMixturesMethodEvent args)
     {
-        if (args.Handled || component.Mixture == null)
+        if (args.Handled)
             return;
         args.Handled = true;
         args.Mixtures ??= new GasMixture?[args.Tiles.Count];
 
         for (var i = 0; i < args.Tiles.Count; i++)
         {
-            args.Mixtures[i] ??= component.Mixture.Clone();
+            args.Mixtures[i] ??= component.Mixture;
         }
     }
 
     private void OnMapGetState(EntityUid uid, MapAtmosphereComponent component, ref ComponentGetState args)
     {
-        args.State = new MapAtmosphereComponentState(_gasTileOverlaySystem.GetOverlayData(component.Mixture));
+        args.State = new MapAtmosphereComponentState(component.Overlay);
+    }
+
+    public void SetMapAtmosphere(EntityUid uid, bool space, GasMixture mixture)
+    {
+        DebugTools.Assert(HasComp<MapComponent>(uid));
+        var component = EnsureComp<MapAtmosphereComponent>(uid);
+        SetMapGasMixture(uid, mixture, component, false);
+        SetMapSpace(uid, space, component, false);
+        RefreshAllGridMapAtmospheres(uid);
     }
 
-    public void SetMapAtmosphere(EntityUid uid, bool space, GasMixture mixture, MapAtmosphereComponent? component = null)
+    public void SetMapGasMixture(EntityUid uid, GasMixture mixture, MapAtmosphereComponent? component = null, bool updateTiles = true)
     {
         if (!Resolve(uid, ref component))
             return;
 
-        component.Space = space;
+        if (!mixture.Immutable)
+        {
+            mixture = mixture.Clone();
+            mixture.MarkImmutable();
+        }
+
         component.Mixture = mixture;
-        Dirty(component);
+        component.Overlay = _gasTileOverlaySystem.GetOverlayData(component.Mixture);
+        Dirty(uid, component);
+        if (updateTiles)
+            RefreshAllGridMapAtmospheres(uid);
     }
 
-    public void SetMapGasMixture(EntityUid uid, GasMixture? mixture, MapAtmosphereComponent? component = null)
+    public void SetMapSpace(EntityUid uid, bool space, MapAtmosphereComponent? component = null, bool updateTiles = true)
     {
         if (!Resolve(uid, ref component))
             return;
 
-        component.Mixture = mixture;
-        Dirty(component);
+        if (component.Space == space)
+            return;
+
+        component.Space = space;
+
+        if (updateTiles)
+            RefreshAllGridMapAtmospheres(uid);
     }
 
-    public void SetMapSpace(EntityUid uid, bool space, MapAtmosphereComponent? component = null)
+    /// <summary>
+    /// Forces a refresh of all MapAtmosphere tiles on every grid on a map.
+    /// </summary>
+    public void RefreshAllGridMapAtmospheres(EntityUid map)
     {
-        if (!Resolve(uid, ref component))
+        DebugTools.Assert(HasComp<MapComponent>(map));
+        var enumerator = AllEntityQuery<GridAtmosphereComponent, TransformComponent>();
+        while (enumerator.MoveNext(out var grid, out var atmos, out var xform))
+        {
+            if (xform.MapUid == map)
+                RefreshMapAtmosphereTiles((grid, atmos));
+        }
+    }
+
+    /// <summary>
+    /// Forces a refresh of all MapAtmosphere tiles on a given grid.
+    /// </summary>
+    private void RefreshMapAtmosphereTiles(Entity<GridAtmosphereComponent?> grid)
+    {
+        if (!Resolve(grid.Owner, ref grid.Comp))
             return;
 
-        component.Space = space;
-        Dirty(component);
+        var atmos = grid.Comp;
+        foreach (var tile in atmos.MapTiles)
+        {
+            RemoveMapAtmos(atmos, tile);
+            atmos.InvalidatedCoords.Add(tile.GridIndices);
+        }
+        atmos.MapTiles.Clear();
+    }
+
+    /// <summary>
+    /// Handles updating map-atmospheres when grids move across maps.
+    /// </summary>
+    private void OnGridParentChanged(Entity<GridAtmosphereComponent> grid, ref EntParentChangedMessage args)
+    {
+        // Do nothing if detaching to nullspace
+        if (!args.Transform.ParentUid.IsValid())
+            return;
+
+        // Avoid doing work if moving from a space-map to another space-map.
+        if (args.OldParent == null
+            || HasComp<MapAtmosphereComponent>(args.OldParent)
+            || HasComp<MapAtmosphereComponent>(args.Transform.ParentUid))
+        {
+            RefreshMapAtmosphereTiles((grid, grid));
+        }
     }
 }
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs
index aceda3cd33..dcbc1e86ee 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs
@@ -5,7 +5,6 @@
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Database;
-using Content.Shared.Doors.Components;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Random;
@@ -27,7 +26,10 @@ public sealed partial class AtmosphereSystem
         private readonly TileAtmosphere[] _depressurizeSpaceTiles = new TileAtmosphere[Atmospherics.MonstermosHardTileLimit];
         private readonly TileAtmosphere[] _depressurizeProgressionOrder = new TileAtmosphere[Atmospherics.MonstermosHardTileLimit * 2];
 
-        private void EqualizePressureInZone(Entity<MapGridComponent, GridAtmosphereComponent> ent, TileAtmosphere tile, int cycleNum, GasTileOverlayComponent? visuals)
+        private void EqualizePressureInZone(
+            Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent> ent,
+            TileAtmosphere tile,
+            int cycleNum)
         {
             if (tile.Air == null || (tile.MonstermosInfo.LastCycle >= cycleNum))
                 return; // Already done.
@@ -56,7 +58,7 @@ private void EqualizePressureInZone(Entity<MapGridComponent, GridAtmosphereCompo
                 return;
             }
 
-            var (_, mapGrid, gridAtmosphere) = ent;
+            var gridAtmosphere = ent.Comp1;
             var queueCycle = ++gridAtmosphere.EqualizationQueueCycleControl;
             var totalMoles = 0f;
             _equalizeTiles[0] = tile;
@@ -91,7 +93,7 @@ private void EqualizePressureInZone(Entity<MapGridComponent, GridAtmosphereCompo
                     {
                         // Looks like someone opened an airlock to space!
 
-                        ExplosivelyDepressurize(ent, tile, cycleNum, visuals);
+                        ExplosivelyDepressurize(ent, tile, cycleNum);
                         return;
                     }
                 }
@@ -216,9 +218,13 @@ private void EqualizePressureInZone(Entity<MapGridComponent, GridAtmosphereCompo
                         for (var k = 0; k < Atmospherics.Directions; k++)
                         {
                             var direction = (AtmosDirection) (1 << k);
-                            if (!otherTile.AdjacentBits.IsFlagSet(direction)) continue;
+                            if (!otherTile.AdjacentBits.IsFlagSet(direction))
+                                continue;
+
+                            if (giver.MonstermosInfo.MoleDelta <= 0)
+                                break; // We're done here now. Let's not do more work than needed.
+
                             var otherTile2 = otherTile.AdjacentTiles[k];
-                            if (giver.MonstermosInfo.MoleDelta <= 0) break; // We're done here now. Let's not do more work than needed.
                             if (otherTile2 == null || otherTile2.MonstermosInfo.LastQueueCycle != queueCycle) continue;
                             DebugTools.Assert(otherTile2.AdjacentBits.IsFlagSet(direction.GetOpposite()));
                             if (otherTile2.MonstermosInfo.LastSlowQueueCycle == queueCycleSlow) continue;
@@ -332,7 +338,7 @@ private void EqualizePressureInZone(Entity<MapGridComponent, GridAtmosphereCompo
             for (var i = 0; i < tileCount; i++)
             {
                 var otherTile = _equalizeTiles[i]!;
-                FinalizeEq(gridAtmosphere, otherTile, visuals);
+                FinalizeEq(gridAtmosphere, otherTile, ent);
             }
 
             for (var i = 0; i < tileCount; i++)
@@ -341,12 +347,17 @@ private void EqualizePressureInZone(Entity<MapGridComponent, GridAtmosphereCompo
                 for (var j = 0; j < Atmospherics.Directions; j++)
                 {
                     var direction = (AtmosDirection) (1 << j);
-                    if (!otherTile.AdjacentBits.IsFlagSet(direction)) continue;
+                    if (!otherTile.AdjacentBits.IsFlagSet(direction))
+                        continue;
+
                     var otherTile2 = otherTile.AdjacentTiles[j]!;
                     if (otherTile2.AdjacentBits == 0)
                         continue;
+
                     DebugTools.Assert(otherTile2.AdjacentBits.IsFlagSet(direction.GetOpposite()));
-                    if (otherTile2.Air != null && CompareExchange(otherTile2.Air, tile.Air) == GasCompareResult.NoExchange) continue;
+                    if (otherTile2.Air != null && CompareExchange(otherTile2.Air, tile.Air) == GasCompareResult.NoExchange)
+                        continue;
+
                     AddActiveTile(gridAtmosphere, otherTile2);
                     break;
                 }
@@ -359,7 +370,10 @@ private void EqualizePressureInZone(Entity<MapGridComponent, GridAtmosphereCompo
             Array.Clear(_equalizeQueue, 0, Atmospherics.MonstermosTileLimit);
         }
 
-        private void ExplosivelyDepressurize(Entity<MapGridComponent, GridAtmosphereComponent> ent, TileAtmosphere tile, int cycleNum, GasTileOverlayComponent? visuals)
+        private void ExplosivelyDepressurize(
+            Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent> ent,
+            TileAtmosphere tile,
+            int cycleNum)
         {
             // Check if explosive depressurization is enabled and if the tile is valid.
             if (!MonstermosDepressurization || tile.Air == null)
@@ -368,7 +382,7 @@ private void ExplosivelyDepressurize(Entity<MapGridComponent, GridAtmosphereComp
             const int limit = Atmospherics.MonstermosHardTileLimit;
 
             var totalMolesRemoved = 0f;
-            var (owner, mapGrid, gridAtmosphere) = ent;
+            var (owner, gridAtmosphere, visuals, mapGrid, _) = ent;
             var queueCycle = ++gridAtmosphere.EqualizationQueueCycleControl;
 
             var tileCount = 0;
@@ -388,20 +402,27 @@ private void ExplosivelyDepressurize(Entity<MapGridComponent, GridAtmosphereComp
                 {
                     for (var j = 0; j < Atmospherics.Directions; j++)
                     {
-                        var direction = (AtmosDirection) (1 << j);
-                        if (!otherTile.AdjacentBits.IsFlagSet(direction)) continue;
                         var otherTile2 = otherTile.AdjacentTiles[j];
-                        if (otherTile2?.Air == null) continue;
+                        if (otherTile2?.Air == null)
+                            continue;
+
+                        if (otherTile2.MonstermosInfo.LastQueueCycle == queueCycle)
+                            continue;
+
+                        var direction = (AtmosDirection) (1 << j);
+                        DebugTools.Assert(otherTile.AdjacentBits.IsFlagSet(direction));
                         DebugTools.Assert(otherTile2.AdjacentBits.IsFlagSet(direction.GetOpposite()));
-                        if (otherTile2.MonstermosInfo.LastQueueCycle == queueCycle) continue;
 
-                        ConsiderFirelocks((owner, gridAtmosphere), otherTile, otherTile2, visuals, mapGrid);
+                        ConsiderFirelocks(ent, otherTile, otherTile2);
 
                         // The firelocks might have closed on us.
-                        if (!otherTile.AdjacentBits.IsFlagSet(direction)) continue;
+                        if (!otherTile.AdjacentBits.IsFlagSet(direction))
+                            continue;
+
                         otherTile2.MonstermosInfo = new MonstermosInfo { LastQueueCycle = queueCycle };
                         _depressurizeTiles[tileCount++] = otherTile2;
-                        if (tileCount >= limit) break;
+                        if (tileCount >= limit)
+                            break;
                     }
                 }
                 else
@@ -437,13 +458,21 @@ private void ExplosivelyDepressurize(Entity<MapGridComponent, GridAtmosphereComp
                     // Flood fill into this new direction
                     var direction = (AtmosDirection) (1 << j);
                     // Tiles in _depressurizeProgressionOrder cannot have null air.
-                    if (!otherTile.AdjacentBits.IsFlagSet(direction) && !otherTile.Space) continue;
+                    if (!otherTile.AdjacentBits.IsFlagSet(direction) && !otherTile.Space)
+                        continue;
+
                     var tile2 = otherTile.AdjacentTiles[j];
-                    if (tile2?.MonstermosInfo.LastQueueCycle != queueCycle) continue;
+                    if (tile2?.MonstermosInfo.LastQueueCycle != queueCycle)
+                        continue;
+
                     DebugTools.Assert(tile2.AdjacentBits.IsFlagSet(direction.GetOpposite()));
                     // If flood fill has already reached this tile, continue.
-                    if (tile2.MonstermosInfo.LastSlowQueueCycle == queueCycleSlow) continue;
-                    if(tile2.Space) continue;
+                    if (tile2.MonstermosInfo.LastSlowQueueCycle == queueCycleSlow)
+                        continue;
+
+                    if(tile2.Space)
+                        continue;
+
                     tile2.MonstermosInfo.CurrentTransferDirection = direction.GetOpposite();
                     tile2.MonstermosInfo.CurrentTransferAmount = 0.0f;
                     tile2.PressureSpecificTarget = otherTile.PressureSpecificTarget;
@@ -535,7 +564,7 @@ private void ExplosivelyDepressurize(Entity<MapGridComponent, GridAtmosphereComp
                 _physics.ApplyAngularImpulse(owner, Vector2Helpers.Cross(tile.GridIndices - gridPhysics.LocalCenter, direction) * totalMolesRemoved, body: gridPhysics);
             }
 
-            if(tileCount > 10 && (totalMolesRemoved / tileCount) > 10)
+            if (tileCount > 10 && (totalMolesRemoved / tileCount) > 10)
                 _adminLog.Add(LogType.ExplosiveDepressurization, LogImpact.High,
                     $"Explosive depressurization removed {totalMolesRemoved} moles from {tileCount} tiles starting from position {tile.GridIndices:position} on grid ID {tile.GridIndex:grid}");
 
@@ -544,36 +573,33 @@ private void ExplosivelyDepressurize(Entity<MapGridComponent, GridAtmosphereComp
             Array.Clear(_depressurizeProgressionOrder, 0, Atmospherics.MonstermosHardTileLimit * 2);
         }
 
-        private void ConsiderFirelocks(Entity<GridAtmosphereComponent> ent, TileAtmosphere tile, TileAtmosphere other, GasTileOverlayComponent? visuals, MapGridComponent mapGrid)
+        private void ConsiderFirelocks(
+            Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent> ent,
+            TileAtmosphere tile,
+            TileAtmosphere other)
         {
             var reconsiderAdjacent = false;
 
-            foreach (var entity in mapGrid.GetAnchoredEntities(tile.GridIndices))
+            var mapGrid = ent.Comp3;
+            foreach (var entity in _map.GetAnchoredEntities(ent.Owner, mapGrid, tile.GridIndices))
             {
-                if (!TryComp(entity, out FirelockComponent? firelock))
-                    continue;
-
-                reconsiderAdjacent |= _firelockSystem.EmergencyPressureStop(entity, firelock);
+                if (_firelockQuery.TryGetComponent(entity, out var firelock))
+                    reconsiderAdjacent |= _firelockSystem.EmergencyPressureStop(entity, firelock);
             }
 
-            foreach (var entity in mapGrid.GetAnchoredEntities(other.GridIndices))
+            foreach (var entity in _map.GetAnchoredEntities(ent.Owner, mapGrid, other.GridIndices))
             {
-                if (!TryComp(entity, out FirelockComponent? firelock))
-                    continue;
-
-                reconsiderAdjacent |= _firelockSystem.EmergencyPressureStop(entity, firelock);
+                if (_firelockQuery.TryGetComponent(entity, out var firelock))
+                    reconsiderAdjacent |= _firelockSystem.EmergencyPressureStop(entity, firelock);
             }
 
             if (!reconsiderAdjacent)
                 return;
 
-            var (owner, gridAtmosphere) = ent;
-            var tileEv = new UpdateAdjacentMethodEvent(owner, tile.GridIndices);
-            var otherEv = new UpdateAdjacentMethodEvent(owner, other.GridIndices);
-            GridUpdateAdjacent(owner, gridAtmosphere, ref tileEv);
-            GridUpdateAdjacent(owner, gridAtmosphere, ref otherEv);
-            InvalidateVisuals(tile.GridIndex, tile.GridIndices, visuals);
-            InvalidateVisuals(other.GridIndex, other.GridIndices, visuals);
+            UpdateAdjacentTiles(ent, tile);
+            UpdateAdjacentTiles(ent, other);
+            InvalidateVisuals(tile.GridIndex, tile.GridIndices, ent);
+            InvalidateVisuals(other.GridIndex, other.GridIndices, ent);
         }
 
         private void FinalizeEq(GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile, GasTileOverlayComponent? visuals)
@@ -635,14 +661,14 @@ private void AdjustEqMovement(TileAtmosphere tile, AtmosDirection direction, flo
             // Turns out: no they don't. Temporary debug checks to figure out which caller is causing problems:
             if (tile == null)
             {
-                Logger.Error($"Encountered null-tile in {nameof(AdjustEqMovement)}. Trace: {Environment.StackTrace}");
+                Log.Error($"Encountered null-tile in {nameof(AdjustEqMovement)}. Trace: {Environment.StackTrace}");
                 return;
             }
             var adj = tile.AdjacentTiles[direction.ToIndex()];
             if (adj == null)
             {
                 var nonNull = tile.AdjacentTiles.Where(x => x != null).Count();
-                Logger.Error($"Encountered null adjacent tile in {nameof(AdjustEqMovement)}. Dir: {direction}, Tile: {tile.Tile}, non-null adj count: {nonNull}, Trace: {Environment.StackTrace}");
+                Log.Error($"Encountered null adjacent tile in {nameof(AdjustEqMovement)}. Dir: {direction}, Tile: ({tile.GridIndex}, {tile.GridIndices}), non-null adj count: {nonNull}, Trace: {Environment.StackTrace}");
                 return;
             }
 
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs
index 4f8df0af67..1f3ca2145b 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs
@@ -1,6 +1,5 @@
 using Content.Server.Atmos.Components;
 using Content.Server.Atmos.Piping.Components;
-using Content.Server.NodeContainer.NodeGroups;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Maps;
@@ -8,6 +7,7 @@
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Timing;
+using Robust.Shared.Utility;
 
 namespace Content.Server.Atmos.EntitySystems
 {
@@ -30,131 +30,249 @@ public sealed partial class AtmosphereSystem
         private int _currentRunAtmosphereIndex;
         private bool _simulationPaused;
 
-        private readonly List<Entity<GridAtmosphereComponent>> _currentRunAtmosphere = new();
+        private TileAtmosphere GetOrNewTile(EntityUid owner, GridAtmosphereComponent atmosphere, Vector2i index)
+        {
+            var tile = atmosphere.Tiles.GetOrNew(index, out var existing);
+            if (existing)
+                return tile;
+
+            atmosphere.InvalidatedCoords.Add(index);
+            tile.GridIndex = owner;
+            tile.GridIndices = index;
+            return tile;
+        }
+
+        private readonly List<Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent>> _currentRunAtmosphere = new();
 
         /// <summary>
         ///     Revalidates all invalid coordinates in a grid atmosphere.
+        ///     I.e., process any tiles that have had their airtight blockers modified.
         /// </summary>
         /// <param name="ent">The grid atmosphere in question.</param>
         /// <returns>Whether the process succeeded or got paused due to time constrains.</returns>
-        private bool ProcessRevalidate(Entity<GridAtmosphereComponent> ent, GasTileOverlayComponent? visuals)
+        private bool ProcessRevalidate(Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent> ent)
         {
-            var (owner, atmosphere) = ent;
+            if (ent.Comp4.MapUid == null)
+            {
+                Log.Error($"Attempted to process atmosphere on a map-less grid? Grid: {ToPrettyString(ent)}");
+                return true;
+            }
+
+            var (uid, atmosphere, visuals, grid, xform) = ent;
+            var volume = GetVolumeForTiles(grid);
+            TryComp(xform.MapUid, out MapAtmosphereComponent? mapAtmos);
+
             if (!atmosphere.ProcessingPaused)
             {
-                atmosphere.CurrentRunInvalidatedCoordinates.Clear();
-                atmosphere.CurrentRunInvalidatedCoordinates.EnsureCapacity(atmosphere.InvalidatedCoords.Count);
-                foreach (var tile in atmosphere.InvalidatedCoords)
+                atmosphere.CurrentRunInvalidatedTiles.Clear();
+                atmosphere.CurrentRunInvalidatedTiles.EnsureCapacity(atmosphere.InvalidatedCoords.Count);
+                foreach (var indices in atmosphere.InvalidatedCoords)
                 {
-                    atmosphere.CurrentRunInvalidatedCoordinates.Enqueue(tile);
+                    var tile = GetOrNewTile(uid, atmosphere, indices);
+                    atmosphere.CurrentRunInvalidatedTiles.Enqueue(tile);
+
+                    // Update tile.IsSpace and tile.MapAtmosphere, and tile.AirtightData.
+                    UpdateTileData(ent, mapAtmos, tile);
                 }
                 atmosphere.InvalidatedCoords.Clear();
+
+                if (_simulationStopwatch.Elapsed.TotalMilliseconds >= AtmosMaxProcessTime)
+                    return false;
             }
 
-            if (!TryComp(owner, out MapGridComponent? mapGridComp))
-                return true;
+            var number = 0;
+            while (atmosphere.CurrentRunInvalidatedTiles.TryDequeue(out var tile))
+            {
+                DebugTools.Assert(atmosphere.Tiles.GetValueOrDefault(tile.GridIndices) == tile);
+                UpdateAdjacentTiles(ent, tile, activate: true);
+                UpdateTileAir(ent, tile, volume);
+                InvalidateVisuals(uid, tile.GridIndices, visuals);
 
-            var mapUid = _mapManager.GetMapEntityIdOrThrow(Transform(owner).MapID);
+                if (number++ < InvalidCoordinatesLagCheckIterations)
+                    continue;
 
-            var volume = GetVolumeForTiles(mapGridComp);
+                number = 0;
+                // Process the rest next time.
+                if (_simulationStopwatch.Elapsed.TotalMilliseconds >= AtmosMaxProcessTime)
+                    return false;
+            }
 
-            var number = 0;
-            while (atmosphere.CurrentRunInvalidatedCoordinates.TryDequeue(out var indices))
+            TrimDisconnectedMapTiles(ent);
+            return true;
+        }
+
+        /// <summary>
+        /// This method queued a tile and all of its neighbours up for processing by <see cref="TrimDisconnectedMapTiles"/>.
+        /// </summary>
+        public void QueueTileTrim(GridAtmosphereComponent atmos, TileAtmosphere tile)
+        {
+            if (!tile.TrimQueued)
             {
-                if (!atmosphere.Tiles.TryGetValue(indices, out var tile))
+                tile.TrimQueued = true;
+                atmos.PossiblyDisconnectedTiles.Add(tile);
+            }
+
+            for (var i = 0; i < Atmospherics.Directions; i++)
+            {
+                var direction = (AtmosDirection) (1 << i);
+                var indices = tile.GridIndices.Offset(direction);
+                if (atmos.Tiles.TryGetValue(indices, out var adj)
+                    && adj.NoGridTile
+                    && !adj.TrimQueued)
                 {
-                    tile = new TileAtmosphere(owner, indices,
-                        new GasMixture(volume) { Temperature = Atmospherics.T20C });
-                    atmosphere.Tiles[indices] = tile;
+                    adj.TrimQueued = true;
+                    atmos.PossiblyDisconnectedTiles.Add(adj);
                 }
+            }
+        }
 
-                var airBlockedEv = new IsTileAirBlockedMethodEvent(owner, indices, MapGridComponent:mapGridComp);
-                GridIsTileAirBlocked(owner, atmosphere, ref airBlockedEv);
-                var isAirBlocked = airBlockedEv.Result;
+        /// <summary>
+        /// Tiles in a <see cref="GridAtmosphereComponent"/> are either grid-tiles, or they they should be are tiles
+        /// adjacent to grid-tiles that represent the map's atmosphere. This method trims any map-tiles that are no longer
+        /// adjacent to any grid-tiles.
+        /// </summary>
+        private void TrimDisconnectedMapTiles(
+            Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent> ent)
+        {
+            var atmos = ent.Comp1;
 
-                var oldBlocked = tile.BlockedAirflow;
-                var updateAdjacentEv = new UpdateAdjacentMethodEvent(owner, indices, mapGridComp);
-                GridUpdateAdjacent(owner, atmosphere, ref updateAdjacentEv);
+            foreach (var tile in atmos.PossiblyDisconnectedTiles)
+            {
+                tile.TrimQueued = false;
+                if (!tile.NoGridTile)
+                    continue;
 
-                // Blocked airflow changed, rebuild excited groups!
-                if (tile.Excited && tile.BlockedAirflow != oldBlocked)
+                var connected = false;
+                for (var i = 0; i < Atmospherics.Directions; i++)
                 {
-                    RemoveActiveTile(atmosphere, tile);
+                    var indices = tile.GridIndices.Offset((AtmosDirection) (1 << i));
+                    if (_map.TryGetTile(ent.Comp3, indices, out var gridTile) && !gridTile.IsEmpty)
+                    {
+                        connected = true;
+                        break;
+                    }
                 }
 
-                // Call this instead of the grid method as the map has a say on whether the tile is space or not.
-                if ((!mapGridComp.TryGetTileRef(indices, out var t) || t.IsSpace(_tileDefinitionManager)) && !isAirBlocked)
+                if (!connected)
                 {
-                    tile.Air = GetTileMixture(null, mapUid, indices);
-                    tile.MolesArchived = tile.Air != null ? new float[Atmospherics.AdjustedNumberOfGases] : null;
-                    tile.Space = IsTileSpace(null, mapUid, indices, mapGridComp);
+                    RemoveActiveTile(atmos, tile);
+                    atmos.Tiles.Remove(tile.GridIndices);
                 }
-                else if (isAirBlocked)
+            }
+
+            atmos.PossiblyDisconnectedTiles.Clear();
+        }
+
+        /// <summary>
+        /// Checks whether a tile has a corresponding grid-tile, or whether it is a "map" tile. Also checks whether the
+        /// tile should be considered "space"
+        /// </summary>
+        private void UpdateTileData(
+            Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent> ent,
+            MapAtmosphereComponent? mapAtmos,
+            TileAtmosphere tile)
+        {
+            var idx = tile.GridIndices;
+            bool mapAtmosphere;
+            if (_map.TryGetTile(ent.Comp3, idx, out var gTile) && !gTile.IsEmpty)
+            {
+                var contentDef = (ContentTileDefinition) _tileDefinitionManager[gTile.TypeId];
+                mapAtmosphere = contentDef.MapAtmosphere;
+                tile.ThermalConductivity = contentDef.ThermalConductivity;
+                tile.HeatCapacity = contentDef.HeatCapacity;
+                tile.NoGridTile = false;
+            }
+            else
+            {
+                mapAtmosphere = true;
+                tile.ThermalConductivity =  0.5f;
+                tile.HeatCapacity = float.PositiveInfinity;
+
+                if (!tile.NoGridTile)
                 {
-                    if (airBlockedEv.NoAir)
-                    {
-                        tile.Air = null;
-                        tile.MolesArchived = null;
-                        tile.ArchivedCycle = 0;
-                        tile.LastShare = 0f;
-                        tile.Hotspot = new Hotspot();
-                    }
+                    tile.NoGridTile = true;
+
+                    // This tile just became a non-grid atmos tile.
+                    // It, or one of its neighbours, might now be completely disconnected from the grid.
+                    QueueTileTrim(ent.Comp1, tile);
                 }
-                else
-                {
-                    if (tile.Air == null && NeedsVacuumFixing(mapGridComp, indices))
-                    {
-                        var vacuumEv = new FixTileVacuumMethodEvent(owner, indices);
-                        GridFixTileVacuum(owner, atmosphere, ref vacuumEv);
-                    }
+            }
 
-                    // Tile used to be space, but isn't anymore.
-                    if (tile.Space || (tile.Air?.Immutable ?? false))
-                    {
-                        tile.Air = null;
-                        tile.MolesArchived = null;
-                        tile.ArchivedCycle = 0;
-                        tile.LastShare = 0f;
-                        tile.Space = false;
-                    }
+            UpdateAirtightData(ent.Owner, ent.Comp1, ent.Comp3, tile);
 
-                    tile.Air ??= new GasMixture(volume){Temperature = Atmospherics.T20C};
-                    tile.MolesArchived ??= new float[Atmospherics.AdjustedNumberOfGases];
+            if (mapAtmosphere)
+            {
+                if (!tile.MapAtmosphere)
+                {
+                    (tile.Air, tile.Space) = GetDefaultMapAtmosphere(mapAtmos);
+                    tile.MapAtmosphere = true;
+                    ent.Comp1.MapTiles.Add(tile);
                 }
 
-                // We activate the tile.
-                AddActiveTile(atmosphere, tile);
+                DebugTools.AssertNotNull(tile.Air);
+                DebugTools.Assert(tile.Air?.Immutable ?? false);
+                return;
+            }
 
-                // TODO ATMOS: Query all the contents of this tile (like walls) and calculate the correct thermal conductivity and heat capacity
-                var tileDef = mapGridComp.TryGetTileRef(indices, out var tileRef)
-                    ? tileRef.GetContentTileDefinition(_tileDefinitionManager)
-                    : null;
+            if (!tile.MapAtmosphere)
+                return;
 
-                tile.ThermalConductivity = tileDef?.ThermalConductivity ?? 0.5f;
-                tile.HeatCapacity = tileDef?.HeatCapacity ?? float.PositiveInfinity;
-                InvalidateVisuals(owner, indices, visuals);
+            // Tile used to be exposed to the map's atmosphere, but isn't anymore.
+            RemoveMapAtmos(ent.Comp1, tile);
+        }
 
-                for (var i = 0; i < Atmospherics.Directions; i++)
-                {
-                    var direction = (AtmosDirection) (1 << i);
-                    var otherIndices = indices.Offset(direction);
+        private void RemoveMapAtmos(GridAtmosphereComponent atmos, TileAtmosphere tile)
+        {
+            DebugTools.Assert(tile.MapAtmosphere);
+            DebugTools.AssertNotNull(tile.Air);
+            DebugTools.Assert(tile.Air?.Immutable ?? false);
+            tile.MapAtmosphere = false;
+            atmos.MapTiles.Remove(tile);
+            tile.Air = null;
+            Array.Clear(tile.MolesArchived);
+            tile.ArchivedCycle = 0;
+            tile.LastShare = 0f;
+            tile.Space = false;
+        }
 
-                    if (atmosphere.Tiles.TryGetValue(otherIndices, out var otherTile))
-                        AddActiveTile(atmosphere, otherTile);
-                }
+        /// <summary>
+        /// Check whether a grid-tile should have an air mixture, and give it one if it doesn't already have one.
+        /// </summary>
+        private void UpdateTileAir(
+            Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent> ent,
+            TileAtmosphere tile,
+            float volume)
+        {
+            if (tile.MapAtmosphere)
+            {
+                DebugTools.AssertNotNull(tile.Air);
+                DebugTools.Assert(tile.Air?.Immutable ?? false);
+                return;
+            }
 
-                if (number++ < InvalidCoordinatesLagCheckIterations)
-                    continue;
+            var data = tile.AirtightData;
+            var fullyBlocked = data.BlockedDirections == AtmosDirection.All;
 
-                number = 0;
-                // Process the rest next time.
-                if (_simulationStopwatch.Elapsed.TotalMilliseconds >= AtmosMaxProcessTime)
-                {
-                    return false;
-                }
+            if (fullyBlocked && data.NoAirWhenBlocked)
+            {
+                if (tile.Air == null)
+                    return;
+
+                tile.Air = null;
+                Array.Clear(tile.MolesArchived);
+                tile.ArchivedCycle = 0;
+                tile.LastShare = 0f;
+                tile.Hotspot = new Hotspot();
+                return;
             }
 
-            return true;
+            if (tile.Air != null)
+                return;
+
+            tile.Air = new GasMixture(volume){Temperature = Atmospherics.T20C};
+
+            if (data.FixVacuum)
+                GridFixTileVacuum(ent, tile, volume);
         }
 
         private void QueueRunTiles(
@@ -170,19 +288,16 @@ private void QueueRunTiles(
             }
         }
 
-        private bool ProcessTileEqualize(Entity<GridAtmosphereComponent> ent, GasTileOverlayComponent? visuals)
+        private bool ProcessTileEqualize(Entity<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent> ent)
         {
-            var (uid, atmosphere) = ent;
+            var atmosphere = ent.Comp1;
             if (!atmosphere.ProcessingPaused)
                 QueueRunTiles(atmosphere.CurrentRunTiles, atmosphere.ActiveTiles);
 
-            if (!TryComp(uid, out MapGridComponent? mapGridComp))
-                throw new Exception("Tried to process a grid atmosphere on an entity that isn't a grid!");
-
             var number = 0;
             while (atmosphere.CurrentRunTiles.TryDequeue(out var tile))
             {
-                EqualizePressureInZone((uid, mapGridComp, atmosphere), tile, atmosphere.UpdateCounter, visuals);
+                EqualizePressureInZone(ent, tile, atmosphere.UpdateCounter);
 
                 if (number++ < LagCheckIterations)
                     continue;
@@ -198,7 +313,7 @@ private bool ProcessTileEqualize(Entity<GridAtmosphereComponent> ent, GasTileOve
             return true;
         }
 
-        private bool ProcessActiveTiles(GridAtmosphereComponent atmosphere, GasTileOverlayComponent? visuals)
+        private bool ProcessActiveTiles(GridAtmosphereComponent atmosphere, GasTileOverlayComponent visuals)
         {
             if(!atmosphere.ProcessingPaused)
                 QueueRunTiles(atmosphere.CurrentRunTiles, atmosphere.ActiveTiles);
@@ -240,11 +355,11 @@ private bool ProcessExcitedGroups(GridAtmosphereComponent gridAtmosphere)
                 excitedGroup.BreakdownCooldown++;
                 excitedGroup.DismantleCooldown++;
 
-                if(excitedGroup.BreakdownCooldown > Atmospherics.ExcitedGroupBreakdownCycles)
+                if (excitedGroup.BreakdownCooldown > Atmospherics.ExcitedGroupBreakdownCycles)
                     ExcitedGroupSelfBreakdown(gridAtmosphere, excitedGroup);
-
-                else if(excitedGroup.DismantleCooldown > Atmospherics.ExcitedGroupsDismantleCycles)
-                    ExcitedGroupDismantle(gridAtmosphere, excitedGroup);
+                else if (excitedGroup.DismantleCooldown > Atmospherics.ExcitedGroupsDismantleCycles)
+                    DeactivateGroupTiles(gridAtmosphere, excitedGroup);
+                // TODO ATMOS. What is the point of this? why is this only de-exciting the group? Shouldn't it also dismantle it?
 
                 if (number++ < LagCheckIterations)
                     continue;
@@ -435,10 +550,10 @@ private void UpdateProcessing(float frameTime)
                 _currentRunAtmosphereIndex = 0;
                 _currentRunAtmosphere.Clear();
 
-                var query = EntityQueryEnumerator<GridAtmosphereComponent>();
-                while (query.MoveNext(out var uid, out var grid))
+                var query = EntityQueryEnumerator<GridAtmosphereComponent, GasTileOverlayComponent, MapGridComponent, TransformComponent>();
+                while (query.MoveNext(out var uid, out var atmos, out var overlay, out var grid, out var xform ))
                 {
-                    _currentRunAtmosphere.Add((uid, grid));
+                    _currentRunAtmosphere.Add((uid, atmos, overlay, grid, xform));
                 }
             }
 
@@ -448,8 +563,7 @@ private void UpdateProcessing(float frameTime)
             for (; _currentRunAtmosphereIndex < _currentRunAtmosphere.Count; _currentRunAtmosphereIndex++)
             {
                 var ent = _currentRunAtmosphere[_currentRunAtmosphereIndex];
-                var (owner, atmosphere) = ent;
-                TryComp(owner, out GasTileOverlayComponent? visuals);
+                var (owner, atmosphere, visuals, grid, xform) = ent;
 
                 if (!TryComp(owner, out TransformComponent? x)
                     || x.MapUid == null
@@ -474,13 +588,14 @@ private void UpdateProcessing(float frameTime)
                 switch (atmosphere.State)
                 {
                     case AtmosphereProcessingState.Revalidate:
-                        if (!ProcessRevalidate(ent, visuals))
+                        if (!ProcessRevalidate(ent))
                         {
                             atmosphere.ProcessingPaused = true;
                             return;
                         }
 
                         atmosphere.ProcessingPaused = false;
+
                         // Next state depends on whether monstermos equalization is enabled or not.
                         // Note: We do this here instead of on the tile equalization step to prevent ending it early.
                         //       Therefore, a change to this CVar might only be applied after that step is over.
@@ -489,7 +604,7 @@ private void UpdateProcessing(float frameTime)
                             : AtmosphereProcessingState.ActiveTiles;
                         continue;
                     case AtmosphereProcessingState.TileEqualize:
-                        if (!ProcessTileEqualize(ent, visuals))
+                        if (!ProcessTileEqualize(ent))
                         {
                             atmosphere.ProcessingPaused = true;
                             return;
@@ -499,7 +614,7 @@ private void UpdateProcessing(float frameTime)
                         atmosphere.State = AtmosphereProcessingState.ActiveTiles;
                         continue;
                     case AtmosphereProcessingState.ActiveTiles:
-                        if (!ProcessActiveTiles(atmosphere, visuals))
+                        if (!ProcessActiveTiles(ent, ent))
                         {
                             atmosphere.ProcessingPaused = true;
                             return;
@@ -520,7 +635,7 @@ private void UpdateProcessing(float frameTime)
                         atmosphere.State = AtmosphereProcessingState.HighPressureDelta;
                         continue;
                     case AtmosphereProcessingState.HighPressureDelta:
-                        if (!ProcessHighPressureDelta(ent))
+                        if (!ProcessHighPressureDelta((ent, ent)))
                         {
                             atmosphere.ProcessingPaused = true;
                             return;
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Superconductivity.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Superconductivity.cs
index 33fa16a6c6..5c73cf1124 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Superconductivity.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Superconductivity.cs
@@ -1,5 +1,6 @@
 using Content.Server.Atmos.Components;
 using Content.Shared.Atmos;
+using Robust.Shared.Map.Components;
 
 namespace Content.Server.Atmos.EntitySystems
 {
@@ -12,7 +13,8 @@ private void Superconduct(GridAtmosphereComponent gridAtmosphere, TileAtmosphere
             for(var i = 0; i < Atmospherics.Directions; i++)
             {
                 var direction = (AtmosDirection) (1 << i);
-                if (!directions.IsFlagSet(direction)) continue;
+                if (!directions.IsFlagSet(direction))
+                    continue;
 
                 var adjacent = tile.AdjacentTiles[direction.ToIndex()];
 
@@ -92,7 +94,9 @@ public void NeighborConductWithSource(GridAtmosphereComponent gridAtmosphere, Ti
         {
             if (tile.Air == null)
             {
-                if (other.Tile != null)
+                // TODO ATMOS: why does this need to check if a tile exists if it doesn't use the tile?
+                if (TryComp<MapGridComponent>(other.GridIndex, out var grid)
+                    && _mapSystem.TryGetTileRef(other.GridIndex, grid, other.GridIndices, out var _))
                 {
                     TemperatureShareOpenToSolid(other, tile);
                 }
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs
index 699c2a70ae..9b0d0d9670 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Utils.cs
@@ -41,20 +41,6 @@ public void InvalidateVisuals(EntityUid gridUid, Vector2i tile, GasTileOverlayCo
         _gasTileOverlaySystem.Invalidate(gridUid, tile, comp);
     }
 
-    public bool NeedsVacuumFixing(MapGridComponent mapGrid, Vector2i indices)
-    {
-        var value = false;
-
-        var enumerator = GetObstructingComponentsEnumerator(mapGrid, indices);
-
-        while (enumerator.MoveNext(out var airtight))
-        {
-            value |= airtight.FixVacuum;
-        }
-
-        return value;
-    }
-
     /// <summary>
     ///     Gets the volume in liters for a number of tiles, on a specific grid.
     /// </summary>
@@ -66,34 +52,44 @@ private float GetVolumeForTiles(MapGridComponent mapGrid, int tiles = 1)
         return Atmospherics.CellVolume * mapGrid.TileSize * tiles;
     }
 
-    /// <summary>
-    ///     Gets all obstructing <see cref="AirtightComponent"/> instances in a specific tile.
-    /// </summary>
-    /// <param name="mapGrid">The grid where to get the tile.</param>
-    /// <param name="tile">The indices of the tile.</param>
-    /// <returns>The enumerator for the airtight components.</returns>
-    public AtmosObstructionEnumerator GetObstructingComponentsEnumerator(MapGridComponent mapGrid, Vector2i tile)
+    public readonly record struct AirtightData(AtmosDirection BlockedDirections, bool NoAirWhenBlocked,
+        bool FixVacuum);
+
+    private void UpdateAirtightData(EntityUid uid, GridAtmosphereComponent atmos, MapGridComponent grid, TileAtmosphere tile)
     {
-        var ancEnumerator = mapGrid.GetAnchoredEntitiesEnumerator(tile);
-        var airQuery = GetEntityQuery<AirtightComponent>();
+        var oldBlocked = tile.AirtightData.BlockedDirections;
+
+        tile.AirtightData = tile.NoGridTile
+            ? default
+            : GetAirtightData(uid, grid, tile.GridIndices);
 
-        var enumerator = new AtmosObstructionEnumerator(ancEnumerator, airQuery);
-        return enumerator;
+        if (tile.AirtightData.BlockedDirections != oldBlocked && tile.ExcitedGroup != null)
+            ExcitedGroupDispose(atmos, tile.ExcitedGroup);
     }
 
-    private AtmosDirection GetBlockedDirections(MapGridComponent mapGrid, Vector2i indices)
+    private AirtightData GetAirtightData(EntityUid uid, MapGridComponent grid, Vector2i tile)
     {
-        var value = AtmosDirection.Invalid;
+        var blockedDirs = AtmosDirection.Invalid;
+        var noAirWhenBlocked = false;
+        var fixVacuum = false;
 
-        var enumerator = GetObstructingComponentsEnumerator(mapGrid, indices);
-
-        while (enumerator.MoveNext(out var airtight))
+        foreach (var ent in _map.GetAnchoredEntities(uid, grid, tile))
         {
-            if(airtight.AirBlocked)
-                value |= airtight.AirBlockedDirection;
+            if (!_airtightQuery.TryGetComponent(ent, out var airtight))
+                continue;
+
+            if(!airtight.AirBlocked)
+                continue;
+
+            blockedDirs |= airtight.AirBlockedDirection;
+            noAirWhenBlocked |= airtight.NoAirWhenFullyAirBlocked;
+            fixVacuum |= airtight.FixVacuum;
+
+            if (blockedDirs == AtmosDirection.All && noAirWhenBlocked && fixVacuum)
+                break;
         }
 
-        return value;
+        return new AirtightData(blockedDirs, noAirWhenBlocked, fixVacuum);
     }
 
     /// <summary>
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs
index dd2a967559..d2f40e7716 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs
@@ -4,6 +4,7 @@
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.NodeContainer.EntitySystems;
 using Content.Shared.Atmos.EntitySystems;
+using Content.Shared.Doors.Components;
 using Content.Shared.Maps;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
@@ -40,6 +41,9 @@ public sealed partial class AtmosphereSystem : SharedAtmosphereSystem
     private const float ExposedUpdateDelay = 1f;
     private float _exposedTimer = 0f;
 
+    private EntityQuery<GridAtmosphereComponent> _atmosQuery;
+    private EntityQuery<AirtightComponent> _airtightQuery;
+    private EntityQuery<FirelockComponent> _firelockQuery;
     private HashSet<EntityUid> _entSet = new();
 
     public override void Initialize()
@@ -55,6 +59,9 @@ public override void Initialize()
         InitializeGridAtmosphere();
         InitializeMap();
 
+        _atmosQuery = GetEntityQuery<GridAtmosphereComponent>();
+        _airtightQuery = GetEntityQuery<AirtightComponent>();
+        _firelockQuery = GetEntityQuery<FirelockComponent>();
 
         SubscribeLocalEvent<TileChangedEvent>(OnTileChanged);
 
diff --git a/Content.Server/Atmos/EntitySystems/AutomaticAtmosSystem.cs b/Content.Server/Atmos/EntitySystems/AutomaticAtmosSystem.cs
index 5d60ae57d9..70e3eef3c4 100644
--- a/Content.Server/Atmos/EntitySystems/AutomaticAtmosSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/AutomaticAtmosSystem.cs
@@ -27,8 +27,12 @@ private void OnTileChanged(ref TileChangedEvent ev)
         // Also, these calls are surprisingly slow.
         // TODO: Make tiledefmanager cache the IsSpace property, and turn this lookup-through-two-interfaces into
         // TODO: a simple array lookup, as tile IDs are likely contiguous, and there's at most 2^16 possibilities anyway.
-        if (!((ev.OldTile.IsSpace(_tileDefinitionManager) && !ev.NewTile.IsSpace(_tileDefinitionManager)) ||
-            (!ev.OldTile.IsSpace(_tileDefinitionManager) && ev.NewTile.IsSpace(_tileDefinitionManager))) ||
+
+        var oldSpace = ev.OldTile.IsSpace(_tileDefinitionManager);
+        var newSpace = ev.NewTile.IsSpace(_tileDefinitionManager);
+
+        if (!(oldSpace && !newSpace ||
+            !oldSpace && newSpace) ||
             _atmosphereSystem.HasAtmosphere(ev.Entity))
             return;
 
@@ -39,7 +43,7 @@ private void OnTileChanged(ref TileChangedEvent ev)
         if (physics.Mass / ShuttleSystem.TileMassMultiplier >= 7.0f)
         {
             AddComp<GridAtmosphereComponent>(ev.Entity);
-            Logger.InfoS("atmos", $"Giving grid {ev.Entity} GridAtmosphereComponent.");
+            Log.Info($"Giving grid {ev.Entity} GridAtmosphereComponent.");
         }
         // It's not super important to remove it should the grid become too small again.
         // If explosions ever gain the ability to outright shatter grids, do rethink this.
diff --git a/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs b/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs
index 023ac28763..fc77a1c8d9 100644
--- a/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs
@@ -149,7 +149,8 @@ public float GetFeltLowPressure(EntityUid uid, BarotraumaComponent barotrauma, f
                 return Atmospherics.OneAtmosphere;
             }
 
-            return (environmentPressure + barotrauma.LowPressureModifier) * (barotrauma.LowPressureMultiplier);
+            var modified = (environmentPressure + barotrauma.LowPressureModifier) * (barotrauma.LowPressureMultiplier);
+            return Math.Min(modified, Atmospherics.OneAtmosphere);
         }
 
         /// <summary>
@@ -162,7 +163,8 @@ public float GetFeltHighPressure(EntityUid uid, BarotraumaComponent barotrauma,
                 return Atmospherics.OneAtmosphere;
             }
 
-            return (environmentPressure + barotrauma.HighPressureModifier) * (barotrauma.HighPressureMultiplier);
+            var modified = (environmentPressure + barotrauma.HighPressureModifier) * (barotrauma.HighPressureMultiplier);
+            return Math.Max(modified, Atmospherics.OneAtmosphere);
         }
 
         public bool TryGetPressureProtectionValues(
diff --git a/Content.Server/Atmos/EntitySystems/GasAnalyzerSystem.cs b/Content.Server/Atmos/EntitySystems/GasAnalyzerSystem.cs
index 6a2c8f0a7e..552ee14232 100644
--- a/Content.Server/Atmos/EntitySystems/GasAnalyzerSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/GasAnalyzerSystem.cs
@@ -260,13 +260,13 @@ private GasEntry[] GenerateGasEntryArray(GasMixture? mixture)
             {
                 var gas = _atmo.GetGas(i);
 
-                if (mixture?.Moles[i] <= UIMinMoles)
+                if (mixture?[i] <= UIMinMoles)
                     continue;
 
                 if (mixture != null)
                 {
                     var gasName = Loc.GetString(gas.Name);
-                    gases.Add(new GasEntry(gasName, mixture.Moles[i], gas.Color));
+                    gases.Add(new GasEntry(gasName, mixture[i], gas.Color));
                 }
             }
 
diff --git a/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs b/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs
index 8ae9517379..397f0167a9 100644
--- a/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs
+++ b/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs
@@ -171,7 +171,7 @@ public GasOverlayData GetOverlayData(GasMixture? mixture)
             {
                 var id = VisibleGasId[i];
                 var gas = _atmosphereSystem.GetGas(id);
-                var moles = mixture?.Moles[id] ?? 0f;
+                var moles = mixture?[id] ?? 0f;
                 ref var opacity = ref data.Opacity[i];
 
                 if (moles < gas.GasMolesVisible)
@@ -216,13 +216,13 @@ private bool UpdateChunkTile(GridAtmosphereComponent gridAtmosphere, GasOverlayC
                 oldData = new GasOverlayData(tile.Hotspot.State, oldData.Opacity);
             }
 
-            if (tile.Air != null)
+            if (tile is {Air: not null, NoGridTile: false})
             {
                 for (var i = 0; i < VisibleGasId.Length; i++)
                 {
                     var id = VisibleGasId[i];
                     var gas = _atmosphereSystem.GetGas(id);
-                    var moles = tile.Air.Moles[id];
+                    var moles = tile.Air[id];
                     ref var oldOpacity = ref oldData.Opacity[i];
 
                     if (moles < gas.GasMolesVisible)
diff --git a/Content.Server/Atmos/GasMixture.cs b/Content.Server/Atmos/GasMixture.cs
index 0a2ef235a7..77fd701833 100644
--- a/Content.Server/Atmos/GasMixture.cs
+++ b/Content.Server/Atmos/GasMixture.cs
@@ -3,6 +3,7 @@
 using System.Runtime.CompilerServices;
 using Content.Server.Atmos.Reactions;
 using Content.Shared.Atmos;
+using Content.Shared.Atmos.EntitySystems;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
 
@@ -17,11 +18,13 @@ public sealed partial class GasMixture : IEquatable<GasMixture>, ISerializationH
     {
         public static GasMixture SpaceGas => new() {Volume = Atmospherics.CellVolume, Temperature = Atmospherics.TCMB, Immutable = true};
 
-        // This must always have a length that is a multiple of 4 for SIMD acceleration.
-        [DataField("moles")]
-        [ViewVariables(VVAccess.ReadWrite)]
+        // No access, to ensure immutable mixtures are never accidentally mutated.
+        [Access(typeof(SharedAtmosphereSystem), typeof(SharedAtmosDebugOverlaySystem), Other = AccessPermissions.None)]
+        [DataField]
         public float[] Moles = new float[Atmospherics.AdjustedNumberOfGases];
 
+        public float this[int gas] => Moles[gas];
+
         [DataField("temperature")]
         [ViewVariables(VVAccess.ReadWrite)]
         private float _temperature = Atmospherics.TCMB;
@@ -80,6 +83,19 @@ public GasMixture(float volume = 0f)
             Volume = volume;
         }
 
+        public GasMixture(float[] moles, float temp, float volume = Atmospherics.CellVolume)
+        {
+            if (moles.Length != Atmospherics.AdjustedNumberOfGases)
+                throw new InvalidOperationException($"Invalid mole array length");
+
+            if (volume < 0)
+                volume = 0;
+
+            _temperature = temp;
+            Moles = moles;
+            Volume = volume;
+        }
+
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void MarkImmutable()
         {
@@ -117,15 +133,16 @@ public void SetMoles(Gas gas, float quantity)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void AdjustMoles(int gasId, float quantity)
         {
-            if (!Immutable)
-            {
-                if (!float.IsFinite(quantity))
-                    throw new ArgumentException($"Invalid quantity \"{quantity}\" specified!", nameof(quantity));
+            if (Immutable)
+                return;
 
-                // Clamping is needed because x - x can be negative with floating point numbers. If we don't
-                // clamp here, the caller always has to call GetMoles(), clamp, then SetMoles().
-                Moles[gasId] = MathF.Max(Moles[gasId] + quantity, 0);
-            }
+            if (!float.IsFinite(quantity))
+                throw new ArgumentException($"Invalid quantity \"{quantity}\" specified!", nameof(quantity));
+
+            // Clamping is needed because x - x can be negative with floating point numbers. If we don't
+            // clamp here, the caller always has to call GetMoles(), clamp, then SetMoles().
+            ref var moles = ref Moles[gasId];
+            moles = MathF.Max(moles + quantity, 0);
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -163,7 +180,8 @@ public GasMixture RemoveRatio(float ratio)
             {
                 var moles = Moles[i];
                 var otherMoles = removed.Moles[i];
-                if (moles < Atmospherics.GasMinMoles || float.IsNaN(moles))
+
+                if ((moles < Atmospherics.GasMinMoles || float.IsNaN(moles)) && !Immutable)
                     Moles[i] = 0;
 
                 if (otherMoles < Atmospherics.GasMinMoles || float.IsNaN(otherMoles))
@@ -202,6 +220,9 @@ public void Multiply(float multiplier)
 
         void ISerializationHooks.AfterDeserialization()
         {
+            // ISerializationHooks is obsolete.
+            // TODO add fixed-length-array serializer
+
             // The arrays MUST have a specific length.
             Array.Resize(ref Moles, Atmospherics.AdjustedNumberOfGases);
         }
@@ -229,8 +250,12 @@ public override bool Equals(object? obj)
 
         public bool Equals(GasMixture? other)
         {
-            if (ReferenceEquals(null, other)) return false;
-            if (ReferenceEquals(this, other)) return true;
+            if (ReferenceEquals(this, other))
+                return true;
+
+            if (ReferenceEquals(null, other))
+                return false;
+
             return Moles.SequenceEqual(other.Moles)
                    && _temperature.Equals(other._temperature)
                    && ReactionResults.SequenceEqual(other.ReactionResults)
@@ -258,11 +283,13 @@ public override int GetHashCode()
 
         public GasMixture Clone()
         {
+            if (Immutable)
+                return this;
+
             var newMixture = new GasMixture()
             {
                 Moles = (float[])Moles.Clone(),
                 _temperature = _temperature,
-                Immutable = Immutable,
                 Volume = Volume,
             };
             return newMixture;
diff --git a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
index f38e0299a0..faf06a6079 100644
--- a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
+++ b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
@@ -167,7 +167,7 @@ private void OnSelectGasMessage(EntityUid uid, GasFilterComponent filter, GasFil
                 }
                 else
                 {
-                    Logger.Warning("atmos", $"{ToPrettyString(uid)} received GasFilterSelectGasMessage with an invalid ID: {args.ID}");
+                    Log.Warning($"{ToPrettyString(uid)} received GasFilterSelectGasMessage with an invalid ID: {args.ID}");
                 }
             }
             else
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
index 64d02d793b..ad647fad1b 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
@@ -136,7 +136,7 @@ private void OnCanisterChangeReleaseValve(EntityUid uid, GasCanisterComponent ca
 
         for (int i = 0; i < containedGasArray.Length; i++)
         {
-            containedGasDict.Add((Gas)i, canister.Air.Moles[i]);
+            containedGasDict.Add((Gas)i, canister.Air[i]);
         }
 
         _adminLogger.Add(LogType.CanisterValve, impact, $"{ToPrettyString(args.Session.AttachedEntity.GetValueOrDefault()):player} set the valve on {ToPrettyString(uid):canister} to {args.Valve:valveState} while it contained [{string.Join(", ", containedGasDict)}]");
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCondenserSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCondenserSystem.cs
index 491bf60062..852542ec6c 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCondenserSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCondenserSystem.cs
@@ -45,7 +45,7 @@ private void OnCondenserUpdated(Entity<GasCondenserComponent> entity, ref AtmosD
         var removed = inlet.Air.Remove(molesToConvert);
         for (var i = 0; i < Atmospherics.TotalNumberOfGases; i++)
         {
-            var moles = removed.Moles[i];
+            var moles = removed[i];
             if (moles <= 0)
                 continue;
 
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
index d376c6d9d6..d4ddd65a8e 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
@@ -110,7 +110,7 @@ private void OnThermoMachineUpdated(EntityUid uid, GasThermoMachineComponent the
                 _atmosphereSystem.AddHeat(heatExchangeGasMixture, dQPipe);
                 thermoMachine.LastEnergyDelta = dQPipe;
 
-                if (dQLeak != 0f && _atmosphereSystem.GetContainingMixture(uid) is { } containingMixture)
+                if (dQLeak != 0f && _atmosphereSystem.GetContainingMixture(uid, excite: true) is { } containingMixture)
                     _atmosphereSystem.AddHeat(containingMixture, dQLeak);
             }
 
@@ -126,7 +126,7 @@ private void GetHeatExchangeGasMixture(EntityUid uid, GasThermoMachineComponent
             heatExchangeGasMixture = null;
             if (thermoMachine.Atmospheric)
             {
-                heatExchangeGasMixture = _atmosphereSystem.GetContainingMixture(uid);
+                heatExchangeGasMixture = _atmosphereSystem.GetContainingMixture(uid, excite: true);
             }
             else
             {
diff --git a/Content.Server/Atmos/Serialization/TileAtmosCollectionSerializer.cs b/Content.Server/Atmos/Serialization/TileAtmosCollectionSerializer.cs
index 7d385c530a..71e4c2d0de 100644
--- a/Content.Server/Atmos/Serialization/TileAtmosCollectionSerializer.cs
+++ b/Content.Server/Atmos/Serialization/TileAtmosCollectionSerializer.cs
@@ -183,13 +183,7 @@ public void CopyTo(ISerializationManager serializationManager, Dictionary<Vector
         target.Clear();
         foreach (var (key, val) in source)
         {
-            target.Add(key,
-                new TileAtmosphere(
-                    val.GridIndex,
-                    val.GridIndices,
-                    val.Air?.Clone(),
-                    val.Air?.Immutable ?? false,
-                    val.Space));
+            target.Add(key, new TileAtmosphere(val));
         }
     }
 }
diff --git a/Content.Server/Atmos/TileAtmosphere.cs b/Content.Server/Atmos/TileAtmosphere.cs
index a380154296..0dd35a29e7 100644
--- a/Content.Server/Atmos/TileAtmosphere.cs
+++ b/Content.Server/Atmos/TileAtmosphere.cs
@@ -1,3 +1,4 @@
+using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
 using Content.Shared.Atmos;
 using Content.Shared.Maps;
@@ -51,6 +52,10 @@ public sealed class TileAtmosphere : IGasMixtureHolder
         [ViewVariables]
         public readonly TileAtmosphere?[] AdjacentTiles = new TileAtmosphere[Atmospherics.Directions];
 
+        /// <summary>
+        /// Neighbouring tiles to which air can flow. This is a combination of this tile's unblocked direction, and the
+        /// unblocked directions on adjacent tiles.
+        /// </summary>
         [ViewVariables]
         public AtmosDirection AdjacentBits = AtmosDirection.Invalid;
 
@@ -72,10 +77,7 @@ public sealed class TileAtmosphere : IGasMixtureHolder
         public EntityUid GridIndex { get; set; }
 
         [ViewVariables]
-        public TileRef? Tile => GridIndices.GetTileRef(GridIndex);
-
-        [ViewVariables]
-        public Vector2i GridIndices { get; }
+        public Vector2i GridIndices;
 
         [ViewVariables]
         public ExcitedGroup? ExcitedGroup { get; set; }
@@ -92,7 +94,7 @@ public sealed class TileAtmosphere : IGasMixtureHolder
         public float LastShare;
 
         [ViewVariables]
-        public float[]? MolesArchived;
+        public readonly float[] MolesArchived = new float[Atmospherics.AdjustedNumberOfGases];
 
         GasMixture IGasMixtureHolder.Air
         {
@@ -103,8 +105,31 @@ GasMixture IGasMixtureHolder.Air
         [ViewVariables]
         public float MaxFireTemperatureSustained { get; set; }
 
+        /// <summary>
+        /// If true, then this tile is directly exposed to the map's atmosphere, either because the grid has no tile at
+        /// this position, or because the tile type is not airtight.
+        /// </summary>
+        [ViewVariables]
+        public bool MapAtmosphere;
+
+        /// <summary>
+        /// If true, this tile does not actually exist on the grid, it only exists to represent the map's atmosphere for
+        /// adjacent grid tiles.
+        /// </summary>
         [ViewVariables]
-        public AtmosDirection BlockedAirflow { get; set; } = AtmosDirection.Invalid;
+        public bool NoGridTile;
+
+        /// <summary>
+        /// If true, this tile is queued for processing in <see cref="GridAtmosphereComponent.PossiblyDisconnectedTiles"/>
+        /// </summary>
+        [ViewVariables]
+        public bool TrimQueued;
+
+        /// <summary>
+        /// Cached information about airtight entities on this tile. This gets updated anytime a tile gets invalidated
+        /// (i.e., gets added to <see cref="GridAtmosphereComponent.InvalidatedCoords"/>).
+        /// </summary>
+        public AtmosphereSystem.AirtightData AirtightData;
 
         public TileAtmosphere(EntityUid gridIndex, Vector2i gridIndices, GasMixture? mixture = null, bool immutable = false, bool space = false)
         {
@@ -112,10 +137,24 @@ public TileAtmosphere(EntityUid gridIndex, Vector2i gridIndices, GasMixture? mix
             GridIndices = gridIndices;
             Air = mixture;
             Space = space;
-            MolesArchived = Air != null ? new float[Atmospherics.AdjustedNumberOfGases] : null;
 
             if(immutable)
                 Air?.MarkImmutable();
         }
+
+        public TileAtmosphere(TileAtmosphere other)
+        {
+            GridIndex = other.GridIndex;
+            GridIndices = other.GridIndices;
+            Space = other.Space;
+            NoGridTile = other.NoGridTile;
+            MapAtmosphere = other.MapAtmosphere;
+            Air = other.Air?.Clone();
+            Array.Copy(other.MolesArchived, MolesArchived, MolesArchived.Length);
+        }
+
+        public TileAtmosphere()
+        {
+        }
     }
 }
diff --git a/Content.Server/Audio/ServerGlobalSoundSystem.cs b/Content.Server/Audio/ServerGlobalSoundSystem.cs
index df8771df8d..3d30be8eea 100644
--- a/Content.Server/Audio/ServerGlobalSoundSystem.cs
+++ b/Content.Server/Audio/ServerGlobalSoundSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.Station.Systems;
 using Content.Shared.Audio;
 using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
 using Robust.Shared.Console;
 using Robust.Shared.Player;
 
@@ -10,6 +11,7 @@ public sealed class ServerGlobalSoundSystem : SharedGlobalSoundSystem
 {
     [Dependency] private readonly IConsoleHost _conHost = default!;
     [Dependency] private readonly StationSystem _stationSystem = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
 
     public override void Shutdown()
     {
@@ -49,10 +51,14 @@ public void StopStationEventMusic(EntityUid source, StationEventMusicType type)
     }
 
     public void DispatchStationEventMusic(EntityUid source, SoundSpecifier sound, StationEventMusicType type)
+    {
+        DispatchStationEventMusic(source, _audio.GetSound(sound), type);
+    }
+
+    public void DispatchStationEventMusic(EntityUid source, string sound, StationEventMusicType type)
     {
         var audio = AudioParams.Default.WithVolume(-8);
-        var soundFile = sound.GetSound();
-        var msg = new StationEventMusicEvent(soundFile, type, audio);
+        var msg = new StationEventMusicEvent(sound, type, audio);
 
         var filter = GetStationAndPvs(source);
         RaiseNetworkEvent(msg, filter);
diff --git a/Content.Server/Bed/Components/SnoringComponent.cs b/Content.Server/Bed/Components/SnoringComponent.cs
new file mode 100644
index 0000000000..09f80327ba
--- /dev/null
+++ b/Content.Server/Bed/Components/SnoringComponent.cs
@@ -0,0 +1,10 @@
+namespace Content.Server.Bed.Sleep;
+
+/// <summary>
+/// This is used for the snoring trait.
+/// </summary>
+[RegisterComponent]
+public sealed partial class SnoringComponent : Component
+{
+
+}
diff --git a/Content.Server/Bed/Sleep/SleepingSystem.cs b/Content.Server/Bed/Sleep/SleepingSystem.cs
index 5d1def7cec..b497254433 100644
--- a/Content.Server/Bed/Sleep/SleepingSystem.cs
+++ b/Content.Server/Bed/Sleep/SleepingSystem.cs
@@ -7,6 +7,7 @@
 using Content.Shared.Examine;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
+using Content.Shared.Interaction.Events;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Slippery;
@@ -45,6 +46,7 @@ public override void Initialize()
             SubscribeLocalEvent<SleepingComponent, InteractHandEvent>(OnInteractHand);
             SubscribeLocalEvent<SleepingComponent, ExaminedEvent>(OnExamined);
             SubscribeLocalEvent<SleepingComponent, SlipAttemptEvent>(OnSlip);
+            SubscribeLocalEvent<SleepingComponent, ConsciousAttemptEvent>(OnConsciousAttempt);
             SubscribeLocalEvent<ForcedSleepingComponent, ComponentInit>(OnInit);
         }
 
@@ -65,7 +67,10 @@ private void OnSleepStateChanged(EntityUid uid, MobStateComponent component, Sle
                 if (TryComp<SleepEmitSoundComponent>(uid, out var sleepSound))
                 {
                     var emitSound = EnsureComp<SpamEmitSoundComponent>(uid);
-                    emitSound.Sound = sleepSound.Snore;
+                    if (HasComp<SnoringComponent>(uid))
+                    {
+                        emitSound.Sound = sleepSound.Snore;
+                    }
                     emitSound.PlayChance = sleepSound.Chance;
                     emitSound.RollInterval = sleepSound.Interval;
                     emitSound.PopUp = sleepSound.PopUp;
@@ -173,6 +178,12 @@ private void OnSlip(EntityUid uid, SleepingComponent component, SlipAttemptEvent
             args.Cancel();
         }
 
+        private void OnConsciousAttempt(EntityUid uid, SleepingComponent component, ConsciousAttemptEvent args)
+        {
+            args.Cancel();
+        }
+
+
         private void OnInit(EntityUid uid, ForcedSleepingComponent component, ComponentInit args)
         {
             TrySleeping(uid);
diff --git a/Content.Server/Body/Systems/LungSystem.cs b/Content.Server/Body/Systems/LungSystem.cs
index b5bac50739..4b60f8814b 100644
--- a/Content.Server/Body/Systems/LungSystem.cs
+++ b/Content.Server/Body/Systems/LungSystem.cs
@@ -77,7 +77,7 @@ public void GasToReagent(EntityUid uid, LungComponent lung)
         foreach (var gas in Enum.GetValues<Gas>())
         {
             var i = (int) gas;
-            var moles = lung.Air.Moles[i];
+            var moles = lung.Air[i];
             if (moles <= 0)
                 continue;
             var reagent = _atmosphereSystem.GasReagents[i];
diff --git a/Content.Server/Cargo/Systems/CargoSystem.CVars.cs b/Content.Server/Cargo/Systems/CargoSystem.CVars.cs
new file mode 100644
index 0000000000..9072362fb4
--- /dev/null
+++ b/Content.Server/Cargo/Systems/CargoSystem.CVars.cs
@@ -0,0 +1,26 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Server.Cargo.Systems
+{
+    public sealed partial class CargoSystem
+    {
+        [Dependency] private readonly IConfigurationManager _cfg = default!;
+    }
+
+    [CVarDefs]
+    public sealed class CargoCVars
+    {
+        /// <summary>
+        ///     Determines if a trade station spawns in its own FTL map.
+        /// </summary>
+        /// <remarks>
+        ///     Set this to true if and only if you are disabling the normal spawning method.
+        ///     Otherwise you get two trade stations.
+        ///     This does NOTHING to the trade station that spawns on the default map.
+        ///     To change that, in Resources/Prototypes/Entities/Stations/base.yml;
+        ///      comment out the "trade:" section.
+        /// </remarks>
+        public static readonly CVarDef<bool> CreateCargoMap =
+            CVarDef.Create("cargo.tradestation_spawns_in_ftl_map", false, CVar.SERVERONLY);
+    }
+}
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
index 44e2b2c7d0..3e39440da5 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
@@ -19,6 +19,7 @@
 using Robust.Shared.Audio;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Utility;
+using Robust.Shared.Configuration;
 
 namespace Content.Server.Cargo.Systems;
 
@@ -27,7 +28,7 @@ public sealed partial class CargoSystem
     /*
      * Handles cargo shuttle / trade mechanics.
      */
-
+    [Dependency] private readonly IConfigurationManager _confMan = default!;
     public MapId? CargoMap { get; private set; }
 
     private static readonly SoundPathSpecifier ApproveSound = new("/Audio/Effects/Cargo/ping.ogg");
@@ -369,7 +370,7 @@ private void OnStationInitialize(StationInitializedEvent args)
         if (!HasComp<StationCargoOrderDatabaseComponent>(args.Station)) // No cargo, L
             return;
 
-        if (_cfgManager.GetCVar(CCVars.GridFill))
+        if (_cfgManager.GetCVar(CCVars.GridFill) && _confMan.GetCVar(CargoCVars.CreateCargoMap))
             SetupTradePost();
     }
 
diff --git a/Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs b/Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs
index 761e9456bc..c923738930 100644
--- a/Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs
+++ b/Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs
@@ -39,7 +39,7 @@ private void OnClientTypingChanged(TypingChangedEvent ev, EntitySessionEventArgs
         var uid = args.SenderSession.AttachedEntity;
         if (!Exists(uid))
         {
-            Logger.Warning($"Client {args.SenderSession} sent TypingChangedEvent without an attached entity.");
+            Log.Warning($"Client {args.SenderSession} sent TypingChangedEvent without an attached entity.");
             return;
         }
 
diff --git a/Content.Server/Chemistry/Components/SolutionInjectOnCollideComponent.cs b/Content.Server/Chemistry/Components/SolutionInjectOnCollideComponent.cs
index cdba55467a..76bb5294bc 100644
--- a/Content.Server/Chemistry/Components/SolutionInjectOnCollideComponent.cs
+++ b/Content.Server/Chemistry/Components/SolutionInjectOnCollideComponent.cs
@@ -25,7 +25,4 @@ public sealed partial class SolutionInjectOnCollideComponent : Component
     /// </summary>
     [DataField("blockSlots"), ViewVariables(VVAccess.ReadWrite)]
     public SlotFlags BlockSlots = SlotFlags.MASK;
-
-    [DataField]
-    public string FixtureId = SharedProjectileSystem.ProjectileFixture;
 }
diff --git a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
index 0846d35477..a6d13b2f7c 100644
--- a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
@@ -128,9 +128,21 @@ private void InjectDoAfter(Entity<InjectorComponent> injector, EntityUid target,
             return;
 
         var actualDelay = MathHelper.Max(injector.Comp.Delay, TimeSpan.FromSeconds(1));
+        float amountToInject;
+        if (injector.Comp.ToggleState == InjectorToggleMode.Draw)
+        {
+            // additional delay is based on actual volume left to draw in syringe when smaller than transfer amount
+            amountToInject = Math.Min(injector.Comp.TransferAmount.Float(), (solution.MaxVolume - solution.Volume).Float());
+        }
+        else
+        {
+            // additional delay is based on actual volume left to inject in syringe when smaller than transfer amount
+            amountToInject = Math.Min(injector.Comp.TransferAmount.Float(), solution.Volume.Float());
+        }
+
+        // Injections take 0.5 seconds longer per 5u of possible space/content
+        actualDelay += TimeSpan.FromSeconds(amountToInject / 10);
 
-        // Injections take 0.5 seconds longer per additional 5u
-        actualDelay += TimeSpan.FromSeconds(injector.Comp.TransferAmount.Float() / injector.Comp.Delay.TotalSeconds - 0.5f);
 
         var isTarget = user != target;
 
diff --git a/Content.Server/Chemistry/EntitySystems/SolutionInjectOnCollideSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionInjectOnCollideSystem.cs
index 0f696774ae..fb84aca3e4 100644
--- a/Content.Server/Chemistry/EntitySystems/SolutionInjectOnCollideSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/SolutionInjectOnCollideSystem.cs
@@ -3,8 +3,7 @@
 using Content.Server.Chemistry.Components;
 using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Shared.Inventory;
-using JetBrains.Annotations;
-using Robust.Shared.Physics.Events;
+using Content.Shared.Projectiles;
 
 namespace Content.Server.Chemistry.EntitySystems;
 
@@ -17,17 +16,15 @@ public sealed class SolutionInjectOnCollideSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<SolutionInjectOnCollideComponent, StartCollideEvent>(HandleInjection);
+        SubscribeLocalEvent<SolutionInjectOnCollideComponent, ProjectileHitEvent>(HandleInjection);
     }
 
-    private void HandleInjection(Entity<SolutionInjectOnCollideComponent> ent, ref StartCollideEvent args)
+    private void HandleInjection(Entity<SolutionInjectOnCollideComponent> ent, ref ProjectileHitEvent args)
     {
         var component = ent.Comp;
-        var target = args.OtherEntity;
+        var target = args.Target;
 
-        if (!args.OtherBody.Hard ||
-            args.OurFixtureId != ent.Comp.FixtureId ||
-            !EntityManager.TryGetComponent<BloodstreamComponent>(target, out var bloodstream) ||
+        if (!TryComp<BloodstreamComponent>(target, out var bloodstream) ||
             !_solutionContainersSystem.TryGetInjectableSolution(ent.Owner, out var solution, out _))
         {
             return;
diff --git a/Content.Server/Chemistry/EntitySystems/VaporSystem.cs b/Content.Server/Chemistry/EntitySystems/VaporSystem.cs
index 2c23b8f039..1415b6cad3 100644
--- a/Content.Server/Chemistry/EntitySystems/VaporSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/VaporSystem.cs
@@ -22,8 +22,8 @@ namespace Content.Server.Chemistry.EntitySystems
     [UsedImplicitly]
     internal sealed class VaporSystem : EntitySystem
     {
-        [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly IPrototypeManager _protoManager = default!;
+        [Dependency] private readonly SharedMapSystem _map = default!;
         [Dependency] private readonly SharedPhysicsSystem _physics = default!;
         [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
         [Dependency] private readonly ThrowingSystem _throwing = default!;
@@ -31,12 +31,10 @@ internal sealed class VaporSystem : EntitySystem
 
         private const float ReactTime = 0.125f;
 
-        private ISawmill _sawmill = default!;
-
         public override void Initialize()
         {
             base.Initialize();
-            _sawmill = Logger.GetSawmill("vapor");
+
             SubscribeLocalEvent<VaporComponent, StartCollideEvent>(HandleCollide);
         }
 
@@ -66,8 +64,8 @@ public void Start(Entity<VaporComponent> vapor, TransformComponent vaporXform, V
             // Set Move
             if (EntityManager.TryGetComponent(vapor, out PhysicsComponent? physics))
             {
-                _physics.SetLinearDamping(physics, 0f);
-                _physics.SetAngularDamping(physics, 0f);
+                _physics.SetLinearDamping(vapor, physics, 0f);
+                _physics.SetAngularDamping(vapor, physics, 0f);
 
                 _throwing.TryThrow(vapor, dir, speed, user: user);
 
@@ -117,7 +115,7 @@ private void Update(float frameTime, Entity<VaporComponent> ent, Entity<Solution
             {
                 vapor.ReactTimer = 0;
 
-                var tile = gridComp.GetTileRef(xform.Coordinates.ToVector2i(EntityManager, _mapManager));
+                var tile = _map.GetTileRef(xform.GridUid.Value, gridComp, xform.Coordinates);
                 foreach (var reagentQuantity in contents.Contents.ToArray())
                 {
                     if (reagentQuantity.Quantity == FixedPoint2.Zero) continue;
@@ -128,7 +126,7 @@ private void Update(float frameTime, Entity<VaporComponent> ent, Entity<Solution
 
                     if (reaction > reagentQuantity.Quantity)
                     {
-                        _sawmill.Error($"Tried to tile react more than we have for reagent {reagentQuantity}. Found {reaction} and we only have {reagentQuantity.Quantity}");
+                        Log.Error($"Tried to tile react more than we have for reagent {reagentQuantity}. Found {reaction} and we only have {reagentQuantity.Quantity}");
                         reaction = reagentQuantity.Quantity;
                     }
 
diff --git a/Content.Server/Chemistry/ReagentEffects/ModifyLungGas.cs b/Content.Server/Chemistry/ReagentEffects/ModifyLungGas.cs
index e12cab80a9..e7466fbc85 100644
--- a/Content.Server/Chemistry/ReagentEffects/ModifyLungGas.cs
+++ b/Content.Server/Chemistry/ReagentEffects/ModifyLungGas.cs
@@ -16,12 +16,15 @@ public sealed partial class ModifyLungGas : ReagentEffect
 
     public override void Effect(ReagentEffectArgs args)
     {
-        if (args.EntityManager.TryGetComponent<LungComponent>(args.OrganEntity, out var lung))
+        if (!args.EntityManager.TryGetComponent<LungComponent>(args.OrganEntity, out var lung))
+            return;
+
+        foreach (var (gas, ratio) in _ratios)
         {
-            foreach (var (gas, ratio) in _ratios)
-            {
-                lung.Air.Moles[(int) gas] += (ratio * args.Quantity.Float()) / Atmospherics.BreathMolesToReagentMultiplier;
-            }
+            var quantity = ratio * args.Quantity.Float() / Atmospherics.BreathMolesToReagentMultiplier;
+            if (quantity < 0)
+                quantity = Math.Max(quantity, -lung.Air[(int)gas]);
+            lung.Air.AdjustMoles(gas, quantity);
         }
     }
 }
diff --git a/Content.Server/Chemistry/TileReactions/SpillTileReaction.cs b/Content.Server/Chemistry/TileReactions/SpillTileReaction.cs
index 49fdaa5c7e..8f8b0626a2 100644
--- a/Content.Server/Chemistry/TileReactions/SpillTileReaction.cs
+++ b/Content.Server/Chemistry/TileReactions/SpillTileReaction.cs
@@ -45,9 +45,9 @@ public FixedPoint2 TileReact(TileRef tile, ReagentPrototype reagent, FixedPoint2
                 var step = entityManager.EnsureComponent<StepTriggerComponent>(puddleUid);
                 entityManager.EntitySysManager.GetEntitySystem<StepTriggerSystem>().SetRequiredTriggerSpeed(puddleUid, _requiredSlipSpeed, step);
 
-                var slow = entityManager.EnsureComponent<SlowContactsComponent>(puddleUid);
+                var slow = entityManager.EnsureComponent<SpeedModifierContactsComponent>(puddleUid);
                 var speedModifier = 1 - reagent.Viscosity;
-                entityManager.EntitySysManager.GetEntitySystem<SlowContactsSystem>().ChangeModifiers(puddleUid, speedModifier, slow);
+                entityManager.EntitySysManager.GetEntitySystem<SpeedModifierContactsSystem>().ChangeModifiers(puddleUid, speedModifier, slow);
 
                 return reactVolume;
             }
diff --git a/Content.Server/Clothing/Systems/LoadoutSystem.cs b/Content.Server/Clothing/Systems/LoadoutSystem.cs
new file mode 100644
index 0000000000..c22f7afb59
--- /dev/null
+++ b/Content.Server/Clothing/Systems/LoadoutSystem.cs
@@ -0,0 +1,49 @@
+using Content.Server.GameTicking;
+using Content.Server.Players.PlayTimeTracking;
+using Content.Shared.CCVar;
+using Content.Shared.Inventory;
+using Content.Shared.Item;
+using Content.Shared.Storage;
+using Content.Shared.Storage.EntitySystems;
+using Robust.Shared.Configuration;
+
+namespace Content.Server.Clothing.Systems;
+
+public sealed class LoadoutSystem : EntitySystem
+{
+    [Dependency] private readonly IConfigurationManager _configurationManager = default!;
+    [Dependency] private readonly Shared.Clothing.Loadouts.Systems.LoadoutSystem _loadout = default!;
+    [Dependency] private readonly InventorySystem _inventory = default!;
+    [Dependency] private readonly SharedStorageSystem _storage = default!;
+    [Dependency] private readonly PlayTimeTrackingManager _playTimeTracking = default!;
+
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<PlayerSpawnCompleteEvent>(OnPlayerSpawnComplete);
+    }
+
+
+    private void OnPlayerSpawnComplete(PlayerSpawnCompleteEvent ev)
+    {
+        if (ev.JobId == null ||
+            !_configurationManager.GetCVar(CCVars.GameLoadoutsEnabled))
+            return;
+
+        // Spawn the loadout, get a list of items that failed to equip
+        var failedLoadouts = _loadout.ApplyCharacterLoadout(ev.Mob, ev.JobId, ev.Profile, _playTimeTracking.GetTrackerTimes(ev.Player));
+
+        // Try to find back-mounted storage apparatus
+        if (!_inventory.TryGetSlotEntity(ev.Mob, "back", out var item) ||
+            !EntityManager.TryGetComponent<StorageComponent>(item, out var inventory))
+            return;
+
+        // Try inserting the entity into the storage, if it can't, it leaves the loadout item on the ground
+        foreach (var loadout in failedLoadouts)
+        {
+            if (EntityManager.TryGetComponent<ItemComponent>(loadout, out var itemComp) &&
+                _storage.CanInsert(item.Value, loadout, out _, inventory, itemComp))
+                _storage.Insert(item.Value, loadout, out _, playSound: false);
+        }
+    }
+}
diff --git a/Content.Server/Communications/CommunicationsConsoleSystem.cs b/Content.Server/Communications/CommunicationsConsoleSystem.cs
index 6b0b13c410..6b745c8cd9 100644
--- a/Content.Server/Communications/CommunicationsConsoleSystem.cs
+++ b/Content.Server/Communications/CommunicationsConsoleSystem.cs
@@ -303,6 +303,9 @@ private void OnBroadcastMessage(EntityUid uid, CommunicationsConsoleComponent co
             };
 
             _deviceNetworkSystem.QueuePacket(uid, null, payload, net.TransmitFrequency);
+
+            if (message.Session.AttachedEntity != null)
+                _adminLogger.Add(LogType.DeviceNetwork, LogImpact.Low, $"{ToPrettyString(message.Session.AttachedEntity.Value):player} has sent the following broadcast: {message.Message:msg}");
         }
 
         private void OnCallShuttleMessage(EntityUid uid, CommunicationsConsoleComponent comp, CommunicationsConsoleCallEmergencyShuttleMessage message)
diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs
index c1d353d37f..719b4a9c63 100644
--- a/Content.Server/Connection/ConnectionManager.cs
+++ b/Content.Server/Connection/ConnectionManager.cs
@@ -16,6 +16,7 @@ namespace Content.Server.Connection
     public interface IConnectionManager
     {
         void Initialize();
+        Task<bool> HasPrivilegedJoin(NetUserId userId);
     }
 
     /// <summary>
@@ -157,13 +158,13 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
                 }
             }
 
-            var wasInGame = EntitySystem.TryGet<GameTicker>(out var ticker) &&
-                            ticker.PlayerGameStatuses.TryGetValue(userId, out var status) &&
-                            status == PlayerGameStatus.JoinedGame;
-            if ((_plyMgr.PlayerCount >= _cfg.GetCVar(CCVars.SoftMaxPlayers) && adminData is null) && !wasInGame)
-            {
+
+            var isPrivileged = await HasPrivilegedJoin(userId);
+            var isQueueEnabled = _cfg.GetCVar(CCVars.QueueEnabled);
+
+            if (_plyMgr.PlayerCount >= _cfg.GetCVar(CCVars.SoftMaxPlayers) && !isPrivileged && !isQueueEnabled)
                 return (ConnectionDenyReason.Full, Loc.GetString("soft-player-cap-full"), null);
-            }
+
 
             var bans = await _db.GetServerBansAsync(addr, userId, hwId, includeUnbanned: false);
             if (bans.Count > 0)
@@ -259,5 +260,14 @@ private async void OnDisconnected(object? sender, NetChannelArgs e)
                 _connectedWhitelistedPlayers.Remove(e.Channel.UserId);
             }
         }
+
+        public async Task<bool> HasPrivilegedJoin(NetUserId userId)
+        {
+            var isAdmin = await _dbManager.GetAdminDataForAsync(userId) != null;
+            var wasInGame = EntitySystem.TryGet<GameTicker>(out var ticker) &&
+                            ticker.PlayerGameStatuses.TryGetValue(userId, out var status) &&
+                            status == PlayerGameStatus.JoinedGame;
+            return isAdmin || wasInGame;
+        }
     }
 }
diff --git a/Content.Server/Construction/Conditions/ComponentInTile.cs b/Content.Server/Construction/Conditions/ComponentInTile.cs
index 8ab4046a72..429c4fdabf 100644
--- a/Content.Server/Construction/Conditions/ComponentInTile.cs
+++ b/Content.Server/Construction/Conditions/ComponentInTile.cs
@@ -3,6 +3,7 @@
 using Content.Shared.Maps;
 using JetBrains.Annotations;
 using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Construction.Conditions
@@ -46,9 +47,18 @@ public bool Condition(EntityUid uid, IEntityManager entityManager)
             if (transform.GridUid == null)
                 return false;
 
-            var indices = transform.Coordinates.ToVector2i(entityManager, IoCManager.Resolve<IMapManager>());
+            var transformSys = entityManager.System<SharedTransformSystem>();
+            var indices = transform.Coordinates.ToVector2i(entityManager, IoCManager.Resolve<IMapManager>(), transformSys);
             var lookup = entityManager.EntitySysManager.GetEntitySystem<EntityLookupSystem>();
-            var entities = indices.GetEntitiesInTile(transform.GridUid.Value, LookupFlags.Approximate | LookupFlags.Static, lookup);
+
+
+            if (!entityManager.TryGetComponent<MapGridComponent>(transform.GridUid.Value, out var grid))
+                return !HasEntity;
+
+            if (!entityManager.System<SharedMapSystem>().TryGetTileRef(transform.GridUid.Value, grid, indices, out var tile))
+                return !HasEntity;
+
+            var entities = tile.GetEntitiesInTile(LookupFlags.Approximate | LookupFlags.Static, lookup);
 
             foreach (var ent in entities)
             {
diff --git a/Content.Server/Construction/ConstructionSystem.Initial.cs b/Content.Server/Construction/ConstructionSystem.Initial.cs
index e0bdf09629..39705fc197 100644
--- a/Content.Server/Construction/ConstructionSystem.Initial.cs
+++ b/Content.Server/Construction/ConstructionSystem.Initial.cs
@@ -2,7 +2,6 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Content.Server.Construction.Components;
-using Content.Server.Storage.EntitySystems;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Construction;
 using Content.Shared.Construction.Prototypes;
@@ -15,7 +14,6 @@
 using Content.Shared.Interaction;
 using Content.Shared.Inventory;
 using Content.Shared.Storage;
-using Content.Shared.Tag;
 using Robust.Shared.Containers;
 using Robust.Shared.Player;
 using Robust.Shared.Timing;
@@ -30,8 +28,7 @@ public sealed partial class ConstructionSystem
         [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
         [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
         [Dependency] private readonly EntityLookupSystem _lookupSystem = default!;
-        [Dependency] private readonly StorageSystem _storageSystem = default!;
-        [Dependency] private readonly TagSystem _tagSystem = default!;
+        [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
 
         // --- WARNING! LEGACY CODE AHEAD! ---
         // This entire file contains the legacy code for initial construction.
@@ -466,7 +463,7 @@ void Cleanup()
                 return;
             }
 
-            var mapPos = location.ToMap(EntityManager);
+            var mapPos = location.ToMap(EntityManager, _transformSystem);
             var predicate = GetPredicate(constructionPrototype.CanBuildInImpassable, mapPos);
 
             if (!_interactionSystem.InRangeUnobstructed(user, mapPos, predicate: predicate))
diff --git a/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs b/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs
index 84f8ffc2e5..4290726cc4 100644
--- a/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs
+++ b/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs
@@ -12,6 +12,8 @@
 using Robust.Server.GameObjects;
 using Robust.Shared.Player;
 using System.Diagnostics.CodeAnalysis;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Security.Components;
 
 namespace Content.Server.CriminalRecords.Systems;
 
@@ -71,7 +73,8 @@ private void OnFiltersChanged(Entity<CriminalRecordsConsoleComponent> ent, ref S
     private void OnChangeStatus(Entity<CriminalRecordsConsoleComponent> ent, ref CriminalRecordChangeStatus msg)
     {
         // prevent malf client violating wanted/reason nullability
-        if ((msg.Status == SecurityStatus.Wanted) != (msg.Reason != null))
+        if (msg.Status == SecurityStatus.Wanted != (msg.Reason != null) &&
+            msg.Status == SecurityStatus.Suspected != (msg.Reason != null))
             return;
 
         if (!CheckSelected(ent, msg.Session, out var mob, out var key))
@@ -105,7 +108,7 @@ private void OnChangeStatus(Entity<CriminalRecordsConsoleComponent> ent, ref Cri
 
         var name = RecordName(key.Value);
         var officer = Loc.GetString("criminal-records-console-unknown-officer");
-        if (_idCard.TryFindIdCard(mob.Value, out var id) && id.Comp.FullName is {} fullName)
+        if (_idCard.TryFindIdCard(mob.Value, out var id) && id.Comp.FullName is { } fullName)
             officer = fullName;
 
         (string, object)[] args;
@@ -117,20 +120,32 @@ private void OnChangeStatus(Entity<CriminalRecordsConsoleComponent> ent, ref Cri
         // figure out which radio message to send depending on transition
         var statusString = (oldStatus, msg.Status) switch
         {
-            // going from wanted or detained on the spot
+            // person has been detained
             (_, SecurityStatus.Detained) => "detained",
+            // person did something sus
+            (_, SecurityStatus.Suspected) => "suspected",
+            // released on parole
+            (_, SecurityStatus.Paroled) => "paroled",
             // prisoner did their time
-            (SecurityStatus.Detained, SecurityStatus.None) => "released",
-            // going from wanted to none, must have been a mistake
-            (_, SecurityStatus.None) => "not-wanted",
-            // going from none or detained, AOS or prisonbreak / lazy secoff never set them to released and they reoffended
+            (_, SecurityStatus.Discharged) => "released",
+            // going from any other state to wanted, AOS or prisonbreak / lazy secoff never set them to released and they reoffended
             (_, SecurityStatus.Wanted) => "wanted",
+            // person is no longer sus
+            (SecurityStatus.Suspected, SecurityStatus.None) => "not-suspected",
+            // going from wanted to none, must have been a mistake
+            (SecurityStatus.Wanted, SecurityStatus.None) => "not-wanted",
+            // criminal status removed
+            (SecurityStatus.Detained, SecurityStatus.None) => "released",
+            // criminal is no longer on parole
+            (SecurityStatus.Paroled, SecurityStatus.None) => "not-parole",
             // this is impossible
             _ => "not-wanted"
         };
-        _radio.SendRadioMessage(ent, Loc.GetString($"criminal-records-console-{statusString}", args), ent.Comp.SecurityChannel, ent);
+        _radio.SendRadioMessage(ent, Loc.GetString($"criminal-records-console-{statusString}", args),
+            ent.Comp.SecurityChannel, ent);
 
         UpdateUserInterface(ent);
+        UpdateCriminalIdentity(name, msg.Status);
     }
 
     private void OnAddHistory(Entity<CriminalRecordsConsoleComponent> ent, ref CriminalRecordAddHistory msg)
@@ -177,7 +192,7 @@ private void UpdateUserInterface(Entity<CriminalRecordsConsoleComponent> ent)
         var listing = _stationRecords.BuildListing((owningStation.Value, stationRecords), console.Filter);
 
         var state = new CriminalRecordsConsoleState(listing, console.Filter);
-        if (console.ActiveKey is {} id)
+        if (console.ActiveKey is { } id)
         {
             // get records to display when a crewmember is selected
             var key = new StationRecordKey(id, owningStation.Value);
@@ -198,7 +213,7 @@ private bool CheckSelected(Entity<CriminalRecordsConsoleComponent> ent, ICommonS
     {
         key = null;
         mob = null;
-        if (session.AttachedEntity is not {} user)
+        if (session.AttachedEntity is not { } user)
             return false;
 
         if (!_access.IsAllowed(user, ent))
@@ -207,11 +222,11 @@ private bool CheckSelected(Entity<CriminalRecordsConsoleComponent> ent, ICommonS
             return false;
         }
 
-        if (ent.Comp.ActiveKey is not {} id)
+        if (ent.Comp.ActiveKey is not { } id)
             return false;
 
         // checking the console's station since the user might be off-grid using on-grid console
-        if (_station.GetOwningStation(ent) is not {} station)
+        if (_station.GetOwningStation(ent) is not { } station)
             return false;
 
         key = new StationRecordKey(id, station);
@@ -229,4 +244,29 @@ private string RecordName(StationRecordKey key)
 
         return record.Name;
     }
+
+    /// <summary>
+    /// Checks if the new identity's name has a criminal record attached to it, and gives the entity the icon that
+    /// belongs to the status if it does.
+    /// </summary>
+    public void CheckNewIdentity(EntityUid uid)
+    {
+        var name = Identity.Name(uid, EntityManager);
+        var xform = Transform(uid);
+        var station = _station.GetStationInMap(xform.MapID);
+
+        if (station != null && _stationRecords.GetRecordByName(station.Value, name) is { } id)
+        {
+            if (_stationRecords.TryGetRecord<CriminalRecord>(new StationRecordKey(id, station.Value),
+                    out var record))
+            {
+                if (record.Status != SecurityStatus.None)
+                {
+                    SetCriminalIcon(name, record.Status, uid);
+                    return;
+                }
+            }
+        }
+        RemComp<CriminalRecordComponent>(uid);
+    }
 }
diff --git a/Content.Server/Database/DatabaseRecords.cs b/Content.Server/Database/DatabaseRecords.cs
index af740a4d74..460a6c8222 100644
--- a/Content.Server/Database/DatabaseRecords.cs
+++ b/Content.Server/Database/DatabaseRecords.cs
@@ -111,7 +111,8 @@ public sealed record AdminMessageRecord(
     bool Deleted,
     PlayerRecord? DeletedBy,
     DateTimeOffset? DeletedAt,
-    bool Seen) : IAdminRemarksRecord;
+    bool Seen,
+    bool Dismissed) : IAdminRemarksRecord;
 
 
 public sealed record PlayerRecord(
diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index ed22c66360..7c9ffe29e8 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -40,6 +40,7 @@ public ServerDbBase(ISawmill opsLog)
                 .Include(p => p.Profiles).ThenInclude(h => h.Jobs)
                 .Include(p => p.Profiles).ThenInclude(h => h.Antags)
                 .Include(p => p.Profiles).ThenInclude(h => h.Traits)
+                .Include(p => p.Profiles).ThenInclude(h => h.Loadouts)
                 .AsSingleQuery()
                 .SingleOrDefaultAsync(p => p.UserId == userId.UserId);
 
@@ -88,6 +89,7 @@ public async Task SaveCharacterSlotAsync(NetUserId userId, ICharacterProfile? pr
                 .Include(p => p.Jobs)
                 .Include(p => p.Antags)
                 .Include(p => p.Traits)
+                .Include(p => p.Loadouts)
                 .AsSplitQuery()
                 .SingleOrDefault(h => h.Slot == slot);
 
@@ -174,6 +176,7 @@ private static HumanoidCharacterProfile ConvertProfiles(Profile profile)
             var jobs = profile.Jobs.ToDictionary(j => j.JobName, j => (JobPriority) j.Priority);
             var antags = profile.Antags.Select(a => a.AntagName);
             var traits = profile.Traits.Select(t => t.TraitName);
+            var loadouts = profile.Loadouts.Select(t => t.LoadoutName);
 
             var sex = Sex.Male;
             if (Enum.TryParse<Sex>(profile.Sex, true, out var sexVal))
@@ -232,7 +235,8 @@ private static HumanoidCharacterProfile ConvertProfiles(Profile profile)
                 jobs,
                 (PreferenceUnavailableMode) profile.PreferenceUnavailable,
                 antags.ToList(),
-                traits.ToList()
+                traits.ToList(),
+                loadouts.ToList()
             );
         }
 
@@ -285,6 +289,12 @@ private static Profile ConvertProfiles(HumanoidCharacterProfile humanoid, int sl
                         .Select(t => new Trait {TraitName = t})
             );
 
+            profile.Loadouts.Clear();
+            profile.Loadouts.AddRange(
+                humanoid.LoadoutPreferences
+                    .Select(t => new Loadout {LoadoutName = t})
+            );
+
             return profile;
         }
         #endregion
@@ -1143,7 +1153,8 @@ private AdminMessageRecord MakeAdminMessageRecord(AdminMessage entity)
                 entity.Deleted,
                 MakePlayerRecord(entity.DeletedBy),
                 NormalizeDatabaseTime(entity.DeletedAt),
-                entity.Seen);
+                entity.Seen,
+                entity.Dismissed);
         }
 
         public async Task<ServerBanNoteRecord?> GetServerBanAsNoteAsync(int id)
@@ -1368,6 +1379,8 @@ public async Task<List<IAdminRemarksRecord>> GetVisibleAdminRemarks(Guid player)
                     .Include(note => note.Player)
                     .ToListAsync()).Select(MakeAdminNoteRecord));
             notesCol.AddRange(await GetMessagesImpl(db, player));
+            notesCol.AddRange(await GetServerBansAsNotesForUser(db, player));
+            notesCol.AddRange(await GetGroupedServerRoleBansAsNotesForUser(db, player));
             return notesCol;
         }
 
@@ -1420,11 +1433,13 @@ protected async Task<List<AdminMessageRecord>> GetMessagesImpl(DbGuard db, Guid
             return entities.Select(MakeAdminMessageRecord).ToList();
         }
 
-        public async Task MarkMessageAsSeen(int id)
+        public async Task MarkMessageAsSeen(int id, bool dismissedToo)
         {
             await using var db = await GetDb();
             var message = await db.DbContext.AdminMessages.SingleAsync(m => m.Id == id);
             message.Seen = true;
+            if (dismissedToo)
+                message.Dismissed = true;
             await db.DbContext.SaveChangesAsync();
         }
 
diff --git a/Content.Server/Database/ServerDbManager.cs b/Content.Server/Database/ServerDbManager.cs
index 5fda2a7e10..554dd30743 100644
--- a/Content.Server/Database/ServerDbManager.cs
+++ b/Content.Server/Database/ServerDbManager.cs
@@ -274,7 +274,15 @@ Task<int> AddConnectionLogAsync(
         Task DeleteAdminMessage(int id, Guid deletedBy, DateTimeOffset deletedAt);
         Task HideServerBanFromNotes(int id, Guid deletedBy, DateTimeOffset deletedAt);
         Task HideServerRoleBanFromNotes(int id, Guid deletedBy, DateTimeOffset deletedAt);
-        Task MarkMessageAsSeen(int id);
+
+        /// <summary>
+        /// Mark an admin message as being seen by the target player.
+        /// </summary>
+        /// <param name="id">The database ID of the admin message.</param>
+        /// <param name="dismissedToo">
+        /// If true, the message is "permanently dismissed" and will not be shown to the player again when they join.
+        /// </param>
+        Task MarkMessageAsSeen(int id, bool dismissedToo);
 
         #endregion
     }
@@ -847,10 +855,10 @@ public Task HideServerRoleBanFromNotes(int id, Guid deletedBy, DateTimeOffset de
             return RunDbCommand(() => _db.HideServerRoleBanFromNotes(id, deletedBy, deletedAt));
         }
 
-        public Task MarkMessageAsSeen(int id)
+        public Task MarkMessageAsSeen(int id, bool dismissedToo)
         {
             DbWriteOpsMetric.Inc();
-            return RunDbCommand(() => _db.MarkMessageAsSeen(id));
+            return RunDbCommand(() => _db.MarkMessageAsSeen(id, dismissedToo));
         }
 
         // Wrapper functions to run DB commands from the thread pool.
diff --git a/Content.Server/DeviceNetwork/Systems/DeviceListSystem.cs b/Content.Server/DeviceNetwork/Systems/DeviceListSystem.cs
index 978dbc0ed9..a8d40882c4 100644
--- a/Content.Server/DeviceNetwork/Systems/DeviceListSystem.cs
+++ b/Content.Server/DeviceNetwork/Systems/DeviceListSystem.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Server.DeviceNetwork.Components;
 using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Components;
@@ -12,8 +12,6 @@ namespace Content.Server.DeviceNetwork.Systems;
 [UsedImplicitly]
 public sealed class DeviceListSystem : SharedDeviceListSystem
 {
-    private ISawmill _sawmill = default!;
-
     [Dependency] private readonly NetworkConfiguratorSystem _configurator = default!;
 
     public override void Initialize()
@@ -23,7 +21,6 @@ public override void Initialize()
         SubscribeLocalEvent<DeviceListComponent, BeforeBroadcastAttemptEvent>(OnBeforeBroadcast);
         SubscribeLocalEvent<DeviceListComponent, BeforePacketSentEvent>(OnBeforePacketSent);
         SubscribeLocalEvent<BeforeSaveEvent>(OnMapSave);
-        _sawmill = Logger.GetSawmill("devicelist");
     }
 
     private void OnShutdown(EntityUid uid, DeviceListComponent component, ComponentShutdown args)
@@ -154,7 +151,7 @@ private void OnMapSave(BeforeSaveEvent ev)
                 // TODO full game saves.
                 // when full saves are supported, this should instead add data to the BeforeSaveEvent informing the
                 // saving system that this map (or null-space entity) also needs to be included in the save.
-                _sawmill.Error(
+                Log.Error(
                     $"Saving a device list ({ToPrettyString(uid)}) that has a reference to an entity on another map ({ToPrettyString(ent)}). Removing entity from list.");
             }
 
diff --git a/Content.Server/DeviceNetwork/Systems/DeviceNetworkJammerSystem.cs b/Content.Server/DeviceNetwork/Systems/DeviceNetworkJammerSystem.cs
new file mode 100644
index 0000000000..3d3820562d
--- /dev/null
+++ b/Content.Server/DeviceNetwork/Systems/DeviceNetworkJammerSystem.cs
@@ -0,0 +1,38 @@
+using Content.Server.DeviceNetwork.Components;
+using Content.Shared.DeviceNetwork.Components;
+using Robust.Server.GameObjects;
+
+namespace Content.Server.DeviceNetwork.Systems;
+
+public sealed class DeviceNetworkJammerSystem : EntitySystem
+{
+    [Dependency] private TransformSystem _transform = default!;
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TransformComponent, BeforePacketSentEvent>(BeforePacketSent);
+    }
+
+    private void BeforePacketSent(EntityUid uid, TransformComponent xform, BeforePacketSentEvent ev)
+    {
+        if (ev.Cancelled)
+            return;
+
+        var query = EntityQueryEnumerator<DeviceNetworkJammerComponent, TransformComponent>();
+
+        while (query.MoveNext(out _, out var jammerComp, out var jammerXform))
+        {
+            if (!jammerComp.JammableNetworks.Contains(ev.NetworkId))
+                continue;
+
+            if (jammerXform.Coordinates.InRange(EntityManager, _transform, ev.SenderTransform.Coordinates, jammerComp.Range)
+                || jammerXform.Coordinates.InRange(EntityManager, _transform, xform.Coordinates, jammerComp.Range))
+            {
+                ev.Cancel();
+                return;
+            }
+        }
+    }
+
+}
diff --git a/Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs b/Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs
index 83967c9bbd..20ee7a5dd1 100644
--- a/Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs
+++ b/Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs
@@ -351,13 +351,14 @@ private void SendToConnections(ReadOnlySpan<DeviceNetworkComponent> connections,
 
             var xform = Transform(packet.Sender);
 
-            BeforePacketSentEvent beforeEv = new(packet.Sender, xform, _transformSystem.GetWorldPosition(xform));
+            var senderPos = _transformSystem.GetWorldPosition(xform);
 
             foreach (var connection in connections)
             {
                 if (connection.Owner == packet.Sender)
                     continue;
 
+                BeforePacketSentEvent beforeEv = new(packet.Sender, xform, senderPos, connection.NetIdEnum.ToString());
                 RaiseLocalEvent(connection.Owner, beforeEv, false);
 
                 if (!beforeEv.Cancelled)
@@ -386,11 +387,17 @@ public sealed class BeforePacketSentEvent : CancellableEntityEventArgs
         /// </summary>
         public readonly Vector2 SenderPosition;
 
-        public BeforePacketSentEvent(EntityUid sender, TransformComponent xform, Vector2 senderPosition)
+        /// <summary>
+        /// The network the packet will be sent to.
+        /// </summary>
+        public readonly string NetworkId;
+
+        public BeforePacketSentEvent(EntityUid sender, TransformComponent xform, Vector2 senderPosition, string networkId)
         {
             Sender = sender;
             SenderTransform = xform;
             SenderPosition = senderPosition;
+            NetworkId = networkId;
         }
     }
 
diff --git a/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs b/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs
index fd62514d00..cdc083feac 100644
--- a/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs
+++ b/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs
@@ -1,4 +1,5 @@
-using Content.Server.DeviceNetwork.Components;
+using System.Diagnostics.CodeAnalysis;
+using Content.Server.DeviceNetwork.Components;
 using Content.Server.Medical.CrewMonitoring;
 using Content.Server.Power.Components;
 using Content.Server.Station.Systems;
@@ -38,7 +39,7 @@ public bool IsActiveServer(EntityUid serverId, SingletonDeviceNetServerComponent
     /// <param name="address">The address of the active server if it exists</param>
     /// <typeparam name="TComp">The component type that determines what type of server you're getting the address of</typeparam>
     /// <returns>True if there is an active serve. False otherwise</returns>
-    public bool TryGetActiveServerAddress<TComp>(EntityUid stationId, out string? address) where TComp : IComponent
+    public bool TryGetActiveServerAddress<TComp>(EntityUid stationId, [NotNullWhen(true)] out string? address) where TComp : IComponent
     {
         var servers = EntityQueryEnumerator<
             SingletonDeviceNetServerComponent,
diff --git a/Content.Server/DiscordAuth/DiscordAuthManager.cs b/Content.Server/DiscordAuth/DiscordAuthManager.cs
new file mode 100644
index 0000000000..5228fdf25d
--- /dev/null
+++ b/Content.Server/DiscordAuth/DiscordAuthManager.cs
@@ -0,0 +1,129 @@
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Content.Shared.CCVar;
+using Content.Shared.DiscordAuth;
+using JetBrains.Annotations;
+using Robust.Server.Player;
+using Robust.Shared.Configuration;
+using Robust.Shared.Enums;
+using Robust.Shared.Network;
+using Robust.Shared.Player;
+
+namespace Content.Server.DiscordAuth;
+
+// TODO: Add minimal Discord account age check for panic bunker by extracting timestamp from snowflake received from API secured with key
+
+/// <summary>
+///     Manage Discord linking with SS14 account through external API
+/// </summary>
+public sealed class DiscordAuthManager
+{
+    [Dependency] private readonly IServerNetManager _net = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IConfigurationManager _configuration = default!;
+
+
+    private ISawmill _sawmill = default!;
+    private readonly HttpClient _httpClient = new();
+    private bool _isEnabled = false;
+    private string _apiUrl = string.Empty;
+    private string _apiKey = string.Empty;
+
+    /// <summary>
+    ///     Raised when player passed verification or if feature disabled
+    /// </summary>
+    public event EventHandler<ICommonSession>? PlayerVerified;
+
+
+    public void Initialize()
+    {
+        _sawmill = Logger.GetSawmill("discord_auth");
+
+        _configuration.OnValueChanged(CCVars.DiscordAuthEnabled, v => _isEnabled = v, true);
+        _configuration.OnValueChanged(CCVars.DiscordAuthApiUrl, v => _apiUrl = v, true);
+        _configuration.OnValueChanged(CCVars.DiscordAuthApiKey, v => _apiKey = v, true);
+
+        _net.RegisterNetMessage<DiscordAuthRequiredMessage>();
+        _net.RegisterNetMessage<DiscordAuthCheckMessage>(OnAuthCheck);
+
+        _player.PlayerStatusChanged += OnPlayerStatusChanged;
+    }
+
+
+    private async void OnAuthCheck(DiscordAuthCheckMessage message)
+    {
+        var isVerified = await IsVerified(message.MsgChannel.UserId);
+        if (isVerified)
+        {
+            var session = _player.GetSessionById(message.MsgChannel.UserId);
+
+            PlayerVerified?.Invoke(this, session);
+        }
+    }
+
+    private async void OnPlayerStatusChanged(object? sender, SessionStatusEventArgs e)
+    {
+        if (e.NewStatus != SessionStatus.Connected)
+            return;
+
+        if (!_isEnabled)
+        {
+            PlayerVerified?.Invoke(this, e.Session);
+            return;
+        }
+
+        if (e.NewStatus == SessionStatus.Connected)
+        {
+            var isVerified = await IsVerified(e.Session.UserId);
+            if (isVerified)
+            {
+                PlayerVerified?.Invoke(this, e.Session);
+                return;
+            }
+
+            var authUrl = await GenerateAuthLink(e.Session.UserId);
+            var msg = new DiscordAuthRequiredMessage { AuthUrl = authUrl };
+            e.Session.Channel.SendMessage(msg);
+        }
+    }
+
+
+    public async Task<string> GenerateAuthLink(NetUserId userId, CancellationToken cancel = default)
+    {
+        _sawmill.Info($"Player {userId} requested generation Discord verification link");
+
+        var requestUrl = $"{_apiUrl}/{WebUtility.UrlEncode(userId.ToString())}?key={_apiKey}";
+        var response = await _httpClient.PostAsync(requestUrl, null, cancel);
+        if (!response.IsSuccessStatusCode)
+        {
+            var content = await response.Content.ReadAsStringAsync();
+            throw new Exception($"Verification API returned bad status code: {response.StatusCode}\nResponse: {content}");
+        }
+
+        var data = await response.Content.ReadFromJsonAsync<DiscordGenerateLinkResponse>(cancellationToken: cancel);
+        return data!.Url;
+    }
+
+    public async Task<bool> IsVerified(NetUserId userId, CancellationToken cancel = default)
+    {
+        _sawmill.Debug($"Player {userId} check Discord verification");
+
+        var requestUrl = $"{_apiUrl}/{WebUtility.UrlEncode(userId.ToString())}";
+        var response = await _httpClient.GetAsync(requestUrl, cancel);
+        if (!response.IsSuccessStatusCode)
+        {
+            var content = await response.Content.ReadAsStringAsync();
+            throw new Exception($"Verification API returned bad status code: {response.StatusCode}\nResponse: {content}");
+        }
+
+        var data = await response.Content.ReadFromJsonAsync<DiscordAuthInfoResponse>(cancellationToken: cancel);
+        return data!.IsLinked;
+    }
+
+
+    [UsedImplicitly] private sealed record DiscordGenerateLinkResponse(string Url);
+    [UsedImplicitly] private sealed record DiscordAuthInfoResponse(bool IsLinked);
+}
diff --git a/Content.Server/Disposal/Tube/DisposalTubeSystem.cs b/Content.Server/Disposal/Tube/DisposalTubeSystem.cs
index b7d8455d85..20aa8b6d2c 100644
--- a/Content.Server/Disposal/Tube/DisposalTubeSystem.cs
+++ b/Content.Server/Disposal/Tube/DisposalTubeSystem.cs
@@ -122,7 +122,7 @@ private void OnUiAction(EntityUid uid, DisposalRouterComponent router, SharedDis
                     if (trimmed == "")
                         continue;
 
-                    router.Tags.Add(tag.Trim());
+                    router.Tags.Add(trimmed);
                 }
 
                 _audioSystem.PlayPvs(router.ClickSound, uid, AudioParams.Default.WithVolume(-2f));
diff --git a/Content.Server/Dragon/DragonSystem.cs b/Content.Server/Dragon/DragonSystem.cs
index 93d6bc8db0..6400472d03 100644
--- a/Content.Server/Dragon/DragonSystem.cs
+++ b/Content.Server/Dragon/DragonSystem.cs
@@ -28,6 +28,7 @@ public sealed partial class DragonSystem : EntitySystem
     [Dependency] private readonly RoleSystem _role = default!;
     [Dependency] private readonly SharedActionsSystem _actions = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
 
     private EntityQuery<CarpRiftsConditionComponent> _objQuery;
 
@@ -146,7 +147,7 @@ private void OnSpawnRift(EntityUid uid, DragonComponent component, DragonSpawnRi
         // cant stack rifts near eachother
         foreach (var (_, riftXform) in EntityQuery<DragonRiftComponent, TransformComponent>(true))
         {
-            if (riftXform.Coordinates.InRange(EntityManager, xform.Coordinates, RiftRange))
+            if (riftXform.Coordinates.InRange(EntityManager, _transform, xform.Coordinates, RiftRange))
             {
                 _popup.PopupEntity(Loc.GetString("carp-rift-proximity", ("proximity", RiftRange)), uid, uid);
                 return;
diff --git a/Content.Server/Entry/EntryPoint.cs b/Content.Server/Entry/EntryPoint.cs
index bf7f3ea84a..28687d17cd 100644
--- a/Content.Server/Entry/EntryPoint.cs
+++ b/Content.Server/Entry/EntryPoint.cs
@@ -5,6 +5,8 @@
 using Content.Server.Afk;
 using Content.Server.Chat.Managers;
 using Content.Server.Connection;
+using Content.Server.DiscordAuth;
+using Content.Server.JoinQueue;
 using Content.Server.Database;
 using Content.Server.EUI;
 using Content.Server.GameTicking;
@@ -102,6 +104,8 @@ public override void Init()
                 IoCManager.Resolve<ContentNetworkResourceManager>().Initialize();
                 IoCManager.Resolve<GhostKickManager>().Initialize();
                 IoCManager.Resolve<ServerInfoManager>().Initialize();
+                IoCManager.Resolve<JoinQueueManager>().Initialize();
+                IoCManager.Resolve<DiscordAuthManager>().Initialize();
 
                 _voteManager.Initialize();
                 _updateManager.Initialize();
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
index 2bfc753b74..4a9477e744 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
@@ -156,7 +156,7 @@ public override void Update(float frameTime)
 #endif
         }
 
-        Logger.InfoS("Explosion", $"Processed {TilesPerTick - tilesRemaining} tiles in {Stopwatch.Elapsed.TotalMilliseconds}ms");
+        Log.Info($"Processed {TilesPerTick - tilesRemaining} tiles in {Stopwatch.Elapsed.TotalMilliseconds}ms");
 
         // we have finished processing our tiles. Is there still an ongoing explosion?
         if (_activeExplosion != null)
@@ -475,7 +475,7 @@ public void DamageFloorTile(TileRef tileRef,
         if (_tileDefinitionManager[tileRef.Tile.TypeId] is not ContentTileDefinition tileDef)
             return;
 
-        if (tileDef.IsSpace)
+        if (tileDef.MapAtmosphere)
             canCreateVacuum = true; // is already a vacuum.
 
         int tileBreakages = 0;
@@ -491,7 +491,7 @@ public void DamageFloorTile(TileRef tileRef,
             if (_tileDefinitionManager[tileDef.BaseTurf] is not ContentTileDefinition newDef)
                 break;
 
-            if (newDef.IsSpace && !canCreateVacuum)
+            if (newDef.MapAtmosphere && !canCreateVacuum)
                 break;
 
             tileDef = newDef;
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs
index 1b324d924b..afad0e27e0 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs
@@ -37,7 +37,7 @@ public sealed partial class ExplosionSystem : EntitySystem
 
         if (!_explosionTypes.TryGetValue(typeID, out var typeIndex))
         {
-            Logger.Error("Attempted to spawn explosion using a prototype that was not defined during initialization. Explosion prototype hot-reload is not currently supported.");
+            Log.Error("Attempted to spawn explosion using a prototype that was not defined during initialization. Explosion prototype hot-reload is not currently supported.");
             return null;
         }
 
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
index 7495ecbb34..6351d999a9 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
@@ -290,7 +290,7 @@ public void QueueExplosion(MapCoordinates epicenter,
 
         if (!_prototypeManager.TryIndex<ExplosionPrototype>(typeId, out var type))
         {
-            Logger.Error($"Attempted to spawn unknown explosion prototype: {type}");
+            Log.Error($"Attempted to spawn unknown explosion prototype: {type}");
             return;
         }
 
@@ -331,7 +331,7 @@ public void QueueExplosion(MapCoordinates epicenter,
         CameraShake(iterationIntensity.Count * 4f, epicenter, totalIntensity);
 
         //For whatever bloody reason, sound system requires ENTITY coordinates.
-        var mapEntityCoords = EntityCoordinates.FromMap(EntityManager, _mapManager.GetMapEntityId(epicenter.MapId), epicenter);
+        var mapEntityCoords = EntityCoordinates.FromMap(_mapManager.GetMapEntityId(epicenter.MapId), epicenter, _transformSystem, EntityManager);
 
         // play sound.
         // for the normal audio, we want everyone in pvs range
diff --git a/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs b/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs
index c0775947ba..17ca972356 100644
--- a/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs
@@ -37,7 +37,7 @@ private void OnTrigger(EntityUid uid, SmokeOnTriggerComponent comp, TriggerEvent
         var ent = Spawn(comp.SmokePrototype, coords.SnapToGrid());
         if (!TryComp<SmokeComponent>(ent, out var smoke))
         {
-            Logger.Error($"Smoke prototype {comp.SmokePrototype} was missing SmokeComponent");
+            Log.Error($"Smoke prototype {comp.SmokePrototype} was missing SmokeComponent");
             Del(ent);
             return;
         }
diff --git a/Content.Server/Fax/FaxSystem.cs b/Content.Server/Fax/FaxSystem.cs
index 265a20ce1c..3ff139466f 100644
--- a/Content.Server/Fax/FaxSystem.cs
+++ b/Content.Server/Fax/FaxSystem.cs
@@ -313,7 +313,7 @@ private void OnFileButtonPressed(EntityUid uid, FaxMachineComponent component, F
 
     private void OnCopyButtonPressed(EntityUid uid, FaxMachineComponent component, FaxCopyMessage args)
     {
-        Copy(uid, component);
+        Copy(uid, component, args);
     }
 
     private void OnSendButtonPressed(EntityUid uid, FaxMachineComponent component, FaxSendMessage args)
@@ -416,13 +416,20 @@ public void PrintFile(EntityUid uid, FaxMachineComponent component, FaxFileMessa
         component.SendTimeoutRemaining += component.SendTimeout;
 
         UpdateUserInterface(uid, component);
+
+        if (args.Session.AttachedEntity != null)
+            _adminLogger.Add(LogType.Action, LogImpact.Low,
+                $"{ToPrettyString(args.Session.AttachedEntity.Value):actor} added print job to {ToPrettyString(uid):tool} with text: {args.Content}");
+        else
+            _adminLogger.Add(LogType.Action, LogImpact.Low,
+                $"Someone added print job to {ToPrettyString(uid):tool} with text: {args.Content}");
     }
 
     /// <summary>
     ///     Copies the paper in the fax. A timeout is set after copying,
     ///     which is shared by the send button.
     /// </summary>
-    public void Copy(EntityUid uid, FaxMachineComponent? component = null)
+    public void Copy(EntityUid uid, FaxMachineComponent? component, FaxCopyMessage args)
     {
         if (!Resolve(uid, ref component))
             return;
@@ -449,6 +456,10 @@ public void Copy(EntityUid uid, FaxMachineComponent? component = null)
         // will start immediately.
 
         UpdateUserInterface(uid, component);
+
+        if (args.Session.AttachedEntity != null)
+            _adminLogger.Add(LogType.Action, LogImpact.Low,
+                $"{ToPrettyString(args.Session.AttachedEntity.Value):actor} added copy job to {ToPrettyString(uid):tool} with text: {ToPrettyString(component.PaperSlot.Item):subject}");
     }
 
     /// <summary>
diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
index c03e6f593c..e3481f98da 100644
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
@@ -54,7 +54,7 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
     [Dependency] private readonly SharedPopupSystem _popups = default!;
     [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
     [Dependency] private readonly StepTriggerSystem _stepTrigger = default!;
-    [Dependency] private readonly SlowContactsSystem _slowContacts = default!;
+    [Dependency] private readonly SpeedModifierContactsSystem _speedModContacts = default!;
     [Dependency] private readonly TileFrictionController _tile = default!;
 
     [ValidatePrototypeId<ReagentPrototype>]
@@ -435,13 +435,13 @@ private void UpdateSlow(EntityUid uid, Solution solution)
 
         if (maxViscosity > 0)
         {
-            var comp = EnsureComp<SlowContactsComponent>(uid);
+            var comp = EnsureComp<SpeedModifierContactsComponent>(uid);
             var speed = 1 - maxViscosity;
-            _slowContacts.ChangeModifiers(uid, speed, comp);
+            _speedModContacts.ChangeModifiers(uid, speed, comp);
         }
         else
         {
-            RemComp<SlowContactsComponent>(uid);
+            RemComp<SpeedModifierContactsComponent>(uid);
         }
     }
 
diff --git a/Content.Server/Forensics/Systems/ForensicScannerSystem.cs b/Content.Server/Forensics/Systems/ForensicScannerSystem.cs
index be44f9e203..0d3168fd4e 100644
--- a/Content.Server/Forensics/Systems/ForensicScannerSystem.cs
+++ b/Content.Server/Forensics/Systems/ForensicScannerSystem.cs
@@ -28,14 +28,10 @@ public sealed class ForensicScannerSystem : EntitySystem
         [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
         [Dependency] private readonly MetaDataSystem _metaData = default!;
 
-        private ISawmill _sawmill = default!;
-
         public override void Initialize()
         {
             base.Initialize();
 
-            _sawmill = Logger.GetSawmill("forensics.scanner");
-
             SubscribeLocalEvent<ForensicScannerComponent, AfterInteractEvent>(OnAfterInteract);
             SubscribeLocalEvent<ForensicScannerComponent, AfterInteractUsingEvent>(OnAfterInteractUsing);
             SubscribeLocalEvent<ForensicScannerComponent, BeforeActivatableUIOpenEvent>(OnBeforeActivatableUIOpen);
@@ -57,7 +53,7 @@ private void UpdateUserInterface(EntityUid uid, ForensicScannerComponent compone
                 component.PrintReadyAt);
 
             if (!_uiSystem.TrySetUiState(uid, ForensicScannerUiKey.Key, state))
-                _sawmill.Warning($"{ToPrettyString(uid)} was unable to set UI state.");
+                Log.Warning($"{ToPrettyString(uid)} was unable to set UI state.");
         }
 
         private void OnDoAfter(EntityUid uid, ForensicScannerComponent component, DoAfterEvent args)
@@ -180,7 +176,7 @@ private void OnPrint(EntityUid uid, ForensicScannerComponent component, Forensic
         {
             if (!args.Session.AttachedEntity.HasValue)
             {
-                _sawmill.Warning($"{ToPrettyString(uid)} got OnPrint without Session.AttachedEntity");
+                Log.Warning($"{ToPrettyString(uid)} got OnPrint without Session.AttachedEntity");
                 return;
             }
 
@@ -200,7 +196,7 @@ private void OnPrint(EntityUid uid, ForensicScannerComponent component, Forensic
 
             if (!HasComp<PaperComponent>(printed))
             {
-                _sawmill.Error("Printed paper did not have PaperComponent.");
+                Log.Error("Printed paper did not have PaperComponent.");
                 return;
             }
 
diff --git a/Content.Server/GameTicking/GameTicker.Player.cs b/Content.Server/GameTicking/GameTicker.Player.cs
index f3d8adafb1..be52137d4f 100644
--- a/Content.Server/GameTicking/GameTicker.Player.cs
+++ b/Content.Server/GameTicking/GameTicker.Player.cs
@@ -1,10 +1,13 @@
 using Content.Server.Database;
+using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
 using Content.Shared.GameWindow;
 using Content.Shared.Players;
 using Content.Shared.Preferences;
 using JetBrains.Annotations;
 using Robust.Server.Player;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
 using Robust.Shared.Enums;
 using Robust.Shared.Player;
 using Robust.Shared.Timing;
@@ -17,6 +20,7 @@ public sealed partial class GameTicker
     {
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IServerDbManager _dbManager = default!;
+        [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
 
         private void InitializePlayer()
         {
@@ -55,10 +59,6 @@ private async void PlayerStatusChanged(object? sender, SessionStatusEventArgs ar
                         session.Data.ContentDataUncast = data;
                     }
 
-                    // Make the player actually join the game.
-                    // timer time must be > tick length
-                    Timer.Spawn(0, () => _playerManager.JoinGame(args.Session));
-
                     var record = await _dbManager.GetPlayerRecordByUserId(args.Session.UserId);
                     var firstConnection = record != null &&
                                           Math.Abs((record.FirstSeenTime - record.LastSeenTime).TotalMinutes) < 1;
@@ -69,6 +69,11 @@ private async void PlayerStatusChanged(object? sender, SessionStatusEventArgs ar
 
                     RaiseNetworkEvent(GetConnectionStatusMsg(), session.Channel);
 
+                    if (firstConnection && _configurationManager.GetCVar(CCVars.AdminNewPlayerJoinSound))
+                        _audioSystem.PlayGlobal(new SoundPathSpecifier("/Audio/Effects/newplayerping.ogg"),
+                            Filter.Empty().AddPlayers(_adminManager.ActiveAdmins), false,
+                            audioParams: new AudioParams { Volume = -5f });
+
                     if (LobbyEnabled && _roundStartCountdownHasNotStartedYetDueToNoPlayers)
                     {
                         _roundStartCountdownHasNotStartedYetDueToNoPlayers = false;
@@ -127,7 +132,8 @@ private async void PlayerStatusChanged(object? sender, SessionStatusEventArgs ar
                         mind.Session = null;
                     }
 
-                    _userDb.ClientDisconnected(session);
+                    if (_playerGameStatuses.ContainsKey(session.UserId))
+                        _userDb.ClientDisconnected(session);
                     break;
                 }
             }
diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs
index 52b59703e3..bf69b4b909 100644
--- a/Content.Server/GameTicking/GameTicker.Spawning.cs
+++ b/Content.Server/GameTicking/GameTicker.Spawning.cs
@@ -346,6 +346,7 @@ public void SpawnObserver(ICommonSession player)
             _metaData.SetEntityName(ghost, name);
             _ghost.SetCanReturnToBody(ghost, false);
             _mind.TransferTo(mind.Value, ghost);
+            _adminLogger.Add(LogType.LateJoin, LogImpact.Low, $"{player.Name} late joined the round as an Observer with {ToPrettyString(ghost):entity}.");
         }
 
         #region Mob Spawning Helpers
@@ -393,7 +394,7 @@ public EntityCoordinates GetObserverSpawnPoint()
                 // Ideally engine would just spawn them on grid directly I guess? Right now grid traversal is handling it during
                 // update which means we need to add a hack somewhere around it.
                 var spawn = _robustRandom.Pick(_possiblePositions);
-                var toMap = spawn.ToMap(EntityManager);
+                var toMap = spawn.ToMap(EntityManager, _transform);
 
                 if (_mapManager.TryFindGridAt(toMap, out var gridUid, out _))
                 {
diff --git a/Content.Server/GameTicking/GameTicker.StatusShell.cs b/Content.Server/GameTicking/GameTicker.StatusShell.cs
index fcf5b1c25c..53c9434599 100644
--- a/Content.Server/GameTicking/GameTicker.StatusShell.cs
+++ b/Content.Server/GameTicking/GameTicker.StatusShell.cs
@@ -1,4 +1,5 @@
 using System.Text.Json.Nodes;
+using Content.Server.JoinQueue;
 using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
 using Robust.Server.ServerStatus;
@@ -28,6 +29,8 @@ public sealed partial class GameTicker
         /// </summary>
         [Dependency] private readonly SharedGameTicker _gameTicker = default!;
 
+        [Dependency] private readonly JoinQueueManager _joinQueue = default!;
+
         private void InitializeStatusShell()
         {
             IoCManager.Resolve<IStatusHost>().OnStatusRequest += GetStatusResponse;
@@ -43,7 +46,7 @@ private void GetStatusResponse(JsonNode jObject)
                 jObject["name"] = _baseServer.ServerName;
                 jObject["map"] = _gameMapManager.GetSelectedMap()?.MapName;
                 jObject["round_id"] = _gameTicker.RoundId;
-                jObject["players"] = _playerManager.PlayerCount;
+                jObject["players"] = _joinQueue.ActualPlayersCount;
                 jObject["soft_max_players"] = _cfg.GetCVar(CCVars.SoftMaxPlayers);
                 jObject["panic_bunker"] = _cfg.GetCVar(CCVars.PanicBunkerEnabled);
                 jObject["run_level"] = (int) _runLevel;
diff --git a/Content.Server/GameTicking/Rules/PiratesRuleSystem.cs b/Content.Server/GameTicking/Rules/PiratesRuleSystem.cs
index f83d719c21..98926536b9 100644
--- a/Content.Server/GameTicking/Rules/PiratesRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/PiratesRuleSystem.cs
@@ -201,7 +201,7 @@ private void OnPlayerSpawningEvent(RulePlayerSpawningEvent ev)
 
             if (!gridId.HasValue)
             {
-                Logger.ErrorS("pirates", $"Gridid was null when loading \"{map}\", aborting.");
+                Log.Error($"Gridid was null when loading \"{map}\", aborting.");
                 foreach (var session in ops)
                 {
                     ev.PlayerPool.Add(session);
@@ -230,7 +230,7 @@ private void OnPlayerSpawningEvent(RulePlayerSpawningEvent ev)
             if (spawns.Count == 0)
             {
                 spawns.Add(Transform(pirates.PirateShip).Coordinates);
-                Logger.WarningS("pirates", $"Fell back to default spawn for pirates!");
+                Log.Warning($"Fell back to default spawn for pirates!");
             }
 
             for (var i = 0; i < ops.Length; i++)
diff --git a/Content.Server/Glue/GlueSystem.cs b/Content.Server/Glue/GlueSystem.cs
index 6bb6aca3ad..44ff4e5459 100644
--- a/Content.Server/Glue/GlueSystem.cs
+++ b/Content.Server/Glue/GlueSystem.cs
@@ -8,6 +8,7 @@
 using Content.Shared.Interaction.Components;
 using Content.Shared.Item;
 using Content.Shared.Popups;
+using Content.Shared.Verbs;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Timing;
 
@@ -21,6 +22,7 @@ public sealed class GlueSystem : SharedGlueSystem
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly MetaDataSystem _metaData = default!;
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly OpenableSystem _openable = default!;
 
     public override void Initialize()
     {
@@ -28,6 +30,7 @@ public override void Initialize()
 
         SubscribeLocalEvent<GlueComponent, AfterInteractEvent>(OnInteract, after: new[] { typeof(OpenableSystem) });
         SubscribeLocalEvent<GluedComponent, ComponentInit>(OnGluedInit);
+        SubscribeLocalEvent<GlueComponent, GetVerbsEvent<UtilityVerb>>(OnUtilityVerb);
         SubscribeLocalEvent<GluedComponent, GotEquippedHandEvent>(OnHandPickUp);
     }
 
@@ -41,35 +44,50 @@ private void OnInteract(Entity<GlueComponent> entity, ref AfterInteractEvent arg
             return;
 
         if (TryGlue(entity, target, args.User))
-        {
             args.Handled = true;
-            _audio.PlayPvs(entity.Comp.Squeeze, entity);
-            _popup.PopupEntity(Loc.GetString("glue-success", ("target", target)), args.User, args.User, PopupType.Medium);
-        }
-        else
+    }
+
+    private void OnUtilityVerb(Entity<GlueComponent> entity, ref GetVerbsEvent<UtilityVerb> args)
+    {
+        if (!args.CanInteract || !args.CanAccess || args.Target is not { Valid: true } target ||
+        _openable.IsClosed(entity))
+            return;
+
+        var user = args.User;
+
+        var verb = new UtilityVerb()
         {
-            _popup.PopupEntity(Loc.GetString("glue-failure", ("target", target)), args.User, args.User, PopupType.Medium);
-        }
+            Act = () => TryGlue(entity, target, user),
+            IconEntity = GetNetEntity(entity),
+            Text = Loc.GetString("glue-verb-text"),
+            Message = Loc.GetString("glue-verb-message")
+        };
+
+        args.Verbs.Add(verb);
     }
 
-    private bool TryGlue(Entity<GlueComponent> glue, EntityUid target, EntityUid actor)
+    private bool TryGlue(Entity<GlueComponent> entity, EntityUid target, EntityUid actor)
     {
         // if item is glued then don't apply glue again so it can be removed for reasonable time
         if (HasComp<GluedComponent>(target) || !HasComp<ItemComponent>(target))
         {
+            _popup.PopupEntity(Loc.GetString("glue-failure", ("target", target)), actor, actor, PopupType.Medium);
             return false;
         }
 
-        if (HasComp<ItemComponent>(target) && _solutionContainer.TryGetSolution(glue.Owner, glue.Comp.Solution, out _, out var solution))
+        if (HasComp<ItemComponent>(target) && _solutionContainer.TryGetSolution(entity.Owner, entity.Comp.Solution, out _, out var solution))
         {
-            var quantity = solution.RemoveReagent(glue.Comp.Reagent, glue.Comp.ConsumptionUnit);
+            var quantity = solution.RemoveReagent(entity.Comp.Reagent, entity.Comp.ConsumptionUnit);
             if (quantity > 0)
             {
-                EnsureComp<GluedComponent>(target).Duration = quantity.Double() * glue.Comp.DurationPerUnit;
-                _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(actor):actor} glued {ToPrettyString(target):subject} with {ToPrettyString(glue.Owner):tool}");
+                EnsureComp<GluedComponent>(target).Duration = quantity.Double() * entity.Comp.DurationPerUnit;
+                _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);
                 return true;
             }
         }
+        _popup.PopupEntity(Loc.GetString("glue-failure", ("target", target)), actor, actor, PopupType.Medium);
         return false;
     }
 
diff --git a/Content.Server/Guardian/GuardianSystem.cs b/Content.Server/Guardian/GuardianSystem.cs
index 627c336a36..d3a717c74a 100644
--- a/Content.Server/Guardian/GuardianSystem.cs
+++ b/Content.Server/Guardian/GuardianSystem.cs
@@ -34,6 +34,7 @@ public sealed class GuardianSystem : EntitySystem
         [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly BodySystem _bodySystem = default!;
         [Dependency] private readonly SharedContainerSystem _container = default!;
+        [Dependency] private readonly SharedTransformSystem _transform = default!;
 
         public override void Initialize()
         {
@@ -328,7 +329,7 @@ private void CheckGuardianMove(
             if (!guardianComponent.GuardianLoose)
                 return;
 
-            if (!guardianXform.Coordinates.InRange(EntityManager, hostXform.Coordinates, guardianComponent.DistanceAllowed))
+            if (!guardianXform.Coordinates.InRange(EntityManager, _transform, hostXform.Coordinates, guardianComponent.DistanceAllowed))
                 RetractGuardian(hostUid, hostComponent, guardianUid, guardianComponent);
         }
 
diff --git a/Content.Server/Hands/Systems/HandsSystem.cs b/Content.Server/Hands/Systems/HandsSystem.cs
index a783a9e096..a0e872dbeb 100644
--- a/Content.Server/Hands/Systems/HandsSystem.cs
+++ b/Content.Server/Hands/Systems/HandsSystem.cs
@@ -31,6 +31,7 @@ public sealed class HandsSystem : SharedHandsSystem
         [Dependency] private readonly VirtualItemSystem _virtualItemSystem = default!;
         [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
         [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
+        [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
         [Dependency] private readonly PullingSystem _pullingSystem = default!;
         [Dependency] private readonly ThrowingSystem _throwingSystem = default!;
 
@@ -191,7 +192,7 @@ hands.ActiveHandEntity is not { } throwEnt ||
                 throwEnt = splitStack.Value;
             }
 
-            var direction = coordinates.ToMapPos(EntityManager) - Transform(player).WorldPosition;
+            var direction = coordinates.ToMapPos(EntityManager, _transformSystem) - Transform(player).WorldPosition;
             if (direction == Vector2.Zero)
                 return true;
 
diff --git a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
index 770e9fc39b..a0e9143eda 100644
--- a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
+++ b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
@@ -188,7 +188,7 @@ public string GetAgeRepresentation(string species, int age)
 
         if (speciesPrototype == null)
         {
-            Logger.Error("Tried to get age representation of species that couldn't be indexed: " + species);
+            Log.Error("Tried to get age representation of species that couldn't be indexed: " + species);
             return Loc.GetString("identity-age-young");
         }
 
diff --git a/Content.Server/IdentityManagement/IdentitySystem.cs b/Content.Server/IdentityManagement/IdentitySystem.cs
index dbd34d7484..ec8412ed1a 100644
--- a/Content.Server/IdentityManagement/IdentitySystem.cs
+++ b/Content.Server/IdentityManagement/IdentitySystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.Access.Systems;
 using Content.Server.Administration.Logs;
+using Content.Server.CriminalRecords.Systems;
 using Content.Server.Humanoid;
 using Content.Shared.Clothing;
 using Content.Shared.Database;
@@ -25,6 +26,7 @@ public class IdentitySystem : SharedIdentitySystem
     [Dependency] private readonly MetaDataSystem _metaData = default!;
     [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly HumanoidAppearanceSystem _humanoid = default!;
+    [Dependency] private readonly CriminalRecordsConsoleSystem _criminalRecordsConsole = default!;
 
     private HashSet<EntityUid> _queuedIdentityUpdates = new();
 
@@ -107,7 +109,9 @@ private void UpdateIdentityInfo(EntityUid uid, IdentityComponent identity)
         _metaData.SetEntityName(ident, name);
 
         _adminLog.Add(LogType.Identity, LogImpact.Medium, $"{ToPrettyString(uid)} changed identity to {name}");
-        RaiseLocalEvent(new IdentityChangedEvent(uid, ident));
+        var identityChangedEvent = new IdentityChangedEvent(uid, ident);
+        RaiseLocalEvent(uid, ref identityChangedEvent);
+        SetIdentityCriminalIcon(uid);
     }
 
     private string GetIdentityName(EntityUid target, IdentityRepresentation representation)
@@ -118,6 +122,16 @@ private string GetIdentityName(EntityUid target, IdentityRepresentation represen
         return representation.ToStringKnown(!ev.Cancelled);
     }
 
+    /// <summary>
+    ///     When the identity of a person is changed, searches the criminal records to see if the name of the new identity
+    ///     has a record. If the new name has a criminal status attached to it, the person will get the criminal status
+    ///     until they change identity again.
+    /// </summary>
+    private void SetIdentityCriminalIcon(EntityUid uid)
+    {
+        _criminalRecordsConsole.CheckNewIdentity(uid);
+    }
+
     /// <summary>
     ///     Gets an 'identity representation' of an entity, with their true name being the entity name
     ///     and their 'presumed name' and 'presumed job' being the name/job on their ID card, if they have one.
@@ -159,15 +173,3 @@ private IdentityRepresentation GetIdentityRepresentation(EntityUid target,
 
     #endregion
 }
-
-public sealed class IdentityChangedEvent : EntityEventArgs
-{
-    public EntityUid CharacterEntity;
-    public EntityUid IdentityEntity;
-
-    public IdentityChangedEvent(EntityUid characterEntity, EntityUid identityEntity)
-    {
-        CharacterEntity = characterEntity;
-        IdentityEntity = identityEntity;
-    }
-}
diff --git a/Content.Server/ImmovableRod/ImmovableRodSystem.cs b/Content.Server/ImmovableRod/ImmovableRodSystem.cs
index 0fa8f7d292..31aa39cf03 100644
--- a/Content.Server/ImmovableRod/ImmovableRodSystem.cs
+++ b/Content.Server/ImmovableRod/ImmovableRodSystem.cs
@@ -53,9 +53,9 @@ private void OnMapInit(EntityUid uid, ImmovableRodComponent component, MapInitEv
     {
         if (EntityManager.TryGetComponent(uid, out PhysicsComponent? phys))
         {
-            _physics.SetLinearDamping(phys, 0f);
-            _physics.SetFriction(phys, 0f);
-            _physics.SetBodyStatus(phys, BodyStatus.InAir);
+            _physics.SetLinearDamping(uid, phys, 0f);
+            _physics.SetFriction(uid, phys, 0f);
+            _physics.SetBodyStatus(uid, phys, BodyStatus.InAir);
 
             if (!component.RandomizeVelocity)
                 return;
diff --git a/Content.Server/Implants/SubdermalImplantSystem.cs b/Content.Server/Implants/SubdermalImplantSystem.cs
index ac415a0434..8eb2741448 100644
--- a/Content.Server/Implants/SubdermalImplantSystem.cs
+++ b/Content.Server/Implants/SubdermalImplantSystem.cs
@@ -99,7 +99,7 @@ private void OnScramImplant(EntityUid uid, SubdermalImplantComponent component,
             return;
 
         var xform = Transform(ent);
-        var entityCoords = xform.Coordinates.ToMap(EntityManager);
+        var entityCoords = xform.Coordinates.ToMap(EntityManager, _xform);
 
         // try to find a valid position to teleport to, teleport to whatever works if we can't
         var targetCoords = new MapCoordinates();
diff --git a/Content.Server/Info/InfoSystem.cs b/Content.Server/Info/InfoSystem.cs
index 04fa6a57e5..350ae033cf 100644
--- a/Content.Server/Info/InfoSystem.cs
+++ b/Content.Server/Info/InfoSystem.cs
@@ -17,7 +17,7 @@ public override void Initialize()
 
     private void OnRequestRules(RequestRulesMessage message, EntitySessionEventArgs eventArgs)
     {
-        Log.Debug("info", "Client requested rules.");
+        Log.Debug("Client requested rules.");
         var title = Loc.GetString(_cfg.GetCVar(CCVars.RulesHeader));
         var path = _cfg.GetCVar(CCVars.RulesFile);
         var rules = "Server could not read its rules.";
@@ -27,7 +27,7 @@ private void OnRequestRules(RequestRulesMessage message, EntitySessionEventArgs
         }
         catch (Exception)
         {
-            Log.Debug("info", "Could not read server rules file.");
+            Log.Debug("Could not read server rules file.");
         }
         var response = new RulesMessage(title, rules);
         RaiseNetworkEvent(response, eventArgs.SenderSession.Channel);
diff --git a/Content.Server/IoC/ServerContentIoC.cs b/Content.Server/IoC/ServerContentIoC.cs
index 2a63ace8e3..4c1e522e9d 100644
--- a/Content.Server/IoC/ServerContentIoC.cs
+++ b/Content.Server/IoC/ServerContentIoC.cs
@@ -5,6 +5,8 @@
 using Content.Server.Afk;
 using Content.Server.Chat.Managers;
 using Content.Server.Connection;
+using Content.Server.DiscordAuth;
+using Content.Server.JoinQueue;
 using Content.Server.Database;
 using Content.Server.Discord;
 using Content.Server.EUI;
@@ -58,6 +60,8 @@ public static void Register()
             IoCManager.Register<PoissonDiskSampler>();
             IoCManager.Register<DiscordWebhook>();
             IoCManager.Register<ServerDbEntryManager>();
+            IoCManager.Register<JoinQueueManager>();
+            IoCManager.Register<DiscordAuthManager>();
         }
     }
 }
diff --git a/Content.Server/JoinQueue/JoinQueueManager.cs b/Content.Server/JoinQueue/JoinQueueManager.cs
new file mode 100644
index 0000000000..bc3c364670
--- /dev/null
+++ b/Content.Server/JoinQueue/JoinQueueManager.cs
@@ -0,0 +1,172 @@
+using System.Linq;
+using Content.Server.Connection;
+using Content.Server.DiscordAuth;
+using Content.Shared.CCVar;
+using Content.Shared.JoinQueue;
+using Prometheus;
+using Robust.Server.Player;
+using Robust.Shared.Configuration;
+using Robust.Shared.Enums;
+using Robust.Shared.Network;
+using Robust.Shared.Player;
+using Robust.Shared.Timing;
+
+namespace Content.Server.JoinQueue;
+
+/// <summary>
+///     Manages new player connections when the server is full and queues them up, granting access when a slot becomes free
+/// </summary>
+public sealed class JoinQueueManager
+{
+    private static readonly Gauge QueueCount = Metrics.CreateGauge(
+        "join_queue_count",
+        "Amount of players in queue.");
+
+    private static readonly Counter QueueBypassCount = Metrics.CreateCounter(
+        "join_queue_bypass_count",
+        "Amount of players who bypassed queue by privileges.");
+
+    private static readonly Histogram QueueTimings = Metrics.CreateHistogram(
+        "join_queue_timings",
+        "Timings of players in queue",
+        new HistogramConfiguration()
+        {
+            LabelNames = new[] {"type"},
+            Buckets = Histogram.ExponentialBuckets(1, 2, 14),
+        });
+
+
+    [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IConnectionManager _connection = default!;
+    [Dependency] private readonly IConfigurationManager _configuration = default!;
+    [Dependency] private readonly IServerNetManager _net = default!;
+    [Dependency] private readonly DiscordAuthManager _discordAuth = default!;
+
+
+    /// <summary>
+    ///     Queue of active player sessions
+    /// </summary>
+    private readonly List<ICommonSession> _queue = new(); // Real Queue class can't delete disconnected users
+
+    private bool _isEnabled = false;
+
+    public int PlayerInQueueCount => _queue.Count;
+    public int ActualPlayersCount => _player.PlayerCount - PlayerInQueueCount; // Now it's only real value with actual players count that in game
+
+
+    public void Initialize()
+    {
+        _net.RegisterNetMessage<QueueUpdateMessage>();
+
+        _configuration.OnValueChanged(CCVars.QueueEnabled, OnQueueCVarChanged, true);
+        _player.PlayerStatusChanged += OnPlayerStatusChanged;
+        _discordAuth.PlayerVerified += OnPlayerVerified;
+    }
+
+
+    private void OnQueueCVarChanged(bool value)
+    {
+        _isEnabled = value;
+
+        if (!value)
+        {
+            foreach (var session in _queue)
+            {
+                session.Channel.Disconnect("Queue was disabled");
+            }
+        }
+    }
+
+    private async void OnPlayerVerified(object? sender, ICommonSession session)
+    {
+        if (!_isEnabled)
+        {
+            SendToGame(session);
+            return;
+        }
+
+        var isPrivileged = await _connection.HasPrivilegedJoin(session.UserId);
+        var currentOnline = _player.PlayerCount - 1; // Do not count current session in general online, because we are still deciding her fate
+        var haveFreeSlot = currentOnline < _configuration.GetCVar(CCVars.SoftMaxPlayers);
+        if (isPrivileged || haveFreeSlot)
+        {
+            SendToGame(session);
+
+            if (isPrivileged && !haveFreeSlot)
+                QueueBypassCount.Inc();
+
+            return;
+        }
+
+        _queue.Add(session);
+        ProcessQueue(false, session.ConnectedTime);
+    }
+
+    private async void OnPlayerStatusChanged(object? sender, SessionStatusEventArgs e)
+    {
+        if (e.NewStatus == SessionStatus.Disconnected)
+        {
+            var wasInQueue = _queue.Remove(e.Session);
+
+            if (!wasInQueue && e.OldStatus != SessionStatus.InGame) // Process queue only if player disconnected from InGame or from queue
+                return;
+
+            ProcessQueue(true, e.Session.ConnectedTime);
+
+            if (wasInQueue)
+                QueueTimings.WithLabels("Unwaited").Observe((DateTime.UtcNow - e.Session.ConnectedTime).TotalSeconds);
+        }
+    }
+
+
+    /// <summary>
+    ///     If possible, takes the first player in the queue and sends him into the game
+    /// </summary>
+    /// <param name="isDisconnect">Is method called on disconnect event</param>
+    /// <param name="connectedTime">Session connected time for histogram metrics</param>
+    private void ProcessQueue(bool isDisconnect, DateTime connectedTime)
+    {
+        var players = ActualPlayersCount;
+        if (isDisconnect)
+            players--; // Decrease currently disconnected session but that has not yet been deleted
+
+        var haveFreeSlot = players < _configuration.GetCVar(CCVars.SoftMaxPlayers);
+        var queueContains = _queue.Count > 0;
+        if (haveFreeSlot && queueContains)
+        {
+            var session = _queue.First();
+            _queue.Remove(session);
+
+            SendToGame(session);
+
+            QueueTimings.WithLabels("Waited").Observe((DateTime.UtcNow - connectedTime).TotalSeconds);
+        }
+
+        SendUpdateMessages();
+        QueueCount.Set(_queue.Count);
+    }
+
+    /// <summary>
+    ///     Sends messages to all players in the queue with the current state of the queue
+    /// </summary>
+    private void SendUpdateMessages()
+    {
+        for (var i = 0; i < _queue.Count; i++)
+        {
+            _queue[i].Channel.SendMessage(new QueueUpdateMessage
+            {
+                Total = _queue.Count,
+                Position = i + 1,
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Letting player's session into game, change player state
+    /// </summary>
+    /// <param name="session">Player session that will be sent to game</param>
+    private void SendToGame(ICommonSession session)
+    {
+        Timer.Spawn(0, () => _player.JoinGame(session));
+    }
+}
diff --git a/Content.Server/Kitchen/EntitySystems/SharpSystem.cs b/Content.Server/Kitchen/EntitySystems/SharpSystem.cs
index f270fe76d2..2c5f88baec 100644
--- a/Content.Server/Kitchen/EntitySystems/SharpSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/SharpSystem.cs
@@ -1,8 +1,11 @@
 using Content.Server.Body.Systems;
 using Content.Server.Kitchen.Components;
+using Content.Shared.Administration.Logs;
 using Content.Shared.Body.Components;
+using Content.Shared.Database;
 using Content.Shared.Interaction;
 using Content.Shared.Nutrition.Components;
+using Content.Server.Nutrition.EntitySystems;
 using Content.Shared.Popups;
 using Content.Shared.Storage;
 using Content.Shared.Verbs;
@@ -26,12 +29,13 @@ public sealed class SharpSystem : EntitySystem
     [Dependency] private readonly ContainerSystem _containerSystem = default!;
     [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<SharpComponent, AfterInteractEvent>(OnAfterInteract);
+        SubscribeLocalEvent<SharpComponent, AfterInteractEvent>(OnAfterInteract, before: new[] { typeof(UtensilSystem) });
         SubscribeLocalEvent<SharpComponent, SharpDoAfterEvent>(OnDoAfter);
 
         SubscribeLocalEvent<ButcherableComponent, GetVerbsEvent<InteractionVerb>>(OnGetInteractionVerbs);
@@ -39,31 +43,34 @@ public override void Initialize()
 
     private void OnAfterInteract(EntityUid uid, SharpComponent component, AfterInteractEvent args)
     {
+        if (args.Handled)
+            return;
+
         if (args.Target is null || !args.CanReach)
             return;
 
-        TryStartButcherDoafter(uid, args.Target.Value, args.User);
+        args.Handled = TryStartButcherDoAfter(uid, args.Target.Value, args.User);
     }
 
-    private void TryStartButcherDoafter(EntityUid knife, EntityUid target, EntityUid user)
+    private bool TryStartButcherDoAfter(EntityUid knife, EntityUid target, EntityUid user)
     {
         if (!TryComp<ButcherableComponent>(target, out var butcher))
-            return;
+            return false;
 
         if (!TryComp<SharpComponent>(knife, out var sharp))
-            return;
+            return false;
 
-        if (butcher.Type != ButcheringType.Knife)
+        if (TryComp<MobStateComponent>(target, out var mobState) && !_mobStateSystem.IsDead(target, mobState))
+            return false;
+
+        if (butcher.Type != ButcheringType.Knife && target != user)
         {
             _popupSystem.PopupEntity(Loc.GetString("butcherable-different-tool", ("target", target)), knife, user);
-            return;
+            return true;
         }
 
-        if (TryComp<MobStateComponent>(target, out var mobState) && !_mobStateSystem.IsDead(target, mobState))
-            return;
-
         if (!sharp.Butchering.Add(target))
-            return;
+            return true;
 
         var doAfter =
             new DoAfterArgs(EntityManager, user, sharp.ButcherDelayModifier * butcher.ButcherDelay, new SharpDoAfterEvent(), knife, target: target, used: knife)
@@ -73,8 +80,8 @@ private void TryStartButcherDoafter(EntityUid knife, EntityUid target, EntityUid
                 BreakOnDamage = true,
                 NeedHand = true
             };
-
         _doAfterSystem.TryStartDoAfter(doAfter);
+        return true;
     }
 
     private void OnDoAfter(EntityUid uid, SharpComponent component, DoAfterEvent args)
@@ -121,6 +128,11 @@ private void OnDoAfter(EntityUid uid, SharpComponent component, DoAfterEvent arg
         _destructibleSystem.DestroyEntity(args.Args.Target.Value);
 
         args.Handled = true;
+
+        _adminLogger.Add(LogType.Gib,
+            $"{EntityManager.ToPrettyString(args.User):user} " +
+            $"has butchered {EntityManager.ToPrettyString(args.Target):target} " +
+            $"with {EntityManager.ToPrettyString(args.Used):knife}");
     }
 
     private void OnGetInteractionVerbs(EntityUid uid, ButcherableComponent component, GetVerbsEvent<InteractionVerb> args)
@@ -154,7 +166,7 @@ private void OnGetInteractionVerbs(EntityUid uid, ButcherableComponent component
             Act = () =>
             {
                 if (!disabled)
-                    TryStartButcherDoafter(args.Using!.Value, args.Target, args.User);
+                    TryStartButcherDoAfter(args.Using!.Value, args.Target, args.User);
             },
             Message = message,
             Disabled = disabled,
diff --git a/Content.Server/Lube/LubeSystem.cs b/Content.Server/Lube/LubeSystem.cs
index d777ae9406..5285cb389c 100644
--- a/Content.Server/Lube/LubeSystem.cs
+++ b/Content.Server/Lube/LubeSystem.cs
@@ -2,11 +2,13 @@
 using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.Nutrition.EntitySystems;
 using Content.Shared.Database;
+using Content.Shared.Glue;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Item;
 using Content.Shared.Lube;
 using Content.Shared.Popups;
+using Content.Shared.Verbs;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Random;
@@ -20,12 +22,14 @@ public sealed class LubeSystem : EntitySystem
     [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly OpenableSystem _openable = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<LubeComponent, AfterInteractEvent>(OnInteract, after: new[] { typeof(OpenableSystem) });
+        SubscribeLocalEvent<LubeComponent, GetVerbsEvent<UtilityVerb>>(OnUtilityVerb);
     }
 
     private void OnInteract(Entity<LubeComponent> entity, ref AfterInteractEvent args)
@@ -37,36 +41,51 @@ private void OnInteract(Entity<LubeComponent> entity, ref AfterInteractEvent arg
             return;
 
         if (TryLube(entity, target, args.User))
-        {
             args.Handled = true;
-            _audio.PlayPvs(entity.Comp.Squeeze, entity);
-            _popup.PopupEntity(Loc.GetString("lube-success", ("target", Identity.Entity(target, EntityManager))), args.User, args.User, PopupType.Medium);
-        }
-        else
+    }
+
+    private void OnUtilityVerb(Entity<LubeComponent> entity, ref GetVerbsEvent<UtilityVerb> args)
+    {
+        if (!args.CanInteract || !args.CanAccess || args.Target is not { Valid: true } target ||
+        _openable.IsClosed(entity))
+            return;
+
+        var user = args.User;
+
+        var verb = new UtilityVerb()
         {
-            _popup.PopupEntity(Loc.GetString("lube-failure", ("target", Identity.Entity(target, EntityManager))), args.User, args.User, PopupType.Medium);
-        }
+            Act = () => TryLube(entity, target, user),
+            IconEntity = GetNetEntity(entity),
+            Text = Loc.GetString("lube-verb-text"),
+            Message = Loc.GetString("lube-verb-message")
+        };
+
+        args.Verbs.Add(verb);
     }
 
-    private bool TryLube(Entity<LubeComponent> lube, EntityUid target, EntityUid actor)
+    private bool TryLube(Entity<LubeComponent> entity, EntityUid target, EntityUid actor)
     {
         if (HasComp<LubedComponent>(target) || !HasComp<ItemComponent>(target))
         {
+            _popup.PopupEntity(Loc.GetString("lube-failure", ("target", Identity.Entity(target, EntityManager))), actor, actor, PopupType.Medium);
             return false;
         }
 
-        if (HasComp<ItemComponent>(target) && _solutionContainer.TryGetSolution(lube.Owner, lube.Comp.Solution, out _, out var solution))
+        if (HasComp<ItemComponent>(target) && _solutionContainer.TryGetSolution(entity.Owner, entity.Comp.Solution, out _, out var solution))
         {
-            var quantity = solution.RemoveReagent(lube.Comp.Reagent, lube.Comp.Consumption);
+            var quantity = solution.RemoveReagent(entity.Comp.Reagent, entity.Comp.Consumption);
             if (quantity > 0)
             {
                 var lubed = EnsureComp<LubedComponent>(target);
-                lubed.SlipsLeft = _random.Next(lube.Comp.MinSlips * quantity.Int(), lube.Comp.MaxSlips * quantity.Int());
-                lubed.SlipStrength = lube.Comp.SlipStrength;
-                _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(actor):actor} lubed {ToPrettyString(target):subject} with {ToPrettyString(lube.Owner):tool}");
+                lubed.SlipsLeft = _random.Next(entity.Comp.MinSlips * quantity.Int(), entity.Comp.MaxSlips * quantity.Int());
+                lubed.SlipStrength = entity.Comp.SlipStrength;
+                _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(actor):actor} lubed {ToPrettyString(target):subject} with {ToPrettyString(entity.Owner):tool}");
+                _audio.PlayPvs(entity.Comp.Squeeze, entity.Owner);
+                _popup.PopupEntity(Loc.GetString("lube-success", ("target", Identity.Entity(target, EntityManager))), actor, actor, PopupType.Medium);
                 return true;
             }
         }
+        _popup.PopupEntity(Loc.GetString("lube-failure", ("target", Identity.Entity(target, EntityManager))), actor, actor, PopupType.Medium);
         return false;
     }
 }
diff --git a/Content.Server/Magic/MagicSystem.cs b/Content.Server/Magic/MagicSystem.cs
index 2c9b11dbd3..92cd794ce2 100644
--- a/Content.Server/Magic/MagicSystem.cs
+++ b/Content.Server/Magic/MagicSystem.cs
@@ -168,7 +168,7 @@ private void OnProjectileSpell(ProjectileSpellEvent ev)
         foreach (var pos in GetSpawnPositions(xform, ev.Pos))
         {
             // If applicable, this ensures the projectile is parented to grid on spawn, instead of the map.
-            var mapPos = pos.ToMap(EntityManager);
+            var mapPos = pos.ToMap(EntityManager, _transformSystem);
             var spawnCoords = _mapManager.TryFindGridAt(mapPos, out var gridUid, out _)
                 ? pos.WithEntityId(gridUid, EntityManager)
                 : new(_mapManager.GetMapEntityId(mapPos.MapId), mapPos.Position);
diff --git a/Content.Server/Mapping/MappingSystem.cs b/Content.Server/Mapping/MappingSystem.cs
index 0678dab7ce..28bb3afbe1 100644
--- a/Content.Server/Mapping/MappingSystem.cs
+++ b/Content.Server/Mapping/MappingSystem.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using Content.Server.Administration;
 using Content.Shared.Administration;
 using Content.Shared.CCVar;
@@ -32,7 +32,6 @@ public sealed class MappingSystem : EntitySystem
     /// <returns></returns>
     private Dictionary<MapId, (TimeSpan next, string fileName)> _currentlyAutosaving = new();
 
-    private ISawmill _sawmill = default!;
     private bool _autosaveEnabled;
 
     public override void Initialize()
@@ -44,7 +43,6 @@ public override void Initialize()
             "autosave <map> <path if enabling>",
             ToggleAutosaveCommand);
 
-        _sawmill = Logger.GetSawmill("autosave");
         Subs.CVar(_cfg, CCVars.AutosaveEnabled, SetAutosaveEnabled, true);
     }
 
@@ -69,7 +67,7 @@ public override void Update(float frameTime)
 
             if (!_mapManager.MapExists(map) || _mapManager.IsMapInitialized(map))
             {
-                _sawmill.Warning($"Can't autosave map {map}; it doesn't exist, or is initialized. Removing from autosave.");
+                Log.Warning($"Can't autosave map {map}; it doesn't exist, or is initialized. Removing from autosave.");
                 _currentlyAutosaving.Remove(map);
                 return;
             }
@@ -79,7 +77,7 @@ public override void Update(float frameTime)
 
             var path = Path.Combine(saveDir, $"{DateTime.Now.ToString("yyyy-M-dd_HH.mm.ss")}-AUTO.yml");
             _currentlyAutosaving[map] = (CalculateNextTime(), name);
-            _sawmill.Info($"Autosaving map {name} ({map}) to {path}. Next save in {ReadableTimeLeft(map)} seconds.");
+            Log.Info($"Autosaving map {name} ({map}) to {path}. Next save in {ReadableTimeLeft(map)} seconds.");
             _map.SaveMap(map, path);
         }
     }
@@ -105,17 +103,17 @@ public void ToggleAutosave(MapId map, string? path=null)
         {
             if (!_mapManager.MapExists(map) || _mapManager.IsMapInitialized(map))
             {
-                _sawmill.Warning("Tried to enable autosaving on non-existant or already initialized map!");
+                Log.Warning("Tried to enable autosaving on non-existant or already initialized map!");
                 _currentlyAutosaving.Remove(map);
                 return;
             }
 
-            _sawmill.Info($"Started autosaving map {path} ({map}). Next save in {ReadableTimeLeft(map)} seconds.");
+            Log.Info($"Started autosaving map {path} ({map}). Next save in {ReadableTimeLeft(map)} seconds.");
         }
         else
         {
             _currentlyAutosaving.Remove(map);
-            _sawmill.Info($"Stopped autosaving on map {map}");
+            Log.Info($"Stopped autosaving on map {map}");
         }
     }
 
diff --git a/Content.Server/Materials/MaterialReclaimerSystem.cs b/Content.Server/Materials/MaterialReclaimerSystem.cs
index c976543f7c..8920daf60d 100644
--- a/Content.Server/Materials/MaterialReclaimerSystem.cs
+++ b/Content.Server/Materials/MaterialReclaimerSystem.cs
@@ -19,6 +19,8 @@
 using Robust.Shared.Player;
 using Robust.Shared.Utility;
 using System.Linq;
+using Content.Server.Administration.Logs;
+using Content.Shared.Database;
 
 namespace Content.Server.Materials;
 
@@ -35,6 +37,7 @@ public sealed class MaterialReclaimerSystem : SharedMaterialReclaimerSystem
     [Dependency] private readonly PuddleSystem _puddle = default!;
     [Dependency] private readonly StackSystem _stack = default!;
     [Dependency] private readonly SharedMindSystem _mind = default!;
+    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -154,6 +157,7 @@ public override void Reclaim(EntityUid uid,
 
         if (CanGib(uid, item, component))
         {
+            _adminLogger.Add(LogType.Gib, LogImpact.Extreme, $"{ToPrettyString(item):victim} was gibbed by {ToPrettyString(uid):entity} ");
             SpawnChemicalsFromComposition(uid, item, completion, false, component, xform);
             _body.GibBody(item, true);
             _appearance.SetData(uid, RecyclerVisuals.Bloody, true);
diff --git a/Content.Server/Mech/Systems/MechSystem.cs b/Content.Server/Mech/Systems/MechSystem.cs
index eef9bcb8ec..1012b9727d 100644
--- a/Content.Server/Mech/Systems/MechSystem.cs
+++ b/Content.Server/Mech/Systems/MechSystem.cs
@@ -39,15 +39,11 @@ public sealed partial class MechSystem : SharedMechSystem
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly UserInterfaceSystem _ui = default!;
 
-    private ISawmill _sawmill = default!;
-
     /// <inheritdoc/>
     public override void Initialize()
     {
         base.Initialize();
 
-        _sawmill = Logger.GetSawmill("mech");
-
         SubscribeLocalEvent<MechComponent, InteractUsingEvent>(OnInteractUsing);
         SubscribeLocalEvent<MechComponent, EntInsertedIntoContainerMessage>(OnInsertBattery);
         SubscribeLocalEvent<MechComponent, MapInitEvent>(OnMapInit);
@@ -343,7 +339,7 @@ public override bool TryChangeEnergy(EntityUid uid, FixedPoint2 delta, MechCompo
         _battery.SetCharge(battery!.Value, batteryComp.CurrentCharge + delta.Float(), batteryComp);
         if (batteryComp.CurrentCharge != component.Energy) //if there's a discrepency, we have to resync them
         {
-            _sawmill.Debug($"Battery charge was not equal to mech charge. Battery {batteryComp.CurrentCharge}. Mech {component.Energy}");
+            Log.Debug($"Battery charge was not equal to mech charge. Battery {batteryComp.CurrentCharge}. Mech {component.Energy}");
             component.Energy = batteryComp.CurrentCharge;
             Dirty(component);
         }
diff --git a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerComponent.cs b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerComponent.cs
index 25378bb3ed..61d36f98b9 100644
--- a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerComponent.cs
+++ b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerComponent.cs
@@ -15,7 +15,7 @@ public sealed partial class BiomassReclaimerComponent : Component
         /// <summary>
         /// The interval for <see cref="RandomMessTimer"/>.
         /// </summary>
-        [ViewVariables(VVAccess.ReadWrite), DataField("randomMessInterval")]
+        [ViewVariables(VVAccess.ReadWrite), DataField]
         public TimeSpan RandomMessInterval = TimeSpan.FromSeconds(5);
 
         /// <summary>
@@ -28,9 +28,10 @@ public sealed partial class BiomassReclaimerComponent : Component
         /// <summary>
         /// Amount of biomass that the mob being processed will yield.
         /// This is calculated from the YieldPerUnitMass.
+        /// Also stores non-integer leftovers.
         /// </summary>
         [ViewVariables]
-        public int CurrentExpectedYield = default;
+        public float CurrentExpectedYield = 0f;
 
         /// <summary>
         /// The reagent that will be spilled while processing a mob.
@@ -49,6 +50,18 @@ public sealed partial class BiomassReclaimerComponent : Component
         [DataField, ViewVariables(VVAccess.ReadWrite)]
         public float YieldPerUnitMass = 0.4f;
 
+        /// <summary>
+        /// How many seconds to take to insert an entity per unit of its mass.
+        /// </summary>
+        [DataField, ViewVariables(VVAccess.ReadWrite)]
+        public float BaseInsertionDelay = 0.1f;
+
+        /// <summary>
+        /// How much to multiply biomass yield from botany produce.
+        /// </summary>
+        [DataField, ViewVariables(VVAccess.ReadWrite)]
+        public float ProduceYieldMultiplier = 0.25f;
+
         /// <summary>
         /// The time it takes to process a mob, per mass.
         /// </summary>
@@ -58,7 +71,7 @@ public sealed partial class BiomassReclaimerComponent : Component
         /// <summary>
         /// Will this refuse to gib a living mob?
         /// </summary>
-        [ViewVariables(VVAccess.ReadWrite), DataField("safetyEnabled")]
+        [ViewVariables(VVAccess.ReadWrite), DataField]
         public bool SafetyEnabled = true;
     }
 }
diff --git a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
index b126c74a10..d07858aec5 100644
--- a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
+++ b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
@@ -1,5 +1,6 @@
 using System.Numerics;
 using Content.Server.Body.Components;
+using Content.Server.Botany.Components;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Materials;
 using Content.Server.Power.Components;
@@ -17,6 +18,7 @@
 using Content.Shared.Jittering;
 using Content.Shared.Medical;
 using Content.Shared.Mind;
+using Content.Shared.Materials;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Nutrition.Components;
@@ -26,6 +28,7 @@
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
 using Robust.Shared.Physics.Components;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
 namespace Content.Server.Medical.BiomassReclaimer
@@ -47,6 +50,9 @@ public sealed class BiomassReclaimerSystem : EntitySystem
         [Dependency] private readonly MaterialStorageSystem _material = default!;
         [Dependency] private readonly SharedMindSystem _minds = default!;
 
+        [ValidatePrototypeId<MaterialPrototype>]
+        public const string BiomassPrototype = "Biomass";
+
         public override void Update(float frameTime)
         {
             base.Update(frameTime);
@@ -79,7 +85,9 @@ public override void Update(float frameTime)
                     continue;
                 }
 
-                _material.SpawnMultipleFromMaterial(reclaimer.CurrentExpectedYield, "Biomass", Transform(uid).Coordinates);
+                var actualYield = (int) (reclaimer.CurrentExpectedYield); // can only have integer biomass
+                reclaimer.CurrentExpectedYield = reclaimer.CurrentExpectedYield - actualYield; // store non-integer leftovers
+                _material.SpawnMultipleFromMaterial(actualYield, BiomassPrototype, Transform(uid).Coordinates);
 
                 reclaimer.BloodReagent = null;
                 reclaimer.SpawnedEntities.Clear();
@@ -148,10 +156,14 @@ private void OnAfterInteractUsing(Entity<BiomassReclaimerComponent> reclaimer, r
             if (!args.CanReach || args.Target == null)
                 return;
 
-            if (!HasComp<MobStateComponent>(args.Used) || !CanGib(reclaimer, args.Used))
+            if (!CanGib(reclaimer, args.Used))
+                return;
+
+            if (!TryComp<PhysicsComponent>(args.Used, out var physics))
                 return;
 
-            _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, 7f, new ReclaimerDoAfterEvent(), reclaimer, target: args.Target, used: args.Used)
+            var delay = reclaimer.Comp.BaseInsertionDelay * physics.FixturesMass;
+            _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, delay, new ReclaimerDoAfterEvent(), reclaimer, target: args.Target, used: args.Used)
             {
                 BreakOnTargetMove = true,
                 BreakOnUserMove = true,
@@ -174,11 +186,14 @@ private void OnClimbedOn(Entity<BiomassReclaimerComponent> reclaimer, ref Climbe
 
         private void OnDoAfter(Entity<BiomassReclaimerComponent> reclaimer, ref ReclaimerDoAfterEvent args)
         {
-            if (args.Handled || args.Cancelled || args.Args.Target == null || HasComp<BiomassReclaimerComponent>(args.Args.Target.Value))
+            if (args.Handled || args.Cancelled)
+                return;
+
+            if (args.Args.Used == null || args.Args.Target == null || !HasComp<BiomassReclaimerComponent>(args.Args.Target.Value))
                 return;
 
             _adminLogger.Add(LogType.Action, LogImpact.Extreme, $"{ToPrettyString(args.Args.User):player} used a biomass reclaimer to gib {ToPrettyString(args.Args.Target.Value):target} in {ToPrettyString(reclaimer):reclaimer}");
-            StartProcessing(args.Args.Target.Value, reclaimer);
+            StartProcessing(args.Args.Used.Value, reclaimer);
 
             args.Handled = true;
         }
@@ -200,8 +215,13 @@ private void StartProcessing(EntityUid toProcess, Entity<BiomassReclaimerCompone
                 component.SpawnedEntities = butcherableComponent.SpawnedEntities;
             }
 
-            component.CurrentExpectedYield = (int) Math.Max(0, physics.FixturesMass * component.YieldPerUnitMass);
+            var expectedYield = physics.FixturesMass * component.YieldPerUnitMass;
+            if (HasComp<ProduceComponent>(toProcess))
+                expectedYield *= component.ProduceYieldMultiplier;
+            component.CurrentExpectedYield += expectedYield;
+
             component.ProcessingTimer = physics.FixturesMass * component.ProcessingTimePerUnitMass;
+
             QueueDel(toProcess);
         }
 
@@ -210,7 +230,8 @@ private bool CanGib(Entity<BiomassReclaimerComponent> reclaimer, EntityUid dragg
             if (HasComp<ActiveBiomassReclaimerComponent>(reclaimer))
                 return false;
 
-            if (!HasComp<MobStateComponent>(dragged))
+            bool isPlant = HasComp<ProduceComponent>(dragged);
+            if (!isPlant && !HasComp<MobStateComponent>(dragged))
                 return false;
 
             if (!Transform(reclaimer).Anchored)
@@ -219,7 +240,7 @@ private bool CanGib(Entity<BiomassReclaimerComponent> reclaimer, EntityUid dragg
             if (TryComp<ApcPowerReceiverComponent>(reclaimer, out var power) && !power.Powered)
                 return false;
 
-            if (reclaimer.Comp.SafetyEnabled && !_mobState.IsDead(dragged))
+            if (!isPlant && reclaimer.Comp.SafetyEnabled && !_mobState.IsDead(dragged))
                 return false;
 
             // Reject souled bodies in easy mode.
diff --git a/Content.Server/Medical/SuitSensors/SuitSensorComponent.cs b/Content.Server/Medical/SuitSensors/SuitSensorComponent.cs
index 9079655c80..8d75d3840a 100644
--- a/Content.Server/Medical/SuitSensors/SuitSensorComponent.cs
+++ b/Content.Server/Medical/SuitSensors/SuitSensorComponent.cs
@@ -87,3 +87,9 @@ public sealed partial class SuitSensorComponent : Component
     [DataField, ViewVariables]
     public bool PreviousControlsLocked = false;
 }
+
+[ByRefEvent]
+public record struct SuitSensorsSendAttemptEvent
+{
+    public bool Cancelled;
+};
diff --git a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
index b807b63e21..f19b3d5b81 100644
--- a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
+++ b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
@@ -73,6 +73,11 @@ public override void Update(float frameTime)
             // TODO: This would cause imprecision at different tick rates.
             sensor.NextUpdate = curTime + sensor.UpdateRate;
 
+            var canEv = new SuitSensorsSendAttemptEvent();
+            RaiseLocalEvent(uid, ref canEv);
+            if (canEv.Cancelled)
+                continue;
+
             // get sensor status
             var status = GetSensorState(uid, sensor);
             if (status == null)
diff --git a/Content.Server/Movement/Systems/LagCompensationSystem.cs b/Content.Server/Movement/Systems/LagCompensationSystem.cs
index 0576fe8f25..8496a8a9b9 100644
--- a/Content.Server/Movement/Systems/LagCompensationSystem.cs
+++ b/Content.Server/Movement/Systems/LagCompensationSystem.cs
@@ -18,12 +18,10 @@ public sealed class LagCompensationSystem : EntitySystem
     // Max ping I've had is 350ms from aus to spain.
     public static readonly TimeSpan BufferTime = TimeSpan.FromMilliseconds(750);
 
-    private ISawmill _sawmill = Logger.GetSawmill("lagcomp");
-
     public override void Initialize()
     {
         base.Initialize();
-        _sawmill.Level = LogLevel.Info;
+        Log.Level = LogLevel.Info;
         SubscribeLocalEvent<LagCompensationComponent, MoveEvent>(OnLagMove);
     }
 
@@ -87,13 +85,13 @@ private void OnLagMove(EntityUid uid, LagCompensationComponent component, ref Mo
 
         if (coordinates == default)
         {
-            _sawmill.Debug($"No long comp coords found, using {xform.Coordinates}");
+            Log.Debug($"No long comp coords found, using {xform.Coordinates}");
             coordinates = xform.Coordinates;
             angle = xform.LocalRotation;
         }
         else
         {
-            _sawmill.Debug($"Actual coords is {xform.Coordinates} and got {coordinates}");
+            Log.Debug($"Actual coords is {xform.Coordinates} and got {coordinates}");
         }
 
         return (coordinates, angle);
diff --git a/Content.Server/NPC/HTN/Preconditions/CoordinatesInRangePrecondition.cs b/Content.Server/NPC/HTN/Preconditions/CoordinatesInRangePrecondition.cs
index 3e030aa819..3485bd2a18 100644
--- a/Content.Server/NPC/HTN/Preconditions/CoordinatesInRangePrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/CoordinatesInRangePrecondition.cs
@@ -22,6 +22,6 @@ public override bool IsMet(NPCBlackboard blackboard)
         if (!blackboard.TryGetValue<EntityCoordinates>(TargetKey, out var target, _entManager))
             return false;
 
-        return coordinates.InRange(_entManager, target, blackboard.GetValueOrDefault<float>(RangeKey, _entManager));
+        return coordinates.InRange(_entManager, _entManager.System<SharedTransformSystem>(), target, blackboard.GetValueOrDefault<float>(RangeKey, _entManager));
     }
 }
diff --git a/Content.Server/NPC/HTN/Preconditions/CoordinatesNotInRangePrecondition.cs b/Content.Server/NPC/HTN/Preconditions/CoordinatesNotInRangePrecondition.cs
index 6d8977bb7a..9d000ca2eb 100644
--- a/Content.Server/NPC/HTN/Preconditions/CoordinatesNotInRangePrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/CoordinatesNotInRangePrecondition.cs
@@ -22,7 +22,7 @@ public override bool IsMet(NPCBlackboard blackboard)
         if (!blackboard.TryGetValue<EntityCoordinates>(TargetKey, out var target, _entManager))
             return false;
 
-        return !coordinates.InRange(_entManager, target, blackboard.GetValueOrDefault<float>(RangeKey, _entManager));
+        return !coordinates.InRange(_entManager, _entManager.System<SharedTransformSystem>(), target, blackboard.GetValueOrDefault<float>(RangeKey, _entManager));
     }
 }
 
diff --git a/Content.Server/NPC/HTN/Preconditions/TargetInRangePrecondition.cs b/Content.Server/NPC/HTN/Preconditions/TargetInRangePrecondition.cs
index 5d616ba630..aaccb426d7 100644
--- a/Content.Server/NPC/HTN/Preconditions/TargetInRangePrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/TargetInRangePrecondition.cs
@@ -23,6 +23,6 @@ public override bool IsMet(NPCBlackboard blackboard)
             !_entManager.TryGetComponent<TransformComponent>(target, out var targetXform))
             return false;
 
-        return coordinates.InRange(_entManager, targetXform.Coordinates, blackboard.GetValueOrDefault<float>(RangeKey, _entManager));
+        return coordinates.InRange(_entManager, _entManager.System<SharedTransformSystem>(), targetXform.Coordinates, blackboard.GetValueOrDefault<float>(RangeKey, _entManager));
     }
 }
diff --git a/Content.Server/NPC/Pathfinding/PathfindingSystem.cs b/Content.Server/NPC/Pathfinding/PathfindingSystem.cs
index 95f931cdd6..a59af88ff5 100644
--- a/Content.Server/NPC/Pathfinding/PathfindingSystem.cs
+++ b/Content.Server/NPC/Pathfinding/PathfindingSystem.cs
@@ -405,7 +405,7 @@ public async void GetPathEvent(
                 return null;
             }
 
-            var localPos = xform.InvWorldMatrix.Transform(coordinates.ToMapPos(EntityManager));
+            var localPos = xform.InvWorldMatrix.Transform(coordinates.ToMapPos(EntityManager, _transform));
             var origin = GetOrigin(localPos);
 
             if (!TryGetChunk(origin, comp, out var chunk))
diff --git a/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs b/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
index 7ac6768e35..e7af2c9107 100644
--- a/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
+++ b/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
@@ -56,7 +56,30 @@ private bool IsFreeSpace(
             return true;
         }
 
-        return false;
+        // TODO: Ideally for "FreeSpace" we check all entities on the tile and build flags dynamically (pathfinder refactor in future).
+        var ents = _entSetPool.Get();
+        _lookup.GetLocalEntitiesIntersecting(node.GraphUid, node.ChunkOrigin, ents, flags: LookupFlags.Static);
+        var result = true;
+
+        if (ents.Count > 0)
+        {
+            var fixtures = _fixturesQuery.GetComponent(uid);
+            var physics = _physicsQuery.GetComponent(uid);
+
+            foreach (var intersecting in ents)
+            {
+                if (!_physics.IsCurrentlyHardCollidable((uid, fixtures, physics), intersecting))
+                {
+                    continue;
+                }
+
+                result = false;
+                break;
+            }
+        }
+
+        _entSetPool.Return(ents);
+        return result;
     }
 
     /// <summary>
diff --git a/Content.Server/NPC/Systems/NPCUtilitySystem.cs b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
index fc483f68c3..33941be929 100644
--- a/Content.Server/NPC/Systems/NPCUtilitySystem.cs
+++ b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
@@ -43,6 +43,7 @@ public sealed class NPCUtilitySystem : EntitySystem
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly SolutionContainerSystem _solutions = default!;
     [Dependency] private readonly WeldableSystem _weldable = default!;
+    [Dependency] private readonly ExamineSystemShared _examine = default!;
 
     private EntityQuery<PuddleComponent> _puddleQuery;
     private EntityQuery<TransformComponent> _xformQuery;
@@ -296,7 +297,7 @@ private float GetScore(NPCBlackboard blackboard, EntityUid targetUid, UtilityCon
             {
                 var radius = blackboard.GetValueOrDefault<float>(NPCBlackboard.VisionRadius, EntityManager);
 
-                return ExamineSystemShared.InRangeUnOccluded(owner, targetUid, radius + 0.5f, null) ? 1f : 0f;
+                return _examine.InRangeUnOccluded(owner, targetUid, radius + 0.5f, null) ? 1f : 0f;
             }
             case TargetInLOSOrCurrentCon:
             {
@@ -313,7 +314,7 @@ private float GetScore(NPCBlackboard blackboard, EntityUid targetUid, UtilityCon
                     return 1f;
                 }
 
-                return ExamineSystemShared.InRangeUnOccluded(owner, targetUid, radius + bufferRange, null) ? 1f : 0f;
+                return _examine.InRangeUnOccluded(owner, targetUid, radius + bufferRange, null) ? 1f : 0f;
             }
             case TargetIsAliveCon:
             {
diff --git a/Content.Server/NPC/Systems/NpcFactionSystem.cs b/Content.Server/NPC/Systems/NpcFactionSystem.cs
index 3458025f19..a96067c5cf 100644
--- a/Content.Server/NPC/Systems/NpcFactionSystem.cs
+++ b/Content.Server/NPC/Systems/NpcFactionSystem.cs
@@ -15,8 +15,6 @@ public sealed partial class NpcFactionSystem : EntitySystem
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly IPrototypeManager _protoManager = default!;
 
-    private ISawmill _sawmill = default!;
-
     /// <summary>
     /// To avoid prototype mutability we store an intermediary data class that gets used instead.
     /// </summary>
@@ -25,7 +23,7 @@ public sealed partial class NpcFactionSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
-        _sawmill = Logger.GetSawmill("faction");
+
         SubscribeLocalEvent<NpcFactionMemberComponent, ComponentStartup>(OnFactionStartup);
         SubscribeLocalEvent<PrototypesReloadedEventArgs>(OnProtoReload);
 
@@ -70,7 +68,7 @@ public void AddFaction(EntityUid uid, string faction, bool dirty = true)
     {
         if (!_protoManager.HasIndex<NpcFactionPrototype>(faction))
         {
-            _sawmill.Error($"Unable to find faction {faction}");
+            Log.Error($"Unable to find faction {faction}");
             return;
         }
 
@@ -91,7 +89,7 @@ public void RemoveFaction(EntityUid uid, string faction, bool dirty = true)
     {
         if (!_protoManager.HasIndex<NpcFactionPrototype>(faction))
         {
-            _sawmill.Error($"Unable to find faction {faction}");
+            Log.Error($"Unable to find faction {faction}");
             return;
         }
 
@@ -214,13 +212,13 @@ public void MakeFriendly(string source, string target)
     {
         if (!_factions.TryGetValue(source, out var sourceFaction))
         {
-            _sawmill.Error($"Unable to find faction {source}");
+            Log.Error($"Unable to find faction {source}");
             return;
         }
 
         if (!_factions.ContainsKey(target))
         {
-            _sawmill.Error($"Unable to find faction {target}");
+            Log.Error($"Unable to find faction {target}");
             return;
         }
 
@@ -256,13 +254,13 @@ public void MakeHostile(string source, string target)
     {
         if (!_factions.TryGetValue(source, out var sourceFaction))
         {
-            _sawmill.Error($"Unable to find faction {source}");
+            Log.Error($"Unable to find faction {source}");
             return;
         }
 
         if (!_factions.ContainsKey(target))
         {
-            _sawmill.Error($"Unable to find faction {target}");
+            Log.Error($"Unable to find faction {target}");
             return;
         }
 
diff --git a/Content.Server/Nuke/NukeSystem.cs b/Content.Server/Nuke/NukeSystem.cs
index 652852ece2..d6767cd2de 100644
--- a/Content.Server/Nuke/NukeSystem.cs
+++ b/Content.Server/Nuke/NukeSystem.cs
@@ -46,7 +46,8 @@ public sealed class NukeSystem : EntitySystem
     /// <summary>
     ///     Used to calculate when the nuke song should start playing for maximum kino with the nuke sfx
     /// </summary>
-    private const float NukeSongLength = 60f + 51.6f;
+    private float _nukeSongLength;
+    private string _selectedNukeSong = String.Empty;
 
     /// <summary>
     ///     Time to leave between the nuke song and the nuke alarm playing.
@@ -292,9 +293,9 @@ private void TickTimer(EntityUid uid, float frameTime, NukeComponent? nuke = nul
 
         // Start playing the nuke event song so that it ends a couple seconds before the alert sound
         // should play
-        if (nuke.RemainingTime <= NukeSongLength + nuke.AlertSoundTime + NukeSongBuffer && !nuke.PlayedNukeSong)
+        if (nuke.RemainingTime <= _nukeSongLength + nuke.AlertSoundTime + NukeSongBuffer && !nuke.PlayedNukeSong && !string.IsNullOrEmpty(_selectedNukeSong))
         {
-            _sound.DispatchStationEventMusic(uid, nuke.ArmMusic, StationEventMusicType.Nuke);
+            _sound.DispatchStationEventMusic(uid, _selectedNukeSong, StationEventMusicType.Nuke);
             nuke.PlayedNukeSong = true;
         }
 
@@ -457,6 +458,9 @@ public void ArmBomb(EntityUid uid, NukeComponent? component = null)
         var y = (int) pos.Y;
         var posText = $"({x}, {y})";
 
+        // We are collapsing the randomness here, otherwise we would get separate random song picks for checking duration and when actually playing the song afterwards
+        _selectedNukeSong = _audio.GetSound(component.ArmMusic);
+
         // warn a crew
         var announcement = Loc.GetString("nuke-component-announcement-armed",
             ("time", (int) component.RemainingTime), ("position", posText));
@@ -464,6 +468,7 @@ public void ArmBomb(EntityUid uid, NukeComponent? component = null)
         _chatSystem.DispatchStationAnnouncement(stationUid ?? uid, announcement, sender, false, null, Color.Red);
 
         _sound.PlayGlobalOnStation(uid, _audio.GetSound(component.ArmSound));
+        _nukeSongLength = (float) _audio.GetAudioLength(_selectedNukeSong).TotalSeconds;
 
         // turn on the spinny light
         _pointLight.SetEnabled(uid, true);
diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
index 925e50b949..6327cf6ae2 100644
--- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
@@ -311,6 +311,9 @@ private void OnDoAfter(Entity<DrinkComponent> entity, ref ConsumeDoAfterEvent ar
         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))
+            return;
+
         // TODO this should really be checked every tick.
         if (_food.IsMouthBlocked(args.Target.Value))
             return;
diff --git a/Content.Server/Nutrition/EntitySystems/UtensilSystem.cs b/Content.Server/Nutrition/EntitySystems/UtensilSystem.cs
index f9feed955f..0edd0711b6 100644
--- a/Content.Server/Nutrition/EntitySystems/UtensilSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/UtensilSystem.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Containers.ItemSlots;
 using Content.Server.Nutrition.Components;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.EntitySystems;
@@ -25,7 +26,7 @@ public override void Initialize()
         {
             base.Initialize();
 
-            SubscribeLocalEvent<UtensilComponent, AfterInteractEvent>(OnAfterInteract);
+            SubscribeLocalEvent<UtensilComponent, AfterInteractEvent>(OnAfterInteract, after: new[] { typeof(ItemSlotsSystem) });
         }
 
         /// <summary>
@@ -33,6 +34,9 @@ public override void Initialize()
         /// </summary>
         private void OnAfterInteract(EntityUid uid, UtensilComponent component, AfterInteractEvent ev)
         {
+            if (ev.Handled)
+                return;
+
             if (ev.Target == null || !ev.CanReach)
                 return;
 
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
index 2eca3173b6..097a0cb750 100644
--- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
+++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
@@ -38,6 +38,7 @@ public sealed class PsionicRegenerationPowerSystem : EntitySystem
         [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly MindSystem _mindSystem = default!;
+        [Dependency] private readonly ExamineSystemShared _examine = default!;
 
 
         public override void Initialize()
@@ -76,7 +77,7 @@ private void OnPowerUsed(EntityUid uid, PsionicRegenerationPowerComponent compon
             _popupSystem.PopupEntity(Loc.GetString("psionic-regeneration-begin", ("entity", uid)),
                 uid,
                 // TODO: Use LoS-based Filter when one is available.
-                Filter.Pvs(uid).RemoveWhereAttachedEntity(entity => !ExamineSystemShared.InRangeUnOccluded(uid, entity, ExamineRange, null)),
+                Filter.Pvs(uid).RemoveWhereAttachedEntity(entity => !_examine.InRangeUnOccluded(uid, entity, ExamineRange, null)),
                 true,
                 PopupType.Medium);
 
diff --git a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs
index 69cf6a9939..aa6de572ce 100644
--- a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs
+++ b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs
@@ -17,7 +17,6 @@
 using Content.Server.Power.EntitySystems;
 using Content.Server.Temperature.Components;
 using Content.Server.Temperature.Systems;
-using Content.Server.UserInterface;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.EntitySystems;
@@ -44,7 +43,6 @@
 using Content.Shared.Popups;
 using Content.Shared.Throwing;
 using Content.Shared.UserInterface;
-using FastAccessors;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
@@ -242,7 +240,7 @@ private void BurnItem(EntityUid uid, DeepFryerComponent component, EntityUid ite
             MetaData(item).EntityPrototype?.ID != component.CharredPrototype)
         {
             var charred = Spawn(component.CharredPrototype, Transform(uid).Coordinates);
-            component.Storage.Insert(charred);
+            _containerSystem.Insert(charred, component.Storage);
             Del(item);
         }
     }
@@ -453,7 +451,7 @@ private void OnThrowHitBy(EntityUid uid, DeepFryerComponent component, ThrowHitB
 
         if (!CanInsertItem(uid, component, args.Thrown) ||
             _random.Prob(missChance) ||
-            !component.Storage.Insert(args.Thrown))
+            !_containerSystem.Insert(args.Thrown, component.Storage))
         {
             _popupSystem.PopupEntity(
                 Loc.GetString("deep-fryer-thrown-missed"),
@@ -501,7 +499,7 @@ private void OnSolutionChange(EntityUid uid, DeepFryerComponent component, Solut
     private void OnRelayMovement(EntityUid uid, DeepFryerComponent component,
         ref ContainerRelayMovementEntityEvent args)
     {
-        if (!component.Storage.Remove(args.Entity, EntityManager, destination: Transform(uid).Coordinates))
+        if (!_containerSystem.Remove(args.Entity, component.Storage, destination: Transform(uid).Coordinates))
             return;
 
         _popupSystem.PopupEntity(
@@ -524,7 +522,7 @@ private void OnRemoveItem(EntityUid uid, DeepFryerComponent component, DeepFryer
         if (removedItem.Valid)
         {
             //JJ Comment - This line should be unnecessary. Some issue is keeping the UI from updating when converting straight to a Burned Mess while the UI is still open. To replicate, put a Raw Meat in the fryer with no oil in it. Wait until it sputters with no effect. It should transform to Burned Mess, but doesn't.
-            if (!component.Storage.Remove(removedItem))
+            if (!_containerSystem.Remove(removedItem, component.Storage))
                 return;
 
             var user = args.Session.AttachedEntity;
diff --git a/Content.Server/Nyanotrasen/Mail/MailCommands.cs b/Content.Server/Nyanotrasen/Mail/MailCommands.cs
index fba8e4b614..5af873f9e8 100644
--- a/Content.Server/Nyanotrasen/Mail/MailCommands.cs
+++ b/Content.Server/Nyanotrasen/Mail/MailCommands.cs
@@ -100,7 +100,7 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args)
         }
 
         foreach (var entity in targetContainer.ContainedEntities.ToArray())
-            mailContents.Insert(entity);
+            _containerSystem.Insert(entity, mailContents);
 
         mailComponent.IsFragile = isFragile;
         mailComponent.IsPriority = isPriority;
@@ -108,7 +108,7 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args)
         _mailSystem.SetupMail(mailUid, teleporterComponent, recipient.Value);
 
         var teleporterQueue = _containerSystem.EnsureContainer<Container>(teleporterComponent.Owner, "queued");
-        teleporterQueue.Insert(mailUid);
+        _containerSystem.Insert(mailUid, teleporterQueue);
         shell.WriteLine(Loc.GetString("command-mailto-success", ("timeToTeleport", teleporterComponent.TeleportInterval.TotalSeconds - teleporterComponent.Accumulator)));
     }
 }
diff --git a/Content.Server/Nyanotrasen/Mail/MailSystem.cs b/Content.Server/Nyanotrasen/Mail/MailSystem.cs
index 915f7399b0..19f9b3e7b5 100644
--- a/Content.Server/Nyanotrasen/Mail/MailSystem.cs
+++ b/Content.Server/Nyanotrasen/Mail/MailSystem.cs
@@ -445,7 +445,7 @@ public void SetupMail(EntityUid uid, MailTeleporterComponent component, MailReci
             foreach (var item in EntitySpawnCollection.GetSpawns(mailComp.Contents, _random))
             {
                 var entity = EntityManager.SpawnEntity(item, Transform(uid).Coordinates);
-                if (!container.Insert(entity))
+                if (!_containerSystem.Insert(entity, container))
                 {
                     _sawmill.Error($"Can't insert {ToPrettyString(entity)} into new mail delivery {ToPrettyString(uid)}! Deleting it.");
                     QueueDel(entity);
diff --git a/Content.Server/Objectives/ObjectivesSystem.cs b/Content.Server/Objectives/ObjectivesSystem.cs
index b18668247a..20205b8b72 100644
--- a/Content.Server/Objectives/ObjectivesSystem.cs
+++ b/Content.Server/Objectives/ObjectivesSystem.cs
@@ -12,6 +12,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using System.Linq;
+using System.Text;
 
 namespace Content.Server.Objectives;
 
@@ -82,29 +83,32 @@ private void OnRoundEndText(RoundEndTextAppendEvent ev)
                 totalInCustody += minds.Where(m => IsInCustody(m)).Count();
             }
 
-            var result = Loc.GetString("objectives-round-end-result", ("count", total), ("agent", agent));
+            var result = new StringBuilder();
+            result.AppendLine(Loc.GetString("objectives-round-end-result", ("count", total), ("agent", agent)));
             if (agent == Loc.GetString("traitor-round-end-agent-name"))
             {
-                result += "\n" + Loc.GetString("objectives-round-end-result-in-custody", ("count", total), ("custody", totalInCustody), ("agent", agent));
+                result.AppendLine(Loc.GetString("objectives-round-end-result-in-custody", ("count", total), ("custody", totalInCustody), ("agent", agent)));
             }
             // next add all the players with its own prepended text
             foreach (var (prepend, minds) in summary)
             {
                 if (prepend != string.Empty)
-                    result += prepend;
+                    result.Append(prepend);
 
                 // add space between the start text and player list
-                result += "\n";
+                result.AppendLine();
 
-                AddSummary(ref result, agent, minds);
+                AddSummary(result, agent, minds);
             }
 
-            ev.AddLine(result + "\n");
+            ev.AddLine(result.AppendLine().ToString());
         }
     }
 
-    private void AddSummary(ref string result, string agent, List<EntityUid> minds)
+    private void AddSummary(StringBuilder result, string agent, List<EntityUid> minds)
     {
+        var agentSummaries = new List<(string summary, float successRate, int completedObjectives)>();
+
         foreach (var mindId in minds)
         {
             if (!TryComp(mindId, out MindComponent? mind))
@@ -114,25 +118,26 @@ private void AddSummary(ref string result, string agent, List<EntityUid> minds)
             if (title == null)
                 continue;
 
-            result += "\n";
-
             var custody = IsInCustody(mindId, mind) ? Loc.GetString("objectives-in-custody") : string.Empty;
 
             var objectives = mind.Objectives;
             if (objectives.Count == 0)
             {
-                result += Loc.GetString("objectives-no-objectives", ("custody", custody), ("title", title), ("agent", agent));
+                agentSummaries.Add((Loc.GetString("objectives-no-objectives", ("custody", custody), ("title", title), ("agent", agent)), 0f, 0));
                 continue;
             }
 
-            result += Loc.GetString("objectives-with-objectives", ("custody", custody), ("title", title), ("agent", agent));
+            var completedObjectives = 0;
+            var totalObjectives = 0;
+            var agentSummary = new StringBuilder();
+            agentSummary.AppendLine(Loc.GetString("objectives-with-objectives", ("custody", custody), ("title", title), ("agent", agent)));
 
             foreach (var objectiveGroup in objectives.GroupBy(o => Comp<ObjectiveComponent>(o).Issuer))
             {
                 //TO DO:
                 //check for the right group here. Getting the target issuer is easy: objectiveGroup.Key
                 //It should be compared to the type of the group's issuer.
-                result += "\n" + Loc.GetString($"objective-issuer-{objectiveGroup.Key}");
+                agentSummary.AppendLine(Loc.GetString($"objective-issuer-{objectiveGroup.Key}"));
 
                 foreach (var objective in objectiveGroup)
                 {
@@ -142,26 +147,39 @@ private void AddSummary(ref string result, string agent, List<EntityUid> minds)
 
                     var objectiveTitle = info.Value.Title;
                     var progress = info.Value.Progress;
+                    totalObjectives++;
+
+                    agentSummary.Append("- ");
                     if (progress > 0.99f)
                     {
-                        result += "\n- " + Loc.GetString(
+                        agentSummary.AppendLine(Loc.GetString(
                             "objectives-objective-success",
                             ("objective", objectiveTitle),
                             ("markupColor", "green")
-                        );
+                        ));
+                        completedObjectives++;
                     }
                     else
                     {
-                        result += "\n- " + Loc.GetString(
+                        agentSummary.AppendLine(Loc.GetString(
                             "objectives-objective-fail",
                             ("objective", objectiveTitle),
                             ("progress", (int) (progress * 100)),
                             ("markupColor", "red")
-                        );
+                        ));
                     }
                 }
             }
+
+            var successRate = totalObjectives > 0 ? (float) completedObjectives / totalObjectives : 0f;
+            agentSummaries.Add((agentSummary.ToString(), successRate, completedObjectives));
         }
+
+        var sortedAgents = agentSummaries.OrderByDescending(x => x.successRate)
+                                       .ThenByDescending(x => x.completedObjectives);
+
+        foreach (var (summary, _, _) in sortedAgents)
+            result.AppendLine(summary);
     }
 
     public EntityUid? GetRandomObjective(EntityUid mindId, MindComponent mind, string objectiveGroupProto)
diff --git a/Content.Server/Paint/PaintSystem.cs b/Content.Server/Paint/PaintSystem.cs
new file mode 100644
index 0000000000..c6718aced6
--- /dev/null
+++ b/Content.Server/Paint/PaintSystem.cs
@@ -0,0 +1,180 @@
+using Content.Shared.Popups;
+using Content.Shared.Paint;
+using Content.Shared.Sprite;
+using Content.Shared.DoAfter;
+using Content.Shared.Interaction;
+using Content.Server.Chemistry.Containers.EntitySystems;
+using Robust.Shared.Audio.Systems;
+using Content.Shared.Humanoid;
+using Robust.Shared.Utility;
+using Content.Shared.Verbs;
+using Content.Shared.SubFloor;
+using Content.Server.Nutrition.Components;
+using Content.Shared.Inventory;
+using Content.Server.Nutrition.EntitySystems;
+
+namespace Content.Server.Paint;
+
+/// <summary>
+/// Colors target and consumes reagent on each color success.
+/// </summary>
+public sealed class PaintSystem : SharedPaintSystem
+{
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
+    [Dependency] private readonly InventorySystem _inventory = default!;
+    [Dependency] private readonly OpenableSystem _openable = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<PaintComponent, AfterInteractEvent>(OnInteract);
+        SubscribeLocalEvent<PaintComponent, PaintDoAfterEvent>(OnPaint);
+        SubscribeLocalEvent<PaintComponent, GetVerbsEvent<UtilityVerb>>(OnPaintVerb);
+    }
+
+    private void OnInteract(EntityUid uid, PaintComponent component, AfterInteractEvent args)
+    {
+        if (!args.CanReach)
+            return;
+
+        if (args.Target is not { Valid: true } target)
+            return;
+
+        PrepPaint(uid, component, target, args.User);
+    }
+
+    private void OnPaintVerb(EntityUid uid, PaintComponent component, GetVerbsEvent<UtilityVerb> args)
+    {
+        if (!args.CanInteract || !args.CanAccess)
+            return;
+
+        var paintText = Loc.GetString("paint-verb");
+
+        var verb = new UtilityVerb()
+        {
+            Act = () =>
+            {
+                PrepPaint(uid, component, args.Target, args.User);
+            },
+
+            Text = paintText,
+            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/paint.svg.192dpi.png"))
+        };
+        args.Verbs.Add(verb);
+    }
+    private void PrepPaint(EntityUid uid, PaintComponent component, EntityUid target, EntityUid user)
+    {
+
+        var doAfterEventArgs = new DoAfterArgs(EntityManager, user, component.Delay, new PaintDoAfterEvent(), uid, target: target, used: uid)
+        {
+            BreakOnTargetMove = true,
+            BreakOnUserMove = true,
+            BreakOnDamage = true,
+            NeedHand = true,
+            BreakOnHandChange = true
+        };
+
+        if (!_doAfterSystem.TryStartDoAfter(doAfterEventArgs))
+            return;
+    }
+
+    private void OnPaint(Entity<PaintComponent> entity, ref PaintDoAfterEvent args)
+    {
+        if (args.Target == null || args.Used == null)
+            return;
+
+        if (args.Handled || args.Cancelled)
+            return;
+
+        if (args.Target is not { Valid: true } target)
+            return;
+
+        if (!_openable.IsOpen(entity))
+        {
+            _popup.PopupEntity(Loc.GetString("paint-closed", ("used", args.Used)), args.User, args.User, PopupType.Medium);
+            return;
+        }
+
+        if (HasComp<PaintedComponent>(target) || HasComp<RandomSpriteComponent>(target))
+        {
+            _popup.PopupEntity(Loc.GetString("paint-failure-painted", ("target", args.Target)), args.User, args.User, PopupType.Medium);
+            return;
+        }
+
+        if (!entity.Comp.Blacklist?.IsValid(target, EntityManager) != true || HasComp<HumanoidAppearanceComponent>(target) || HasComp<SubFloorHideComponent>(target))
+        {
+            _popup.PopupEntity(Loc.GetString("paint-failure", ("target", args.Target)), args.User, args.User, PopupType.Medium);
+            return;
+        }
+
+
+        if (TryPaint(entity, target))
+        {
+            EnsureComp<PaintedComponent>(target, out PaintedComponent? paint);
+            EnsureComp<AppearanceComponent>(target);
+
+            paint.Color = entity.Comp.Color; // set the target color to the color specified in the spray paint yml.
+            _audio.PlayPvs(entity.Comp.Spray, entity);
+            paint.Enabled = true;
+
+            if (HasComp<InventoryComponent>(target)) // Paint any clothing the target is wearing.
+            {
+                if (_inventory.TryGetSlots(target, out var slotDefinitions))
+                {
+                    foreach (var slot in slotDefinitions)
+                    {
+                        if (!_inventory.TryGetSlotEntity(target, slot.Name, out var slotEnt))
+                            continue;
+
+                        if (slotEnt == null)
+                            return;
+
+                        if (HasComp<PaintedComponent>(slotEnt.Value) || !entity.Comp.Blacklist?.IsValid(slotEnt.Value, EntityManager) != true
+                            || HasComp<RandomSpriteComponent>(slotEnt.Value) || HasComp<HumanoidAppearanceComponent>(slotEnt.Value))
+                            return;
+
+                        EnsureComp<PaintedComponent>(slotEnt.Value, out PaintedComponent? slotpaint);
+                        EnsureComp<AppearanceComponent>(slotEnt.Value);
+                        slotpaint.Color = entity.Comp.Color;
+                        _appearanceSystem.SetData(slotEnt.Value, PaintVisuals.Painted, true);
+                        Dirty(slotEnt.Value, slotpaint);
+                    }
+                }
+            }
+
+            _popup.PopupEntity(Loc.GetString("paint-success", ("target", args.Target)), args.User, args.User, PopupType.Medium);
+            _appearanceSystem.SetData(target, PaintVisuals.Painted, true);
+            Dirty(target, paint);
+            args.Handled = true;
+            return;
+        }
+
+        if (!TryPaint(entity, target))
+        {
+            _popup.PopupEntity(Loc.GetString("paint-empty", ("used", args.Used)), args.User, args.User, PopupType.Medium);
+            return;
+        }
+    }
+
+    private bool TryPaint(Entity<PaintComponent> reagent, EntityUid target)
+    {
+        if (HasComp<HumanoidAppearanceComponent>(target) || HasComp<SubFloorHideComponent>(target))
+            return false;
+
+        if (_solutionContainer.TryGetSolution(reagent.Owner, reagent.Comp.Solution, out _, out var solution))
+        {
+            var quantity = solution.RemoveReagent(reagent.Comp.Reagent, reagent.Comp.ConsumptionUnit);
+            if (quantity > 0)// checks quantity of solution is more than 0.
+                return true;
+
+            if (quantity < 1)
+                return false;
+        }
+        return false;
+    }
+}
diff --git a/Content.Server/Parallax/BiomeSystem.cs b/Content.Server/Parallax/BiomeSystem.cs
index c4c2300870..83cf9b9cb2 100644
--- a/Content.Server/Parallax/BiomeSystem.cs
+++ b/Content.Server/Parallax/BiomeSystem.cs
@@ -1001,20 +1001,13 @@ public void EnsurePlanet(EntityUid mapUid, BiomeTemplatePrototype biomeTemplate,
         light.AmbientLightColor = Color.FromHex("#D8B059");
         Dirty(mapUid, light, metadata);
 
-        // Atmos
-        var atmos = EnsureComp<MapAtmosphereComponent>(mapUid);
-
         var moles = new float[Atmospherics.AdjustedNumberOfGases];
         moles[(int) Gas.Oxygen] = 21.824779f;
         moles[(int) Gas.Nitrogen] = 82.10312f;
 
-        var mixture = new GasMixture(2500)
-        {
-            Temperature = 293.15f,
-            Moles = moles,
-        };
+        var mixture = new GasMixture(moles, Atmospherics.T20C);
 
-        _atmos.SetMapAtmosphere(mapUid, false, mixture, atmos);
+        _atmos.SetMapAtmosphere(mapUid, false, mixture);
     }
 
     /// <summary>
diff --git a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.Emitter.cs b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.Emitter.cs
index 7fad69e349..06f1b6b154 100644
--- a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.Emitter.cs
+++ b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.Emitter.cs
@@ -16,7 +16,7 @@ private void FireEmitter(EntityUid uid, ParticleAcceleratorPowerState strength,
         var xformQuery = GetEntityQuery<TransformComponent>();
         if (!xformQuery.TryGetComponent(uid, out var xform))
         {
-            Logger.Error("ParticleAccelerator attempted to emit a particle without (having) a transform from which to base its initial position and orientation.");
+            Log.Error("ParticleAccelerator attempted to emit a particle without (having) a transform from which to base its initial position and orientation.");
             return;
         }
 
@@ -28,7 +28,7 @@ private void FireEmitter(EntityUid uid, ParticleAcceleratorPowerState strength,
         if (TryComp<PhysicsComponent>(emitted, out var particlePhys))
         {
             var angle = _transformSystem.GetWorldRotation(uid, xformQuery);
-            _physicsSystem.SetBodyStatus(particlePhys, BodyStatus.InAir);
+            _physicsSystem.SetBodyStatus(emitted, particlePhys, BodyStatus.InAir);
 
             var velocity = angle.ToWorldVec() * 20f;
             if (TryComp<PhysicsComponent>(uid, out var phys))
diff --git a/Content.Server/Physics/Controllers/ChasingWalkSystem.cs b/Content.Server/Physics/Controllers/ChasingWalkSystem.cs
index 215e7e3124..618dd4156f 100644
--- a/Content.Server/Physics/Controllers/ChasingWalkSystem.cs
+++ b/Content.Server/Physics/Controllers/ChasingWalkSystem.cs
@@ -97,6 +97,6 @@ private void ForceImpulse(EntityUid uid, ChasingWalkComponent component)
         var speed = delta.Length() > 0 ? delta.Normalized() * component.Speed : Vector2.Zero;
 
         _physics.SetLinearVelocity(uid, speed);
-        _physics.SetBodyStatus(physics, BodyStatus.InAir); //If this is not done, from the explosion up close, the tesla will "Fall" to the ground, and almost stop moving.
+        _physics.SetBodyStatus(uid, physics, BodyStatus.InAir); //If this is not done, from the explosion up close, the tesla will "Fall" to the ground, and almost stop moving.
     }
 }
diff --git a/Content.Server/Pointing/EntitySystems/PointingSystem.cs b/Content.Server/Pointing/EntitySystems/PointingSystem.cs
index a7c455e6a5..9b2e14eff8 100644
--- a/Content.Server/Pointing/EntitySystems/PointingSystem.cs
+++ b/Content.Server/Pointing/EntitySystems/PointingSystem.cs
@@ -36,7 +36,9 @@ internal sealed class PointingSystem : SharedPointingSystem
         [Dependency] private readonly SharedPopupSystem _popup = default!;
         [Dependency] private readonly VisibilitySystem _visibilitySystem = default!;
         [Dependency] private readonly SharedMindSystem _minds = default!;
+        [Dependency] private readonly SharedTransformSystem _transform = default!;
         [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+        [Dependency] private readonly ExamineSystemShared _examine = default!;
 
         private static readonly TimeSpan PointDelay = TimeSpan.FromSeconds(0.5f);
 
@@ -96,11 +98,11 @@ public bool InRange(EntityUid pointer, EntityCoordinates coordinates)
         {
             if (HasComp<GhostComponent>(pointer))
             {
-                return Transform(pointer).Coordinates.InRange(EntityManager, coordinates, 15);
+                return Transform(pointer).Coordinates.InRange(EntityManager, _transform, coordinates, 15);
             }
             else
             {
-                return ExamineSystemShared.InRangeUnOccluded(pointer, coordinates, 15, predicate: e => e == pointer);
+                return _examine.InRangeUnOccluded(pointer, coordinates, 15, predicate: e => e == pointer);
             }
         }
 
@@ -141,7 +143,7 @@ public bool TryPoint(ICommonSession? session, EntityCoordinates coordsPointed, E
                 return false;
             }
 
-            var mapCoordsPointed = coordsPointed.ToMap(EntityManager);
+            var mapCoordsPointed = coordsPointed.ToMap(EntityManager, _transform);
             _rotateToFaceSystem.TryFaceCoordinates(player, mapCoordsPointed.Position);
 
             var arrow = EntityManager.SpawnEntity("PointingArrow", coordsPointed);
@@ -149,7 +151,7 @@ public bool TryPoint(ICommonSession? session, EntityCoordinates coordsPointed, E
             if (TryComp<PointingArrowComponent>(arrow, out var pointing))
             {
                 if (TryComp(player, out TransformComponent? xformPlayer))
-                    pointing.StartPosition = EntityCoordinates.FromMap(arrow, xformPlayer.Coordinates.ToMap(EntityManager)).Position;
+                    pointing.StartPosition = EntityCoordinates.FromMap(arrow, xformPlayer.Coordinates.ToMap(EntityManager, _transform), _transform).Position;
 
                 pointing.EndTime = _gameTiming.CurTime + PointDuration;
 
diff --git a/Content.Server/Power/EntitySystems/ChargerSystem.cs b/Content.Server/Power/EntitySystems/ChargerSystem.cs
index b6b718455d..db16dfa008 100644
--- a/Content.Server/Power/EntitySystems/ChargerSystem.cs
+++ b/Content.Server/Power/EntitySystems/ChargerSystem.cs
@@ -6,7 +6,6 @@
 using JetBrains.Annotations;
 using Robust.Shared.Containers;
 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
 using Content.Shared.Storage.Components;
 using Robust.Server.Containers;
 
@@ -179,7 +178,7 @@ private CellChargerStatus GetStatus(EntityUid uid, ChargerComponent component)
         if (container.ContainedEntities.Count == 0)
             return CellChargerStatus.Empty;
 
-        if (!SearchForBattery(container.ContainedEntities.First(), out var heldBattery))
+        if (!SearchForBattery(container.ContainedEntities[0], out _, out var heldBattery))
             return CellChargerStatus.Off;
 
         if (Math.Abs(heldBattery.MaxCharge - heldBattery.CurrentCharge) < 0.01)
@@ -199,27 +198,28 @@ private void TransferPower(EntityUid uid, EntityUid targetEntity, ChargerCompone
         if (component.Whitelist?.IsValid(targetEntity, EntityManager) == false)
             return;
 
-        if (!SearchForBattery(targetEntity, out var heldBattery))
+        if (!SearchForBattery(targetEntity, out var batteryUid, out var heldBattery))
             return;
 
-        _battery.SetCharge(targetEntity, heldBattery.CurrentCharge + component.ChargeRate * frameTime, heldBattery);
+        _battery.SetCharge(batteryUid.Value, heldBattery.CurrentCharge + component.ChargeRate * frameTime, heldBattery);
         // Just so the sprite won't be set to 99.99999% visibility
         if (heldBattery.MaxCharge - heldBattery.CurrentCharge < 0.01)
         {
-            _battery.SetCharge(targetEntity, heldBattery.MaxCharge, heldBattery);
+            _battery.SetCharge(batteryUid.Value, heldBattery.MaxCharge, heldBattery);
         }
 
         UpdateStatus(uid, component);
     }
 
-    private bool SearchForBattery(EntityUid uid, [NotNullWhen(true)] out BatteryComponent? component)
+    private bool SearchForBattery(EntityUid uid, [NotNullWhen(true)] out EntityUid? batteryUid, [NotNullWhen(true)] out BatteryComponent? component)
     {
         // try get a battery directly on the inserted entity
         if (!TryComp(uid, out component))
         {
             // or by checking for a power cell slot on the inserted entity
-            return _powerCell.TryGetBatteryFromSlot(uid, out component);
+            return _powerCell.TryGetBatteryFromSlot(uid, out batteryUid, out component);
         }
+        batteryUid = uid;
         return true;
     }
 }
diff --git a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs
index 5ed39d5178..048fda2355 100644
--- a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs
@@ -20,6 +20,8 @@ public sealed class PowerReceiverSystem : EntitySystem
         [Dependency] private readonly IAdminManager _adminManager = default!;
         [Dependency] private readonly AppearanceSystem _appearance = default!;
         [Dependency] private readonly AudioSystem _audio = default!;
+        private EntityQuery<ApcPowerReceiverComponent> _recQuery;
+        private EntityQuery<ApcPowerProviderComponent> _provQuery;
 
         public override void Initialize()
         {
@@ -35,6 +37,9 @@ public override void Initialize()
 
             SubscribeLocalEvent<ApcPowerReceiverComponent, GetVerbsEvent<Verb>>(OnGetVerbs);
             SubscribeLocalEvent<PowerSwitchComponent, GetVerbsEvent<AlternativeVerb>>(AddSwitchPowerVerb);
+
+            _recQuery = GetEntityQuery<ApcPowerReceiverComponent>();
+            _provQuery = GetEntityQuery<ApcPowerProviderComponent>();
         }
 
         private void OnGetVerbs(EntityUid uid, ApcPowerReceiverComponent component, GetVerbsEvent<Verb> args)
@@ -77,7 +82,7 @@ private void OnProviderShutdown(EntityUid uid, ApcPowerProviderComponent compone
         private void OnProviderConnected(Entity<ApcPowerReceiverComponent> receiver, ref ExtensionCableSystem.ProviderConnectedEvent args)
         {
             var providerUid = args.Provider.Owner;
-            if (!EntityManager.TryGetComponent<ApcPowerProviderComponent>(providerUid, out var provider))
+            if (!_provQuery.TryGetComponent(providerUid, out var provider))
                 return;
 
             receiver.Comp.Provider = provider;
@@ -94,7 +99,7 @@ private void OnProviderDisconnected(Entity<ApcPowerReceiverComponent> receiver,
 
         private void OnReceiverConnected(Entity<ApcPowerProviderComponent> provider, ref ExtensionCableSystem.ReceiverConnectedEvent args)
         {
-            if (EntityManager.TryGetComponent(args.Receiver, out ApcPowerReceiverComponent? receiver))
+            if (_recQuery.TryGetComponent(args.Receiver, out var receiver))
             {
                 provider.Comp.AddReceiver(receiver);
             }
@@ -102,7 +107,7 @@ private void OnReceiverConnected(Entity<ApcPowerProviderComponent> provider, ref
 
         private void OnReceiverDisconnected(EntityUid uid, ApcPowerProviderComponent provider, ExtensionCableSystem.ReceiverDisconnectedEvent args)
         {
-            if (EntityManager.TryGetComponent(args.Receiver, out ApcPowerReceiverComponent? receiver))
+            if (_recQuery.TryGetComponent(args.Receiver, out var receiver))
             {
                 provider.RemoveReceiver(receiver);
             }
@@ -116,7 +121,7 @@ private void AddSwitchPowerVerb(EntityUid uid, PowerSwitchComponent component, G
             if (!HasComp<HandsComponent>(args.User))
                 return;
 
-            if (!TryComp<ApcPowerReceiverComponent>(uid, out var receiver))
+            if (!_recQuery.TryGetComponent(uid, out var receiver))
                 return;
 
             if (!receiver.NeedsPower)
@@ -152,7 +157,7 @@ private void ProviderChanged(Entity<ApcPowerReceiverComponent> receiver)
         /// </summary>
         public bool IsPowered(EntityUid uid, ApcPowerReceiverComponent? receiver = null)
         {
-            if (!Resolve(uid, ref receiver, false))
+            if (!_recQuery.Resolve(uid, ref receiver, false))
                 return true;
 
             return receiver.Powered;
@@ -164,7 +169,7 @@ public bool IsPowered(EntityUid uid, ApcPowerReceiverComponent? receiver = null)
         /// </summary>
         public bool TogglePower(EntityUid uid, bool playSwitchSound = true, ApcPowerReceiverComponent? receiver = null, EntityUid? user = null)
         {
-            if (!Resolve(uid, ref receiver, false))
+            if (!_recQuery.Resolve(uid, ref receiver, false))
                 return true;
 
             // it'll save a lot of confusion if 'always powered' means 'always powered'
diff --git a/Content.Server/Power/Generator/GasPowerReceiverSystem.cs b/Content.Server/Power/Generator/GasPowerReceiverSystem.cs
index c61599edfc..76cf90c369 100644
--- a/Content.Server/Power/Generator/GasPowerReceiverSystem.cs
+++ b/Content.Server/Power/Generator/GasPowerReceiverSystem.cs
@@ -37,7 +37,7 @@ private void OnDeviceUpdated(EntityUid uid, GasPowerReceiverComponent component,
         if (pipe.Air.Temperature <= component.MaxTemperature)
         {
             // we have enough gas, so we consume it and are powered
-            if (pipe.Air.Moles[(int) component.TargetGas] > component.MolesConsumedSec * timeDelta)
+            if (pipe.Air[(int) component.TargetGas] > component.MolesConsumedSec * timeDelta)
             {
                 pipe.Air.AdjustMoles(component.TargetGas, -component.MolesConsumedSec * timeDelta);
                 SetPowered(uid, component, true);
diff --git a/Content.Server/Procedural/DungeonJob.CorridorClutterPost.cs b/Content.Server/Procedural/DungeonJob.CorridorClutterPost.cs
new file mode 100644
index 0000000000..8099157cc5
--- /dev/null
+++ b/Content.Server/Procedural/DungeonJob.CorridorClutterPost.cs
@@ -0,0 +1,53 @@
+using System.Threading.Tasks;
+using Content.Shared.Procedural;
+using Content.Shared.Procedural.PostGeneration;
+using Content.Shared.Storage;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Random;
+
+namespace Content.Server.Procedural;
+
+public sealed partial class DungeonJob
+{
+    private async Task PostGen(CorridorClutterPostGen gen, Dungeon dungeon, EntityUid gridUid, MapGridComponent grid,
+        Random random)
+    {
+        var physicsQuery = _entManager.GetEntityQuery<PhysicsComponent>();
+        var count = (int) Math.Ceiling(dungeon.CorridorTiles.Count * gen.Chance);
+
+        while (count > 0)
+        {
+            var tile = random.Pick(dungeon.CorridorTiles);
+
+            var enumerator = _maps.GetAnchoredEntitiesEnumerator(_gridUid, _grid, tile);
+            var blocked = false;
+
+            while (enumerator.MoveNext(out var ent))
+            {
+                if (!physicsQuery.TryGetComponent(ent, out var physics) ||
+                    !physics.CanCollide ||
+                    !physics.Hard)
+                {
+                    continue;
+                }
+
+                blocked = true;
+                break;
+            }
+
+            if (blocked)
+                continue;
+
+            count--;
+
+            var protos = EntitySpawnCollection.GetSpawns(gen.Contents, random);
+            var coords = _maps.ToCenterCoordinates(_gridUid, tile, _grid);
+            _entManager.SpawnEntities(coords, protos);
+            await SuspendIfOutOfTime();
+
+            if (!ValidateResume())
+                return;
+        }
+    }
+}
diff --git a/Content.Server/Procedural/DungeonJob.PostGen.cs b/Content.Server/Procedural/DungeonJob.PostGen.cs
index 9674cb5fae..b326bcc378 100644
--- a/Content.Server/Procedural/DungeonJob.PostGen.cs
+++ b/Content.Server/Procedural/DungeonJob.PostGen.cs
@@ -26,7 +26,7 @@ public sealed partial class DungeonJob
 
     private bool HasWall(MapGridComponent grid, Vector2i tile)
     {
-        var anchored = grid.GetAnchoredEntitiesEnumerator(tile);
+        var anchored = _maps.GetAnchoredEntitiesEnumerator(_gridUid, _grid, tile);
 
         while (anchored.MoveNext(out var uid))
         {
@@ -52,7 +52,7 @@ private async Task PostGen(AutoCablingPostGen gen, Dungeon dungeon, EntityUid gr
         // Gather existing nodes
         foreach (var tile in allTiles)
         {
-            var anchored = grid.GetAnchoredEntitiesEnumerator(tile);
+            var anchored = _maps.GetAnchoredEntitiesEnumerator(_gridUid, _grid, tile);
 
             while (anchored.MoveNext(out var anc))
             {
@@ -186,7 +186,9 @@ private async Task PostGen(BoundaryWallPostGen gen, Dungeon dungeon, EntityUid g
         // - Tiles first
         foreach (var neighbor in dungeon.RoomExteriorTiles)
         {
-            if (dungeon.RoomTiles.Contains(neighbor))
+            DebugTools.Assert(!dungeon.RoomTiles.Contains(neighbor));
+
+            if (dungeon.Entrances.Contains(neighbor))
                 continue;
 
             if (!_anchorable.TileFree(grid, neighbor, DungeonSystem.CollisionLayer, DungeonSystem.CollisionMask))
@@ -265,7 +267,6 @@ private async Task PostGen(CornerClutterPostGen gen, Dungeon dungeon, EntityUid
         Random random)
     {
         var physicsQuery = _entManager.GetEntityQuery<PhysicsComponent>();
-        var tagQuery = _entManager.GetEntityQuery<TagComponent>();
 
         foreach (var tile in dungeon.CorridorTiles)
         {
@@ -771,7 +772,7 @@ private async Task PostGen(CorridorPostGen gen, Dungeon dungeon, EntityUid gridU
                 {
                     for (var y = -expansion; y <= expansion; y++)
                     {
-                        var neighbor = new Vector2i(tile.X + x, tile.Y + y);
+                        var neighbor = new Vector2(tile.X + x, tile.Y + y).Floored();
 
                         if (dungeon.RoomTiles.Contains(neighbor) ||
                             dungeon.RoomExteriorTiles.Contains(neighbor) ||
@@ -817,6 +818,52 @@ private async Task PostGen(CorridorPostGen gen, Dungeon dungeon, EntityUid gridU
             return mod;
         });
 
+        WidenCorridor(dungeon, gen.Width, corridorTiles);
+
+        var setTiles = new List<(Vector2i, Tile)>();
+        var tileDef = _prototype.Index(gen.Tile);
+
+        foreach (var tile in corridorTiles)
+        {
+            setTiles.Add((tile, _tile.GetVariantTile(tileDef, random)));
+        }
+
+        grid.SetTiles(setTiles);
+        dungeon.CorridorTiles.UnionWith(corridorTiles);
+        BuildCorridorExterior(dungeon);
+    }
+
+    private void BuildCorridorExterior(Dungeon dungeon)
+    {
+        var exterior = dungeon.CorridorExteriorTiles;
+
+        // Just ignore entrances or whatever for now.
+        foreach (var tile in dungeon.CorridorTiles)
+        {
+            for (var x = -1; x <= 1; x++)
+            {
+                for (var y = -1; y <= 1; y++)
+                {
+                    var neighbor = new Vector2i(tile.X + x, tile.Y + y);
+
+                    if (dungeon.CorridorTiles.Contains(neighbor) ||
+                        dungeon.RoomExteriorTiles.Contains(neighbor) ||
+                        dungeon.RoomTiles.Contains(neighbor) ||
+                        dungeon.Entrances.Contains(neighbor))
+                    {
+                        continue;
+                    }
+
+                    exterior.Add(neighbor);
+                }
+            }
+        }
+    }
+
+    private void WidenCorridor(Dungeon dungeon, float width, ICollection<Vector2i> corridorTiles)
+    {
+        var expansion = width - 2;
+
         // Widen the path
         if (expansion >= 1)
         {
@@ -831,7 +878,7 @@ private async Task PostGen(CorridorPostGen gen, Dungeon dungeon, EntityUid gridU
                 {
                     for (var y = -expansion; y <= expansion; y++)
                     {
-                        var neighbor = new Vector2i(node.X + x, node.Y + y);
+                        var neighbor = new Vector2(node.X + x, node.Y + y).Floored();
 
                         // Diagonals still matter here.
                         if (dungeon.RoomTiles.Contains(neighbor) ||
@@ -852,36 +899,6 @@ private async Task PostGen(CorridorPostGen gen, Dungeon dungeon, EntityUid gridU
                 corridorTiles.Add(node);
             }
         }
-
-        var setTiles = new List<(Vector2i, Tile)>();
-        var tileDef = _prototype.Index(gen.Tile);
-
-        foreach (var tile in corridorTiles)
-        {
-            setTiles.Add((tile, _tile.GetVariantTile(tileDef, random)));
-        }
-
-        grid.SetTiles(setTiles);
-        dungeon.CorridorTiles.UnionWith(corridorTiles);
-
-        var exterior = dungeon.CorridorExteriorTiles;
-
-        // Just ignore entrances or whatever for now.
-        foreach (var tile in dungeon.CorridorTiles)
-        {
-            for (var x = -1; x <= 1; x++)
-            {
-                for (var y = -1; y <= 1; y++)
-                {
-                    var neighbor = new Vector2i(tile.X + x, tile.Y + y);
-
-                    if (dungeon.CorridorTiles.Contains(neighbor))
-                        continue;
-
-                    exterior.Add(neighbor);
-                }
-            }
-        }
     }
 
     private async Task PostGen(EntranceFlankPostGen gen, Dungeon dungeon, EntityUid gridUid, MapGridComponent grid,
diff --git a/Content.Server/Procedural/DungeonJob.PrefabDunGen.cs b/Content.Server/Procedural/DungeonJob.PrefabDunGen.cs
index 230c21c56e..1783a56790 100644
--- a/Content.Server/Procedural/DungeonJob.PrefabDunGen.cs
+++ b/Content.Server/Procedural/DungeonJob.PrefabDunGen.cs
@@ -21,7 +21,6 @@ private async Task<Dungeon> GeneratePrefabDungeon(PrefabDunGen prefab, EntityUid
         var dungeonRotation = _dungeon.GetDungeonRotation(seed);
         var dungeonTransform = Matrix3.CreateTransform(_position, dungeonRotation);
         var roomPackProtos = new Dictionary<Vector2i, List<DungeonRoomPackPrototype>>();
-        var fallbackTile = new Tile(_tileDefManager[prefab.Tile].TileId);
 
         foreach (var pack in _prototype.EnumeratePrototypes<DungeonRoomPackPrototype>())
         {
@@ -325,6 +324,7 @@ private void SetDungeonEntrance(Dungeon dungeon, DungeonRoom room, Random random
                 }
 
                 room.Entrances.Add(entrancePos);
+                dungeon.Entrances.Add(entrancePos);
                 break;
             }
         }
diff --git a/Content.Server/Procedural/DungeonJob.WormPost.cs b/Content.Server/Procedural/DungeonJob.WormPost.cs
new file mode 100644
index 0000000000..5d2271cae6
--- /dev/null
+++ b/Content.Server/Procedural/DungeonJob.WormPost.cs
@@ -0,0 +1,193 @@
+using System.Linq;
+using System.Numerics;
+using System.Threading.Tasks;
+using Content.Shared.Procedural;
+using Content.Shared.Procedural.PostGeneration;
+using Robust.Shared.Collections;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Random;
+using Robust.Shared.Utility;
+
+namespace Content.Server.Procedural;
+
+public sealed partial class DungeonJob
+{
+    /// <summary>
+    /// Tries to connect rooms via worm-like corridors.
+    /// </summary>
+    private async Task PostGen(WormCorridorPostGen gen, Dungeon dungeon, EntityUid gridUid, MapGridComponent grid, Random random)
+    {
+        var networks = new List<(Vector2i Start, HashSet<Vector2i> Network)>();
+
+        // List of places to start from.
+        var worm = new ValueList<Vector2i>();
+        var startAngles = new Dictionary<Vector2i, Angle>();
+
+        foreach (var room in dungeon.Rooms)
+        {
+            foreach (var entrance in room.Entrances)
+            {
+                var network = new HashSet<Vector2i> { entrance };
+                networks.Add((entrance, network));
+
+                // Point away from the room to start with.
+                startAngles.Add(entrance, (entrance + grid.TileSizeHalfVector - room.Center).ToAngle());
+            }
+        }
+
+        // There's a lot of ways to handle this, e.g. pathfinding towards each room
+        // For simplicity we'll go through each entrance randomly and generate worms from it
+        // then as a final step we will connect all of their networks.
+        random.Shuffle(networks);
+
+        for (var i = 0; i < gen.Count; i++)
+        {
+            // Find a random network to worm from.
+            var startIndex = (i % networks.Count);
+            var startPos = networks[startIndex].Start;
+            var position = startPos + grid.TileSizeHalfVector;
+
+            var remainingLength = gen.Length;
+            worm.Clear();
+            var angle = startAngles[startPos];
+
+            for (var x = remainingLength; x >= 0; x--)
+            {
+                position += angle.ToVec();
+                angle += random.NextAngle(-gen.MaxAngleChange, gen.MaxAngleChange);
+                var roundedPos = position.Floored();
+
+                // Check if the tile doesn't overlap something it shouldn't
+                if (dungeon.RoomTiles.Contains(roundedPos) ||
+                    dungeon.RoomExteriorTiles.Contains(roundedPos))
+                {
+                    continue;
+                }
+
+                worm.Add(roundedPos);
+            }
+
+            // Uhh yeah.
+            if (worm.Count == 0)
+            {
+                continue;
+            }
+
+            // Find a random part on the existing worm to start.
+            var value = random.Pick(worm);
+            networks[startIndex].Network.UnionWith(worm);
+            startAngles[value] = random.NextAngle();
+        }
+
+        // Now to ensure they all connect we'll pathfind each network to one another
+        // Simple BFS pathfinder
+        var main = networks[0];
+
+        var frontier = new PriorityQueue<Vector2i, float>();
+        var cameFrom = new Dictionary<Vector2i, Vector2i>();
+        var costSoFar = new Dictionary<Vector2i, float>();
+
+        // How many times we try to patch the networks together
+        var attempts = 3;
+
+        for (var attempt = 0; attempt < attempts; attempt++)
+        {
+            // Skip index 0
+            for (var i = networks.Count - 1; i > 0; i--)
+            {
+                cameFrom.Clear();
+                frontier.Clear();
+                costSoFar.Clear();
+
+                var targetNode = random.Pick(main.Network);
+
+                var other = networks[i];
+                var startNode = other.Network.First();
+                frontier.Enqueue(startNode, 0f);
+                costSoFar[startNode] = 0f;
+                var count = 0;
+
+                await SuspendIfOutOfTime();
+                if (!ValidateResume())
+                    return;
+
+                while (frontier.TryDequeue(out var node, out _) && count < gen.PathLimit)
+                {
+                    count++;
+
+                    // Found
+                    if (main.Network.Contains(node))
+                    {
+                        // found, rebuild
+                        frontier.Clear();
+                        main.Network.Add(node);
+                        main.Network.UnionWith(other.Network);
+                        var target = node;
+
+                        // Rebuild
+                        while (cameFrom.TryGetValue(target, out var source))
+                        {
+                            target = source;
+                            main.Network.Add(target);
+                        }
+
+                        networks.RemoveSwap(i);
+                        continue;
+                    }
+
+                    for (var x = -1; x <= 1; x++)
+                    {
+                        for (var y = -1; y <= 1; y++)
+                        {
+                            if (x == 0 && y == 0)
+                                continue;
+
+                            var neighbor = node + new Vector2i(x, y);
+
+                            // Exclude room tiles.
+                            if (dungeon.RoomTiles.Contains(neighbor) ||
+                                dungeon.RoomExteriorTiles.Contains(neighbor))
+                            {
+                                continue;
+                            }
+
+                            var tileCost = (neighbor - node).Length;
+                            var gScore = costSoFar[node] + tileCost;
+
+                            if (costSoFar.TryGetValue(neighbor, out var nextValue) && gScore >= nextValue)
+                            {
+                                continue;
+                            }
+
+                            cameFrom[neighbor] = node;
+                            costSoFar[neighbor] = gScore;
+                            var hScore = (targetNode - neighbor).Length + gScore;
+
+                            frontier.Enqueue(neighbor, hScore);
+                        }
+                    }
+                }
+            }
+        }
+
+        WidenCorridor(dungeon, gen.Width, main.Network);
+        dungeon.CorridorTiles.UnionWith(main.Network);
+        BuildCorridorExterior(dungeon);
+
+        var tiles = new List<(Vector2i Index, Tile Tile)>();
+        var tileDef = _prototype.Index(gen.Tile);
+
+        foreach (var tile in dungeon.CorridorTiles)
+        {
+            tiles.Add((tile, _tile.GetVariantTile(tileDef, random)));
+        }
+
+        foreach (var tile in dungeon.CorridorExteriorTiles)
+        {
+            tiles.Add((tile, _tile.GetVariantTile(tileDef, random)));
+        }
+
+        _maps.SetTiles(_gridUid, _grid, tiles);
+    }
+}
diff --git a/Content.Server/Procedural/DungeonJob.cs b/Content.Server/Procedural/DungeonJob.cs
index c8a69808d3..8fecf1c9e8 100644
--- a/Content.Server/Procedural/DungeonJob.cs
+++ b/Content.Server/Procedural/DungeonJob.cs
@@ -126,6 +126,9 @@ public DungeonJob(
                 case CornerClutterPostGen clutter:
                     await PostGen(clutter, dungeon, _gridUid, _grid, random);
                     break;
+                case CorridorClutterPostGen corClutter:
+                    await PostGen(corClutter, dungeon, _gridUid, _grid, random);
+                    break;
                 case CorridorPostGen cordor:
                     await PostGen(cordor, dungeon, _gridUid, _grid, random);
                     break;
@@ -159,6 +162,9 @@ public DungeonJob(
                 case WallMountPostGen wall:
                     await PostGen(wall, dungeon, _gridUid, _grid, random);
                     break;
+                case WormCorridorPostGen worm:
+                    await PostGen(worm, dungeon, _gridUid, _grid, random);
+                    break;
                 default:
                     throw new NotImplementedException();
             }
diff --git a/Content.Server/Radio/EntitySystems/JammerSystem.cs b/Content.Server/Radio/EntitySystems/JammerSystem.cs
index dc6f476416..53e0409af0 100644
--- a/Content.Server/Radio/EntitySystems/JammerSystem.cs
+++ b/Content.Server/Radio/EntitySystems/JammerSystem.cs
@@ -1,7 +1,13 @@
+using Content.Server.DeviceNetwork.Components;
+using Content.Server.DeviceNetwork.Systems;
+using Content.Server.Medical.CrewMonitoring;
+using Content.Server.Medical.SuitSensors;
 using Content.Server.Popups;
 using Content.Server.Power.EntitySystems;
 using Content.Server.PowerCell;
 using Content.Server.Radio.Components;
+using Content.Server.Station.Systems;
+using Content.Shared.DeviceNetwork.Components;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.PowerCell.Components;
@@ -14,6 +20,8 @@ public sealed class JammerSystem : EntitySystem
     [Dependency] private readonly BatterySystem _battery = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly StationSystem _stationSystem = default!;
+    [Dependency] private readonly SingletonDeviceNetServerSystem _singletonServerSystem = default!;
 
     public override void Initialize()
     {
@@ -23,6 +31,7 @@ public override void Initialize()
         SubscribeLocalEvent<ActiveRadioJammerComponent, PowerCellChangedEvent>(OnPowerCellChanged);
         SubscribeLocalEvent<RadioJammerComponent, ExaminedEvent>(OnExamine);
         SubscribeLocalEvent<RadioSendAttemptEvent>(OnRadioSendAttempt);
+        SubscribeLocalEvent<SuitSensorComponent, SuitSensorsSendAttemptEvent>(OnSensorSendAttempt);
     }
 
     public override void Update(float frameTime)
@@ -34,6 +43,7 @@ public override void Update(float frameTime)
                 !_battery.TryUseCharge(batteryUid.Value, jam.Wattage * frameTime, battery))
             {
                 RemComp<ActiveRadioJammerComponent>(uid);
+                RemComp<DeviceNetworkJammerComponent>(uid);
             }
         }
     }
@@ -46,10 +56,19 @@ private void OnActivate(EntityUid uid, RadioJammerComponent comp, ActivateInWorl
         if (activated)
         {
             EnsureComp<ActiveRadioJammerComponent>(uid);
+            var stationId = _stationSystem.GetOwningStation(uid);
+            if (stationId != null && _singletonServerSystem.TryGetActiveServerAddress<CrewMonitoringServerComponent>(stationId.Value, out var netId))
+            {
+                EnsureComp<DeviceNetworkJammerComponent>(uid, out var jammingComp);
+                jammingComp.Range = comp.Range;
+                jammingComp.JammableNetworks.Add(netId);
+                Dirty(uid, jammingComp);
+            }
         }
         else
         {
             RemComp<ActiveRadioJammerComponent>(uid);
+            RemComp<DeviceNetworkJammerComponent>(uid);
         }
         var state = Loc.GetString(activated ? "radio-jammer-component-on-state" : "radio-jammer-component-off-state");
         var message = Loc.GetString("radio-jammer-component-on-use", ("state", state));
@@ -76,15 +95,33 @@ private void OnExamine(EntityUid uid, RadioJammerComponent comp, ExaminedEvent a
 
     private void OnRadioSendAttempt(ref RadioSendAttemptEvent args)
     {
-        var source = Transform(args.RadioSource).Coordinates;
+        if (ShouldCancelSend(args.RadioSource))
+        {
+            args.Cancelled = true;
+        }
+    }
+
+    private void OnSensorSendAttempt(EntityUid uid, SuitSensorComponent comp, ref SuitSensorsSendAttemptEvent args)
+    {
+        if (ShouldCancelSend(uid))
+        {
+            args.Cancelled = true;
+        }
+    }
+
+    private bool ShouldCancelSend(EntityUid sourceUid)
+    {
+        var source = Transform(sourceUid).Coordinates;
         var query = EntityQueryEnumerator<ActiveRadioJammerComponent, RadioJammerComponent, TransformComponent>();
+
         while (query.MoveNext(out _, out _, out var jam, out var transform))
         {
             if (source.InRange(EntityManager, _transform, transform.Coordinates, jam.Range))
             {
-                args.Cancelled = true;
-                return;
+                return true;
             }
         }
+
+        return false;
     }
 }
diff --git a/Content.Server/Remotes/DoorRemoteSystem.cs b/Content.Server/Remotes/DoorRemoteSystem.cs
index 9be7e5e96b..d335911901 100644
--- a/Content.Server/Remotes/DoorRemoteSystem.cs
+++ b/Content.Server/Remotes/DoorRemoteSystem.cs
@@ -22,6 +22,7 @@ public sealed class DoorRemoteSystem : EntitySystem
         [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
         [Dependency] private readonly DoorSystem _doorSystem = default!;
         [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
+        [Dependency] private readonly ExamineSystemShared _examine = default!;
         // I'm so sorry [Dependency] private readonly SharedAirlockSystem _sharedAirlockSystem = default!;
 
         public override void Initialize()
@@ -67,7 +68,7 @@ private void OnBeforeInteract(EntityUid uid, DoorRemoteComponent component, Befo
                 || !TryComp<DoorComponent>(args.Target, out var doorComp) // If it isn't a door we don't use it
                 // Only able to control doors if they are within your vision and within your max range.
                 // Not affected by mobs or machines anymore.
-                || !ExamineSystemShared.InRangeUnOccluded(args.User, args.Target.Value, SharedInteractionSystem.MaxRaycastRange, null))
+                || !_examine.InRangeUnOccluded(args.User, args.Target.Value, SharedInteractionSystem.MaxRaycastRange, null))
             {
                 return;
             }
@@ -80,10 +81,8 @@ private void OnBeforeInteract(EntityUid uid, DoorRemoteComponent component, Befo
                 return;
             }
 
-            // Holding the door remote grants you access to the relevant doors IN ADDITION to what ever access you had.
-            // This access is enforced in _doorSystem.HasAccess when it calls _accessReaderSystem.IsAllowed
             if (TryComp<AccessReaderComponent>(args.Target, out var accessComponent)
-                && !_doorSystem.HasAccess(args.Target.Value, args.User, doorComp, accessComponent))
+                && !_doorSystem.HasAccess(args.Target.Value, args.Used, doorComp, accessComponent))
             {
                 _doorSystem.Deny(args.Target.Value, doorComp, args.User);
                 ShowPopupToUser("door-remote-denied", args.User);
@@ -93,10 +92,7 @@ private void OnBeforeInteract(EntityUid uid, DoorRemoteComponent component, Befo
             switch (component.Mode)
             {
                 case OperatingMode.OpenClose:
-                    // Note we provide args.User here to TryToggleDoor as the "user"
-                    // This means that the door will look at all access items carryed by the player for access, including
-                    // this remote, but also including anything else they are carrying such as a PDA or ID card.
-                    if (_doorSystem.TryToggleDoor(args.Target.Value, doorComp, args.User))
+                    if (_doorSystem.TryToggleDoor(args.Target.Value, doorComp, args.Used))
                         _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(args.User):player} used {ToPrettyString(args.Used)} on {ToPrettyString(args.Target.Value)}: {doorComp.State}");
                     break;
                 case OperatingMode.ToggleBolts:
@@ -104,7 +100,7 @@ private void OnBeforeInteract(EntityUid uid, DoorRemoteComponent component, Befo
                     {
                         if (!boltsComp.BoltWireCut)
                         {
-                            _doorSystem.SetBoltsDown((args.Target.Value, boltsComp), !boltsComp.BoltsDown, args.User);
+                            _doorSystem.SetBoltsDown((args.Target.Value, boltsComp), !boltsComp.BoltsDown, args.Used);
                             _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(args.User):player} used {ToPrettyString(args.Used)} on {ToPrettyString(args.Target.Value)} to {(boltsComp.BoltsDown ? "" : "un")}bolt it");
                         }
                     }
diff --git a/Content.Server/Respawn/SpecialRespawnSystem.cs b/Content.Server/Respawn/SpecialRespawnSystem.cs
index 51c092be18..2822c94093 100644
--- a/Content.Server/Respawn/SpecialRespawnSystem.cs
+++ b/Content.Server/Respawn/SpecialRespawnSystem.cs
@@ -20,6 +20,7 @@ public sealed class SpecialRespawnSystem : SharedSpecialRespawnSystem
     [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
     [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly TurfSystem _turf = default!;
     [Dependency] private readonly IChatManager _chat = default!;
 
@@ -129,11 +130,11 @@ private void OnTermination(EntityUid uid, SpecialRespawnComponent component, ref
     private void Respawn(EntityUid oldEntity, string prototype, EntityCoordinates coords)
     {
         var entity = Spawn(prototype, coords);
-        _adminLog.Add(LogType.Respawn, LogImpact.High, $"{ToPrettyString(oldEntity)} was deleted and was respawned at {coords.ToMap(EntityManager)} as {ToPrettyString(entity)}");
+        _adminLog.Add(LogType.Respawn, LogImpact.High, $"{ToPrettyString(oldEntity)} was deleted and was respawned at {coords.ToMap(EntityManager, _transform)} as {ToPrettyString(entity)}");
         _chat.SendAdminAlert($"{MetaData(oldEntity).EntityName} was deleted and was respawned as {ToPrettyString(entity)}");
     }
 
-        /// <summary>
+    /// <summary>
     /// Try to find a random safe tile on the supplied grid
     /// </summary>
     /// <param name="targetGrid">The grid that you're looking for a safe tile on</param>
diff --git a/Content.Server/Salvage/SpawnSalvageMissionJob.cs b/Content.Server/Salvage/SpawnSalvageMissionJob.cs
index 2776db2283..e2b17b5872 100644
--- a/Content.Server/Salvage/SpawnSalvageMissionJob.cs
+++ b/Content.Server/Salvage/SpawnSalvageMissionJob.cs
@@ -125,11 +125,7 @@ protected override async Task<bool> Process()
             air.Gases.CopyTo(moles, 0);
             var atmos = _entManager.EnsureComponent<MapAtmosphereComponent>(mapUid);
             _entManager.System<AtmosphereSystem>().SetMapSpace(mapUid, air.Space, atmos);
-            _entManager.System<AtmosphereSystem>().SetMapGasMixture(mapUid, new GasMixture(2500)
-            {
-                Temperature = mission.Temperature,
-                Moles = moles,
-            }, atmos);
+            _entManager.System<AtmosphereSystem>().SetMapGasMixture(mapUid, new GasMixture(moles, mission.Temperature), atmos);
 
             if (mission.Color != null)
             {
diff --git a/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs b/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
index 7bc1be02e3..e46a7c715f 100644
--- a/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
+++ b/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
@@ -134,7 +134,7 @@ private bool CanDock(
 
        foreach (var config in configs)
        {
-           if (config.Coordinates.Equals(coordinates) && config.Angle.EqualsApprox(angle, 0.01))
+           if (config.Coordinates.Equals(coordinates) && config.Angle.EqualsApprox(angle, 0.15))
            {
                return config;
            }
diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
index 6d2c28edcf..aeb2ebdbba 100644
--- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
+++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
@@ -308,8 +308,9 @@ private void OnEmergencyAuthorize(EntityUid uid, EmergencyShuttleConsoleComponen
 
     private void CleanupEmergencyConsole()
     {
+        // Realistically most of this shit needs moving to a station component so each station has their own emergency shuttle
+        // and timer and all that jazz so I don't really care about debugging if it works on cleanup vs start.
         _announced = false;
-        _roundEndCancelToken = null;
         ShuttlesLeft = false;
         _launchedShuttles = false;
         _consoleAccumulator = float.MinValue;
diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
index a7df41d887..f8d995b8a4 100644
--- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
+++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
@@ -19,6 +19,7 @@
 using Content.Shared.CCVar;
 using Content.Shared.Database;
 using Content.Shared.DeviceNetwork;
+using Content.Shared.GameTicking;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Shuttles.Events;
 using Content.Shared.Tag;
@@ -63,8 +64,6 @@ public sealed partial class EmergencyShuttleSystem : EntitySystem
     [Dependency] private readonly TransformSystem _transformSystem = default!;
     [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
 
-    private ISawmill _sawmill = default!;
-
     private const float ShuttleSpawnBuffer = 1f;
 
     private bool _emergencyShuttleEnabled;
@@ -74,12 +73,12 @@ public sealed partial class EmergencyShuttleSystem : EntitySystem
 
     public override void Initialize()
     {
-        _sawmill = Logger.GetSawmill("shuttle.emergency");
         _emergencyShuttleEnabled = _configManager.GetCVar(CCVars.EmergencyShuttleEnabled);
         // Don't immediately invoke as roundstart will just handle it.
         Subs.CVar(_configManager, CCVars.EmergencyShuttleEnabled, SetEmergencyShuttleEnabled);
 
         SubscribeLocalEvent<RoundStartingEvent>(OnRoundStart);
+        SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundCleanup);
         SubscribeLocalEvent<StationEmergencyShuttleComponent, ComponentStartup>(OnStationStartup);
         SubscribeLocalEvent<StationCentcommComponent, ComponentShutdown>(OnCentcommShutdown);
         SubscribeLocalEvent<StationCentcommComponent, ComponentInit>(OnCentcommInit);
@@ -93,10 +92,15 @@ public override void Initialize()
     private void OnRoundStart(RoundStartingEvent ev)
     {
         CleanupEmergencyConsole();
-        _roundEndCancelToken?.Cancel();
         _roundEndCancelToken = new CancellationTokenSource();
     }
 
+    private void OnRoundCleanup(RoundRestartCleanupEvent ev)
+    {
+        _roundEndCancelToken?.Cancel();
+        _roundEndCancelToken = null;
+    }
+
     private void OnCentcommShutdown(EntityUid uid, StationCentcommComponent component, ComponentShutdown args)
     {
         ClearCentcomm(component);
@@ -384,7 +388,7 @@ private void AddCentcomm(StationCentcommComponent component)
     {
         if (component.MapEntity != null || component.Entity != null)
         {
-            _sawmill.Warning("Attempted to re-add an existing centcomm map.");
+            Log.Warning("Attempted to re-add an existing centcomm map.");
             return;
         }
 
@@ -409,7 +413,7 @@ private void AddCentcomm(StationCentcommComponent component)
 
         if (string.IsNullOrEmpty(component.Map.ToString()))
         {
-            _sawmill.Warning("No CentComm map found, skipping setup.");
+            Log.Warning("No CentComm map found, skipping setup.");
             return;
         }
 
@@ -484,7 +488,7 @@ private void AddEmergencyShuttle(EntityUid uid, StationEmergencyShuttleComponent
 
         if (shuttle == null)
         {
-            _sawmill.Error($"Unable to spawn emergency shuttle {shuttlePath} for {ToPrettyString(uid)}");
+            Log.Error($"Unable to spawn emergency shuttle {shuttlePath} for {ToPrettyString(uid)}");
             return;
         }
 
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
index f9ceab8f7b..e4e4534b0c 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
@@ -371,8 +371,8 @@ private void UpdateFTLStarting(Entity<FTLComponent, ShuttleComponent> entity)
         Enable(uid, component: body);
         _physics.SetLinearVelocity(uid, new Vector2(0f, 20f), body: body);
         _physics.SetAngularVelocity(uid, 0f, body: body);
-        _physics.SetLinearDamping(body, 0f);
-        _physics.SetAngularDamping(body, 0f);
+        _physics.SetLinearDamping(uid, body, 0f);
+        _physics.SetAngularDamping(uid, body, 0f);
 
         _dockSystem.SetDockBolts(uid, true);
         _console.RefreshShuttleConsoles(uid);
@@ -426,8 +426,8 @@ private void UpdateFTLArriving(Entity<FTLComponent, ShuttleComponent> entity)
 
         _physics.SetLinearVelocity(uid, Vector2.Zero, body: body);
         _physics.SetAngularVelocity(uid, 0f, body: body);
-        _physics.SetLinearDamping(body, entity.Comp2.LinearDamping);
-        _physics.SetAngularDamping(body, entity.Comp2.AngularDamping);
+        _physics.SetLinearDamping(uid, body, entity.Comp2.LinearDamping);
+        _physics.SetAngularDamping(uid, body, entity.Comp2.AngularDamping);
 
         var target = entity.Comp1.TargetCoordinates;
 
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
index 8d44dae4b2..7c42753a7d 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
@@ -129,10 +129,10 @@ public void Enable(EntityUid uid, FixturesComponent? manager = null, PhysicsComp
             return;
 
         _physics.SetBodyType(uid, BodyType.Dynamic, manager: manager, body: component);
-        _physics.SetBodyStatus(component, BodyStatus.InAir);
+        _physics.SetBodyStatus(uid, component, BodyStatus.InAir);
         _physics.SetFixedRotation(uid, false, manager: manager, body: component);
-        _physics.SetLinearDamping(component, shuttle.LinearDamping);
-        _physics.SetAngularDamping(component, shuttle.AngularDamping);
+        _physics.SetLinearDamping(uid, component, shuttle.LinearDamping);
+        _physics.SetAngularDamping(uid, component, shuttle.AngularDamping);
     }
 
     public void Disable(EntityUid uid, FixturesComponent? manager = null, PhysicsComponent? component = null)
@@ -141,7 +141,7 @@ public void Disable(EntityUid uid, FixturesComponent? manager = null, PhysicsCom
             return;
 
         _physics.SetBodyType(uid, BodyType.Static, manager: manager, body: component);
-        _physics.SetBodyStatus(component, BodyStatus.OnGround);
+        _physics.SetBodyStatus(uid, component, BodyStatus.OnGround);
         _physics.SetFixedRotation(uid, true, manager: manager, body: component);
     }
 
diff --git a/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs b/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs
index ce4334391d..f1d0af6f90 100644
--- a/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs
@@ -18,13 +18,13 @@ namespace Content.Server.Singularity.EntitySystems;
 /// </summary>
 public sealed class GravityWellSystem : SharedGravityWellSystem
 {
-#region Dependencies
+    #region Dependencies
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IViewVariablesManager _vvManager = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
-#endregion Dependencies
+    #endregion Dependencies
 
     /// <summary>
     /// The minimum range at which gravpulses will act.
@@ -155,7 +155,7 @@ public void GravPulse(EntityUid uid, float maxRange, float minRange, float baseR
     /// <param name="minRange">The minimum distance at which entities can be affected by the gravity pulse.</param>
     /// <param name="baseMatrixDeltaV">The base velocity added to any entities within affected by the gravity pulse scaled by the displacement of those entities from the epicenter.</param>
     public void GravPulse(EntityCoordinates entityPos, float maxRange, float minRange, in Matrix3 baseMatrixDeltaV)
-        => GravPulse(entityPos.ToMap(EntityManager), maxRange, minRange, in baseMatrixDeltaV);
+        => GravPulse(entityPos.ToMap(EntityManager, _transform), maxRange, minRange, in baseMatrixDeltaV);
 
     /// <summary>
     /// Greates a gravitational pulse, shoving around all entities within some distance of an epicenter.
@@ -166,7 +166,7 @@ public void GravPulse(EntityCoordinates entityPos, float maxRange, float minRang
     /// <param name="baseRadialDeltaV">The base radial velocity that will be added to entities within range towards the center of the gravitational pulse.</param>
     /// <param name="baseTangentialDeltaV">The base tangential velocity that will be added to entities within countrclockwise around the center of the gravitational pulse.</param>
     public void GravPulse(EntityCoordinates entityPos, float maxRange, float minRange, float baseRadialDeltaV = 0.0f, float baseTangentialDeltaV = 0.0f)
-        => GravPulse(entityPos.ToMap(EntityManager), maxRange, minRange, baseRadialDeltaV, baseTangentialDeltaV);
+        => GravPulse(entityPos.ToMap(EntityManager, _transform), maxRange, minRange, baseRadialDeltaV, baseTangentialDeltaV);
 
     /// <summary>
     /// Causes a gravitational pulse, shoving around all entities within some distance of an epicenter.
diff --git a/Content.Server/Singularity/EntitySystems/SingularityAttractorSystem.cs b/Content.Server/Singularity/EntitySystems/SingularityAttractorSystem.cs
index 3c44a7fc7a..bc0de7c8c6 100644
--- a/Content.Server/Singularity/EntitySystems/SingularityAttractorSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/SingularityAttractorSystem.cs
@@ -2,12 +2,7 @@
 using Content.Server.Power.EntitySystems;
 using Content.Server.Singularity.Components;
 using Content.Shared.Singularity.Components;
-using Content.Shared.Singularity.EntitySystems;
 using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Systems;
 using Robust.Shared.Timing;
 using System.Numerics;
 
@@ -18,8 +13,8 @@ namespace Content.Server.Singularity.EntitySystems;
 /// </summary>
 public sealed class SingularityAttractorSystem : EntitySystem
 {
-    [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
 
     /// <summary>
     /// The minimum range at which the attraction will act.
@@ -69,7 +64,7 @@ private void Update(EntityUid uid, SingularityAttractorComponent? attractor = nu
 
         attractor.LastPulseTime = _timing.CurTime;
 
-        var mapPos = xform.Coordinates.ToMap(EntityManager);
+        var mapPos = xform.Coordinates.ToMap(EntityManager, _transform);
 
         if (mapPos == MapCoordinates.Nullspace)
             return;
@@ -77,7 +72,7 @@ private void Update(EntityUid uid, SingularityAttractorComponent? attractor = nu
         var query = EntityQuery<SingularityComponent, RandomWalkComponent, TransformComponent>();
         foreach (var (singulo, walk, singuloXform) in query)
         {
-            var singuloMapPos = singuloXform.Coordinates.ToMap(EntityManager);
+            var singuloMapPos = singuloXform.Coordinates.ToMap(EntityManager, _transform);
 
             if (singuloMapPos.MapId != mapPos.MapId)
                 continue;
diff --git a/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs b/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs
index 6616746506..506fd61d55 100644
--- a/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs
+++ b/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs
@@ -73,7 +73,7 @@ private void Spawn(EntityUid uid, ConditionalSpawnerComponent component)
 
             if (component.Prototypes.Count == 0)
             {
-                Logger.Warning($"Prototype list in ConditionalSpawnComponent is empty! Entity: {ToPrettyString(uid)}");
+                Log.Warning($"Prototype list in ConditionalSpawnComponent is empty! Entity: {ToPrettyString(uid)}");
                 return;
             }
 
@@ -94,7 +94,7 @@ private void Spawn(EntityUid uid, RandomSpawnerComponent component)
 
             if (component.Prototypes.Count == 0)
             {
-                Logger.Warning($"Prototype list in RandomSpawnerComponent is empty! Entity: {ToPrettyString(uid)}");
+                Log.Warning($"Prototype list in RandomSpawnerComponent is empty! Entity: {ToPrettyString(uid)}");
                 return;
             }
 
diff --git a/Content.Server/Speech/Components/ParrotAccentComponent.cs b/Content.Server/Speech/Components/ParrotAccentComponent.cs
new file mode 100644
index 0000000000..5c4e01527c
--- /dev/null
+++ b/Content.Server/Speech/Components/ParrotAccentComponent.cs
@@ -0,0 +1,47 @@
+namespace Content.Server.Speech.Components;
+
+/// <summary>
+/// Makes this entity speak like a parrot in all chat messages it sends.
+/// </summary>
+[RegisterComponent]
+public sealed partial class ParrotAccentComponent : Component
+{
+    /// <summary>
+    /// Chance that a message will have a squawk sound added before the first character.
+    /// If it fails, the message with have a squawk as a postfix instead.
+    /// If the longest word is repeated, no pre- or postfix will be added.
+    /// </summary>
+    [DataField]
+    public float SquawkPrefixChance = 0.5f;
+
+    /// <summary>
+    /// Chance that the longest word in the message will be repeated as an
+    /// exclamation at the end of the final message.
+    /// </summary>
+    [DataField]
+    public float LongestWordRepeatChance = 0.5f;
+
+    /// <summary>
+    /// The longest word must be at least this many characters long to be
+    /// repeated. This prevents repeating short words, which can sound weird.
+    /// ex: "How are you? AWWK! How!" - bad
+    /// ex: "Look out, it's the captain! RAWWK! Captain!" - good
+    /// </summary>
+    [DataField]
+    public float LongestWordMinLength = 5;
+
+    /// <summary>
+    /// Strings to use as squawking noises.
+    /// </summary>
+    public readonly string[] Squawks = [
+        "accent-parrot-squawk-1",
+        "accent-parrot-squawk-2",
+        "accent-parrot-squawk-3",
+        "accent-parrot-squawk-4",
+        "accent-parrot-squawk-5",
+        "accent-parrot-squawk-6",
+        "accent-parrot-squawk-7",
+        "accent-parrot-squawk-8"
+    ];
+
+}
diff --git a/Content.Server/Speech/EntitySystems/ParrotAccentSystem.cs b/Content.Server/Speech/EntitySystems/ParrotAccentSystem.cs
new file mode 100644
index 0000000000..10437c235d
--- /dev/null
+++ b/Content.Server/Speech/EntitySystems/ParrotAccentSystem.cs
@@ -0,0 +1,79 @@
+using System.Linq;
+using System.Text.RegularExpressions;
+using Content.Server.Speech.Components;
+using Robust.Shared.Random;
+
+namespace Content.Server.Speech.EntitySystems;
+
+public sealed partial class ParrotAccentSystem : EntitySystem
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ParrotAccentComponent, AccentGetEvent>(OnAccentGet);
+    }
+
+    private void OnAccentGet(Entity<ParrotAccentComponent> entity, ref AccentGetEvent args)
+    {
+        args.Message = Accentuate(entity, args.Message);
+    }
+
+    public string Accentuate(Entity<ParrotAccentComponent> entity, string message)
+    {
+        // Sometimes repeat the longest word at the end of the message, after a squawk! SQUAWK! Sometimes!
+        if (_random.Prob(entity.Comp.LongestWordRepeatChance))
+        {
+            // Don't count non-alphanumeric characters as parts of words
+            var cleaned = Regex.Replace(message, "[^A-Za-z0-9 -]", string.Empty);
+            // Split on whitespace and favor words towards the end of the message
+            var words = cleaned.Split(null).Reverse();
+            // Find longest word
+            var longest = words.MaxBy(word => word.Length);
+            if (longest?.Length >= entity.Comp.LongestWordMinLength)
+            {
+                message = EnsurePunctuation(message);
+
+                // Capitalize the first letter of the repeated word
+                longest = string.Concat(longest[0].ToString().ToUpper(), longest.AsSpan(1));
+
+                message = string.Format("{0} {1} {2}!", message, GetRandomSquawk(entity), longest);
+                return message; // No more changes, or it's too much
+            }
+        }
+
+        if (_random.Prob(entity.Comp.SquawkPrefixChance))
+        {
+            // AWWK! Sometimes add a squawk at the begining of the message
+            message = string.Format("{0} {1}", GetRandomSquawk(entity), message);
+        }
+        else
+        {
+            // Otherwise add a squawk at the end of the message! RAWWK!
+            message = EnsurePunctuation(message);
+            message = string.Format("{0} {1}", message, GetRandomSquawk(entity));
+        }
+
+        return message;
+    }
+
+    /// <summary>
+    /// Adds a "!" to the end of the string, if there isn't already a sentence-ending punctuation mark.
+    /// </summary>
+    private string EnsurePunctuation(string message)
+    {
+        if (!message.EndsWith('!') && !message.EndsWith('?') && !message.EndsWith('.'))
+            return message + '!';
+        return message;
+    }
+
+    /// <summary>
+    /// Returns a random, localized squawk sound.
+    /// </summary>
+    private string GetRandomSquawk(Entity<ParrotAccentComponent> entity)
+    {
+        return Loc.GetString(_random.Pick(entity.Comp.Squawks));
+    }
+}
diff --git a/Content.Server/Spreader/SpreaderSystem.cs b/Content.Server/Spreader/SpreaderSystem.cs
index 269d35d12f..5b2f3298a2 100644
--- a/Content.Server/Spreader/SpreaderSystem.cs
+++ b/Content.Server/Spreader/SpreaderSystem.cs
@@ -18,6 +18,7 @@ namespace Content.Server.Spreader;
 /// </summary>
 public sealed class SpreaderSystem : EntitySystem
 {
+    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
     [Dependency] private readonly SharedMapSystem _map = default!;
@@ -33,6 +34,8 @@ public sealed class SpreaderSystem : EntitySystem
     // TODO PERFORMANCE Assign each prototype to an index and convert dictionary to array
     private readonly Dictionary<EntityUid, Dictionary<string, int>> _gridUpdates = [];
 
+    private EntityQuery<EdgeSpreaderComponent> _query;
+
     public const float SpreadCooldownSeconds = 1;
 
     [ValidatePrototypeId<TagPrototype>]
@@ -47,6 +50,8 @@ public override void Initialize()
 
         SubscribeLocalEvent<EdgeSpreaderComponent, EntityTerminatingEvent>(OnTerminating);
         SetupPrototypes();
+
+        _query = GetEntityQuery<EdgeSpreaderComponent>();
     }
 
     private void OnPrototypeReload(PrototypesReloadedEventArgs obj)
@@ -66,13 +71,7 @@ private void SetupPrototypes()
 
     private void OnAirtightChanged(ref AirtightChanged ev)
     {
-        var neighbors = GetSpreadableNeighbors(ev.Entity, ev.Airtight, ev.Position);
-
-        foreach (var neighbor in neighbors)
-        {
-            if (!TerminatingOrDeleted(neighbor))
-                EnsureComp<ActiveEdgeSpreaderComponent>(neighbor);
-        }
+        ActivateSpreadableNeighbors(ev.Entity, ev.Position);
     }
 
     private void OnGridInit(GridInitializeEvent ev)
@@ -82,13 +81,7 @@ private void OnGridInit(GridInitializeEvent ev)
 
     private void OnTerminating(Entity<EdgeSpreaderComponent> entity, ref EntityTerminatingEvent args)
     {
-        var neighbors = GetSpreadableNeighbors(entity);
-
-        foreach (var neighbor in neighbors)
-        {
-            if (!TerminatingOrDeleted(neighbor))
-                EnsureComp<ActiveEdgeSpreaderComponent>(neighbor);
-        }
+        ActivateSpreadableNeighbors(entity);
     }
 
     /// <inheritdoc/>
@@ -215,7 +208,7 @@ public void GetNeighbors(EntityUid uid, TransformComponent comp, ProtoId<EdgeSpr
                 xformQuery.TryGetComponent(dock.DockedWith, out var dockedXform) &&
                 TryComp<MapGridComponent>(dockedXform.GridUid, out var dockedGrid))
             {
-                neighborTiles.Add((ent.Value, dockedGrid, _map.CoordinatesToTile(ent.Value, dockedGrid, dockedXform.Coordinates), xform.LocalRotation.ToAtmosDirection(), dockedXform.LocalRotation.ToAtmosDirection()));
+                neighborTiles.Add((dockedXform.GridUid.Value, dockedGrid, _map.CoordinatesToTile(dockedXform.GridUid.Value, dockedGrid, dockedXform.Coordinates), xform.LocalRotation.ToAtmosDirection(), dockedXform.LocalRotation.ToAtmosDirection()));
             }
 
             // If we're on a blocked tile work out which directions we can go.
@@ -254,8 +247,7 @@ public void GetNeighbors(EntityUid uid, TransformComponent comp, ProtoId<EdgeSpr
             if (!_map.TryGetTileRef(neighborEnt, neighborGrid, neighborPos, out var tileRef) || tileRef.Tile.IsEmpty)
                 continue;
 
-            var directionEnumerator =
-                _map.GetAnchoredEntitiesEnumerator(neighborEnt, neighborGrid, neighborPos);
+            var directionEnumerator = _map.GetAnchoredEntitiesEnumerator(neighborEnt, neighborGrid, neighborPos);
             var occupied = false;
 
             while (directionEnumerator.MoveNext(out var ent))
@@ -277,8 +269,7 @@ public void GetNeighbors(EntityUid uid, TransformComponent comp, ProtoId<EdgeSpr
                 continue;
 
             var oldCount = occupiedTiles.Count;
-            directionEnumerator =
-                _map.GetAnchoredEntitiesEnumerator(neighborEnt, neighborGrid, neighborPos);
+            directionEnumerator = _map.GetAnchoredEntitiesEnumerator(neighborEnt, neighborGrid, neighborPos);
 
             while (directionEnumerator.MoveNext(out var ent))
             {
@@ -299,14 +290,11 @@ public void GetNeighbors(EntityUid uid, TransformComponent comp, ProtoId<EdgeSpr
     }
 
     /// <summary>
-    /// Given an entity, this returns a list of all adjacent entities with a <see cref="EdgeSpreaderComponent"/>.
+    /// This function activates all spreaders that are adjacent to a given entity. This also activates other spreaders
+    /// on the same tile as the current entity (for thin airtight entities like windoors).
     /// </summary>
-    public List<EntityUid> GetSpreadableNeighbors(EntityUid uid, AirtightComponent? comp = null,
-        (EntityUid Grid, Vector2i Tile)? position = null)
+    public void ActivateSpreadableNeighbors(EntityUid uid, (EntityUid Grid, Vector2i Tile)? position = null)
     {
-        Resolve(uid, ref comp, false);
-        var neighbors = new List<EntityUid>();
-
         Vector2i tile;
         EntityUid ent;
         MapGridComponent? grid;
@@ -315,37 +303,40 @@ public List<EntityUid> GetSpreadableNeighbors(EntityUid uid, AirtightComponent?
         {
             var transform = Transform(uid);
             if (!TryComp(transform.GridUid, out grid) || TerminatingOrDeleted(transform.GridUid.Value))
-                return neighbors;
+                return;
+
             tile = _map.TileIndicesFor(transform.GridUid.Value, grid, transform.Coordinates);
             ent = transform.GridUid.Value;
         }
         else
         {
             if (!TryComp(position.Value.Grid, out grid))
-                return neighbors;
-            tile = position.Value.Tile;
-            ent = position.Value.Grid;
+                return;
+            (ent, tile) = position.Value;
         }
 
-        var spreaderQuery = GetEntityQuery<EdgeSpreaderComponent>();
+        var anchored = _map.GetAnchoredEntitiesEnumerator(ent, grid, tile);
+        while (anchored.MoveNext(out var entity))
+        {
+            if (entity == ent)
+                continue;
+            DebugTools.Assert(Transform(entity.Value).Anchored);
+            if (_query.HasComponent(ent) && !TerminatingOrDeleted(entity.Value))
+                EnsureComp<ActiveEdgeSpreaderComponent>(entity.Value);
+        }
 
         for (var i = 0; i < Atmospherics.Directions; i++)
         {
             var direction = (AtmosDirection) (1 << i);
-            if (comp != null && !comp.AirBlockedDirection.IsFlagSet(direction))
-                continue;
+            var adjacentTile = SharedMapSystem.GetDirection(tile, direction.ToDirection());
+            anchored = _map.GetAnchoredEntitiesEnumerator(ent, grid, adjacentTile);
 
-            var directionEnumerator =
-                _map.GetAnchoredEntitiesEnumerator(ent, grid, SharedMapSystem.GetDirection(tile, direction.ToDirection()));
-
-            while (directionEnumerator.MoveNext(out var entity))
+            while (anchored.MoveNext(out var entity))
             {
                 DebugTools.Assert(Transform(entity.Value).Anchored);
-                if (spreaderQuery.HasComponent(entity) && !TerminatingOrDeleted(entity.Value))
-                    neighbors.Add(entity.Value);
+                if (_query.HasComponent(ent) && !TerminatingOrDeleted(entity.Value))
+                    EnsureComp<ActiveEdgeSpreaderComponent>(entity.Value);
             }
         }
-
-        return neighbors;
     }
 }
diff --git a/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs b/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
index 78d1b1e212..4b7cd64961 100644
--- a/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
+++ b/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
@@ -323,8 +323,7 @@ public void CalcExtendedAccess(Dictionary<EntityUid, int> jobsCount)
 
             jobs.ExtendedAccess = count <= thresh;
 
-            Logger.DebugS(
-                "station", "Station {Station} on extended access: {ExtendedAccess}",
+            Log.Debug("Station {Station} on extended access: {ExtendedAccess}",
                 Name(station), jobs.ExtendedAccess);
         }
     }
diff --git a/Content.Server/Station/Systems/StationSystem.cs b/Content.Server/Station/Systems/StationSystem.cs
index 4647392665..b9ff8a4339 100644
--- a/Content.Server/Station/Systems/StationSystem.cs
+++ b/Content.Server/Station/Systems/StationSystem.cs
@@ -456,7 +456,7 @@ public void DeleteStation(EntityUid station, StationDataComponent? stationData =
 
         if (xform.GridUid == EntityUid.Invalid)
         {
-            Log.Debug("A");
+            Log.Debug("Unable to get owning station - GridUid invalid.");
             return null;
         }
 
diff --git a/Content.Server/StationEvents/EventManagerSystem.cs b/Content.Server/StationEvents/EventManagerSystem.cs
index 8942bdaf50..261e8ca46d 100644
--- a/Content.Server/StationEvents/EventManagerSystem.cs
+++ b/Content.Server/StationEvents/EventManagerSystem.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Server.GameTicking;
 using Content.Server.StationEvents.Components;
 using Content.Shared.CCVar;
@@ -19,8 +19,6 @@ public sealed class EventManagerSystem : EntitySystem
     [Dependency] public readonly GameTicker GameTicker = default!;
     [Dependency] private readonly GlimmerSystem _glimmerSystem = default!; //Nyano - Summary: pulls in the glimmer system.
 
-    private ISawmill _sawmill = default!;
-
     public bool EventsEnabled { get; private set; }
     private void SetEnabled(bool value) => EventsEnabled = value;
 
@@ -28,8 +26,6 @@ public override void Initialize()
     {
         base.Initialize();
 
-        _sawmill = Logger.GetSawmill("events");
-
         Subs.CVar(_configurationManager, CCVars.EventsEnabled, SetEnabled, true);
     }
 
@@ -43,13 +39,13 @@ public string RunRandomEvent()
         if (randomEvent == null)
         {
             var errStr = Loc.GetString("station-event-system-run-random-event-no-valid-events");
-            _sawmill.Error(errStr);
+            Log.Error(errStr);
             return errStr;
         }
 
         var ent = GameTicker.AddGameRule(randomEvent);
         var str = Loc.GetString("station-event-system-run-event",("eventName", ToPrettyString(ent)));
-        _sawmill.Info(str);
+        Log.Info(str);
         return str;
     }
 
@@ -59,7 +55,7 @@ public string RunRandomEvent()
     public string? PickRandomEvent()
     {
         var availableEvents = AvailableEvents();
-        _sawmill.Info($"Picking from {availableEvents.Count} total available events");
+        Log.Info($"Picking from {availableEvents.Count} total available events");
         return FindEvent(availableEvents);
     }
 
@@ -71,7 +67,7 @@ public string RunRandomEvent()
     {
         if (availableEvents.Count == 0)
         {
-            _sawmill.Warning("No events were available to run!");
+            Log.Warning("No events were available to run!");
             return null;
         }
 
@@ -94,7 +90,7 @@ public string RunRandomEvent()
             }
         }
 
-        _sawmill.Error("Event was not found after weighted pick process!");
+        Log.Error("Event was not found after weighted pick process!");
         return null;
     }
 
@@ -118,7 +114,7 @@ private Dictionary<EntityPrototype, StationEventComponent> AvailableEvents(bool
         {
             if (CanRun(proto, stationEvent, playerCount, currentTime))
             {
-                _sawmill.Debug($"Adding event {proto.ID} to possibilities");
+                Log.Debug($"Adding event {proto.ID} to possibilities");
                 result.Add(proto, stationEvent);
             }
         }
diff --git a/Content.Server/StationEvents/Events/MeteorSwarmRule.cs b/Content.Server/StationEvents/Events/MeteorSwarmRule.cs
index 192a620c9f..ad56479b37 100644
--- a/Content.Server/StationEvents/Events/MeteorSwarmRule.cs
+++ b/Content.Server/StationEvents/Events/MeteorSwarmRule.cs
@@ -68,9 +68,9 @@ protected override void ActiveTick(EntityUid uid, MeteorSwarmRuleComponent compo
                 var spawnPosition = new MapCoordinates(center + offset, mapId);
                 var meteor = Spawn("MeteorLarge", spawnPosition);
                 var physics = EntityManager.GetComponent<PhysicsComponent>(meteor);
-                _physics.SetBodyStatus(physics, BodyStatus.InAir);
-                _physics.SetLinearDamping(physics, 0f);
-                _physics.SetAngularDamping(physics, 0f);
+                _physics.SetBodyStatus(meteor, physics, BodyStatus.InAir);
+                _physics.SetLinearDamping(meteor, physics, 0f);
+                _physics.SetAngularDamping(meteor, physics, 0f);
                 _physics.ApplyLinearImpulse(meteor, -offset.Normalized() * component.MeteorVelocity * physics.Mass, body: physics);
                 _physics.ApplyAngularImpulse(
                     meteor,
diff --git a/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs b/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
index 9995ed40c1..356768769b 100644
--- a/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
+++ b/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
@@ -26,6 +26,7 @@ public sealed class BluespaceLockerSystem : EntitySystem
     [Dependency] private readonly WeldableSystem _weldableSystem = default!;
     [Dependency] private readonly LockSystem _lockSystem = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
+    [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
     [Dependency] private readonly ExplosionSystem _explosionSystem = default!;
 
     public override void Initialize()
@@ -386,7 +387,7 @@ private void DestroyAfterLimit(EntityUid uid, BluespaceLockerComponent component
         switch (component.BehaviorProperties.DestroyType)
         {
             case BluespaceLockerDestroyType.Explode:
-                _explosionSystem.QueueExplosion(uid.ToCoordinates().ToMap(EntityManager),
+                _explosionSystem.QueueExplosion(uid.ToCoordinates().ToMap(EntityManager, _transformSystem),
                     ExplosionSystem.DefaultExplosionPrototypeId, 4, 1, 2, maxTileBreak: 0);
                 goto case BluespaceLockerDestroyType.Delete;
             case BluespaceLockerDestroyType.Delete:
diff --git a/Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs b/Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs
index c49bfdec93..0b4b13d6e4 100644
--- a/Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs
+++ b/Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs
@@ -80,11 +80,6 @@ private void OnUseInHand(EntityUid uid, SpawnItemsOnUseComponent component, UseI
                 _adminLogger.Add(LogType.EntitySpawn, LogImpact.Low, $"{ToPrettyString(args.User)} used {ToPrettyString(uid)} which spawned {ToPrettyString(entityToPlaceInHands.Value)}");
             }
 
-            if (component.Sound != null)
-            {
-                _audio.PlayPvs(component.Sound, uid);
-            }
-
             component.Uses--;
 
             // Delete entity only if component was successfully used
@@ -97,6 +92,7 @@ private void OnUseInHand(EntityUid uid, SpawnItemsOnUseComponent component, UseI
             if (entityToPlaceInHands != null)
             {
                 _hands.PickupOrDrop(args.User, entityToPlaceInHands.Value);
+                _audio.PlayPvs(component.Sound, entityToPlaceInHands.Value);
             }
         }
     }
diff --git a/Content.Server/Store/Systems/StoreSystem.Listings.cs b/Content.Server/Store/Systems/StoreSystem.Listings.cs
index b5d1ae79be..a56d9640d3 100644
--- a/Content.Server/Store/Systems/StoreSystem.Listings.cs
+++ b/Content.Server/Store/Systems/StoreSystem.Listings.cs
@@ -43,7 +43,7 @@ public bool TryAddListing(StoreComponent component, string listingId)
     {
         if (!_proto.TryIndex<ListingPrototype>(listingId, out var proto))
         {
-            Logger.Error("Attempted to add invalid listing.");
+            Log.Error("Attempted to add invalid listing.");
             return false;
         }
         return TryAddListing(component, proto);
diff --git a/Content.Server/Store/Systems/StoreSystem.Ui.cs b/Content.Server/Store/Systems/StoreSystem.Ui.cs
index a7490fd27f..49db980451 100644
--- a/Content.Server/Store/Systems/StoreSystem.Ui.cs
+++ b/Content.Server/Store/Systems/StoreSystem.Ui.cs
@@ -5,6 +5,7 @@
 using Content.Server.Stack;
 using Content.Server.Store.Components;
 using Content.Shared.Actions;
+using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
 using Content.Shared.FixedPoint;
 using Content.Shared.Hands.EntitySystems;
@@ -165,8 +166,6 @@ private void OnBuyRequest(EntityUid uid, StoreComponent component, StoreBuyListi
 
         if (!IsOnStartingMap(uid, component))
             component.RefundAllowed = false;
-        else
-            component.RefundAllowed = true;
 
         //subtract the cash
         foreach (var (currency, value) in listing.Cost)
@@ -250,10 +249,12 @@ private void OnBuyRequest(EntityUid uid, StoreComponent component, StoreBuyListi
                 HandleRefundComp(uid, component, upgradeActionId.Value);
         }
 
-        //broadcast event
         if (listing.ProductEvent != null)
         {
-            RaiseLocalEvent(listing.ProductEvent);
+            if (!listing.RaiseProductEventOnUser)
+                RaiseLocalEvent(listing.ProductEvent);
+            else
+                RaiseLocalEvent(buyer, listing.ProductEvent);
         }
 
         //log dat shit.
@@ -323,7 +324,9 @@ private void OnRequestRefund(EntityUid uid, StoreComponent component, StoreReque
         if (!component.RefundAllowed || component.BoughtEntities.Count == 0)
             return;
 
-        for (var i = component.BoughtEntities.Count; i >= 0; i--)
+        _admin.Add(LogType.StoreRefund, LogImpact.Low, $"{ToPrettyString(buyer):player} has refunded their purchases from {ToPrettyString(uid):store}");
+
+        for (var i = component.BoughtEntities.Count - 1; i >= 0; i--)
         {
             var purchase = component.BoughtEntities[i];
 
@@ -332,7 +335,7 @@ private void OnRequestRefund(EntityUid uid, StoreComponent component, StoreReque
 
             component.BoughtEntities.RemoveAt(i);
 
-            if (_actions.TryGetActionData(purchase, out var actionComponent))
+            if (_actions.TryGetActionData(purchase, out var actionComponent, logError: false))
             {
                 _actionContainer.RemoveAction(purchase, actionComponent);
             }
@@ -340,6 +343,8 @@ private void OnRequestRefund(EntityUid uid, StoreComponent component, StoreReque
             EntityManager.DeleteEntity(purchase);
         }
 
+        component.BoughtEntities.Clear();
+
         foreach (var (currency, value) in component.BalanceSpent)
         {
             component.Balance[currency] += value;
diff --git a/Content.Server/Strip/StrippableSystem.cs b/Content.Server/Strip/StrippableSystem.cs
index 50a9cb9b69..96b2ecc00c 100644
--- a/Content.Server/Strip/StrippableSystem.cs
+++ b/Content.Server/Strip/StrippableSystem.cs
@@ -210,7 +210,7 @@ bool Check()
 
             if (!_inventorySystem.TryGetSlot(target, slot, out var slotDef))
             {
-                Logger.Error($"{ToPrettyString(user)} attempted to place an item in a non-existent inventory slot ({slot}) on {ToPrettyString(target)}");
+                Log.Error($"{ToPrettyString(user)} attempted to place an item in a non-existent inventory slot ({slot}) on {ToPrettyString(target)}");
                 return;
             }
 
@@ -347,7 +347,7 @@ bool Check()
 
             if (!_inventorySystem.TryGetSlot(target, slot, out var slotDef))
             {
-                Logger.Error($"{ToPrettyString(user)} attempted to take an item from a non-existent inventory slot ({slot}) on {ToPrettyString(target)}");
+                Log.Error($"{ToPrettyString(user)} attempted to take an item from a non-existent inventory slot ({slot}) on {ToPrettyString(target)}");
                 return;
             }
 
diff --git a/Content.Server/Tabletop/TabletopSystem.Session.cs b/Content.Server/Tabletop/TabletopSystem.Session.cs
index f16f3f01e9..c2bb8426fc 100644
--- a/Content.Server/Tabletop/TabletopSystem.Session.cs
+++ b/Content.Server/Tabletop/TabletopSystem.Session.cs
@@ -31,7 +31,7 @@ public TabletopSession EnsureSession(TabletopGameComponent tabletop)
             // Since this is the first time opening this session, set up the game
             tabletop.Setup.SetupTabletop(session, EntityManager);
 
-            Logger.Info($"Created tabletop session number {tabletop} at position {session.Position}.");
+            Log.Info($"Created tabletop session number {tabletop} at position {session.Position}.");
 
             return session;
         }
diff --git a/Content.Server/Traits/TraitSystem.cs b/Content.Server/Traits/TraitSystem.cs
index 91b0d6caea..22ee0e4861 100644
--- a/Content.Server/Traits/TraitSystem.cs
+++ b/Content.Server/Traits/TraitSystem.cs
@@ -27,7 +27,7 @@ private void OnPlayerSpawnComplete(PlayerSpawnCompleteEvent args)
         {
             if (!_prototypeManager.TryIndex<TraitPrototype>(traitId, out var traitPrototype))
             {
-                Logger.Warning($"No trait found with ID {traitId}!");
+                Log.Warning($"No trait found with ID {traitId}!");
                 return;
             }
 
diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs
index 9443b0b394..b5fa611a39 100644
--- a/Content.Server/VendingMachines/VendingMachineSystem.cs
+++ b/Content.Server/VendingMachines/VendingMachineSystem.cs
@@ -41,13 +41,10 @@ public sealed class VendingMachineSystem : SharedVendingMachineSystem
         [Dependency] private readonly IGameTiming _timing = default!;
         [Dependency] private readonly AdvertiseSystem _advertise = default!;
 
-        private ISawmill _sawmill = default!;
-
         public override void Initialize()
         {
             base.Initialize();
 
-            _sawmill = Logger.GetSawmill("vending");
             SubscribeLocalEvent<VendingMachineComponent, MapInitEvent>(OnComponentMapInit);
             SubscribeLocalEvent<VendingMachineComponent, PowerChangedEvent>(OnPowerChanged);
             SubscribeLocalEvent<VendingMachineComponent, BreakageEventArgs>(OnBreak);
@@ -86,7 +83,7 @@ private void OnVendingPrice(EntityUid uid, VendingMachineComponent component, re
             {
                 if (!PrototypeManager.TryIndex<EntityPrototype>(entry.ID, out var proto))
                 {
-                    _sawmill.Error($"Unable to find entity prototype {entry.ID} on {ToPrettyString(uid)} vending.");
+                    Log.Error($"Unable to find entity prototype {entry.ID} on {ToPrettyString(uid)} vending.");
                     continue;
                 }
 
@@ -193,7 +190,7 @@ private void OnDoAfter(EntityUid uid, VendingMachineComponent component, DoAfter
 
             if (!TryComp<VendingMachineRestockComponent>(args.Args.Used, out var restockComponent))
             {
-                _sawmill.Error($"{ToPrettyString(args.Args.User)} tried to restock {ToPrettyString(uid)} with {ToPrettyString(args.Args.Used.Value)} which did not have a VendingMachineRestockComponent.");
+                Log.Error($"{ToPrettyString(args.Args.User)} tried to restock {ToPrettyString(uid)} with {ToPrettyString(args.Args.Used.Value)} which did not have a VendingMachineRestockComponent.");
                 return;
             }
 
diff --git a/Content.Server/Whitelist/WhitelistCommands.cs b/Content.Server/Whitelist/WhitelistCommands.cs
index 6a4347cdd1..6a9050f57b 100644
--- a/Content.Server/Whitelist/WhitelistCommands.cs
+++ b/Content.Server/Whitelist/WhitelistCommands.cs
@@ -71,7 +71,7 @@ public override CompletionResult GetCompletion(IConsoleShell shell, string[] arg
     }
 }
 
-[AdminCommand(AdminFlags.Ban | AdminFlags.Whitelist)] // DeltaV - Custom permission for whitelist. Hopefully this is an or, not an and
+[AdminCommand(AdminFlags.Ban), AdminCommand(AdminFlags.Whitelist)] // DeltaV - Custom permission for whitelist.
 public sealed class RemoveWhitelistCommand : LocalizedCommands
 {
     public override string Command => "whitelistremove";
diff --git a/Content.Server/Wires/WireLayout.cs b/Content.Server/Wires/WireLayout.cs
index ecafba013e..621992c915 100644
--- a/Content.Server/Wires/WireLayout.cs
+++ b/Content.Server/Wires/WireLayout.cs
@@ -28,11 +28,13 @@ public sealed partial class WireLayoutPrototype : IPrototype, IInheritingPrototy
     ///     initialization)
     /// </summary>
     [DataField("dummyWires")]
+    [NeverPushInheritance]
     public int DummyWires { get; private set; } = default!;
 
     /// <summary>
     ///     All the valid IWireActions currently in this layout.
     /// </summary>
     [DataField("wires")]
+    [NeverPushInheritance]
     public List<IWireAction>? Wires { get; private set; }
 }
diff --git a/Content.Server/Worldgen/Systems/Biomes/BiomeSelectionSystem.cs b/Content.Server/Worldgen/Systems/Biomes/BiomeSelectionSystem.cs
index 3fff584217..1827f6deed 100644
--- a/Content.Server/Worldgen/Systems/Biomes/BiomeSelectionSystem.cs
+++ b/Content.Server/Worldgen/Systems/Biomes/BiomeSelectionSystem.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Server.Worldgen.Components;
 using Content.Server.Worldgen.Prototypes;
 using Robust.Shared.Prototypes;
@@ -35,7 +35,7 @@ private void OnWorldChunkAdded(EntityUid uid, BiomeSelectionComponent component,
             return;
         }
 
-        Logger.Error($"Biome selection ran out of biomes to select? See biomes list: {component.Biomes}");
+        Log.Error($"Biome selection ran out of biomes to select? See biomes list: {component.Biomes}");
     }
 
     private void OnBiomeSelectionStartup(EntityUid uid, BiomeSelectionComponent component, ComponentStartup args)
diff --git a/Content.Server/Worldgen/Systems/Carvers/NoiseRangeCarverSystem.cs b/Content.Server/Worldgen/Systems/Carvers/NoiseRangeCarverSystem.cs
index aed32bc89c..f2e051669a 100644
--- a/Content.Server/Worldgen/Systems/Carvers/NoiseRangeCarverSystem.cs
+++ b/Content.Server/Worldgen/Systems/Carvers/NoiseRangeCarverSystem.cs
@@ -9,6 +9,7 @@ namespace Content.Server.Worldgen.Systems.Carvers;
 public sealed class NoiseRangeCarverSystem : EntitySystem
 {
     [Dependency] private readonly NoiseIndexSystem _index = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
 
     /// <inheritdoc />
     public override void Initialize()
@@ -19,7 +20,7 @@ public override void Initialize()
     private void OnPrePlaceDebris(EntityUid uid, NoiseRangeCarverComponent component,
         ref PrePlaceDebrisFeatureEvent args)
     {
-        var coords = WorldGen.WorldToChunkCoords(args.Coords.ToMapPos(EntityManager));
+        var coords = WorldGen.WorldToChunkCoords(args.Coords.ToMapPos(EntityManager, _transform));
         var val = _index.Evaluate(uid, component.NoiseChannel, coords);
 
         foreach (var (low, high) in component.Ranges)
diff --git a/Content.Server/Worldgen/Systems/WorldgenConfigSystem.cs b/Content.Server/Worldgen/Systems/WorldgenConfigSystem.cs
index d3eeeb6037..c47bfb9f88 100644
--- a/Content.Server/Worldgen/Systems/WorldgenConfigSystem.cs
+++ b/Content.Server/Worldgen/Systems/WorldgenConfigSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration;
+using Content.Server.Administration;
 using Content.Server.GameTicking;
 using Content.Server.GameTicking.Events;
 using Content.Server.Worldgen.Components;
@@ -74,7 +74,7 @@ private void OnLoadingMaps(RoundStartingEvent ev)
             return;
 
         var target = _map.GetMapEntityId(_gameTicker.DefaultMap);
-        Logger.Debug($"Trying to configure {_gameTicker.DefaultMap}, aka {ToPrettyString(target)} aka {target}");
+        Log.Debug($"Trying to configure {_gameTicker.DefaultMap}, aka {ToPrettyString(target)} aka {target}");
         var cfg = _proto.Index<WorldgenConfigPrototype>(_worldgenConfig);
 
         cfg.Apply(target, _ser, EntityManager); // Apply the config to the map.
diff --git a/Content.Server/Zombies/PendingZombieComponent.cs b/Content.Server/Zombies/PendingZombieComponent.cs
index e112198711..a49b424c53 100644
--- a/Content.Server/Zombies/PendingZombieComponent.cs
+++ b/Content.Server/Zombies/PendingZombieComponent.cs
@@ -16,8 +16,7 @@ public sealed partial class PendingZombieComponent : Component
     {
         DamageDict = new ()
         {
-            { "Blunt", 0.25 },
-            { "Poison", 0.1 },
+            { "Poison", 0.3 },
         }
     };
 
diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs
index 1b4f2f1c5b..daadd4b518 100644
--- a/Content.Server/Zombies/ZombieSystem.Transform.cs
+++ b/Content.Server/Zombies/ZombieSystem.Transform.cs
@@ -141,7 +141,10 @@ public void ZombifyEntity(EntityUid target, MobStateComponent? mobState = null)
             var melee = EnsureComp<MeleeWeaponComponent>(target);
             melee.Animation = zombiecomp.AttackAnimation;
             melee.WideAnimation = zombiecomp.AttackAnimation;
+            melee.AltDisarm = false;
             melee.Range = 1.2f;
+            melee.Angle = 0.0f;
+            melee.HitSound = zombiecomp.BiteSound;
 
             if (mobState.CurrentState == MobState.Alive)
             {
diff --git a/Content.Server/Zombies/ZombieSystem.cs b/Content.Server/Zombies/ZombieSystem.cs
index e515c377be..bef57eceb3 100644
--- a/Content.Server/Zombies/ZombieSystem.cs
+++ b/Content.Server/Zombies/ZombieSystem.cs
@@ -55,7 +55,7 @@ public override void Initialize()
 
             SubscribeLocalEvent<ZombieComponent, ComponentStartup>(OnStartup);
             SubscribeLocalEvent<ZombieComponent, EmoteEvent>(OnEmote, before:
-                new []{typeof(VocalSystem), typeof(BodyEmotesSystem)});
+                new[] { typeof(VocalSystem), typeof(BodyEmotesSystem) });
 
             SubscribeLocalEvent<ZombieComponent, MeleeHitEvent>(OnMeleeHit);
             SubscribeLocalEvent<ZombieComponent, MobStateChangedEvent>(OnMobState);
@@ -70,6 +70,12 @@ public override void Initialize()
 
         private void OnPendingMapInit(EntityUid uid, PendingZombieComponent component, MapInitEvent args)
         {
+            if (_mobState.IsDead(uid))
+            {
+                ZombifyEntity(uid);
+                return;
+            }
+
             component.NextTick = _timing.CurTime + TimeSpan.FromSeconds(1f);
         }
 
@@ -196,7 +202,7 @@ private float GetZombieInfectionChance(EntityUid uid, ZombieComponent component)
 
             var min = component.MinZombieInfectionChance;
             //gets a value between the max and min based on how many items the entity is wearing
-            var chance = (max-min) * ((total - items)/total) + min;
+            var chance = (max - min) * ((total - items) / total) + min;
             return chance;
         }
 
@@ -261,7 +267,7 @@ public bool UnZombify(EntityUid source, EntityUid target, ZombieComponent? zombi
                 _humanoidAppearance.SetBaseLayerColor(target, layer, info.Color);
                 _humanoidAppearance.SetBaseLayerId(target, layer, info.Id);
             }
-            if(TryComp<HumanoidAppearanceComponent>(target, out var appcomp))
+            if (TryComp<HumanoidAppearanceComponent>(target, out var appcomp))
             {
                 appcomp.EyeColor = zombiecomp.BeforeZombifiedEyeColor;
             }
diff --git a/Content.Shared.Database/LogType.cs b/Content.Shared.Database/LogType.cs
index cc87dddf30..ba94b0f373 100644
--- a/Content.Shared.Database/LogType.cs
+++ b/Content.Shared.Database/LogType.cs
@@ -97,4 +97,6 @@ public enum LogType
     /// </summary>
     ChatRateLimited = 87,
     AtmosTemperatureChanged = 88,
+    DeviceNetwork = 89,
+    StoreRefund = 90
 }
diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
index eafc78cad1..252fc2c5f4 100644
--- a/Content.Shared/Access/Components/IdCardConsoleComponent.cs
+++ b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
@@ -57,6 +57,7 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List<string> acc
         "ChiefEngineer",
         "ChiefMedicalOfficer",
         "Clown", // DeltaV - Add Clown access
+        "Corpsman", // DeltaV - Add Corpsman access
         "Command",
         "Cryogenics",
         "Engineering",
@@ -67,7 +68,7 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List<string> acc
         "Janitor",
         "Kitchen",
         "Lawyer",
-        "Library",  // DeltaV - Add Library access 
+        "Library",  // DeltaV - Add Library access
         "Maintenance",
         "Medical",
         "Mime", // DeltaV - Add Mime access
diff --git a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
index 6dff8161ee..a914a8f267 100644
--- a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
+++ b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Bed.Sleep;
 using Content.Shared.Body.Events;
 using Content.Shared.DragDrop;
 using Content.Shared.Emoting;
@@ -5,6 +6,8 @@
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Item;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Events;
 using Content.Shared.Speech;
@@ -67,6 +70,9 @@ public bool UpdateCanMove(EntityUid uid, InputMoverComponent? component = null)
         /// <returns></returns>
         public bool CanInteract(EntityUid user, EntityUid? target)
         {
+            if (!CanConsciouslyPerformAction(user))
+                return false;
+
             var ev = new InteractionAttemptEvent(user, target);
             RaiseLocalEvent(user, ev);
 
@@ -98,6 +104,21 @@ public bool CanUseHeldEntity(EntityUid user)
             return !ev.Cancelled;
         }
 
+
+        /// <summary>
+        /// Whether a user conscious to perform an action.
+        /// </summary>
+        /// <remarks>
+        /// This should be used when you want a much more permissive check than <see cref="CanInteract"/>
+        /// </remarks>
+        public bool CanConsciouslyPerformAction(EntityUid user)
+        {
+            var ev = new ConsciousAttemptEvent(user);
+            RaiseLocalEvent(user, ev);
+
+            return !ev.Cancelled;
+        }
+
         public bool CanThrow(EntityUid user, EntityUid itemUid)
         {
             var ev = new ThrowAttemptEvent(user, itemUid);
diff --git a/Content.Shared/Actions/BaseActionComponent.cs b/Content.Shared/Actions/BaseActionComponent.cs
index cce7b912c7..6d9242acc1 100644
--- a/Content.Shared/Actions/BaseActionComponent.cs
+++ b/Content.Shared/Actions/BaseActionComponent.cs
@@ -1,4 +1,5 @@
-using Robust.Shared.Audio;
+using Content.Shared.Mobs;
+using Robust.Shared.Audio;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
 
@@ -118,6 +119,12 @@ public EntityUid? EntityIcon
     /// </summary>
     [DataField("checkCanInteract")] public bool CheckCanInteract = true;
 
+    /// <summary>
+    /// Whether to check if the user is conscious or not. Can be used instead of <see cref="CheckCanInteract"/>
+    /// for a more permissive check.
+    /// </summary>
+    [DataField] public bool CheckConsciousness = true;
+
     /// <summary>
     ///     If true, this will cause the action to only execute locally without ever notifying the server.
     /// </summary>
@@ -177,6 +184,7 @@ public abstract class BaseActionComponentState : ComponentState
     public NetEntity? Container;
     public NetEntity? EntityIcon;
     public bool CheckCanInteract;
+    public bool CheckConsciousness;
     public bool ClientExclusive;
     public int Priority;
     public NetEntity? AttachedEntity;
@@ -204,6 +212,7 @@ protected BaseActionComponentState(BaseActionComponent component, IEntityManager
         MaxCharges = component.MaxCharges;
         RenewCharges = component.RenewCharges;
         CheckCanInteract = component.CheckCanInteract;
+        CheckConsciousness = component.CheckConsciousness;
         ClientExclusive = component.ClientExclusive;
         Priority = component.Priority;
         AutoPopulate = component.AutoPopulate;
diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs
index a3bfa07130..e909f0a8a3 100644
--- a/Content.Shared/Actions/SharedActionsSystem.cs
+++ b/Content.Shared/Actions/SharedActionsSystem.cs
@@ -8,6 +8,7 @@
 using Content.Shared.Interaction;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Mind;
+using Content.Shared.Mobs.Components;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
@@ -370,6 +371,9 @@ private void OnActionRequest(RequestPerformActionEvent ev, EntitySessionEventArg
 
         BaseActionEvent? performEvent = null;
 
+        if (action.CheckConsciousness && !_actionBlockerSystem.CanConsciouslyPerformAction(user))
+            return;
+
         // Validate request by checking action blockers and the like:
         switch (action)
         {
diff --git a/Content.Shared/Administration/Notes/AdminMessageEuiState.cs b/Content.Shared/Administration/Notes/AdminMessageEuiState.cs
index d9038659b3..7d7cd5efc4 100644
--- a/Content.Shared/Administration/Notes/AdminMessageEuiState.cs
+++ b/Content.Shared/Administration/Notes/AdminMessageEuiState.cs
@@ -1,39 +1,28 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Content.Shared.Eui;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Administration.Notes;
 
 [Serializable, NetSerializable]
-public sealed class AdminMessageEuiState : EuiStateBase
+public sealed class AdminMessageEuiState(TimeSpan time, AdminMessageEuiState.Message[] messages) : EuiStateBase
 {
-    public float Time { get; set; }
-    public string Message { get; set; }
-    public string AdminName { get; set; }
-    public DateTime AddedOn { get; set; }
+    public TimeSpan Time { get; } = time;
+    public Message[] Messages { get; } = messages;
 
-    public AdminMessageEuiState(float time, string message, string adminName, DateTime addedOn)
+    [Serializable]
+    public sealed class Message(string text, string adminName, DateTime addedOn)
     {
-        Message = message;
-        Time = time;
-        AdminName = adminName;
-        AddedOn = addedOn;
+        public string Text = text;
+        public string AdminName = adminName;
+        public DateTime AddedOn = addedOn;
     }
 }
 
 public static class AdminMessageEuiMsg
 {
     [Serializable, NetSerializable]
-    public sealed class Accept : EuiMessageBase
-    {
-    }
-
-    [Serializable, NetSerializable]
-    public sealed class Dismiss : EuiMessageBase
+    public sealed class Dismiss(bool permanent) : EuiMessageBase
     {
+        public bool Permanent { get; } = permanent;
     }
 }
diff --git a/Content.Shared/Anomaly/SharedAnomalySystem.cs b/Content.Shared/Anomaly/SharedAnomalySystem.cs
index 6cdcdf305b..c335cd7b85 100644
--- a/Content.Shared/Anomaly/SharedAnomalySystem.cs
+++ b/Content.Shared/Anomaly/SharedAnomalySystem.cs
@@ -35,8 +35,6 @@ public abstract class SharedAnomalySystem : EntitySystem
     [Dependency] protected readonly SharedPopupSystem Popup = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
 
-    private ISawmill _sawmill = default!;
-
     public override void Initialize()
     {
         base.Initialize();
@@ -45,8 +43,6 @@ public override void Initialize()
         SubscribeLocalEvent<AnomalyComponent, AttackedEvent>(OnAttacked);
         SubscribeLocalEvent<AnomalyComponent, MeleeThrowOnHitStartEvent>(OnAnomalyThrowStart);
         SubscribeLocalEvent<AnomalyComponent, MeleeThrowOnHitEndEvent>(OnAnomalyThrowEnd);
-
-        _sawmill = Logger.GetSawmill("anomaly");
     }
 
     private void OnInteractHand(EntityUid uid, AnomalyComponent component, InteractHandEvent args)
@@ -98,7 +94,7 @@ public void DoAnomalyPulse(EntityUid uid, AnomalyComponent? component = null)
         component.NextPulseTime = Timing.CurTime + GetPulseLength(component) * variation;
 
         if (_net.IsServer)
-            _sawmill.Info($"Performing anomaly pulse. Entity: {ToPrettyString(uid)}");
+            Log.Info($"Performing anomaly pulse. Entity: {ToPrettyString(uid)}");
 
         // if we are above the growth threshold, then grow before the pulse
         if (component.Stability > component.GrowthThreshold)
@@ -133,9 +129,9 @@ public void StartSupercriticalEvent(EntityUid uid)
         if (HasComp<AnomalySupercriticalComponent>(uid))
             return;
 
-        AdminLog.Add(LogType.Anomaly, LogImpact.High, $"Anomaly {ToPrettyString(uid)} began to go supercritical.");
+        AdminLog.Add(LogType.Anomaly, LogImpact.Extreme, $"Anomaly {ToPrettyString(uid)} began to go supercritical.");
         if (_net.IsServer)
-            _sawmill.Info($"Anomaly is going supercritical. Entity: {ToPrettyString(uid)}");
+            Log.Info($"Anomaly is going supercritical. Entity: {ToPrettyString(uid)}");
 
         var super = AddComp<AnomalySupercriticalComponent>(uid);
         super.EndTime = Timing.CurTime + super.SupercriticalDuration;
@@ -161,7 +157,7 @@ public void DoAnomalySupercriticalEvent(EntityUid uid, AnomalyComponent? compone
         Audio.PlayPvs(component.SupercriticalSound, uid);
 
         if (_net.IsServer)
-            _sawmill.Info($"Raising supercritical event. Entity: {ToPrettyString(uid)}");
+            Log.Info($"Raising supercritical event. Entity: {ToPrettyString(uid)}");
 
         var ev = new AnomalySupercriticalEvent(uid);
         RaiseLocalEvent(uid, ref ev, true);
@@ -179,8 +175,9 @@ public void EndAnomaly(EntityUid uid, AnomalyComponent? component = null, bool s
     {
         // Logging before resolve, in case the anomaly has deleted itself.
         if (_net.IsServer)
-            _sawmill.Info($"Ending anomaly. Entity: {ToPrettyString(uid)}");
-        AdminLog.Add(LogType.Anomaly, LogImpact.Extreme, $"Anomaly {ToPrettyString(uid)} went supercritical.");
+            Log.Info($"Ending anomaly. Entity: {ToPrettyString(uid)}");
+        AdminLog.Add(LogType.Anomaly, supercritical ? LogImpact.High : LogImpact.Low,
+                     $"Anomaly {ToPrettyString(uid)} {(supercritical ? "went supercritical" : "decayed")}.");
 
         if (!Resolve(uid, ref component))
             return;
diff --git a/Content.Shared/Atmos/Atmospherics.cs b/Content.Shared/Atmos/Atmospherics.cs
index 7460e08e46..6a8587ca23 100644
--- a/Content.Shared/Atmos/Atmospherics.cs
+++ b/Content.Shared/Atmos/Atmospherics.cs
@@ -8,11 +8,6 @@ namespace Content.Shared.Atmos
     /// </summary>
     public static class Atmospherics
     {
-        static Atmospherics()
-        {
-            AdjustedNumberOfGases = MathHelper.NextMultipleOf(TotalNumberOfGases, 4);
-        }
-
         #region ATMOS
         /// <summary>
         ///     The universal gas constant, in kPa*L/(K*mol)
@@ -183,7 +178,7 @@ static Atmospherics()
         ///     This is the actual length of the gases arrays in mixtures.
         ///     Set to the closest multiple of 4 relative to <see cref="TotalNumberOfGases"/> for SIMD reasons.
         /// </summary>
-        public static readonly int AdjustedNumberOfGases;
+        public const int AdjustedNumberOfGases = ((TotalNumberOfGases + 3) / 4) * 4;
 
         /// <summary>
         ///     Amount of heat released per mole of burnt hydrogen or tritium (hydrogen isotope)
diff --git a/Content.Shared/Atmos/EntitySystems/SharedAtmosDebugOverlaySystem.cs b/Content.Shared/Atmos/EntitySystems/SharedAtmosDebugOverlaySystem.cs
index 136c195502..979bbf77ba 100644
--- a/Content.Shared/Atmos/EntitySystems/SharedAtmosDebugOverlaySystem.cs
+++ b/Content.Shared/Atmos/EntitySystems/SharedAtmosDebugOverlaySystem.cs
@@ -20,7 +20,8 @@ public readonly record struct AtmosDebugOverlayData(
             int? InExcitedGroup,
             bool IsSpace,
             bool MapAtmosphere,
-            bool NoGrid);
+            bool NoGrid,
+            bool Immutable);
 
         /// <summary>
         ///     Invalid tiles for the gas overlay.
diff --git a/Content.Shared/Atmos/EntitySystems/SharedGasTileOverlaySystem.cs b/Content.Shared/Atmos/EntitySystems/SharedGasTileOverlaySystem.cs
index eb0079eb35..f468724db3 100644
--- a/Content.Shared/Atmos/EntitySystems/SharedGasTileOverlaySystem.cs
+++ b/Content.Shared/Atmos/EntitySystems/SharedGasTileOverlaySystem.cs
@@ -66,7 +66,10 @@ public static Vector2i GetGasChunkIndices(Vector2i indices)
         [Serializable, NetSerializable]
         public readonly struct GasOverlayData : IEquatable<GasOverlayData>
         {
+            [ViewVariables]
             public readonly byte FireState;
+
+            [ViewVariables]
             public readonly byte[] Opacity;
 
             // TODO change fire color based on temps
diff --git a/Content.Shared/Audio/SharedAmbientSoundSystem.cs b/Content.Shared/Audio/SharedAmbientSoundSystem.cs
index 6318ba2557..5f17261825 100644
--- a/Content.Shared/Audio/SharedAmbientSoundSystem.cs
+++ b/Content.Shared/Audio/SharedAmbientSoundSystem.cs
@@ -5,16 +5,19 @@ namespace Content.Shared.Audio;
 
 public abstract class SharedAmbientSoundSystem : EntitySystem
 {
+    private EntityQuery<AmbientSoundComponent> _query;
+
     public override void Initialize()
     {
         base.Initialize();
         SubscribeLocalEvent<AmbientSoundComponent, ComponentGetState>(GetCompState);
         SubscribeLocalEvent<AmbientSoundComponent, ComponentHandleState>(HandleCompState);
+        _query = GetEntityQuery<AmbientSoundComponent>();
     }
 
     public virtual void SetAmbience(EntityUid uid, bool value, AmbientSoundComponent? ambience = null)
     {
-        if (!Resolve(uid, ref ambience, false) || ambience.Enabled == value)
+        if (!_query.Resolve(uid, ref ambience, false) || ambience.Enabled == value)
             return;
 
         ambience.Enabled = value;
@@ -24,7 +27,7 @@ public virtual void SetAmbience(EntityUid uid, bool value, AmbientSoundComponent
 
     public virtual void SetRange(EntityUid uid, float value, AmbientSoundComponent? ambience = null)
     {
-        if (!Resolve(uid, ref ambience, false) || MathHelper.CloseToPercent(ambience.Range, value))
+        if (!_query.Resolve(uid, ref ambience, false) || MathHelper.CloseToPercent(ambience.Range, value))
             return;
 
         ambience.Range = value;
@@ -39,7 +42,7 @@ protected virtual void QueueUpdate(EntityUid uid, AmbientSoundComponent ambience
 
     public virtual void SetVolume(EntityUid uid, float value, AmbientSoundComponent? ambience = null)
     {
-        if (!Resolve(uid, ref ambience, false) || MathHelper.CloseToPercent(ambience.Volume, value))
+        if (!_query.Resolve(uid, ref ambience, false) || MathHelper.CloseToPercent(ambience.Volume, value))
             return;
 
         ambience.Volume = value;
@@ -48,7 +51,7 @@ public virtual void SetVolume(EntityUid uid, float value, AmbientSoundComponent?
 
     public virtual void SetSound(EntityUid uid, SoundSpecifier sound, AmbientSoundComponent? ambience = null)
     {
-        if (!Resolve(uid, ref ambience, false) || ambience.Sound == sound)
+        if (!_query.Resolve(uid, ref ambience, false) || ambience.Sound == sound)
             return;
 
         ambience.Sound = sound;
diff --git a/Content.Shared/Blocking/BlockingSystem.User.cs b/Content.Shared/Blocking/BlockingSystem.User.cs
index 87f285597f..2cd1db7f1f 100644
--- a/Content.Shared/Blocking/BlockingSystem.User.cs
+++ b/Content.Shared/Blocking/BlockingSystem.User.cs
@@ -47,13 +47,23 @@ private void OnUserDamageModified(EntityUid uid, BlockingUserComponent component
             if (args.Damage.GetTotal() <= 0)
                 return;
 
+            // A shield should only block damage it can itself absorb. To determine that we need the Damageable component on it.
+            if (!TryComp<DamageableComponent>(component.BlockingItem, out var dmgComp))
+                return;
+
             var blockFraction = blocking.IsBlocking ? blocking.ActiveBlockFraction : blocking.PassiveBlockFraction;
             blockFraction = Math.Clamp(blockFraction, 0, 1);
             _damageable.TryChangeDamage(component.BlockingItem, blockFraction * args.OriginalDamage);
 
-            args.Damage *= (1 - blockFraction);
+            var modify = new DamageModifierSet();
+            foreach (var key in dmgComp.Damage.DamageDict.Keys)
+            {
+                modify.Coefficients.TryAdd(key, 1 - blockFraction);
+            }
+
+            args.Damage = DamageSpecifier.ApplyModifierSet(args.Damage, modify);
 
-            if (blocking.IsBlocking)
+            if (blocking.IsBlocking && !args.Damage.Equals(args.OriginalDamage))
             {
                 _audio.PlayPvs(blocking.BlockSound, uid);
             }
diff --git a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
index 731b2892aa..8172947a03 100644
--- a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
+++ b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
@@ -7,7 +7,6 @@
 using Content.Shared.Hands.Components;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Movement.Events;
 using Content.Shared.Popups;
@@ -39,7 +38,6 @@ private void InitializeBuckle()
         SubscribeLocalEvent<BuckleComponent, StandAttemptEvent>(OnBuckleStandAttempt);
         SubscribeLocalEvent<BuckleComponent, ThrowPushbackAttemptEvent>(OnBuckleThrowPushbackAttempt);
         SubscribeLocalEvent<BuckleComponent, UpdateCanMoveEvent>(OnBuckleUpdateCanMove);
-        SubscribeLocalEvent<BuckleComponent, ChangeDirectionAttemptEvent>(OnBuckleChangeDirectionAttempt);
     }
 
     private void OnBuckleComponentStartup(EntityUid uid, BuckleComponent component, ComponentStartup args)
@@ -142,12 +140,6 @@ private void OnBuckleUpdateCanMove(EntityUid uid, BuckleComponent component, Upd
             args.Cancel();
     }
 
-    private void OnBuckleChangeDirectionAttempt(EntityUid uid, BuckleComponent component, ChangeDirectionAttemptEvent args)
-    {
-        if (component.Buckled)
-            args.Cancel();
-    }
-
     public bool IsBuckled(EntityUid uid, BuckleComponent? component = null)
     {
         return Resolve(uid, ref component, false) && component.Buckled;
@@ -366,7 +358,7 @@ public bool TryBuckle(EntityUid buckleUid, EntityUid userUid, EntityUid strapUid
 
         if (TryComp<PhysicsComponent>(buckleUid, out var physics))
         {
-            _physics.ResetDynamics(physics);
+            _physics.ResetDynamics(buckleUid, physics);
         }
 
         if (!buckleComp.PullStrap && TryComp<SharedPullableComponent>(strapUid, out var toPullable))
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 6427faa113..f8943a9bf9 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -341,6 +341,18 @@ public static readonly CVarDef<bool>
         public static readonly CVarDef<bool> DebugCoordinatesAdminOnly =
             CVarDef.Create("game.debug_coordinates_admin_only", true, CVar.SERVER | CVar.REPLICATED);
 
+        /// <summary>
+        /// Whether or not to allow characters to select loadout items.
+        /// </summary>
+        public static readonly CVarDef<bool> GameLoadoutsEnabled =
+            CVarDef.Create("game.loadouts_enabled", true, CVar.REPLICATED);
+
+        /// <summary>
+        /// How many points to give to each player for loadouts.
+        /// </summary>
+        public static readonly CVarDef<int> GameLoadoutsPoints =
+            CVarDef.Create("game.loadouts_points", 14, CVar.REPLICATED);
+
 #if EXCEPTION_TOLERANCE
         /// <summary>
         ///     Amount of times round start must fail before the server is shut down.
@@ -375,6 +387,19 @@ public static readonly CVarDef<bool>
         public static readonly CVarDef<string> RoundEndSoundCollection =
             CVarDef.Create("game.round_end_sound_collection", "RoundEnd", CVar.SERVERONLY);
 
+
+        /*
+         * Queue
+         */
+
+        /// <summary>
+        ///     Controls if the connections queue is enabled
+        ///     If enabled plyaers will be added to a queue instead of being kicked after SoftMaxPlayers is reached
+        /// </summary>
+        public static readonly CVarDef<bool>
+        QueueEnabled = CVarDef.Create("queue.enabled", false, CVar.SERVERONLY);
+
+
         /*
          * Discord
          */
@@ -415,6 +440,24 @@ public static readonly CVarDef<bool>
         public static readonly CVarDef<string> DiscordRoundEndRoleWebhook =
             CVarDef.Create("discord.round_end_role", string.Empty, CVar.SERVERONLY);
 
+        /// <summary>
+        ///     Enable Discord linking, show linking button and modal window
+        /// </summary>
+        public static readonly CVarDef<bool> DiscordAuthEnabled =
+            CVarDef.Create("discord.auth_enabled", false, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     URL of the Discord auth server API
+        /// </summary>
+        public static readonly CVarDef<string> DiscordAuthApiUrl =
+            CVarDef.Create("discord.auth_api_url", "", CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Secret key of the Discord auth server API
+        /// </summary>
+        public static readonly CVarDef<string> DiscordAuthApiKey =
+            CVarDef.Create("discord.auth_api_key", "", CVar.SERVERONLY | CVar.CONFIDENTIAL);
+
 
         /*
          * Suspicion
@@ -772,6 +815,12 @@ public static readonly CVarDef<bool>
         public static readonly CVarDef<bool> SeeOwnNotes =
             CVarDef.Create("admin.see_own_notes", false, CVar.ARCHIVE | CVar.REPLICATED | CVar.SERVER);
 
+        /// <summary>
+        /// Should the server play a quick sound to the active admins whenever a new player joins?
+        /// </summary>
+        public static readonly CVarDef<bool> AdminNewPlayerJoinSound =
+            CVarDef.Create("admin.new_player_join_sound", false, CVar.SERVERONLY);
+
         /// <summary>
         /// The amount of days before the note starts fading. It will slowly lose opacity until it reaches stale. Set to 0 to disable.
         /// </summary>
@@ -1578,6 +1627,13 @@ public static readonly CVarDef<int>
         public static readonly CVarDef<float> ScreenShakeIntensity =
             CVarDef.Create("accessibility.screen_shake_intensity", 1f, CVar.CLIENTONLY | CVar.ARCHIVE);
 
+        /// <summary>
+        /// A generic toggle for various visual effects that are color sensitive.
+        /// As of 2/16/24, only applies to progress bar colors.
+        /// </summary>
+        public static readonly CVarDef<bool> AccessibilityColorblindFriendly =
+            CVarDef.Create("accessibility.colorblind_friendly", false, CVar.CLIENTONLY | CVar.ARCHIVE);
+
         /*
          * CHAT
          */
diff --git a/Content.Shared/Chemistry/Components/InjectorComponent.cs b/Content.Shared/Chemistry/Components/InjectorComponent.cs
index e29047b6de..437c5e327d 100644
--- a/Content.Shared/Chemistry/Components/InjectorComponent.cs
+++ b/Content.Shared/Chemistry/Components/InjectorComponent.cs
@@ -30,7 +30,7 @@ public sealed partial class InjectorComponent : Component
     /// Whether or not the injector is able to draw from containers or if it's a single use
     /// device that can only inject.
     /// </summary>
-    [DataField("injectOnly")]
+    [DataField]
     public bool InjectOnly;
 
     /// <summary>
@@ -39,29 +39,26 @@ public sealed partial class InjectorComponent : Component
     /// <remarks>
     ///     for example: droppers would ignore mobs
     /// </remarks>
-    [DataField("ignoreMobs")]
+    [DataField]
     public bool IgnoreMobs;
 
     /// <summary>
     ///     The minimum amount of solution that can be transferred at once from this solution.
     /// </summary>
     [DataField("minTransferAmount")]
-    [ViewVariables(VVAccess.ReadWrite)]
     public FixedPoint2 MinimumTransferAmount = FixedPoint2.New(5);
 
     /// <summary>
     ///     The maximum amount of solution that can be transferred at once from this solution.
     /// </summary>
     [DataField("maxTransferAmount")]
-    [ViewVariables(VVAccess.ReadWrite)]
     public FixedPoint2 MaximumTransferAmount = FixedPoint2.New(50);
 
     /// <summary>
     /// Amount to inject or draw on each usage. If the injector is inject only, it will
     /// attempt to inject it's entire contents upon use.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("transferAmount")]
+    [DataField]
     [AutoNetworkedField]
     public FixedPoint2 TransferAmount = FixedPoint2.New(5);
 
@@ -72,8 +69,7 @@ public sealed partial class InjectorComponent : Component
     /// The base delay has a minimum of 1 second, but this will still be modified if the target is incapacitated or
     /// in combat mode.
     /// </remarks>
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("delay")]
+    [DataField]
     public TimeSpan Delay = TimeSpan.FromSeconds(5);
 
     /// <summary>
@@ -81,7 +77,6 @@ public sealed partial class InjectorComponent : Component
     /// right SolutionCaps to support injection/drawing. For InjectOnly injectors this should
     /// only ever be set to Inject
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
     [AutoNetworkedField]
     [DataField]
     public InjectorToggleMode ToggleState = InjectorToggleMode.Draw;
diff --git a/Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs
index dad8eb4091..7e41cb39bd 100644
--- a/Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs
@@ -39,12 +39,34 @@ private void AddSetTransferVerbs(Entity<InjectorComponent> entity, ref GetVerbsE
 
         if (!HasComp<ActorComponent>(args.User))
             return;
+        var user = args.User;
 
         var (_, component) = entity;
 
-        // Add specific transfer verbs according to the container's size
+        var min = component.MinimumTransferAmount;
+        var max = component.MaximumTransferAmount;
+        var cur = component.TransferAmount;
+        var toggleAmount = cur == max ? min : max;
+
         var priority = 0;
-        var user = args.User;
+        AlternativeVerb toggleVerb = new()
+        {
+            Text = Loc.GetString("comp-solution-transfer-verb-toggle", ("amount", toggleAmount)),
+            Category = VerbCategory.SetTransferAmount,
+            Act = () =>
+            {
+                component.TransferAmount = toggleAmount;
+                Popup.PopupClient(Loc.GetString("comp-solution-transfer-set-amount", ("amount", toggleAmount)), user, user);
+                Dirty(entity);
+            },
+
+            Priority = priority
+        };
+        args.Verbs.Add(toggleVerb);
+
+        priority -= 1;
+
+        // Add specific transfer verbs according to the container's size
         foreach (var amount in TransferAmounts)
         {
             if (amount < component.MinimumTransferAmount || amount > component.MaximumTransferAmount)
diff --git a/Content.Shared/Climbing/Components/BonkableComponent.cs b/Content.Shared/Climbing/Components/BonkableComponent.cs
index cc85e1c562..5e97396fba 100644
--- a/Content.Shared/Climbing/Components/BonkableComponent.cs
+++ b/Content.Shared/Climbing/Components/BonkableComponent.cs
@@ -15,7 +15,7 @@ public sealed partial class BonkableComponent : Component
     /// Chance of bonk triggering if the user is clumsy.
     /// </summary>
     [DataField("bonkClumsyChance")]
-    public float BonkClumsyChance = 0.75f;
+    public float BonkClumsyChance = 0.5f;
 
     /// <summary>
     /// Sound to play when bonking.
@@ -42,5 +42,5 @@ public sealed partial class BonkableComponent : Component
     /// How long it takes to bonk.
     /// </summary>
     [DataField("bonkDelay")]
-    public float BonkDelay = 0.8f;
+    public float BonkDelay = 1.5f;
 }
diff --git a/Content.Shared/Climbing/Components/ClimbingComponent.cs b/Content.Shared/Climbing/Components/ClimbingComponent.cs
index 89320eabc8..1ab861b1f7 100644
--- a/Content.Shared/Climbing/Components/ClimbingComponent.cs
+++ b/Content.Shared/Climbing/Components/ClimbingComponent.cs
@@ -4,9 +4,21 @@
 
 namespace Content.Shared.Climbing.Components;
 
+/// <summary>
+/// Indicates that this entity is able to be placed on top of surfaces like tables.
+/// Does not by itself allow the entity to carry out the action of climbing, unless
+/// <see cref="CanClimb"/> is true. Use <see cref="CanForceClimb"/> to control whether
+/// the entity can force other entities onto surfaces.
+/// </summary>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
 public sealed partial class ClimbingComponent : Component
 {
+    /// <summary>
+    /// Whether the owner is able to climb onto things by their own action.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool CanClimb = true;
+
     /// <summary>
     /// Whether the owner is climbing on a climbable entity.
     /// </summary>
diff --git a/Content.Shared/Climbing/Events/AttemptClimbEvent.cs b/Content.Shared/Climbing/Events/AttemptClimbEvent.cs
new file mode 100644
index 0000000000..d38e27de38
--- /dev/null
+++ b/Content.Shared/Climbing/Events/AttemptClimbEvent.cs
@@ -0,0 +1,7 @@
+namespace Content.Shared.Climbing.Events;
+
+[ByRefEvent]
+public record struct AttemptClimbEvent(EntityUid User, EntityUid Climber, EntityUid Climbable)
+{
+    public bool Cancelled;
+}
diff --git a/Content.Shared/Climbing/Systems/BonkSystem.cs b/Content.Shared/Climbing/Systems/BonkSystem.cs
index e91d1eadbe..c5cbb97376 100644
--- a/Content.Shared/Climbing/Systems/BonkSystem.cs
+++ b/Content.Shared/Climbing/Systems/BonkSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.CCVar;
 using Content.Shared.Climbing.Components;
+using Content.Shared.Climbing.Events;
 using Content.Shared.Damage;
 using Content.Shared.DoAfter;
 using Content.Shared.DragDrop;
@@ -9,7 +10,6 @@
 using Content.Shared.Interaction.Components;
 using Content.Shared.Popups;
 using Content.Shared.Stunnable;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
 using Robust.Shared.Player;
@@ -30,42 +30,54 @@ public sealed partial class BonkSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<BonkableComponent, DragDropTargetEvent>(OnDragDrop);
         SubscribeLocalEvent<BonkableComponent, BonkDoAfterEvent>(OnBonkDoAfter);
+        SubscribeLocalEvent<BonkableComponent, AttemptClimbEvent>(OnAttemptClimb);
     }
 
-    private void OnBonkDoAfter(EntityUid uid, Components.BonkableComponent component, BonkDoAfterEvent args)
+    private void OnBonkDoAfter(EntityUid uid, BonkableComponent component, BonkDoAfterEvent args)
     {
-        if (args.Handled || args.Cancelled || args.Args.Target == null)
+        if (args.Handled || args.Cancelled || args.Args.Used == null)
             return;
 
-        TryBonk(args.Args.User, uid, component);
+        TryBonk(args.Args.Used.Value, uid, component, source: args.Args.User);
 
         args.Handled = true;
     }
 
 
-    public bool TryBonk(EntityUid user, EntityUid bonkableUid, Components.BonkableComponent? bonkableComponent = null)
+    public bool TryBonk(EntityUid user, EntityUid bonkableUid, BonkableComponent? bonkableComponent = null, EntityUid? source = null)
     {
         if (!Resolve(bonkableUid, ref bonkableComponent, false))
             return false;
 
-        if (!_cfg.GetCVar(CCVars.GameTableBonk))
-        {
-            // Not set to always bonk, try clumsy roll.
-            if (!_interactionSystem.TryRollClumsy(user, bonkableComponent.BonkClumsyChance))
-                return false;
-        }
-
         // BONK!
         var userName = Identity.Entity(user, EntityManager);
         var bonkableName = Identity.Entity(bonkableUid, EntityManager);
 
-        _popupSystem.PopupEntity(Loc.GetString("bonkable-success-message-others", ("user", userName), ("bonkable", bonkableName)), user, Filter.PvsExcept(user), true);
+        if (user == source)
+        {
+            // Non-local, non-bonking players
+            _popupSystem.PopupEntity(Loc.GetString("bonkable-success-message-others", ("user", userName), ("bonkable", bonkableName)), user, Filter.PvsExcept(user), true);
+            // Local, bonking player
+            _popupSystem.PopupClient(Loc.GetString("bonkable-success-message-user", ("user", userName), ("bonkable", bonkableName)), user, user);
+        }
+        else if (source != null)
+        {
+            // Local, non-bonking player (dragger)
+            _popupSystem.PopupClient(Loc.GetString("bonkable-success-message-others", ("user", userName), ("bonkable", bonkableName)), user, source.Value);
+            // Non-local, non-bonking players
+            _popupSystem.PopupEntity(Loc.GetString("bonkable-success-message-others", ("user", userName), ("bonkable", bonkableName)), user, Filter.Pvs(user).RemoveWhereAttachedEntity(e => e == user || e == source.Value), true);
+            // Non-local, bonking player
+            _popupSystem.PopupEntity(Loc.GetString("bonkable-success-message-user", ("user", userName), ("bonkable", bonkableName)), user, user);
+        }
+
+
 
-        _popupSystem.PopupEntity(Loc.GetString("bonkable-success-message-user", ("user", userName), ("bonkable", bonkableName)), user, user);
+        if (source != null)
+            _audioSystem.PlayPredicted(bonkableComponent.BonkSound, bonkableUid, source);
+        else
+            _audioSystem.PlayPvs(bonkableComponent.BonkSound, bonkableUid);
 
-        _audioSystem.PlayPvs(bonkableComponent.BonkSound, bonkableUid);
         _stunSystem.TryParalyze(user, TimeSpan.FromSeconds(bonkableComponent.BonkTime), true);
 
         if (bonkableComponent.BonkDamage is { } bonkDmg)
@@ -75,12 +87,22 @@ public bool TryBonk(EntityUid user, EntityUid bonkableUid, Components.BonkableCo
 
     }
 
-    private void OnDragDrop(EntityUid uid, Components.BonkableComponent component, ref DragDropTargetEvent args)
+    private bool TryStartBonk(EntityUid uid, EntityUid user, EntityUid climber, BonkableComponent? bonkableComponent = null)
     {
-        if (args.Handled || !HasComp<ClumsyComponent>(args.Dragged) || !HasComp<HandsComponent>(args.User))
-            return;
+        if (!Resolve(uid, ref bonkableComponent, false))
+            return false;
 
-        var doAfterArgs = new DoAfterArgs(EntityManager, args.Dragged, component.BonkDelay, new BonkDoAfterEvent(), uid, target: uid)
+        if (!HasComp<ClumsyComponent>(climber) || !HasComp<HandsComponent>(user))
+            return false;
+
+        if (!_cfg.GetCVar(CCVars.GameTableBonk))
+        {
+            // Not set to always bonk, try clumsy roll.
+            if (!_interactionSystem.TryRollClumsy(climber, bonkableComponent.BonkClumsyChance))
+                return false;
+        }
+
+        var doAfterArgs = new DoAfterArgs(EntityManager, user, bonkableComponent.BonkDelay, new BonkDoAfterEvent(), uid, target: uid, used: climber)
         {
             BreakOnTargetMove = true,
             BreakOnUserMove = true,
@@ -89,7 +111,16 @@ private void OnDragDrop(EntityUid uid, Components.BonkableComponent component, r
 
         _doAfter.TryStartDoAfter(doAfterArgs);
 
-        args.Handled = true;
+        return true;
+    }
+
+    private void OnAttemptClimb(EntityUid uid, BonkableComponent component, AttemptClimbEvent args)
+    {
+        if (args.Cancelled || !HasComp<ClumsyComponent>(args.Climber) || !HasComp<HandsComponent>(args.User))
+            return;
+
+        if (TryStartBonk(uid, args.User, args.Climber, component))
+            args.Cancelled = true;
     }
 
     [Serializable, NetSerializable]
diff --git a/Content.Shared/Climbing/Systems/ClimbSystem.cs b/Content.Shared/Climbing/Systems/ClimbSystem.cs
index 7c760f2c5d..6a2976a838 100644
--- a/Content.Shared/Climbing/Systems/ClimbSystem.cs
+++ b/Content.Shared/Climbing/Systems/ClimbSystem.cs
@@ -1,6 +1,4 @@
 using Content.Shared.ActionBlocker;
-using Content.Shared.Body.Components;
-using Content.Shared.Body.Part;
 using Content.Shared.Body.Systems;
 using Content.Shared.Buckle.Components;
 using Content.Shared.Climbing.Components;
@@ -151,7 +149,6 @@ private void OnCanDragDropOn(EntityUid uid, ClimbableComponent component, ref Ca
         if (args.Handled)
             return;
 
-
         var canVault = args.User == args.Dragged
             ? CanVault(component, args.User, uid, out _)
             : CanVault(component, args.User, args.Dragged, uid, out _);
@@ -169,7 +166,7 @@ private void AddClimbableVerb(EntityUid uid, ClimbableComponent component, GetVe
         if (!args.CanAccess || !args.CanInteract || !_actionBlockerSystem.CanMove(args.User))
             return;
 
-        if (!TryComp(args.User, out ClimbingComponent? climbingComponent) || climbingComponent.IsClimbing)
+        if (!TryComp(args.User, out ClimbingComponent? climbingComponent) || climbingComponent.IsClimbing || !climbingComponent.CanClimb)
             return;
 
         // TODO VERBS ICON add a climbing icon?
@@ -198,14 +195,28 @@ public bool TryClimb(
     {
         id = null;
 
-        if (!Resolve(climbable, ref comp) || !Resolve(entityToMove, ref climbing))
+        if (!Resolve(climbable, ref comp) || !Resolve(entityToMove, ref climbing, false))
+            return false;
+
+        var canVault = user == entityToMove
+             ? CanVault(comp, user, climbable, out var reason)
+             : CanVault(comp, user, entityToMove, climbable, out reason);
+        if (!canVault)
+        {
+            _popupSystem.PopupClient(reason, user, user);
             return false;
+        }
 
         // Note, IsClimbing does not mean a DoAfter is active, it means the target has already finished a DoAfter and
         // is currently on top of something..
         if (climbing.IsClimbing)
             return true;
 
+        var ev = new AttemptClimbEvent(user, entityToMove, climbable);
+        RaiseLocalEvent(climbable, ref ev);
+        if (ev.Cancelled)
+            return false;
+
         var args = new DoAfterArgs(EntityManager, user, comp.ClimbDelay, new ClimbDoAfterEvent(),
             entityToMove,
             target: climbable,
@@ -245,7 +256,7 @@ private void Climb(EntityUid uid, EntityUid user, EntityUid climbable, bool sile
         var (worldPos, worldRot) = _xformSystem.GetWorldPositionRotation(xform);
         var worldDirection = _xformSystem.GetWorldPosition(climbable) - worldPos;
         var distance = worldDirection.Length();
-        var parentRot = (worldRot - xform.LocalRotation);
+        var parentRot = worldRot - xform.LocalRotation;
         // Need direction relative to climber's parent.
         var localDirection = (-parentRot).RotateVec(worldDirection);
 
@@ -400,10 +411,8 @@ public bool CanVault(ClimbableComponent component, EntityUid user, EntityUid tar
             return false;
         }
 
-        if (!HasComp<ClimbingComponent>(user)
-            || !TryComp(user, out BodyComponent? body)
-            || !_bodySystem.BodyHasPartType(user, BodyPartType.Leg, body)
-            || !_bodySystem.BodyHasPartType(user, BodyPartType.Foot, body))
+        if (!TryComp<ClimbingComponent>(user, out var climbingComp)
+            || !climbingComp.CanClimb)
         {
             reason = Loc.GetString("comp-climbable-cant-climb");
             return false;
@@ -439,7 +448,7 @@ public bool CanVault(ClimbableComponent component, EntityUid user, EntityUid dra
 
         if (!HasComp<ClimbingComponent>(dragged))
         {
-            reason = Loc.GetString("comp-climbable-cant-climb");
+            reason = Loc.GetString("comp-climbable-target-cant-climb", ("moved-user", Identity.Entity(dragged, EntityManager)));
             return false;
         }
 
diff --git a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
index 50a1d93a6c..f189db005b 100644
--- a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
@@ -217,5 +217,38 @@ public void CopyVisuals(EntityUid uid, ClothingComponent otherClothing, Clothing
         Dirty(uid, clothing);
     }
 
+    public void SetLayerColor(ClothingComponent clothing, string slot, string mapKey, Color? color)
+    {
+        if (clothing.ClothingVisuals == null)
+            return;
+
+        foreach (var layer in clothing.ClothingVisuals[slot])
+        {
+            if (layer.MapKeys == null)
+                return;
+
+            if (!layer.MapKeys.Contains(mapKey))
+                continue;
+
+            layer.Color = color;
+        }
+    }
+    public void SetLayerState(ClothingComponent clothing, string slot, string mapKey, string state)
+    {
+        if (clothing.ClothingVisuals == null)
+            return;
+
+        foreach (var layer in clothing.ClothingVisuals[slot])
+        {
+            if (layer.MapKeys == null)
+                return;
+
+            if (!layer.MapKeys.Contains(mapKey))
+                continue;
+
+            layer.State = state;
+        }
+    }
+
     #endregion
 }
diff --git a/Content.Shared/Clothing/LoadoutSystem.cs b/Content.Shared/Clothing/LoadoutSystem.cs
deleted file mode 100644
index bb93e9e38c..0000000000
--- a/Content.Shared/Clothing/LoadoutSystem.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Content.Shared.Clothing.Components;
-using Content.Shared.Roles;
-using Content.Shared.Station;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-
-namespace Content.Shared.Clothing;
-
-/// <summary>
-/// Assigns a loadout to an entity based on the startingGear prototype
-/// </summary>
-public sealed class LoadoutSystem : EntitySystem
-{
-    // Shared so we can predict it for placement manager.
-
-    [Dependency] private readonly SharedStationSpawningSystem _station = default!;
-    [Dependency] private readonly IPrototypeManager _protoMan = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<LoadoutComponent, MapInitEvent>(OnMapInit);
-    }
-
-    private void OnMapInit(EntityUid uid, LoadoutComponent component, MapInitEvent args)
-    {
-        if (component.Prototypes == null)
-            return;
-
-        var proto = _protoMan.Index<StartingGearPrototype>(_random.Pick(component.Prototypes));
-        _station.EquipStartingGear(uid, proto, null);
-    }
-}
diff --git a/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutCategoryPrototype.cs b/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutCategoryPrototype.cs
new file mode 100644
index 0000000000..5dd880d3f1
--- /dev/null
+++ b/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutCategoryPrototype.cs
@@ -0,0 +1,13 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Clothing.Loadouts.Prototypes;
+
+/// <summary>
+///     A prototype defining a valid category for <see cref="LoadoutPrototype"/>s to go into.
+/// </summary>
+[Prototype("loadoutCategory")]
+public sealed class LoadoutCategoryPrototype : IPrototype
+{
+    [IdDataField]
+    public string ID { get; } = default!;
+}
diff --git a/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs b/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs
new file mode 100644
index 0000000000..bc31fc1570
--- /dev/null
+++ b/Content.Shared/Clothing/Loadouts/Prototypes/LoadoutPrototype.cs
@@ -0,0 +1,45 @@
+using Content.Shared.Clothing.Loadouts.Systems;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
+
+namespace Content.Shared.Clothing.Loadouts.Prototypes;
+
+[Prototype("loadout")]
+public sealed class LoadoutPrototype : IPrototype
+{
+    /// <summary>
+    ///     Formatted like "Loadout[Department/ShortHeadName][CommonClothingSlot][SimplifiedClothingId]", example: "LoadoutScienceOuterLabcoatSeniorResearcher"
+    /// </summary>
+    [IdDataField]
+    public string ID { get; } = default!;
+
+    /// <summary>
+    ///     Which tab category to put this under
+    /// </summary>
+    [DataField(customTypeSerializer:typeof(PrototypeIdSerializer<LoadoutCategoryPrototype>))]
+    public string Category = "Uncategorized";
+
+    /// <summary>
+    ///     The item to give
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>), required: true)]
+    public List<string> Items = new();
+
+
+    /// <summary>
+    ///     The point cost of this loadout
+    /// </summary>
+    [DataField]
+    public int Cost = 1;
+
+    /// <summary>
+    ///     Should this item override other items in the same slot?
+    /// </summary>
+    [DataField]
+    public bool Exclusive;
+
+
+    [DataField]
+    public List<LoadoutRequirement> Requirements = new();
+}
diff --git a/Content.Shared/Clothing/Loadouts/Systems/LoadoutRequirements.cs b/Content.Shared/Clothing/Loadouts/Systems/LoadoutRequirements.cs
new file mode 100644
index 0000000000..b76a31e422
--- /dev/null
+++ b/Content.Shared/Clothing/Loadouts/Systems/LoadoutRequirements.cs
@@ -0,0 +1,375 @@
+using System.Linq;
+using Content.Shared.CCVar;
+using Content.Shared.Humanoid.Prototypes;
+using Content.Shared.Players.PlayTimeTracking;
+using Content.Shared.Preferences;
+using Content.Shared.Roles;
+using Content.Shared.Roles.Jobs;
+using Content.Shared.Traits;
+using JetBrains.Annotations;
+using Robust.Shared.Configuration;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Clothing.Loadouts.Systems;
+
+[ImplicitDataDefinitionForInheritors, MeansImplicitUse]
+[Serializable, NetSerializable]
+public abstract partial class LoadoutRequirement
+{
+    /// <summary>
+    ///     If true valid requirements will be treated as invalid and vice versa
+    /// </summary>
+    [DataField]
+    public bool Inverted = false;
+
+    /// <summary>
+    ///     Checks if this loadout requirement is valid for the given parameters
+    /// </summary>
+    /// <param name="reason">Description for the requirement, shown when not null</param>
+    public abstract bool IsValid(
+        JobPrototype job,
+        HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        IEntityManager entityManager,
+        IPrototypeManager prototypeManager,
+        IConfigurationManager configManager,
+        out FormattedMessage? reason
+    );
+}
+
+
+#region HumanoidCharacterProfile
+
+/// <summary>
+///     Requires the profile to be within an age range
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class LoadoutAgeRequirement : LoadoutRequirement
+{
+    [DataField(required: true)]
+    public int Min;
+
+    [DataField(required: true)]
+    public int Max;
+
+    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
+        IConfigurationManager configManager, out FormattedMessage? reason)
+    {
+        reason = FormattedMessage.FromMarkup(Loc.GetString("loadout-age-requirement",
+            ("min", Min), ("max", Max)));
+        return profile.Age >= Min && profile.Age <= Max;
+    }
+}
+
+/// <summary>
+///   Requires the profile to use either a Backpack, Satchel, or Duffelbag
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class LoadoutBackpackTypeRequirement : LoadoutRequirement
+{
+    [DataField(required: true)]
+    public BackpackPreference Preference;
+
+    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
+        IConfigurationManager configManager, out FormattedMessage? reason)
+    {
+        reason = FormattedMessage.FromMarkup(Loc.GetString("loadout-backpack-type-requirement",
+            ("type", Loc.GetString($"humanoid-profile-editor-preference-{Preference.ToString().ToLower()}"))));
+        return profile.Backpack == Preference;
+    }
+}
+
+/// <summary>
+///     Requires the profile to use either Jumpsuits or Jumpskirts
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class LoadoutClothingPreferenceRequirement : LoadoutRequirement
+{
+    [DataField(required: true)]
+    public ClothingPreference Preference;
+
+    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
+        IConfigurationManager configManager, out FormattedMessage? reason)
+    {
+        reason = FormattedMessage.FromMarkup(Loc.GetString("loadout-clothing-preference-requirement",
+            ("preference", Loc.GetString($"humanoid-profile-editor-preference-{Preference.ToString().ToLower()}"))));
+        return profile.Clothing == Preference;
+    }
+}
+
+/// <summary>
+///     Requires the profile to be a certain species
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class LoadoutSpeciesRequirement : LoadoutRequirement
+{
+    [DataField(required: true)]
+    public ProtoId<SpeciesPrototype> Species;
+
+    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
+        IConfigurationManager configManager, out FormattedMessage? reason)
+    {
+        reason = FormattedMessage.FromMarkup(Loc.GetString("loadout-species-requirement",
+            ("species", Loc.GetString($"species-name-{Species.ToString().ToLower()}"))));
+        return profile.Species == Species;
+    }
+}
+
+/// <summary>
+///     Requires the profile to have a certain trait
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class LoadoutTraitRequirement : LoadoutRequirement
+{
+    [DataField(required: true)]
+    public ProtoId<TraitPrototype> Trait;
+
+    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
+        IConfigurationManager configManager, out FormattedMessage? reason)
+    {
+        reason = FormattedMessage.FromMarkup(Loc.GetString("loadout-trait-requirement",
+            ("trait", Loc.GetString($"trait-{Trait.ToString().ToLower()}-name"))));
+        return profile.TraitPreferences.Contains(Trait.ToString());
+    }
+}
+
+#endregion
+
+#region Jobs
+
+/// <summary>
+///     Requires the selected job to be a certain one
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class LoadoutJobRequirement : LoadoutRequirement
+{
+    [DataField(required: true)]
+    public List<ProtoId<JobPrototype>> Jobs;
+
+    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
+        IConfigurationManager configManager, out FormattedMessage? reason)
+    {
+        // Join localized job names with a comma
+        var jobsString = string.Join(", ", Jobs.Select(j => Loc.GetString(prototypeManager.Index(j).Name)));
+        // Form the reason message
+        jobsString = Loc.GetString("loadout-job-requirement", ("job", jobsString));
+
+        reason = FormattedMessage.FromMarkup(jobsString);
+        return Jobs.Contains(job.ID);
+    }
+}
+
+/// <summary>
+///     Requires the playtime for a department to be within a certain range
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class LoadoutDepartmentTimeRequirement : LoadoutRequirement
+{
+    [DataField]
+    public TimeSpan Min = TimeSpan.MinValue;
+
+    [DataField]
+    public TimeSpan Max = TimeSpan.MaxValue;
+
+    [DataField(required: true)]
+    public ProtoId<DepartmentPrototype> Department;
+
+    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
+        IConfigurationManager configManager, out FormattedMessage? reason)
+    {
+        // Disable the requirement if the role timers are disabled
+        if (!configManager.GetCVar(CCVars.GameRoleTimers))
+        {
+            reason = null;
+            return !Inverted;
+        }
+
+        var department = prototypeManager.Index(Department);
+
+        // Combine all of this department's job playtimes
+        var playtime = TimeSpan.Zero;
+        foreach (var other in department.Roles)
+        {
+            var proto = prototypeManager.Index<JobPrototype>(other).PlayTimeTracker;
+
+            playTimes.TryGetValue(proto, out var otherTime);
+            playtime += otherTime;
+        }
+
+        if (playtime > Max)
+        {
+            // Show the reason if invalid
+            reason = Inverted
+                ? null
+                : FormattedMessage.FromMarkup(Loc.GetString("loadout-timer-department-too-high",
+                    ("time", playtime.Minutes - Max.Minutes),
+                    ("department", Loc.GetString($"department-{department.ID}")),
+                    ("departmentColor", department.Color)));
+            return false;
+        }
+
+        if (playtime < Min)
+        {
+            // Show the reason if invalid
+            reason = Inverted
+                ? null
+                : FormattedMessage.FromMarkup(Loc.GetString("loadout-timer-department-insufficient",
+                    ("time", Min.Minutes - playtime.Minutes),
+                    ("department", Loc.GetString($"department-{department.ID}")),
+                    ("departmentColor", department.Color)));
+            return false;
+        }
+
+        reason = null;
+        return true;
+    }
+}
+
+/// <summary>
+///     Requires the player to have a certain amount of overall job time
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class LoadoutOverallTimeRequirement : LoadoutRequirement
+{
+    [DataField]
+    public TimeSpan Min = TimeSpan.MinValue;
+
+    [DataField]
+    public TimeSpan Max = TimeSpan.MaxValue;
+
+    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
+        IConfigurationManager configManager, out FormattedMessage? reason)
+    {
+        // Disable the requirement if the role timers are disabled
+        if (!configManager.GetCVar(CCVars.GameRoleTimers))
+        {
+            reason = null;
+            return !Inverted;
+        }
+
+        // Get the overall time
+        var overallTime = playTimes.GetValueOrDefault(PlayTimeTrackingShared.TrackerOverall);
+
+        if (overallTime > Max)
+        {
+            // Show the reason if invalid
+            reason = Inverted
+                ? null
+                : FormattedMessage.FromMarkup(Loc.GetString("loadout-timer-overall-too-high",
+                    ("time", overallTime.Minutes - Max.Minutes)));
+            return false;
+        }
+
+        if (overallTime < Min)
+        {
+            // Show the reason if invalid
+            reason = Inverted
+                ? null
+                : FormattedMessage.FromMarkup(Loc.GetString("loadout-timer-overall-insufficient",
+                    ("time", Min.Minutes - overallTime.Minutes)));
+            return false;
+        }
+
+        reason = null;
+        return true;
+    }
+}
+
+/// <summary>
+///     Requires the playtime for a tracker to be within a certain range
+/// </summary>
+[UsedImplicitly]
+[Serializable, NetSerializable]
+public sealed partial class LoadoutPlaytimeRequirement : LoadoutRequirement
+{
+    [DataField]
+    public TimeSpan Min = TimeSpan.MinValue;
+
+    [DataField]
+    public TimeSpan Max = TimeSpan.MaxValue;
+
+    [DataField(required: true)]
+    public ProtoId<PlayTimeTrackerPrototype> Tracker;
+
+    public override bool IsValid(JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager, IPrototypeManager prototypeManager,
+        IConfigurationManager configManager, out FormattedMessage? reason)
+    {
+        // Disable the requirement if the role timers are disabled
+        if (!configManager.GetCVar(CCVars.GameRoleTimers))
+        {
+            reason = null;
+            return !Inverted;
+        }
+
+        // Get SharedJobSystem
+        if (!entityManager.EntitySysManager.TryGetEntitySystem(out SharedJobSystem? jobSystem))
+        {
+            DebugTools.Assert("LoadoutRequirements: SharedJobSystem not found");
+            reason = null;
+            return false;
+        }
+
+        // Get the JobPrototype of the Tracker
+        var trackerJob = jobSystem.GetJobPrototype(Tracker);
+
+        // Get the primary department of the Tracker
+        if (!jobSystem.TryGetPrimaryDepartment(trackerJob, out var department) &&
+            !jobSystem.TryGetDepartment(trackerJob, out department))
+        {
+            DebugTools.Assert($"LoadoutRequirements: Department not found for job {trackerJob}");
+            reason = null;
+            return false;
+        }
+
+        // Get the time for the tracker
+        playTimes.TryGetValue(Tracker, out var time);
+        reason = null;
+
+        if (time > Max)
+        {
+            // Show the reason if invalid
+            reason = Inverted
+                ? null
+                : FormattedMessage.FromMarkup(Loc.GetString("loadout-timer-role-too-high",
+                    ("time", time.Minutes - Max.Minutes),
+                    ("job", trackerJob),
+                    ("departmentColor", department.Color)));
+            return false;
+        }
+
+        if (time < Min)
+        {
+            // Show the reason if invalid
+            reason = Inverted
+                ? null
+                : FormattedMessage.FromMarkup(Loc.GetString("loadout-timer-role-insufficient",
+                    ("time", Min.Minutes - time.Minutes),
+                    ("job", trackerJob),
+                    ("departmentColor", department.Color)));
+            return false;
+        }
+
+        return true;
+    }
+}
+
+#endregion
diff --git a/Content.Shared/Clothing/Loadouts/Systems/LoadoutSystem.cs b/Content.Shared/Clothing/Loadouts/Systems/LoadoutSystem.cs
new file mode 100644
index 0000000000..eb9a5dcbc8
--- /dev/null
+++ b/Content.Shared/Clothing/Loadouts/Systems/LoadoutSystem.cs
@@ -0,0 +1,149 @@
+using Content.Shared.Clothing.Components;
+using Content.Shared.Clothing.Loadouts.Prototypes;
+using Content.Shared.Inventory;
+using Content.Shared.Preferences;
+using Content.Shared.Roles;
+using Content.Shared.Station;
+using Robust.Shared.Configuration;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Clothing.Loadouts.Systems;
+
+public sealed class LoadoutSystem : EntitySystem
+{
+    [Dependency] private readonly SharedStationSpawningSystem _station = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly InventorySystem _inventory = default!;
+    [Dependency] private readonly IConfigurationManager _configurationManager = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<LoadoutComponent, MapInitEvent>(OnMapInit);
+    }
+
+    private void OnMapInit(EntityUid uid, LoadoutComponent component, MapInitEvent args)
+    {
+        if (component.Prototypes == null)
+            return;
+
+        var proto = _prototype.Index<StartingGearPrototype>(_random.Pick(component.Prototypes));
+        _station.EquipStartingGear(uid, proto, null);
+    }
+
+
+    /// <inheritdoc cref="ApplyCharacterLoadout(Robust.Shared.GameObjects.EntityUid,string,Content.Shared.Preferences.HumanoidCharacterProfile,System.Collections.Generic.Dictionary{string,System.TimeSpan}?)"/>
+    public List<EntityUid> ApplyCharacterLoadout(EntityUid uid, string job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan>? playTimes = null)
+    {
+        var jobPrototype = _prototype.Index<JobPrototype>(job);
+        return ApplyCharacterLoadout(uid, jobPrototype, profile, playTimes);
+    }
+
+    /// <summary>
+    ///     Equips entities from a <see cref="HumanoidCharacterProfile"/>'s loadout preferences to a given entity
+    /// </summary>
+    /// <param name="uid">The entity to give the loadout items to</param>
+    /// <param name="job">The job to use for loadout whitelist/blacklist (should be the job of the entity)</param>
+    /// <param name="profile">The profile to get loadout items from (should be the entity's, or at least have the same species as the entity)</param>
+    /// <param name="playTimes">Playtime for the player for use with playtime requirements</param>
+    /// <returns>A list of loadout items that couldn't be equipped but passed checks</returns>
+    public List<EntityUid> ApplyCharacterLoadout(EntityUid uid, JobPrototype job, HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan>? playTimes = null)
+    {
+        var failedLoadouts = new List<EntityUid>();
+
+        foreach (var loadout in profile.LoadoutPreferences)
+        {
+            var slot = "";
+
+            // Ignore loadouts that don't exist
+            if (!_prototype.TryIndex<LoadoutPrototype>(loadout, out var loadoutProto))
+                continue;
+
+
+            if (!CheckRequirementsValid(loadoutProto.Requirements, job, profile,
+                playTimes ?? new Dictionary<string, TimeSpan>(), EntityManager, _prototype, _configurationManager,
+                out _))
+                continue;
+
+
+            // Spawn the loadout items
+            var spawned = EntityManager.SpawnEntities(
+                EntityManager.GetComponent<TransformComponent>(uid).Coordinates.ToMap(EntityManager),
+                loadoutProto.Items!);
+
+            foreach (var item in spawned)
+            {
+                if (EntityManager.TryGetComponent<ClothingComponent>(item, out var clothingComp) &&
+                    _inventory.TryGetSlots(uid, out var slotDefinitions))
+                {
+                    var deleted = false;
+                    foreach (var curSlot in slotDefinitions)
+                    {
+                        // If the loadout can't equip here or we've already deleted an item from this slot, skip it
+                        if (!clothingComp.Slots.HasFlag(curSlot.SlotFlags) || deleted)
+                            continue;
+
+                        slot = curSlot.Name;
+
+                        // If the loadout is exclusive delete the equipped item
+                        if (loadoutProto.Exclusive)
+                        {
+                            // Get the item in the slot
+                            if (!_inventory.TryGetSlotEntity(uid, curSlot.Name, out var slotItem))
+                                continue;
+
+                            EntityManager.DeleteEntity(slotItem.Value);
+                            deleted = true;
+                        }
+                    }
+                }
+
+
+                // Equip the loadout
+                if (!_inventory.TryEquip(uid, item, slot, true, !string.IsNullOrEmpty(slot), true))
+                    failedLoadouts.Add(item);
+            }
+        }
+
+        // Return a list of items that couldn't be equipped so the server can handle it if it wants
+        // The server has more information about the inventory system than the client does and the client doesn't need to put loadouts in backpacks
+        return failedLoadouts;
+    }
+
+
+    public bool CheckRequirementsValid(List<LoadoutRequirement> requirements, JobPrototype job,
+        HumanoidCharacterProfile profile, Dictionary<string, TimeSpan> playTimes, IEntityManager entityManager,
+        IPrototypeManager prototypeManager, IConfigurationManager configManager, out List<FormattedMessage> reasons)
+    {
+        reasons = new List<FormattedMessage>();
+        var valid = true;
+
+        foreach (var requirement in requirements)
+        {
+            // Set valid to false if the requirement is invalid and not inverted, if it's inverted set it to true when it's valid
+            if (!requirement.IsValid(job, profile, playTimes, entityManager, prototypeManager, configManager, out var reason))
+            {
+                if (valid)
+                    valid = requirement.Inverted;
+            }
+            else
+            {
+                if (valid)
+                    valid = !requirement.Inverted;
+            }
+
+            if (reason != null)
+            {
+                reasons.Add(reason);
+            }
+        }
+
+        return valid;
+    }
+}
diff --git a/Content.Shared/Construction/Conditions/WallmountCondition.cs b/Content.Shared/Construction/Conditions/WallmountCondition.cs
index bf3016d497..fe4336e6fc 100644
--- a/Content.Shared/Construction/Conditions/WallmountCondition.cs
+++ b/Content.Shared/Construction/Conditions/WallmountCondition.cs
@@ -19,8 +19,9 @@ public bool Condition(EntityUid user, EntityCoordinates location, Direction dire
             var entManager = IoCManager.Resolve<IEntityManager>();
 
             // get blueprint and user position
+            var transformSystem = entManager.System<SharedTransformSystem>();
             var userWorldPosition = entManager.GetComponent<TransformComponent>(user).WorldPosition;
-            var objWorldPosition = location.ToMap(entManager).Position;
+            var objWorldPosition = location.ToMap(entManager, transformSystem).Position;
 
             // find direction from user to blueprint
             var userToObject = (objWorldPosition - userWorldPosition);
diff --git a/Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsConsoleSystem.cs b/Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsConsoleSystem.cs
index f9fc67c896..6c51cb77ac 100644
--- a/Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsConsoleSystem.cs
+++ b/Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsConsoleSystem.cs
@@ -1,8 +1,52 @@
+using Content.Shared.IdentityManagement;
+using Content.Shared.IdentityManagement.Components;
+using Content.Shared.Security;
+using Content.Shared.Security.Components;
+
 namespace Content.Shared.CriminalRecords.Systems;
 
-/// <summary>
-/// Nothing is predicted just exists for access.
-/// </summary>
 public abstract class SharedCriminalRecordsConsoleSystem : EntitySystem
 {
+    /// <summary>
+    /// Any entity that has a the name of the record that was just changed as their visible name will get their icon
+    /// updated with the new status, if the record got removed their icon will be removed too.
+    /// </summary>
+    public void UpdateCriminalIdentity(string name, SecurityStatus status)
+    {
+        var query = EntityQueryEnumerator<IdentityComponent>();
+
+        while (query.MoveNext(out var uid, out var identity))
+        {
+            if (!Identity.Name(uid, EntityManager).Equals(name))
+                continue;
+
+            if (status == SecurityStatus.None)
+                RemComp<CriminalRecordComponent>(uid);
+            else
+                SetCriminalIcon(name, status, uid);
+        }
+    }
+
+    /// <summary>
+    /// Decides the icon that should be displayed on the entity based on the security status
+    /// </summary>
+    public void SetCriminalIcon(string name, SecurityStatus status, EntityUid characterUid)
+    {
+        EnsureComp<CriminalRecordComponent>(characterUid, out var record);
+
+        var previousIcon = record.StatusIcon;
+
+        record.StatusIcon = status switch
+        {
+            SecurityStatus.Paroled => "SecurityIconParoled",
+            SecurityStatus.Wanted => "SecurityIconWanted",
+            SecurityStatus.Detained => "SecurityIconIncarcerated",
+            SecurityStatus.Discharged => "SecurityIconDischarged",
+            SecurityStatus.Suspected => "SecurityIconSuspected",
+            _ => record.StatusIcon
+        };
+
+        if(previousIcon != record.StatusIcon)
+            Dirty(characterUid, record);
+    }
 }
diff --git a/Content.Shared/Damage/Components/DamageableComponent.cs b/Content.Shared/Damage/Components/DamageableComponent.cs
index f8ba661a66..be66d51e3b 100644
--- a/Content.Shared/Damage/Components/DamageableComponent.cs
+++ b/Content.Shared/Damage/Components/DamageableComponent.cs
@@ -1,6 +1,9 @@
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
+using Content.Shared.Mobs;
+using Content.Shared.StatusIcon;
 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.List;
@@ -62,7 +65,18 @@ public sealed partial class DamageableComponent : Component
         public FixedPoint2 TotalDamage;
 
         [DataField("radiationDamageTypes", customTypeSerializer: typeof(PrototypeIdListSerializer<DamageTypePrototype>))]
-        public List<string> RadiationDamageTypeIDs = new() {"Radiation"};
+        public List<string> RadiationDamageTypeIDs = new() { "Radiation" };
+
+        [DataField]
+        public Dictionary<MobState, ProtoId<StatusIconPrototype>> HealthIcons = new()
+        {
+            { MobState.Alive, "HealthIconFine" },
+            { MobState.Critical, "HealthIconCritical" },
+            { MobState.Dead, "HealthIconDead" },
+        };
+
+        [DataField]
+        public ProtoId<StatusIconPrototype> RottingIcon = "HealthIconRotting";
     }
 
     [Serializable, NetSerializable]
diff --git a/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs b/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs
index 2ac525d154..83aa708589 100644
--- a/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs
+++ b/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs
@@ -13,7 +13,6 @@ public abstract class SharedDeviceLinkSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
-    private ISawmill _sawmill = default!;
 
     public const string InvokedPort = "link_port";
 
@@ -25,7 +24,6 @@ public override void Initialize()
         SubscribeLocalEvent<DeviceLinkSinkComponent, ComponentStartup>(OnSinkStartup);
         SubscribeLocalEvent<DeviceLinkSourceComponent, ComponentRemove>(OnSourceRemoved);
         SubscribeLocalEvent<DeviceLinkSinkComponent, ComponentRemove>(OnSinkRemoved);
-        _sawmill = Logger.GetSawmill("devicelink");
     }
 
     #region Link Validation
@@ -386,12 +384,12 @@ public void RemoveSinkFromSource(
 
         if (sourceComponent == null)
         {
-            _sawmill.Error($"Attempted to remove link between {ToPrettyString(sourceUid)} and {ToPrettyString(sinkUid)}, but the source component was missing.");
+            Log.Error($"Attempted to remove link between {ToPrettyString(sourceUid)} and {ToPrettyString(sinkUid)}, but the source component was missing.");
             sinkComponent!.LinkedSources.Remove(sourceUid);
         }
         else
         {
-            _sawmill.Error($"Attempted to remove link between {ToPrettyString(sourceUid)} and {ToPrettyString(sinkUid)}, but the sink component was missing.");
+            Log.Error($"Attempted to remove link between {ToPrettyString(sourceUid)} and {ToPrettyString(sinkUid)}, but the sink component was missing.");
             sourceComponent.LinkedPorts.Remove(sourceUid);
         }
     }
diff --git a/Content.Shared/DeviceNetwork/Components/DeviceNetworkJammerComponent.cs b/Content.Shared/DeviceNetwork/Components/DeviceNetworkJammerComponent.cs
new file mode 100644
index 0000000000..75de0cb8a2
--- /dev/null
+++ b/Content.Shared/DeviceNetwork/Components/DeviceNetworkJammerComponent.cs
@@ -0,0 +1,24 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.DeviceNetwork.Components;
+
+/// <summary>
+/// Allow entities to jam DeviceNetwork packets.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class DeviceNetworkJammerComponent : Component
+{
+    /// <summary>
+    /// Range where packets will be jammed. This is checked both against the sender and receiver.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float Range = 5.0f;
+
+    /// <summary>
+    /// Device networks that can be jammed. For a list of default NetworkIds see DeviceNetIdDefaults on Content.Server.
+    /// Network ids are not guaranteed to be limited to DeviceNetIdDefaults.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public HashSet<string> JammableNetworks = [];
+
+}
diff --git a/Content.Shared/DiscordAuth/DiscordAuthCheckMessage.cs b/Content.Shared/DiscordAuth/DiscordAuthCheckMessage.cs
new file mode 100644
index 0000000000..55a8842514
--- /dev/null
+++ b/Content.Shared/DiscordAuth/DiscordAuthCheckMessage.cs
@@ -0,0 +1,17 @@
+using Lidgren.Network;
+using Robust.Shared.Network;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.DiscordAuth;
+
+/// <summary>
+///     Client sends this event to force server check player Discord verification state
+/// </summary>
+public sealed class DiscordAuthCheckMessage : NetMessage
+{
+    public override MsgGroups MsgGroup => MsgGroups.Command;
+
+    public override void ReadFromBuffer(NetIncomingMessage buffer, IRobustSerializer serializer) { }
+
+    public override void WriteToBuffer(NetOutgoingMessage buffer, IRobustSerializer serializer) { }
+}
diff --git a/Content.Shared/DiscordAuth/DiscordAuthRequiredMessage.cs b/Content.Shared/DiscordAuth/DiscordAuthRequiredMessage.cs
new file mode 100644
index 0000000000..86cc6e68a1
--- /dev/null
+++ b/Content.Shared/DiscordAuth/DiscordAuthRequiredMessage.cs
@@ -0,0 +1,25 @@
+using Lidgren.Network;
+using Robust.Shared.Network;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.DiscordAuth;
+
+/// <summary>
+///     Server sends this event to client on connect if Discord auth is required
+/// </summary>
+public sealed class DiscordAuthRequiredMessage : NetMessage
+{
+    public override MsgGroups MsgGroup => MsgGroups.Command;
+
+    public string AuthUrl = string.Empty;
+
+    public override void ReadFromBuffer(NetIncomingMessage buffer, IRobustSerializer serializer)
+    {
+        AuthUrl = buffer.ReadString();
+    }
+
+    public override void WriteToBuffer(NetOutgoingMessage buffer, IRobustSerializer serializer)
+    {
+        buffer.Write(AuthUrl);
+    }
+}
diff --git a/Content.Shared/DoAfter/SharedDoAfterSystem.cs b/Content.Shared/DoAfter/SharedDoAfterSystem.cs
index 382ecb5a9a..9e81c91550 100644
--- a/Content.Shared/DoAfter/SharedDoAfterSystem.cs
+++ b/Content.Shared/DoAfter/SharedDoAfterSystem.cs
@@ -157,7 +157,7 @@ public async Task<DoAfterStatus> WaitDoAfter(DoAfterArgs doAfter, DoAfterCompone
 
         if (doAfter.Delay <= TimeSpan.Zero)
         {
-            Logger.Warning("Awaited instant DoAfters are not supported fully supported");
+            Log.Warning("Awaited instant DoAfters are not supported fully supported");
             return DoAfterStatus.Finished;
         }
 
diff --git a/Content.Shared/Doors/Components/AirlockComponent.cs b/Content.Shared/Doors/Components/AirlockComponent.cs
index dd8241c64e..b2fa7574f7 100644
--- a/Content.Shared/Doors/Components/AirlockComponent.cs
+++ b/Content.Shared/Doors/Components/AirlockComponent.cs
@@ -21,7 +21,7 @@ public sealed partial class AirlockComponent : Component
     public bool Safety = true;
 
     [ViewVariables(VVAccess.ReadWrite)]
-    [DataField]
+    [DataField, AutoNetworkedField]
     public bool EmergencyAccess = false;
 
     /// <summary>
diff --git a/Content.Shared/Doors/Systems/SharedAirlockSystem.cs b/Content.Shared/Doors/Systems/SharedAirlockSystem.cs
index a3172bb8c3..5a6d45d9ec 100644
--- a/Content.Shared/Doors/Systems/SharedAirlockSystem.cs
+++ b/Content.Shared/Doors/Systems/SharedAirlockSystem.cs
@@ -126,6 +126,7 @@ public void UpdateEmergencyLightStatus(EntityUid uid, AirlockComponent component
     public void ToggleEmergencyAccess(EntityUid uid, AirlockComponent component)
     {
         component.EmergencyAccess = !component.EmergencyAccess;
+        Dirty(uid, component); // This only runs on the server apparently so we need this.
         UpdateEmergencyLightStatus(uid, component);
     }
 
diff --git a/Content.Shared/Examine/ExamineSystemShared.cs b/Content.Shared/Examine/ExamineSystemShared.cs
index 5a3fb87229..f792862be1 100644
--- a/Content.Shared/Examine/ExamineSystemShared.cs
+++ b/Content.Shared/Examine/ExamineSystemShared.cs
@@ -144,7 +144,7 @@ public bool IsOccluded(EntityUid uid)
             return TryComp<EyeComponent>(uid, out var eye) && eye.DrawFov;
         }
 
-        public static bool InRangeUnOccluded(MapCoordinates origin, MapCoordinates other, float range, Ignored? predicate, bool ignoreInsideBlocker = true, IEntityManager? entMan = null)
+        public bool InRangeUnOccluded(MapCoordinates origin, MapCoordinates other, float range, Ignored? predicate, bool ignoreInsideBlocker = true, IEntityManager? entMan = null)
         {
             // No, rider. This is better.
             // ReSharper disable once ConvertToLocalFunction
@@ -154,7 +154,7 @@ public static bool InRangeUnOccluded(MapCoordinates origin, MapCoordinates other
             return InRangeUnOccluded(origin, other, range, predicate, wrapped, ignoreInsideBlocker, entMan);
         }
 
-        public static bool InRangeUnOccluded<TState>(MapCoordinates origin, MapCoordinates other, float range,
+        public bool InRangeUnOccluded<TState>(MapCoordinates origin, MapCoordinates other, float range,
             TState state, Func<EntityUid, TState, bool> predicate, bool ignoreInsideBlocker = true, IEntityManager? entMan = null)
         {
             if (other.MapId != origin.MapId ||
@@ -171,7 +171,7 @@ public static bool InRangeUnOccluded<TState>(MapCoordinates origin, MapCoordinat
 
             if (length > MaxRaycastRange)
             {
-                Logger.Warning("InRangeUnOccluded check performed over extreme range. Limiting CollisionRay size.");
+                Log.Warning("InRangeUnOccluded check performed over extreme range. Limiting CollisionRay size.");
                 length = MaxRaycastRange;
             }
 
@@ -207,7 +207,7 @@ public static bool InRangeUnOccluded<TState>(MapCoordinates origin, MapCoordinat
             return true;
         }
 
-        public static bool InRangeUnOccluded(EntityUid origin, EntityUid other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
+        public bool InRangeUnOccluded(EntityUid origin, EntityUid other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
         {
             var entMan = IoCManager.Resolve<IEntityManager>();
             var originPos = entMan.GetComponent<TransformComponent>(origin).MapPosition;
@@ -216,7 +216,7 @@ public static bool InRangeUnOccluded(EntityUid origin, EntityUid other, float ra
             return InRangeUnOccluded(originPos, otherPos, range, predicate, ignoreInsideBlocker);
         }
 
-        public static bool InRangeUnOccluded(EntityUid origin, EntityCoordinates other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
+        public bool InRangeUnOccluded(EntityUid origin, EntityCoordinates other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
         {
             var entMan = IoCManager.Resolve<IEntityManager>();
             var originPos = entMan.GetComponent<TransformComponent>(origin).MapPosition;
@@ -225,7 +225,7 @@ public static bool InRangeUnOccluded(EntityUid origin, EntityCoordinates other,
             return InRangeUnOccluded(originPos, otherPos, range, predicate, ignoreInsideBlocker);
         }
 
-        public static bool InRangeUnOccluded(EntityUid origin, MapCoordinates other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
+        public bool InRangeUnOccluded(EntityUid origin, MapCoordinates other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true)
         {
             var entMan = IoCManager.Resolve<IEntityManager>();
             var originPos = entMan.GetComponent<TransformComponent>(origin).MapPosition;
diff --git a/Content.Shared/Frontier/Storage/Components/MaterialReclaimerMagnetPickupComponent.cs b/Content.Shared/Frontier/Storage/Components/MaterialReclaimerMagnetPickupComponent.cs
new file mode 100644
index 0000000000..fb55184eb3
--- /dev/null
+++ b/Content.Shared/Frontier/Storage/Components/MaterialReclaimerMagnetPickupComponent.cs
@@ -0,0 +1,20 @@
+namespace Content.Shared.Frontier.Storage.Components;
+
+/// <summary>
+/// Applies an ongoing pickup area around the attached entity.
+/// </summary>
+[RegisterComponent]
+public sealed partial class MaterialReclaimerMagnetPickupComponent : Component
+{
+    [ViewVariables(VVAccess.ReadWrite), DataField("nextScan")]
+    public TimeSpan NextScan = TimeSpan.Zero;
+
+    [ViewVariables(VVAccess.ReadWrite), DataField("range")]
+    public float Range = 1f;
+
+    /// <summary>
+    /// Frontier - Is the magnet currently enabled?
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField("magnetEnabled")]
+    public bool MagnetEnabled = false;
+}
diff --git a/Content.Shared/Frontier/Storage/Components/MaterialStorageMagnetPickupComponent.cs b/Content.Shared/Frontier/Storage/Components/MaterialStorageMagnetPickupComponent.cs
new file mode 100644
index 0000000000..f83c81dc9a
--- /dev/null
+++ b/Content.Shared/Frontier/Storage/Components/MaterialStorageMagnetPickupComponent.cs
@@ -0,0 +1,20 @@
+namespace Content.Shared.Frontier.Storage.Components;
+
+/// <summary>
+/// Applies an ongoing pickup area around the attached entity.
+/// </summary>
+[RegisterComponent]
+public sealed partial class MaterialStorageMagnetPickupComponent : Component
+{
+    [ViewVariables(VVAccess.ReadWrite), DataField("nextScan")]
+    public TimeSpan NextScan = TimeSpan.Zero;
+
+    [ViewVariables(VVAccess.ReadWrite), DataField("range")]
+    public float Range = 1f;
+
+    /// <summary>
+    /// Frontier - Is the magnet currently enabled?
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField("magnetEnabled")]
+    public bool MagnetEnabled = false;
+}
diff --git a/Content.Shared/Frontier/Storage/EntitySystems/MaterialReclaimerMagnetPickupSystem.cs b/Content.Shared/Frontier/Storage/EntitySystems/MaterialReclaimerMagnetPickupSystem.cs
new file mode 100644
index 0000000000..bee489446f
--- /dev/null
+++ b/Content.Shared/Frontier/Storage/EntitySystems/MaterialReclaimerMagnetPickupSystem.cs
@@ -0,0 +1,107 @@
+using Content.Shared.Frontier.Storage.Components;
+using Content.Shared.Materials;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Timing;
+using Content.Shared.Examine;   // Frontier
+using Content.Shared.Hands.Components;  // Frontier
+using Content.Shared.Verbs;     // Frontier
+using Robust.Shared.Utility;    // Frontier
+
+namespace Content.Shared.Frontier.Storage.EntitySystems;
+
+/// <summary>
+/// <see cref="MaterialReclaimerMagnetPickupComponent"/>
+/// </summary>
+public sealed class MaterialReclaimerMagnetPickupSystem : EntitySystem
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly EntityLookupSystem _lookup = default!;
+    [Dependency] private readonly SharedMaterialReclaimerSystem _storage = default!;
+
+    private static readonly TimeSpan ScanDelay = TimeSpan.FromSeconds(1);
+
+    private EntityQuery<PhysicsComponent> _physicsQuery;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        _physicsQuery = GetEntityQuery<PhysicsComponent>();
+        SubscribeLocalEvent<MaterialReclaimerMagnetPickupComponent, MapInitEvent>(OnMagnetMapInit);
+        SubscribeLocalEvent<MaterialReclaimerMagnetPickupComponent, EntityUnpausedEvent>(OnMagnetUnpaused);
+        SubscribeLocalEvent<MaterialReclaimerMagnetPickupComponent, ExaminedEvent>(OnExamined);  // Frontier
+        SubscribeLocalEvent<MaterialReclaimerMagnetPickupComponent, GetVerbsEvent<AlternativeVerb>>(AddToggleMagnetVerb);    // Frontier
+    }
+
+    private void OnMagnetUnpaused(EntityUid uid, MaterialReclaimerMagnetPickupComponent component, ref EntityUnpausedEvent args)
+    {
+        component.NextScan += args.PausedTime;
+    }
+
+    private void OnMagnetMapInit(EntityUid uid, MaterialReclaimerMagnetPickupComponent component, MapInitEvent args)
+    {
+        component.NextScan = _timing.CurTime + TimeSpan.FromSeconds(1); // Need to add 1 sec to fix a weird time bug with it that make it never start the magnet
+    }
+
+    // Frontier, used to add the magnet toggle to the context menu
+    private void AddToggleMagnetVerb(EntityUid uid, MaterialReclaimerMagnetPickupComponent component, GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!HasComp<HandsComponent>(args.User)
+            || !args.CanInteract
+            || !args.CanAccess)
+            return;
+
+        AlternativeVerb verb = new()
+        {
+            Act = () =>
+            {
+                component.MagnetEnabled = !component.MagnetEnabled;
+            },
+            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/Spare/poweronoff.svg.192dpi.png")),
+            Text = Loc.GetString("magnet-pickup-component-toggle-verb"),
+            Priority = 3
+        };
+
+        args.Verbs.Add(verb);
+    }
+
+    // Frontier, used to show the magnet state on examination
+    private void OnExamined(EntityUid uid, MaterialReclaimerMagnetPickupComponent component, ExaminedEvent args)
+    {
+        args.PushMarkup(Loc.GetString("magnet-pickup-component-on-examine-main",
+                        ("stateText", Loc.GetString(component.MagnetEnabled
+                        ? "magnet-pickup-component-magnet-on"
+                        : "magnet-pickup-component-magnet-off"))));
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+        var query = EntityQueryEnumerator<MaterialReclaimerMagnetPickupComponent, MaterialReclaimerComponent, TransformComponent>();
+        var currentTime = _timing.CurTime;
+
+        while (query.MoveNext(out var uid, out var comp, out var storage, out var xform))
+        {
+            if (comp.NextScan < currentTime)
+                continue;
+
+            comp.NextScan += ScanDelay;
+
+            // Frontier - magnet disabled
+            if (!comp.MagnetEnabled)
+                continue;
+
+            var parentUid = xform.ParentUid;
+
+            foreach (var near in _lookup.GetEntitiesInRange(uid, comp.Range, LookupFlags.Dynamic | LookupFlags.Sundries))
+            {
+                if (!_physicsQuery.TryGetComponent(near, out var physics) || physics.BodyStatus != BodyStatus.OnGround)
+                    continue;
+
+                if (near == parentUid)
+                    continue;
+
+                _storage.TryStartProcessItem(uid, near);
+            }
+        }
+    }
+}
diff --git a/Content.Shared/Frontier/Storage/EntitySystems/MaterialStorageMagnetPickupSystem.cs b/Content.Shared/Frontier/Storage/EntitySystems/MaterialStorageMagnetPickupSystem.cs
new file mode 100644
index 0000000000..0efea1e793
--- /dev/null
+++ b/Content.Shared/Frontier/Storage/EntitySystems/MaterialStorageMagnetPickupSystem.cs
@@ -0,0 +1,107 @@
+using Content.Shared.Frontier.Storage.Components;
+using Content.Shared.Materials;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Timing;
+using Content.Shared.Examine;   // Frontier
+using Content.Shared.Hands.Components;  // Frontier
+using Content.Shared.Verbs;     // Frontier
+using Robust.Shared.Utility;    // Frontier
+
+namespace Content.Shared.Frontier.Storage.EntitySystems;
+
+/// <summary>
+/// <see cref="MaterialStorageMagnetPickupComponent"/>
+/// </summary>
+public sealed class MaterialStorageMagnetPickupSystem : EntitySystem
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly EntityLookupSystem _lookup = default!;
+    [Dependency] private readonly SharedMaterialStorageSystem _storage = default!;
+
+    private static readonly TimeSpan ScanDelay = TimeSpan.FromSeconds(1);
+
+    private EntityQuery<PhysicsComponent> _physicsQuery;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        _physicsQuery = GetEntityQuery<PhysicsComponent>();
+        SubscribeLocalEvent<MaterialStorageMagnetPickupComponent, MapInitEvent>(OnMagnetMapInit);
+        SubscribeLocalEvent<MaterialStorageMagnetPickupComponent, EntityUnpausedEvent>(OnMagnetUnpaused);
+        SubscribeLocalEvent<MaterialStorageMagnetPickupComponent, ExaminedEvent>(OnExamined);  // Frontier
+        SubscribeLocalEvent<MaterialStorageMagnetPickupComponent, GetVerbsEvent<AlternativeVerb>>(AddToggleMagnetVerb);    // Frontier
+    }
+
+    private void OnMagnetUnpaused(EntityUid uid, MaterialStorageMagnetPickupComponent component, ref EntityUnpausedEvent args)
+    {
+        component.NextScan += args.PausedTime;
+    }
+
+    private void OnMagnetMapInit(EntityUid uid, MaterialStorageMagnetPickupComponent component, MapInitEvent args)
+    {
+        component.NextScan = _timing.CurTime + TimeSpan.FromSeconds(1); // Need to add 1 sec to fix a weird time bug with it that make it never start the magnet
+    }
+
+    // Frontier, used to add the magnet toggle to the context menu
+    private void AddToggleMagnetVerb(EntityUid uid, MaterialStorageMagnetPickupComponent component, GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!HasComp<HandsComponent>(args.User)
+            || !args.CanInteract
+            || !args.CanAccess)
+            return;
+
+        AlternativeVerb verb = new()
+        {
+            Act = () =>
+            {
+                component.MagnetEnabled = !component.MagnetEnabled;
+            },
+            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/Spare/poweronoff.svg.192dpi.png")),
+            Text = Loc.GetString("magnet-pickup-component-toggle-verb"),
+            Priority = 3
+        };
+
+        args.Verbs.Add(verb);
+    }
+
+    // Frontier, used to show the magnet state on examination
+    private void OnExamined(EntityUid uid, MaterialStorageMagnetPickupComponent component, ExaminedEvent args)
+    {
+        args.PushMarkup(Loc.GetString("magnet-pickup-component-on-examine-main",
+                        ("stateText", Loc.GetString(component.MagnetEnabled
+                        ? "magnet-pickup-component-magnet-on"
+                        : "magnet-pickup-component-magnet-off"))));
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+        var query = EntityQueryEnumerator<MaterialStorageMagnetPickupComponent, MaterialStorageComponent, TransformComponent>();
+        var currentTime = _timing.CurTime;
+
+        while (query.MoveNext(out var uid, out var comp, out var storage, out var xform))
+        {
+            if (comp.NextScan < currentTime)
+                continue;
+
+            comp.NextScan += ScanDelay;
+
+            // Frontier - magnet disabled
+            if (!comp.MagnetEnabled)
+                continue;
+
+            var parentUid = xform.ParentUid;
+
+            foreach (var near in _lookup.GetEntitiesInRange(uid, comp.Range, LookupFlags.Dynamic | LookupFlags.Sundries))
+            {
+                if (!_physicsQuery.TryGetComponent(near, out var physics) || physics.BodyStatus != BodyStatus.OnGround)
+                    continue;
+
+                if (near == parentUid)
+                    continue;
+
+                _storage.TryInsertMaterialEntity(uid, near, uid, storage);
+            }
+        }
+    }
+}
diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs
index bbae03e45b..20e08b2767 100644
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs
@@ -114,7 +114,7 @@ public bool TryPickup(
                 && (itemPos.Position - xform.MapPosition.Position).Length() <= MaxAnimationRange
                 && MetaData(entity).VisibilityMask == MetaData(uid).VisibilityMask) // Don't animate aghost pickups.
             {
-                var initialPosition = EntityCoordinates.FromMap(coordinateEntity, itemPos, EntityManager);
+                var initialPosition = EntityCoordinates.FromMap(coordinateEntity, itemPos, TransformSystem, EntityManager);
                 _storage.PlayPickupAnimation(entity, initialPosition, xform.Coordinates, itemXform.LocalRotation, uid);
             }
         }
diff --git a/Content.Shared/IdentityManagement/Components/IdentityComponent.cs b/Content.Shared/IdentityManagement/Components/IdentityComponent.cs
index 7bbdeffe90..5e4c4531c1 100644
--- a/Content.Shared/IdentityManagement/Components/IdentityComponent.cs
+++ b/Content.Shared/IdentityManagement/Components/IdentityComponent.cs
@@ -1,5 +1,4 @@
-using Content.Shared.Humanoid.Prototypes;
-using Robust.Shared.Containers;
+using Robust.Shared.Containers;
 using Robust.Shared.Enums;
 
 namespace Content.Shared.IdentityManagement.Components;
diff --git a/Content.Shared/IdentityManagement/SharedIdentitySystem.cs b/Content.Shared/IdentityManagement/SharedIdentitySystem.cs
index a02e00f0b1..ef1c50f63c 100644
--- a/Content.Shared/IdentityManagement/SharedIdentitySystem.cs
+++ b/Content.Shared/IdentityManagement/SharedIdentitySystem.cs
@@ -40,3 +40,8 @@ private void OnMaskToggled(Entity<IdentityBlockerComponent> ent, ref ItemMaskTog
         ent.Comp.Enabled = !args.IsToggled;
     }
 }
+/// <summary>
+///     Gets called whenever an entity changes their identity.
+/// </summary>
+[ByRefEvent]
+public record struct IdentityChangedEvent(EntityUid CharacterEntity, EntityUid IdentityEntity);
diff --git a/Content.Shared/Interaction/Events/InteractionAttemptEvent.cs b/Content.Shared/Interaction/Events/InteractionAttemptEvent.cs
index 46dfd20c34..0024811c36 100644
--- a/Content.Shared/Interaction/Events/InteractionAttemptEvent.cs
+++ b/Content.Shared/Interaction/Events/InteractionAttemptEvent.cs
@@ -15,6 +15,14 @@ public InteractionAttemptEvent(EntityUid uid, EntityUid? target)
         public EntityUid? Target { get; }
     }
 
+    /// <summary>
+    /// Raised to determine whether an entity is conscious to perform an action.
+    /// </summary>
+    public sealed class ConsciousAttemptEvent(EntityUid Uid) : CancellableEntityEventArgs
+    {
+        public EntityUid Uid { get; } = Uid;
+    }
+
     /// <summary>
     ///     Event raised directed at the target entity of an interaction to see if the user is allowed to perform some
     ///     generic interaction.
diff --git a/Content.Shared/Interaction/RotateToFaceSystem.cs b/Content.Shared/Interaction/RotateToFaceSystem.cs
index 01dc572a73..ed950240af 100644
--- a/Content.Shared/Interaction/RotateToFaceSystem.cs
+++ b/Content.Shared/Interaction/RotateToFaceSystem.cs
@@ -80,14 +80,8 @@ public bool TryFaceCoordinates(EntityUid user, Vector2 coordinates, TransformCom
 
         public bool TryFaceAngle(EntityUid user, Angle diffAngle, TransformComponent? xform = null)
         {
-            if (_actionBlockerSystem.CanChangeDirection(user))
-            {
-                if (!Resolve(user, ref xform))
-                    return false;
-
-                _transform.SetWorldRotation(xform, diffAngle);
-                return true;
-            }
+            if (!_actionBlockerSystem.CanChangeDirection(user))
+                return false;
 
             if (EntityManager.TryGetComponent(user, out BuckleComponent? buckle) && buckle.Buckled)
             {
@@ -105,9 +99,16 @@ public bool TryFaceAngle(EntityUid user, Angle diffAngle, TransformComponent? xf
                         return true;
                     }
                 }
+
+                return false;
             }
 
-            return false;
+            // user is not buckled in; apply to their transform
+            if (!Resolve(user, ref xform))
+                return false;
+
+            _transform.SetWorldRotation(xform, diffAngle);
+            return true;
         }
     }
 }
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index 75063c5550..0e390ecea4 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -171,7 +171,7 @@ private bool HandleTryPullObject(ICommonSession? session, EntityCoordinates coor
         {
             if (!ValidateClientInput(session, coords, uid, out var userEntity))
             {
-                Logger.InfoS("system.interaction", $"TryPullObject input validation failed");
+                Log.Info($"TryPullObject input validation failed");
                 return true;
             }
 
@@ -203,7 +203,7 @@ private void HandleInteractInventorySlotEvent(InteractInventorySlotEvent msg, En
             // client sanitization
             if (!TryComp(item, out TransformComponent? itemXform) || !ValidateClientInput(args.SenderSession, itemXform.Coordinates, item, out var user))
             {
-                Logger.InfoS("system.interaction", $"Inventory interaction validation failed.  Session={args.SenderSession}");
+                Log.Info($"Inventory interaction validation failed.  Session={args.SenderSession}");
                 return;
             }
 
@@ -225,7 +225,7 @@ public bool HandleAltUseInteraction(ICommonSession? session, EntityCoordinates c
             // client sanitization
             if (!ValidateClientInput(session, coords, uid, out var user))
             {
-                Logger.InfoS("system.interaction", $"Alt-use input validation failed");
+                Log.Info($"Alt-use input validation failed");
                 return true;
             }
 
@@ -239,7 +239,7 @@ public bool HandleUseInteraction(ICommonSession? session, EntityCoordinates coor
             // client sanitization
             if (!ValidateClientInput(session, coords, uid, out var userEntity))
             {
-                Logger.InfoS("system.interaction", $"Use input validation failed");
+                Log.Info($"Use input validation failed");
                 return true;
             }
 
@@ -459,7 +459,7 @@ protected bool ValidateInteractAndFace(EntityUid user, EntityCoordinates coordin
                 return false;
 
             if (!HasComp<NoRotateOnInteractComponent>(user))
-                _rotateToFaceSystem.TryFaceCoordinates(user, coordinates.ToMapPos(EntityManager));
+                _rotateToFaceSystem.TryFaceCoordinates(user, coordinates.ToMapPos(EntityManager, _transform));
 
             return true;
         }
@@ -547,7 +547,7 @@ public bool InRangeUnobstructed(
 
             if (length > MaxRaycastRange)
             {
-                Logger.Warning("InRangeUnobstructed check performed over extreme range. Limiting CollisionRay size.");
+                Log.Warning("InRangeUnobstructed check performed over extreme range. Limiting CollisionRay size.");
                 length = MaxRaycastRange;
             }
 
@@ -612,7 +612,7 @@ public bool InRangeUnobstructed(
             Ignored combinedPredicate = e => e == origin || (predicate?.Invoke(e) ?? false);
             var inRange = true;
             MapCoordinates originPos = default;
-            var targetPos = otherCoordinates.ToMap(EntityManager);
+            var targetPos = otherCoordinates.ToMap(EntityManager, _transform);
             Angle targetRot = default;
 
             // So essentially:
@@ -785,7 +785,7 @@ public bool InRangeUnobstructed(
             Ignored? predicate = null,
             bool popup = false)
         {
-            return InRangeUnobstructed(origin, other.ToMap(EntityManager), range, collisionMask, predicate, popup);
+            return InRangeUnobstructed(origin, other.ToMap(EntityManager, _transform), range, collisionMask, predicate, popup);
         }
 
         /// <summary>
@@ -921,7 +921,7 @@ private bool HandleActivateItemInWorld(ICommonSession? session, EntityCoordinate
         {
             if (!ValidateClientInput(session, coords, uid, out var user))
             {
-                Logger.InfoS("system.interaction", $"ActivateItemInWorld input validation failed");
+                Log.Info($"ActivateItemInWorld input validation failed");
                 return false;
             }
 
@@ -1100,14 +1100,13 @@ protected bool ValidateClientInput(ICommonSession? session, EntityCoordinates co
 
             if (!coords.IsValid(EntityManager))
             {
-                Logger.InfoS("system.interaction", $"Invalid Coordinates: client={session}, coords={coords}");
+                Log.Info($"Invalid Coordinates: client={session}, coords={coords}");
                 return false;
             }
 
             if (IsClientSide(uid))
             {
-                Logger.WarningS("system.interaction",
-                    $"Client sent interaction with client-side entity. Session={session}, Uid={uid}");
+                Log.Warning($"Client sent interaction with client-side entity. Session={session}, Uid={uid}");
                 return false;
             }
 
@@ -1115,15 +1114,13 @@ protected bool ValidateClientInput(ICommonSession? session, EntityCoordinates co
 
             if (userEntity == null || !userEntity.Value.Valid)
             {
-                Logger.WarningS("system.interaction",
-                    $"Client sent interaction with no attached entity. Session={session}");
+                Log.Warning($"Client sent interaction with no attached entity. Session={session}");
                 return false;
             }
 
             if (!Exists(userEntity))
             {
-                Logger.WarningS("system.interaction",
-                    $"Client attempted interaction with a non-existent attached entity. Session={session},  entity={userEntity}");
+                Log.Warning($"Client attempted interaction with a non-existent attached entity. Session={session},  entity={userEntity}");
                 return false;
             }
 
diff --git a/Content.Shared/JoinQueue/QueueUpdateMessage.cs b/Content.Shared/JoinQueue/QueueUpdateMessage.cs
new file mode 100644
index 0000000000..ce74cb6b4e
--- /dev/null
+++ b/Content.Shared/JoinQueue/QueueUpdateMessage.cs
@@ -0,0 +1,36 @@
+using Lidgren.Network;
+using Robust.Shared.Network;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.JoinQueue;
+
+/// <summary>
+///     Sent from server to client with queue state for player
+///     Also initiates queue state on client
+/// </summary>
+public sealed class QueueUpdateMessage : NetMessage
+{
+    public override MsgGroups MsgGroup => MsgGroups.Command;
+
+    /// <summary>
+    ///     Total players in queue
+    /// </summary>
+    public int Total { get; set; }
+
+    /// <summary>
+    ///     Player current position in queue (starts from 1)
+    /// </summary>
+    public int Position { get; set; }
+
+    public override void ReadFromBuffer(NetIncomingMessage buffer, IRobustSerializer serializer)
+    {
+        Total = buffer.ReadInt32();
+        Position = buffer.ReadInt32();
+    }
+
+    public override void WriteToBuffer(NetOutgoingMessage buffer, IRobustSerializer serializer)
+    {
+        buffer.Write(Total);
+        buffer.Write(Position);
+    }
+}
diff --git a/Content.Shared/Maps/ContentTileDefinition.cs b/Content.Shared/Maps/ContentTileDefinition.cs
index ce7980509e..32f5db0e82 100644
--- a/Content.Shared/Maps/ContentTileDefinition.cs
+++ b/Content.Shared/Maps/ContentTileDefinition.cs
@@ -81,7 +81,11 @@ public sealed partial class ContentTileDefinition : IPrototype, IInheritingProto
         [DataField("itemDrop", customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
         public string ItemDropPrototypeName { get; private set; } = "FloorTileItemSteel";
 
-        [DataField("isSpace")] public bool IsSpace { get; private set; }
+        // TODO rename data-field in yaml
+        /// <summary>
+        /// Whether or not the tile is exposed to the map's atmosphere.
+        /// </summary>
+        [DataField("isSpace")] public bool MapAtmosphere { get; private set; }
 
         /// <summary>
         ///     Friction override for mob mover in <see cref="SharedMoverController"/>
diff --git a/Content.Shared/Maps/TurfHelpers.cs b/Content.Shared/Maps/TurfHelpers.cs
index a87b8c97d1..58a5d133b5 100644
--- a/Content.Shared/Maps/TurfHelpers.cs
+++ b/Content.Shared/Maps/TurfHelpers.cs
@@ -11,22 +11,6 @@ namespace Content.Shared.Maps
     // That, or make the interface arguments non-optional so people stop failing to pass them in.
     public static class TurfHelpers
     {
-        /// <summary>
-        ///     Attempts to get the turf at map indices with grid id or null if no such turf is found.
-        /// </summary>
-        public static TileRef GetTileRef(this Vector2i vector2i, EntityUid gridId, IMapManager? mapManager = null)
-        {
-            mapManager ??= IoCManager.Resolve<IMapManager>();
-
-            if (!mapManager.TryGetGrid(gridId, out var grid))
-                return default;
-
-            if (!grid.TryGetTileRef(vector2i, out var tile))
-                return default;
-
-            return tile;
-        }
-
         /// <summary>
         ///     Attempts to get the turf at a certain coordinates or null if no such turf is found.
         /// </summary>
@@ -67,7 +51,7 @@ public static ContentTileDefinition GetContentTileDefinition(this Tile tile, ITi
         /// </summary>
         public static bool IsSpace(this Tile tile, ITileDefinitionManager? tileDefinitionManager = null)
         {
-            return tile.GetContentTileDefinition(tileDefinitionManager).IsSpace;
+            return tile.GetContentTileDefinition(tileDefinitionManager).MapAtmosphere;
         }
 
         /// <summary>
@@ -115,15 +99,6 @@ public static IEnumerable<EntityUid> GetEntitiesInTile(this EntityCoordinates co
             return GetEntitiesInTile(turf.Value, flags, lookupSystem);
         }
 
-        /// <summary>
-        ///     Helper that returns all entities in a turf.
-        /// </summary>
-        [Obsolete("Use the lookup system")]
-        public static IEnumerable<EntityUid> GetEntitiesInTile(this Vector2i indices, EntityUid gridId, LookupFlags flags = LookupFlags.Static, EntityLookupSystem? lookupSystem = null)
-        {
-            return GetEntitiesInTile(indices.GetTileRef(gridId), flags, lookupSystem);
-        }
-
         /// <summary>
         /// Checks if a turf has something dense on it.
         /// </summary>
diff --git a/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs b/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs
index 5199133253..0c2fcc0579 100644
--- a/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs
+++ b/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs
@@ -28,7 +28,7 @@ private void SubscribeEvents()
         SubscribeLocalEvent<MobStateComponent, ChangeDirectionAttemptEvent>(CheckAct);
         SubscribeLocalEvent<MobStateComponent, UseAttemptEvent>(CheckAct);
         SubscribeLocalEvent<MobStateComponent, AttackAttemptEvent>(CheckAct);
-        SubscribeLocalEvent<MobStateComponent, InteractionAttemptEvent>(CheckAct);
+        SubscribeLocalEvent<MobStateComponent, ConsciousAttemptEvent>(CheckAct);
         SubscribeLocalEvent<MobStateComponent, ThrowAttemptEvent>(CheckAct);
         SubscribeLocalEvent<MobStateComponent, SpeakAttemptEvent>(OnSpeakAttempt);
         SubscribeLocalEvent<MobStateComponent, IsEquippingAttemptEvent>(OnEquipAttempt);
diff --git a/Content.Shared/Movement/Components/SlowedByContactComponent.cs b/Content.Shared/Movement/Components/SpeedModifiedByContactComponent.cs
similarity index 80%
rename from Content.Shared/Movement/Components/SlowedByContactComponent.cs
rename to Content.Shared/Movement/Components/SpeedModifiedByContactComponent.cs
index eafefefee1..4f791e13ca 100644
--- a/Content.Shared/Movement/Components/SlowedByContactComponent.cs
+++ b/Content.Shared/Movement/Components/SpeedModifiedByContactComponent.cs
@@ -7,6 +7,6 @@ namespace Content.Shared.Movement.Components;
 /// Exists just to listen to a single event. What a life.
 /// </summary>
 [NetworkedComponent, RegisterComponent] // must be networked to properly predict adding & removal
-public sealed partial class SlowedByContactComponent : Component
+public sealed partial class SpeedModifiedByContactComponent : Component
 {
 }
diff --git a/Content.Shared/Movement/Components/SlowContactsComponent.cs b/Content.Shared/Movement/Components/SpeedModifierContactsComponent.cs
similarity index 83%
rename from Content.Shared/Movement/Components/SlowContactsComponent.cs
rename to Content.Shared/Movement/Components/SpeedModifierContactsComponent.cs
index 00cbc55d19..73bb0690fd 100644
--- a/Content.Shared/Movement/Components/SlowContactsComponent.cs
+++ b/Content.Shared/Movement/Components/SpeedModifierContactsComponent.cs
@@ -6,8 +6,8 @@ namespace Content.Shared.Movement.Components;
 
 [NetworkedComponent, RegisterComponent]
 [AutoGenerateComponentState]
-[Access(typeof(SlowContactsSystem))]
-public sealed partial class SlowContactsComponent : Component
+[Access(typeof(SpeedModifierContactsSystem))]
+public sealed partial class SpeedModifierContactsComponent : Component
 {
     [DataField("walkSpeedModifier"), ViewVariables(VVAccess.ReadWrite)]
     [AutoNetworkedField]
diff --git a/Content.Shared/Movement/Systems/FrictionContactsSystem.cs b/Content.Shared/Movement/Systems/FrictionContactsSystem.cs
index b104c549e6..b086bc0e05 100644
--- a/Content.Shared/Movement/Systems/FrictionContactsSystem.cs
+++ b/Content.Shared/Movement/Systems/FrictionContactsSystem.cs
@@ -10,7 +10,7 @@ public sealed class FrictionContactsSystem : EntitySystem
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] private readonly MovementSpeedModifierSystem _speedModifierSystem = default!;
 
-    // Comment copied from "original" SlowContactsSystem.cs
+    // Comment copied from "original" SlowContactsSystem.cs (now SpeedModifierContactsSystem.cs)
     // TODO full-game-save 
     // Either these need to be processed before a map is saved, or slowed/slowing entities need to update on init.
     private HashSet<EntityUid> _toUpdate = new();
diff --git a/Content.Shared/Movement/Systems/SharedJetpackSystem.cs b/Content.Shared/Movement/Systems/SharedJetpackSystem.cs
index abe12b79d1..8c42511f84 100644
--- a/Content.Shared/Movement/Systems/SharedJetpackSystem.cs
+++ b/Content.Shared/Movement/Systems/SharedJetpackSystem.cs
@@ -92,7 +92,7 @@ private void SetupUser(EntityUid user, EntityUid jetpackUid)
         _mover.SetRelay(user, jetpackUid);
 
         if (TryComp<PhysicsComponent>(user, out var physics))
-            _physics.SetBodyStatus(physics, BodyStatus.InAir);
+            _physics.SetBodyStatus(user, physics, BodyStatus.InAir);
 
         userComp.Jetpack = jetpackUid;
     }
@@ -103,7 +103,7 @@ private void RemoveUser(EntityUid uid)
             return;
 
         if (TryComp<PhysicsComponent>(uid, out var physics))
-            _physics.SetBodyStatus(physics, BodyStatus.OnGround);
+            _physics.SetBodyStatus(uid, physics, BodyStatus.OnGround);
 
         RemComp<RelayInputMoverComponent>(uid);
     }
diff --git a/Content.Shared/Movement/Systems/SlowContactsSystem.cs b/Content.Shared/Movement/Systems/SpeedModifierContactsSystem.cs
similarity index 59%
rename from Content.Shared/Movement/Systems/SlowContactsSystem.cs
rename to Content.Shared/Movement/Systems/SpeedModifierContactsSystem.cs
index 1ee145075f..f9f6b82bb1 100644
--- a/Content.Shared/Movement/Systems/SlowContactsSystem.cs
+++ b/Content.Shared/Movement/Systems/SpeedModifierContactsSystem.cs
@@ -5,7 +5,7 @@
 
 namespace Content.Shared.Movement.Systems;
 
-public sealed class SlowContactsSystem : EntitySystem
+public sealed class SpeedModifierContactsSystem : EntitySystem
 {
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] private readonly MovementSpeedModifierSystem _speedModifierSystem = default!;
@@ -18,10 +18,10 @@ public sealed class SlowContactsSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<SlowContactsComponent, StartCollideEvent>(OnEntityEnter);
-        SubscribeLocalEvent<SlowContactsComponent, EndCollideEvent>(OnEntityExit);
-        SubscribeLocalEvent<SlowedByContactComponent, RefreshMovementSpeedModifiersEvent>(MovementSpeedCheck);
-        SubscribeLocalEvent<SlowContactsComponent, ComponentShutdown>(OnShutdown);
+        SubscribeLocalEvent<SpeedModifierContactsComponent, StartCollideEvent>(OnEntityEnter);
+        SubscribeLocalEvent<SpeedModifierContactsComponent, EndCollideEvent>(OnEntityExit);
+        SubscribeLocalEvent<SpeedModifiedByContactComponent, RefreshMovementSpeedModifiersEvent>(MovementSpeedCheck);
+        SubscribeLocalEvent<SpeedModifierContactsComponent, ComponentShutdown>(OnShutdown);
 
         UpdatesAfter.Add(typeof(SharedPhysicsSystem));
     }
@@ -39,18 +39,18 @@ public override void Update(float frameTime)
 
         foreach (var ent in _toRemove)
         {
-            RemComp<SlowedByContactComponent>(ent);
+            RemComp<SpeedModifiedByContactComponent>(ent);
         }
 
         _toUpdate.Clear();
     }
 
-    public void ChangeModifiers(EntityUid uid, float speed, SlowContactsComponent? component = null)
+    public void ChangeModifiers(EntityUid uid, float speed, SpeedModifierContactsComponent? component = null)
     {
         ChangeModifiers(uid, speed, speed, component);
     }
 
-    public void ChangeModifiers(EntityUid uid, float walkSpeed, float sprintSpeed, SlowContactsComponent? component = null)
+    public void ChangeModifiers(EntityUid uid, float walkSpeed, float sprintSpeed, SpeedModifierContactsComponent? component = null)
     {
         if (!Resolve(uid, ref component))
         {
@@ -62,7 +62,7 @@ public void ChangeModifiers(EntityUid uid, float walkSpeed, float sprintSpeed, S
         _toUpdate.UnionWith(_physics.GetContactingEntities(uid));
     }
 
-    private void OnShutdown(EntityUid uid, SlowContactsComponent component, ComponentShutdown args)
+    private void OnShutdown(EntityUid uid, SpeedModifierContactsComponent component, ComponentShutdown args)
     {
         if (!TryComp(uid, out PhysicsComponent? phys))
             return;
@@ -71,48 +71,56 @@ private void OnShutdown(EntityUid uid, SlowContactsComponent component, Componen
         _toUpdate.UnionWith(_physics.GetContactingEntities(uid, phys));
     }
 
-    private void MovementSpeedCheck(EntityUid uid, SlowedByContactComponent component, RefreshMovementSpeedModifiersEvent args)
+    private void MovementSpeedCheck(EntityUid uid, SpeedModifiedByContactComponent component, RefreshMovementSpeedModifiersEvent args)
     {
         if (!EntityManager.TryGetComponent<PhysicsComponent>(uid, out var physicsComponent))
             return;
 
-        var walkSpeed = 1.0f;
-        var sprintSpeed = 1.0f;
+        var walkSpeed = 0.0f;
+        var sprintSpeed = 0.0f;
 
         bool remove = true;
+        var entries = 0;
         foreach (var ent in _physics.GetContactingEntities(uid, physicsComponent))
         {
-            if (!TryComp<SlowContactsComponent>(ent, out var slowContactsComponent))
+            if (!TryComp<SpeedModifierContactsComponent>(ent, out var slowContactsComponent))
                 continue;
 
             if (slowContactsComponent.IgnoreWhitelist != null && slowContactsComponent.IgnoreWhitelist.IsValid(uid))
                 continue;
 
-            walkSpeed = Math.Min(walkSpeed, slowContactsComponent.WalkSpeedModifier);
-            sprintSpeed = Math.Min(sprintSpeed, slowContactsComponent.SprintSpeedModifier);
+            walkSpeed += slowContactsComponent.WalkSpeedModifier;
+            sprintSpeed += slowContactsComponent.SprintSpeedModifier;
             remove = false;
+            entries++;
         }
 
-        args.ModifySpeed(walkSpeed, sprintSpeed);
+        if (entries > 0)
+        {
+            walkSpeed /= entries;
+            sprintSpeed /= entries;
+
+            args.ModifySpeed(walkSpeed, sprintSpeed);
+        }
 
         // no longer colliding with anything
         if (remove)
             _toRemove.Add(uid);
     }
 
-    private void OnEntityExit(EntityUid uid, SlowContactsComponent component, ref EndCollideEvent args)
+    private void OnEntityExit(EntityUid uid, SpeedModifierContactsComponent component, ref EndCollideEvent args)
     {
         var otherUid = args.OtherEntity;
         _toUpdate.Add(otherUid);
     }
 
-    private void OnEntityEnter(EntityUid uid, SlowContactsComponent component, ref StartCollideEvent args)
+    private void OnEntityEnter(EntityUid uid, SpeedModifierContactsComponent component, ref StartCollideEvent args)
     {
         var otherUid = args.OtherEntity;
         if (!HasComp<MovementSpeedModifierComponent>(otherUid))
             return;
 
-        EnsureComp<SlowedByContactComponent>(otherUid);
+        EnsureComp<SpeedModifiedByContactComponent>(otherUid);
         _toUpdate.Add(otherUid);
     }
 }
diff --git a/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs b/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
index b070cee283..29218f5719 100644
--- a/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
@@ -18,14 +18,10 @@ public sealed class ThirstSystem : EntitySystem
     [Dependency] private readonly MovementSpeedModifierSystem _movement = default!;
     [Dependency] private readonly SharedJetpackSystem _jetpack = default!;
 
-    private ISawmill _sawmill = default!;
-
     public override void Initialize()
     {
         base.Initialize();
 
-        _sawmill = Logger.GetSawmill("thirst");
-
         SubscribeLocalEvent<ThirstComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovespeed);
         SubscribeLocalEvent<ThirstComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<ThirstComponent, RejuvenateEvent>(OnRejuvenate);
@@ -156,7 +152,7 @@ private void UpdateEffects(EntityUid uid, ThirstComponent component)
                 return;
 
             default:
-                _sawmill.Error($"No thirst threshold found for {component.CurrentThirstThreshold}");
+                Log.Error($"No thirst threshold found for {component.CurrentThirstThreshold}");
                 throw new ArgumentOutOfRangeException($"No thirst threshold found for {component.CurrentThirstThreshold}");
         }
     }
diff --git a/Content.Shared/Paint/PaintComponent.cs b/Content.Shared/Paint/PaintComponent.cs
new file mode 100644
index 0000000000..ad09f4ca73
--- /dev/null
+++ b/Content.Shared/Paint/PaintComponent.cs
@@ -0,0 +1,60 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Audio;
+using Content.Shared.Whitelist;
+using Robust.Shared.Prototypes;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Paint;
+
+/// <summary>
+/// Entity when used on another entity will paint target entity.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(SharedPaintSystem))]
+public sealed partial class PaintComponent : Component
+{
+    /// <summary>
+    /// Noise made when paint applied.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier Spray = new SoundPathSpecifier("/Audio/Effects/spray2.ogg");
+
+    /// <summary>
+    /// Solution on the entity that contains the paint.
+    /// </summary>
+    [DataField]
+    public string Solution = "drink";
+
+    /// <summary>
+    /// How long the doafter will take.
+    /// </summary>
+    [DataField]
+    public int Delay = 2;
+
+    /// <summary>
+    /// Reagent that will be used as paint.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public ProtoId<ReagentPrototype> Reagent = "SpaceGlue";
+
+    /// <summary>
+    /// Color that the painting entity will instruct the painted entity to be.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public Color Color = Color.FromHex("#c62121");
+
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public EntityWhitelist? Blacklist;
+    /// <summary>
+    /// Reagent consumption per use.
+    /// </summary>
+    [DataField]
+    public FixedPoint2 ConsumptionUnit = FixedPoint2.New(5);
+
+    /// <summary>
+    /// Duration per unit
+    /// </summary>
+    [DataField]
+    public TimeSpan DurationPerUnit = TimeSpan.FromSeconds(6);
+}
diff --git a/Content.Shared/Paint/PaintDoAfterEvent.cs b/Content.Shared/Paint/PaintDoAfterEvent.cs
new file mode 100644
index 0000000000..0851f1541b
--- /dev/null
+++ b/Content.Shared/Paint/PaintDoAfterEvent.cs
@@ -0,0 +1,9 @@
+using Content.Shared.DoAfter;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Paint;
+
+[Serializable, NetSerializable]
+public sealed partial class PaintDoAfterEvent : SimpleDoAfterEvent
+{
+}
diff --git a/Content.Shared/Paint/PaintRemoverComponent.cs b/Content.Shared/Paint/PaintRemoverComponent.cs
new file mode 100644
index 0000000000..54d0ed7a71
--- /dev/null
+++ b/Content.Shared/Paint/PaintRemoverComponent.cs
@@ -0,0 +1,24 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Audio;
+
+namespace Content.Shared.Paint;
+
+/// <summary>
+///  Removes paint from an entity that was painted with spray paint.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(PaintRemoverSystem))]
+public sealed partial class PaintRemoverComponent : Component
+{
+    /// <summary>
+    /// Sound when target is cleaned.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/Effects/Fluids/watersplash.ogg");
+
+    /// <summary>
+    /// DoAfter wait time.
+    /// </summary>
+    [DataField]
+    public float CleanDelay = 2f;
+}
diff --git a/Content.Shared/Paint/PaintRemoverDoAfterEvent.cs b/Content.Shared/Paint/PaintRemoverDoAfterEvent.cs
new file mode 100644
index 0000000000..940b1aa513
--- /dev/null
+++ b/Content.Shared/Paint/PaintRemoverDoAfterEvent.cs
@@ -0,0 +1,9 @@
+using Content.Shared.DoAfter;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Paint;
+
+[Serializable, NetSerializable]
+public sealed partial class PaintRemoverDoAfterEvent : SimpleDoAfterEvent
+{
+}
diff --git a/Content.Shared/Paint/PaintRemoverSystem.cs b/Content.Shared/Paint/PaintRemoverSystem.cs
new file mode 100644
index 0000000000..ac1cc624cf
--- /dev/null
+++ b/Content.Shared/Paint/PaintRemoverSystem.cs
@@ -0,0 +1,96 @@
+using Content.Shared.Popups;
+using Content.Shared.Interaction;
+using Content.Shared.DoAfter;
+using Content.Shared.Verbs;
+using Content.Shared.Sprite;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Paint;
+
+/// <summary>
+/// Removes paint from an entity.
+/// </summary>
+public sealed class PaintRemoverSystem : SharedPaintSystem
+{
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<PaintRemoverComponent, AfterInteractEvent>(OnInteract);
+        SubscribeLocalEvent<PaintRemoverComponent, PaintRemoverDoAfterEvent>(OnDoAfter);
+        SubscribeLocalEvent<PaintRemoverComponent, GetVerbsEvent<UtilityVerb>>(OnPaintRemoveVerb);
+    }
+
+    // When entity is painted, remove paint from that entity.
+    private void OnInteract(EntityUid uid, PaintRemoverComponent component, AfterInteractEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        if (!args.CanReach || args.Target is not { Valid: true } target || !HasComp<PaintedComponent>(target))
+            return;
+
+        _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, component.CleanDelay, new PaintRemoverDoAfterEvent(), uid, args.Target, uid)
+        {
+            BreakOnUserMove = true,
+            BreakOnDamage = true,
+            BreakOnTargetMove = true,
+            MovementThreshold = 1.0f,
+        });
+        args.Handled = true;
+    }
+
+    private void OnDoAfter(EntityUid uid, PaintRemoverComponent component, DoAfterEvent args)
+    {
+        if (args.Cancelled || args.Handled || args.Args.Target == null)
+            return;
+
+        if (args.Target is not { Valid: true } target)
+            return;
+
+        if (!TryComp(target, out PaintedComponent? paint))
+            return;
+
+        paint.Enabled = false;
+        _audio.PlayPredicted(component.Sound, target, args.User);
+        _popup.PopupClient(Loc.GetString("paint-removed", ("target", target)), args.User, args.User, PopupType.Medium);
+        _appearanceSystem.SetData(target, PaintVisuals.Painted, false);
+        RemComp<PaintedComponent>(target);
+        Dirty(target, paint);
+
+        args.Handled = true;
+    }
+
+    private void OnPaintRemoveVerb(EntityUid uid, PaintRemoverComponent component, GetVerbsEvent<UtilityVerb> args)
+    {
+        if (!args.CanInteract || !args.CanAccess)
+            return;
+
+        var paintremovalText = Loc.GetString("paint-remove-verb");
+
+        var verb = new UtilityVerb()
+        {
+            Act = () => {
+
+                _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, component.CleanDelay, new PaintRemoverDoAfterEvent(), uid, args.Target, uid)
+                {
+                    BreakOnUserMove = true,
+                    BreakOnDamage = true,
+                    BreakOnTargetMove = true,
+                    MovementThreshold = 1.0f,
+                });
+            },
+
+            Text = paintremovalText
+        };
+
+        args.Verbs.Add(verb);
+    }
+}
diff --git a/Content.Shared/Paint/PaintedComponent.cs b/Content.Shared/Paint/PaintedComponent.cs
new file mode 100644
index 0000000000..a6ee7377e1
--- /dev/null
+++ b/Content.Shared/Paint/PaintedComponent.cs
@@ -0,0 +1,41 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Paint;
+
+/// <summary>
+/// Component applied to target entity when painted.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class PaintedComponent : Component
+{
+    /// <summary>
+    ///  Color of the paint.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public Color Color = Color.FromHex("#2cdbd5");
+
+    /// <summary>
+    ///  Used to remove the color when component removed.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public Color BeforeColor;
+
+    /// <summary>
+    /// If paint is enabled.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Enabled;
+
+    /// <summary>
+    /// Name of the shader.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public string ShaderName = "Greyscale";
+}
+
+[Serializable, NetSerializable]
+public enum PaintVisuals : byte
+{
+    Painted,
+}
diff --git a/Content.Shared/Paint/SharedPaintSystem.cs b/Content.Shared/Paint/SharedPaintSystem.cs
new file mode 100644
index 0000000000..10185817b8
--- /dev/null
+++ b/Content.Shared/Paint/SharedPaintSystem.cs
@@ -0,0 +1,11 @@
+namespace Content.Shared.Paint;
+
+/// <summary>
+/// Colors target and consumes reagent on each color success.
+/// </summary>
+public abstract class SharedPaintSystem : EntitySystem
+{
+    public virtual void UpdateAppearance(EntityUid uid, PaintedComponent? component = null)
+    {
+    }
+}
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index 59906538ec..ece9a82bb2 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -1,11 +1,10 @@
 using System.Linq;
-using System.Globalization;
 using System.Text.RegularExpressions;
 using Content.Shared.CCVar;
+using Content.Shared.Clothing.Loadouts.Prototypes;
 using Content.Shared.GameTicking;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Prototypes;
-using Content.Shared.Random.Helpers;
 using Content.Shared.Roles;
 using Content.Shared.Traits;
 using Robust.Shared.Configuration;
@@ -30,6 +29,7 @@ public sealed partial class HumanoidCharacterProfile : ICharacterProfile
         private readonly Dictionary<string, JobPriority> _jobPriorities;
         private readonly List<string> _antagPreferences;
         private readonly List<string> _traitPreferences;
+        private readonly List<string> _loadoutPreferences;
 
         private HumanoidCharacterProfile(
             string name,
@@ -45,7 +45,8 @@ private HumanoidCharacterProfile(
             Dictionary<string, JobPriority> jobPriorities,
             PreferenceUnavailableMode preferenceUnavailable,
             List<string> antagPreferences,
-            List<string> traitPreferences)
+            List<string> traitPreferences,
+            List<string> loadoutPreferences)
         {
             Name = name;
             FlavorText = flavortext;
@@ -61,6 +62,7 @@ private HumanoidCharacterProfile(
             PreferenceUnavailable = preferenceUnavailable;
             _antagPreferences = antagPreferences;
             _traitPreferences = traitPreferences;
+            _loadoutPreferences = loadoutPreferences;
         }
 
         /// <summary>Copy constructor but with overridable references (to prevent useless copies)</summary>
@@ -68,15 +70,19 @@ private HumanoidCharacterProfile(
             HumanoidCharacterProfile other,
             Dictionary<string, JobPriority> jobPriorities,
             List<string> antagPreferences,
-            List<string> traitPreferences)
-            : this(other.Name, other.FlavorText, other.Species, other.Age, other.Sex, other.Gender, other.Appearance, other.Clothing, other.Backpack, other.SpawnPriority,
-                jobPriorities, other.PreferenceUnavailable, antagPreferences, traitPreferences)
+            List<string> traitPreferences,
+            List<string> loadoutPreferences)
+            : this(other.Name, other.FlavorText, other.Species, other.Age, other.Sex, other.Gender, other.Appearance,
+                other.Clothing, other.Backpack, other.SpawnPriority, jobPriorities, other.PreferenceUnavailable,
+                antagPreferences, traitPreferences, loadoutPreferences)
         {
         }
 
         /// <summary>Copy constructor</summary>
         private HumanoidCharacterProfile(HumanoidCharacterProfile other)
-            : this(other, new Dictionary<string, JobPriority>(other.JobPriorities), new List<string>(other.AntagPreferences), new List<string>(other.TraitPreferences))
+            : this(other, new Dictionary<string, JobPriority>(other.JobPriorities),
+                new List<string>(other.AntagPreferences), new List<string>(other.TraitPreferences),
+                new List<string>(other.LoadoutPreferences))
         {
         }
 
@@ -94,9 +100,12 @@ public HumanoidCharacterProfile(
             IReadOnlyDictionary<string, JobPriority> jobPriorities,
             PreferenceUnavailableMode preferenceUnavailable,
             IReadOnlyList<string> antagPreferences,
-            IReadOnlyList<string> traitPreferences)
-            : this(name, flavortext, species, age, sex, gender, appearance, clothing, backpack, spawnPriority, new Dictionary<string, JobPriority>(jobPriorities),
-                preferenceUnavailable, new List<string>(antagPreferences), new List<string>(traitPreferences))
+            IReadOnlyList<string> traitPreferences,
+            IReadOnlyList<string> loadoutPreferences)
+            : this(name, flavortext, species, age, sex, gender, appearance, clothing, backpack, spawnPriority,
+                new Dictionary<string, JobPriority>(jobPriorities), preferenceUnavailable,
+                new List<string>(antagPreferences), new List<string>(traitPreferences),
+                new List<string>(loadoutPreferences))
         {
         }
 
@@ -122,6 +131,7 @@ public HumanoidCharacterProfile() : this(
             },
             PreferenceUnavailableMode.SpawnAsOverflow,
             new List<string>(),
+            new List<string>(),
             new List<string>())
         {
         }
@@ -150,6 +160,7 @@ public static HumanoidCharacterProfile DefaultWithSpecies(string species = Share
                 },
                 PreferenceUnavailableMode.SpawnAsOverflow,
                 new List<string>(),
+                new List<string>(),
                 new List<string>());
         }
 
@@ -195,11 +206,13 @@ public static HumanoidCharacterProfile RandomWithSpecies(string species = Shared
 
             var name = GetName(species, gender);
 
-            return new HumanoidCharacterProfile(name, "", species, age, sex, gender, HumanoidCharacterAppearance.Random(species, sex), ClothingPreference.Jumpsuit, BackpackPreference.Backpack, SpawnPriorityPreference.None,
+            return new HumanoidCharacterProfile(name, "", species, age, sex, gender,
+                HumanoidCharacterAppearance.Random(species, sex), ClothingPreference.Jumpsuit,
+                BackpackPreference.Backpack, SpawnPriorityPreference.None,
                 new Dictionary<string, JobPriority>
                 {
                     {SharedGameTicker.FallbackOverflowJob, JobPriority.High},
-                }, PreferenceUnavailableMode.StayInLobby, new List<string>(), new List<string>());
+                }, PreferenceUnavailableMode.StayInLobby, new List<string>(), new List<string>(), new List<string>());
         }
 
         public string Name { get; private set; }
@@ -225,6 +238,7 @@ public static HumanoidCharacterProfile RandomWithSpecies(string species = Shared
         public IReadOnlyDictionary<string, JobPriority> JobPriorities => _jobPriorities;
         public IReadOnlyList<string> AntagPreferences => _antagPreferences;
         public IReadOnlyList<string> TraitPreferences => _traitPreferences;
+        public IReadOnlyList<string> LoadoutPreferences => _loadoutPreferences;
         public PreferenceUnavailableMode PreferenceUnavailable { get; private set; }
 
         public HumanoidCharacterProfile WithName(string name)
@@ -277,7 +291,8 @@ public HumanoidCharacterProfile WithSpawnPriorityPreference(SpawnPriorityPrefere
         }
         public HumanoidCharacterProfile WithJobPriorities(IEnumerable<KeyValuePair<string, JobPriority>> jobPriorities)
         {
-            return new(this, new Dictionary<string, JobPriority>(jobPriorities), _antagPreferences, _traitPreferences);
+            return new(this, new Dictionary<string, JobPriority>(jobPriorities), _antagPreferences, _traitPreferences,
+                _loadoutPreferences);
         }
 
         public HumanoidCharacterProfile WithJobPriority(string jobId, JobPriority priority)
@@ -291,7 +306,7 @@ public HumanoidCharacterProfile WithJobPriority(string jobId, JobPriority priori
             {
                 dictionary[jobId] = priority;
             }
-            return new(this, dictionary, _antagPreferences, _traitPreferences);
+            return new(this, dictionary, _antagPreferences, _traitPreferences, _loadoutPreferences);
         }
 
         public HumanoidCharacterProfile WithPreferenceUnavailable(PreferenceUnavailableMode mode)
@@ -301,7 +316,8 @@ public HumanoidCharacterProfile WithPreferenceUnavailable(PreferenceUnavailableM
 
         public HumanoidCharacterProfile WithAntagPreferences(IEnumerable<string> antagPreferences)
         {
-            return new(this, _jobPriorities, new List<string>(antagPreferences), _traitPreferences);
+            return new(this, _jobPriorities, new List<string>(antagPreferences), _traitPreferences,
+                _loadoutPreferences);
         }
 
         public HumanoidCharacterProfile WithAntagPreference(string antagId, bool pref)
@@ -321,7 +337,7 @@ public HumanoidCharacterProfile WithAntagPreference(string antagId, bool pref)
                     list.Remove(antagId);
                 }
             }
-            return new(this, _jobPriorities, list, _traitPreferences);
+            return new(this, _jobPriorities, list, _traitPreferences, _loadoutPreferences);
         }
 
         public HumanoidCharacterProfile WithTraitPreference(string traitId, bool pref)
@@ -343,7 +359,28 @@ public HumanoidCharacterProfile WithTraitPreference(string traitId, bool pref)
                     list.Remove(traitId);
                 }
             }
-            return new(this, _jobPriorities, _antagPreferences, list);
+            return new(this, _jobPriorities, _antagPreferences, list, _loadoutPreferences);
+        }
+
+        public HumanoidCharacterProfile WithLoadoutPreference(string loadoutId, bool pref)
+        {
+            var list = new List<string>(_loadoutPreferences);
+
+            if(pref)
+            {
+                if(!list.Contains(loadoutId))
+                {
+                    list.Add(loadoutId);
+                }
+            }
+            else
+            {
+                if(list.Contains(loadoutId))
+                {
+                    list.Remove(loadoutId);
+                }
+            }
+            return new(this, _jobPriorities, _antagPreferences, _traitPreferences, list);
         }
 
         public string Summary =>
@@ -356,18 +393,21 @@ public HumanoidCharacterProfile WithTraitPreference(string traitId, bool pref)
 
         public bool MemberwiseEquals(ICharacterProfile maybeOther)
         {
-            if (maybeOther is not HumanoidCharacterProfile other) return false;
-            if (Name != other.Name) return false;
-            if (Age != other.Age) return false;
-            if (Sex != other.Sex) return false;
-            if (Gender != other.Gender) return false;
-            if (PreferenceUnavailable != other.PreferenceUnavailable) return false;
-            if (Clothing != other.Clothing) return false;
-            if (Backpack != other.Backpack) return false;
-            if (SpawnPriority != other.SpawnPriority) return false;
-            if (!_jobPriorities.SequenceEqual(other._jobPriorities)) return false;
-            if (!_antagPreferences.SequenceEqual(other._antagPreferences)) return false;
-            if (!_traitPreferences.SequenceEqual(other._traitPreferences)) return false;
+            if (maybeOther is not HumanoidCharacterProfile other ||
+                Name != other.Name ||
+                Age != other.Age ||
+                Sex != other.Sex ||
+                Gender != other.Gender ||
+                PreferenceUnavailable != other.PreferenceUnavailable ||
+                Clothing != other.Clothing ||
+                Backpack != other.Backpack ||
+                SpawnPriority != other.SpawnPriority ||
+                !_jobPriorities.SequenceEqual(other._jobPriorities) ||
+                !_antagPreferences.SequenceEqual(other._antagPreferences) ||
+                !_traitPreferences.SequenceEqual(other._traitPreferences) ||
+                !_loadoutPreferences.SequenceEqual(other._loadoutPreferences))
+                return false;
+
             return Appearance.MemberwiseEquals(other.Appearance);
         }
 
@@ -436,8 +476,8 @@ public void EnsureValid(IConfigurationManager configManager, IPrototypeManager p
             {
                 // This regex replaces the first character of the first and last words of the name with their uppercase version
                 name = Regex.Replace(name,
-                @"^(?<word>\w)|\b(?<word>\w)(?=\w*$)",
-                m => m.Groups["word"].Value.ToUpper());
+                    @"^(?<word>\w)|\b(?<word>\w)(?=\w*$)",
+                    m => m.Groups["word"].Value.ToUpper());
             }
 
             if (string.IsNullOrEmpty(name))
@@ -502,8 +542,25 @@ public void EnsureValid(IConfigurationManager configManager, IPrototypeManager p
                 .ToList();
 
             var traits = TraitPreferences
-                         .Where(prototypeManager.HasIndex<TraitPrototype>)
-                         .ToList();
+                .Where(prototypeManager.HasIndex<TraitPrototype>)
+                .ToList();
+
+            var loadouts = LoadoutPreferences
+                .Where(prototypeManager.HasIndex<LoadoutPrototype>)
+                .ToList();
+
+            var maxLoadouts = configManager.GetCVar(CCVars.GameLoadoutsPoints);
+            var currentLoadouts = 0;
+
+            foreach (var loadout in loadouts.ToList())
+            {
+                var proto = prototypeManager.Index<LoadoutPrototype>(loadout);
+
+                if (currentLoadouts + proto.Cost > maxLoadouts)
+                    loadouts.Remove(loadout);
+                else
+                    currentLoadouts += proto.Cost;
+            }
 
             Name = name;
             FlavorText = flavortext;
@@ -529,6 +586,9 @@ public void EnsureValid(IConfigurationManager configManager, IPrototypeManager p
 
             _traitPreferences.Clear();
             _traitPreferences.AddRange(traits);
+
+            _loadoutPreferences.Clear();
+            _loadoutPreferences.AddRange(loadouts);
         }
 
         public ICharacterProfile Validated(IConfigurationManager configManager, IPrototypeManager prototypeManager)
@@ -568,7 +628,8 @@ public override int GetHashCode()
                 PreferenceUnavailable,
                 _jobPriorities,
                 _antagPreferences,
-                _traitPreferences
+                _traitPreferences,
+                _loadoutPreferences
             );
         }
     }
diff --git a/Content.Shared/Procedural/Dungeon.cs b/Content.Shared/Procedural/Dungeon.cs
index 5e976fe83d..aecfef2c78 100644
--- a/Content.Shared/Procedural/Dungeon.cs
+++ b/Content.Shared/Procedural/Dungeon.cs
@@ -15,6 +15,8 @@ public sealed class Dungeon
 
     public readonly HashSet<Vector2i> CorridorExteriorTiles = new();
 
+    public readonly HashSet<Vector2i> Entrances = new();
+
     public Dungeon()
     {
         Rooms = new List<DungeonRoom>();
@@ -23,5 +25,10 @@ public Dungeon()
     public Dungeon(List<DungeonRoom> rooms)
     {
         Rooms = rooms;
+
+        foreach (var room in Rooms)
+        {
+            Entrances.UnionWith(room.Entrances);
+        }
     }
 }
diff --git a/Content.Shared/Procedural/DungeonRoom.cs b/Content.Shared/Procedural/DungeonRoom.cs
index a6f9367b12..4802949d2f 100644
--- a/Content.Shared/Procedural/DungeonRoom.cs
+++ b/Content.Shared/Procedural/DungeonRoom.cs
@@ -4,7 +4,7 @@ namespace Content.Shared.Procedural;
 
 public sealed record DungeonRoom(HashSet<Vector2i> Tiles, Vector2 Center, Box2i Bounds, HashSet<Vector2i> Exterior)
 {
-    public List<Vector2i> Entrances = new();
+    public readonly List<Vector2i> Entrances = new();
 
     /// <summary>
     /// Nodes adjacent to tiles, including the corners.
diff --git a/Content.Shared/Procedural/PostGeneration/BoundaryWallPostGen.cs b/Content.Shared/Procedural/PostGeneration/BoundaryWallPostGen.cs
index 56d314089e..390ff42fee 100644
--- a/Content.Shared/Procedural/PostGeneration/BoundaryWallPostGen.cs
+++ b/Content.Shared/Procedural/PostGeneration/BoundaryWallPostGen.cs
@@ -9,15 +9,25 @@ namespace Content.Shared.Procedural.PostGeneration;
 /// </summary>
 public sealed partial class BoundaryWallPostGen : IPostDunGen
 {
-    [DataField("tile", customTypeSerializer:typeof(PrototypeIdSerializer<ContentTileDefinition>))]
-    public string Tile = "FloorSteel";
+    [DataField]
+    public ProtoId<ContentTileDefinition> Tile = "FloorSteel";
 
-    [DataField("wall", customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string Wall = "WallSolid";
+    [DataField]
+    public EntProtoId Wall = "WallSolid";
 
     /// <summary>
     /// Walls to use in corners if applicable.
     /// </summary>
-    [DataField("cornerWall", customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
+    [DataField]
     public string? CornerWall;
+
+    [DataField]
+    public BoundaryWallFlags Flags = BoundaryWallFlags.Corridors | BoundaryWallFlags.Rooms;
+}
+
+[Flags]
+public enum BoundaryWallFlags : byte
+{
+    Rooms = 1 << 0,
+    Corridors = 1 << 1,
 }
diff --git a/Content.Shared/Procedural/PostGeneration/CornerClutterPostGen.cs b/Content.Shared/Procedural/PostGeneration/CornerClutterPostGen.cs
index 22889d2b38..a16c7f9ab3 100644
--- a/Content.Shared/Procedural/PostGeneration/CornerClutterPostGen.cs
+++ b/Content.Shared/Procedural/PostGeneration/CornerClutterPostGen.cs
@@ -7,12 +7,12 @@ namespace Content.Shared.Procedural.PostGeneration;
 /// </summary>
 public sealed partial class CornerClutterPostGen : IPostDunGen
 {
-    [DataField("chance")]
+    [DataField]
     public float Chance = 0.50f;
 
     /// <summary>
     /// The default starting bulbs
     /// </summary>
-    [DataField("contents", required: true)]
+    [DataField(required: true)]
     public List<EntitySpawnEntry> Contents = new();
 }
diff --git a/Content.Shared/Procedural/PostGeneration/CorridorClutterPostGen.cs b/Content.Shared/Procedural/PostGeneration/CorridorClutterPostGen.cs
new file mode 100644
index 0000000000..a8a74ba6cc
--- /dev/null
+++ b/Content.Shared/Procedural/PostGeneration/CorridorClutterPostGen.cs
@@ -0,0 +1,18 @@
+using Content.Shared.Storage;
+
+namespace Content.Shared.Procedural.PostGeneration;
+
+/// <summary>
+/// Adds entities randomly to the corridors.
+/// </summary>
+public sealed partial class CorridorClutterPostGen : IPostDunGen
+{
+    [DataField]
+    public float Chance = 0.05f;
+
+    /// <summary>
+    /// The default starting bulbs
+    /// </summary>
+    [DataField(required: true)]
+    public List<EntitySpawnEntry> Contents = new();
+}
diff --git a/Content.Shared/Procedural/PostGeneration/CorridorPostGen.cs b/Content.Shared/Procedural/PostGeneration/CorridorPostGen.cs
index 32c49d1951..705ae99dce 100644
--- a/Content.Shared/Procedural/PostGeneration/CorridorPostGen.cs
+++ b/Content.Shared/Procedural/PostGeneration/CorridorPostGen.cs
@@ -14,24 +14,15 @@ public sealed partial class CorridorPostGen : IPostDunGen
     /// <remarks>
     /// Given the heavy weightings this needs to be fairly large for larger dungeons.
     /// </remarks>
-    [DataField("pathLimit")]
+    [DataField]
     public int PathLimit = 2048;
 
-    [DataField("method")]
-    public CorridorPostGenMethod Method = CorridorPostGenMethod.MinimumSpanningTree;
-
     [DataField]
     public ProtoId<ContentTileDefinition> Tile = "FloorSteel";
 
     /// <summary>
     /// How wide to make the corridor.
     /// </summary>
-    [DataField("width")]
-    public int Width = 3;
-}
-
-public enum CorridorPostGenMethod : byte
-{
-    Invalid,
-    MinimumSpanningTree,
+    [DataField]
+    public float Width = 3f;
 }
diff --git a/Content.Shared/Procedural/PostGeneration/WormCorridorPostGen.cs b/Content.Shared/Procedural/PostGeneration/WormCorridorPostGen.cs
new file mode 100644
index 0000000000..c57d92ef95
--- /dev/null
+++ b/Content.Shared/Procedural/PostGeneration/WormCorridorPostGen.cs
@@ -0,0 +1,42 @@
+using Content.Shared.Maps;
+using Content.Shared.Procedural.DungeonGenerators;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Procedural.PostGeneration;
+
+// Ime a worm
+/// <summary>
+/// Generates worm corridors.
+/// </summary>
+public sealed partial class WormCorridorPostGen : IPostDunGen
+{
+    [DataField]
+    public int PathLimit = 2048;
+
+    /// <summary>
+    /// How many times to run the worm
+    /// </summary>
+    [DataField]
+    public int Count = 20;
+
+    /// <summary>
+    /// How long to make each worm
+    /// </summary>
+    [DataField]
+    public int Length = 20;
+
+    /// <summary>
+    /// Maximum amount the angle can change in a single step.
+    /// </summary>
+    [DataField]
+    public Angle MaxAngleChange = Angle.FromDegrees(45);
+
+    [DataField]
+    public ProtoId<ContentTileDefinition> Tile = "FloorSteel";
+
+    /// <summary>
+    /// How wide to make the corridor.
+    /// </summary>
+    [DataField]
+    public float Width = 3f;
+}
diff --git a/Content.Shared/Roles/JobRequirements.cs b/Content.Shared/Roles/JobRequirements.cs
index ef07545ec4..66947c79c3 100644
--- a/Content.Shared/Roles/JobRequirements.cs
+++ b/Content.Shared/Roles/JobRequirements.cs
@@ -101,7 +101,8 @@ public static bool TryRequirementMet(
             [NotNullWhen(false)] out FormattedMessage? reason,
             IEntityManager entManager,
             IPrototypeManager prototypes,
-            bool isWhitelisted)
+            bool isWhitelisted,
+            string? localePrefix = "role-timer-")
         {
             reason = null;
 
@@ -133,7 +134,7 @@ public static bool TryRequirementMet(
                             return true;
 
                         reason = FormattedMessage.FromMarkup(Loc.GetString(
-                            "role-timer-department-insufficient",
+                            $"{localePrefix}department-insufficient",
                             ("time", Math.Ceiling(deptDiff)),
                             ("department", Loc.GetString(deptRequirement.Department)),
                             ("departmentColor", department.Color.ToHex())));
@@ -144,7 +145,7 @@ public static bool TryRequirementMet(
                         if (deptDiff <= 0)
                         {
                             reason = FormattedMessage.FromMarkup(Loc.GetString(
-                                "role-timer-department-too-high",
+                                $"{localePrefix}department-too-high",
                                 ("time", -deptDiff),
                                 ("department", Loc.GetString(deptRequirement.Department)),
                                 ("departmentColor", department.Color.ToHex())));
@@ -164,7 +165,7 @@ public static bool TryRequirementMet(
                             return true;
 
                         reason = FormattedMessage.FromMarkup(Loc.GetString(
-                              "role-timer-overall-insufficient", 
+                            $"{localePrefix}overall-insufficient",
                               ("time", Math.Ceiling(overallDiff))));
                         return false;
                     }
@@ -172,7 +173,7 @@ public static bool TryRequirementMet(
                     {
                         if (overallDiff <= 0 || overallTime >= overallRequirement.Time)
                         {
-                            reason = FormattedMessage.FromMarkup(Loc.GetString("role-timer-overall-too-high", ("time", -overallDiff)));
+                            reason = FormattedMessage.FromMarkup(Loc.GetString($"{localePrefix}overall-too-high", ("time", -overallDiff)));
                             return false;
                         }
 
@@ -200,7 +201,7 @@ public static bool TryRequirementMet(
                             return true;
 
                         reason = FormattedMessage.FromMarkup(Loc.GetString(
-                            "role-timer-role-insufficient",
+                            $"{localePrefix}role-insufficient",
                             ("time", Math.Ceiling(roleDiff)),
                             ("job", Loc.GetString(proto)),
                             ("departmentColor", departmentColor.ToHex())));
@@ -211,7 +212,7 @@ public static bool TryRequirementMet(
                         if (roleDiff <= 0)
                         {
                             reason = FormattedMessage.FromMarkup(Loc.GetString(
-                                "role-timer-role-too-high",
+                                $"{localePrefix}role-too-high",
                                 ("time", -roleDiff),
                                 ("job", Loc.GetString(proto)),
                                 ("departmentColor", departmentColor.ToHex())));
diff --git a/Content.Shared/Security/Components/CriminalRecordComponent.cs b/Content.Shared/Security/Components/CriminalRecordComponent.cs
new file mode 100644
index 0000000000..25fab3f135
--- /dev/null
+++ b/Content.Shared/Security/Components/CriminalRecordComponent.cs
@@ -0,0 +1,15 @@
+using Content.Shared.StatusIcon;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Security.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class CriminalRecordComponent : Component
+{
+    /// <summary>
+    ///     The icon that should be displayed based on the criminal status of the entity.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public ProtoId<StatusIconPrototype> StatusIcon = "SecurityIconWanted";
+}
diff --git a/Content.Shared/Security/SecurityStatus.cs b/Content.Shared/Security/SecurityStatus.cs
index 95250a8645..c7fe3766f1 100644
--- a/Content.Shared/Security/SecurityStatus.cs
+++ b/Content.Shared/Security/SecurityStatus.cs
@@ -4,12 +4,18 @@
 /// Status used in Criminal Records.
 ///
 /// None - the default value
+/// Suspected - the person is suspected of doing something illegal
 /// Wanted - the person is being wanted by security
 /// Detained - the person is detained by security
+/// Paroled - the person is on parole
+/// Discharged - the person has been released from prison
 /// </summary>
 public enum SecurityStatus : byte
 {
     None,
+    Suspected,
     Wanted,
-    Detained
+    Detained,
+    Paroled,
+    Discharged
 }
diff --git a/Content.Shared/Shuttles/Systems/SharedShuttleSystem.IFF.cs b/Content.Shared/Shuttles/Systems/SharedShuttleSystem.IFF.cs
index 72068c71f8..ed687d48f4 100644
--- a/Content.Shared/Shuttles/Systems/SharedShuttleSystem.IFF.cs
+++ b/Content.Shared/Shuttles/Systems/SharedShuttleSystem.IFF.cs
@@ -60,7 +60,7 @@ public void SetIFFColor(EntityUid gridUid, Color color, IFFComponent? component
             return;
 
         component.Color = color;
-        Dirty(component);
+        Dirty(gridUid, component);
         UpdateIFFInterfaces(gridUid, component);
     }
 
@@ -73,7 +73,7 @@ public void AddIFFFlag(EntityUid gridUid, IFFFlags flags, IFFComponent? componen
             return;
 
         component.Flags |= flags;
-        Dirty(component);
+        Dirty(gridUid, component);
         UpdateIFFInterfaces(gridUid, component);
     }
 
@@ -87,7 +87,7 @@ public void RemoveIFFFlag(EntityUid gridUid, IFFFlags flags, IFFComponent? compo
             return;
 
         component.Flags &= ~flags;
-        Dirty(component);
+        Dirty(gridUid, component);
         UpdateIFFInterfaces(gridUid, component);
     }
 }
diff --git a/Content.Shared/Shuttles/UI/MapObjects/GridMapObject.cs b/Content.Shared/Shuttles/UI/MapObjects/GridMapObject.cs
index cb4194b732..7bbd9ef64a 100644
--- a/Content.Shared/Shuttles/UI/MapObjects/GridMapObject.cs
+++ b/Content.Shared/Shuttles/UI/MapObjects/GridMapObject.cs
@@ -3,5 +3,6 @@ namespace Content.Shared.Shuttles.UI.MapObjects;
 public record struct GridMapObject : IMapObject
 {
     public string Name { get; set; }
+    public bool HideButton { get; init; }
     public EntityUid Entity;
 }
diff --git a/Content.Shared/Shuttles/UI/MapObjects/IMapObject.cs b/Content.Shared/Shuttles/UI/MapObjects/IMapObject.cs
index 80e165d0b0..a2584fa223 100644
--- a/Content.Shared/Shuttles/UI/MapObjects/IMapObject.cs
+++ b/Content.Shared/Shuttles/UI/MapObjects/IMapObject.cs
@@ -6,4 +6,9 @@ namespace Content.Shared.Shuttles.UI.MapObjects;
 public interface IMapObject
 {
     string Name { get; }
+
+    /// <summary>
+    /// Should we hide the button from being shown (AKA just draw it).
+    /// </summary>
+    bool HideButton { get; }
 }
diff --git a/Content.Shared/Shuttles/UI/MapObjects/ShuttleBeaconObject.cs b/Content.Shared/Shuttles/UI/MapObjects/ShuttleBeaconObject.cs
index 2be80f46a8..c5e13c414b 100644
--- a/Content.Shared/Shuttles/UI/MapObjects/ShuttleBeaconObject.cs
+++ b/Content.Shared/Shuttles/UI/MapObjects/ShuttleBeaconObject.cs
@@ -4,4 +4,7 @@
 namespace Content.Shared.Shuttles.UI.MapObjects;
 
 [Serializable, NetSerializable]
-public readonly record struct ShuttleBeaconObject(NetEntity Entity, NetCoordinates Coordinates, string Name) : IMapObject;
+public readonly record struct ShuttleBeaconObject(NetEntity Entity, NetCoordinates Coordinates, string Name) : IMapObject
+{
+    public bool HideButton => false;
+}
diff --git a/Content.Shared/Shuttles/UI/MapObjects/ShuttleExclusionObject.cs b/Content.Shared/Shuttles/UI/MapObjects/ShuttleExclusionObject.cs
index a5ac93c658..7c7c927b4a 100644
--- a/Content.Shared/Shuttles/UI/MapObjects/ShuttleExclusionObject.cs
+++ b/Content.Shared/Shuttles/UI/MapObjects/ShuttleExclusionObject.cs
@@ -4,4 +4,7 @@
 namespace Content.Shared.Shuttles.UI.MapObjects;
 
 [Serializable, NetSerializable]
-public record struct ShuttleExclusionObject(NetCoordinates Coordinates, float Range, string Name = "") : IMapObject;
+public record struct ShuttleExclusionObject(NetCoordinates Coordinates, float Range, string Name = "") : IMapObject
+{
+    public bool HideButton => false;
+}
diff --git a/Content.Shared/Slippery/SlipperySystem.cs b/Content.Shared/Slippery/SlipperySystem.cs
index 1f602b9b52..d20495cfa6 100644
--- a/Content.Shared/Slippery/SlipperySystem.cs
+++ b/Content.Shared/Slippery/SlipperySystem.cs
@@ -1,9 +1,12 @@
 using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
 using Content.Shared.Inventory;
+using Robust.Shared.Network;
+using Content.Shared.Popups;
 using Content.Shared.StatusEffect;
 using Content.Shared.StepTrigger.Systems;
 using Content.Shared.Stunnable;
+using Content.Shared.Throwing;
 using JetBrains.Annotations;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
@@ -30,6 +33,7 @@ public override void Initialize()
         SubscribeLocalEvent<SlipperyComponent, StepTriggerAttemptEvent>(HandleAttemptCollide);
         SubscribeLocalEvent<SlipperyComponent, StepTriggeredEvent>(HandleStepTrigger);
         SubscribeLocalEvent<NoSlipComponent, SlipAttemptEvent>(OnNoSlipAttempt);
+        SubscribeLocalEvent<ThrownItemComponent, SlipCausingAttemptEvent>(OnThrownSlipAttempt);
         // as long as slip-resistant mice are never added, this should be fine (otherwise a mouse-hat will transfer it's power to the wearer).
         SubscribeLocalEvent<NoSlipComponent, InventoryRelayedEvent<SlipAttemptEvent>>((e, c, ev) => OnNoSlipAttempt(e, c, ev.Args));
     }
@@ -52,6 +56,11 @@ private static void OnNoSlipAttempt(EntityUid uid, NoSlipComponent component, Sl
         args.Cancel();
     }
 
+    private void OnThrownSlipAttempt(EntityUid uid, ThrownItemComponent comp, ref SlipCausingAttemptEvent args)
+    {
+        args.Cancelled = true;
+    }
+
     private bool CanSlip(EntityUid uid, EntityUid toSlip)
     {
         return !_container.IsEntityInContainer(uid)
@@ -68,6 +77,11 @@ private void TrySlip(EntityUid uid, SlipperyComponent component, EntityUid other
         if (attemptEv.Cancelled)
             return;
 
+        var attemptCausingEv = new SlipCausingAttemptEvent();
+        RaiseLocalEvent(uid, ref attemptCausingEv);
+        if (attemptCausingEv.Cancelled)
+            return;
+
         var ev = new SlipEvent(other);
         RaiseLocalEvent(uid, ref ev);
 
@@ -107,7 +121,13 @@ public sealed class SlipAttemptEvent : CancellableEntityEventArgs, IInventoryRel
 }
 
 /// <summary>
-///     This event is raised directed at an entity that CAUSED some other entity to slip (e.g., the banana peel).
+/// Raised on an entity that is causing the slip event (e.g, the banana peel), to determine if the slip attempt should be cancelled.
 /// </summary>
+/// <param name="Cancelled">If the slip should be cancelled</param>
+[ByRefEvent]
+public record struct SlipCausingAttemptEvent (bool Cancelled);
+
+/// Raised on an entity that CAUSED some other entity to slip (e.g., the banana peel).
+/// <param name="Slipped">The entity being slipped</param>
 [ByRefEvent]
 public readonly record struct SlipEvent(EntityUid Slipped);
diff --git a/Content.Shared/Spawning/EntitySystemExtensions.cs b/Content.Shared/Spawning/EntitySystemExtensions.cs
index 14b171baeb..507a0f4aa2 100644
--- a/Content.Shared/Spawning/EntitySystemExtensions.cs
+++ b/Content.Shared/Spawning/EntitySystemExtensions.cs
@@ -16,7 +16,7 @@ public static class EntitySystemExtensions
             SharedPhysicsSystem? physicsManager = null)
         {
             physicsManager ??= entityManager.System<SharedPhysicsSystem>();
-            var mapCoordinates = coordinates.ToMap(entityManager);
+            var mapCoordinates = coordinates.ToMap(entityManager, entityManager.System<SharedTransformSystem>());
 
             return entityManager.SpawnIfUnobstructed(prototypeName, mapCoordinates, collisionLayer, box, physicsManager);
         }
diff --git a/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs b/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
index 529e321f8d..fa04a50f8b 100644
--- a/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
+++ b/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
@@ -4,6 +4,7 @@
 using Content.Shared.Doors.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
+using Content.Shared.Paint;
 using Content.Shared.SprayPainter.Components;
 using Content.Shared.SprayPainter.Prototypes;
 using Robust.Shared.Audio.Systems;
@@ -129,6 +130,8 @@ private void OnAirlockInteract(Entity<PaintableAirlockComponent> ent, ref Intera
             return;
         }
 
+        RemComp<PaintedComponent>(ent);
+
         var doAfterEventArgs = new DoAfterArgs(EntityManager, args.User, painter.AirlockSprayTime, new SprayPainterDoorDoAfterEvent(sprite, style.Department), args.Used, target: ent, used: args.Used)
         {
             BreakOnTargetMove = true,
diff --git a/Content.Shared/Store/ListingPrototype.cs b/Content.Shared/Store/ListingPrototype.cs
index 2f067afbee..25245327ce 100644
--- a/Content.Shared/Store/ListingPrototype.cs
+++ b/Content.Shared/Store/ListingPrototype.cs
@@ -98,6 +98,9 @@ public partial class ListingData : IEquatable<ListingData>, ICloneable
     [DataField("productEvent")]
     public object? ProductEvent;
 
+    [DataField]
+    public bool RaiseProductEventOnUser;
+
     /// <summary>
     /// used internally for tracking how many times an item was purchased.
     /// </summary>
@@ -120,7 +123,7 @@ public bool Equals(ListingData? listing)
             Description != listing.Description ||
             ProductEntity != listing.ProductEntity ||
             ProductAction != listing.ProductAction ||
-            ProductEvent != listing.ProductEvent ||
+            ProductEvent?.GetType() != listing.ProductEvent?.GetType() ||
             RestockTime != listing.RestockTime)
             return false;
 
diff --git a/Content.Shared/Throwing/ThrowingSystem.cs b/Content.Shared/Throwing/ThrowingSystem.cs
index 5429431831..0168286338 100644
--- a/Content.Shared/Throwing/ThrowingSystem.cs
+++ b/Content.Shared/Throwing/ThrowingSystem.cs
@@ -160,7 +160,7 @@ public void TryThrow(EntityUid uid,
         }
         else
         {
-            _physics.SetBodyStatus(physics, BodyStatus.InAir);
+            _physics.SetBodyStatus(uid, physics, BodyStatus.InAir);
         }
 
         if (user == null)
@@ -176,10 +176,10 @@ public void TryThrow(EntityUid uid,
         {
             var msg = new ThrowPushbackAttemptEvent();
             RaiseLocalEvent(uid, msg);
-            const float MassLimit = 5f;
+            const float massLimit = 5f;
 
             if (!msg.Cancelled)
-                _physics.ApplyLinearImpulse(user.Value, -impulseVector / physics.Mass * pushbackRatio * MathF.Min(MassLimit, physics.Mass), body: userPhysics);
+                _physics.ApplyLinearImpulse(user.Value, -impulseVector / physics.Mass * pushbackRatio * MathF.Min(massLimit, physics.Mass), body: userPhysics);
         }
     }
 }
diff --git a/Content.Shared/Throwing/ThrownItemSystem.cs b/Content.Shared/Throwing/ThrownItemSystem.cs
index b3b5bcf787..cc50094e3d 100644
--- a/Content.Shared/Throwing/ThrownItemSystem.cs
+++ b/Content.Shared/Throwing/ThrownItemSystem.cs
@@ -93,7 +93,7 @@ public void StopThrow(EntityUid uid, ThrownItemComponent thrownItemComponent)
         {
             if (TryComp<PhysicsComponent>(uid, out var physics))
             {
-                _physics.SetBodyStatus(physics, BodyStatus.OnGround);
+                _physics.SetBodyStatus(uid, physics, BodyStatus.OnGround);
 
                 if (physics.Awake)
                     _broadphase.RegenerateContacts(uid, physics);
diff --git a/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs b/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
index 50803e8ee2..59f8489ac6 100644
--- a/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
+++ b/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
@@ -7,6 +7,7 @@
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Network;
+using Robust.Shared.Random;
 
 namespace Content.Shared.VendingMachines;
 
@@ -17,6 +18,7 @@ public abstract partial class SharedVendingMachineSystem : EntitySystem
     [Dependency] protected readonly SharedAudioSystem Audio = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] protected readonly SharedPopupSystem Popup = default!;
+    [Dependency] protected readonly IRobustRandom Randomizer = default!;
 
     public override void Initialize()
     {
@@ -27,11 +29,11 @@ public override void Initialize()
 
     protected virtual void OnComponentInit(EntityUid uid, VendingMachineComponent component, ComponentInit args)
     {
-        RestockInventoryFromPrototype(uid, component);
+        RestockInventoryFromPrototype(uid, component, component.InitialStockQuality);
     }
 
     public void RestockInventoryFromPrototype(EntityUid uid,
-        VendingMachineComponent? component = null)
+        VendingMachineComponent? component = null, float restockQuality = 1f)
     {
         if (!Resolve(uid, ref component))
         {
@@ -41,9 +43,9 @@ public void RestockInventoryFromPrototype(EntityUid uid,
         if (!PrototypeManager.TryIndex(component.PackPrototypeId, out VendingMachineInventoryPrototype? packPrototype))
             return;
 
-        AddInventoryFromPrototype(uid, packPrototype.StartingInventory, InventoryType.Regular, component);
-        AddInventoryFromPrototype(uid, packPrototype.EmaggedInventory, InventoryType.Emagged, component);
-        AddInventoryFromPrototype(uid, packPrototype.ContrabandInventory, InventoryType.Contraband, component);
+        AddInventoryFromPrototype(uid, packPrototype.StartingInventory, InventoryType.Regular, component, restockQuality);
+        AddInventoryFromPrototype(uid, packPrototype.EmaggedInventory, InventoryType.Emagged, component, restockQuality);
+        AddInventoryFromPrototype(uid, packPrototype.ContrabandInventory, InventoryType.Contraband, component, restockQuality);
     }
 
     /// <summary>
@@ -80,7 +82,7 @@ public List<VendingMachineInventoryEntry> GetAvailableInventory(EntityUid uid, V
 
     private void AddInventoryFromPrototype(EntityUid uid, Dictionary<string, uint>? entries,
         InventoryType type,
-        VendingMachineComponent? component = null)
+        VendingMachineComponent? component = null, float restockQuality = 1.0f)
     {
         if (!Resolve(uid, ref component) || entries == null)
         {
@@ -107,6 +109,15 @@ private void AddInventoryFromPrototype(EntityUid uid, Dictionary<string, uint>?
         {
             if (PrototypeManager.HasIndex<EntityPrototype>(id))
             {
+                var restock = amount;
+                var chanceOfMissingStock = 1 - restockQuality;
+
+                var result = Randomizer.NextFloat(0, 1);
+                if (result < chanceOfMissingStock)
+                {
+                    restock = (uint) Math.Floor(amount * result / chanceOfMissingStock);
+                }
+
                 if (inventory.TryGetValue(id, out var entry))
                     // Prevent a machine's stock from going over three times
                     // the prototype's normal amount. This is an arbitrary
@@ -114,9 +125,9 @@ private void AddInventoryFromPrototype(EntityUid uid, Dictionary<string, uint>?
                     // restocking a machine who doesn't want to force vend out
                     // all the items just to restock one empty slot without
                     // losing the rest of the restock.
-                    entry.Amount = Math.Min(entry.Amount + amount, 3 * amount);
+                    entry.Amount = Math.Min(entry.Amount + amount, 3 * restock);
                 else
-                    inventory.Add(id, new VendingMachineInventoryEntry(type, id, amount));
+                    inventory.Add(id, new VendingMachineInventoryEntry(type, id, restock));
             }
         }
     }
diff --git a/Content.Shared/VendingMachines/VendingMachineComponent.cs b/Content.Shared/VendingMachines/VendingMachineComponent.cs
index a7c8ae299a..725dc60e3b 100644
--- a/Content.Shared/VendingMachines/VendingMachineComponent.cs
+++ b/Content.Shared/VendingMachines/VendingMachineComponent.cs
@@ -123,6 +123,14 @@ public sealed partial class VendingMachineComponent : Component
         public float DenyAccumulator = 0f;
         public float DispenseOnHitAccumulator = 0f;
 
+        /// <summary>
+        /// The quality of the stock in the vending machine on spawn.
+        /// Represents the percentage chance (0.0f = 0%, 1.0f = 100%) each set of items in the machine is fully-stocked.
+        /// If not fully stocked, the stock will have a random value between 0 (inclusive) and max stock (exclusive).
+        /// </summary>
+        [DataField]
+        public float InitialStockQuality = 1.0f;
+
         /// <summary>
         ///     While disabled by EMP it randomly ejects items
         /// </summary>
diff --git a/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs b/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs
index e840bd1ddd..e069602260 100644
--- a/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs
+++ b/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs
@@ -74,7 +74,7 @@ private void OnThrownStartup(Entity<MeleeThrownComponent> ent, ref ComponentStar
         comp.PreviousStatus = body.BodyStatus;
         comp.ThrownEndTime = _timing.CurTime + TimeSpan.FromSeconds(comp.Lifetime);
         comp.MinLifetimeTime = _timing.CurTime + TimeSpan.FromSeconds(comp.MinLifetime);
-        _physics.SetBodyStatus(body, BodyStatus.InAir);
+        _physics.SetBodyStatus(ent, body, BodyStatus.InAir);
         _physics.SetLinearVelocity(ent, Vector2.Zero, body: body);
         _physics.ApplyLinearImpulse(ent, comp.Velocity * body.Mass, body: body);
         Dirty(ent, ent.Comp);
@@ -83,7 +83,7 @@ private void OnThrownStartup(Entity<MeleeThrownComponent> ent, ref ComponentStar
     private void OnThrownShutdown(Entity<MeleeThrownComponent> ent, ref ComponentShutdown args)
     {
         if (TryComp<PhysicsComponent>(ent, out var body))
-            _physics.SetBodyStatus(body,ent.Comp.PreviousStatus);
+            _physics.SetBodyStatus(ent, body, ent.Comp.PreviousStatus);
         var ev = new MeleeThrowOnHitEndEvent();
         RaiseLocalEvent(ent, ref ev);
     }
diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
index e5b35f6c0b..85d2e4675f 100644
--- a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
+++ b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
@@ -18,7 +18,7 @@ public sealed partial class MeleeWeaponComponent : Component
     /// <summary>
     /// Does this entity do a disarm on alt attack.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
     public bool AltDisarm = true;
 
     /// <summary>
diff --git a/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs b/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs
index 177cb310d1..3a950bcd29 100644
--- a/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs
+++ b/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs
@@ -207,12 +207,12 @@ protected virtual void StartTether(EntityUid gunUid, BaseForceGunComponent compo
         TransformSystem.Unanchor(target, targetXform);
         component.Tethered = target;
         var tethered = EnsureComp<TetheredComponent>(target);
-        _physics.SetBodyStatus(targetPhysics, BodyStatus.InAir, false);
+        _physics.SetBodyStatus(target, targetPhysics, BodyStatus.InAir, false);
         _physics.SetSleepingAllowed(target, targetPhysics, false);
         tethered.Tetherer = gunUid;
         tethered.OriginalAngularDamping = targetPhysics.AngularDamping;
-        _physics.SetAngularDamping(targetPhysics, 0f);
-        _physics.SetLinearDamping(targetPhysics, 0f);
+        _physics.SetAngularDamping(target, targetPhysics, 0f);
+        _physics.SetLinearDamping(target, targetPhysics, 0f);
         _physics.SetAngularVelocity(target, SpinVelocity, body: targetPhysics);
         _physics.WakeBody(target, body: targetPhysics);
         var thrown = EnsureComp<ThrownItemComponent>(component.Tethered.Value);
@@ -264,9 +264,9 @@ protected virtual void StopTether(EntityUid gunUid, BaseForceGunComponent compon
                 _thrown.StopThrow(component.Tethered.Value, thrown);
             }
 
-            _physics.SetBodyStatus(targetPhysics, BodyStatus.OnGround);
+            _physics.SetBodyStatus(component.Tethered.Value, targetPhysics, BodyStatus.OnGround);
             _physics.SetSleepingAllowed(component.Tethered.Value, targetPhysics, true);
-            _physics.SetAngularDamping(targetPhysics, Comp<TetheredComponent>(component.Tethered.Value).OriginalAngularDamping);
+            _physics.SetAngularDamping(component.Tethered.Value, targetPhysics, Comp<TetheredComponent>(component.Tethered.Value).OriginalAngularDamping);
         }
 
         if (!transfer)
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
index a8f7ee2395..91aad89582 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
@@ -261,7 +261,7 @@ private void OnBallisticAmmoCount(EntityUid uid, BallisticAmmoProviderComponent
         args.Capacity = component.Capacity;
     }
 
-    private void UpdateBallisticAppearance(EntityUid uid, BallisticAmmoProviderComponent component)
+    public void UpdateBallisticAppearance(EntityUid uid, BallisticAmmoProviderComponent component)
     {
         if (!Timing.IsFirstTimePredicted || !TryComp<AppearanceComponent>(uid, out var appearance))
             return;
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index 36b5bbd192..d3aee5a48e 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -388,7 +388,7 @@ public abstract void Shoot(
     public void ShootProjectile(EntityUid uid, Vector2 direction, Vector2 gunVelocity, EntityUid gunUid, EntityUid? user = null, float speed = 20f)
     {
         var physics = EnsureComp<PhysicsComponent>(uid);
-        Physics.SetBodyStatus(physics, BodyStatus.InAir);
+        Physics.SetBodyStatus(uid, physics, BodyStatus.InAir);
 
         var targetMapVelocity = gunVelocity + direction.Normalized() * speed;
         var currentMapVelocity = Physics.GetMapLinearVelocity(uid, physics);
diff --git a/Content.Shared/Weather/IgnoreWeatherComponent.cs b/Content.Shared/Weather/BlockWeatherComponent.cs
similarity index 51%
rename from Content.Shared/Weather/IgnoreWeatherComponent.cs
rename to Content.Shared/Weather/BlockWeatherComponent.cs
index 8b8d004ee2..2ca8ba1aaa 100644
--- a/Content.Shared/Weather/IgnoreWeatherComponent.cs
+++ b/Content.Shared/Weather/BlockWeatherComponent.cs
@@ -3,10 +3,10 @@
 namespace Content.Shared.Weather;
 
 /// <summary>
-/// This entity will be ignored for considering weather on a tile
+/// This entity will block the weather if it's anchored to the floor.
 /// </summary>
 [RegisterComponent, NetworkedComponent]
-public sealed partial class IgnoreWeatherComponent : Component
+public sealed partial class BlockWeatherComponent : Component
 {
 
 }
diff --git a/Content.Shared/Weather/SharedWeatherSystem.cs b/Content.Shared/Weather/SharedWeatherSystem.cs
index c907137d84..45a2afe7cd 100644
--- a/Content.Shared/Weather/SharedWeatherSystem.cs
+++ b/Content.Shared/Weather/SharedWeatherSystem.cs
@@ -19,13 +19,13 @@ public abstract class SharedWeatherSystem : EntitySystem
     [Dependency] private   readonly MetaDataSystem _metadata = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
 
-    private EntityQuery<IgnoreWeatherComponent> _ignoreQuery;
+    private EntityQuery<BlockWeatherComponent> _blockQuery;
     private EntityQuery<PhysicsComponent> _physicsQuery;
 
     public override void Initialize()
     {
         base.Initialize();
-        _ignoreQuery = GetEntityQuery<IgnoreWeatherComponent>();
+        _blockQuery = GetEntityQuery<BlockWeatherComponent>();
         _physicsQuery = GetEntityQuery<PhysicsComponent>();
         SubscribeLocalEvent<WeatherComponent, EntityUnpausedEvent>(OnWeatherUnpaused);
     }
@@ -57,13 +57,8 @@ public bool CanWeatherAffect(
 
         while (anchoredEnts.MoveNext(out var ent))
         {
-            if (!_ignoreQuery.HasComponent(ent.Value) &&
-                _physicsQuery.TryGetComponent(ent, out var body) &&
-                body.Hard &&
-                body.CanCollide)
-            {
+            if (_blockQuery.HasComponent(ent.Value))
                 return false;
-            }
         }
 
         return true;
diff --git a/Content.Shared/Zombies/InitialInfectedComponent.cs b/Content.Shared/Zombies/InitialInfectedComponent.cs
new file mode 100644
index 0000000000..3200dd7f5e
--- /dev/null
+++ b/Content.Shared/Zombies/InitialInfectedComponent.cs
@@ -0,0 +1,16 @@
+using Content.Shared.Antag;
+using Content.Shared.StatusIcon;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Zombies;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class InitialInfectedComponent : Component, IAntagStatusIconComponent
+{
+    [DataField("initialInfectedStatusIcon")]
+    public ProtoId<StatusIconPrototype> StatusIcon { get; set; } = "InitialInfectedFaction";
+
+    [DataField]
+    public bool IconVisibleToGhost { get; set; } = true;
+}
diff --git a/Content.Shared/Zombies/ZombieComponent.cs b/Content.Shared/Zombies/ZombieComponent.cs
index 5ae441b132..be3fdbdd01 100644
--- a/Content.Shared/Zombies/ZombieComponent.cs
+++ b/Content.Shared/Zombies/ZombieComponent.cs
@@ -20,14 +20,14 @@ public sealed partial class ZombieComponent : Component, IAntagStatusIconCompone
     /// The baseline infection chance you have if you are completely nude
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite)]
-    public float MaxZombieInfectionChance = 0.50f;
+    public float MaxZombieInfectionChance = 0.80f;
 
     /// <summary>
     /// The minimum infection chance possible. This is simply to prevent
     /// being invincible by bundling up.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite)]
-    public float MinZombieInfectionChance = 0.20f;
+    public float MinZombieInfectionChance = 0.50f;
 
     [ViewVariables(VVAccess.ReadWrite)]
     public float ZombieMovementSpeedDebuff = 0.70f;
@@ -110,7 +110,9 @@ public sealed partial class ZombieComponent : Component, IAntagStatusIconCompone
         {
             { "Blunt", -0.4 },
             { "Slash", -0.2 },
-            { "Piercing", -0.2 }
+            { "Piercing", -0.2 },
+            { "Heat", -0.02 },
+            { "Shock", -0.02 }
         }
     };
 
@@ -140,6 +142,12 @@ public sealed partial class ZombieComponent : Component, IAntagStatusIconCompone
     [DataField("greetSoundNotification")]
     public SoundSpecifier GreetSoundNotification = new SoundPathSpecifier("/Audio/Ambience/Antag/zombie_start.ogg");
 
+    /// <summary>
+    ///     Hit sound on zombie bite.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier BiteSound = new SoundPathSpecifier("/Audio/Effects/bite.ogg");
+
     /// <summary>
     /// The blood reagent of the humanoid to restore in case of cloning
     /// </summary>
diff --git a/RUN_THIS.py b/RUN_THIS.py
index b7a8fcaa35..6ea9f8e707 100755
--- a/RUN_THIS.py
+++ b/RUN_THIS.py
@@ -5,14 +5,9 @@
 import sys
 import subprocess
 
-IS_WINDOWS = sys.platform in ("win32", "cygwin")
-
 version = sys.version_info
 if version.major < 3 or (version.major == 3 and version.minor < 5):
     print("ERROR: You need at least Python 3.5 to build SS14.")
     sys.exit(1)
 
-if IS_WINDOWS:
-    subprocess.run(["py", "-3", "git_helper.py"], cwd="BuildChecker")
-else:
-    subprocess.run(["python3", "git_helper.py"], cwd="BuildChecker")
+subprocess.run([sys.executable, "git_helper.py"], cwd="BuildChecker")
diff --git a/Resources/Audio/Ambience/attributions.yml b/Resources/Audio/Ambience/attributions.yml
index 3e6e039cd7..01d1f1c92e 100644
--- a/Resources/Audio/Ambience/attributions.yml
+++ b/Resources/Audio/Ambience/attributions.yml
@@ -91,6 +91,11 @@
   copyright: "Created by Discord handle derflerp"
   source: "https://discord.com/channels/310555209753690112/536955542913024015/1162982443645665371"
 
+- files: ["unanchored.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Created by Discord handle pigeonpeas, Soundcloud handle pigeonbeans"
+  source: "https://soundcloud.com/pigeonbeans/unanchored"
+
 - files: ["spookyspace1.ogg,
           spookyspace2.ogg"]
   license: "CC0-1.0"
diff --git a/Resources/Audio/Ambience/unanchored.ogg b/Resources/Audio/Ambience/unanchored.ogg
new file mode 100644
index 0000000000..70bcbbf2d3
Binary files /dev/null and b/Resources/Audio/Ambience/unanchored.ogg differ
diff --git a/Resources/Audio/Effects/attributions.yml b/Resources/Audio/Effects/attributions.yml
index f856871846..90445a31d1 100644
--- a/Resources/Audio/Effects/attributions.yml
+++ b/Resources/Audio/Effects/attributions.yml
@@ -93,6 +93,11 @@
   license: Custom
   source: https://gdc.sonniss.com
 
+- files: ["church_bell1.ogg", "church_bell2.ogg", "church_bell3.ogg", "church_bell4.ogg"]
+  copyright: '"the bell of my schools church.wav" by fonografico https://freesound.org/s/636113/". Pitch variations created via edits by Sphiral.'
+  license: "CC0-1.0"
+  source: https://freesound.org/people/fonografico/sounds/636113/?
+
 - files: ["pop.ogg"]
   copyright: '"pop.ogg" by mirrorcult of GitHub.com'
   license: "CC0-1.0"
@@ -216,3 +221,8 @@
   copyright: Bhijn and Myr (github username deathride58)
   license: CC0-1.0
   source: https://github.com/space-wizards/space-station-14/pull/23212
+
+- files: ["newplayerping.ogg"]
+  copyright: TGStation at 3df5d3b42bfb6b3b5adba1067ab41f83816255bb
+  license: CC-BY-SA-3.0
+  source: https://github.com/tgstation/tgstation/blob/3df5d3b42bfb6b3b5adba1067ab41f83816255bb/sound/misc/server-ready.ogg
diff --git a/Resources/Audio/Effects/church_bell1.ogg b/Resources/Audio/Effects/church_bell1.ogg
new file mode 100644
index 0000000000..9713bd3d25
Binary files /dev/null and b/Resources/Audio/Effects/church_bell1.ogg differ
diff --git a/Resources/Audio/Effects/church_bell2.ogg b/Resources/Audio/Effects/church_bell2.ogg
new file mode 100644
index 0000000000..1d0f58b74d
Binary files /dev/null and b/Resources/Audio/Effects/church_bell2.ogg differ
diff --git a/Resources/Audio/Effects/church_bell3.ogg b/Resources/Audio/Effects/church_bell3.ogg
new file mode 100644
index 0000000000..97567beaa0
Binary files /dev/null and b/Resources/Audio/Effects/church_bell3.ogg differ
diff --git a/Resources/Audio/Effects/church_bell4.ogg b/Resources/Audio/Effects/church_bell4.ogg
new file mode 100644
index 0000000000..c6f6aab9dd
Binary files /dev/null and b/Resources/Audio/Effects/church_bell4.ogg differ
diff --git a/Resources/Audio/Effects/newplayerping.ogg b/Resources/Audio/Effects/newplayerping.ogg
new file mode 100644
index 0000000000..216533b6f3
Binary files /dev/null and b/Resources/Audio/Effects/newplayerping.ogg differ
diff --git a/Resources/Audio/Items/attributions.yml b/Resources/Audio/Items/attributions.yml
index 8942e41db2..e63b678ef8 100644
--- a/Resources/Audio/Items/attributions.yml
+++ b/Resources/Audio/Items/attributions.yml
@@ -102,3 +102,8 @@
   license: "CC-BY-SA-3.0"
   copyright: "Taken from tgstation, modified by themias (github) for ss14"
   source: "https://github.com/tgstation/tgstation/tree/85a0925051bb00e7a950ee66cb7f87982cd22439/sound/effects/shovel_dig.ogg"
+
+- files: ["smoke_grenade_prime.ogg", "smoke_grenade_smoke.ogg"]
+  license: "CC0-1.0"
+  copyright: "Bhijn and Myr (github username deathride58)"
+  source: "https://github.com/space-wizards/space-station-14/pull/23476"
diff --git a/Resources/Audio/Items/smoke_grenade_prime.ogg b/Resources/Audio/Items/smoke_grenade_prime.ogg
new file mode 100644
index 0000000000..1c6cbcd25a
Binary files /dev/null and b/Resources/Audio/Items/smoke_grenade_prime.ogg differ
diff --git a/Resources/Audio/Items/smoke_grenade_smoke.ogg b/Resources/Audio/Items/smoke_grenade_smoke.ogg
new file mode 100644
index 0000000000..7603869d17
Binary files /dev/null and b/Resources/Audio/Items/smoke_grenade_smoke.ogg differ
diff --git a/Resources/Audio/StationEvents/attributions.yml b/Resources/Audio/StationEvents/attributions.yml
index 1972bc1287..e63b18a627 100644
--- a/Resources/Audio/StationEvents/attributions.yml
+++ b/Resources/Audio/StationEvents/attributions.yml
@@ -2,3 +2,8 @@
   license: "CC-BY-3.0"
   copyright: "Created by Bolgarich"
   source: "https://www.youtube.com/watch?v=SzEp2nv6oZ4"
+
+- files: ["clearly_nuclear.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Created by mryikes"
+  source: "https://www.youtube.com/watch?v=chix8uz-oUQ"
\ No newline at end of file
diff --git a/Resources/Audio/StationEvents/clearly_nuclear.ogg b/Resources/Audio/StationEvents/clearly_nuclear.ogg
new file mode 100644
index 0000000000..2c8b18e1b1
Binary files /dev/null and b/Resources/Audio/StationEvents/clearly_nuclear.ogg differ
diff --git a/Resources/Audio/Voice/Misc/silly_snore.ogg b/Resources/Audio/Voice/Misc/silly_snore.ogg
index 7b3d82ce39..22b4c03808 100644
Binary files a/Resources/Audio/Voice/Misc/silly_snore.ogg and b/Resources/Audio/Voice/Misc/silly_snore.ogg differ
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 411a5bf2a2..000caf9020 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4038,3 +4038,101 @@ Entries:
       message: Species in the character editor have a shortcut to their guidebook entry
   id: 6105
   time: '2024-03-23T02:09:54.0000000+00:00'
+- author: LovelyLophi
+  changes:
+    - type: Tweak
+      message: >-
+        Sectech now says "Crack communist skulls!" instead of "Crack syndicate
+        skulls!"
+  id: 6106
+  time: '2024-04-17T04:07:41.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        Glass/Crystal shards and floor tiles now deal damage and embed in
+        victims when colliding with them. 
+  id: 6107
+  time: '2024-05-11T01:23:00.0000000+00:00'
+- author: FoxxoTrystan
+  changes:
+    - type: Tweak
+      message: Better looking Vents Sprites!
+  id: 6108
+  time: '2024-05-12T04:26:55.0000000+00:00'
+- author: DEATHB4DEFEAT
+  changes:
+    - type: Add
+      message: >-
+        Added a new character customization tab for selecting items to start
+        your shift with, loadouts!
+    - type: Remove
+      message: Removed some default job equipment in favor of loadouts
+    - type: Remove
+      message: Removed several clothing items from Command lockers in favor of loadouts
+  id: 6109
+  time: '2024-05-13T04:46:57.0000000+00:00'
+- author: DEATHB4DEFEAT
+  changes:
+    - type: Add
+      message: >-
+        Added a queue for players so you don't need to spam reconnect and hope
+        you join when someone leaves.
+  id: 6110
+  time: '2024-05-13T04:58:39.0000000+00:00'
+- author: LovelyLophi
+  changes:
+    - type: Add
+      message: Added a number of new corporate coats to the Clothesmate.
+  id: 6111
+  time: '2024-05-22T03:35:11.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Tweak
+      message: >-
+        Syndicate Listening Posts can now appear any time in a round, and can
+        appear on low-pop servers.
+  id: 6112
+  time: '2024-05-28T23:44:39.0000000+00:00'
+- author: FoxxoTrystan
+  changes:
+    - type: Tweak
+      message: Better wall sprites.
+    - type: Tweak
+      message: Better window sprites.
+  id: 6113
+  time: '2024-05-28T23:59:19.0000000+00:00'
+- author: FoxxoTrystan
+  changes:
+    - type: Tweak
+      message: Radio Resprites, Talkwalkies, Beacon, Headset...
+    - type: Tweak
+      message: >-
+        Radio and uplink radio looks the same, make sure to check what freq the
+        radio is on!
+  id: 6114
+  time: '2024-05-29T00:00:50.0000000+00:00'
+- author: FoxxoTrystan
+  changes:
+    - type: Tweak
+      message: New Tools Sprites!
+  id: 6115
+  time: '2024-05-29T01:06:42.0000000+00:00'
+- author: FoxxoTrystan
+  changes:
+    - type: Tweak
+      message: Resprited gas canisters
+    - type: Tweak
+      message: Resprited gas tanks
+  id: 6116
+  time: '2024-05-31T00:13:45.0000000+00:00'
+- author: LovelyLophi
+  changes:
+    - type: Add
+      message: Added five new coats
+    - type: Add
+      message: Added loadouts
+    - type: Fix
+      message: Fixed the coat handhole
+  id: 6117
+  time: '2024-06-02T00:36:59.0000000+00:00'
diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
index 928686d263..db58663a2b 100644
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
@@ -1 +1 @@
-0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, africalimedrop, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bribrooo, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, CaptainSqrBeard, Carbonhell, Carolyn3114, casperr04, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, clement-or, Clyybber, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, Delete69, deltanedas, DeltaV-Bot, DerbyX, DmitriyMX, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, Guess-My-Name, gusxyz, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, KaiShibaa, kalane15, kalanosh, KEEYNy, Keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Kmc2000, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, leonardo-dabepis, LetterN, Level10Cybermancer, lever1209, LightVillet, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, LudwigVonChesterfield, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, M3739, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, matthst, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, MishaUnity, MisterMecky, Mith-randalf, MjrLandWhale, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nails-n-Tape, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, Nylux, OCOtheOmega, OctoRocket, OldDanceJacket, onoira, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, PHCodes, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, SignalWalker, Simyon264, SirDragooon, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, Slava0135, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpeltIncorrectyl, spoogemonster, ssdaniel24, Stealthbomber16, StrawberryMoses, Subversionary, SweptWasTaken, Szunti, TadJohnson00, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, Theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, tom-leys, tomasalves8, Tomeno, tosatur, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, UnicornOnLSD, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Verslebas, VigersRay, Visne, VMSolidus, volundr-, Vordenburg, vulppine, waylon531, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem
+0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, africalimedrop, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bribrooo, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, CaptainSqrBeard, Carbonhell, Carolyn3114, casperr04, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, clement-or, Clyybber, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, Delete69, deltanedas, DeltaV-Bot, DerbyX, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, Guess-My-Name, gusxyz, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, KaiShibaa, kalane15, kalanosh, KEEYNy, Keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Kmc2000, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, leonardo-dabepis, LetterN, Level10Cybermancer, lever1209, LightVillet, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, LovelyLophi, LudwigVonChesterfield, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, M3739, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, matthst, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, MishaUnity, MisterMecky, Mith-randalf, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OCOtheOmega, OctoRocket, OldDanceJacket, onoira, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, PHCodes, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, SignalWalker, SimpleStation14, Simyon264, SirDragooon, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, Slava0135, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpeltIncorrectyl, spoogemonster, ssdaniel24, Stealthbomber16, stellar-novas, StrawberryMoses, Subversionary, SweptWasTaken, Szunti, TadJohnson00, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, tom-leys, tomasalves8, Tomeno, tosatur, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, UnicornOnLSD, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Verslebas, VigersRay, Visne, VMSolidus, volundr-, Voomra, Vordenburg, vulppine, waylon531, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem
diff --git a/Resources/Locale/en-US/accent/parrot.ftl b/Resources/Locale/en-US/accent/parrot.ftl
new file mode 100644
index 0000000000..4d4e0dc7e3
--- /dev/null
+++ b/Resources/Locale/en-US/accent/parrot.ftl
@@ -0,0 +1,8 @@
+accent-parrot-squawk-1 = SQUAWK!
+accent-parrot-squawk-2 = SQUAAAWK!
+accent-parrot-squawk-3 = AWWK!
+accent-parrot-squawk-4 = AAWK!
+accent-parrot-squawk-5 = RAWWK!
+accent-parrot-squawk-6 = RAAAWK!
+accent-parrot-squawk-7 = BRAAWK!
+accent-parrot-squawk-8 = BRAWWK!
diff --git a/Resources/Locale/en-US/accessories/human-hair.ftl b/Resources/Locale/en-US/accessories/human-hair.ftl
index 9bd8c01fb0..3a507ec6cf 100644
--- a/Resources/Locale/en-US/accessories/human-hair.ftl
+++ b/Resources/Locale/en-US/accessories/human-hair.ftl
@@ -7,6 +7,7 @@ marking-HumanHairBedhead = Bedhead
 marking-HumanHairBedheadv2 = Bedhead 2
 marking-HumanHairBedheadv3 = Bedhead 3
 marking-HumanHairLongBedhead = Long Bedhead
+marking-HumanHairLongBedhead2 = Long Bedhead 2
 marking-HumanHairFloorlengthBedhead = Floorlength Bedhead
 marking-HumanHairBeehive = Beehive
 marking-HumanHairBeehivev2 = Beehive 2
@@ -55,6 +56,7 @@ marking-HumanHairCornrowbun = Cornrow Bun
 marking-HumanHairCornrowbraid = Cornrow Braid
 marking-HumanHairCornrowtail = Cornrow Tail
 marking-HumanHairCrewcut = Crewcut
+marking-HumanHairCrewcut2 = Crewcut 2
 marking-HumanHairCurls = Curls
 marking-HumanHairC = Cut Hair
 marking-HumanHairDandypompadour = Dandy Pompadour
diff --git a/Resources/Locale/en-US/administration/smites.ftl b/Resources/Locale/en-US/administration/smites.ftl
index fe8077a550..ae4e6f7271 100644
--- a/Resources/Locale/en-US/administration/smites.ftl
+++ b/Resources/Locale/en-US/administration/smites.ftl
@@ -44,7 +44,7 @@ admin-smite-reptilian-species-swap-description = It changes their species to Rep
 admin-smite-locker-stuff-description = Stuffs them in a (welded) locker.
 admin-smite-headstand-description = Vertically flips their sprite.
 admin-smite-plasma-internals-description = Replaces the contents of their internals with plasma.
-admin-smite-become-mouse-description = They become a rat. Ratatouille.
+admin-smite-become-mouse-description = They become a mouse. Squeak!
 admin-smite-maid-description = Forcibly converts them into a janitorial cat maid. This is actual torture for some players, use it wisely.
 admin-smite-zoom-in-description = Zooms in their view so that they can no longer see their surroundings.
 admin-smite-flip-eye-description = Flips their view, effectively reversing their controls and making the game annoying to play.
diff --git a/Resources/Locale/en-US/administration/ui/admin-notes.ftl b/Resources/Locale/en-US/administration/ui/admin-notes.ftl
index 16cdc7c500..ca5348a940 100644
--- a/Resources/Locale/en-US/administration/ui/admin-notes.ftl
+++ b/Resources/Locale/en-US/administration/ui/admin-notes.ftl
@@ -23,8 +23,11 @@ admin-notes-hide = Hide
 admin-notes-delete-confirm = Confirm delete
 admin-notes-edited = Last edit by {$author} on {$date}
 admin-notes-unbanned = Unbanned by {$admin} on {$date}
-admin-notes-message-window-title = Alert!
-admin-notes-message-admin = New message from {$admin}, added on {$date}
+admin-notes-message-desc = [color=white]You have received { $count ->
+    [1] an administrative message
+    *[other] administrative messages
+} since the last time you played on this server.[/color]
+admin-notes-message-admin = From [bold]{ $admin }[/bold], written on { TOSTRING($date, "f") }:
 admin-notes-message-wait = The accept button will be enabled after {$time} seconds.
 admin-notes-message-accept = Dismiss permanently
 admin-notes-message-dismiss = Dismiss for now
@@ -68,6 +71,7 @@ admin-notes-verb-text = Open Admin Notes
 # Watchlist and message login
 admin-notes-watchlist = Watchlist for {$player}: {$message}
 admin-notes-new-message = You've received an admin message from {$admin}: {$message}
+admin-notes-fallback-admin-name = [System]
 
 # Admin remarks
 admin-remarks-command-description = Opens the admin remarks page
diff --git a/Resources/Locale/en-US/advertisements/vending/lawdrobe.ftl b/Resources/Locale/en-US/advertisements/vending/lawdrobe.ftl
index 054e9c2bec..d91ca5e3df 100644
--- a/Resources/Locale/en-US/advertisements/vending/lawdrobe.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/lawdrobe.ftl
@@ -1,3 +1,13 @@
 advertisement-lawdrobe-1 = OBJECTION! Get the rule of law for yourself!
 advertisement-lawdrobe-2 = Go pester security until they abide by your own rules!
 advertisement-lawdrobe-3 = A new case just came in? Go get them out of jail!
+advertisement-lawdrobe-4 = A dougnut a day keeps security away!
+advertisement-lawdrobe-5 = No one is above the law!
+advertisement-lawdrobe-6 = No officer, I do not consent to a search!
+advertisement-lawdrobe-7 = Injecting space drugs leaves no evidence!
+advertisement-lawdrobe-8 = You or a loved one hurt by Nanotrasen? Too bad!
+thankyou-lawdrobe-1 = You can win any case in that outfit!
+thankyou-lawdrobe-2 = Get one for your client as well!
+thankyou-lawdrobe-3 = Win or lose, you get paid either way!
+thankyou-lawdrobe-4 = Remember: Its only illegal if you get caught!
+thankyou-lawdrobe-5 = OBJECTION! That outfit is too cool for court!
diff --git a/Resources/Locale/en-US/advertisements/vending/sectech.ftl b/Resources/Locale/en-US/advertisements/vending/sectech.ftl
index 8f02897142..1edaa980cd 100644
--- a/Resources/Locale/en-US/advertisements/vending/sectech.ftl
+++ b/Resources/Locale/en-US/advertisements/vending/sectech.ftl
@@ -1,4 +1,4 @@
-advertisement-sectech-1 = Crack syndicate skulls!
+advertisement-sectech-1 = Crack communist skulls!
 advertisement-sectech-2 = Beat some heads in!
 advertisement-sectech-3 = Don't forget - harm is good!
 advertisement-sectech-4 = Your weapons are right here.
diff --git a/Resources/Locale/en-US/atmos/commands.ftl b/Resources/Locale/en-US/atmos/commands.ftl
new file mode 100644
index 0000000000..692908d42a
--- /dev/null
+++ b/Resources/Locale/en-US/atmos/commands.ftl
@@ -0,0 +1,8 @@
+cmd-set-map-atmos-desc = Sets a map's atmosphere
+cmd-set-map-atmos-help = setmapatmos <mapid> <space> [<temperature> [moles...]]
+cmd-set-map-atmos-removed = Atmosphere removed from map {$map}
+cmd-set-map-atmos-updated = Atmosphere set for map {$map}
+cmd-set-map-atmos-hint-map = <mapid>
+cmd-set-map-atmos-hint-space = <space>
+cmd-set-map-atmos-hint-temp = <temperature> (float)
+cmd-set-map-atmos-hint-gas = <{$gas} moles> (float)
diff --git a/Resources/Locale/en-US/bonk/components/bonkable-component.ftl b/Resources/Locale/en-US/bonk/components/bonkable-component.ftl
index e66eb91dd9..560b10c46e 100644
--- a/Resources/Locale/en-US/bonk/components/bonkable-component.ftl
+++ b/Resources/Locale/en-US/bonk/components/bonkable-component.ftl
@@ -1,2 +1,2 @@
-bonkable-success-message-others = { CAPITALIZE(THE($user)) } bonks { POSS-ADJ($user) } head against { $bonkable }
+bonkable-success-message-others = { CAPITALIZE(THE($user)) } bonks { POSS-ADJ($user) } head against { THE($bonkable) }
 bonkable-success-message-user = You bonk your head against { THE($bonkable) }
diff --git a/Resources/Locale/en-US/chat/managers/chat-manager.ftl b/Resources/Locale/en-US/chat/managers/chat-manager.ftl
index a0cc5cf634..fab815b4f9 100644
--- a/Resources/Locale/en-US/chat/managers/chat-manager.ftl
+++ b/Resources/Locale/en-US/chat/managers/chat-manager.ftl
@@ -109,6 +109,10 @@ chat-speech-verb-large-mob-2 = growls
 chat-speech-verb-monkey-1 = chimpers
 chat-speech-verb-monkey-2 = screeches
 
+chat-speech-verb-parrot-1 = squawks
+chat-speech-verb-parrot-2 = tweets
+chat-speech-verb-parrot-3 = chirps
+
 chat-speech-verb-cluwne-1 = giggles
 chat-speech-verb-cluwne-2 = guffaws
 chat-speech-verb-cluwne-3 = laughs
diff --git a/Resources/Locale/en-US/chemistry/components/solution-transfer-component.ftl b/Resources/Locale/en-US/chemistry/components/solution-transfer-component.ftl
index 14cec95129..74e38f00ab 100644
--- a/Resources/Locale/en-US/chemistry/components/solution-transfer-component.ftl
+++ b/Resources/Locale/en-US/chemistry/components/solution-transfer-component.ftl
@@ -11,6 +11,7 @@ comp-solution-transfer-is-full = {THE($target)} is full!
 ## Displayed in change transfer amount verb's name
 comp-solution-transfer-verb-custom-amount = Custom
 comp-solution-transfer-verb-amount = {$amount}u
+comp-solution-transfer-verb-toggle = Toggle to {$amount}u
 
 ## Displayed after you successfully change a solution's amount using the BUI
 comp-solution-transfer-set-amount = Transfer amount set to {$amount}u.
diff --git a/Resources/Locale/en-US/climbing/climbable-component.ftl b/Resources/Locale/en-US/climbing/climbable-component.ftl
index b614e66915..baff6f1564 100644
--- a/Resources/Locale/en-US/climbing/climbable-component.ftl
+++ b/Resources/Locale/en-US/climbing/climbable-component.ftl
@@ -12,10 +12,10 @@ comp-climbable-user-climbs = You jump onto { THE($climbable) }!
 # Shown to others when $user climbs on $climbable
 comp-climbable-user-climbs-other  = { CAPITALIZE(THE($user)) } jumps onto { THE($climbable) }!
 
-# Shown to you when your character force someone to climb on $climbable
-comp-climbable-user-climbs-force = You force { CAPITALIZE(THE($moved-user)) } onto { THE($climbable) }!
+# Shown to you when your character forces someone to climb on $climbable
+comp-climbable-user-climbs-force = You force { THE($moved-user) } onto { THE($climbable) }!
 
-# Shown to others when someone force other $moved-user to climb on $climbable
+# Shown to others when someone forces other $moved-user to climb on $climbable
 comp-climbable-user-climbs-force-other = { CAPITALIZE(THE($user)) } forces { THE($moved-user) } onto { THE($climbable) }!
 
 # Shown to you when your character is far away from climbable
@@ -24,5 +24,8 @@ comp-climbable-cant-reach = You can't reach there!
 # Shown to you when your character can't interact with climbable for some reason
 comp-climbable-cant-interact = You can't do that!
 
-# Shown to you when your character can't climb
+# Shown to you when your character isn't able to climb by their own actions
 comp-climbable-cant-climb = You are incapable of climbing!
+
+# Shown to you when your character tries to force someone else who can't climb onto a climbable
+comp-climbable-target-cant-climb = { CAPITALIZE(THE($moved-user)) } can't go there!
diff --git a/Resources/Locale/en-US/clothing/boots.ftl b/Resources/Locale/en-US/clothing/boots.ftl
index 05322d612a..c86bec8455 100644
--- a/Resources/Locale/en-US/clothing/boots.ftl
+++ b/Resources/Locale/en-US/clothing/boots.ftl
@@ -1 +1 @@
-clothing-military-boots-sidearm = Sidearm
+clothing-boots-sidearm = Sidearm
diff --git a/Resources/Locale/en-US/criminal-records/criminal-records.ftl b/Resources/Locale/en-US/criminal-records/criminal-records.ftl
index 8e8124edcb..cd73883f06 100644
--- a/Resources/Locale/en-US/criminal-records/criminal-records.ftl
+++ b/Resources/Locale/en-US/criminal-records/criminal-records.ftl
@@ -10,8 +10,12 @@ criminal-records-console-status = Status
 criminal-records-status-none = None
 criminal-records-status-wanted = Wanted
 criminal-records-status-detained = Detained
+criminal-records-status-suspected = Suspect
+criminal-records-status-discharged = Discharged
+criminal-records-status-paroled = Paroled
 
 criminal-records-console-wanted-reason = [color=gray]Wanted Reason[/color]
+criminal-records-console-suspected-reason = [color=gray]Suspected Reason[/color]
 criminal-records-console-reason = Reason
 criminal-records-console-reason-placeholder = For example: {$placeholder}
 
@@ -28,9 +32,13 @@ criminal-records-permission-denied = Permission denied
 ## Security channel notifications
 
 criminal-records-console-wanted = {$name} is wanted by {$officer} for: {$reason}.
+criminal-records-console-suspected = {$officer} marked {$name} as suspicious because of: {$reason}
+criminal-records-console-not-suspected = {$name} is no longer a suspect.
 criminal-records-console-detained = {$name} has been detained by {$officer}.
 criminal-records-console-released = {$name} has been released by {$officer}.
 criminal-records-console-not-wanted = {$name} is no longer wanted.
+criminal-records-console-paroled = {$name} has been released on parole by {$officer}.
+criminal-records-console-not-parole = {$name} is no longer on parole.
 criminal-records-console-unknown-officer = <unknown officer>
 
 ## Filters
diff --git a/Resources/Locale/en-US/deltav/advertisements/vending/courierdrobe.ftl b/Resources/Locale/en-US/deltav/advertisements/vending/courierdrobe.ftl
index 17ef24784c..b411cf2eec 100644
--- a/Resources/Locale/en-US/deltav/advertisements/vending/courierdrobe.ftl
+++ b/Resources/Locale/en-US/deltav/advertisements/vending/courierdrobe.ftl
@@ -3,3 +3,5 @@ advertisement-courierdrobe-2 = A great investment for your survival!
 advertisement-courierdrobe-3 = Wear your brown with pride!
 advertisement-courierdrobe-4 = These shorts are comfy and easy to wear, get yours now!
 advertisement-courierdrobe-5 = Outrun every danger with our stylish clothes!
+thankyou-courierdrobe-1 = Now get out there and deliver that mail!
+thankyou-courierdrobe-1 = Those parcels aren't going to deliver themselves!
diff --git a/Resources/Locale/en-US/deltav/advertisements/vending/pride.ftl b/Resources/Locale/en-US/deltav/advertisements/vending/pride.ftl
index 1a23169c46..d8c47a8e41 100644
--- a/Resources/Locale/en-US/deltav/advertisements/vending/pride.ftl
+++ b/Resources/Locale/en-US/deltav/advertisements/vending/pride.ftl
@@ -1,3 +1,5 @@
 advertisement-pride-1 = Be gay do crime!
 advertisement-pride-2 = Full of colors!
 advertisement-pride-3 = You are valid!
+thankyou-pride-1 = Go, do some crime!
+thankyou-pride-1 = Have a colorful day!
diff --git a/Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl
index d4602b9939..98e04f2818 100644
--- a/Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl
@@ -25,5 +25,5 @@ flavor-complex-lemondrop = refreshingly tart
 flavor-complex-greengrass = like a holiday in the sun
 flavor-complex-daiquiri = fashionable
 flavor-complex-arsonistsbrew = like ash and flame
-flavor-complex-dulleavene = ominous
+flavor-complex-healthcodeviolation = ominous
 flavor-complex-pumpkin = like pumpkin
diff --git a/Resources/Locale/en-US/deltav/markings/Oni.ftl b/Resources/Locale/en-US/deltav/markings/Oni.ftl
new file mode 100644
index 0000000000..0ba3315fdb
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/markings/Oni.ftl
@@ -0,0 +1,4 @@
+marking-OniHornShaved = Shaved
+marking-OniHornShaved-shaved = Shaved
+marking-OniHornBull = Bull
+marking-OniHornBull-bull = Bull
diff --git a/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl b/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl
index a66aedbd7e..7b2d06a04e 100644
--- a/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl
+++ b/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl
@@ -2,31 +2,31 @@ station-beacon-epistemics = Epistemics
 station-beacon-mystagogue = Mystagogue
 
 station-beacon-logistics = Logistics
-station-beacon-logistics-reception = Logistics Reception
+station-beacon-logistics-reception = Logistics
 station-beacon-lo = LO
 
 station-beacon-conference-room = Conference Room
 
 station-beacon-virology = Virology
 station-beacon-metempsychosis = Metempsychosis
-station-beacon-exam = Exam Room
+station-beacon-exam = Exam
 station-beacon-med-outpost = Med Outpost
-station-beacon-psych = Psychologist
+station-beacon-psych = Psych
 
-station-beacon-glimmer-prober = Glimmer Prober
-station-beacon-forensic-mantis = Forensic Mantis
+station-beacon-glimmer-prober = Prober
+station-beacon-forensic-mantis = Mantis
 
 station-beacon-mailroom = Mail
 
 station-beacon-engi-outpost = Engi Outpost
 
 station-beacon-janitor-office = Jani Office
-station-beacon-janitor-closet = Jani closet
+station-beacon-janitor-closet = Jani Closet
 station-beacon-reporter = Reporter
 
-station-beacon-camera-servers = Camera Servers
+station-beacon-camera-servers = Cameras
 
-station-beacon-boxing-ring = Boxing Ring
+station-beacon-boxing-ring = Boxing
 station-beacon-park = Park
 
 station-beacon-corpsman = Corpsman
diff --git a/Resources/Locale/en-US/deltav/paper/paper-misc.ftl b/Resources/Locale/en-US/deltav/paper/paper-misc.ftl
new file mode 100644
index 0000000000..69b0d09c0b
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/paper/paper-misc.ftl
@@ -0,0 +1,12 @@
+book-text-lunchbox-generic = Hello Honey!
+      I've packed your lunch for this shift, I hope you enjoy it!!
+      Love you so so much,
+       - Mum.
+book-text-lunchbox-healthy = Hello Honey!
+      I've packed you something healthy for this shift! I hope you enjoy it!!
+      Love you so so much,
+       - Mum.
+book-text-lunchbox-unhealthy = Hello Honey!
+      I've packed you something fun for this shift! I hope you enjoy it!!
+      Love you so so much,
+       - Mum.
\ No newline at end of file
diff --git a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl
index 239cecc6e0..84245872f5 100644
--- a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl
+++ b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl
@@ -1,2 +1,3 @@
 id-card-access-level-orders = Orders
 id-card-access-level-mantis = Psionic Mantis
+id-card-access-level-corpsman = Corpsman
diff --git a/Resources/Locale/en-US/deltav/warp-points/warp-points.ftl b/Resources/Locale/en-US/deltav/warp-points/warp-points.ftl
new file mode 100644
index 0000000000..0079685cb0
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/warp-points/warp-points.ftl
@@ -0,0 +1,41 @@
+warp-point-evacshuttle = Evac Shuttle
+warp-point-shuttle = Shuttle
+warp-point-debris = Space Debris
+warp-point-ruin = Space Ruin
+
+warp-point-bridge = Bridge
+warp-point-vault = Vault
+
+warp-point-sec = Security
+warp-point-perma = Perma
+warp-point-detective = Detective
+warp-point-court = Courtroom
+
+warp-point-medical = Medical
+warp-point-morgue = Morgue
+
+warp-point-epistemics = Epistemics
+
+warp-point-logistics = Logistics
+warp-point-salvage = Salvage
+
+warp-point-engineering = Engineering
+warp-point-singularity = Singularity
+warp-point-atmospherics = Atmos
+
+warp-point-hop = HoP
+warp-point-kitchen = Kitchen
+warp-point-bar = Bar
+warp-point-botany = Botany
+warp-point-janitor = Janitor
+warp-point-reporter = Reporter
+warp-point-lawyer = Lawyer
+
+warp-point-ai = AI
+warp-point-arrivals = Arrivals
+warp-point-evac = Evac
+warp-point-cryo = Cryo
+warp-point-chapel = Chapel
+warp-point-library = Library
+warp-point-dorms = Dorms
+warp-point-disposals = Disposals
diff --git a/Resources/Locale/en-US/discord-auth/discord-auth-state.ftl b/Resources/Locale/en-US/discord-auth/discord-auth-state.ftl
new file mode 100644
index 0000000000..a0df50c369
--- /dev/null
+++ b/Resources/Locale/en-US/discord-auth/discord-auth-state.ftl
@@ -0,0 +1,6 @@
+discord-auth-title = Discord Authorization
+discord-auth-info = To access the server, you need to link your SS14 account to Discord
+discord-auth-warn = Don't worry, it only takes a couple of clicks!
+discord-auth-link = Link:
+discord-auth-browser-btn = Open in browser
+discord-auth-quit-btn = Quit
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 4be4781316..8e52e7f067 100644
--- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
@@ -46,6 +46,7 @@ ui-options-show-looc-on-head = Show LOOC chat above characters head
 ui-options-fancy-speech = Show names in speech bubbles
 ui-options-fancy-name-background = Add background to speech bubble names
 ui-options-enable-color-name = Add colors to character names
+ui-options-colorblind-friendly = Colorblind friendly mode
 ui-options-reduced-motion = Reduce motion of visual effects
 ui-options-screen-shake-intensity = Screen shake intensity
 ui-options-screen-shake-percent = { TOSTRING($intensity, "P0") }
diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
index 5d42146f74..35de5555a2 100644
--- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
@@ -47,9 +47,9 @@ flavor-base-clean = clean
 flavor-base-alkaline = alkaline
 flavor-base-holy = holy
 flavor-base-horrible = horrible
-
 # lmao
 flavor-base-terrible = terrible
+flavor-base-mindful = mindful
 
 # Complex flavors. Put a flavor here when you want something that's more
 # specific.
diff --git a/Resources/Locale/en-US/frontier/storage/components/magnet-pickup-components.ftl b/Resources/Locale/en-US/frontier/storage/components/magnet-pickup-components.ftl
new file mode 100644
index 0000000000..0a82347631
--- /dev/null
+++ b/Resources/Locale/en-US/frontier/storage/components/magnet-pickup-components.ftl
@@ -0,0 +1,4 @@
+magnet-pickup-component-toggle-verb = Toggle magnet
+magnet-pickup-component-on-examine-main = The magnet appears to be {$stateText}.
+magnet-pickup-component-magnet-on = [color=darkgreen]on[/color]
+magnet-pickup-component-magnet-off =  [color=darkred]off[/color]
diff --git a/Resources/Locale/en-US/game-ticking/game-presets/preset-thief.ftl b/Resources/Locale/en-US/game-ticking/game-presets/preset-thief.ftl
index db1404e09b..ab2b8f88d7 100644
--- a/Resources/Locale/en-US/game-ticking/game-presets/preset-thief.ftl
+++ b/Resources/Locale/en-US/game-ticking/game-presets/preset-thief.ftl
@@ -6,7 +6,7 @@ thief-role-greeting-human =
     but that can't stop you from getting your fix by any means necessary.
 
 thief-role-greeting-animal =
-    You are a kleptomaniaс animal.
+    You are a kleptomaniac animal.
     Steal things that you like.
 
 thief-role-greeting-equipment =
diff --git a/Resources/Locale/en-US/glue/glue.ftl b/Resources/Locale/en-US/glue/glue.ftl
index 1d0db515cb..1a711d51c2 100644
--- a/Resources/Locale/en-US/glue/glue.ftl
+++ b/Resources/Locale/en-US/glue/glue.ftl
@@ -1,3 +1,6 @@
 glue-success = {THE($target)} has been covered in glue!
 glued-name-prefix = Glued {$target}
 glue-failure = Can't cover {THE($target)} in glue!
+glue-verb-text = Apply Glue
+glue-verb-message = Glue an object
+
diff --git a/Resources/Locale/en-US/join-queue/queue-screen.ftl b/Resources/Locale/en-US/join-queue/queue-screen.ftl
new file mode 100644
index 0000000000..b518b57f8d
--- /dev/null
+++ b/Resources/Locale/en-US/join-queue/queue-screen.ftl
@@ -0,0 +1,4 @@
+queue-title = Join Queue
+queue-quit = Disconnect
+queue-position = Position in queue:
+queue-total = Total in queue:
diff --git a/Resources/Locale/en-US/loadouts/categories.ftl b/Resources/Locale/en-US/loadouts/categories.ftl
new file mode 100644
index 0000000000..bdfa215e6a
--- /dev/null
+++ b/Resources/Locale/en-US/loadouts/categories.ftl
@@ -0,0 +1,7 @@
+# Alphabetically ordered
+loadout-category-Accessories = Accessories
+loadout-category-Items = Items
+loadout-category-Jobs = Jobs
+loadout-category-Outer = Outer
+loadout-category-Uncategorized = Uncategorized
+loadout-category-Uniform = Uniform
diff --git a/Resources/Locale/en-US/loadouts/eyes.ftl b/Resources/Locale/en-US/loadouts/eyes.ftl
new file mode 100644
index 0000000000..e1ee7edce7
--- /dev/null
+++ b/Resources/Locale/en-US/loadouts/eyes.ftl
@@ -0,0 +1,2 @@
+loadout-description-LoadoutEyesEyepatch = Eyewear, for the fashionista without an eye.
+loadout-description-LoadoutEyesBlindfold = Why would you want this?
diff --git a/Resources/Locale/en-US/loadouts/head.ftl b/Resources/Locale/en-US/loadouts/head.ftl
new file mode 100644
index 0000000000..be10f7d2fd
--- /dev/null
+++ b/Resources/Locale/en-US/loadouts/head.ftl
@@ -0,0 +1,2 @@
+loadout-description-LoadoutHeadBeaverHat = Gentlemen.
+loadout-description-LoadoutHeadTophat = A stylish black tophat.
diff --git a/Resources/Locale/en-US/loadouts/items.ftl b/Resources/Locale/en-US/loadouts/items.ftl
new file mode 100644
index 0000000000..a481901126
--- /dev/null
+++ b/Resources/Locale/en-US/loadouts/items.ftl
@@ -0,0 +1,13 @@
+loadout-description-LoadoutItemCig = Cool guys always have one.
+loadout-description-LoadoutItemCigsGreen = A pack a day keeps the doctor well-paid!
+loadout-description-LoadoutItemCigsRed = A pack a day keeps the doctor well-paid!
+loadout-description-LoadoutItemCigsBlue = A pack a day keeps the doctor well-paid!
+loadout-description-LoadoutItemCigsBlack = A pack a day keeps the doctor well-paid!
+loadout-description-LoadoutItemPAI = A little flakey on booting up, but a more loyal friend you won't find.
+loadout-description-LoadoutItemLighter = A basic lighter.
+loadout-description-LoadoutItemLighterCheap = A very basic lighter.
+loadout-description-LoadoutItemMatches = A box of matches.
+loadout-description-LoadoutItemPlushieSharkBlue = Dive into battle with your very own aquatic ally, the Blue Shark Plushie! It's more cuddly than fierce, but don't underestimate its ability to strike fear into the hearts of your enemies… or at least make them laugh as they're devoured by cuteness overload.
+loadout-description-LoadoutItemPlushieSharkPink = Unleash the power of pink with the Pink Shark Plushie! This rosy-hued predator might not have real teeth, but its sheer adorableness is enough to take a bite out of anyone's resolve. Watch as foes melt away in the face of its cottony charm.
+loadout-description-LoadoutItemPlushieSharkGrey = Introducing the Grey Shark Plushie, the apex predator of snuggles! With its sleek and understated design, this plushie strikes the perfect balance between cuddle companion and imaginary ocean guardian. Beware; opponents may be mesmerized by its dorsal fin's hypnotic sway!
+loadout-description-LoadoutItemPlushieCarp = Brace for extraterrestrial antics with the Purple Space Carp Plushie! A fishy invader from the cosmic deep, this plushie brings a splash of humor to zero-gravity escapades. From hostile waters to interstellar giggles, it's a cuddly contradiction that's out of this world
diff --git a/Resources/Locale/en-US/loadouts/jobs/cargo.ftl b/Resources/Locale/en-US/loadouts/jobs/cargo.ftl
new file mode 100644
index 0000000000..9fadc8c4db
--- /dev/null
+++ b/Resources/Locale/en-US/loadouts/jobs/cargo.ftl
@@ -0,0 +1 @@
+loadout-description-LoadoutCargoNeckGoliathCloak = For the greatest of the Salvage crew.
diff --git a/Resources/Locale/en-US/loadouts/jobs/engineering.ftl b/Resources/Locale/en-US/loadouts/jobs/engineering.ftl
new file mode 100644
index 0000000000..bf00def52e
--- /dev/null
+++ b/Resources/Locale/en-US/loadouts/jobs/engineering.ftl
@@ -0,0 +1,5 @@
+loadout-name-LoadoutEngineeringChickenSuit = eggmospheric technician suit
+loadout-description-LoadoutEngineeringChickenSuit = For the Eggmos tech who always knows where home is...
+loadout-description-LoadoutEngineeringUniformJumpskirtSenior = A skirt fit for the best of the best.
+loadout-description-LoadoutEngineeringUniformJumpsuitSenior = A suit fit for the best of the best.
+loadout-description-LoadoutEngineeringItemInflatable = A box containing inflatable walls and doors, for quickly patching up breaches.
diff --git a/Resources/Locale/en-US/loadouts/jobs/heads/captain.ftl b/Resources/Locale/en-US/loadouts/jobs/heads/captain.ftl
new file mode 100644
index 0000000000..af5b90dd8d
--- /dev/null
+++ b/Resources/Locale/en-US/loadouts/jobs/heads/captain.ftl
@@ -0,0 +1,12 @@
+loadout-description-LoadoutCommandCapNeckMantle = To show who has the authority around here.
+loadout-description-LoadoutCommandCapNeckCloak = To really show who has the authority around here.
+loadout-description-LoadoutCommandCapNeckCloakFormal = More than just to show who has the authority, it also shows who has the greatest fashion sense.
+loadout-description-LoadoutCommandCapJumpsuitFormal = The outfit is quite fancy. I am curious where the wearer could be heading to justify such a stylish look.
+loadout-description-LoadoutCommandCapJumpskirtFormal = The outfit is quite fancy. I am curious where the wearer could be heading to justify such a stylish look.
+loadout-description-LoadoutCommandCapOuterWinter = A warm coat for the cold of space.
+loadout-description-LoadoutCommandCapGloves = The gloves of the captain. They are very nice gloves.
+loadout-description-LoadoutCommandCapHat = The hat of the captain. It is a very nice hat.
+loadout-description-LoadoutCommandCapHatCapcap = The Captain's cap, pretty nice.
+loadout-description-LoadoutCommandCapHat = The Captain's beret, very nice.
+loadout-description-LoadoutCommandCapMaskGas = Why would the captain need this? I don't know, but it looks cool.
+loadout-description-LoadoutCommandCapItemDrinkFlask = The finest of flasks, for the finest of drinks.
diff --git a/Resources/Locale/en-US/loadouts/jobs/heads/chiefEngineer.ftl b/Resources/Locale/en-US/loadouts/jobs/heads/chiefEngineer.ftl
new file mode 100644
index 0000000000..3192a6be20
--- /dev/null
+++ b/Resources/Locale/en-US/loadouts/jobs/heads/chiefEngineer.ftl
@@ -0,0 +1,3 @@
+loadout-description-LoadoutCommandCENeckMantle = To show who has the authority around here. It seems over-engineered.
+loadout-description-LoadoutCommandCENeckCloak = To really show who has the authority around here. It seems over-engineered.
+loadout-description-LoadoutCommandCEOuterWinter = A warm coat for the cold of space. It seems over-engineered.
diff --git a/Resources/Locale/en-US/loadouts/jobs/heads/chiefMedicalOfficer.ftl b/Resources/Locale/en-US/loadouts/jobs/heads/chiefMedicalOfficer.ftl
new file mode 100644
index 0000000000..7a58507c8a
--- /dev/null
+++ b/Resources/Locale/en-US/loadouts/jobs/heads/chiefMedicalOfficer.ftl
@@ -0,0 +1,5 @@
+loadout-description-LoadoutCommandCMONeckMantle = To show who has the authority around here. It seems unusually clean.
+loadout-description-LoadoutCommandCMONeckCloak = To really show who has the authority around here. It seems unusually clean.
+loadout-description-LoadoutCommandCMOOuterWinter = A warm coat for the cold of space. It seems unusually clean.
+loadout-description-LoadoutCommandCMOOuterLab = A lab coat for the CMO. It seems unusually clean.
+loadout-description-LoadoutCommandCMOHatBeret = A beret for the CMO. It seems unusually clean.
diff --git a/Resources/Locale/en-US/loadouts/jobs/heads/headOfPersonnel.ftl b/Resources/Locale/en-US/loadouts/jobs/heads/headOfPersonnel.ftl
new file mode 100644
index 0000000000..8dc606f65d
--- /dev/null
+++ b/Resources/Locale/en-US/loadouts/jobs/heads/headOfPersonnel.ftl
@@ -0,0 +1,4 @@
+loadout-description-LoadoutCommandHOPNeckMantle = To show who has the authority around here.
+loadout-description-LoadoutCommandHOPNeckCloak = To really show who has the authority around here.
+loadout-description-LoadoutCommandHOPBackIan = A backpack that looks like Ian, how cute!
+loadout-description-LoadoutCommandHOPHatCap = The HOP's cap, pretty nice.
diff --git a/Resources/Locale/en-US/loadouts/jobs/heads/headOfSecurity.ftl b/Resources/Locale/en-US/loadouts/jobs/heads/headOfSecurity.ftl
new file mode 100644
index 0000000000..920de83b49
--- /dev/null
+++ b/Resources/Locale/en-US/loadouts/jobs/heads/headOfSecurity.ftl
@@ -0,0 +1,10 @@
+loadout-description-LoadoutCommandHOSNeckMantle = To really show who has the authority around here.
+loadout-description-LoadoutCommandHOSNeckCloak = To truly show who has the authority around here.
+loadout-description-LoadoutCommandHOSJumpsuitParade = A fancy uniform for a fancy officer, wonder what event they mey be attending.
+loadout-description-LoadoutCommandHOSJumpsuitFormal = The outfit is quite fancy. I am curious where the wearer could be heading to justify such a stylish look.
+loadout-description-LoadoutCommandHOSJumpskirtParade = A fancy uniform for a fancy officer, wonder what event they mey be attending.
+loadout-description-LoadoutCommandHOSJumpskirtFormal = The outfit is quite fancy. I am curious where the wearer could be heading to justify such a stylish look.
+loadout-description-LoadoutCommandHOSOuterWinter = A warm coat for the cold of space.
+loadout-description-LoadoutCommandHOSOuterTrench = A trench coat for the HOS.
+loadout-description-LoadoutCommandHOSHatBeret = A beret for the HOS.
+loadout-description-LoadoutCommandHOSHatHoshat = The HOS's hat, pretty nice.
diff --git a/Resources/Locale/en-US/loadouts/jobs/heads/quarterMaster.ftl b/Resources/Locale/en-US/loadouts/jobs/heads/quarterMaster.ftl
new file mode 100644
index 0000000000..c8b23057f1
--- /dev/null
+++ b/Resources/Locale/en-US/loadouts/jobs/heads/quarterMaster.ftl
@@ -0,0 +1,3 @@
+loadout-description-LoadoutCommandQMNeckMantle = To show who has the authority around here. It's stained with beer.
+loadout-description-LoadoutCommandQMNeckCloak = To really show who has the authority around here. It's stained with beer. It's stained with beer. It's stained with beer.
+loadout-description-LoadoutCommandQMHeadSoft = The QM's hat. It's stained with beer.
diff --git a/Resources/Locale/en-US/loadouts/jobs/heads/researchDirector.ftl b/Resources/Locale/en-US/loadouts/jobs/heads/researchDirector.ftl
new file mode 100644
index 0000000000..2a9d0e704d
--- /dev/null
+++ b/Resources/Locale/en-US/loadouts/jobs/heads/researchDirector.ftl
@@ -0,0 +1,3 @@
+loadout-description-LoadoutCommandRDNeckMantle = To show who has the authority around here.
+loadout-description-LoadoutCommandRDNeckCloak = To really show who has the authority around here.
+loadout-description-LoadoutCommandRDOuterWinter = A warm coat for the cold of space.
diff --git a/Resources/Locale/en-US/loadouts/jobs/medical.ftl b/Resources/Locale/en-US/loadouts/jobs/medical.ftl
new file mode 100644
index 0000000000..c016232cee
--- /dev/null
+++ b/Resources/Locale/en-US/loadouts/jobs/medical.ftl
@@ -0,0 +1,3 @@
+loadout-description-LoadoutMedicalUniformJumpskirtSenior = A skirt fit for the best of the best.
+loadout-description-LoadoutMedicalUniformJumpsuitSenior = A suit fit for the best of the best.
+loadout-description-LoadoutMedicalHeadBeretSeniorPhysician = A beret fit for the best of the best.
diff --git a/Resources/Locale/en-US/loadouts/jobs/science.ftl b/Resources/Locale/en-US/loadouts/jobs/science.ftl
new file mode 100644
index 0000000000..c84db91b3f
--- /dev/null
+++ b/Resources/Locale/en-US/loadouts/jobs/science.ftl
@@ -0,0 +1,3 @@
+loadout-description-LoadoutScienceUniformJumpskirtSenior = A skirt fit for the best of the best.
+loadout-description-LoadoutScienceUniformJumpsuitSenior = A suit fit for the best of the best.
+loadout-description-LoadoutScienceOuterLabcoatSeniorResearcher = A labcoat fit for the best of the best.
diff --git a/Resources/Locale/en-US/loadouts/jobs/security.ftl b/Resources/Locale/en-US/loadouts/jobs/security.ftl
new file mode 100644
index 0000000000..c3d78d7813
--- /dev/null
+++ b/Resources/Locale/en-US/loadouts/jobs/security.ftl
@@ -0,0 +1,3 @@
+loadout-description-LoadoutSecurityUniformJumpskirtSenior = A skirt fit for the best of the best.
+loadout-description-LoadoutSecurityUniformJumpsuitSenior = A suit fit for the best of the best.
+loadout-description-LoadoutSecurityShoesJackboots = A really nice, heavy, pair of black boots.
diff --git a/Resources/Locale/en-US/loadouts/jobs/service.ftl b/Resources/Locale/en-US/loadouts/jobs/service.ftl
new file mode 100644
index 0000000000..4eaa2fb7a6
--- /dev/null
+++ b/Resources/Locale/en-US/loadouts/jobs/service.ftl
@@ -0,0 +1,7 @@
+loadout-description-LoadoutServiceClownUniformJesterAlt = For the fool who knows their place.
+loadout-description-LoadoutServiceClownShoesJester = For the fool who knows their place.
+loadout-description-LoadoutServiceClownHeadJesterHatAlt = For the fool who knows their place.
+loadout-description-LoadoutServiceBotanistUniformOveralls = A rugged pair of overalls.
+loadout-description-LoadoutServiceReporterUniformJournalist = For the reporter on the case!
+loadout-description-LoadoutServiceReporterUniformDetectivesuit = Always reminds you of the one that got away...
+loadout-description-LoadoutServiceReporterUniformDetectiveskirt = Always reminds you of the one that got away...
diff --git a/Resources/Locale/en-US/loadouts/loadout-requirements.ftl b/Resources/Locale/en-US/loadouts/loadout-requirements.ftl
new file mode 100644
index 0000000000..5a453ed5cb
--- /dev/null
+++ b/Resources/Locale/en-US/loadouts/loadout-requirements.ftl
@@ -0,0 +1,13 @@
+loadout-age-requirement = You must be within {$min} and {$max} years old
+loadout-species-requirement = You must be a {$species}
+loadout-trait-requirement = You must have the trait {$trait}
+loadout-backpack-type-requirement = You must use a {$type} as your bag
+loadout-clothing-preference-requirement = You must wear a {$type}
+
+loadout-job-requirement = You must be one of these jobs: {$job}
+loadout-timer-department-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes of [color={$departmentColor}]{$department}[/color] department playtime
+loadout-timer-department-too-high = You require [color=yellow]{TOSTRING($time, "0")}[/color] fewer minutes in [color={$departmentColor}]{$department}[/color] department
+loadout-timer-overall-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes of playtime
+loadout-timer-overall-too-high = You require [color=yellow]{TOSTRING($time, "0")}[/color] fewer minutes of playtime
+loadout-timer-role-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes with [color={$departmentColor}]{$job}[/color]
+loadout-timer-role-too-high = You require[color=yellow] {TOSTRING($time, "0")}[/color] fewer minutes with [color={$departmentColor}]{$job}[/color]
diff --git a/Resources/Locale/en-US/loadouts/neck.ftl b/Resources/Locale/en-US/loadouts/neck.ftl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/Resources/Locale/en-US/loadouts/outerClothing.ftl b/Resources/Locale/en-US/loadouts/outerClothing.ftl
new file mode 100644
index 0000000000..7dc09f552e
--- /dev/null
+++ b/Resources/Locale/en-US/loadouts/outerClothing.ftl
@@ -0,0 +1,5 @@
+loadout-description-LoadoutOuterGhostSheet = Spooky...
+loadout-description-LoadoutOuterCoatBomberjacket = A sleek bomber jacket.
+loadout-description-LoadoutOuterCoatHoodieBlack = A warm hoodie.
+loadout-description-LoadoutOuterCoatHoodieGrey = A warm hoodie.
+loadout-description-LoadoutOuterCoatWinterCoat = For keeping nice and snug.
diff --git a/Resources/Locale/en-US/loadouts/shoes.ftl b/Resources/Locale/en-US/loadouts/shoes.ftl
new file mode 100644
index 0000000000..79a8dd9c43
--- /dev/null
+++ b/Resources/Locale/en-US/loadouts/shoes.ftl
@@ -0,0 +1,10 @@
+loadout-description-LoadoutShoesBlack = Step into the shadows with these sleek and stylish black shoes, perfect for ninjas or anyone looking to leave an enigmatic impression.
+loadout-description-LoadoutShoesBlue =  From zero-gravity dance floors to orbital adventures, these kicks are ready to make your journey as vibrant as the cosmos.
+loadout-description-LoadoutShoesBrown = Classic and reliable, these brown shoes are like your trusted sidekick on any adventure.
+loadout-description-LoadoutShoesGreen = Embrace the essence of nature with these green shoes. Slip them on, and let the world become your lush and vibrant playground.
+loadout-description-LoadoutShoesOrange = Gear up for high-octane thrills on the space station with these vivid orange shoes.
+loadout-description-LoadoutShoesPurple = Step into the unknown with the allure of these purple shoes. Channel the mystique of space as you stroll through the station's enigmatic sectors, leaving an air of intrigue in your wake.
+loadout-description-LoadoutShoesRed = Embrace the spirit of exploration with these bold red shoes that mirror the pioneering heart of the space station's inhabitants. These shoes are not just for walking; they're a declaration of your relentless determination.
+loadout-description-LoadoutShoesWhite = Elevate your style with these pristine white shoes, a symbol of innovation and progress.
+loadout-description-LoadoutShoesYellow = Light up the space station with these radiant yellow shoes, bringing a burst of energy to your every step.
+loadout-description-LoadoutShoesSlippersDuck = Quack up your downtime with these adorable duck slippers that waddle the line between comfort and quirkiness.
diff --git a/Resources/Locale/en-US/loadouts/uniform.ftl b/Resources/Locale/en-US/loadouts/uniform.ftl
new file mode 100644
index 0000000000..b32bd92b3a
--- /dev/null
+++ b/Resources/Locale/en-US/loadouts/uniform.ftl
@@ -0,0 +1 @@
+loadout-description-LoadoutUniformAncientJumpsuit = The legend of the Greytide.
diff --git a/Resources/Locale/en-US/lube/lube.ftl b/Resources/Locale/en-US/lube/lube.ftl
index 57af8f774a..92dd2802ec 100644
--- a/Resources/Locale/en-US/lube/lube.ftl
+++ b/Resources/Locale/en-US/lube/lube.ftl
@@ -2,3 +2,5 @@ lube-success = {THE($target)} has been covered in lube!
 lubed-name-prefix = Lubed {$target}
 lube-failure = Can't cover {THE($target)} in lube!
 lube-slip = {THE($target)} slips out of your hands!
+lube-verb-text = Apply Lube
+lube-verb-message = Lube an object
diff --git a/Resources/Locale/en-US/nyanotrasen/markings/Oni.ftl b/Resources/Locale/en-US/nyanotrasen/markings/Oni.ftl
index 7b8a14bccf..de9389d9aa 100644
--- a/Resources/Locale/en-US/nyanotrasen/markings/Oni.ftl
+++ b/Resources/Locale/en-US/nyanotrasen/markings/Oni.ftl
@@ -1,7 +1,14 @@
 marking-OniHornSingleCurved = Single Curved
-marking-OniHornSingleLeftCurved =Single Left Curved
+marking-OniHornSingleCurved-single_curved = Single Curved
+marking-OniHornSingleLeftCurved = Single Left Curved
+marking-OniHornSingleLeftCurved-single_left_curved = Single Left Curved
 marking-OniHornSingleRightCurved = Single Right Curved
+marking-OniHornSingleRightCurved-single_right_curved = Single Right Curved
 marking-OniHornDoubleCurvedOutwards = Double Curved Outwards
+marking-OniHornDoubleCurvedOutwards-double_curved_outwards = Double Curved Outwards
 marking-OniHornDoubleCurved = Double Curved
+marking-OniHornDoubleCurved-double_curved = Double Curved
 marking-OniHornDoubleLeftBrokeCurved = Double Left Broke Curved
+marking-OniHornDoubleLeftBrokeCurved-double_left_broke_curved = Double Left Broke Curved
 marking-OniHornDoubleRightBrokeCurved =  Double Right Broke Curved
+marking-OniHornDoubleRightBrokeCurved-double_right_broke_curved = Double Right Broke Curved
diff --git a/Resources/Locale/en-US/paint/paint.ftl b/Resources/Locale/en-US/paint/paint.ftl
new file mode 100644
index 0000000000..200b1f6e3f
--- /dev/null
+++ b/Resources/Locale/en-US/paint/paint.ftl
@@ -0,0 +1,8 @@
+paint-success = {THE($target)} has been covered in paint!
+paint-failure = Can't cover {THE($target)} in paint!
+paint-failure-painted = {THE($target)} is already covered in paint!
+paint-empty = {THE($used)} is empty!
+paint-removed = You clean off the paint!
+paint-closed = You must open {THE($used)}  first!
+paint-verb = Paint
+paint-remove-verb = Remove Paint
diff --git a/Resources/Locale/en-US/paper/book-authorbooks.ftl b/Resources/Locale/en-US/paper/book-authorbooks.ftl
index b1981d9e15..ae886e835a 100644
--- a/Resources/Locale/en-US/paper/book-authorbooks.ftl
+++ b/Resources/Locale/en-US/paper/book-authorbooks.ftl
@@ -253,3 +253,11 @@ book-text-inspiration = As a freelance writer, Sarah was always in search of ins
       Without a moment's hesitation, Sarah took out her pen and notebook and began to write. She wrote about the beauty of the scene, the peacefulness she felt, and the surreal quality of the moment. She wanted to capture this feeling and share it with others through her words.
       As she finished writing, Sarah heard the snap of a twig and looked up to see a man approaching her with a camera. He introduced himself as a nature photographer and asked if she had seen the waterfall. They struck up a conversation, and soon they were both laughing and sharing stories of their adventures.
       As the sun began to set, the two of them packed up their gear and said their goodbyes. Sarah felt grateful for this unexpected encounter and the inspiration it brought her. She knew that this moment would stay with her forever, and she felt a sense of serenity knowing that there was still so much beauty in the world waiting to be discovered.
+
+book-text-janitor = [bold][color=black][head=3]The Tales of a Tired Janitor[/head][/bold]
+      Cleaning a space station as a janitor is like being trapped in a cosmic custodial nightmare. You'd think floating through the vastness of space would be glamorous, but no, I'm stuck scrubbing space grime and extraterrestrial goop off the walls. It's a thankless job in a zero-gravity abyss.
+      First off, let's talk about the mess. Space dust, alien gunk, and who knows what else accumulates faster than a rocket launch. It's not just about sweeping up the crumbs; it's about battling interstellar filth that seems to have a life of its own. You'd hope for a sleek, futuristic space station, but you get a swirling vortex of space garbage waiting for you around every corner.
+      And the tools they give us! You'd expect state-of-the-art cleaning gadgets, but nope. They raided a dollar store on Earth before launching us into the cosmos. Mops that barely work in microgravity, spray bottles that run out in one use, and don't even get me started on the space janitor jumpsuit. I feel like a reject from a sci-fi B-movie.
+      Speaking of jumpsuits, the lack of respect is astronomical. The scientists and astronauts zoom past in their sleek suits, utterly oblivious to the fact that I'm the unsung hero keeping this place from turning into a cosmic trash heap. I bet they don't even know my name. "Hey, Space Janitor!" That's what I get. No appreciation for the elbow grease I put into keeping their precious station spick and span.
+      And let's remember the hazards. Cleaning up alien slime? Yeah, that's a regular Tuesday for me. One wrong move and I'm dealing with an intergalactic biohazard. It's like playing Russian roulette with space critters that could burst out of some hidden nook and cranny. I signed up to mop floors, not play host to extraterrestrial invaders.
+      Being a janitor on this so-called Space Station 14 is a cosmic joke. Where did the other 13 stations go? It's not all spacewalks and futuristic gadgets; it's scrubbing toilets and battling alien goo. If anyone thinks space is glamorous, they clearly haven't seen the mess we space janitors deal with every single day. It's time they appreciate the unsung heroes of the space station – the custodians of the cosmos.
\ No newline at end of file
diff --git a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
index b1a695dbed..b929da9655 100644
--- a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
+++ b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
@@ -3,6 +3,7 @@ humanoid-profile-editor-name-label = Name:
 humanoid-profile-editor-name-random-button = Randomize
 humanoid-profile-editor-appearance-tab = Appearance
 humanoid-profile-editor-clothing = Show clothing
+humanoid-profile-editor-loadouts = Show loadout
 humanoid-profile-editor-clothing-show = Show
 humanoid-profile-editor-sex-label = Sex:
 humanoid-profile-editor-sex-male-text = Male
@@ -49,5 +50,14 @@ humanoid-profile-editor-job-priority-medium-button = Medium
 humanoid-profile-editor-job-priority-low-button = Low
 humanoid-profile-editor-job-priority-never-button = Never
 humanoid-profile-editor-naming-rules-warning = Warning: Offensive or LRP IC names and descriptions will lead to admin intervention on this server. Read our \[Rules\] for more.
+humanoid-profile-editor-loadouts-tab = Loadout
+humanoid-profile-editor-loadouts-uncategorized-tab = Uncategorized
+humanoid-profile-editor-loadouts-no-loadouts = No loadouts found
+humanoid-profile-editor-loadouts-points-label = You have {$points}/{$max} points
+humanoid-profile-editor-loadouts-show-unusable-button = Show Unusable
+humanoid-profile-editor-loadouts-show-unusable-button-tooltip =
+    When enabled, loadouts that your current character setup cannot use will be shown highlighted in red.
+    You will still not be able to use the invalid loadouts unless your character setup changes to fit the requirements.
+    This may be useful if you like switching between multiple jobs and don't want to have to reselect your loadout every time.
 humanoid-profile-editor-markings-tab = Markings
 humanoid-profile-editor-flavortext-tab = Description
diff --git a/Resources/Locale/en-US/prototypes/catalog/cargo/cargoproduct-categories.ftl b/Resources/Locale/en-US/prototypes/catalog/cargo/cargoproduct-categories.ftl
new file mode 100644
index 0000000000..f2451527b0
--- /dev/null
+++ b/Resources/Locale/en-US/prototypes/catalog/cargo/cargoproduct-categories.ftl
@@ -0,0 +1,16 @@
+cargoproduct-category-name-armory = Armory
+cargoproduct-category-name-atmospherics = Atmospherics
+cargoproduct-category-name-cargo = Cargo
+cargoproduct-category-name-circuitboards = Circuitboards
+cargoproduct-category-name-emergency = Emergency
+cargoproduct-category-name-engineering = Engineering
+cargoproduct-category-name-food = Food
+cargoproduct-category-name-fun = Fun
+cargoproduct-category-name-hydroponics = Hydroponics
+cargoproduct-category-name-livestock = Livestock
+cargoproduct-category-name-materials = Materials
+cargoproduct-category-name-medical = Medical
+cargoproduct-category-name-science = Science
+cargoproduct-category-name-security = Security
+cargoproduct-category-name-service = Service
+cargoproduct-category-name-shuttle = Shuttle
diff --git a/Resources/Locale/en-US/reagents/meta/biological.ftl b/Resources/Locale/en-US/reagents/meta/biological.ftl
index 10a9a07e08..a320bbdcb3 100644
--- a/Resources/Locale/en-US/reagents/meta/biological.ftl
+++ b/Resources/Locale/en-US/reagents/meta/biological.ftl
@@ -24,3 +24,6 @@ reagent-desc-fat = No matter how it was obtained, its application is important.
 
 reagent-name-vomit = vomit
 reagent-desc-vomit = You can see a few chunks of someone's last meal in it.
+
+reagent-name-grey-matter = grey matter
+reagent-desc-grey-matter = Thought juice, the stuff that leaks out of your ears.
diff --git a/Resources/Locale/en-US/reagents/meta/consumable/food/food.ftl b/Resources/Locale/en-US/reagents/meta/consumable/food/food.ftl
index 85d46ff6c8..5f89fea575 100644
--- a/Resources/Locale/en-US/reagents/meta/consumable/food/food.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/food/food.ftl
@@ -10,7 +10,7 @@ reagent-desc-vitamin = Found in healthy, complete meals.
 reagent-name-protein = protein
 reagent-desc-protein = Found in certain meals, good for bodily health.
 
-reagent-name-cocoapowder = сocoa powder
+reagent-name-cocoapowder = cocoa powder
 reagent-desc-cocoapowder = From the best varieties of cocoa beans
 
 reagent-name-butter = butter
diff --git a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl
index 88ec3c4726..50ea5f590c 100644
--- a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl
+++ b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl
@@ -98,3 +98,4 @@ reagent-physical-desc-alkaline = alkaline
 reagent-physical-desc-reflective = reflective
 reagent-physical-desc-holy = holy
 reagent-physical-desc-slimy = slimy
+reagent-physical-desc-neural = neural
diff --git a/Resources/Locale/en-US/salvage/salvage-magnet.ftl b/Resources/Locale/en-US/salvage/salvage-magnet.ftl
index 1a391ea48c..7ce2a486de 100644
--- a/Resources/Locale/en-US/salvage/salvage-magnet.ftl
+++ b/Resources/Locale/en-US/salvage/salvage-magnet.ftl
@@ -64,6 +64,7 @@ salvage-map-proto-MediumShuttleWreck = Ruined Emergency Shuttle
 salvage-map-proto-MediumPetHospital = Pet and Bear Hospital
 salvage-map-proto-MediumCrashedShuttle = Crashed Shuttle
 salvage-map-proto-Meatball = Meatball
+salvage-map-proto-VeganMeatball = Vegan Meatball
 
 salvage-map-proto-StationStation = Station station
 salvage-map-proto-AsteroidBase = Asteroid Base
diff --git a/Resources/Locale/en-US/speech/speech-chatsan.ftl b/Resources/Locale/en-US/speech/speech-chatsan.ftl
index 4c8cf5db54..6ce575e648 100644
--- a/Resources/Locale/en-US/speech/speech-chatsan.ftl
+++ b/Resources/Locale/en-US/speech/speech-chatsan.ftl
@@ -114,3 +114,6 @@ chatsan-replacement-41 = what are you doing
 
 chatsan-word-42 = ofc
 chatsan-replacement-42 = of course
+
+chatsan-word-43 = ig
+chatsan-replacement-43 = i guess
diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index 500bb801c4..70eb998bb4 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -64,7 +64,10 @@ uplink-exploding-pen-name = Exploding pen
 uplink-exploding-pen-desc = A class IV explosive device contained within a standard pen. Comes with a 4 second fuse.
 
 uplink-exploding-syndicate-bomb-name = Syndicate Bomb
-uplink-exploding-syndicate-bomb-desc = A big, anchored bomb that can create a huge explosion if not defused in time. Useful as a distraction. Has an adjustable timer with a minimum setting of 120 seconds.
+uplink-exploding-syndicate-bomb-desc = A big, anchored bomb that can create a huge explosion if not defused in time. Useful as a distraction. Has an adjustable timer with a minimum setting of 180 seconds.
+
+uplink-exploding-syndicate-bomb-fake-name = Decoy Syndicate Bomb
+uplink-exploding-syndicate-bomb-fake-desc = A training bomb carefully made to look just like the real thing. In all ways similar to a syndicate bomb, but only creates a tiny explosion.
 
 uplink-cluster-grenade-name = Cluster Grenade
 uplink-cluster-grenade-desc = Three explosive grenades bundled together, the grenades get launched after the 3.5 second timer runs out.
@@ -146,7 +149,7 @@ uplink-clothing-eyes-hud-syndicate-name = Syndicate Visor
 uplink-clothing-eyes-hud-syndicate-desc = The syndicate's professional head-up display, designed for better detection of humanoids and their subsequent elimination.
 
 uplink-radio-jammer-name = Radio Jammer
-uplink-radio-jammer-desc = This device will disrupt any nearby outgoing radio communication when activated.
+uplink-radio-jammer-desc = This device will disrupt any nearby outgoing radio communication as well as suit sensors when activated.
 
 uplink-syndicate-weapon-module-name = Weapon Cyborg Module
 uplink-syndicate-weapon-module-desc = This module will give a cyborg advanced laser and machete
@@ -406,3 +409,9 @@ uplink-bribe-desc = A heartfelt gift that can help you sway someone's opinion. R
 
 uplink-hypodart-name = Hypodart
 uplink-hypodart-desc = A seemingly unremarkable dart with an enlarged reservoir for chemicals. It can store up to 7u reagents in itself, and instantly inject when it hits the target. Starts empty.
+
+uplink-barber-scissors-name = Barber Scissors
+uplink-barber-scissors-desc = A good tool to give your fellow agent a nice haircut, unless you want to give it to yourself.
+
+uplink-backpack-syndicate-name = Syndicate backpack
+uplink-backpack-syndicate-desc = Lightweight explosion-proof а backpack for holding various traitor goods
diff --git a/Resources/Locale/en-US/tiles/tiles.ftl b/Resources/Locale/en-US/tiles/tiles.ftl
index 0a1b13a6e0..e5b6810fca 100644
--- a/Resources/Locale/en-US/tiles/tiles.ftl
+++ b/Resources/Locale/en-US/tiles/tiles.ftl
@@ -122,5 +122,8 @@ tiles-hull-reinforced = exterior reinforced hull plating
 tiles-web = web tile
 tiles-chromite = chromite
 tiles-astro-grass = astro-grass
+tiles-mowed-astro-grass = mowed astro-grass
+tiles-jungle-astro-grass = jungle astro-grass
 tiles-astro-ice = astro-ice
+tiles-astro-snow = astro-snow
 tiles-wood-large = large wood
\ No newline at end of file
diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl
index c097a689dd..7a3564edf6 100644
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -29,3 +29,6 @@ trait-frontal-lisp-desc = You thpeak with a lithp
 
 trait-socialanxiety-name = Social Anxiety
 trait-socialanxiety-desc = You are anxious when you speak and stutter.
+
+trait-snoring-name = Snoring
+trait-snoring-desc = You will snore while sleeping.
diff --git a/Resources/Maps/Dungeon/haunted.yml b/Resources/Maps/Dungeon/haunted.yml
new file mode 100644
index 0000000000..d63ca74f20
--- /dev/null
+++ b/Resources/Maps/Dungeon/haunted.yml
@@ -0,0 +1,3251 @@
+meta:
+  format: 6
+  postmapinit: false
+tilemap:
+  0: Space
+  22: FloorCave
+  23: FloorCaveDrought
+  40: FloorDirt
+  66: FloorMining
+  68: FloorMiningLight
+  71: FloorOldConcreteMono
+  72: FloorOldConcreteSmooth
+  82: FloorShuttleOrange
+  118: FloorWood
+  121: Plating
+  124: PlatingDamaged
+entities:
+- proto: ""
+  entities:
+  - uid: 1653
+    components:
+    - type: MetaData
+    - type: Transform
+    - type: Map
+    - type: PhysicsMap
+    - type: Broadphase
+    - type: OccluderTree
+    - chunks:
+        -1,-1:
+          ind: -1,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAA
+          version: 6
+        0,0:
+          ind: 0,0
+          tiles: FgAAAAAEFgAAAAAEFgAAAAAFFgAAAAAFFgAAAAAGFgAAAAAAFgAAAAAFFgAAAAAEFgAAAAADFgAAAAAAFgAAAAAFFgAAAAAAFgAAAAADFgAAAAAAFgAAAAACFgAAAAAFFgAAAAACFgAAAAAGFgAAAAADFgAAAAAAFgAAAAADFgAAAAAAFgAAAAAEFgAAAAABFgAAAAAEFgAAAAAGFgAAAAACFgAAAAACFgAAAAABFgAAAAAEFgAAAAAEFgAAAAAGFgAAAAAFFgAAAAAEFgAAAAACFgAAAAAFFgAAAAAAFgAAAAAFFgAAAAAAFgAAAAADFgAAAAACFgAAAAAGFgAAAAACFgAAAAAAFgAAAAAAFgAAAAAGFgAAAAAFFgAAAAADFgAAAAAEFgAAAAABFgAAAAACFgAAAAABFgAAAAAAFgAAAAAFFgAAAAAEFgAAAAAAFgAAAAAEFgAAAAADFgAAAAAGFgAAAAAEFgAAAAABFgAAAAAEFgAAAAACFgAAAAAGFgAAAAAFFgAAAAAAFgAAAAABFgAAAAAFFgAAAAADFgAAAAADFgAAAAAFFgAAAAAFFgAAAAABFgAAAAAFFgAAAAACFgAAAAAAFgAAAAAAFgAAAAAFFgAAAAADFgAAAAACUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFgAAAAADFgAAAAABFgAAAAABFgAAAAACFgAAAAABFgAAAAAGFgAAAAAAFgAAAAAGFwAAAAAAFwAAAAAAFgAAAAACUgAAAAAAFgAAAAAAFgAAAAAEFgAAAAAEFgAAAAACFwAAAAAAFwAAAAAAFgAAAAAAFgAAAAABFgAAAAADFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFgAAAAADUgAAAAAAFgAAAAACFgAAAAAFFgAAAAACFwAAAAAAFgAAAAAGFgAAAAADFwAAAAAAFwAAAAAAFgAAAAAEFgAAAAAAFgAAAAACFgAAAAADFwAAAAAAFgAAAAAAFgAAAAAFUgAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFgAAAAABFgAAAAABFwAAAAAAFwAAAAAAFwAAAAAAFgAAAAAFFgAAAAAAFgAAAAADFgAAAAAFFwAAAAAAFwAAAAAAUgAAAAAAFgAAAAADFgAAAAAGFgAAAAAGFwAAAAAAFgAAAAAAFgAAAAAGFgAAAAAFFgAAAAAEFgAAAAADFgAAAAAEFgAAAAAAFgAAAAAAFgAAAAABFgAAAAAEFgAAAAAEUgAAAAAAFgAAAAABFgAAAAADFgAAAAACFgAAAAAGUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFgAAAAAEFgAAAAAEFgAAAAABFgAAAAAEFwAAAAABFwAAAAABFwAAAAAEUgAAAAAAFgAAAAAFFgAAAAABFgAAAAAFFgAAAAADFgAAAAADFgAAAAAEFgAAAAADUgAAAAAAFgAAAAACFgAAAAAEFgAAAAAFFgAAAAABFgAAAAAGFgAAAAAFFwAAAAAEUgAAAAAAFgAAAAAGFgAAAAAGFwAAAAAGFwAAAAADFgAAAAAAFgAAAAADFgAAAAAEUgAAAAAAFgAAAAAGFwAAAAACFgAAAAACFgAAAAABFgAAAAABFgAAAAADFgAAAAAAUgAAAAAAFwAAAAACFgAAAAABFwAAAAAHFgAAAAACFgAAAAAEFwAAAAAEFgAAAAADUgAAAAAAFwAAAAACFgAAAAAGFgAAAAAGFgAAAAABFgAAAAAAFgAAAAAEFwAAAAAEUgAAAAAAFgAAAAABFwAAAAAFFwAAAAAFFgAAAAACFgAAAAABFwAAAAAHFwAAAAAEUgAAAAAA
+          version: 6
+        0,1:
+          ind: 0,1
+          tiles: FwAAAAACFgAAAAAFFgAAAAACFgAAAAAEFgAAAAAEFgAAAAAGFgAAAAAAUgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAGFgAAAAADFgAAAAAGFgAAAAADUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFgAAAAAEFgAAAAAFFgAAAAAFFgAAAAAFFgAAAAABUgAAAAAAFgAAAAAAFgAAAAAGFgAAAAAFFwAAAAAAFgAAAAAEUgAAAAAAFgAAAAADFgAAAAAGFgAAAAAAFgAAAAAFFgAAAAAEFwAAAAABFwAAAAAGFgAAAAAFFgAAAAAEUgAAAAAAFgAAAAACFwAAAAAFFwAAAAADFwAAAAADFgAAAAAFUgAAAAAAFwAAAAACFwAAAAADFwAAAAAEFwAAAAAFFgAAAAAEFwAAAAAGFwAAAAAHFwAAAAADFwAAAAAGUgAAAAAAFwAAAAAHFwAAAAACFgAAAAADFwAAAAADFgAAAAABUgAAAAAAFgAAAAABFgAAAAAGFgAAAAAEFgAAAAAGFgAAAAAFFgAAAAAAFwAAAAACFgAAAAAGFgAAAAABUgAAAAAAFgAAAAAGFwAAAAAGFwAAAAABFwAAAAAAFgAAAAACUgAAAAAAFwAAAAAAFgAAAAAGFwAAAAADFwAAAAAHFgAAAAADFgAAAAAGFgAAAAAFFgAAAAABFgAAAAAGUgAAAAAAFgAAAAAAFgAAAAABFgAAAAAFFgAAAAAGFwAAAAADUgAAAAAAFgAAAAACFgAAAAAAFgAAAAADFgAAAAAEUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFgAAAAAGFgAAAAABFgAAAAAFUgAAAAAAFwAAAAAEFgAAAAAAFgAAAAAFUgAAAAAAFwAAAAABFgAAAAAAFgAAAAADUgAAAAAAFgAAAAADFwAAAAAFFgAAAAAGUgAAAAAAFgAAAAAAFgAAAAAGFgAAAAAFUgAAAAAAFgAAAAADFgAAAAAGFgAAAAAGUgAAAAAAFgAAAAAGFgAAAAAAFgAAAAAAUgAAAAAAFwAAAAAAFwAAAAADFwAAAAAHUgAAAAAAFgAAAAABFgAAAAABFgAAAAACUgAAAAAAFgAAAAAFFgAAAAADFgAAAAAGUgAAAAAAFgAAAAAAFgAAAAAEFgAAAAAGUgAAAAAAFwAAAAABFwAAAAAFFgAAAAAGUgAAAAAAFgAAAAAGFgAAAAAAFwAAAAAEUgAAAAAAFgAAAAAAFgAAAAAFFgAAAAACUgAAAAAAFgAAAAADFgAAAAAFFgAAAAAEUgAAAAAAFwAAAAACFwAAAAAHFgAAAAADUgAAAAAAFgAAAAACFgAAAAADFgAAAAAGUgAAAAAAFgAAAAADFgAAAAADFgAAAAAAUgAAAAAAFgAAAAACFgAAAAAAFwAAAAABUgAAAAAAFwAAAAAAFgAAAAABFgAAAAABUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFgAAAAABFgAAAAABFgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAEFgAAAAABFgAAAAADFgAAAAABFgAAAAAGFgAAAAAEFgAAAAADFgAAAAADUgAAAAAAFgAAAAADFgAAAAAFFgAAAAACFgAAAAACFgAAAAAEFgAAAAAGFgAAAAABFgAAAAAFFgAAAAACFgAAAAAGFgAAAAAAFgAAAAADFgAAAAAFFgAAAAAAFgAAAAAFUgAAAAAAFgAAAAADFgAAAAAA
+          version: 6
+        0,-1:
+          ind: 0,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAA
+          version: 6
+        -1,0:
+          ind: -1,0
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAA
+          version: 6
+        -1,1:
+          ind: -1,1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAA
+          version: 6
+        1,-1:
+          ind: 1,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAA
+          version: 6
+        1,0:
+          ind: 1,0
+          tiles: FgAAAAACUgAAAAAAFgAAAAACFgAAAAACFgAAAAABFgAAAAADFgAAAAACKAAAAAAAKAAAAAAAKAAAAAAAFgAAAAAGFgAAAAABFgAAAAAEFgAAAAAAFgAAAAAFFgAAAAABFgAAAAAGUgAAAAAAFgAAAAAGFgAAAAAAFgAAAAAFFgAAAAAGFgAAAAABFgAAAAADKAAAAAAAFgAAAAADFgAAAAAEFgAAAAAAFgAAAAAFFgAAAAABFgAAAAAAKAAAAAAAFgAAAAAEUgAAAAAAKAAAAAAAKAAAAAAAFgAAAAAAFgAAAAADKAAAAAAAFgAAAAADFgAAAAACFgAAAAAFKAAAAAAAKAAAAAAAKAAAAAAAFgAAAAAGKAAAAAAAKAAAAAAAFgAAAAACUgAAAAAAKAAAAAAAKAAAAAAAFgAAAAAGFgAAAAACFgAAAAAFFgAAAAACFgAAAAAEFgAAAAAGFgAAAAABFgAAAAADFgAAAAAGFgAAAAADFgAAAAABKAAAAAAAFgAAAAAGUgAAAAAAKAAAAAAAFgAAAAAEFgAAAAAFFgAAAAAFFgAAAAAAFgAAAAADFgAAAAAGFgAAAAABFgAAAAAGFgAAAAACFgAAAAACFgAAAAAAFgAAAAABKAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFgAAAAADFgAAAAAAFgAAAAAEFgAAAAADUgAAAAAAFgAAAAACFgAAAAAFFgAAAAAAFgAAAAAGFgAAAAAEFgAAAAADFgAAAAABFgAAAAAEFwAAAAAAFgAAAAADFwAAAAAAFwAAAAAAFgAAAAAGFgAAAAADFgAAAAAGUgAAAAAAFgAAAAAGFgAAAAAAFgAAAAAGFgAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFgAAAAAAFgAAAAACFgAAAAADFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAUgAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFgAAAAADFgAAAAAFFgAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFgAAAAAGFwAAAAAAFwAAAAAAFgAAAAAGFgAAAAAGFgAAAAACUgAAAAAAFgAAAAAFFgAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFgAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFgAAAAAAFgAAAAABFgAAAAAFFgAAAAABUgAAAAAAFgAAAAAEFgAAAAABFgAAAAAFFgAAAAAEFgAAAAADFgAAAAAGFgAAAAAEFwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFgAAAAADFgAAAAAGFgAAAAAGFgAAAAAGFgAAAAADFgAAAAAEFgAAAAACUgAAAAAAFgAAAAABFgAAAAAAFgAAAAABFgAAAAAFFgAAAAABFgAAAAABFgAAAAACUgAAAAAAFgAAAAACFwAAAAAAFwAAAAACFwAAAAAEFwAAAAACFgAAAAACFgAAAAAFUgAAAAAAFgAAAAACFgAAAAAEFgAAAAAGFgAAAAADFgAAAAAGFgAAAAABFgAAAAACUgAAAAAAFgAAAAAGFgAAAAAFFwAAAAAHFwAAAAADFwAAAAAAFwAAAAACFgAAAAAAUgAAAAAAFgAAAAABFgAAAAAFFgAAAAABFgAAAAADFgAAAAAFFgAAAAAFFgAAAAAGUgAAAAAAFgAAAAADFgAAAAABFwAAAAAHFwAAAAAAFwAAAAAEFgAAAAADFgAAAAAGUgAAAAAAFgAAAAAAFgAAAAABFgAAAAACFgAAAAAAFgAAAAAFFgAAAAADFgAAAAADUgAAAAAA
+          version: 6
+        1,1:
+          ind: 1,1
+          tiles: FgAAAAAAFgAAAAAAFgAAAAAFFgAAAAADFgAAAAAEFgAAAAAEFgAAAAAGUgAAAAAAFgAAAAABFgAAAAABFgAAAAAAFgAAAAABFgAAAAACFgAAAAAFFgAAAAADUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFgAAAAAAUgAAAAAAFgAAAAADFgAAAAAAFgAAAAABFgAAAAAGFgAAAAADUgAAAAAAFgAAAAAAFgAAAAAAFgAAAAACFgAAAAAAFgAAAAAFUgAAAAAAFgAAAAABFgAAAAACFgAAAAAGUgAAAAAAFgAAAAAGFgAAAAAGFgAAAAAGFgAAAAADFgAAAAAGUgAAAAAAFgAAAAADFwAAAAADFwAAAAABFgAAAAACFgAAAAAFUgAAAAAAFgAAAAAEdgAAAAADFgAAAAAFUgAAAAAAFgAAAAABFgAAAAAFFgAAAAAGFgAAAAABFgAAAAABUgAAAAAAFgAAAAAGFwAAAAAEFwAAAAACFwAAAAAHFgAAAAACUgAAAAAAFgAAAAACdgAAAAABFwAAAAADUgAAAAAAFgAAAAAGFgAAAAAAFgAAAAACFgAAAAAFFgAAAAADUgAAAAAAFgAAAAACFgAAAAACFwAAAAAHFwAAAAAAFgAAAAABUgAAAAAAFgAAAAAAdgAAAAACFgAAAAAGUgAAAAAAFgAAAAAGFgAAAAADFgAAAAAAFgAAAAAFFgAAAAAAUgAAAAAAFgAAAAACFgAAAAAFFgAAAAABFgAAAAADFgAAAAAAUgAAAAAAFgAAAAAEFgAAAAAGUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFwAAAAAEFwAAAAAFFwAAAAAGUgAAAAAAFgAAAAAGFwAAAAAFFgAAAAACUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFwAAAAADFgAAAAACFgAAAAAEUgAAAAAAFgAAAAAGFgAAAAABFgAAAAAFUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFwAAAAACFwAAAAAGFwAAAAAAUgAAAAAAFgAAAAAGFgAAAAAFFgAAAAAEUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFgAAAAABFgAAAAAGFwAAAAADUgAAAAAAFwAAAAACFgAAAAAEFgAAAAACUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFwAAAAAAFwAAAAAEFwAAAAABUgAAAAAAFgAAAAAGFgAAAAAFFwAAAAAHUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFgAAAAAGFgAAAAACFgAAAAAFFgAAAAAFFgAAAAADFgAAAAACFgAAAAAGFgAAAAAFFwAAAAAGFwAAAAAFFwAAAAAAUgAAAAAAFgAAAAAAFwAAAAADFwAAAAADFwAAAAADFwAAAAAEFgAAAAAEFwAAAAAHFwAAAAAGFgAAAAADFgAAAAACFgAAAAADFwAAAAAEFwAAAAABFwAAAAABFwAAAAAHUgAAAAAAFgAAAAAAFgAAAAAFFgAAAAADFgAAAAAE
+          version: 6
+        -1,2:
+          ind: -1,2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAA
+          version: 6
+        -1,3:
+          ind: -1,3
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        0,2:
+          ind: 0,2
+          tiles: FgAAAAAAFgAAAAACFgAAAAAEFgAAAAADFgAAAAACFgAAAAAGFgAAAAAFFgAAAAACFgAAAAAFFgAAAAACFgAAAAAEFgAAAAAFFgAAAAABUgAAAAAAFgAAAAAFFgAAAAABUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFgAAAAADFgAAAAACFgAAAAAEFwAAAAAAFgAAAAACFgAAAAAAFgAAAAAEFgAAAAADFgAAAAAGFgAAAAAGFwAAAAAEUgAAAAAAFgAAAAAEFgAAAAADFgAAAAAAFgAAAAADFwAAAAAFFwAAAAACFgAAAAAFFgAAAAACFgAAAAAFFgAAAAAFFgAAAAAEFwAAAAAAFgAAAAAGFgAAAAAAFgAAAAACUgAAAAAAFgAAAAABFgAAAAAFFgAAAAAGFgAAAAAAFgAAAAAGFgAAAAAFFgAAAAACFgAAAAAEFwAAAAAHFgAAAAAGFgAAAAAFFgAAAAAFFgAAAAAGFgAAAAAAFgAAAAACUgAAAAAAFgAAAAAEFgAAAAAAFgAAAAABFgAAAAAFUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFgAAAAAGFgAAAAABFgAAAAAGFgAAAAADFgAAAAABFgAAAAAAFgAAAAAEUgAAAAAAFgAAAAADFgAAAAABFgAAAAAFFgAAAAAAFgAAAAAEFgAAAAADFgAAAAAFUgAAAAAAFgAAAAAEFgAAAAACFgAAAAABFgAAAAADFgAAAAAEFgAAAAACFgAAAAABUgAAAAAAFgAAAAAEFgAAAAAAFgAAAAAGFgAAAAABFgAAAAAAFgAAAAAEFgAAAAAGUgAAAAAAFgAAAAAEFgAAAAAGFgAAAAABFgAAAAABFgAAAAADFgAAAAACFgAAAAAEUgAAAAAAFgAAAAAAFgAAAAADFgAAAAADFgAAAAADFgAAAAAAFgAAAAADFgAAAAAEUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFgAAAAACFgAAAAABFgAAAAAFFgAAAAABFgAAAAABFgAAAAAAFgAAAAAEUgAAAAAAFgAAAAAEFgAAAAAFFgAAAAACFgAAAAAEFgAAAAADFgAAAAAAFgAAAAAGUgAAAAAAFgAAAAAAFgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAFgAAAAAFFgAAAAAGUgAAAAAAFgAAAAADFgAAAAABQgAAAAAAFgAAAAAEfAAAAAAAFgAAAAACFgAAAAAAUgAAAAAAFgAAAAAAQgAAAAAAQgAAAAAARAAAAAAAQgAAAAAAQgAAAAAAFgAAAAAEUgAAAAAAFgAAAAAAQgAAAAAAfAAAAAABRAAAAAAAeQAAAAAAFgAAAAAAFgAAAAABUgAAAAAAFgAAAAAFQgAAAAAAQgAAAAAARAAAAAAAQgAAAAAAQgAAAAAAFgAAAAAAUgAAAAAAFgAAAAAFQgAAAAAARAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAFgAAAAACUgAAAAAAFgAAAAABQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAFgAAAAAGUgAAAAAAFgAAAAAFQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAFgAAAAABUgAAAAAAFgAAAAABFgAAAAACQgAAAAAAQgAAAAAAQgAAAAAAFgAAAAAGFgAAAAAEUgAAAAAAFgAAAAAEFgAAAAACQgAAAAAAQgAAAAAAQgAAAAAAFgAAAAABFgAAAAABUgAAAAAA
+          version: 6
+        0,3:
+          ind: 0,3
+          tiles: FgAAAAADFgAAAAAGFgAAAAAGFgAAAAAFFgAAAAAGFgAAAAAFFgAAAAAFUgAAAAAAFgAAAAADFgAAAAACFgAAAAAFFgAAAAAGFgAAAAAEFgAAAAAAFgAAAAAFUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        1,2:
+          ind: 1,2
+          tiles: FgAAAAACFgAAAAAFFgAAAAADFgAAAAAEFgAAAAACFwAAAAACFwAAAAADFwAAAAAAFwAAAAAGFwAAAAAHFwAAAAAEUgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFgAAAAAFFgAAAAACFgAAAAAEFgAAAAAAFgAAAAAAFgAAAAADFgAAAAABUgAAAAAAFgAAAAAEFgAAAAAGFgAAAAAAFgAAAAAGFgAAAAAFFgAAAAABFgAAAAAFFgAAAAACFgAAAAAEFgAAAAACFgAAAAABFgAAAAAEFgAAAAAEFgAAAAAFFgAAAAAGUgAAAAAAFgAAAAABFgAAAAACFgAAAAAFFgAAAAAGFgAAAAAGFgAAAAAGFgAAAAADFgAAAAAAFgAAAAAGFgAAAAAEFgAAAAADFgAAAAAFFgAAAAAAFgAAAAAFFgAAAAAEUgAAAAAAFgAAAAAEFgAAAAABFgAAAAAEFgAAAAAEFgAAAAAAFgAAAAAGFgAAAAAGFgAAAAABUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFgAAAAACFgAAAAACFgAAAAAAFgAAAAADFgAAAAAEFgAAAAAEFgAAAAAFUgAAAAAAFgAAAAABFgAAAAAEFgAAAAABFgAAAAAAFgAAAAAFFgAAAAACFgAAAAAAUgAAAAAAFgAAAAAGFgAAAAAEFgAAAAAEFgAAAAAGFgAAAAAEFgAAAAACFgAAAAAEUgAAAAAAFgAAAAAAFgAAAAACFgAAAAAGFgAAAAAAFgAAAAAGFgAAAAACFgAAAAADUgAAAAAAFgAAAAAGFgAAAAAFFgAAAAABFgAAAAAAFgAAAAAAFgAAAAAAFgAAAAACUgAAAAAAFgAAAAAEFgAAAAAFFgAAAAABFgAAAAAAFgAAAAAFFgAAAAACFgAAAAAEUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFgAAAAAEFgAAAAAFFgAAAAABFgAAAAABFgAAAAAAFgAAAAAFFgAAAAAGUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAAAAFFgAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAFgAAAAAFFgAAAAACUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAAAAEQgAAAAAAQgAAAAAARAAAAAAAQgAAAAAAQgAAAAAAFgAAAAAFUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAAAAEQgAAAAAAQgAAAAAARAAAAAAAQgAAAAAAQgAAAAAAFgAAAAAEUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAAAABQgAAAAAAQgAAAAAARAAAAAAAQgAAAAAAQgAAAAAAFgAAAAAEUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAAAABFgAAAAAEQgAAAAAAQgAAAAAAQgAAAAAAFgAAAAAFFgAAAAADUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        1,3:
+          ind: 1,3
+          tiles: FgAAAAAEFgAAAAACFgAAAAAFFgAAAAAGFgAAAAACFgAAAAACFgAAAAAFUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        2,0:
+          ind: 2,0
+          tiles: FgAAAAABFgAAAAABFgAAAAACUgAAAAAAFwAAAAAAFgAAAAAFFgAAAAAFFgAAAAADFgAAAAAEFgAAAAACFgAAAAAAFgAAAAAEFgAAAAAGFgAAAAADFgAAAAADFgAAAAAGFgAAAAAGFgAAAAAFKAAAAAAAUgAAAAAAFwAAAAAAFwAAAAAAFgAAAAAFFgAAAAACFgAAAAABFgAAAAACFgAAAAAGFgAAAAAGFgAAAAAGFgAAAAAAFgAAAAABFgAAAAACFgAAAAAGFgAAAAAEKAAAAAAAUgAAAAAAFwAAAAAAFwAAAAAAFgAAAAAAFgAAAAAFFgAAAAAAFgAAAAAAFgAAAAAEFgAAAAAGFgAAAAAAFgAAAAACFgAAAAAAFgAAAAAGKAAAAAAAKAAAAAAAKAAAAAAAUgAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFgAAAAACFgAAAAAFFgAAAAAAFgAAAAACFgAAAAABFgAAAAAAFgAAAAADFgAAAAAGKAAAAAAAKAAAAAAAFgAAAAAFUgAAAAAAFgAAAAADFgAAAAADFwAAAAAAFgAAAAABFgAAAAADFgAAAAACFgAAAAAEFgAAAAADFgAAAAADFgAAAAAFFgAAAAABFgAAAAAFUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFwAAAAAAFgAAAAAEFgAAAAAEUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFgAAAAAFFgAAAAABFgAAAAAGUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAGUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFgAAAAAFFgAAAAAFFgAAAAAEFgAAAAADFgAAAAAEFgAAAAAAFgAAAAAFUgAAAAAAFgAAAAAGFgAAAAACFgAAAAAAFgAAAAAFFgAAAAADFgAAAAAFFgAAAAAGUgAAAAAAFgAAAAABRwAAAAADRwAAAAABSAAAAAAARwAAAAADFgAAAAAFFgAAAAAFUgAAAAAAFgAAAAACFgAAAAAEFgAAAAADFgAAAAAGFgAAAAAFFgAAAAABFgAAAAAAUgAAAAAAFgAAAAABFgAAAAACSAAAAAACSAAAAAADRwAAAAADSAAAAAAAFgAAAAADUgAAAAAAFgAAAAADFgAAAAADFgAAAAADFgAAAAAFFgAAAAABFgAAAAAEFgAAAAAAUgAAAAAAFgAAAAAGRwAAAAABSAAAAAACSAAAAAAASAAAAAACRwAAAAADFgAAAAAGUgAAAAAAFgAAAAAGFgAAAAAEFgAAAAAFFgAAAAACFgAAAAAEFgAAAAACFgAAAAAGUgAAAAAA
+          version: 6
+        3,0:
+          ind: 3,0
+          tiles: FgAAAAADFgAAAAACFgAAAAAEFgAAAAAEFgAAAAADFwAAAAAAFgAAAAAEUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAAAAGFgAAAAAEFgAAAAAGFgAAAAADFgAAAAAFFgAAAAADFwAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAAAABFgAAAAAAFgAAAAABFgAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAAAAAFgAAAAADFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAAAAGFgAAAAABFgAAAAAGFgAAAAAAFgAAAAAFFgAAAAADFgAAAAADUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        2,-1:
+          ind: 2,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAA
+          version: 6
+        3,-1:
+          ind: 3,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        3,1:
+          ind: 3,1
+          tiles: UgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        3,2:
+          ind: 3,2
+          tiles: UgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        2,2:
+          ind: 2,2
+          tiles: FgAAAAAAFgAAAAAFFgAAAAAAFgAAAAADFgAAAAAFFgAAAAAGFwAAAAACFwAAAAABFgAAAAAFUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFgAAAAAEFgAAAAAGFgAAAAACUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFgAAAAAFFgAAAAAEFgAAAAAEUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFgAAAAAEFgAAAAABFgAAAAADUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFgAAAAAAFgAAAAABFgAAAAAGFgAAAAAFFgAAAAACFgAAAAACFgAAAAAEUgAAAAAAFgAAAAAAFgAAAAAGFgAAAAAAFgAAAAADFgAAAAACFgAAAAAEFgAAAAAGUgAAAAAAFgAAAAABFgAAAAACFgAAAAAEFgAAAAACFgAAAAABFgAAAAAAFgAAAAAFUgAAAAAAFgAAAAACFgAAAAADFgAAAAAGFgAAAAADFgAAAAACFgAAAAAFFgAAAAAEUgAAAAAAFgAAAAAEFgAAAAABFgAAAAAEFgAAAAACFgAAAAACFgAAAAABFgAAAAAGUgAAAAAAFgAAAAAEFgAAAAABFgAAAAACFgAAAAADFgAAAAABFgAAAAABFgAAAAAEUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        2,1:
+          ind: 2,1
+          tiles: FgAAAAAAFgAAAAAGFgAAAAAEFgAAAAACFgAAAAAGFgAAAAAEFgAAAAADUgAAAAAAFgAAAAACFgAAAAAEFgAAAAAAFgAAAAAGFgAAAAADFgAAAAADFgAAAAAEUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFgAAAAADFgAAAAAFFgAAAAACUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAdgAAAAAAdgAAAAABFgAAAAACUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAdgAAAAADdgAAAAABFgAAAAACUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAdgAAAAAAdgAAAAAAFgAAAAAEUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFgAAAAADFgAAAAAAFgAAAAAGUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFwAAAAAFFwAAAAAHFwAAAAAGFwAAAAABFwAAAAAFFgAAAAAFFgAAAAAEFgAAAAAEFgAAAAADUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAFwAAAAADFwAAAAABFwAAAAAGFgAAAAAAFgAAAAACFgAAAAAEFgAAAAACFgAAAAABFwAAAAAHUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAA
+          version: 6
+      type: MapGrid
+    - gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+      type: Gravity
+    - chunkCollection:
+        version: 2
+        nodes:
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt1
+          decals:
+            1342: 6.955441,21.068565
+            1405: 5.569477,24.342073
+            1409: 21.493462,30.781818
+            1423: 16.244232,47.723083
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt2
+          decals:
+            1408: 21.571587,25.092073
+            1411: 38.670036,30.328693
+            1412: 32.59149,34.61899
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt3
+          decals:
+            1404: 2.0071354,12.534689
+            1413: 28.294615,35.52524
+            1419: 1.8725519,39.603367
+            1428: 40.1997,39.904606
+            1429: 37.775063,38.35773
+            1430: 27.454536,18.497276
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt4
+          decals:
+            1407: 14.05264,26.857698
+            1420: 8.417587,42.316833
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt5
+          decals:
+            1347: 7.0134563,30.499578
+            1403: 8.765746,13.144064
+            1414: 24.413132,39.478367
+            1421: 13.773578,47.660583
+            1426: 12.267979,34.57054
+            1427: 44.902824,38.38898
+            1431: 24.313911,21.591026
+            1432: 21.396156,20.325401
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt6
+          decals:
+            1341: 0.908566,19.95919
+            1415: 20.816694,39.134617
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt7
+          decals:
+            1339: 10,18
+            1416: 12.790198,39.33774
+            1422: 21.884857,42.17621
+            1433: 18.589165,18.387901
+            1434: 34.005077,18.028526
+            1435: 4.6335278,15.488716
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt8
+          decals:
+            1340: 7.1637583,18.068565
+            1417: 8.813416,38.415867
+            1424: 0.46817493,47.80121
+            1425: 8.544811,34.586166
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt9
+          decals:
+            1343: 13.433517,19.162315
+            1406: 0.6944771,26.826448
+            1410: 30.17049,31.359943
+            1418: 5.810052,38.259617
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtLight
+          decals:
+            301: 9,45
+            306: 13,42
+            308: 10,42
+            311: 13,45
+            578: 10,32
+        - node:
+            color: '#FFFFFFFF'
+            id: Rock06
+          decals:
+            1344: 2.1520143,30.343328
+        - node:
+            color: '#FFFFFFFF'
+            id: Rock07
+          decals:
+            1345: 10.29961,31.483953
+        - node:
+            color: '#DE3A3A96'
+            id: rune6
+          decals:
+            1402: 8.952158,26.184813
+        - node:
+            color: '#79150031'
+            id: splatter
+          decals:
+            1348: 10.903494,45.563152
+            1349: 10.950369,45.969402
+            1350: 11.184744,45.906902
+            1351: 11.590994,45.422527
+            1352: 11.590994,45.422527
+            1353: 10.965994,45.610027
+            1354: 10.997244,44.969402
+            1355: 11.231619,45.047527
+            1356: 11.356619,45.344402
+            1357: 10.825369,45.656902
+            1358: 11.184744,45.922527
+            1359: 11.231619,45.891277
+            1360: 10.512869,45.563152
+            1361: 11.684744,44.078777
+            1362: 11.747244,43.797527
+            1363: 12.044119,43.328777
+            1364: 11.778494,43.281902
+            1365: 11.887869,43.688152
+            1366: 12.200369,43.735027
+            1367: 12.137869,44.141277
+            1368: 11.669119,43.656902
+            1369: 10.637869,43.781902
+            1370: 10.544119,43.781902
+            1371: 10.669119,43.453777
+            1372: 10.590994,43.485027
+            1373: 11.419119,45.797527
+            1374: 11.825369,45.813152
+            1375: 11.950369,46.219402
+            1376: 11.200369,45.672527
+            1377: 11.247244,45.922527
+            1378: 10.590994,46.125652
+            1379: 11.481619,45.422527
+            1380: 11.684744,45.672527
+            1381: 11.512869,45.141277
+            1382: 11.825369,45.281902
+            1383: 11.684744,45.438152
+            1384: 10.950369,45.735027
+            1385: 10.262869,45.797527
+            1386: 10.028494,44.891277
+            1387: 9.903494,44.891277
+            1388: 9.887869,45.500652
+            1389: 10.153494,45.344402
+            1390: 10.809744,45.391277
+            1391: 10.934744,45.422527
+            1392: 11.262869,45.531902
+            1393: 11.184744,46.031902
+            1394: 10.872244,45.813152
+            1395: 11.090994,45.563152
+            1396: 10.731619,46.031902
+            1397: 10.075369,44.000652
+            1398: 9.856619,43.703777
+            1399: 10.059744,44.281902
+            1400: 10.419119,43.813152
+        - node:
+            cleanable: True
+            color: '#79150031'
+            id: splatter
+          decals:
+            1444: 35.155014,12.447503
+            1445: 34.811264,12.353753
+            1446: 34.85814,12.744378
+            1447: 35.342514,12.463128
+            1448: 35.155014,12.228753
+            1449: 34.42064,12.572503
+            1450: 34.123764,13.025628
+            1451: 34.17064,13.322503
+            1452: 34.342514,12.900628
+            1453: 33.85814,12.994378
+            1454: 33.79564,13.338128
+            1455: 33.63939,13.838128
+            1456: 33.70189,13.603753
+            1457: 33.311264,13.900628
+            1458: 33.717514,14.306878
+            1459: 34.10814,14.650628
+            1460: 33.936264,15.135003
+            1461: 34.405014,14.947503
+            1462: 33.79564,14.510003
+            1463: 33.70189,14.088128
+            1464: 34.29564,14.541253
+            1465: 34.623764,15.010003
+            1466: 35.26439,15.072503
+            1467: 35.405014,14.931878
+            1468: 34.623764,15.338128
+            1469: 35.592514,14.994378
+            1470: 35.79564,14.447503
+            1471: 36.13939,15.025628
+            1472: 36.436264,14.181878
+            1473: 36.592514,13.869378
+            1474: 35.780014,14.697503
+            1475: 36.467514,14.072503
+            1476: 35.748764,14.588128
+            1477: 36.07689,13.963128
+            1478: 36.092514,13.291253
+            1479: 35.57689,13.103753
+            1480: 35.70189,13.088128
+            1481: 35.38939,12.478753
+            1482: 35.92064,13.260003
+            1483: 36.061264,13.666253
+            1484: 36.217514,12.822503
+            1485: 35.48314,12.650628
+            1486: 35.98314,12.353753
+            1487: 34.842514,12.744378
+            1488: 34.23314,12.853753
+            1489: 34.04564,13.447503
+            1490: 33.51439,13.650628
+        - node:
+            cleanable: True
+            color: '#DE3A3A28'
+            id: splatter
+          decals:
+            1436: 34.151947,12.931878
+            1437: 33.542572,13.775628
+            1438: 34.089447,14.588128
+            1439: 34.886322,15.025628
+            1440: 35.714447,14.681878
+            1441: 36.214447,14.119378
+            1442: 35.933197,13.228753
+            1443: 35.026947,12.447503
+      type: DecalGrid
+    - type: RadiationGridResistance
+    - type: LoadedMap
+    - type: SpreaderGrid
+    - type: GridTree
+    - type: MovedGrids
+    - type: GridPathfinding
+- proto: AirCanister
+  entities:
+  - uid: 302
+    components:
+    - pos: 20.5,38.5
+      parent: 1653
+      type: Transform
+- proto: AirlockMining
+  entities:
+  - uid: 149
+    components:
+    - pos: 11.5,43.5
+      parent: 1653
+      type: Transform
+- proto: AirlockMiningGlassLocked
+  entities:
+  - uid: 492
+    components:
+    - pos: 19.5,43.5
+      parent: 1653
+      type: Transform
+- proto: AirlockMiningLocked
+  entities:
+  - uid: 454
+    components:
+    - pos: 3.5,43.5
+      parent: 1653
+      type: Transform
+- proto: AltarFangs
+  entities:
+  - uid: 12
+    components:
+    - pos: 35.5,14.5
+      parent: 1653
+      type: Transform
+- proto: BananiumOre1
+  entities:
+  - uid: 147
+    components:
+    - pos: 25.454952,10.460608
+      parent: 1653
+      type: Transform
+  - uid: 436
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 435
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
+- proto: Barricade
+  entities:
+  - uid: 61
+    components:
+    - pos: 14.5,12.5
+      parent: 1653
+      type: Transform
+  - uid: 304
+    components:
+    - pos: 6.5,18.5
+      parent: 1653
+      type: Transform
+  - uid: 369
+    components:
+    - pos: 51.5,0.5
+      parent: 1653
+      type: Transform
+- proto: BikeHorn
+  entities:
+  - uid: 201
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 200
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
+- proto: Bucket
+  entities:
+  - uid: 220
+    components:
+    - pos: 28.080187,14.004396
+      parent: 1653
+      type: Transform
+- proto: CandleRedSmallInfinite
+  entities:
+  - uid: 121
+    components:
+    - pos: 10.514658,25.137938
+      parent: 1653
+      type: Transform
+  - uid: 123
+    components:
+    - pos: 10.655283,25.247313
+      parent: 1653
+      type: Transform
+  - uid: 126
+    components:
+    - rot: -6.283185307179586 rad
+      pos: 9.436043,27.291958
+      parent: 1653
+      type: Transform
+  - uid: 181
+    components:
+    - pos: 9.83762,26.231688
+      parent: 1653
+      type: Transform
+  - uid: 182
+    components:
+    - pos: 9.009495,26.278563
+      parent: 1653
+      type: Transform
+  - uid: 211
+    components:
+    - pos: 10.467783,25.325438
+      parent: 1653
+      type: Transform
+  - uid: 212
+    components:
+    - rot: -6.283185307179586 rad
+      pos: 9.976189,27.010708
+      parent: 1653
+      type: Transform
+  - uid: 213
+    components:
+    - pos: 8.86887,27.028563
+      parent: 1653
+      type: Transform
+- proto: Chainsaw
+  entities:
+  - uid: 396
+    components:
+    - pos: 12.278494,46.219402
+      parent: 1653
+      type: Transform
+- proto: Chair
+  entities:
+  - uid: 399
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 19.5,34.5
+      parent: 1653
+      type: Transform
+- proto: ChairPilotSeat
+  entities:
+  - uid: 8
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 2.5,44.5
+      parent: 1653
+      type: Transform
+  - uid: 466
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 4.5,44.5
+      parent: 1653
+      type: Transform
+- proto: ChairRitual
+  entities:
+  - uid: 127
+    components:
+    - pos: 9.5,28.5
+      parent: 1653
+      type: Transform
+- proto: CigaretteCapsaicinOil
+  entities:
+  - uid: 322
+    components:
+    - pos: 31.649122,18.823664
+      parent: 1653
+      type: Transform
+- proto: CigaretteSyndicate
+  entities:
+  - uid: 439
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 438
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
+- proto: ClothingBackpackDuffelCargo
+  entities:
+  - uid: 288
+    components:
+    - pos: 17.527935,7.630492
+      parent: 1653
+      type: Transform
+- proto: ClothingHeadHatFlowerCrown
+  entities:
+  - uid: 233
+    components:
+    - pos: 27.441708,39.437607
+      parent: 1653
+      type: Transform
+- proto: ClothingHeadHatGladiator
+  entities:
+  - uid: 7
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 6
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
+- proto: ClothingNeckCloakTrans
+  entities:
+  - uid: 332
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 331
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
+- proto: ClothingOuterHardsuitSalvage
+  entities:
+  - uid: 432
+    components:
+    - pos: 4.447749,45.58406
+      parent: 1653
+      type: Transform
+- proto: ClothingShoesClown
+  entities:
+  - uid: 202
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 200
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
+- proto: ClothingUniformJumpsuitGladiator
+  entities:
+  - uid: 215
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 214
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
+- proto: ClothingUniformJumpsuitMonasticRobeDark
+  entities:
+  - uid: 40
+    components:
+    - pos: 36.46349,13.791253
+      parent: 1653
+      type: Transform
+  - uid: 99
+    components:
+    - pos: 36.27599,15.338128
+      parent: 1653
+      type: Transform
+  - uid: 216
+    components:
+    - pos: 35.46349,15.619378
+      parent: 1653
+      type: Transform
+  - uid: 272
+    components:
+    - pos: 34.05724,14.385003
+      parent: 1653
+      type: Transform
+  - uid: 273
+    components:
+    - pos: 34.58849,15.213128
+      parent: 1653
+      type: Transform
+  - uid: 357
+    components:
+    - pos: 35.58849,13.213128
+      parent: 1653
+      type: Transform
+  - uid: 358
+    components:
+    - pos: 34.697865,13.588128
+      parent: 1653
+      type: Transform
+  - uid: 443
+    components:
+    - pos: 36.80724,14.744378
+      parent: 1653
+      type: Transform
+- proto: Cobweb1
+  entities:
+  - uid: 190
+    components:
+    - pos: 24.5,10.5
+      parent: 1653
+      type: Transform
+  - uid: 289
+    components:
+    - pos: 0.5,10.5
+      parent: 1653
+      type: Transform
+  - uid: 290
+    components:
+    - pos: 32.5,16.5
+      parent: 1653
+      type: Transform
+  - uid: 384
+    components:
+    - pos: 0.5,36.5
+      parent: 1653
+      type: Transform
+  - uid: 385
+    components:
+    - pos: 28.5,32.5
+      parent: 1653
+      type: Transform
+  - uid: 393
+    components:
+    - pos: 12.5,22.5
+      parent: 1653
+      type: Transform
+  - uid: 418
+    components:
+    - pos: 0.5,40.5
+      parent: 1653
+      type: Transform
+  - uid: 458
+    components:
+    - pos: 2.5,46.5
+      parent: 1653
+      type: Transform
+- proto: Cobweb2
+  entities:
+  - uid: 137
+    components:
+    - pos: 33.5,9.5
+      parent: 1653
+      type: Transform
+  - uid: 252
+    components:
+    - pos: 26.5,32.5
+      parent: 1653
+      type: Transform
+  - uid: 291
+    components:
+    - pos: 34.5,3.5
+      parent: 1653
+      type: Transform
+  - uid: 314
+    components:
+    - pos: 22.5,10.5
+      parent: 1653
+      type: Transform
+  - uid: 341
+    components:
+    - pos: 20.5,46.5
+      parent: 1653
+      type: Transform
+  - uid: 382
+    components:
+    - pos: 14.5,40.5
+      parent: 1653
+      type: Transform
+  - uid: 383
+    components:
+    - pos: 32.5,20.5
+      parent: 1653
+      type: Transform
+  - uid: 417
+    components:
+    - pos: 24.5,2.5
+      parent: 1653
+      type: Transform
+- proto: ComfyChair
+  entities:
+  - uid: 381
+    components:
+    - pos: 13.5,27.5
+      parent: 1653
+      type: Transform
+- proto: ConveyorBelt
+  entities:
+  - uid: 101
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 27.5,10.5
+      parent: 1653
+      type: Transform
+  - uid: 102
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 28.5,10.5
+      parent: 1653
+      type: Transform
+  - uid: 103
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 25.5,10.5
+      parent: 1653
+      type: Transform
+  - uid: 104
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 29.5,10.5
+      parent: 1653
+      type: Transform
+  - uid: 105
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 30.5,10.5
+      parent: 1653
+      type: Transform
+  - uid: 106
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 26.5,10.5
+      parent: 1653
+      type: Transform
+- proto: CrateCoffin
+  entities:
+  - uid: 331
+    components:
+    - pos: 16.5,32.5
+      parent: 1653
+      type: Transform
+    - containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 332
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+      type: ContainerContainer
+  - uid: 435
+    components:
+    - pos: 22.5,32.5
+      parent: 1653
+      type: Transform
+    - containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 436
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+      type: ContainerContainer
+  - uid: 438
+    components:
+    - pos: 23.5,32.5
+      parent: 1653
+      type: Transform
+    - containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 439
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+      type: ContainerContainer
+  - uid: 441
+    components:
+    - pos: 20.5,30.5
+      parent: 1653
+      type: Transform
+    - containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 442
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+      type: ContainerContainer
+- proto: CrateEmergencyRadiation
+  entities:
+  - uid: 364
+    components:
+    - pos: 15.5,36.5
+      parent: 1653
+      type: Transform
+- proto: CrateEmptySpawner
+  entities:
+  - uid: 128
+    components:
+    - pos: 4.5,40.5
+      parent: 1653
+      type: Transform
+- proto: CrateFilledSpawner
+  entities:
+  - uid: 111
+    components:
+    - pos: 8.5,2.5
+      parent: 1653
+      type: Transform
+  - uid: 367
+    components:
+    - pos: 18.5,46.5
+      parent: 1653
+      type: Transform
+  - uid: 411
+    components:
+    - pos: 13.5,36.5
+      parent: 1653
+      type: Transform
+  - uid: 490
+    components:
+    - pos: 28.5,8.5
+      parent: 1653
+      type: Transform
+- proto: CrateNPCPenguin
+  entities:
+  - uid: 474
+    components:
+    - pos: 13.5,25.5
+      parent: 1653
+      type: Transform
+- proto: CrateWoodenGrave
+  entities:
+  - uid: 6
+    components:
+    - pos: 27.5,39.5
+      parent: 1653
+      type: Transform
+    - containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 7
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+      type: ContainerContainer
+  - uid: 200
+    components:
+    - pos: 42.5,39.5
+      parent: 1653
+      type: Transform
+    - containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 202
+          - 201
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+      type: ContainerContainer
+  - uid: 214
+    components:
+    - pos: 28.5,39.5
+      parent: 1653
+      type: Transform
+    - containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 215
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+      type: ContainerContainer
+  - uid: 231
+    components:
+    - pos: 26.5,39.5
+      parent: 1653
+      type: Transform
+    - containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 232
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+      type: ContainerContainer
+- proto: CrystalSpawner
+  entities:
+  - uid: 129
+    components:
+    - pos: 27.5,35.5
+      parent: 1653
+      type: Transform
+  - uid: 131
+    components:
+    - pos: 29.5,34.5
+      parent: 1653
+      type: Transform
+  - uid: 132
+    components:
+    - pos: 30.5,35.5
+      parent: 1653
+      type: Transform
+  - uid: 172
+    components:
+    - pos: 19.5,21.5
+      parent: 1653
+      type: Transform
+  - uid: 178
+    components:
+    - pos: 20.5,20.5
+      parent: 1653
+      type: Transform
+  - uid: 298
+    components:
+    - pos: 13.5,38.5
+      parent: 1653
+      type: Transform
+  - uid: 300
+    components:
+    - pos: 9.5,40.5
+      parent: 1653
+      type: Transform
+  - uid: 301
+    components:
+    - pos: 30.5,36.5
+      parent: 1653
+      type: Transform
+  - uid: 308
+    components:
+    - pos: 31.5,36.5
+      parent: 1653
+      type: Transform
+- proto: DoubleEmergencyNitrogenTankFilled
+  entities:
+  - uid: 309
+    components:
+    - pos: 21.254128,38.485172
+      parent: 1653
+      type: Transform
+- proto: DresserFilled
+  entities:
+  - uid: 413
+    components:
+    - pos: 20.5,44.5
+      parent: 1653
+      type: Transform
+- proto: FenceMetalCorner
+  entities:
+  - uid: 321
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 20.5,35.5
+      parent: 1653
+      type: Transform
+  - uid: 477
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 14.5,35.5
+      parent: 1653
+      type: Transform
+- proto: FenceMetalGate
+  entities:
+  - uid: 268
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 17.5,35.5
+      parent: 1653
+      type: Transform
+- proto: FenceMetalStraight
+  entities:
+  - uid: 267
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 19.5,35.5
+      parent: 1653
+      type: Transform
+  - uid: 293
+    components:
+    - pos: 14.5,36.5
+      parent: 1653
+      type: Transform
+  - uid: 476
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 15.5,35.5
+      parent: 1653
+      type: Transform
+  - uid: 478
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 16.5,35.5
+      parent: 1653
+      type: Transform
+  - uid: 479
+    components:
+    - pos: 20.5,34.5
+      parent: 1653
+      type: Transform
+  - uid: 480
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 18.5,35.5
+      parent: 1653
+      type: Transform
+- proto: FlashlightLantern
+  entities:
+  - uid: 372
+    components:
+    - pos: 16.286905,3.5055985
+      parent: 1653
+      type: Transform
+- proto: FloorChasmEntity
+  entities:
+  - uid: 3
+    components:
+    - pos: 5.5,0.5
+      parent: 1653
+      type: Transform
+  - uid: 4
+    components:
+    - pos: 6.5,4.5
+      parent: 1653
+      type: Transform
+  - uid: 5
+    components:
+    - pos: 6.5,3.5
+      parent: 1653
+      type: Transform
+  - uid: 17
+    components:
+    - pos: 9.5,4.5
+      parent: 1653
+      type: Transform
+  - uid: 18
+    components:
+    - pos: 4.5,4.5
+      parent: 1653
+      type: Transform
+  - uid: 19
+    components:
+    - pos: 41.5,1.5
+      parent: 1653
+      type: Transform
+  - uid: 20
+    components:
+    - pos: 44.5,1.5
+      parent: 1653
+      type: Transform
+  - uid: 21
+    components:
+    - pos: 45.5,1.5
+      parent: 1653
+      type: Transform
+  - uid: 22
+    components:
+    - pos: 44.5,0.5
+      parent: 1653
+      type: Transform
+  - uid: 23
+    components:
+    - pos: 45.5,0.5
+      parent: 1653
+      type: Transform
+  - uid: 24
+    components:
+    - pos: 47.5,0.5
+      parent: 1653
+      type: Transform
+  - uid: 25
+    components:
+    - pos: 48.5,0.5
+      parent: 1653
+      type: Transform
+  - uid: 76
+    components:
+    - pos: 15.5,4.5
+      parent: 1653
+      type: Transform
+  - uid: 77
+    components:
+    - pos: 14.5,0.5
+      parent: 1653
+      type: Transform
+  - uid: 78
+    components:
+    - pos: 14.5,1.5
+      parent: 1653
+      type: Transform
+  - uid: 82
+    components:
+    - pos: 12.5,1.5
+      parent: 1653
+      type: Transform
+  - uid: 83
+    components:
+    - pos: 13.5,4.5
+      parent: 1653
+      type: Transform
+  - uid: 84
+    components:
+    - pos: 12.5,0.5
+      parent: 1653
+      type: Transform
+  - uid: 85
+    components:
+    - pos: 13.5,0.5
+      parent: 1653
+      type: Transform
+  - uid: 86
+    components:
+    - pos: 13.5,1.5
+      parent: 1653
+      type: Transform
+  - uid: 87
+    components:
+    - pos: 46.5,1.5
+      parent: 1653
+      type: Transform
+  - uid: 88
+    components:
+    - pos: 46.5,0.5
+      parent: 1653
+      type: Transform
+  - uid: 97
+    components:
+    - pos: 14.5,4.5
+      parent: 1653
+      type: Transform
+  - uid: 112
+    components:
+    - pos: 7.5,0.5
+      parent: 1653
+      type: Transform
+  - uid: 114
+    components:
+    - pos: 10.5,0.5
+      parent: 1653
+      type: Transform
+  - uid: 115
+    components:
+    - pos: 10.5,1.5
+      parent: 1653
+      type: Transform
+  - uid: 116
+    components:
+    - pos: 11.5,4.5
+      parent: 1653
+      type: Transform
+  - uid: 118
+    components:
+    - pos: 11.5,3.5
+      parent: 1653
+      type: Transform
+  - uid: 119
+    components:
+    - pos: 11.5,0.5
+      parent: 1653
+      type: Transform
+  - uid: 120
+    components:
+    - pos: 11.5,1.5
+      parent: 1653
+      type: Transform
+  - uid: 235
+    components:
+    - pos: 49.5,0.5
+      parent: 1653
+      type: Transform
+  - uid: 241
+    components:
+    - pos: 3.5,4.5
+      parent: 1653
+      type: Transform
+  - uid: 242
+    components:
+    - pos: 2.5,0.5
+      parent: 1653
+      type: Transform
+  - uid: 245
+    components:
+    - pos: 10.5,3.5
+      parent: 1653
+      type: Transform
+  - uid: 250
+    components:
+    - pos: 4.5,3.5
+      parent: 1653
+      type: Transform
+  - uid: 258
+    components:
+    - pos: 3.5,0.5
+      parent: 1653
+      type: Transform
+  - uid: 278
+    components:
+    - pos: 40.5,2.5
+      parent: 1653
+      type: Transform
+  - uid: 315
+    components:
+    - pos: 1.5,4.5
+      parent: 1653
+      type: Transform
+  - uid: 317
+    components:
+    - pos: 5.5,3.5
+      parent: 1653
+      type: Transform
+  - uid: 337
+    components:
+    - pos: 4.5,0.5
+      parent: 1653
+      type: Transform
+  - uid: 340
+    components:
+    - pos: 42.5,2.5
+      parent: 1653
+      type: Transform
+  - uid: 350
+    components:
+    - pos: 42.5,1.5
+      parent: 1653
+      type: Transform
+  - uid: 354
+    components:
+    - pos: 12.5,3.5
+      parent: 1653
+      type: Transform
+  - uid: 359
+    components:
+    - pos: 15.5,1.5
+      parent: 1653
+      type: Transform
+  - uid: 360
+    components:
+    - pos: 15.5,0.5
+      parent: 1653
+      type: Transform
+  - uid: 363
+    components:
+    - pos: 12.5,4.5
+      parent: 1653
+      type: Transform
+  - uid: 368
+    components:
+    - pos: 43.5,2.5
+      parent: 1653
+      type: Transform
+  - uid: 377
+    components:
+    - pos: 7.5,4.5
+      parent: 1653
+      type: Transform
+  - uid: 378
+    components:
+    - pos: 6.5,1.5
+      parent: 1653
+      type: Transform
+  - uid: 387
+    components:
+    - pos: 43.5,1.5
+      parent: 1653
+      type: Transform
+  - uid: 398
+    components:
+    - pos: 41.5,2.5
+      parent: 1653
+      type: Transform
+  - uid: 401
+    components:
+    - pos: 5.5,1.5
+      parent: 1653
+      type: Transform
+  - uid: 404
+    components:
+    - pos: 5.5,4.5
+      parent: 1653
+      type: Transform
+  - uid: 452
+    components:
+    - pos: 2.5,4.5
+      parent: 1653
+      type: Transform
+  - uid: 453
+    components:
+    - pos: 1.5,0.5
+      parent: 1653
+      type: Transform
+  - uid: 459
+    components:
+    - pos: 44.5,2.5
+      parent: 1653
+      type: Transform
+  - uid: 468
+    components:
+    - pos: 3.5,3.5
+      parent: 1653
+      type: Transform
+  - uid: 471
+    components:
+    - pos: 6.5,0.5
+      parent: 1653
+      type: Transform
+  - uid: 472
+    components:
+    - pos: 10.5,4.5
+      parent: 1653
+      type: Transform
+  - uid: 473
+    components:
+    - pos: 9.5,0.5
+      parent: 1653
+      type: Transform
+- proto: FloorWaterEntity
+  entities:
+  - uid: 13
+    components:
+    - pos: 27.5,14.5
+      parent: 1653
+      type: Transform
+  - uid: 14
+    components:
+    - pos: 29.5,14.5
+      parent: 1653
+      type: Transform
+  - uid: 15
+    components:
+    - pos: 28.5,15.5
+      parent: 1653
+      type: Transform
+  - uid: 43
+    components:
+    - pos: 26.5,16.5
+      parent: 1653
+      type: Transform
+  - uid: 45
+    components:
+    - pos: 30.5,13.5
+      parent: 1653
+      type: Transform
+  - uid: 46
+    components:
+    - pos: 29.5,13.5
+      parent: 1653
+      type: Transform
+  - uid: 47
+    components:
+    - pos: 28.5,12.5
+      parent: 1653
+      type: Transform
+  - uid: 49
+    components:
+    - pos: 27.5,16.5
+      parent: 1653
+      type: Transform
+  - uid: 65
+    components:
+    - pos: 29.5,12.5
+      parent: 1653
+      type: Transform
+  - uid: 72
+    components:
+    - pos: 25.5,13.5
+      parent: 1653
+      type: Transform
+  - uid: 93
+    components:
+    - pos: 24.5,15.5
+      parent: 1653
+      type: Transform
+  - uid: 100
+    components:
+    - pos: 27.5,12.5
+      parent: 1653
+      type: Transform
+  - uid: 221
+    components:
+    - pos: 26.5,13.5
+      parent: 1653
+      type: Transform
+  - uid: 222
+    components:
+    - pos: 26.5,14.5
+      parent: 1653
+      type: Transform
+  - uid: 223
+    components:
+    - pos: 26.5,15.5
+      parent: 1653
+      type: Transform
+  - uid: 224
+    components:
+    - pos: 27.5,13.5
+      parent: 1653
+      type: Transform
+  - uid: 444
+    components:
+    - pos: 28.5,14.5
+      parent: 1653
+      type: Transform
+  - uid: 445
+    components:
+    - pos: 27.5,15.5
+      parent: 1653
+      type: Transform
+  - uid: 446
+    components:
+    - pos: 28.5,13.5
+      parent: 1653
+      type: Transform
+  - uid: 447
+    components:
+    - pos: 25.5,15.5
+      parent: 1653
+      type: Transform
+  - uid: 448
+    components:
+    - pos: 25.5,14.5
+      parent: 1653
+      type: Transform
+- proto: FloraRockSolid01
+  entities:
+  - uid: 63
+    components:
+    - pos: 1.4643247,15.527116
+      parent: 1653
+      type: Transform
+  - uid: 230
+    components:
+    - pos: 25.553497,34.710487
+      parent: 1653
+      type: Transform
+  - uid: 281
+    components:
+    - pos: 7.4866443,6.552367
+      parent: 1653
+      type: Transform
+  - uid: 295
+    components:
+    - pos: 0.911531,32.452705
+      parent: 1653
+      type: Transform
+  - uid: 303
+    components:
+    - pos: 21.638557,19.381065
+      parent: 1653
+      type: Transform
+  - uid: 374
+    components:
+    - pos: 3.5664039,19.498943
+      parent: 1653
+      type: Transform
+- proto: FloraRockSolid02
+  entities:
+  - uid: 64
+    components:
+    - pos: 11.966135,14.804356
+      parent: 1653
+      type: Transform
+  - uid: 171
+    components:
+    - pos: 8.535091,20.608318
+      parent: 1653
+      type: Transform
+  - uid: 306
+    components:
+    - pos: 12.087021,32.358955
+      parent: 1653
+      type: Transform
+- proto: FloraRockSolid03
+  entities:
+  - uid: 90
+    components:
+    - pos: 23.53006,1.5159609
+      parent: 1653
+      type: Transform
+  - uid: 170
+    components:
+    - pos: 1.9101539,21.811443
+      parent: 1653
+      type: Transform
+  - uid: 199
+    components:
+    - pos: 44.689724,39.621048
+      parent: 1653
+      type: Transform
+  - uid: 243
+    components:
+    - pos: 21.468937,26.614876
+      parent: 1653
+      type: Transform
+  - uid: 296
+    components:
+    - pos: 9.355139,30.733953
+      parent: 1653
+      type: Transform
+  - uid: 330
+    components:
+    - pos: 35.552525,31.574036
+      parent: 1653
+      type: Transform
+  - uid: 361
+    components:
+    - pos: 5.433075,13.527116
+      parent: 1653
+      type: Transform
+  - uid: 375
+    components:
+    - pos: 1.5647693,8.536742
+      parent: 1653
+      type: Transform
+- proto: FoodBoxDonkpocketPizza
+  entities:
+  - uid: 209
+    components:
+    - pos: 0.9877088,26.184813
+      parent: 1653
+      type: Transform
+- proto: FoodCornTrash
+  entities:
+  - uid: 2
+    components:
+    - pos: 26.81556,20.415936
+      parent: 1653
+      type: Transform
+  - uid: 109
+    components:
+    - pos: 27.367641,20.311768
+      parent: 1653
+      type: Transform
+  - uid: 113
+    components:
+    - pos: 27.388475,19.988852
+      parent: 1653
+      type: Transform
+  - uid: 249
+    components:
+    - pos: 27.638475,20.843018
+      parent: 1653
+      type: Transform
+  - uid: 254
+    components:
+    - pos: 28.055141,20.301352
+      parent: 1653
+      type: Transform
+  - uid: 319
+    components:
+    - pos: 27.482225,20.530518
+      parent: 1653
+      type: Transform
+  - uid: 391
+    components:
+    - pos: 26.930141,20.728436
+      parent: 1653
+      type: Transform
+  - uid: 475
+    components:
+    - pos: 27.84681,20.634686
+      parent: 1653
+      type: Transform
+- proto: FoodMeatHuman
+  entities:
+  - uid: 186
+    components:
+    - pos: 34.42388,40.652298
+      parent: 1653
+      type: Transform
+  - uid: 187
+    components:
+    - pos: 34.64263,40.511673
+      parent: 1653
+      type: Transform
+- proto: FoodMeatLizardtailKebab
+  entities:
+  - uid: 42
+    components:
+    - pos: 38.036457,12.588582
+      parent: 1653
+      type: Transform
+- proto: FoodMeatRouny
+  entities:
+  - uid: 183
+    components:
+    - pos: 36.45513,40.589798
+      parent: 1653
+      type: Transform
+- proto: FoodSnackPopcorn
+  entities:
+  - uid: 74
+    components:
+    - pos: 25.648891,21.040936
+      parent: 1653
+      type: Transform
+  - uid: 79
+    components:
+    - pos: 25.763475,21.645102
+      parent: 1653
+      type: Transform
+  - uid: 81
+    components:
+    - pos: 25.461391,21.207602
+      parent: 1653
+      type: Transform
+  - uid: 117
+    components:
+    - pos: 25.857225,21.207602
+      parent: 1653
+      type: Transform
+  - uid: 240
+    components:
+    - pos: 25.97181,21.030518
+      parent: 1653
+      type: Transform
+- proto: FoodTinPeachesMaintOpen
+  entities:
+  - uid: 208
+    components:
+    - pos: 2.343669,28.087896
+      parent: 1653
+      type: Transform
+- proto: GeigerCounter
+  entities:
+  - uid: 228
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 2.536777,44.354866
+      parent: 1653
+      type: Transform
+- proto: Girder
+  entities:
+  - uid: 351
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 13.5,45.5
+      parent: 1653
+      type: Transform
+- proto: GlowstickRed
+  entities:
+  - uid: 256
+    components:
+    - pos: 12.648991,38.39441
+      parent: 1653
+      type: Transform
+  - uid: 264
+    components:
+    - pos: 22.50236,34.545544
+      parent: 1653
+      type: Transform
+  - uid: 271
+    components:
+    - pos: 4.5084944,44.49994
+      parent: 1653
+      type: Transform
+  - uid: 294
+    components:
+    - pos: 10.820133,30.586414
+      parent: 1653
+      type: Transform
+  - uid: 316
+    components:
+    - pos: 26.3416,18.72954
+      parent: 1653
+      type: Transform
+  - uid: 414
+    components:
+    - pos: 1.8548665,32.055164
+      parent: 1653
+      type: Transform
+  - uid: 420
+    components:
+    - pos: 22.799234,34.62367
+      parent: 1653
+      type: Transform
+  - uid: 421
+    components:
+    - pos: 22.299234,34.608044
+      parent: 1653
+      type: Transform
+- proto: GoldOre1
+  entities:
+  - uid: 134
+    components:
+    - pos: 8.948225,24.854458
+      parent: 1653
+      type: Transform
+  - uid: 138
+    components:
+    - pos: 26.486202,10.538733
+      parent: 1653
+      type: Transform
+  - uid: 139
+    components:
+    - pos: 26.486202,10.538733
+      parent: 1653
+      type: Transform
+  - uid: 144
+    components:
+    - pos: 26.486202,10.538733
+      parent: 1653
+      type: Transform
+  - uid: 145
+    components:
+    - pos: 26.486202,10.538733
+      parent: 1653
+      type: Transform
+  - uid: 191
+    components:
+    - pos: 26.486202,10.538733
+      parent: 1653
+      type: Transform
+  - uid: 266
+    components:
+    - pos: 9.448225,25.291958
+      parent: 1653
+      type: Transform
+  - uid: 328
+    components:
+    - pos: 8.541975,25.885708
+      parent: 1653
+      type: Transform
+  - uid: 379
+    components:
+    - pos: 10.026349,24.557583
+      parent: 1653
+      type: Transform
+- proto: hydroponicsSoil
+  entities:
+  - uid: 1
+    components:
+    - pos: 25.5,20.5
+      parent: 1653
+      type: Transform
+  - uid: 390
+    components:
+    - pos: 27.5,21.5
+      parent: 1653
+      type: Transform
+  - uid: 423
+    components:
+    - pos: 25.5,19.5
+      parent: 1653
+      type: Transform
+- proto: ImprovisedExplosiveFuel
+  entities:
+  - uid: 203
+    components:
+    - pos: 36.443645,31.673359
+      parent: 1653
+      type: Transform
+- proto: IngotGold1
+  entities:
+  - uid: 312
+    components:
+    - pos: 10.073225,25.588833
+      parent: 1653
+      type: Transform
+  - uid: 313
+    components:
+    - pos: 10.4951,24.791958
+      parent: 1653
+      type: Transform
+  - uid: 426
+    components:
+    - pos: 8.385725,25.104458
+      parent: 1653
+      type: Transform
+  - uid: 449
+    components:
+    - pos: 10.698225,26.120083
+      parent: 1653
+      type: Transform
+  - uid: 460
+    components:
+    - pos: 9.120099,24.323208
+      parent: 1653
+      type: Transform
+- proto: IngotSilver
+  entities:
+  - uid: 262
+    components:
+    - pos: 20.52197,46.638992
+      parent: 1653
+      type: Transform
+- proto: KitchenElectricGrill
+  entities:
+  - uid: 205
+    components:
+    - pos: 35.5,40.5
+      parent: 1653
+      type: Transform
+- proto: KitchenMicrowave
+  entities:
+  - uid: 244
+    components:
+    - pos: 26.5,21.5
+      parent: 1653
+      type: Transform
+- proto: KukriKnife
+  entities:
+  - uid: 130
+    components:
+    - pos: 2.508058,45.496773
+      parent: 1653
+      type: Transform
+- proto: LampGold
+  entities:
+  - uid: 380
+    components:
+    - pos: 13.291822,27.041958
+      parent: 1653
+      type: Transform
+- proto: Lantern
+  entities:
+  - uid: 28
+    components:
+    - pos: 24.446167,4.4534607
+      parent: 1653
+      type: Transform
+  - uid: 29
+    components:
+    - pos: 33.45849,0.51596093
+      parent: 1653
+      type: Transform
+  - uid: 89
+    components:
+    - pos: 18.58248,0.51596093
+      parent: 1653
+      type: Transform
+  - uid: 180
+    components:
+    - pos: 20.497932,21.77169
+      parent: 1653
+      type: Transform
+- proto: MaintenancePlantSpawner
+  entities:
+  - uid: 67
+    components:
+    - pos: 21.5,16.5
+      parent: 1653
+      type: Transform
+  - uid: 70
+    components:
+    - pos: 17.5,15.5
+      parent: 1653
+      type: Transform
+  - uid: 73
+    components:
+    - pos: 21.5,14.5
+      parent: 1653
+      type: Transform
+  - uid: 217
+    components:
+    - pos: 22.5,12.5
+      parent: 1653
+      type: Transform
+  - uid: 218
+    components:
+    - pos: 16.5,13.5
+      parent: 1653
+      type: Transform
+- proto: MaintenanceToolSpawner
+  entities:
+  - uid: 57
+    components:
+    - pos: 39.5,0.5
+      parent: 1653
+      type: Transform
+  - uid: 96
+    components:
+    - pos: 51.5,1.5
+      parent: 1653
+      type: Transform
+  - uid: 416
+    components:
+    - pos: 7.5,32.5
+      parent: 1653
+      type: Transform
+- proto: MaintenanceWeaponSpawner
+  entities:
+  - uid: 31
+    components:
+    - pos: 22.5,0.5
+      parent: 1653
+      type: Transform
+  - uid: 32
+    components:
+    - pos: 1.5,3.5
+      parent: 1653
+      type: Transform
+  - uid: 51
+    components:
+    - pos: 52.5,0.5
+      parent: 1653
+      type: Transform
+  - uid: 292
+    components:
+    - pos: 34.5,31.5
+      parent: 1653
+      type: Transform
+- proto: MaterialWoodPlank
+  entities:
+  - uid: 442
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 441
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
+- proto: MedkitOxygenFilled
+  entities:
+  - uid: 225
+    components:
+    - pos: 17.973127,40.40886
+      parent: 1653
+      type: Transform
+- proto: MiningWindow
+  entities:
+  - uid: 155
+    components:
+    - pos: 19.5,47.5
+      parent: 1653
+      type: Transform
+  - uid: 162
+    components:
+    - pos: 3.5,47.5
+      parent: 1653
+      type: Transform
+  - uid: 248
+    components:
+    - pos: 11.5,47.5
+      parent: 1653
+      type: Transform
+- proto: OreBox
+  entities:
+  - uid: 184
+    components:
+    - pos: 2.5,24.5
+      parent: 1653
+      type: Transform
+  - uid: 270
+    components:
+    - pos: 37.5,4.5
+      parent: 1653
+      type: Transform
+  - uid: 283
+    components:
+    - pos: 17.5,8.5
+      parent: 1653
+      type: Transform
+  - uid: 488
+    components:
+    - pos: 29.5,8.5
+      parent: 1653
+      type: Transform
+- proto: OreProcessor
+  entities:
+  - uid: 269
+    components:
+    - pos: 24.5,10.5
+      parent: 1653
+      type: Transform
+  - uid: 320
+    components:
+    - pos: 3.5,46.5
+      parent: 1653
+      type: Transform
+- proto: OrganHumanAppendix
+  entities:
+  - uid: 148
+    components:
+    - pos: 10.481619,44.360027
+      parent: 1653
+      type: Transform
+- proto: OrganHumanHeart
+  entities:
+  - uid: 206
+    components:
+    - pos: 9.478245,26.669188
+      parent: 1653
+      type: Transform
+- proto: PaintingSadClown
+  entities:
+  - uid: 122
+    components:
+    - pos: 43.5,39.5
+      parent: 1653
+      type: Transform
+- proto: PaintingSkeletonCigarette
+  entities:
+  - uid: 362
+    components:
+    - pos: 32.5,21.5
+      parent: 1653
+      type: Transform
+- proto: Pickaxe
+  entities:
+  - uid: 158
+    components:
+    - pos: 21.525682,34.54406
+      parent: 1653
+      type: Transform
+  - uid: 179
+    components:
+    - pos: 21.743324,22.05294
+      parent: 1653
+      type: Transform
+- proto: PlasmaOre1
+  entities:
+  - uid: 469
+    components:
+    - pos: 30.486202,10.491858
+      parent: 1653
+      type: Transform
+  - uid: 482
+    components:
+    - pos: 30.486202,10.491858
+      parent: 1653
+      type: Transform
+  - uid: 483
+    components:
+    - pos: 30.486202,10.491858
+      parent: 1653
+      type: Transform
+  - uid: 485
+    components:
+    - pos: 30.486202,10.491858
+      parent: 1653
+      type: Transform
+  - uid: 489
+    components:
+    - pos: 30.486202,10.491858
+      parent: 1653
+      type: Transform
+- proto: PlushieLizard
+  entities:
+  - uid: 41
+    components:
+    - pos: 35.503193,14.666253
+      parent: 1653
+      type: Transform
+- proto: PlushiePenguin
+  entities:
+  - uid: 415
+    components:
+    - pos: 13.526197,27.541958
+      parent: 1653
+      type: Transform
+- proto: PortableGeneratorJrPacman
+  entities:
+  - uid: 392
+    components:
+    - pos: 37.5,31.5
+      parent: 1653
+      type: Transform
+- proto: PottedPlantRandom
+  entities:
+  - uid: 44
+    components:
+    - pos: 44.5,14.5
+      parent: 1653
+      type: Transform
+  - uid: 50
+    components:
+    - pos: 45.5,14.5
+      parent: 1653
+      type: Transform
+  - uid: 94
+    components:
+    - pos: 42.5,14.5
+      parent: 1653
+      type: Transform
+  - uid: 347
+    components:
+    - pos: 41.5,14.5
+      parent: 1653
+      type: Transform
+- proto: PowerCellHyperPrinted
+  entities:
+  - uid: 52
+    components:
+    - pos: 31.760115,2.7803574
+      parent: 1653
+      type: Transform
+- proto: PoweredSmallLight
+  entities:
+  - uid: 156
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 10.5,45.5
+      parent: 1653
+      type: Transform
+- proto: PuddleVomit
+  entities:
+  - uid: 229
+    components:
+    - pos: 3.5,45.5
+      parent: 1653
+      type: Transform
+- proto: Rack
+  entities:
+  - uid: 276
+    components:
+    - pos: 18.5,45.5
+      parent: 1653
+      type: Transform
+  - uid: 334
+    components:
+    - pos: 20.5,45.5
+      parent: 1653
+      type: Transform
+  - uid: 335
+    components:
+    - pos: 20.5,46.5
+      parent: 1653
+      type: Transform
+  - uid: 352
+    components:
+    - pos: 21.5,34.5
+      parent: 1653
+      type: Transform
+  - uid: 365
+    components:
+    - pos: 10.5,46.5
+      parent: 1653
+      type: Transform
+  - uid: 403
+    components:
+    - pos: 4.5,45.5
+      parent: 1653
+      type: Transform
+  - uid: 410
+    components:
+    - pos: 22.5,34.5
+      parent: 1653
+      type: Transform
+- proto: Railing
+  entities:
+  - uid: 260
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 27.5,9.5
+      parent: 1653
+      type: Transform
+  - uid: 261
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 28.5,9.5
+      parent: 1653
+      type: Transform
+  - uid: 277
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 26.5,9.5
+      parent: 1653
+      type: Transform
+  - uid: 327
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 30.5,9.5
+      parent: 1653
+      type: Transform
+  - uid: 376
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 25.5,9.5
+      parent: 1653
+      type: Transform
+  - uid: 467
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 29.5,9.5
+      parent: 1653
+      type: Transform
+- proto: RailingCornerSmall
+  entities:
+  - uid: 371
+    components:
+    - pos: 31.5,9.5
+      parent: 1653
+      type: Transform
+- proto: RandomArtifactSpawner
+  entities:
+  - uid: 48
+    components:
+    - pos: 43.5,14.5
+      parent: 1653
+      type: Transform
+- proto: RandomCargoCorpseSpawner
+  entities:
+  - uid: 274
+    components:
+    - pos: 11.5,46.5
+      parent: 1653
+      type: Transform
+- proto: RandomServiceCorpseSpawner
+  entities:
+  - uid: 400
+    components:
+    - pos: 19.5,45.5
+      parent: 1653
+      type: Transform
+- proto: SalvageMaterialCrateSpawner
+  entities:
+  - uid: 481
+    components:
+    - pos: 27.5,8.5
+      parent: 1653
+      type: Transform
+  - uid: 491
+    components:
+    - pos: 30.5,8.5
+      parent: 1653
+      type: Transform
+- proto: ShadowTree03
+  entities:
+  - uid: 68
+    components:
+    - pos: 19.477606,14.337568
+      parent: 1653
+      type: Transform
+- proto: SheetSteel1
+  entities:
+  - uid: 457
+    components:
+    - pos: 13.481619,44.391277
+      parent: 1653
+      type: Transform
+- proto: ShellShotgunIncendiary
+  entities:
+  - uid: 405
+    components:
+    - pos: 18.58831,45.763992
+      parent: 1653
+      type: Transform
+- proto: ShellShotgunSlug
+  entities:
+  - uid: 339
+    components:
+    - pos: 18.603935,45.404617
+      parent: 1653
+      type: Transform
+- proto: Shovel
+  entities:
+  - uid: 30
+    components:
+    - pos: 33.425346,4.383849
+      parent: 1653
+      type: Transform
+  - uid: 394
+    components:
+    - pos: 31.844257,31.05841
+      parent: 1653
+      type: Transform
+- proto: SignNTMine
+  entities:
+  - uid: 253
+    components:
+    - pos: 4.5,43.5
+      parent: 1653
+      type: Transform
+  - uid: 326
+    components:
+    - pos: 20.5,43.5
+      parent: 1653
+      type: Transform
+- proto: SilverOre1
+  entities:
+  - uid: 198
+    components:
+    - pos: 29.423702,10.476233
+      parent: 1653
+      type: Transform
+  - uid: 318
+    components:
+    - pos: 29.423702,10.476233
+      parent: 1653
+      type: Transform
+  - uid: 484
+    components:
+    - pos: 29.423702,10.476233
+      parent: 1653
+      type: Transform
+  - uid: 486
+    components:
+    - pos: 29.423702,10.476233
+      parent: 1653
+      type: Transform
+  - uid: 487
+    components:
+    - pos: 29.423702,10.476233
+      parent: 1653
+      type: Transform
+- proto: SmallLight
+  entities:
+  - uid: 336
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 18.5,45.5
+      parent: 1653
+      type: Transform
+  - uid: 434
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 2.5,45.5
+      parent: 1653
+      type: Transform
+- proto: SpawnMobFrog
+  entities:
+  - uid: 386
+    components:
+    - pos: 18.5,44.5
+      parent: 1653
+      type: Transform
+- proto: SpearBone
+  entities:
+  - uid: 232
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 231
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
+- proto: SteelBench
+  entities:
+  - uid: 71
+    components:
+    - pos: 19.5,13.5
+      parent: 1653
+      type: Transform
+- proto: SteelOre
+  entities:
+  - uid: 197
+    components:
+    - pos: 28.470577,10.523108
+      parent: 1653
+      type: Transform
+- proto: TableCarpet
+  entities:
+  - uid: 465
+    components:
+    - pos: 13.5,26.5
+      parent: 1653
+      type: Transform
+- proto: TableReinforced
+  entities:
+  - uid: 246
+    components:
+    - pos: 4.5,46.5
+      parent: 1653
+      type: Transform
+- proto: TableWood
+  entities:
+  - uid: 56
+    components:
+    - pos: 39.5,0.5
+      parent: 1653
+      type: Transform
+  - uid: 59
+    components:
+    - pos: 51.5,1.5
+      parent: 1653
+      type: Transform
+  - uid: 124
+    components:
+    - pos: 34.5,40.5
+      parent: 1653
+      type: Transform
+  - uid: 133
+    components:
+    - pos: 5.5,40.5
+      parent: 1653
+      type: Transform
+  - uid: 173
+    components:
+    - pos: 20.5,21.5
+      parent: 1653
+      type: Transform
+  - uid: 226
+    components:
+    - pos: 36.5,40.5
+      parent: 1653
+      type: Transform
+  - uid: 227
+    components:
+    - pos: 35.5,40.5
+      parent: 1653
+      type: Transform
+  - uid: 333
+    components:
+    - pos: 36.5,31.5
+      parent: 1653
+      type: Transform
+- proto: ToiletDirtyWater
+  entities:
+  - uid: 406
+    components:
+    - pos: 32.5,20.5
+      parent: 1653
+      type: Transform
+- proto: Torch
+  entities:
+  - uid: 58
+    components:
+    - pos: 52.617035,4.4522324
+      parent: 1653
+      type: Transform
+  - uid: 60
+    components:
+    - pos: 38.654633,2.7959824
+      parent: 1653
+      type: Transform
+  - uid: 135
+    components:
+    - pos: 5.4760814,40.63729
+      parent: 1653
+      type: Transform
+  - uid: 136
+    components:
+    - pos: 5.6792064,40.621666
+      parent: 1653
+      type: Transform
+  - uid: 366
+    components:
+    - pos: 10.669119,46.594402
+      parent: 1653
+      type: Transform
+- proto: TorsoSkeleton
+  entities:
+  - uid: 325
+    components:
+    - pos: 32.5085,20.620539
+      parent: 1653
+      type: Transform
+- proto: TrashBakedBananaPeel
+  entities:
+  - uid: 210
+    components:
+    - pos: 5.484687,26.403563
+      parent: 1653
+      type: Transform
+- proto: UraniumOre
+  entities:
+  - uid: 433
+    components:
+    - pos: 4.487873,46.58196
+      parent: 1653
+      type: Transform
+- proto: UraniumOre1
+  entities:
+  - uid: 192
+    components:
+    - pos: 27.517452,10.507483
+      parent: 1653
+      type: Transform
+  - uid: 193
+    components:
+    - pos: 27.517452,10.507483
+      parent: 1653
+      type: Transform
+  - uid: 194
+    components:
+    - pos: 27.517452,10.507483
+      parent: 1653
+      type: Transform
+  - uid: 195
+    components:
+    - pos: 27.517452,10.507483
+      parent: 1653
+      type: Transform
+  - uid: 196
+    components:
+    - pos: 27.517452,10.507483
+      parent: 1653
+      type: Transform
+- proto: WallMining
+  entities:
+  - uid: 11
+    components:
+    - pos: 13.5,46.5
+      parent: 1653
+      type: Transform
+  - uid: 150
+    components:
+    - pos: 18.5,43.5
+      parent: 1653
+      type: Transform
+  - uid: 151
+    components:
+    - pos: 17.5,44.5
+      parent: 1653
+      type: Transform
+  - uid: 152
+    components:
+    - pos: 17.5,46.5
+      parent: 1653
+      type: Transform
+  - uid: 153
+    components:
+    - pos: 18.5,47.5
+      parent: 1653
+      type: Transform
+  - uid: 154
+    components:
+    - pos: 20.5,47.5
+      parent: 1653
+      type: Transform
+  - uid: 157
+    components:
+    - pos: 17.5,45.5
+      parent: 1653
+      type: Transform
+  - uid: 159
+    components:
+    - pos: 4.5,47.5
+      parent: 1653
+      type: Transform
+  - uid: 160
+    components:
+    - pos: 2.5,47.5
+      parent: 1653
+      type: Transform
+  - uid: 161
+    components:
+    - pos: 1.5,44.5
+      parent: 1653
+      type: Transform
+  - uid: 163
+    components:
+    - pos: 5.5,45.5
+      parent: 1653
+      type: Transform
+  - uid: 164
+    components:
+    - pos: 1.5,46.5
+      parent: 1653
+      type: Transform
+  - uid: 165
+    components:
+    - pos: 1.5,45.5
+      parent: 1653
+      type: Transform
+  - uid: 247
+    components:
+    - pos: 10.5,47.5
+      parent: 1653
+      type: Transform
+  - uid: 265
+    components:
+    - pos: 21.5,46.5
+      parent: 1653
+      type: Transform
+  - uid: 329
+    components:
+    - pos: 20.5,43.5
+      parent: 1653
+      type: Transform
+  - uid: 353
+    components:
+    - pos: 9.5,46.5
+      parent: 1653
+      type: Transform
+  - uid: 370
+    components:
+    - pos: 5.5,44.5
+      parent: 1653
+      type: Transform
+  - uid: 373
+    components:
+    - pos: 5.5,46.5
+      parent: 1653
+      type: Transform
+  - uid: 402
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 10.5,43.5
+      parent: 1653
+      type: Transform
+  - uid: 425
+    components:
+    - pos: 21.5,45.5
+      parent: 1653
+      type: Transform
+  - uid: 427
+    components:
+    - pos: 21.5,44.5
+      parent: 1653
+      type: Transform
+  - uid: 429
+    components:
+    - pos: 9.5,44.5
+      parent: 1653
+      type: Transform
+  - uid: 430
+    components:
+    - pos: 9.5,45.5
+      parent: 1653
+      type: Transform
+  - uid: 431
+    components:
+    - pos: 12.5,47.5
+      parent: 1653
+      type: Transform
+  - uid: 455
+    components:
+    - pos: 2.5,43.5
+      parent: 1653
+      type: Transform
+  - uid: 456
+    components:
+    - pos: 4.5,43.5
+      parent: 1653
+      type: Transform
+- proto: WallMiningDiagonal
+  entities:
+  - uid: 166
+    components:
+    - pos: 1.5,47.5
+      parent: 1653
+      type: Transform
+  - uid: 167
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 5.5,47.5
+      parent: 1653
+      type: Transform
+  - uid: 168
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 5.5,43.5
+      parent: 1653
+      type: Transform
+  - uid: 169
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 1.5,43.5
+      parent: 1653
+      type: Transform
+  - uid: 251
+    components:
+    - pos: 9.5,47.5
+      parent: 1653
+      type: Transform
+  - uid: 275
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 13.5,47.5
+      parent: 1653
+      type: Transform
+  - uid: 397
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 9.5,43.5
+      parent: 1653
+      type: Transform
+  - uid: 428
+    components:
+    - pos: 17.5,47.5
+      parent: 1653
+      type: Transform
+  - uid: 493
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 21.5,47.5
+      parent: 1653
+      type: Transform
+  - uid: 494
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 21.5,43.5
+      parent: 1653
+      type: Transform
+  - uid: 495
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 17.5,43.5
+      parent: 1653
+      type: Transform
+- proto: WallWood
+  entities:
+  - uid: 16
+    components:
+    - pos: 31.5,19.5
+      parent: 1653
+      type: Transform
+  - uid: 188
+    components:
+    - pos: 43.5,39.5
+      parent: 1653
+      type: Transform
+  - uid: 255
+    components:
+    - pos: 31.5,21.5
+      parent: 1653
+      type: Transform
+  - uid: 323
+    components:
+    - pos: 33.5,20.5
+      parent: 1653
+      type: Transform
+  - uid: 324
+    components:
+    - pos: 33.5,21.5
+      parent: 1653
+      type: Transform
+  - uid: 338
+    components:
+    - pos: 33.5,19.5
+      parent: 1653
+      type: Transform
+  - uid: 408
+    components:
+    - pos: 32.5,21.5
+      parent: 1653
+      type: Transform
+  - uid: 409
+    components:
+    - pos: 31.5,20.5
+      parent: 1653
+      type: Transform
+- proto: WaterTankHighCapacity
+  entities:
+  - uid: 219
+    components:
+    - pos: 27.5,14.5
+      parent: 1653
+      type: Transform
+- proto: WeaponShotgunImprovised
+  entities:
+  - uid: 412
+    components:
+    - pos: 20.496641,45.467117
+      parent: 1653
+      type: Transform
+- proto: WeldingFuelTankFull
+  entities:
+  - uid: 10
+    components:
+    - pos: 2.5,46.5
+      parent: 1653
+      type: Transform
+- proto: WoodDoor
+  entities:
+  - uid: 407
+    components:
+    - pos: 32.5,19.5
+      parent: 1653
+      type: Transform
+- proto: WoodenSign
+  entities:
+  - uid: 189
+    components:
+    - pos: 1.5555744,26.347673
+      parent: 1653
+      type: Transform
+- proto: WoodenSignRight
+  entities:
+  - uid: 62
+    components:
+    - pos: 11.898959,14.345065
+      parent: 1653
+      type: Transform
+  - uid: 177
+    components:
+    - pos: 9.503841,22.358318
+      parent: 1653
+      type: Transform
+  - uid: 440
+    components:
+    - pos: 25.205534,32.33467
+      parent: 1653
+      type: Transform
+  - uid: 451
+    components:
+    - pos: 5.5491443,7.271117
+      parent: 1653
+      type: Transform
+- proto: WoodenSupport
+  entities:
+  - uid: 9
+    components:
+    - pos: 10.5,10.5
+      parent: 1653
+      type: Transform
+  - uid: 66
+    components:
+    - pos: 38.5,16.5
+      parent: 1653
+      type: Transform
+  - uid: 107
+    components:
+    - pos: 8.5,32.5
+      parent: 1653
+      type: Transform
+  - uid: 108
+    components:
+    - pos: 1.5,36.5
+      parent: 1653
+      type: Transform
+  - uid: 110
+    components:
+    - pos: 0.5,22.5
+      parent: 1653
+      type: Transform
+  - uid: 140
+    components:
+    - pos: 34.5,6.5
+      parent: 1653
+      type: Transform
+  - uid: 146
+    components:
+    - pos: 24.5,6.5
+      parent: 1653
+      type: Transform
+  - uid: 174
+    components:
+    - pos: 13.5,22.5
+      parent: 1653
+      type: Transform
+  - uid: 204
+    components:
+    - pos: 2.5,28.5
+      parent: 1653
+      type: Transform
+  - uid: 207
+    components:
+    - pos: 0.5,28.5
+      parent: 1653
+      type: Transform
+  - uid: 259
+    components:
+    - pos: 20.5,24.5
+      parent: 1653
+      type: Transform
+  - uid: 279
+    components:
+    - pos: 12.5,10.5
+      parent: 1653
+      type: Transform
+  - uid: 286
+    components:
+    - pos: 22.5,10.5
+      parent: 1653
+      type: Transform
+  - uid: 422
+    components:
+    - pos: 22.5,28.5
+      parent: 1653
+      type: Transform
+  - uid: 424
+    components:
+    - pos: 22.5,40.5
+      parent: 1653
+      type: Transform
+  - uid: 450
+    components:
+    - pos: 0.5,10.5
+      parent: 1653
+      type: Transform
+  - uid: 462
+    components:
+    - pos: 53.5,4.5
+      parent: 1653
+      type: Transform
+  - uid: 464
+    components:
+    - pos: 36.5,4.5
+      parent: 1653
+      type: Transform
+  - uid: 470
+    components:
+    - pos: 8.5,36.5
+      parent: 1653
+      type: Transform
+- proto: WoodenSupportBeam
+  entities:
+  - uid: 35
+    components:
+    - pos: 29.5,1.5
+      parent: 1653
+      type: Transform
+  - uid: 143
+    components:
+    - pos: 33.5,10.5
+      parent: 1653
+      type: Transform
+  - uid: 285
+    components:
+    - pos: 12.5,6.5
+      parent: 1653
+      type: Transform
+  - uid: 307
+    components:
+    - pos: 14.5,20.5
+      parent: 1653
+      type: Transform
+  - uid: 355
+    components:
+    - pos: 25.5,1.5
+      parent: 1653
+      type: Transform
+  - uid: 395
+    components:
+    - pos: 17.5,27.5
+      parent: 1653
+      type: Transform
+- proto: WoodenSupportWall
+  entities:
+  - uid: 27
+    components:
+    - pos: 34.5,4.5
+      parent: 1653
+      type: Transform
+  - uid: 33
+    components:
+    - pos: 27.5,1.5
+      parent: 1653
+      type: Transform
+  - uid: 34
+    components:
+    - pos: 28.5,1.5
+      parent: 1653
+      type: Transform
+  - uid: 36
+    components:
+    - pos: 32.5,2.5
+      parent: 1653
+      type: Transform
+  - uid: 37
+    components:
+    - pos: 32.5,3.5
+      parent: 1653
+      type: Transform
+  - uid: 38
+    components:
+    - pos: 30.5,1.5
+      parent: 1653
+      type: Transform
+  - uid: 39
+    components:
+    - pos: 32.5,0.5
+      parent: 1653
+      type: Transform
+  - uid: 53
+    components:
+    - pos: 7.5,8.5
+      parent: 1653
+      type: Transform
+  - uid: 54
+    components:
+    - pos: 6.5,8.5
+      parent: 1653
+      type: Transform
+  - uid: 55
+    components:
+    - pos: 5.5,8.5
+      parent: 1653
+      type: Transform
+  - uid: 69
+    components:
+    - pos: 0.5,12.5
+      parent: 1653
+      type: Transform
+  - uid: 75
+    components:
+    - pos: 16.5,27.5
+      parent: 1653
+      type: Transform
+  - uid: 91
+    components:
+    - pos: 32.5,1.5
+      parent: 1653
+      type: Transform
+  - uid: 92
+    components:
+    - pos: 31.5,3.5
+      parent: 1653
+      type: Transform
+  - uid: 98
+    components:
+    - pos: 18.5,25.5
+      parent: 1653
+      type: Transform
+  - uid: 125
+    components:
+    - pos: 38.5,40.5
+      parent: 1653
+      type: Transform
+  - uid: 141
+    components:
+    - pos: 34.5,10.5
+      parent: 1653
+      type: Transform
+  - uid: 142
+    components:
+    - pos: 34.5,9.5
+      parent: 1653
+      type: Transform
+  - uid: 175
+    components:
+    - pos: 12.5,20.5
+      parent: 1653
+      type: Transform
+  - uid: 176
+    components:
+    - pos: 15.5,20.5
+      parent: 1653
+      type: Transform
+  - uid: 185
+    components:
+    - pos: 32.5,40.5
+      parent: 1653
+      type: Transform
+  - uid: 234
+    components:
+    - pos: 50.5,0.5
+      parent: 1653
+      type: Transform
+  - uid: 236
+    components:
+    - pos: 30.5,3.5
+      parent: 1653
+      type: Transform
+  - uid: 237
+    components:
+    - pos: 25.5,3.5
+      parent: 1653
+      type: Transform
+  - uid: 238
+    components:
+    - pos: 25.5,4.5
+      parent: 1653
+      type: Transform
+  - uid: 239
+    components:
+    - pos: 18.5,1.5
+      parent: 1653
+      type: Transform
+  - uid: 257
+    components:
+    - pos: 29.5,3.5
+      parent: 1653
+      type: Transform
+  - uid: 263
+    components:
+    - pos: 25.5,2.5
+      parent: 1653
+      type: Transform
+  - uid: 280
+    components:
+    - pos: 13.5,6.5
+      parent: 1653
+      type: Transform
+  - uid: 282
+    components:
+    - pos: 21.5,6.5
+      parent: 1653
+      type: Transform
+  - uid: 287
+    components:
+    - pos: 22.5,6.5
+      parent: 1653
+      type: Transform
+  - uid: 297
+    components:
+    - pos: 6.5,40.5
+      parent: 1653
+      type: Transform
+  - uid: 299
+    components:
+    - pos: 0.5,38.5
+      parent: 1653
+      type: Transform
+  - uid: 305
+    components:
+    - pos: 14.5,30.5
+      parent: 1653
+      type: Transform
+  - uid: 310
+    components:
+    - pos: 14.5,32.5
+      parent: 1653
+      type: Transform
+  - uid: 311
+    components:
+    - pos: 26.5,30.5
+      parent: 1653
+      type: Transform
+  - uid: 342
+    components:
+    - pos: 22.5,3.5
+      parent: 1653
+      type: Transform
+  - uid: 343
+    components:
+    - pos: 21.5,3.5
+      parent: 1653
+      type: Transform
+  - uid: 344
+    components:
+    - pos: 23.5,3.5
+      parent: 1653
+      type: Transform
+  - uid: 345
+    components:
+    - pos: 24.5,3.5
+      parent: 1653
+      type: Transform
+  - uid: 346
+    components:
+    - pos: 20.5,1.5
+      parent: 1653
+      type: Transform
+  - uid: 349
+    components:
+    - pos: 21.5,1.5
+      parent: 1653
+      type: Transform
+  - uid: 388
+    components:
+    - pos: 28.5,3.5
+      parent: 1653
+      type: Transform
+  - uid: 389
+    components:
+    - pos: 26.5,1.5
+      parent: 1653
+      type: Transform
+  - uid: 419
+    components:
+    - pos: 19.5,1.5
+      parent: 1653
+      type: Transform
+  - uid: 437
+    components:
+    - pos: 26.5,32.5
+      parent: 1653
+      type: Transform
+  - uid: 461
+    components:
+    - pos: 54.5,4.5
+      parent: 1653
+      type: Transform
+- proto: WoodenSupportWallBroken
+  entities:
+  - uid: 26
+    components:
+    - pos: 27.5,3.5
+      parent: 1653
+      type: Transform
+  - uid: 80
+    components:
+    - pos: 17.5,25.5
+      parent: 1653
+      type: Transform
+  - uid: 95
+    components:
+    - pos: 4.5,8.5
+      parent: 1653
+      type: Transform
+  - uid: 284
+    components:
+    - pos: 20.5,6.5
+      parent: 1653
+      type: Transform
+  - uid: 348
+    components:
+    - pos: 20.5,3.5
+      parent: 1653
+      type: Transform
+  - uid: 356
+    components:
+    - pos: 39.5,2.5
+      parent: 1653
+      type: Transform
+  - uid: 463
+    components:
+    - pos: 50.5,1.5
+      parent: 1653
+      type: Transform
+...
diff --git a/Resources/Maps/Salvage/vegan-meatball.yml b/Resources/Maps/Salvage/vegan-meatball.yml
new file mode 100644
index 0000000000..824e3d0b7e
--- /dev/null
+++ b/Resources/Maps/Salvage/vegan-meatball.yml
@@ -0,0 +1,1694 @@
+meta:
+  format: 6
+  postmapinit: false
+tilemap:
+  0: Space
+  49: FloorGrassJungle
+  74: FloorPlanetGrass
+entities:
+- proto: ""
+  entities:
+  - uid: 1
+    components:
+    - type: MetaData
+      name: grid
+    - type: Transform
+      pos: -0.5,-0.46875
+      parent: invalid
+    - type: MapGrid
+      chunks:
+        0,0:
+          ind: 0,0
+          tiles: MQAAAAAAMQAAAAAAMQAAAAAASgAAAAAAMQAAAAAAMQAAAAAASgAAAAAASgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAAAMQAAAAAASgAAAAAASgAAAAAAMQAAAAAAMQAAAAAASgAAAAAASgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAAAMQAAAAAASgAAAAAASgAAAAAAMQAAAAAASgAAAAAASgAAAAAASgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAAAMQAAAAAAMQAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAAAMQAAAAAAMQAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAAAMQAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -1,0:
+          ind: -1,0
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAAAMQAAAAAAMQAAAAAASgAAAAAASgAAAAAASgAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASgAAAAAASgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASgAAAAAASgAAAAAASgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -1,-1:
+          ind: -1,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASgAAAAAASgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASgAAAAAASgAAAAAASgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASgAAAAAASgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASgAAAAAASgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAASgAAAAAASgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAASgAAAAAASgAAAAAASgAAAAAA
+          version: 6
+        0,-1:
+          ind: 0,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASgAAAAAASgAAAAAASgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAAAMQAAAAAAMQAAAAAASgAAAAAASgAAAAAASgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAAAMQAAAAAAMQAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAAMQAAAAAASgAAAAAASgAAAAAASgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAASgAAAAAASgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+    - type: Broadphase
+    - type: Physics
+      bodyStatus: InAir
+      angularDamping: 0.05
+      linearDamping: 0.05
+      fixedRotation: False
+      bodyType: Dynamic
+    - type: Fixtures
+      fixtures: {}
+    - type: OccluderTree
+    - type: SpreaderGrid
+    - type: Shuttle
+    - type: GridPathfinding
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+    - type: DecalGrid
+      chunkCollection:
+        version: 2
+        nodes:
+        - node:
+            color: '#FFFFFFFF'
+            id: Bushf1
+          decals:
+            4: -4.57722,1.2575569
+            5: -3.311595,3.601307
+            6: 0.36809254,0.22630692
+            7: 0.41496754,-4.5783806
+            8: -5.6787825,-1.5549431
+            71: -1.38972,-4.320568
+            72: -0.56940746,-4.836193
+            73: -0.78034496,-3.851818
+            74: -1.7881575,-4.2033806
+            75: -2.42097,-3.523693
+            76: 0.57903004,1.1638069
+            77: -0.030344963,1.8434944
+            78: -0.19440746,0.5309944
+            79: 0.53215504,-0.19556811
+        - node:
+            color: '#FFFFFFFF'
+            id: Bushf2
+          decals:
+            0: -1.3662825,2.382557
+            1: -4.20222,-1.8361931
+            2: -2.2100325,-3.523693
+            3: 4.2587175,-0.5002556
+            80: 0.60246754,1.4450569
+            81: 0.78996754,3.085682
+            82: 0.69621754,3.460682
+            83: 0.27434254,4.0934944
+            84: 1.2587175,3.6247444
+            85: 0.06340504,4.7028694
+            86: 4.6337175,-0.6174431
+            87: 4.89153,-0.3596306
+            88: 0.22746754,-4.3440056
+            89: -1.5069075,-4.6721306
+            90: -2.5850325,-3.195568
+            91: -1.95222,-4.320568
+        - node:
+            color: '#FFFFFFFF'
+            id: Bushf3
+          decals:
+            9: -2.04597,1.8434944
+            10: -2.749095,3.2966194
+            11: -4.717845,1.9138069
+            12: -3.6162825,-3.1252556
+            13: -3.63972,-2.070568
+            14: -2.4912825,-2.9377556
+            15: -0.52253246,-4.461193
+            16: 4.4462175,-0.7111931
+            17: 4.3055925,0.24974442
+            66: -0.19440746,1.4450569
+            67: 1.0243425,-0.101818115
+            68: 0.43840504,-0.6408806
+            69: -1.3662825,1.2341194
+            70: -0.10065746,1.8903694
+            92: -1.7881575,-0.2658806
+            93: 0.39153004,-0.0080681145
+            94: -1.20222,1.2575569
+            95: 0.88371754,-0.2893181
+            96: 0.97746754,2.054432
+            97: 0.86028004,0.085681915
+            98: -1.7412825,-3.804943
+            99: -0.71003246,-4.3440056
+            100: -2.04597,-3.2190056
+        - node:
+            color: '#FFFFFFFF'
+            id: Bushl1
+          decals:
+            27: -5.374095,-1.2502556
+            28: -4.2256575,-2.0002556
+            29: -4.85847,2.6403694
+            30: -4.249095,3.1559944
+            31: -1.8350325,3.038807
+            32: -1.3662825,3.5778694
+            33: -2.42097,2.804432
+            34: -3.9912825,-2.7502556
+            35: 0.48528004,-4.414318
+            36: -1.76472,-3.4065056
+            37: -0.59284496,-4.8127556
+            38: 1.14153,-0.6643181
+            39: -0.19440746,2.570057
+        - node:
+            color: '#FFFFFFFF'
+            id: Bushl2
+          decals:
+            40: 0.81340504,1.7263069
+            41: -1.624095,3.273182
+            42: -2.3506575,3.9059944
+            43: -3.82722,3.9997444
+            44: 0.90715504,3.9997444
+            45: 4.657155,-1.1330681
+            46: 4.04778,0.36693192
+            47: 5.032155,-1.0158806
+            48: -0.17096996,-4.320568
+            49: -0.56940746,-4.695568
+            50: -2.32722,-4.2033806
+        - node:
+            color: '#FFFFFFFF'
+            id: Bushl3
+          decals:
+            57: -1.20222,2.4528694
+            58: -0.66315746,3.554432
+            59: -3.4756575,2.4059944
+            60: -4.0850325,2.616932
+            61: -6.26472,-0.7111931
+            62: -3.4287825,-2.4690056
+            63: -1.4600325,-4.273693
+            64: -0.82721996,-3.5940056
+            65: -0.38190746,-4.4846306
+        - node:
+            color: '#FFFFFFFF'
+            id: Bushl4
+          decals:
+            18: -0.80378246,2.851307
+            19: -3.967845,3.460682
+            20: -4.76472,1.9372444
+            21: 0.46184254,0.32005692
+            22: -0.45221996,2.335682
+            23: -3.1475325,-2.2346306
+            24: -4.436595,-1.1565056
+            25: -1.48347,-3.5471306
+            26: 3.9774675,-1.0861931
+            51: -4.3194075,-0.9690056
+            52: -2.561595,-3.054943
+            53: -1.85847,-4.039318
+            54: -5.3506575,-1.7893181
+            55: -0.52253246,0.8825569
+            56: -1.20222,2.4528694
+    - type: GridAtmosphere
+      version: 2
+      data:
+        tiles:
+          0,0:
+            0: 65535
+          -1,0:
+            0: 65535
+          0,1:
+            0: 65535
+          1,0:
+            0: 65535
+          1,1:
+            0: 4983
+          2,0:
+            0: 17
+          -2,0:
+            0: 61166
+          -2,1:
+            0: 206
+          -1,1:
+            0: 36863
+          -2,-1:
+            0: 61166
+          -2,-2:
+            0: 49152
+          -1,-2:
+            0: 65472
+          -1,-1:
+            0: 65535
+          0,-2:
+            0: 65392
+          0,-1:
+            0: 65535
+          1,-2:
+            0: 12288
+          1,-1:
+            0: 65527
+          2,-1:
+            0: 4352
+        uniqueMixes:
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        chunkSize: 4
+    - type: GasTileOverlay
+    - type: RadiationGridResistance
+- proto: AnomalyFlora
+  entities:
+  - uid: 3
+    components:
+    - type: Transform
+      pos: 0.5,0.515625
+      parent: 1
+- proto: AnomalyFloraBulb
+  entities:
+  - uid: 2
+    components:
+    - type: Transform
+      pos: 2.5,-0.5
+      parent: 1
+  - uid: 129
+    components:
+    - type: Transform
+      pos: -0.5,1.5
+      parent: 1
+  - uid: 130
+    components:
+    - type: Transform
+      pos: 1.5,2.5
+      parent: 1
+  - uid: 131
+    components:
+    - type: Transform
+      pos: 4.5,-1.5
+      parent: 1
+  - uid: 132
+    components:
+    - type: Transform
+      pos: 5.5,-0.5
+      parent: 1
+  - uid: 133
+    components:
+    - type: Transform
+      pos: -2.5,-2.5
+      parent: 1
+  - uid: 134
+    components:
+    - type: Transform
+      pos: -0.5,-3.5
+      parent: 1
+  - uid: 135
+    components:
+    - type: Transform
+      pos: -1.5,3.5
+      parent: 1
+  - uid: 136
+    components:
+    - type: Transform
+      pos: -2.5,4.5
+      parent: 1
+  - uid: 137
+    components:
+    - type: Transform
+      pos: -4.5,2.5
+      parent: 1
+  - uid: 138
+    components:
+    - type: Transform
+      pos: -5.5,-1.5
+      parent: 1
+  - uid: 139
+    components:
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 1
+  - uid: 158
+    components:
+    - type: Transform
+      pos: 0.5,4.5
+      parent: 1
+  - uid: 167
+    components:
+    - type: Transform
+      pos: 1.5,0.5
+      parent: 1
+  - uid: 169
+    components:
+    - type: Transform
+      pos: -3.5,-3.5
+      parent: 1
+  - uid: 188
+    components:
+    - type: Transform
+      pos: 5.5,0.5
+      parent: 1
+  - uid: 189
+    components:
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 1
+  - uid: 190
+    components:
+    - type: Transform
+      pos: -3.5,-0.5
+      parent: 1
+  - uid: 191
+    components:
+    - type: Transform
+      pos: -3.5,1.5
+      parent: 1
+  - uid: 193
+    components:
+    - type: Transform
+      pos: -5.5,0.5
+      parent: 1
+  - uid: 198
+    components:
+    - type: Transform
+      pos: -0.5,-4.5
+      parent: 1
+  - uid: 199
+    components:
+    - type: Transform
+      pos: 1.5,-3.5
+      parent: 1
+  - uid: 200
+    components:
+    - type: Transform
+      pos: 2.5,-4.5
+      parent: 1
+- proto: FoodAloe
+  entities:
+  - uid: 248
+    components:
+    - type: Transform
+      pos: 1.6065493,3.296236
+      parent: 1
+  - uid: 254
+    components:
+    - type: Transform
+      pos: 1.3252993,3.389986
+      parent: 1
+  - uid: 255
+    components:
+    - type: Transform
+      pos: 1.7237368,3.4134235
+      parent: 1
+- proto: FoodBlueTomato
+  entities:
+  - uid: 218
+    components:
+    - type: Transform
+      pos: 5.5281873,0.9375
+      parent: 1
+- proto: FoodGalaxythistle
+  entities:
+  - uid: 249
+    components:
+    - type: Transform
+      pos: 1.4659243,3.5540485
+      parent: 1
+  - uid: 256
+    components:
+    - type: Transform
+      pos: 1.1846743,3.5540485
+      parent: 1
+- proto: FoodGrape
+  entities:
+  - uid: 247
+    components:
+    - type: Transform
+      pos: 0.38779926,5.593111
+      parent: 1
+  - uid: 252
+    components:
+    - type: Transform
+      pos: 0.62217426,5.3821735
+      parent: 1
+- proto: FoodLemoon
+  entities:
+  - uid: 226
+    components:
+    - type: Transform
+      pos: 4.8485,-0.3515625
+      parent: 1
+  - uid: 227
+    components:
+    - type: Transform
+      pos: 4.614125,-0.4921875
+      parent: 1
+- proto: FoodLingzhi
+  entities:
+  - uid: 217
+    components:
+    - type: Transform
+      pos: 4.5438123,1.921875
+      parent: 1
+  - uid: 225
+    components:
+    - type: Transform
+      pos: 4.7313123,2.0625
+      parent: 1
+- proto: FoodPumpkin
+  entities:
+  - uid: 245
+    components:
+    - type: Transform
+      pos: -1.5106382,2.6165485
+      parent: 1
+- proto: FoodTomato
+  entities:
+  - uid: 243
+    components:
+    - type: Transform
+      pos: 0.31748676,2.7102985
+      parent: 1
+  - uid: 251
+    components:
+    - type: Transform
+      pos: 0.78623676,2.5227985
+      parent: 1
+- proto: FoodWatermelon
+  entities:
+  - uid: 244
+    components:
+    - type: Transform
+      pos: -1.6278257,-2.235014
+      parent: 1
+  - uid: 253
+    components:
+    - type: Transform
+      pos: -5.120013,-1.1100138
+      parent: 1
+- proto: hydroponicsSoil
+  entities:
+  - uid: 230
+    components:
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 1
+  - uid: 231
+    components:
+    - type: Transform
+      pos: -1.5,-3.5
+      parent: 1
+    - type: PlantHolder
+      lastProduce: 1
+      age: 1
+      health: 100
+      seed:
+        splatPrototype: null
+        lifespan: 75
+        endurance: 100
+        weedHighLevelThreshold: 10
+        weedTolerance: 5
+        pestTolerance: 5
+        highPressureTolerance: 121
+        lowPressureTolerance: 81
+        toxinsTolerance: 4
+        lightTolerance: 3
+        idealLight: 9
+        heatTolerance: 10
+        idealHeat: 298
+        waterConsumption: 0.4
+        nutrientConsumption: 0.75
+        exudeGasses: {}
+        consumeGasses: {}
+        chemicals:
+          THC:
+            Inherent: True
+            PotencyDivisor: 10
+            Max: 10
+            Min: 1
+        productPrototypes:
+        - LeavesCannabis
+        packetPrototype: CannabisSeeds
+        immutable: False
+        yield: 2
+        maturation: 8
+        bioluminescentColor: '#FFFFFFFF'
+        production: 12
+        plantIconState: produce
+        plantRsi: Objects/Specific/Hydroponics/cannabis.rsi
+        displayName: seeds-cannabis-display-name
+        noun: seeds-noun-seeds
+        name: seeds-cannabis-name
+        mutationPrototypes: []
+        turnIntoKudzu: False
+        kudzuPrototype: WeakKudzu
+        bioluminescent: False
+        screaming: False
+        screamSound: !type:SoundPathSpecifier
+          params:
+            variation: null
+            playOffsetSeconds: 0
+            loop: False
+            referenceDistance: 1
+            rolloffFactor: 1
+            maxDistance: 20
+            busName: Master
+            pitch: 1
+            volume: 0
+            attenuation: LinearDistanceClamped
+          path: /Audio/Voice/Human/malescream_1.ogg
+        ligneous: False
+        sentient: False
+        slip: False
+        viable: True
+        seedless: False
+        potency: 20
+        harvestRepeat: Repeat
+        growthStages: 3
+        mysterious: False
+  - uid: 232
+    components:
+    - type: Transform
+      pos: 1.5,3.5
+      parent: 1
+    - type: PlantHolder
+      lastProduce: 1
+      age: 1
+      health: 100
+      seed:
+        splatPrototype: null
+        lifespan: 25
+        endurance: 100
+        weedHighLevelThreshold: 10
+        weedTolerance: 5
+        pestTolerance: 5
+        highPressureTolerance: 121
+        lowPressureTolerance: 81
+        toxinsTolerance: 4
+        lightTolerance: 3
+        idealLight: 7
+        heatTolerance: 10
+        idealHeat: 293
+        waterConsumption: 0.6
+        nutrientConsumption: 0.75
+        exudeGasses: {}
+        consumeGasses: {}
+        chemicals:
+          Stellibinin:
+            Inherent: True
+            PotencyDivisor: 4
+            Max: 25
+            Min: 1
+        productPrototypes:
+        - FoodGalaxythistle
+        packetPrototype: GalaxythistleSeeds
+        immutable: False
+        yield: 3
+        maturation: 10
+        bioluminescentColor: '#FFFFFFFF'
+        production: 3
+        plantIconState: produce
+        plantRsi: Objects/Specific/Hydroponics/galaxythistle.rsi
+        displayName: seeds-galaxythistle-display-name
+        noun: seeds-noun-seeds
+        name: seeds-galaxythistle-name
+        mutationPrototypes: []
+        turnIntoKudzu: False
+        kudzuPrototype: WeakKudzu
+        bioluminescent: False
+        screaming: False
+        screamSound: !type:SoundPathSpecifier
+          params:
+            variation: null
+            playOffsetSeconds: 0
+            loop: False
+            referenceDistance: 1
+            rolloffFactor: 1
+            maxDistance: 20
+            busName: Master
+            pitch: 1
+            volume: 0
+            attenuation: LinearDistanceClamped
+          path: /Audio/Voice/Human/malescream_1.ogg
+        ligneous: False
+        sentient: False
+        slip: False
+        viable: True
+        seedless: False
+        potency: 10
+        harvestRepeat: NoRepeat
+        growthStages: 3
+        mysterious: False
+- proto: KudzuFlowerFriendly
+  entities:
+  - uid: 115
+    components:
+    - type: Transform
+      pos: -0.5,0.5
+      parent: 1
+  - uid: 116
+    components:
+    - type: Transform
+      pos: 0.5,1.5
+      parent: 1
+  - uid: 117
+    components:
+    - type: Transform
+      pos: 1.5,0.5
+      parent: 1
+  - uid: 118
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 1
+  - uid: 119
+    components:
+    - type: Transform
+      pos: 0.5,-0.5
+      parent: 1
+  - uid: 120
+    components:
+    - type: Transform
+      pos: 1.5,1.5
+      parent: 1
+  - uid: 121
+    components:
+    - type: Transform
+      pos: -1.5,1.5
+      parent: 1
+  - uid: 122
+    components:
+    - type: Transform
+      pos: -0.5,2.5
+      parent: 1
+  - uid: 123
+    components:
+    - type: Transform
+      pos: 0.5,2.5
+      parent: 1
+  - uid: 124
+    components:
+    - type: Transform
+      pos: -0.5,1.5
+      parent: 1
+  - uid: 125
+    components:
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 1
+  - uid: 126
+    components:
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 1
+  - uid: 127
+    components:
+    - type: Transform
+      pos: 1.5,2.5
+      parent: 1
+  - uid: 128
+    components:
+    - type: Transform
+      pos: 0.5,3.5
+      parent: 1
+  - uid: 140
+    components:
+    - type: Transform
+      pos: 1.5,-4.5
+      parent: 1
+  - uid: 141
+    components:
+    - type: Transform
+      pos: 0.5,-4.5
+      parent: 1
+  - uid: 142
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 1
+  - uid: 143
+    components:
+    - type: Transform
+      pos: 1.5,-3.5
+      parent: 1
+  - uid: 144
+    components:
+    - type: Transform
+      pos: 2.5,-3.5
+      parent: 1
+  - uid: 145
+    components:
+    - type: Transform
+      pos: 2.5,-4.5
+      parent: 1
+  - uid: 146
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 1
+  - uid: 147
+    components:
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 1
+  - uid: 148
+    components:
+    - type: Transform
+      pos: -0.5,-3.5
+      parent: 1
+  - uid: 149
+    components:
+    - type: Transform
+      pos: -1.5,-3.5
+      parent: 1
+  - uid: 150
+    components:
+    - type: Transform
+      pos: -1.5,-4.5
+      parent: 1
+  - uid: 151
+    components:
+    - type: Transform
+      pos: -2.5,-4.5
+      parent: 1
+  - uid: 152
+    components:
+    - type: Transform
+      pos: -0.5,-4.5
+      parent: 1
+  - uid: 153
+    components:
+    - type: Transform
+      pos: 5.5,0.5
+      parent: 1
+  - uid: 154
+    components:
+    - type: Transform
+      pos: 5.5,-0.5
+      parent: 1
+  - uid: 156
+    components:
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 1
+  - uid: 157
+    components:
+    - type: Transform
+      pos: 4.5,0.5
+      parent: 1
+  - uid: 159
+    components:
+    - type: Transform
+      pos: 0.5,4.5
+      parent: 1
+  - uid: 160
+    components:
+    - type: Transform
+      pos: -0.5,4.5
+      parent: 1
+  - uid: 161
+    components:
+    - type: Transform
+      pos: 0.5,5.5
+      parent: 1
+  - uid: 162
+    components:
+    - type: Transform
+      pos: 1.5,4.5
+      parent: 1
+  - uid: 163
+    components:
+    - type: Transform
+      pos: 1.5,3.5
+      parent: 1
+  - uid: 164
+    components:
+    - type: Transform
+      pos: 2.5,3.5
+      parent: 1
+  - uid: 165
+    components:
+    - type: Transform
+      pos: 2.5,4.5
+      parent: 1
+  - uid: 166
+    components:
+    - type: Transform
+      pos: 1.5,5.5
+      parent: 1
+  - uid: 172
+    components:
+    - type: Transform
+      pos: -2.5,-2.5
+      parent: 1
+  - uid: 173
+    components:
+    - type: Transform
+      pos: 4.5,2.5
+      parent: 1
+  - uid: 178
+    components:
+    - type: Transform
+      pos: -3.5,-3.5
+      parent: 1
+  - uid: 180
+    components:
+    - type: Transform
+      pos: -1.5,-2.5
+      parent: 1
+  - uid: 182
+    components:
+    - type: Transform
+      pos: -4.5,-3.5
+      parent: 1
+  - uid: 184
+    components:
+    - type: Transform
+      pos: -2.5,-3.5
+      parent: 1
+  - uid: 216
+    components:
+    - type: Transform
+      pos: 5.5,1.5
+      parent: 1
+  - uid: 234
+    components:
+    - type: Transform
+      pos: 3.5,-0.5
+      parent: 1
+  - uid: 235
+    components:
+    - type: Transform
+      pos: 4.5,-0.5
+      parent: 1
+- proto: LeavesCannabis
+  entities:
+  - uid: 241
+    components:
+    - type: Transform
+      pos: -1.2997007,-3.7115765
+      parent: 1
+  - uid: 242
+    components:
+    - type: Transform
+      pos: -1.7918882,-3.500639
+      parent: 1
+- proto: LockerBotanistLoot
+  entities:
+  - uid: 239
+    components:
+    - type: Transform
+      pos: -3.5,4.5
+      parent: 1
+  - uid: 240
+    components:
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 1
+- proto: Nettle
+  entities:
+  - uid: 228
+    components:
+    - type: Transform
+      pos: 0.140854,1.640625
+      parent: 1
+  - uid: 229
+    components:
+    - type: Transform
+      pos: 0.609604,1.8046875
+      parent: 1
+- proto: RandomProduce
+  entities:
+  - uid: 175
+    components:
+    - type: Transform
+      pos: -0.5,3.5
+      parent: 1
+  - uid: 202
+    components:
+    - type: Transform
+      pos: -3.5,4.5
+      parent: 1
+  - uid: 203
+    components:
+    - type: Transform
+      pos: -2.5,-1.5
+      parent: 1
+  - uid: 204
+    components:
+    - type: Transform
+      pos: -5.5,-0.5
+      parent: 1
+  - uid: 205
+    components:
+    - type: Transform
+      pos: -4.5,1.5
+      parent: 1
+  - uid: 206
+    components:
+    - type: Transform
+      pos: -0.5,2.5
+      parent: 1
+  - uid: 207
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 1
+  - uid: 208
+    components:
+    - type: Transform
+      pos: 1.5,1.5
+      parent: 1
+  - uid: 209
+    components:
+    - type: Transform
+      pos: 4.5,0.5
+      parent: 1
+  - uid: 210
+    components:
+    - type: Transform
+      pos: 0.5,-4.5
+      parent: 1
+  - uid: 211
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 1
+  - uid: 212
+    components:
+    - type: Transform
+      pos: -1.5,1.5
+      parent: 1
+  - uid: 213
+    components:
+    - type: Transform
+      pos: 5.5,-0.5
+      parent: 1
+- proto: ShadowTree01
+  entities:
+  - uid: 107
+    components:
+    - type: Transform
+      pos: 2.2109375,3.4453125
+      parent: 1
+  - uid: 109
+    components:
+    - type: Transform
+      pos: -2.921875,1.453125
+      parent: 1
+  - uid: 111
+    components:
+    - type: Transform
+      pos: -5.078125,0.0234375
+      parent: 1
+  - uid: 192
+    components:
+    - type: Transform
+      pos: 2.3984375,0.796875
+      parent: 1
+  - uid: 196
+    components:
+    - type: Transform
+      pos: -6.3964796,-0.03136772
+      parent: 1
+  - uid: 197
+    components:
+    - type: Transform
+      pos: -6.0928297,-0.68256617
+      parent: 1
+  - uid: 237
+    components:
+    - type: Transform
+      pos: 2.1853876,-0.5390625
+      parent: 1
+- proto: ShadowTree02
+  entities:
+  - uid: 105
+    components:
+    - type: Transform
+      pos: -6.2734375,-0.28125
+      parent: 1
+  - uid: 110
+    components:
+    - type: Transform
+      pos: -1.1640625,4.5
+      parent: 1
+  - uid: 114
+    components:
+    - type: Transform
+      pos: 0.40625,-2.625
+      parent: 1
+  - uid: 194
+    components:
+    - type: Transform
+      pos: -6.5371046,1.2498822
+      parent: 1
+  - uid: 236
+    components:
+    - type: Transform
+      pos: 2.6307,-0.3046875
+      parent: 1
+- proto: ShadowTree03
+  entities:
+  - uid: 104
+    components:
+    - type: Transform
+      pos: -5.7578125,0.8203125
+      parent: 1
+- proto: ShadowTree04
+  entities:
+  - uid: 113
+    components:
+    - type: Transform
+      pos: 2.3515625,-4.5
+      parent: 1
+- proto: ShadowTree05
+  entities:
+  - uid: 112
+    components:
+    - type: Transform
+      pos: -4.375,-3.515625
+      parent: 1
+- proto: ShadowTree06
+  entities:
+  - uid: 106
+    components:
+    - type: Transform
+      pos: 2.1875,0.046875
+      parent: 1
+  - uid: 108
+    components:
+    - type: Transform
+      pos: 1.25,4.9453125
+      parent: 1
+  - uid: 195
+    components:
+    - type: Transform
+      pos: -6.2871046,0.28113228
+      parent: 1
+- proto: SpawnMobLuminousEntity
+  entities:
+  - uid: 12
+    components:
+    - type: Transform
+      pos: 4.5,2.5
+      parent: 1
+  - uid: 168
+    components:
+    - type: Transform
+      pos: 0.5,4.5
+      parent: 1
+  - uid: 170
+    components:
+    - type: Transform
+      pos: -1.5,-4.5
+      parent: 1
+  - uid: 171
+    components:
+    - type: Transform
+      pos: -0.5,-3.5
+      parent: 1
+  - uid: 179
+    components:
+    - type: Transform
+      pos: -4.5,-0.5
+      parent: 1
+  - uid: 181
+    components:
+    - type: Transform
+      pos: -4.5,3.5
+      parent: 1
+  - uid: 185
+    components:
+    - type: Transform
+      pos: 5.5,1.5
+      parent: 1
+- proto: SpawnMobLuminousObject
+  entities:
+  - uid: 174
+    components:
+    - type: Transform
+      pos: 5.5,0.5
+      parent: 1
+  - uid: 176
+    components:
+    - type: Transform
+      pos: -0.5,4.5
+      parent: 1
+  - uid: 177
+    components:
+    - type: Transform
+      pos: -4.5,-1.5
+      parent: 1
+  - uid: 183
+    components:
+    - type: Transform
+      pos: -2.5,4.5
+      parent: 1
+- proto: SpawnMobLuminousPerson
+  entities:
+  - uid: 11
+    components:
+    - type: Transform
+      pos: 5.5,-0.5
+      parent: 1
+  - uid: 186
+    components:
+    - type: Transform
+      pos: 0.5,3.5
+      parent: 1
+  - uid: 187
+    components:
+    - type: Transform
+      pos: -2.5,-3.5
+      parent: 1
+  - uid: 201
+    components:
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 1
+  - uid: 214
+    components:
+    - type: Transform
+      pos: 4.5,-1.5
+      parent: 1
+  - uid: 238
+    components:
+    - type: Transform
+      pos: 3.5,-0.5
+      parent: 1
+- proto: WallRockChromite
+  entities:
+  - uid: 4
+    components:
+    - type: Transform
+      pos: 7.5,-1.5
+      parent: 1
+  - uid: 5
+    components:
+    - type: Transform
+      pos: 6.5,0.5
+      parent: 1
+  - uid: 6
+    components:
+    - type: Transform
+      pos: 7.5,0.5
+      parent: 1
+  - uid: 7
+    components:
+    - type: Transform
+      pos: 7.5,1.5
+      parent: 1
+  - uid: 8
+    components:
+    - type: Transform
+      pos: 6.5,-3.5
+      parent: 1
+  - uid: 9
+    components:
+    - type: Transform
+      pos: 6.5,-2.5
+      parent: 1
+  - uid: 10
+    components:
+    - type: Transform
+      pos: 6.5,-1.5
+      parent: 1
+  - uid: 13
+    components:
+    - type: Transform
+      pos: 6.5,1.5
+      parent: 1
+  - uid: 14
+    components:
+    - type: Transform
+      pos: 6.5,2.5
+      parent: 1
+  - uid: 15
+    components:
+    - type: Transform
+      pos: 6.5,3.5
+      parent: 1
+  - uid: 16
+    components:
+    - type: Transform
+      pos: 5.5,2.5
+      parent: 1
+  - uid: 17
+    components:
+    - type: Transform
+      pos: 5.5,3.5
+      parent: 1
+  - uid: 18
+    components:
+    - type: Transform
+      pos: 5.5,4.5
+      parent: 1
+  - uid: 19
+    components:
+    - type: Transform
+      pos: 5.5,5.5
+      parent: 1
+  - uid: 20
+    components:
+    - type: Transform
+      pos: 6.5,-0.5
+      parent: 1
+  - uid: 21
+    components:
+    - type: Transform
+      pos: 4.5,3.5
+      parent: 1
+  - uid: 22
+    components:
+    - type: Transform
+      pos: 4.5,4.5
+      parent: 1
+  - uid: 23
+    components:
+    - type: Transform
+      pos: 4.5,5.5
+      parent: 1
+  - uid: 24
+    components:
+    - type: Transform
+      pos: 4.5,6.5
+      parent: 1
+  - uid: 25
+    components:
+    - type: Transform
+      pos: 3.5,0.5
+      parent: 1
+  - uid: 26
+    components:
+    - type: Transform
+      pos: 3.5,1.5
+      parent: 1
+  - uid: 27
+    components:
+    - type: Transform
+      pos: 3.5,2.5
+      parent: 1
+  - uid: 28
+    components:
+    - type: Transform
+      pos: 3.5,3.5
+      parent: 1
+  - uid: 29
+    components:
+    - type: Transform
+      pos: 3.5,4.5
+      parent: 1
+  - uid: 30
+    components:
+    - type: Transform
+      pos: 3.5,5.5
+      parent: 1
+  - uid: 31
+    components:
+    - type: Transform
+      pos: 3.5,6.5
+      parent: 1
+  - uid: 32
+    components:
+    - type: Transform
+      pos: 3.5,7.5
+      parent: 1
+  - uid: 33
+    components:
+    - type: Transform
+      pos: 2.5,1.5
+      parent: 1
+  - uid: 34
+    components:
+    - type: Transform
+      pos: 2.5,2.5
+      parent: 1
+  - uid: 35
+    components:
+    - type: Transform
+      pos: 2.5,5.5
+      parent: 1
+  - uid: 36
+    components:
+    - type: Transform
+      pos: 2.5,6.5
+      parent: 1
+  - uid: 37
+    components:
+    - type: Transform
+      pos: 2.5,7.5
+      parent: 1
+  - uid: 38
+    components:
+    - type: Transform
+      pos: 1.5,6.5
+      parent: 1
+  - uid: 39
+    components:
+    - type: Transform
+      pos: 1.5,7.5
+      parent: 1
+  - uid: 40
+    components:
+    - type: Transform
+      pos: 0.5,6.5
+      parent: 1
+  - uid: 41
+    components:
+    - type: Transform
+      pos: 0.5,7.5
+      parent: 1
+  - uid: 42
+    components:
+    - type: Transform
+      pos: -0.5,7.5
+      parent: 1
+  - uid: 43
+    components:
+    - type: Transform
+      pos: -0.5,6.5
+      parent: 1
+  - uid: 44
+    components:
+    - type: Transform
+      pos: -0.5,5.5
+      parent: 1
+  - uid: 45
+    components:
+    - type: Transform
+      pos: -1.5,5.5
+      parent: 1
+  - uid: 46
+    components:
+    - type: Transform
+      pos: -1.5,6.5
+      parent: 1
+  - uid: 47
+    components:
+    - type: Transform
+      pos: -2.5,5.5
+      parent: 1
+  - uid: 48
+    components:
+    - type: Transform
+      pos: -2.5,6.5
+      parent: 1
+  - uid: 49
+    components:
+    - type: Transform
+      pos: -3.5,5.5
+      parent: 1
+  - uid: 50
+    components:
+    - type: Transform
+      pos: -3.5,6.5
+      parent: 1
+  - uid: 51
+    components:
+    - type: Transform
+      pos: -4.5,5.5
+      parent: 1
+  - uid: 52
+    components:
+    - type: Transform
+      pos: -4.5,4.5
+      parent: 1
+  - uid: 53
+    components:
+    - type: Transform
+      pos: -5.5,5.5
+      parent: 1
+  - uid: 54
+    components:
+    - type: Transform
+      pos: -5.5,4.5
+      parent: 1
+  - uid: 55
+    components:
+    - type: Transform
+      pos: -5.5,3.5
+      parent: 1
+  - uid: 56
+    components:
+    - type: Transform
+      pos: -6.5,3.5
+      parent: 1
+  - uid: 57
+    components:
+    - type: Transform
+      pos: -6.5,2.5
+      parent: 1
+  - uid: 58
+    components:
+    - type: Transform
+      pos: -6.5,4.5
+      parent: 1
+  - uid: 59
+    components:
+    - type: Transform
+      pos: -6.5,-1.5
+      parent: 1
+  - uid: 60
+    components:
+    - type: Transform
+      pos: -6.5,-2.5
+      parent: 1
+  - uid: 61
+    components:
+    - type: Transform
+      pos: -6.5,-3.5
+      parent: 1
+  - uid: 62
+    components:
+    - type: Transform
+      pos: -5.5,-2.5
+      parent: 1
+  - uid: 63
+    components:
+    - type: Transform
+      pos: -5.5,-3.5
+      parent: 1
+  - uid: 64
+    components:
+    - type: Transform
+      pos: -5.5,-4.5
+      parent: 1
+  - uid: 65
+    components:
+    - type: Transform
+      pos: -4.5,-4.5
+      parent: 1
+  - uid: 66
+    components:
+    - type: Transform
+      pos: -3.5,-4.5
+      parent: 1
+  - uid: 67
+    components:
+    - type: Transform
+      pos: -3.5,-5.5
+      parent: 1
+  - uid: 68
+    components:
+    - type: Transform
+      pos: -2.5,-5.5
+      parent: 1
+  - uid: 69
+    components:
+    - type: Transform
+      pos: -1.5,-5.5
+      parent: 1
+  - uid: 70
+    components:
+    - type: Transform
+      pos: -0.5,-5.5
+      parent: 1
+  - uid: 71
+    components:
+    - type: Transform
+      pos: 0.5,-5.5
+      parent: 1
+  - uid: 72
+    components:
+    - type: Transform
+      pos: 1.5,-5.5
+      parent: 1
+  - uid: 73
+    components:
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 1
+  - uid: 74
+    components:
+    - type: Transform
+      pos: 3.5,-5.5
+      parent: 1
+  - uid: 75
+    components:
+    - type: Transform
+      pos: 2.5,-6.5
+      parent: 1
+  - uid: 76
+    components:
+    - type: Transform
+      pos: 1.5,-6.5
+      parent: 1
+  - uid: 77
+    components:
+    - type: Transform
+      pos: 0.5,-6.5
+      parent: 1
+  - uid: 78
+    components:
+    - type: Transform
+      pos: -0.5,-6.5
+      parent: 1
+  - uid: 79
+    components:
+    - type: Transform
+      pos: -1.5,-6.5
+      parent: 1
+  - uid: 80
+    components:
+    - type: Transform
+      pos: 3.5,-4.5
+      parent: 1
+  - uid: 81
+    components:
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 1
+  - uid: 82
+    components:
+    - type: Transform
+      pos: 4.5,-4.5
+      parent: 1
+  - uid: 83
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 1
+  - uid: 84
+    components:
+    - type: Transform
+      pos: 5.5,-4.5
+      parent: 1
+  - uid: 85
+    components:
+    - type: Transform
+      pos: 5.5,-3.5
+      parent: 1
+  - uid: 86
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 1
+  - uid: 87
+    components:
+    - type: Transform
+      pos: 4.5,-2.5
+      parent: 1
+  - uid: 88
+    components:
+    - type: Transform
+      pos: 5.5,-2.5
+      parent: 1
+  - uid: 89
+    components:
+    - type: Transform
+      pos: 5.5,-1.5
+      parent: 1
+  - uid: 90
+    components:
+    - type: Transform
+      pos: 3.5,-1.5
+      parent: 1
+  - uid: 91
+    components:
+    - type: Transform
+      pos: 2.5,-1.5
+      parent: 1
+  - uid: 92
+    components:
+    - type: Transform
+      pos: 2.5,-2.5
+      parent: 1
+  - uid: 93
+    components:
+    - type: Transform
+      pos: 1.5,-1.5
+      parent: 1
+  - uid: 94
+    components:
+    - type: Transform
+      pos: 1.5,-2.5
+      parent: 1
+  - uid: 95
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 1
+  - uid: 96
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 1
+  - uid: 97
+    components:
+    - type: Transform
+      pos: -0.5,-0.5
+      parent: 1
+  - uid: 98
+    components:
+    - type: Transform
+      pos: -1.5,-1.5
+      parent: 1
+  - uid: 99
+    components:
+    - type: Transform
+      pos: -1.5,-0.5
+      parent: 1
+  - uid: 100
+    components:
+    - type: Transform
+      pos: -1.5,0.5
+      parent: 1
+  - uid: 101
+    components:
+    - type: Transform
+      pos: -2.5,0.5
+      parent: 1
+  - uid: 102
+    components:
+    - type: Transform
+      pos: -3.5,0.5
+      parent: 1
+  - uid: 103
+    components:
+    - type: Transform
+      pos: -2.5,-0.5
+      parent: 1
+  - uid: 155
+    components:
+    - type: Transform
+      pos: 7.5,-0.5
+      parent: 1
+  - uid: 215
+    components:
+    - type: Transform
+      pos: 7.5,-2.5
+      parent: 1
+  - uid: 219
+    components:
+    - type: Transform
+      pos: 4.5,7.5
+      parent: 1
+  - uid: 220
+    components:
+    - type: Transform
+      pos: 7.5,2.5
+      parent: 1
+  - uid: 221
+    components:
+    - type: Transform
+      pos: 5.5,6.5
+      parent: 1
+  - uid: 222
+    components:
+    - type: Transform
+      pos: 6.5,5.5
+      parent: 1
+  - uid: 223
+    components:
+    - type: Transform
+      pos: 6.5,4.5
+      parent: 1
+  - uid: 224
+    components:
+    - type: Transform
+      pos: 7.5,3.5
+      parent: 1
+...
diff --git a/Resources/Maps/Shuttles/DeltaV/NTES_Propeller.yml b/Resources/Maps/Shuttles/DeltaV/NTES_Propeller.yml
new file mode 100644
index 0000000000..929103c42a
--- /dev/null
+++ b/Resources/Maps/Shuttles/DeltaV/NTES_Propeller.yml
@@ -0,0 +1,14893 @@
+meta:
+  format: 6
+  postmapinit: false
+tilemap:
+  0: Space
+  14: FloorBar
+  30: FloorDark
+  51: FloorGrassLight
+  61: FloorKitchen
+  77: FloorRGlass
+  78: FloorReinforced
+  92: FloorSteel
+  111: FloorWhite
+  123: Lattice
+  124: Plating
+entities:
+- proto: ""
+  entities:
+  - uid: 1
+    components:
+    - type: MetaData
+      name: NT Evac Propeller
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5625,0.671875
+      parent: invalid
+    - type: MapGrid
+      chunks:
+        -1,0:
+          ind: -1,0
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAABMwAAAAADMwAAAAABTQAAAAADTQAAAAAATQAAAAADTQAAAAABXAAAAAACPQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAMwAAAAAAMwAAAAAAMwAAAAABTQAAAAAATQAAAAACXAAAAAADTQAAAAAAXAAAAAADPQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAACTQAAAAABTQAAAAABTQAAAAABTQAAAAACTQAAAAABXAAAAAACTQAAAAADXAAAAAABTQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAACTQAAAAACTQAAAAABTQAAAAAATQAAAAAATQAAAAADXAAAAAACTQAAAAABTQAAAAACTQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAACXAAAAAAAXAAAAAADXAAAAAADTQAAAAAAXAAAAAACXAAAAAAAXAAAAAAAXAAAAAADXAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAACTQAAAAAATQAAAAACTQAAAAACTQAAAAADTQAAAAAAXAAAAAABTQAAAAACTQAAAAADTQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAABTQAAAAADTQAAAAAATQAAAAABTQAAAAAATQAAAAABXAAAAAAATQAAAAACXAAAAAACXAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAMwAAAAACMwAAAAACMwAAAAAATQAAAAACTQAAAAAAXAAAAAADTQAAAAACXAAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAMwAAAAACTQAAAAACTQAAAAADTQAAAAAATQAAAAADXAAAAAADHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAMwAAAAADTQAAAAACHgAAAAACHgAAAAADHgAAAAAAXAAAAAACHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAAATQAAAAABHgAAAAADHgAAAAABHgAAAAABTQAAAAACHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAABXAAAAAAAHgAAAAACHgAAAAADHgAAAAADXAAAAAAAHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAAATQAAAAADHgAAAAADHgAAAAABHgAAAAAAXAAAAAACXAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAAATQAAAAABHgAAAAAAHgAAAAACHgAAAAABTQAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAXAAAAAACXAAAAAADXAAAAAAAXAAAAAABHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAXAAAAAAD
+          version: 6
+        0,-1:
+          ind: 0,-1
+          tiles: TQAAAAAATQAAAAAATQAAAAADTQAAAAABTQAAAAADTQAAAAAATQAAAAADTQAAAAABXAAAAAADTQAAAAABXAAAAAADTQAAAAACTQAAAAADMwAAAAABewAAAAAAewAAAAAAXAAAAAADXAAAAAAAXAAAAAAAXAAAAAABXAAAAAABXAAAAAADXAAAAAACXAAAAAACXAAAAAADXAAAAAABXAAAAAABTQAAAAACTQAAAAACMwAAAAAAMwAAAAADMwAAAAABTQAAAAACTQAAAAADTQAAAAAATQAAAAACTQAAAAAATQAAAAABTQAAAAACTQAAAAABTQAAAAADTQAAAAADXAAAAAABTQAAAAACTQAAAAABTQAAAAAATQAAAAABTQAAAAAATQAAAAABTQAAAAABTQAAAAABTQAAAAADTQAAAAAATQAAAAACTQAAAAAATQAAAAABTQAAAAADTQAAAAABXAAAAAADTQAAAAABTQAAAAAATQAAAAABTQAAAAACTQAAAAABXAAAAAADXAAAAAABXAAAAAADXAAAAAAAXAAAAAACXAAAAAABXAAAAAABXAAAAAADXAAAAAABXAAAAAABXAAAAAABXAAAAAAATQAAAAAAXAAAAAAAXAAAAAAAXAAAAAADTQAAAAACTQAAAAABTQAAAAACTQAAAAABTQAAAAACTQAAAAACTQAAAAAATQAAAAAATQAAAAABTQAAAAABXAAAAAACTQAAAAABTQAAAAACTQAAAAACTQAAAAACTQAAAAAATQAAAAACXAAAAAABXAAAAAABXAAAAAADXAAAAAAAXAAAAAAATQAAAAACTQAAAAABXAAAAAACTQAAAAAAXAAAAAADTQAAAAADTQAAAAACTQAAAAAATQAAAAADTQAAAAADbwAAAAACbwAAAAAAbwAAAAAAbwAAAAABbwAAAAADbwAAAAAAbwAAAAACbwAAAAABXAAAAAACTQAAAAABXAAAAAACTQAAAAABTQAAAAACMwAAAAAAMwAAAAACMwAAAAABbwAAAAABbwAAAAADbwAAAAABbwAAAAAAbwAAAAABbwAAAAADbwAAAAADbwAAAAAAXAAAAAACTQAAAAAATQAAAAABTQAAAAADTQAAAAABMwAAAAAAMwAAAAABMwAAAAABbwAAAAACbwAAAAAATgAAAAAATgAAAAAATgAAAAAAbwAAAAADbwAAAAAAbwAAAAADTQAAAAAATQAAAAACXAAAAAADTQAAAAABTQAAAAACMwAAAAAAMwAAAAABMwAAAAADbwAAAAADbwAAAAABTQAAAAAATQAAAAAATQAAAAADbwAAAAADbwAAAAABbwAAAAACTQAAAAAATQAAAAADXAAAAAABTQAAAAADTQAAAAACTQAAAAADTQAAAAADTQAAAAADbwAAAAAAbwAAAAADTQAAAAAATQAAAAAATQAAAAABbwAAAAADbwAAAAADbwAAAAABTQAAAAACTQAAAAADXAAAAAADTQAAAAADTQAAAAAATQAAAAADTQAAAAAATQAAAAACXAAAAAACXAAAAAACXAAAAAACXAAAAAACXAAAAAADXAAAAAAAXAAAAAABTQAAAAADXAAAAAABTQAAAAABXAAAAAACXAAAAAABTQAAAAAAXAAAAAADXAAAAAADXAAAAAACDgAAAAACDgAAAAACDgAAAAADDgAAAAADDgAAAAABDgAAAAAADgAAAAADDgAAAAADTQAAAAACTQAAAAACXAAAAAADTQAAAAACTQAAAAACTQAAAAABTQAAAAABTQAAAAABDgAAAAADDgAAAAADDgAAAAAADgAAAAADDgAAAAACDgAAAAACDgAAAAADDgAAAAABTQAAAAAATQAAAAADXAAAAAACTQAAAAACTQAAAAACTQAAAAADTQAAAAACTQAAAAADPQAAAAAAPQAAAAAADgAAAAABDgAAAAABDgAAAAACDgAAAAAADgAAAAACTQAAAAABTQAAAAADTQAAAAACXAAAAAAATQAAAAAATQAAAAADMwAAAAABMwAAAAACMwAAAAAA
+          version: 6
+        -1,-1:
+          ind: -1,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAAATQAAAAAATQAAAAABXAAAAAACTQAAAAAAXAAAAAABTQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAMwAAAAACMwAAAAAAMwAAAAACTQAAAAAATQAAAAACXAAAAAACXAAAAAAAXAAAAAAAXAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAABTQAAAAADTQAAAAAATQAAAAACTQAAAAACTQAAAAAAXAAAAAADTQAAAAADTQAAAAADTQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAACTQAAAAABTQAAAAABTQAAAAACTQAAAAACTQAAAAABXAAAAAADTQAAAAAATQAAAAAATQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAABXAAAAAAAXAAAAAAAXAAAAAABTQAAAAADXAAAAAACXAAAAAADXAAAAAACXAAAAAACXAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAADTQAAAAAATQAAAAABTQAAAAACTQAAAAADTQAAAAACXAAAAAADTQAAAAADTQAAAAAATQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAATQAAAAACTQAAAAACTQAAAAAATQAAAAADTQAAAAAAXAAAAAADTQAAAAACXAAAAAADTQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAMwAAAAAAMwAAAAAAMwAAAAADTQAAAAACTQAAAAADXAAAAAADTQAAAAAAXAAAAAABbwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAACMwAAAAADMwAAAAADTQAAAAACTQAAAAACTQAAAAABTQAAAAABXAAAAAACbwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAMwAAAAADMwAAAAADMwAAAAABTQAAAAAATQAAAAACXAAAAAABTQAAAAABTQAAAAAAbwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAAAXAAAAAABXAAAAAABXAAAAAADTQAAAAADTQAAAAAAXAAAAAADTQAAAAABTQAAAAADbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAABTQAAAAABTQAAAAAATQAAAAADTQAAAAACTQAAAAACXAAAAAABTQAAAAACTQAAAAABbwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAACXAAAAAABXAAAAAAAXAAAAAAATQAAAAACXAAAAAABXAAAAAADTQAAAAACTQAAAAABTQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAADTQAAAAACTQAAAAABTQAAAAADTQAAAAACTQAAAAAAXAAAAAABTQAAAAAATQAAAAADDgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAACTQAAAAACTQAAAAACTQAAAAADTQAAAAADTQAAAAACXAAAAAAATQAAAAADTQAAAAABDgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAMwAAAAACMwAAAAABMwAAAAAATQAAAAAATQAAAAAAXAAAAAADTQAAAAAATQAAAAABTQAAAAAD
+          version: 6
+        0,0:
+          ind: 0,0
+          tiles: PQAAAAAAPQAAAAAADgAAAAACDgAAAAAADgAAAAADDgAAAAABDgAAAAABDgAAAAADXAAAAAABTQAAAAADTQAAAAADTQAAAAABTQAAAAADMwAAAAACMwAAAAACMwAAAAAAPQAAAAAAPQAAAAAADgAAAAADDgAAAAAADgAAAAACDgAAAAABDgAAAAAADgAAAAADXAAAAAACTQAAAAADXAAAAAABTQAAAAABTQAAAAAAMwAAAAAAMwAAAAACMwAAAAABTQAAAAAATQAAAAACXAAAAAADXAAAAAABTQAAAAAATQAAAAABTQAAAAACTQAAAAABXAAAAAAATQAAAAABXAAAAAACTQAAAAACTQAAAAAATQAAAAABTQAAAAADTQAAAAAATQAAAAADTQAAAAAATQAAAAABTQAAAAADTQAAAAACTQAAAAACTQAAAAAATQAAAAADTQAAAAADTQAAAAADXAAAAAAATQAAAAACTQAAAAACTQAAAAACTQAAAAABTQAAAAADXAAAAAAAXAAAAAACXAAAAAAAXAAAAAABXAAAAAAAXAAAAAAAXAAAAAABXAAAAAABXAAAAAACXAAAAAADXAAAAAABXAAAAAADTQAAAAABXAAAAAADXAAAAAAAXAAAAAACTQAAAAAATQAAAAAATQAAAAABTQAAAAABTQAAAAAATQAAAAACTQAAAAAATQAAAAABTQAAAAACTQAAAAAAXAAAAAAATQAAAAACTQAAAAACTQAAAAADTQAAAAACTQAAAAACTQAAAAACXAAAAAAAXAAAAAACXAAAAAAAXAAAAAACXAAAAAABTQAAAAADXAAAAAACXAAAAAABTQAAAAACXAAAAAAATQAAAAABTQAAAAABTQAAAAADTQAAAAABTQAAAAABHgAAAAACHgAAAAAATgAAAAAATgAAAAAATgAAAAAAHgAAAAACHgAAAAABHgAAAAAAXAAAAAADTQAAAAADXAAAAAAATQAAAAABTQAAAAADMwAAAAADMwAAAAACMwAAAAACHgAAAAACHgAAAAABTgAAAAAATgAAAAAATgAAAAAAHgAAAAABHgAAAAACHgAAAAAAXAAAAAAATQAAAAABTQAAAAACTQAAAAACTQAAAAACMwAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAADTgAAAAAATgAAAAAATgAAAAAAHgAAAAAAHgAAAAABHgAAAAADTQAAAAABHgAAAAACHgAAAAABHgAAAAADTQAAAAAAMwAAAAABewAAAAAAAAAAAAAAHgAAAAAAHgAAAAABHgAAAAACHgAAAAADHgAAAAABHgAAAAADHgAAAAADHgAAAAADTQAAAAADHgAAAAAAHgAAAAAAHgAAAAACTQAAAAAAMwAAAAABewAAAAAAAAAAAAAAHgAAAAADHgAAAAAAHgAAAAAAHgAAAAACHgAAAAAAHgAAAAAAHgAAAAACHgAAAAAATQAAAAABHgAAAAADHgAAAAABHgAAAAAAXAAAAAADMwAAAAACAAAAAAAAAAAAAAAAXAAAAAABXAAAAAADXAAAAAADXAAAAAAAXAAAAAACXAAAAAAAXAAAAAABXAAAAAACXAAAAAAAHgAAAAABHgAAAAAAHgAAAAAATQAAAAAAMwAAAAABewAAAAAAAAAAAAAAHgAAAAABHgAAAAACHgAAAAAAHgAAAAABHgAAAAACHgAAAAACHgAAAAACHgAAAAABTQAAAAADHgAAAAACHgAAAAABHgAAAAAATQAAAAADMwAAAAABAAAAAAAAAAAAAAAAHgAAAAADHgAAAAADHgAAAAACHgAAAAABHgAAAAABHgAAAAABHgAAAAACHgAAAAABXAAAAAACXAAAAAACXAAAAAABXAAAAAADewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAXAAAAAABHgAAAAABHgAAAAACHgAAAAADXAAAAAAAXAAAAAAAXAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        1,-1:
+          ind: 1,-1
+          tiles: ewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        1,0:
+          ind: 1,0
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -1,-2:
+          ind: -1,-2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAACHgAAAAABHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHgAAAAADHgAAAAADHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAABHgAAAAADHgAAAAAAXAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHgAAAAACHgAAAAADTQAAAAABXAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAAATQAAAAABTQAAAAADHgAAAAAAHgAAAAABTQAAAAAAXAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAMwAAAAADfAAAAAAATQAAAAABHgAAAAAAHgAAAAAATQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAADfAAAAAAATQAAAAABHgAAAAACHgAAAAADTQAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAMwAAAAABfAAAAAAATQAAAAABTQAAAAADTQAAAAAAHgAAAAACfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAMwAAAAACXAAAAAAATQAAAAACXAAAAAABTQAAAAAAXAAAAAABTQAAAAAC
+          version: 6
+        0,-2:
+          ind: 0,-2
+          tiles: fAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAABHgAAAAACHgAAAAADHgAAAAADHgAAAAADHgAAAAABHgAAAAAAHgAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAACfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAHgAAAAADHgAAAAADHgAAAAABfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAADHgAAAAABHgAAAAACHgAAAAACHgAAAAACfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAACHgAAAAACHgAAAAAAHgAAAAADfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAABfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAABHgAAAAACHgAAAAACHgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAACfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAADTQAAAAADHgAAAAAAHgAAAAADfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAAATQAAAAACHgAAAAABHgAAAAAATQAAAAAAfAAAAAAAMwAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATQAAAAADTQAAAAABHgAAAAADHgAAAAADTQAAAAACfAAAAAAAMwAAAAABewAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATQAAAAADTQAAAAACHgAAAAACHgAAAAAATQAAAAAAfAAAAAAAMwAAAAABAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAADTQAAAAABHgAAAAADTQAAAAACfAAAAAAAMwAAAAADAAAAAAAAAAAAAAAATQAAAAAATQAAAAAATQAAAAACTQAAAAADTQAAAAABTQAAAAABTQAAAAACTQAAAAABXAAAAAADTQAAAAACXAAAAAABTQAAAAADXAAAAAACMwAAAAAAewAAAAAAAAAAAAAA
+          version: 6
+        0,1:
+          ind: 0,1
+          tiles: AAAAAAAAewAAAAAAXAAAAAABXAAAAAADXAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -1,1:
+          ind: -1,1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        0,-3:
+          ind: 0,-3
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -1,-3:
+          ind: -1,-3
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+    - type: Broadphase
+    - type: Physics
+      bodyStatus: InAir
+      angularDamping: 0.05
+      linearDamping: 0.05
+      fixedRotation: False
+      bodyType: Dynamic
+    - type: Fixtures
+      fixtures: {}
+    - type: OccluderTree
+    - type: SpreaderGrid
+    - type: Shuttle
+    - type: GridPathfinding
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+    - type: DecalGrid
+      chunkCollection:
+        version: 2
+        nodes:
+        - node:
+            color: '#B02E26FF'
+            id: BrickTileSteelCornerNe
+          decals:
+            0: 7,11
+        - node:
+            color: '#B02E26FF'
+            id: BrickTileSteelCornerNw
+          decals:
+            1: -1,11
+        - node:
+            color: '#B02E26FF'
+            id: BrickTileSteelCornerSe
+          decals:
+            2: 7,7
+            3: 1,7
+        - node:
+            color: '#B02E26FF'
+            id: BrickTileSteelCornerSw
+          decals:
+            4: -1,7
+            5: 5,7
+        - node:
+            color: '#B02E26FF'
+            id: BrickTileSteelInnerSe
+          decals:
+            28: 1,10
+        - node:
+            color: '#B02E26FF'
+            id: BrickTileSteelInnerSw
+          decals:
+            29: 5,10
+        - node:
+            color: '#B02E26FF'
+            id: BrickTileSteelLineE
+          decals:
+            13: 7,10
+            14: 7,9
+            15: 7,8
+            16: 1,8
+            17: 1,9
+        - node:
+            color: '#B02E26FF'
+            id: BrickTileSteelLineN
+          decals:
+            6: 0,11
+            7: 1,11
+            8: 2,11
+            9: 3,11
+            10: 4,11
+            11: 5,11
+            12: 6,11
+            30: -1,5
+            31: 0,5
+            32: 1,5
+            33: 2,5
+            34: 3,5
+            35: 4,5
+            36: 5,5
+            37: 6,5
+            38: 7,5
+            39: 8,5
+            40: -2,5
+        - node:
+            color: '#B02E26FF'
+            id: BrickTileSteelLineS
+          decals:
+            23: 0,7
+            24: 6,7
+            25: 2,10
+            26: 3,10
+            27: 4,10
+        - node:
+            color: '#B02E26FF'
+            id: BrickTileSteelLineW
+          decals:
+            18: -1,10
+            19: -1,9
+            20: -1,8
+            21: 5,9
+            22: 5,8
+        - node:
+            color: '#334E6DFF'
+            id: BrickTileWhiteCornerNe
+          decals:
+            45: 7,14
+            46: 4,15
+            47: -3,13
+        - node:
+            color: '#91D4FFFF'
+            id: BrickTileWhiteCornerNe
+          decals:
+            86: 7,-5
+            103: 1,-5
+        - node:
+            color: '#BA9241FF'
+            id: BrickTileWhiteCornerNe
+          decals:
+            116: -2,-19
+            117: 11,-19
+            118: 9,-24
+            122: 6,-19
+        - node:
+            color: '#334E6DFF'
+            id: BrickTileWhiteCornerNw
+          decals:
+            48: -5,13
+            49: -1,14
+            50: 2,15
+        - node:
+            color: '#91D4FFFF'
+            id: BrickTileWhiteCornerNw
+          decals:
+            87: -1,-5
+            104: 5,-5
+        - node:
+            color: '#BA9241FF'
+            id: BrickTileWhiteCornerNw
+          decals:
+            119: -5,-19
+            120: -3,-24
+            121: 0,-19
+            123: 8,-19
+        - node:
+            color: '#334E6DFF'
+            id: BrickTileWhiteCornerSe
+          decals:
+            43: 7,13
+            44: -3,9
+        - node:
+            color: '#91D4FFFF'
+            id: BrickTileWhiteCornerSe
+          decals:
+            88: 7,-9
+        - node:
+            color: '#BA9241FF'
+            id: BrickTileWhiteCornerSe
+          decals:
+            124: 11,-21
+            125: 10,-22
+            126: 9,-25
+            127: 8,-27
+            128: -2,-22
+            129: 6,-20
+        - node:
+            color: '#334E6DFF'
+            id: BrickTileWhiteCornerSw
+          decals:
+            41: -5,9
+            42: -1,13
+        - node:
+            color: '#91D4FFFF'
+            id: BrickTileWhiteCornerSw
+          decals:
+            96: -1,-9
+        - node:
+            color: '#BA9241FF'
+            id: BrickTileWhiteCornerSw
+          decals:
+            130: -5,-21
+            131: -4,-22
+            132: 0,-20
+            133: -3,-25
+            134: -2,-27
+            135: 8,-22
+        - node:
+            color: '#334E6DFF'
+            id: BrickTileWhiteInnerNe
+          decals:
+            71: 4,14
+        - node:
+            color: '#334E6DFF'
+            id: BrickTileWhiteInnerNw
+          decals:
+            72: 2,14
+        - node:
+            color: '#BA9241FF'
+            id: BrickTileWhiteInnerSe
+          decals:
+            182: 8,-25
+            183: 10,-21
+        - node:
+            color: '#BA9241FF'
+            id: BrickTileWhiteInnerSw
+          decals:
+            175: -4,-21
+            176: -2,-25
+        - node:
+            color: '#334E6DFF'
+            id: BrickTileWhiteLineE
+          decals:
+            57: -3,10
+            58: -3,11
+            59: -3,12
+        - node:
+            color: '#91D4FFFF'
+            id: BrickTileWhiteLineE
+          decals:
+            100: 7,-8
+            101: 7,-7
+            102: 7,-6
+            107: 1,-6
+        - node:
+            color: '#BA9241FF'
+            id: BrickTileWhiteLineE
+          decals:
+            167: -2,-20
+            168: -2,-21
+            169: 11,-20
+            174: 8,-26
+        - node:
+            color: '#334E6DFF'
+            id: BrickTileWhiteLineN
+          decals:
+            51: -4,13
+            52: 0,14
+            53: 1,14
+            54: 3,15
+            55: 6,14
+            56: 5,14
+        - node:
+            color: '#91D4FFFF'
+            id: BrickTileWhiteLineN
+          decals:
+            105: 0,-5
+            106: 6,-5
+        - node:
+            color: '#BA9241FF'
+            id: BrickTileWhiteLineN
+          decals:
+            146: -2,-24
+            147: -1,-24
+            148: 0,-24
+            149: 1,-24
+            150: 2,-24
+            151: 3,-24
+            152: 4,-24
+            153: 5,-24
+            154: 6,-24
+            155: 7,-24
+            156: 8,-24
+            157: 1,-19
+            158: 2,-19
+            159: 3,-19
+            160: 4,-19
+            161: 5,-19
+            162: 9,-19
+            163: 10,-19
+            164: -3,-19
+            165: -4,-19
+        - node:
+            color: '#334E6DFF'
+            id: BrickTileWhiteLineS
+          decals:
+            63: -4,9
+            64: 0,13
+            65: 1,13
+            66: 2,13
+            67: 3,13
+            68: 4,13
+            69: 5,13
+            70: 6,13
+        - node:
+            color: '#91D4FFFF'
+            id: BrickTileWhiteLineS
+          decals:
+            89: 6,-9
+            90: 5,-9
+            91: 4,-9
+            92: 3,-9
+            93: 2,-9
+            94: 1,-9
+            95: 0,-9
+        - node:
+            color: '#BA9241FF'
+            id: BrickTileWhiteLineS
+          decals:
+            136: 9,-22
+            137: 7,-27
+            138: 6,-27
+            139: 5,-27
+            140: 4,-27
+            141: 3,-27
+            142: 2,-27
+            143: 1,-27
+            144: 0,-27
+            145: -1,-27
+            166: -3,-22
+            177: 1,-20
+            178: 2,-20
+            179: 3,-20
+            180: 4,-20
+            181: 5,-20
+        - node:
+            color: '#334E6DFF'
+            id: BrickTileWhiteLineW
+          decals:
+            60: -5,10
+            61: -5,11
+            62: -5,12
+        - node:
+            color: '#91D4FFFF'
+            id: BrickTileWhiteLineW
+          decals:
+            97: -1,-8
+            98: -1,-7
+            99: -1,-6
+            108: 5,-6
+        - node:
+            color: '#BA9241FF'
+            id: BrickTileWhiteLineW
+          decals:
+            170: -5,-20
+            171: 8,-20
+            172: 8,-21
+            173: -2,-26
+        - node:
+            color: '#FFFFFFFF'
+            id: BushAThree
+          decals:
+            307: 12.804497,9.619086
+            308: 14.764846,1.1706746
+            309: 13.889846,-8.990104
+            310: 12.811721,-16.335752
+            311: -6.4601245,-16.429502
+            312: -7.0538745,-8.738005
+        - node:
+            color: '#FFFFFFFF'
+            id: BushDThree
+          decals:
+            313: -8.553875,-7.3005047
+        - node:
+            color: '#FFFFFFFF'
+            id: Bushb2
+          decals:
+            304: -7.0770183,-6.7465653
+        - node:
+            color: '#FFFFFFFF'
+            id: Bushb3
+          decals:
+            306: -6.865152,6.800915
+        - node:
+            color: '#FFFFFFFF'
+            id: Bushc2
+          decals:
+            305: -7.6707683,1.165602
+        - node:
+            color: '#FFFFFFFF'
+            id: Bushj1
+          decals:
+            345: 14.490994,-0.75366926
+            346: 12.704702,-8.237985
+        - node:
+            color: '#FFFFFFFF'
+            id: Bushj3
+          decals:
+            344: 13.115994,0.027580738
+        - node:
+            color: '#FFFFFFFF'
+            id: Bushk2
+          decals:
+            314: -6.971112,-18.265469
+        - node:
+            color: '#FFFFFFFF'
+            id: Bushm1
+          decals:
+            342: 13.139432,7.2979603
+            343: 14.076932,0.95726824
+        - node:
+            color: '#FFFFFFFF'
+            id: Bushn1
+          decals:
+            315: 12.984519,-18.829172
+            316: -6.987802,11.466034
+            339: -7.911175,0.71791697
+            340: -7.1689873,-0.48520803
+            341: -8.509342,0.071397305
+        - node:
+            color: '#B02E26FF'
+            id: Delivery
+          decals:
+            79: 2,11
+            80: 3,11
+            81: 4,11
+        - node:
+            color: '#FFFFFFFF'
+            id: Delivery
+          decals:
+            73: 9,12
+            74: 9,11
+            75: 9,10
+            76: 11,10
+            77: 11,11
+            78: 11,12
+            184: -2,-26
+            185: -2,-27
+            186: 8,-26
+            187: 8,-27
+            188: 1,-24
+            189: 2,-24
+            190: 4,-24
+            191: 5,-24
+            192: 0,-20
+            193: 6,-20
+            194: 0,-22
+            195: 1,-22
+            196: 2,-22
+            197: 4,-22
+            198: 5,-22
+            199: 6,-22
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtHeavy
+          decals:
+            347: -2,-15
+            348: 5,-12
+            349: 6,-12
+            350: 10,-10
+            351: 5,-8
+            352: 0,-7
+            353: -1,-8
+            354: -1,-2
+            355: 4,-3
+            356: 4,0
+            357: 4,4
+            358: 0,3
+            359: -3,4
+            360: -5,6
+            361: -5,3
+            362: -7,3
+            363: -9,5
+            364: 10,5
+            365: 10,2
+            366: 9,1
+            367: 11,-4
+            368: 10,-6
+            369: 9,-10
+            370: 11,-16
+            371: 9,-20
+            372: 8,-21
+            373: 4,-20
+            374: 1,-19
+            375: -3,-20
+            376: -4,-21
+            377: -3,-22
+            378: -1,-25
+            379: 1,-27
+            380: 6,-26
+            381: 6,-25
+            382: 8,-25
+            383: 6,-30
+            384: 3,-34
+            385: 1,-32
+            386: 5,-33
+            387: 3,-30
+            388: 2,-36
+            389: 4,-38
+            390: 7,-38
+            391: -3,-15
+            392: -5,-10
+            393: -4,-10
+            394: -4,-3
+            395: -5,10
+            396: -3,13
+            397: 1,13
+            398: 5,14
+            399: 7,13
+            400: 0,9
+            401: 0,8
+            402: 6,8
+            403: 5,10
+            404: 10,12
+            405: 11,9
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtHeavyMonotile
+          decals:
+            406: 0,10
+            407: 1,9
+            408: 6,9
+            409: 10,6
+            410: 6,4
+            411: 9,2
+            412: 11,3
+            413: 14,3
+            414: 13,5
+            415: 10,-3
+            416: 5,-3
+            417: 1,0
+            418: -1,1
+            419: 5,0
+            420: 2,-2
+            421: 6,-2
+            422: -4,-4
+            423: -5,-3
+            424: -5,-1
+            425: -3,-6
+            426: -1,-6
+            427: 7,-6
+            428: 7,-9
+            429: -3,-12
+            430: -5,-17
+            431: 1,-16
+            432: 6,-17
+            433: 9,-16
+            434: 11,-17
+            435: 11,-19
+            436: 9,-24
+            437: 3,-27
+            438: 6,-31
+            439: -3,-25
+            440: -5,-20
+            441: -5,-16
+            442: 3,-14
+            443: 1,-6
+            444: 4,-6
+            445: 2,-7
+            446: 2,-1
+            447: -4,5
+            448: 6,10
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtLight
+          decals:
+            449: -4,13
+            450: -3,5
+            451: -2,4
+            452: 4,4
+            453: 1,4
+            454: 10,3
+            455: 10,-4
+            456: 7,-7
+            457: 9,-12
+            458: 0,-15
+            459: 6,-15
+            460: 5,-15
+            461: 9,-19
+            462: 10,-21
+            463: 8,-24
+            464: 4,-27
+            465: 0,-25
+            466: 0,-30
+            467: -4,-20
+            468: -8,-12
+            469: -4,-9
+            470: -9,-4
+            471: -8,4
+            472: 14,4
+            473: 13,-4
+            474: 13,-12
+            475: 11,-12
+            476: 15,-12
+            477: 10,-15
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtMedium
+          decals:
+            478: 4,-15
+            479: 7,-12
+            480: 0,-8
+            481: -5,-4
+            482: -8,-4
+            483: -7,4
+            484: -4,4
+            485: -3,9
+            486: 1,14
+            487: -1,10
+            488: 8,4
+            489: 15,4
+            490: 10,-5
+            491: 14,-12
+            492: 10,-20
+            493: 1,-25
+            494: 0,-31
+            495: -3,-24
+            496: 6,-27
+            497: -5,-20
+            498: -5,-15
+            499: 8,-20
+            500: 8,-24
+            501: -1,-5
+            502: -1,7
+            503: -5,10
+            504: -3,9
+            505: 5,14
+            506: 7,13
+        - node:
+            color: '#FFFFFFFF'
+            id: FlowersBROne
+          decals:
+            325: 14.072122,-8.212612
+        - node:
+            color: '#FFFFFFFF'
+            id: FlowersBRTwo
+          decals:
+            326: 14.618997,-6.8532376
+        - node:
+            color: '#FFFFFFFF'
+            id: Flowersbr1
+          decals:
+            296: 13.060454,-8.141483
+            297: 13.162017,8.219303
+            298: 12.677642,11.842984
+            299: -6.678396,11.749234
+            300: -8.842644,-0.6058136
+            301: -7.3348308,-14.903952
+        - node:
+            color: '#FFFFFFFF'
+            id: Flowersbr2
+          decals:
+            327: 13.384622,-8.790737
+        - node:
+            color: '#FFFFFFFF'
+            id: Flowersbr3
+          decals:
+            302: -6.8426433,-19.2149
+        - node:
+            color: '#FFFFFFFF'
+            id: Flowerspv1
+          decals:
+            318: -6.972177,1.0421443
+            331: -7.5654354,7.0316067
+        - node:
+            color: '#FFFFFFFF'
+            id: Flowerspv2
+          decals:
+            317: -8.2534275,-1.0437932
+            332: -6.7685604,7.5812607
+            333: 12.863869,8.440636
+            334: 13.754494,0.3390727
+        - node:
+            color: '#FFFFFFFF'
+            id: Flowerspv3
+          decals:
+            319: -8.370615,-9.02503
+            335: 12.795735,-6.759691
+            336: 13.733235,-8.475926
+            337: 13.035806,-15.623274
+            338: 12.699868,-20.64732
+        - node:
+            color: '#FFFFFFFF'
+            id: Flowersy1
+          decals:
+            321: -8.037345,-7.713258
+        - node:
+            color: '#FFFFFFFF'
+            id: Flowersy3
+          decals:
+            303: -7.3660808,-8.01219
+            320: -8.6440525,-8.470343
+            322: -7.6042743,-6.9569654
+            323: -6.8792906,-19.848684
+            324: 13.736184,-7.8532376
+        - node:
+            color: '#FFFFFFFF'
+            id: Flowersy4
+          decals:
+            328: 13.290872,0.6521311
+            329: 12.751809,9.01808
+            330: -6.7216854,9.305044
+        - node:
+            color: '#FFFFFFFF'
+            id: Grassa1
+          decals:
+            265: -6.957039,10.046124
+            266: -6.4602795,9.045384
+            267: -8.514967,6.615697
+            268: -6.718092,-0.23826182
+            269: -8.913404,-9.378304
+            270: -6.671217,-14.888496
+            271: -6.577467,-20.558512
+            272: 12.467425,-19.285074
+            273: 12.62706,-9.163324
+            274: 14.25206,-0.016394615
+        - node:
+            color: '#FFFFFFFF'
+            id: Grassb1
+          decals:
+            257: -8.611971,1.0849676
+            258: -7.127596,-0.9150324
+            259: -7.0199404,-7.71227
+            260: -6.662537,-19.883926
+            261: 12.889915,-14.801397
+            262: 14.944603,-0.8122648
+            263: 12.694603,7.2785254
+            264: -6.503914,12.132062
+        - node:
+            color: '#FFFFFFFF'
+            id: Grassb4
+          decals:
+            275: 12.858477,-0.015170097
+            276: 13.866289,6.6957674
+            277: 12.655352,12.5601425
+            278: -6.6879063,12.8878975
+            279: -6.6158834,0.38787055
+            280: -8.873695,-7.8524575
+            281: -6.9127584,-17.44151
+            282: 13.157625,-20.261635
+        - node:
+            color: '#FFFFFFFF'
+            id: Rock01
+          decals:
+            283: 14.563875,-14.755343
+            284: 13.337313,-7.514801
+            285: 14.7045,6.9149504
+            286: -8.3399315,0.36978865
+            287: -6.746181,-15.854146
+        - node:
+            color: '#FFFFFFFF'
+            id: Rock03
+          decals:
+            288: -8.3399315,-8.373338
+            289: -7.8164935,-0.4678113
+            290: -6.699306,8.1197605
+            291: 12.788823,10.2291355
+            292: 13.406011,-0.6160376
+            293: 12.843511,-17.471735
+        - node:
+            color: '#FFFFFFFF'
+            id: Rock04
+          decals:
+            295: 14.921458,-7.971257
+        - node:
+            color: '#FFFFFFFF'
+            id: Rock05
+          decals:
+            294: 14.477363,-8.660469
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerNE
+          decals:
+            203: 4,-29
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerNW
+          decals:
+            200: 2,-29
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSE
+          decals:
+            201: 4,-30
+            235: 4,-40
+            236: 5,-34
+            237: 6,-32
+            238: 7,-31
+            239: 8,-29
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSW
+          decals:
+            202: 2,-30
+            240: -2,-29
+            241: -1,-31
+            242: 0,-32
+            243: 1,-34
+            244: 2,-40
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallNE
+          decals:
+            115: 1,-8
+            231: 4,-38
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallNW
+          decals:
+            114: 5,-8
+            230: 2,-38
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallSE
+          decals:
+            220: 4,-38
+            221: 4,-34
+            222: 5,-32
+            223: 6,-31
+            224: 7,-29
+            234: 3,-40
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallSW
+          decals:
+            225: -1,-29
+            226: 0,-31
+            227: 1,-32
+            228: 2,-34
+            229: 2,-38
+            233: 3,-40
+        - node:
+            color: '#B02E26FF'
+            id: WarnEndE
+          decals:
+            83: 4,9
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnEndE
+          decals:
+            207: 8,-38
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnEndS
+          decals:
+            232: 3,-41
+        - node:
+            color: '#B02E26FF'
+            id: WarnEndW
+          decals:
+            82: 2,9
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnEndW
+          decals:
+            206: -2,-38
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineE
+          decals:
+            112: 1,-7
+            251: 5,-33
+            252: 7,-30
+            253: 4,-35
+            254: 4,-36
+            255: 4,-37
+            256: 4,-39
+        - node:
+            color: '#B02E26FF'
+            id: WarnLineN
+          decals:
+            84: 3,9
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineN
+          decals:
+            204: 3,-30
+            208: -1,-38
+            209: 0,-38
+            210: 1,-38
+            211: 5,-38
+            212: 6,-38
+            213: 7,-38
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineS
+          decals:
+            113: 5,-7
+            245: 2,-39
+            246: 2,-36
+            247: 2,-37
+            248: 2,-35
+            249: 1,-33
+            250: -1,-30
+        - node:
+            color: '#B02E26FF'
+            id: WarnLineW
+          decals:
+            85: 3,9
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineW
+          decals:
+            109: 2,-8
+            110: 3,-8
+            111: 4,-8
+            205: 3,-29
+            214: -1,-38
+            215: 0,-38
+            216: 1,-38
+            217: 5,-38
+            218: 6,-38
+            219: 7,-38
+    - type: GridAtmosphere
+      version: 2
+      data:
+        tiles:
+          0,0:
+            0: 65535
+          -1,0:
+            0: 65535
+          -1,-1:
+            0: 65535
+          0,-1:
+            0: 65535
+          0,1:
+            0: 65535
+          -4,0:
+            0: 61166
+          -4,1:
+            0: 14
+          -3,0:
+            0: 65535
+          -3,1:
+            0: 61167
+          -3,2:
+            0: 238
+          -2,0:
+            0: 65535
+          -2,1:
+            0: 65535
+          -2,2:
+            0: 61183
+          -1,1:
+            0: 65535
+          -1,2:
+            0: 65535
+          -4,-4:
+            0: 61166
+          -4,-3:
+            0: 61166
+          -4,-2:
+            0: 61166
+          -4,-1:
+            0: 61166
+          -3,-4:
+            0: 65535
+          -3,-3:
+            0: 65535
+          -3,-2:
+            0: 65535
+          -3,-1:
+            0: 65535
+          -2,-4:
+            0: 65535
+          -2,-3:
+            0: 65535
+          -2,-2:
+            0: 65535
+          -2,-1:
+            0: 65535
+          -1,-4:
+            0: 65535
+          -1,-3:
+            0: 65535
+          -1,-2:
+            0: 65535
+          0,-4:
+            0: 65535
+          0,-3:
+            0: 65535
+          0,-2:
+            0: 65535
+          -4,-5:
+            0: 61152
+          -3,-5:
+            0: 65520
+          -2,-6:
+            0: 65535
+          -2,-5:
+            0: 65535
+          -1,-6:
+            0: 65535
+          -1,-5:
+            0: 65535
+          0,-6:
+            0: 63743
+            1: 1792
+          0,-5:
+            0: 65535
+          -3,-7:
+            0: 34816
+          -3,-6:
+            0: 2184
+          -2,-7:
+            0: 65420
+          -1,-7:
+            0: 65535
+          0,-7:
+            0: 65535
+          1,-4:
+            0: 65535
+          1,-3:
+            0: 65535
+          1,-2:
+            0: 65535
+          1,-1:
+            0: 65535
+          2,-4:
+            0: 65535
+          2,-3:
+            0: 65535
+          2,-2:
+            0: 65535
+          2,-1:
+            0: 65535
+          3,-4:
+            0: 65535
+          3,-3:
+            0: 65535
+          3,-2:
+            0: 65535
+          3,-1:
+            0: 65535
+          0,2:
+            0: 65535
+          1,0:
+            0: 65535
+          1,1:
+            0: 65535
+          1,2:
+            0: 65535
+          2,0:
+            0: 65535
+          2,1:
+            0: 65535
+          2,2:
+            0: 65535
+          3,0:
+            0: 65535
+          3,1:
+            0: 65535
+          3,2:
+            0: 14195
+          4,-4:
+            0: 4369
+          4,-3:
+            0: 4369
+          4,-2:
+            0: 4368
+          4,-1:
+            0: 4369
+          4,0:
+            0: 4368
+          4,1:
+            0: 4369
+          -2,3:
+            0: 3310
+          -1,3:
+            0: 65535
+          0,3:
+            0: 65535
+          1,3:
+            0: 65535
+          2,3:
+            0: 16383
+          3,3:
+            0: 311
+          1,-6:
+            0: 63743
+            2: 1792
+          1,-5:
+            0: 65535
+          1,-7:
+            0: 65535
+          2,-7:
+            0: 30719
+          2,-6:
+            0: 65535
+          2,-5:
+            0: 65535
+          3,-7:
+            0: 1
+          3,-6:
+            0: 12560
+          3,-5:
+            0: 29495
+          0,4:
+            0: 14
+          1,4:
+            0: 15
+          -1,4:
+            0: 8
+          -1,-8:
+            0: 51328
+          0,-8:
+            0: 65535
+          1,-8:
+            0: 65527
+          2,-8:
+            0: 4096
+          0,-10:
+            0: 65532
+          0,-9:
+            0: 61132
+          0,-11:
+            0: 32768
+          1,-10:
+            0: 65521
+          1,-9:
+            0: 13073
+          2,-10:
+            0: 4880
+          -1,-10:
+            0: 52928
+        uniqueMixes:
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.824879
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 6666.982
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 0
+          - 6666.982
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        chunkSize: 4
+    - type: GasTileOverlay
+    - type: RadiationGridResistance
+- proto: AirAlarm
+  entities:
+  - uid: 1885
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,2.5
+      parent: 1
+    - type: DeviceList
+      devices:
+      - 79
+      - 78
+      - 23
+      - 246
+      - 90
+      - 262
+      - 263
+      - 91
+      - 1595
+      - 1902
+      - 1594
+      - 1347
+      - 1350
+      - 1593
+      - 1348
+      - 1349
+      - 1901
+      - 1596
+      - 1598
+      - 1592
+      - 1591
+    - type: AtmosDevice
+      joinedGrid: 1
+  - uid: 1887
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,8.5
+      parent: 1
+    - type: DeviceList
+      devices:
+      - 682
+      - 23
+      - 246
+      - 1594
+      - 1593
+      - 1596
+      - 1598
+      - 1364
+      - 1363
+    - type: AtmosDevice
+      joinedGrid: 1
+  - uid: 1888
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,12.5
+      parent: 1
+    - type: DeviceList
+      devices:
+      - 1596
+      - 1352
+      - 1126
+      - 1593
+      - 1594
+      - 1598
+      - 289
+      - 288
+      - 682
+      - 679
+      - 1597
+    - type: AtmosDevice
+      joinedGrid: 1
+  - uid: 1889
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,9.5
+      parent: 1
+    - type: DeviceList
+      devices:
+      - 1594
+      - 1593
+      - 1353
+      - 1595
+      - 1351
+      - 263
+      - 91
+    - type: AtmosDevice
+      joinedGrid: 1
+  - uid: 1890
+    components:
+    - type: Transform
+      pos: 1.5,15.5
+      parent: 1
+    - type: DeviceList
+      devices:
+      - 1597
+      - 1390
+      - 1383
+      - 1596
+      - 679
+    - type: AtmosDevice
+      joinedGrid: 1
+  - uid: 1891
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-3.5
+      parent: 1
+    - type: DeviceList
+      devices:
+      - 1591
+      - 1401
+      - 1599
+      - 1400
+      - 1592
+      - 87
+      - 86
+    - type: AtmosDevice
+      joinedGrid: 1
+  - uid: 1892
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-7.5
+      parent: 1
+    - type: DeviceList
+      devices:
+      - 1398
+      - 1600
+      - 1399
+      - 88
+      - 295
+      - 1592
+      - 1591
+    - type: AtmosDevice
+      joinedGrid: 1
+  - uid: 1893
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-20.5
+      parent: 1
+    - type: DeviceList
+      devices:
+      - 973
+      - 1562
+      - 85
+      - 1737
+      - 21
+      - 722
+      - 762
+      - 1589
+    - type: AtmosDevice
+      joinedGrid: 1
+  - uid: 1894
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,-15.5
+      parent: 1
+    - type: DeviceList
+      devices:
+      - 1339
+      - 1341
+      - 1589
+      - 1590
+      - 1342
+      - 1340
+      - 1738
+      - 1739
+      - 971
+      - 1737
+      - 21
+      - 973
+      - 1592
+      - 1591
+      - 1898
+      - 1899
+      - 89
+      - 93
+      - 80
+      - 286
+    - type: AtmosDevice
+      joinedGrid: 1
+  - uid: 1895
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-20.5
+      parent: 1
+    - type: DeviceList
+      devices:
+      - 681
+      - 689
+      - 1738
+      - 1739
+      - 971
+      - 1601
+      - 762
+      - 1755
+      - 1756
+      - 1590
+      - 1589
+    - type: AtmosDevice
+      joinedGrid: 1
+  - uid: 1896
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-25.5
+      parent: 1
+    - type: DeviceList
+      devices:
+      - 681
+      - 722
+      - 727
+      - 762
+      - 726
+      - 971
+      - 973
+    - type: AtmosDevice
+      joinedGrid: 1
+  - uid: 1904
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-0.5
+      parent: 1
+    - type: DeviceList
+      devices:
+      - 1590
+      - 1589
+      - 1592
+      - 1345
+      - 1343
+      - 1900
+      - 1593
+      - 1600
+      - 80
+      - 286
+      - 295
+      - 78
+      - 79
+      - 86
+      - 1599
+    - type: AtmosDevice
+      joinedGrid: 1
+  - uid: 1905
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-3.5
+      parent: 1
+    - type: DeviceList
+      devices:
+      - 89
+      - 93
+      - 88
+      - 1600
+      - 1591
+      - 1346
+      - 1344
+      - 1903
+      - 262
+      - 90
+      - 87
+      - 1590
+      - 1589
+      - 1599
+      - 1594
+    - type: AtmosDevice
+      joinedGrid: 1
+- proto: AirlockAtmosphericsGlassLocked
+  entities:
+  - uid: 833
+    components:
+    - type: Transform
+      pos: 9.5,-22.5
+      parent: 1
+  - uid: 1570
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-18.5
+      parent: 1
+  - uid: 1571
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-17.5
+      parent: 1
+  - uid: 1748
+    components:
+    - type: Transform
+      pos: 11.5,-17.5
+      parent: 1
+- proto: AirlockCommandGlassLocked
+  entities:
+  - uid: 47
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,8.5
+      parent: 1
+  - uid: 71
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,8.5
+      parent: 1
+  - uid: 663
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,13.5
+      parent: 1
+- proto: AirlockEngineeringGlassLocked
+  entities:
+  - uid: 967
+    components:
+    - type: Transform
+      pos: -2.5,-17.5
+      parent: 1
+  - uid: 1524
+    components:
+    - type: Transform
+      pos: -2.5,-22.5
+      parent: 1
+  - uid: 1747
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-17.5
+      parent: 1
+- proto: AirlockExternalEngineeringLocked
+  entities:
+  - uid: 1636
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-27.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 1635
+      - 1637
+    - type: DeviceLinkSource
+      linkedPorts:
+        1637:
+        - DoorStatus: DoorBolt
+        1635:
+        - DoorStatus: DoorBolt
+  - uid: 1640
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-27.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 1635
+      - 1637
+    - type: DeviceLinkSource
+      linkedPorts:
+        1635:
+        - DoorStatus: DoorBolt
+        1637:
+        - DoorStatus: DoorBolt
+- proto: AirlockExternalGlassEasyPry
+  entities:
+  - uid: 25
+    components:
+    - type: Transform
+      pos: 12.5,-2.5
+      parent: 1
+  - uid: 27
+    components:
+    - type: Transform
+      pos: 12.5,5.5
+      parent: 1
+  - uid: 53
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-10.5
+      parent: 1
+  - uid: 61
+    components:
+    - type: Transform
+      pos: 12.5,-12.5
+      parent: 1
+  - uid: 103
+    components:
+    - type: Transform
+      pos: 12.5,3.5
+      parent: 1
+  - uid: 119
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-12.5
+      parent: 1
+  - uid: 267
+    components:
+    - type: Transform
+      pos: 12.5,-4.5
+      parent: 1
+  - uid: 303
+    components:
+    - type: Transform
+      pos: 12.5,-10.5
+      parent: 1
+  - uid: 333
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-2.5
+      parent: 1
+  - uid: 338
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,5.5
+      parent: 1
+  - uid: 339
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,3.5
+      parent: 1
+  - uid: 354
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-4.5
+      parent: 1
+- proto: AirlockExternalGlassLocked
+  entities:
+  - uid: 1635
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-30.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 1636
+      - 1640
+    - type: DeviceLinkSource
+      linkedPorts:
+        1636:
+        - DoorStatus: DoorBolt
+        1640:
+        - DoorStatus: DoorBolt
+  - uid: 1637
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-30.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 1636
+      - 1640
+    - type: DeviceLinkSource
+      linkedPorts:
+        1636:
+        - DoorStatus: DoorBolt
+        1640:
+        - DoorStatus: DoorBolt
+- proto: AirlockGlass
+  entities:
+  - uid: 26
+    components:
+    - type: Transform
+      pos: -4.5,-7.5
+      parent: 1
+  - uid: 36
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-1.5
+      parent: 1
+  - uid: 38
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,8.5
+      parent: 1
+  - uid: 43
+    components:
+    - type: Transform
+      pos: 11.5,-7.5
+      parent: 1
+  - uid: 128
+    components:
+    - type: Transform
+      pos: -4.5,0.5
+      parent: 1
+  - uid: 134
+    components:
+    - type: Transform
+      pos: 11.5,0.5
+      parent: 1
+  - uid: 170
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,8.5
+      parent: 1
+  - uid: 224
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-1.5
+      parent: 1
+  - uid: 229
+    components:
+    - type: Transform
+      pos: 9.5,-7.5
+      parent: 1
+  - uid: 306
+    components:
+    - type: Transform
+      pos: -2.5,0.5
+      parent: 1
+  - uid: 1409
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-7.5
+      parent: 1
+  - uid: 1505
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,0.5
+      parent: 1
+- proto: AirlockGlassShuttleEasyPry
+  entities:
+  - uid: 63
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,5.5
+      parent: 1
+  - uid: 66
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-4.5
+      parent: 1
+  - uid: 115
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-10.5
+      parent: 1
+  - uid: 116
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-12.5
+      parent: 1
+  - uid: 158
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,-4.5
+      parent: 1
+  - uid: 159
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,-10.5
+      parent: 1
+  - uid: 201
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,3.5
+      parent: 1
+  - uid: 249
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,-12.5
+      parent: 1
+  - uid: 271
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,-2.5
+      parent: 1
+  - uid: 272
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,5.5
+      parent: 1
+  - uid: 293
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,3.5
+      parent: 1
+  - uid: 347
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-2.5
+      parent: 1
+- proto: AirlockMedicalGlassLocked
+  entities:
+  - uid: 183
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-5.5
+      parent: 1
+  - uid: 312
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-5.5
+      parent: 1
+- proto: AirlockSecurityGlassLocked
+  entities:
+  - uid: 680
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,10.5
+      parent: 1
+- proto: AirlockSecurityLawyerGlassLocked
+  entities:
+  - uid: 612
+    components:
+    - type: Transform
+      pos: 0.5,6.5
+      parent: 1
+  - uid: 633
+    components:
+    - type: Transform
+      pos: 6.5,6.5
+      parent: 1
+- proto: AirSensor
+  entities:
+  - uid: 762
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-26.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1896
+      - 1895
+      - 1893
+  - uid: 971
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,-20.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1896
+      - 1895
+      - 1894
+  - uid: 973
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-20.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1896
+      - 1893
+      - 1894
+  - uid: 1589
+    components:
+    - type: Transform
+      pos: -3.5,-12.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1895
+      - 1893
+      - 1894
+      - 1904
+      - 1905
+  - uid: 1590
+    components:
+    - type: Transform
+      pos: 10.5,-12.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1895
+      - 1894
+      - 1904
+      - 1905
+  - uid: 1591
+    components:
+    - type: Transform
+      pos: 10.5,-4.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1894
+      - 1892
+      - 1905
+      - 1891
+      - 1885
+  - uid: 1592
+    components:
+    - type: Transform
+      pos: -3.5,-4.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1894
+      - 1904
+      - 1892
+      - 1891
+      - 1885
+  - uid: 1593
+    components:
+    - type: Transform
+      pos: -3.5,3.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1904
+      - 1885
+      - 1889
+      - 1888
+      - 1887
+  - uid: 1594
+    components:
+    - type: Transform
+      pos: 10.5,3.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1905
+      - 1885
+      - 1889
+      - 1888
+      - 1887
+  - uid: 1595
+    components:
+    - type: Transform
+      pos: 10.5,11.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1885
+      - 1889
+  - uid: 1596
+    components:
+    - type: Transform
+      pos: -3.5,11.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1885
+      - 1888
+      - 1887
+      - 1890
+  - uid: 1597
+    components:
+    - type: Transform
+      pos: 3.5,13.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1890
+      - 1888
+  - uid: 1598
+    components:
+    - type: Transform
+      pos: 3.5,11.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1885
+      - 1888
+      - 1887
+  - uid: 1599
+    components:
+    - type: Transform
+      pos: 3.5,-1.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1904
+      - 1905
+      - 1891
+  - uid: 1600
+    components:
+    - type: Transform
+      pos: 3.5,-7.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1904
+      - 1892
+      - 1905
+  - uid: 1601
+    components:
+    - type: Transform
+      pos: 3.5,-19.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1895
+  - uid: 1898
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -8.5,-11.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1894
+  - uid: 1899
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 15.5,-11.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1894
+  - uid: 1900
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -8.5,-3.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1904
+  - uid: 1901
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -8.5,4.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1885
+  - uid: 1902
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 15.5,4.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1885
+  - uid: 1903
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 15.5,-3.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1905
+- proto: APCBasic
+  entities:
+  - uid: 557
+    components:
+    - type: MetaData
+      name: Sitting Area APC
+    - type: Transform
+      pos: 3.5,-9.5
+      parent: 1
+  - uid: 1506
+    components:
+    - type: MetaData
+      name: Central APC
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-3.5
+      parent: 1
+  - uid: 1507
+    components:
+    - type: MetaData
+      name: Bridge APC
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,12.5
+      parent: 1
+  - uid: 1690
+    components:
+    - type: MetaData
+      name: Engineering APC
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-27.5
+      parent: 1
+- proto: ArrivalsShuttleTimer
+  entities:
+  - uid: 605
+    components:
+    - type: Transform
+      pos: -5.5,-3.5
+      parent: 1
+  - uid: 606
+    components:
+    - type: Transform
+      pos: -5.5,-11.5
+      parent: 1
+  - uid: 607
+    components:
+    - type: Transform
+      pos: -5.5,4.5
+      parent: 1
+  - uid: 608
+    components:
+    - type: Transform
+      pos: 12.5,4.5
+      parent: 1
+  - uid: 609
+    components:
+    - type: Transform
+      pos: 12.5,-3.5
+      parent: 1
+  - uid: 610
+    components:
+    - type: Transform
+      pos: 12.5,-11.5
+      parent: 1
+- proto: AtmosDeviceFanTiny
+  entities:
+  - uid: 49
+    components:
+    - type: Transform
+      pos: 16.5,3.5
+      parent: 1
+  - uid: 50
+    components:
+    - type: Transform
+      pos: 16.5,-2.5
+      parent: 1
+  - uid: 112
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-10.5
+      parent: 1
+  - uid: 114
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-12.5
+      parent: 1
+  - uid: 180
+    components:
+    - type: Transform
+      pos: 16.5,-12.5
+      parent: 1
+  - uid: 226
+    components:
+    - type: Transform
+      pos: 16.5,5.5
+      parent: 1
+  - uid: 241
+    components:
+    - type: Transform
+      pos: 16.5,-10.5
+      parent: 1
+  - uid: 294
+    components:
+    - type: Transform
+      pos: 16.5,-4.5
+      parent: 1
+  - uid: 355
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,5.5
+      parent: 1
+  - uid: 356
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,3.5
+      parent: 1
+  - uid: 357
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-2.5
+      parent: 1
+  - uid: 358
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-4.5
+      parent: 1
+- proto: AtmosFixNitrogenMarker
+  entities:
+  - uid: 552
+    components:
+    - type: Transform
+      pos: 4.5,-21.5
+      parent: 1
+  - uid: 553
+    components:
+    - type: Transform
+      pos: 5.5,-21.5
+      parent: 1
+  - uid: 554
+    components:
+    - type: Transform
+      pos: 6.5,-21.5
+      parent: 1
+- proto: AtmosFixOxygenMarker
+  entities:
+  - uid: 548
+    components:
+    - type: Transform
+      pos: 0.5,-21.5
+      parent: 1
+  - uid: 549
+    components:
+    - type: Transform
+      pos: 1.5,-21.5
+      parent: 1
+  - uid: 550
+    components:
+    - type: Transform
+      pos: 2.5,-21.5
+      parent: 1
+- proto: BenchSofaCorpLeft
+  entities:
+  - uid: 45
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-19.5
+      parent: 1
+  - uid: 268
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-12.5
+      parent: 1
+  - uid: 595
+    components:
+    - type: Transform
+      pos: 4.5,-13.5
+      parent: 1
+  - uid: 599
+    components:
+    - type: Transform
+      pos: 7.5,-13.5
+      parent: 1
+  - uid: 676
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-20.5
+      parent: 1
+  - uid: 718
+    components:
+    - type: Transform
+      pos: 0.5,-13.5
+      parent: 1
+  - uid: 759
+    components:
+    - type: Transform
+      pos: 7.5,-10.5
+      parent: 1
+  - uid: 760
+    components:
+    - type: Transform
+      pos: 4.5,-10.5
+      parent: 1
+  - uid: 831
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-20.5
+      parent: 1
+  - uid: 939
+    components:
+    - type: Transform
+      pos: 0.5,-10.5
+      parent: 1
+  - uid: 972
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-19.5
+      parent: 1
+  - uid: 1511
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,3.5
+      parent: 1
+  - uid: 1512
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,3.5
+      parent: 1
+  - uid: 1515
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,3.5
+      parent: 1
+  - uid: 1522
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-4.5
+      parent: 1
+  - uid: 1523
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-2.5
+      parent: 1
+  - uid: 1543
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,12.5
+      parent: 1
+  - uid: 1545
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,11.5
+      parent: 1
+  - uid: 1574
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,-12.5
+      parent: 1
+  - uid: 1575
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-12.5
+      parent: 1
+  - uid: 1787
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,-16.5
+      parent: 1
+  - uid: 1788
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-16.5
+      parent: 1
+- proto: BenchSofaCorpMiddle
+  entities:
+  - uid: 165
+    components:
+    - type: Transform
+      pos: 3.5,-13.5
+      parent: 1
+  - uid: 269
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-12.5
+      parent: 1
+  - uid: 752
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-19.5
+      parent: 1
+  - uid: 804
+    components:
+    - type: Transform
+      pos: 3.5,-10.5
+      parent: 1
+  - uid: 1516
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,3.5
+      parent: 1
+  - uid: 1518
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-3.5
+      parent: 1
+  - uid: 1519
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-3.5
+      parent: 1
+- proto: BenchSofaCorpRight
+  entities:
+  - uid: 260
+    components:
+    - type: Transform
+      pos: 2.5,-13.5
+      parent: 1
+  - uid: 261
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-12.5
+      parent: 1
+  - uid: 603
+    components:
+    - type: Transform
+      pos: 6.5,-13.5
+      parent: 1
+  - uid: 690
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-20.5
+      parent: 1
+  - uid: 733
+    components:
+    - type: Transform
+      pos: -0.5,-13.5
+      parent: 1
+  - uid: 751
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-20.5
+      parent: 1
+  - uid: 761
+    components:
+    - type: Transform
+      pos: 2.5,-10.5
+      parent: 1
+  - uid: 821
+    components:
+    - type: Transform
+      pos: 6.5,-10.5
+      parent: 1
+  - uid: 842
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,-16.5
+      parent: 1
+  - uid: 940
+    components:
+    - type: Transform
+      pos: -0.5,-10.5
+      parent: 1
+  - uid: 970
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-18.5
+      parent: 1
+  - uid: 1513
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,3.5
+      parent: 1
+  - uid: 1514
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,3.5
+      parent: 1
+  - uid: 1517
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,3.5
+      parent: 1
+  - uid: 1520
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-2.5
+      parent: 1
+  - uid: 1521
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-4.5
+      parent: 1
+  - uid: 1525
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-19.5
+      parent: 1
+  - uid: 1544
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,12.5
+      parent: 1
+  - uid: 1546
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,11.5
+      parent: 1
+  - uid: 1572
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-12.5
+      parent: 1
+  - uid: 1573
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,-12.5
+      parent: 1
+  - uid: 1785
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-16.5
+      parent: 1
+- proto: BenchSteelLeft
+  entities:
+  - uid: 644
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,7.5
+      parent: 1
+  - uid: 646
+    components:
+    - type: Transform
+      pos: 2.5,8.5
+      parent: 1
+- proto: BenchSteelMiddle
+  entities:
+  - uid: 645
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,7.5
+      parent: 1
+  - uid: 647
+    components:
+    - type: Transform
+      pos: 3.5,8.5
+      parent: 1
+- proto: BenchSteelRight
+  entities:
+  - uid: 643
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,7.5
+      parent: 1
+  - uid: 648
+    components:
+    - type: Transform
+      pos: 4.5,8.5
+      parent: 1
+- proto: BoozeDispenser
+  entities:
+  - uid: 418
+    components:
+    - type: Transform
+      pos: 6.5,1.5
+      parent: 1
+- proto: BorgCharger
+  entities:
+  - uid: 1676
+    components:
+    - type: Transform
+      pos: 6.5,-23.5
+      parent: 1
+  - uid: 1677
+    components:
+    - type: Transform
+      pos: 7.5,-23.5
+      parent: 1
+- proto: BoxBodyBag
+  entities:
+  - uid: 1867
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.3108487,-4.393447
+      parent: 1
+- proto: BriefcaseBrown
+  entities:
+  - uid: 834
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.10444713,-10.646297
+      parent: 1
+- proto: BriefcaseBrownFilled
+  entities:
+  - uid: 1994
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.917647,-13.465573
+      parent: 1
+- proto: CableApcExtension
+  entities:
+  - uid: 137
+    components:
+    - type: Transform
+      pos: 3.5,-37.5
+      parent: 1
+  - uid: 139
+    components:
+    - type: Transform
+      pos: -1.5,-14.5
+      parent: 1
+  - uid: 151
+    components:
+    - type: Transform
+      pos: 3.5,-35.5
+      parent: 1
+  - uid: 256
+    components:
+    - type: Transform
+      pos: 3.5,-10.5
+      parent: 1
+  - uid: 276
+    components:
+    - type: Transform
+      pos: -2.5,-3.5
+      parent: 1
+  - uid: 302
+    components:
+    - type: Transform
+      pos: 8.5,-20.5
+      parent: 1
+  - uid: 310
+    components:
+    - type: Transform
+      pos: 9.5,-20.5
+      parent: 1
+  - uid: 461
+    components:
+    - type: Transform
+      pos: 10.5,-21.5
+      parent: 1
+  - uid: 465
+    components:
+    - type: Transform
+      pos: -1.5,-20.5
+      parent: 1
+  - uid: 466
+    components:
+    - type: Transform
+      pos: -0.5,-20.5
+      parent: 1
+  - uid: 473
+    components:
+    - type: Transform
+      pos: 3.5,-20.5
+      parent: 1
+  - uid: 474
+    components:
+    - type: Transform
+      pos: 0.5,-20.5
+      parent: 1
+  - uid: 475
+    components:
+    - type: Transform
+      pos: 4.5,-20.5
+      parent: 1
+  - uid: 476
+    components:
+    - type: Transform
+      pos: 2.5,-20.5
+      parent: 1
+  - uid: 479
+    components:
+    - type: Transform
+      pos: -2.5,-20.5
+      parent: 1
+  - uid: 513
+    components:
+    - type: Transform
+      pos: 7.5,-20.5
+      parent: 1
+  - uid: 514
+    components:
+    - type: Transform
+      pos: 6.5,-20.5
+      parent: 1
+  - uid: 562
+    components:
+    - type: Transform
+      pos: 2.5,-37.5
+      parent: 1
+  - uid: 566
+    components:
+    - type: Transform
+      pos: 9.5,-22.5
+      parent: 1
+  - uid: 582
+    components:
+    - type: Transform
+      pos: 2.5,-25.5
+      parent: 1
+  - uid: 583
+    components:
+    - type: Transform
+      pos: 4.5,-25.5
+      parent: 1
+  - uid: 584
+    components:
+    - type: Transform
+      pos: -2.5,-22.5
+      parent: 1
+  - uid: 585
+    components:
+    - type: Transform
+      pos: 3.5,-36.5
+      parent: 1
+  - uid: 627
+    components:
+    - type: Transform
+      pos: 0.5,12.5
+      parent: 1
+  - uid: 692
+    components:
+    - type: Transform
+      pos: -3.5,-21.5
+      parent: 1
+  - uid: 715
+    components:
+    - type: Transform
+      pos: -3.5,-22.5
+      parent: 1
+  - uid: 716
+    components:
+    - type: Transform
+      pos: 10.5,-22.5
+      parent: 1
+  - uid: 731
+    components:
+    - type: Transform
+      pos: 3.5,-9.5
+      parent: 1
+  - uid: 745
+    components:
+    - type: Transform
+      pos: -0.5,-37.5
+      parent: 1
+  - uid: 747
+    components:
+    - type: Transform
+      pos: 6.5,-37.5
+      parent: 1
+  - uid: 754
+    components:
+    - type: Transform
+      pos: -2.5,-14.5
+      parent: 1
+  - uid: 755
+    components:
+    - type: Transform
+      pos: -3.5,-14.5
+      parent: 1
+  - uid: 756
+    components:
+    - type: Transform
+      pos: -3.5,-13.5
+      parent: 1
+  - uid: 757
+    components:
+    - type: Transform
+      pos: -3.5,-12.5
+      parent: 1
+  - uid: 758
+    components:
+    - type: Transform
+      pos: -3.5,-11.5
+      parent: 1
+  - uid: 764
+    components:
+    - type: Transform
+      pos: -3.5,-5.5
+      parent: 1
+  - uid: 765
+    components:
+    - type: Transform
+      pos: -3.5,-4.5
+      parent: 1
+  - uid: 766
+    components:
+    - type: Transform
+      pos: -3.5,-3.5
+      parent: 1
+  - uid: 767
+    components:
+    - type: Transform
+      pos: -3.5,-2.5
+      parent: 1
+  - uid: 768
+    components:
+    - type: Transform
+      pos: -3.5,-1.5
+      parent: 1
+  - uid: 769
+    components:
+    - type: Transform
+      pos: -3.5,-0.5
+      parent: 1
+  - uid: 770
+    components:
+    - type: Transform
+      pos: -3.5,0.5
+      parent: 1
+  - uid: 771
+    components:
+    - type: Transform
+      pos: -3.5,1.5
+      parent: 1
+  - uid: 772
+    components:
+    - type: Transform
+      pos: -3.5,2.5
+      parent: 1
+  - uid: 773
+    components:
+    - type: Transform
+      pos: -3.5,3.5
+      parent: 1
+  - uid: 774
+    components:
+    - type: Transform
+      pos: -3.5,4.5
+      parent: 1
+  - uid: 780
+    components:
+    - type: Transform
+      pos: -3.5,10.5
+      parent: 1
+  - uid: 781
+    components:
+    - type: Transform
+      pos: -3.5,11.5
+      parent: 1
+  - uid: 782
+    components:
+    - type: Transform
+      pos: -3.5,12.5
+      parent: 1
+  - uid: 783
+    components:
+    - type: Transform
+      pos: -3.5,13.5
+      parent: 1
+  - uid: 784
+    components:
+    - type: Transform
+      pos: -2.5,13.5
+      parent: 1
+  - uid: 785
+    components:
+    - type: Transform
+      pos: -1.5,13.5
+      parent: 1
+  - uid: 786
+    components:
+    - type: Transform
+      pos: -0.5,13.5
+      parent: 1
+  - uid: 787
+    components:
+    - type: Transform
+      pos: 0.5,13.5
+      parent: 1
+  - uid: 788
+    components:
+    - type: Transform
+      pos: 1.5,13.5
+      parent: 1
+  - uid: 789
+    components:
+    - type: Transform
+      pos: 2.5,13.5
+      parent: 1
+  - uid: 790
+    components:
+    - type: Transform
+      pos: 3.5,13.5
+      parent: 1
+  - uid: 791
+    components:
+    - type: Transform
+      pos: 4.5,13.5
+      parent: 1
+  - uid: 792
+    components:
+    - type: Transform
+      pos: 5.5,13.5
+      parent: 1
+  - uid: 793
+    components:
+    - type: Transform
+      pos: 6.5,13.5
+      parent: 1
+  - uid: 794
+    components:
+    - type: Transform
+      pos: 7.5,13.5
+      parent: 1
+  - uid: 795
+    components:
+    - type: Transform
+      pos: 8.5,13.5
+      parent: 1
+  - uid: 796
+    components:
+    - type: Transform
+      pos: 9.5,13.5
+      parent: 1
+  - uid: 797
+    components:
+    - type: Transform
+      pos: 10.5,13.5
+      parent: 1
+  - uid: 798
+    components:
+    - type: Transform
+      pos: 10.5,12.5
+      parent: 1
+  - uid: 799
+    components:
+    - type: Transform
+      pos: 10.5,11.5
+      parent: 1
+  - uid: 800
+    components:
+    - type: Transform
+      pos: 10.5,10.5
+      parent: 1
+  - uid: 801
+    components:
+    - type: Transform
+      pos: 10.5,9.5
+      parent: 1
+  - uid: 802
+    components:
+    - type: Transform
+      pos: 3.5,9.5
+      parent: 1
+  - uid: 803
+    components:
+    - type: Transform
+      pos: -3.5,9.5
+      parent: 1
+  - uid: 806
+    components:
+    - type: Transform
+      pos: 10.5,4.5
+      parent: 1
+  - uid: 807
+    components:
+    - type: Transform
+      pos: 10.5,3.5
+      parent: 1
+  - uid: 808
+    components:
+    - type: Transform
+      pos: 10.5,2.5
+      parent: 1
+  - uid: 809
+    components:
+    - type: Transform
+      pos: 10.5,1.5
+      parent: 1
+  - uid: 810
+    components:
+    - type: Transform
+      pos: 10.5,0.5
+      parent: 1
+  - uid: 811
+    components:
+    - type: Transform
+      pos: 10.5,-0.5
+      parent: 1
+  - uid: 812
+    components:
+    - type: Transform
+      pos: 10.5,-1.5
+      parent: 1
+  - uid: 813
+    components:
+    - type: Transform
+      pos: 10.5,-2.5
+      parent: 1
+  - uid: 814
+    components:
+    - type: Transform
+      pos: 10.5,-3.5
+      parent: 1
+  - uid: 815
+    components:
+    - type: Transform
+      pos: 10.5,-4.5
+      parent: 1
+  - uid: 816
+    components:
+    - type: Transform
+      pos: 10.5,-5.5
+      parent: 1
+  - uid: 822
+    components:
+    - type: Transform
+      pos: 10.5,-11.5
+      parent: 1
+  - uid: 823
+    components:
+    - type: Transform
+      pos: 10.5,-12.5
+      parent: 1
+  - uid: 824
+    components:
+    - type: Transform
+      pos: 10.5,-13.5
+      parent: 1
+  - uid: 825
+    components:
+    - type: Transform
+      pos: 10.5,-14.5
+      parent: 1
+  - uid: 835
+    components:
+    - type: Transform
+      pos: 4.5,-26.5
+      parent: 1
+  - uid: 836
+    components:
+    - type: Transform
+      pos: 4.5,-27.5
+      parent: 1
+  - uid: 839
+    components:
+    - type: Transform
+      pos: 1.5,-20.5
+      parent: 1
+  - uid: 840
+    components:
+    - type: Transform
+      pos: 1.5,-21.5
+      parent: 1
+  - uid: 841
+    components:
+    - type: Transform
+      pos: 1.5,-22.5
+      parent: 1
+  - uid: 845
+    components:
+    - type: Transform
+      pos: 5.5,-20.5
+      parent: 1
+  - uid: 846
+    components:
+    - type: Transform
+      pos: 5.5,-21.5
+      parent: 1
+  - uid: 847
+    components:
+    - type: Transform
+      pos: 5.5,-22.5
+      parent: 1
+  - uid: 851
+    components:
+    - type: Transform
+      pos: -3.5,-20.5
+      parent: 1
+  - uid: 855
+    components:
+    - type: Transform
+      pos: 10.5,-20.5
+      parent: 1
+  - uid: 856
+    components:
+    - type: Transform
+      pos: 9.5,-11.5
+      parent: 1
+  - uid: 857
+    components:
+    - type: Transform
+      pos: 8.5,-11.5
+      parent: 1
+  - uid: 858
+    components:
+    - type: Transform
+      pos: 7.5,-11.5
+      parent: 1
+  - uid: 859
+    components:
+    - type: Transform
+      pos: 6.5,-11.5
+      parent: 1
+  - uid: 860
+    components:
+    - type: Transform
+      pos: 5.5,-11.5
+      parent: 1
+  - uid: 861
+    components:
+    - type: Transform
+      pos: 4.5,-11.5
+      parent: 1
+  - uid: 862
+    components:
+    - type: Transform
+      pos: 3.5,-11.5
+      parent: 1
+  - uid: 863
+    components:
+    - type: Transform
+      pos: 2.5,-11.5
+      parent: 1
+  - uid: 864
+    components:
+    - type: Transform
+      pos: 1.5,-11.5
+      parent: 1
+  - uid: 865
+    components:
+    - type: Transform
+      pos: 0.5,-11.5
+      parent: 1
+  - uid: 866
+    components:
+    - type: Transform
+      pos: -0.5,-11.5
+      parent: 1
+  - uid: 867
+    components:
+    - type: Transform
+      pos: -1.5,-11.5
+      parent: 1
+  - uid: 868
+    components:
+    - type: Transform
+      pos: -2.5,-11.5
+      parent: 1
+  - uid: 869
+    components:
+    - type: Transform
+      pos: -4.5,-11.5
+      parent: 1
+  - uid: 870
+    components:
+    - type: Transform
+      pos: -5.5,-11.5
+      parent: 1
+  - uid: 871
+    components:
+    - type: Transform
+      pos: -6.5,-11.5
+      parent: 1
+  - uid: 872
+    components:
+    - type: Transform
+      pos: -7.5,-11.5
+      parent: 1
+  - uid: 873
+    components:
+    - type: Transform
+      pos: -8.5,-11.5
+      parent: 1
+  - uid: 874
+    components:
+    - type: Transform
+      pos: 11.5,-11.5
+      parent: 1
+  - uid: 875
+    components:
+    - type: Transform
+      pos: 12.5,-11.5
+      parent: 1
+  - uid: 876
+    components:
+    - type: Transform
+      pos: 13.5,-11.5
+      parent: 1
+  - uid: 877
+    components:
+    - type: Transform
+      pos: 14.5,-11.5
+      parent: 1
+  - uid: 878
+    components:
+    - type: Transform
+      pos: 15.5,-11.5
+      parent: 1
+  - uid: 879
+    components:
+    - type: Transform
+      pos: 11.5,-3.5
+      parent: 1
+  - uid: 880
+    components:
+    - type: Transform
+      pos: 12.5,-3.5
+      parent: 1
+  - uid: 881
+    components:
+    - type: Transform
+      pos: 13.5,-3.5
+      parent: 1
+  - uid: 882
+    components:
+    - type: Transform
+      pos: 14.5,-3.5
+      parent: 1
+  - uid: 883
+    components:
+    - type: Transform
+      pos: 15.5,-3.5
+      parent: 1
+  - uid: 884
+    components:
+    - type: Transform
+      pos: -4.5,-3.5
+      parent: 1
+  - uid: 885
+    components:
+    - type: Transform
+      pos: -5.5,-3.5
+      parent: 1
+  - uid: 886
+    components:
+    - type: Transform
+      pos: -6.5,-3.5
+      parent: 1
+  - uid: 887
+    components:
+    - type: Transform
+      pos: -7.5,-3.5
+      parent: 1
+  - uid: 888
+    components:
+    - type: Transform
+      pos: -8.5,-3.5
+      parent: 1
+  - uid: 889
+    components:
+    - type: Transform
+      pos: -4.5,4.5
+      parent: 1
+  - uid: 890
+    components:
+    - type: Transform
+      pos: -5.5,4.5
+      parent: 1
+  - uid: 891
+    components:
+    - type: Transform
+      pos: -6.5,4.5
+      parent: 1
+  - uid: 892
+    components:
+    - type: Transform
+      pos: -7.5,4.5
+      parent: 1
+  - uid: 893
+    components:
+    - type: Transform
+      pos: -8.5,4.5
+      parent: 1
+  - uid: 894
+    components:
+    - type: Transform
+      pos: 11.5,4.5
+      parent: 1
+  - uid: 895
+    components:
+    - type: Transform
+      pos: 12.5,4.5
+      parent: 1
+  - uid: 896
+    components:
+    - type: Transform
+      pos: 13.5,4.5
+      parent: 1
+  - uid: 897
+    components:
+    - type: Transform
+      pos: 14.5,4.5
+      parent: 1
+  - uid: 898
+    components:
+    - type: Transform
+      pos: 15.5,4.5
+      parent: 1
+  - uid: 899
+    components:
+    - type: Transform
+      pos: 9.5,10.5
+      parent: 1
+  - uid: 900
+    components:
+    - type: Transform
+      pos: 8.5,10.5
+      parent: 1
+  - uid: 901
+    components:
+    - type: Transform
+      pos: 7.5,10.5
+      parent: 1
+  - uid: 902
+    components:
+    - type: Transform
+      pos: 6.5,10.5
+      parent: 1
+  - uid: 903
+    components:
+    - type: Transform
+      pos: 5.5,10.5
+      parent: 1
+  - uid: 904
+    components:
+    - type: Transform
+      pos: 4.5,10.5
+      parent: 1
+  - uid: 905
+    components:
+    - type: Transform
+      pos: 3.5,10.5
+      parent: 1
+  - uid: 906
+    components:
+    - type: Transform
+      pos: 2.5,10.5
+      parent: 1
+  - uid: 907
+    components:
+    - type: Transform
+      pos: 1.5,10.5
+      parent: 1
+  - uid: 908
+    components:
+    - type: Transform
+      pos: 0.5,10.5
+      parent: 1
+  - uid: 909
+    components:
+    - type: Transform
+      pos: -0.5,10.5
+      parent: 1
+  - uid: 910
+    components:
+    - type: Transform
+      pos: -1.5,10.5
+      parent: 1
+  - uid: 911
+    components:
+    - type: Transform
+      pos: -2.5,10.5
+      parent: 1
+  - uid: 912
+    components:
+    - type: Transform
+      pos: -2.5,4.5
+      parent: 1
+  - uid: 913
+    components:
+    - type: Transform
+      pos: -1.5,4.5
+      parent: 1
+  - uid: 914
+    components:
+    - type: Transform
+      pos: -0.5,4.5
+      parent: 1
+  - uid: 915
+    components:
+    - type: Transform
+      pos: 0.5,4.5
+      parent: 1
+  - uid: 916
+    components:
+    - type: Transform
+      pos: 1.5,4.5
+      parent: 1
+  - uid: 917
+    components:
+    - type: Transform
+      pos: 2.5,4.5
+      parent: 1
+  - uid: 918
+    components:
+    - type: Transform
+      pos: 3.5,4.5
+      parent: 1
+  - uid: 919
+    components:
+    - type: Transform
+      pos: 4.5,4.5
+      parent: 1
+  - uid: 920
+    components:
+    - type: Transform
+      pos: 5.5,4.5
+      parent: 1
+  - uid: 921
+    components:
+    - type: Transform
+      pos: 6.5,4.5
+      parent: 1
+  - uid: 922
+    components:
+    - type: Transform
+      pos: 7.5,4.5
+      parent: 1
+  - uid: 923
+    components:
+    - type: Transform
+      pos: 8.5,4.5
+      parent: 1
+  - uid: 924
+    components:
+    - type: Transform
+      pos: 9.5,4.5
+      parent: 1
+  - uid: 925
+    components:
+    - type: Transform
+      pos: 9.5,-1.5
+      parent: 1
+  - uid: 926
+    components:
+    - type: Transform
+      pos: 8.5,-1.5
+      parent: 1
+  - uid: 927
+    components:
+    - type: Transform
+      pos: 7.5,-1.5
+      parent: 1
+  - uid: 928
+    components:
+    - type: Transform
+      pos: 6.5,-1.5
+      parent: 1
+  - uid: 929
+    components:
+    - type: Transform
+      pos: 5.5,-1.5
+      parent: 1
+  - uid: 930
+    components:
+    - type: Transform
+      pos: 4.5,-1.5
+      parent: 1
+  - uid: 931
+    components:
+    - type: Transform
+      pos: 3.5,-1.5
+      parent: 1
+  - uid: 932
+    components:
+    - type: Transform
+      pos: 2.5,-1.5
+      parent: 1
+  - uid: 933
+    components:
+    - type: Transform
+      pos: 1.5,-1.5
+      parent: 1
+  - uid: 934
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 1
+  - uid: 935
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 1
+  - uid: 936
+    components:
+    - type: Transform
+      pos: -1.5,-1.5
+      parent: 1
+  - uid: 937
+    components:
+    - type: Transform
+      pos: -2.5,-1.5
+      parent: 1
+  - uid: 938
+    components:
+    - type: Transform
+      pos: 3.5,-0.5
+      parent: 1
+  - uid: 941
+    components:
+    - type: Transform
+      pos: -2.5,-5.5
+      parent: 1
+  - uid: 942
+    components:
+    - type: Transform
+      pos: -1.5,-5.5
+      parent: 1
+  - uid: 943
+    components:
+    - type: Transform
+      pos: -0.5,-5.5
+      parent: 1
+  - uid: 944
+    components:
+    - type: Transform
+      pos: 0.5,-5.5
+      parent: 1
+  - uid: 945
+    components:
+    - type: Transform
+      pos: 1.5,-5.5
+      parent: 1
+  - uid: 946
+    components:
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 1
+  - uid: 947
+    components:
+    - type: Transform
+      pos: 3.5,-5.5
+      parent: 1
+  - uid: 948
+    components:
+    - type: Transform
+      pos: 4.5,-5.5
+      parent: 1
+  - uid: 949
+    components:
+    - type: Transform
+      pos: 5.5,-5.5
+      parent: 1
+  - uid: 950
+    components:
+    - type: Transform
+      pos: 6.5,-5.5
+      parent: 1
+  - uid: 951
+    components:
+    - type: Transform
+      pos: 7.5,-5.5
+      parent: 1
+  - uid: 952
+    components:
+    - type: Transform
+      pos: 8.5,-5.5
+      parent: 1
+  - uid: 953
+    components:
+    - type: Transform
+      pos: 9.5,-5.5
+      parent: 1
+  - uid: 954
+    components:
+    - type: Transform
+      pos: 15.5,-12.5
+      parent: 1
+  - uid: 955
+    components:
+    - type: Transform
+      pos: 15.5,-10.5
+      parent: 1
+  - uid: 956
+    components:
+    - type: Transform
+      pos: 15.5,-4.5
+      parent: 1
+  - uid: 957
+    components:
+    - type: Transform
+      pos: 15.5,-2.5
+      parent: 1
+  - uid: 958
+    components:
+    - type: Transform
+      pos: 15.5,3.5
+      parent: 1
+  - uid: 959
+    components:
+    - type: Transform
+      pos: 15.5,5.5
+      parent: 1
+  - uid: 960
+    components:
+    - type: Transform
+      pos: -8.5,5.5
+      parent: 1
+  - uid: 961
+    components:
+    - type: Transform
+      pos: -8.5,3.5
+      parent: 1
+  - uid: 962
+    components:
+    - type: Transform
+      pos: -8.5,-2.5
+      parent: 1
+  - uid: 963
+    components:
+    - type: Transform
+      pos: -8.5,-4.5
+      parent: 1
+  - uid: 964
+    components:
+    - type: Transform
+      pos: -8.5,-10.5
+      parent: 1
+  - uid: 965
+    components:
+    - type: Transform
+      pos: -8.5,-12.5
+      parent: 1
+  - uid: 975
+    components:
+    - type: Transform
+      pos: 4.5,-30.5
+      parent: 1
+  - uid: 983
+    components:
+    - type: Transform
+      pos: 13.5,5.5
+      parent: 1
+  - uid: 984
+    components:
+    - type: Transform
+      pos: -6.5,5.5
+      parent: 1
+  - uid: 1037
+    components:
+    - type: Transform
+      pos: 1.5,-37.5
+      parent: 1
+  - uid: 1044
+    components:
+    - type: Transform
+      pos: 7.5,-37.5
+      parent: 1
+  - uid: 1052
+    components:
+    - type: Transform
+      pos: 8.5,-37.5
+      parent: 1
+  - uid: 1068
+    components:
+    - type: Transform
+      pos: 0.5,-37.5
+      parent: 1
+  - uid: 1069
+    components:
+    - type: Transform
+      pos: -1.5,-37.5
+      parent: 1
+  - uid: 1072
+    components:
+    - type: Transform
+      pos: 5.5,-37.5
+      parent: 1
+  - uid: 1187
+    components:
+    - type: Transform
+      pos: 9.5,-23.5
+      parent: 1
+  - uid: 1188
+    components:
+    - type: Transform
+      pos: 8.5,-23.5
+      parent: 1
+  - uid: 1189
+    components:
+    - type: Transform
+      pos: 7.5,-23.5
+      parent: 1
+  - uid: 1191
+    components:
+    - type: Transform
+      pos: 5.5,-23.5
+      parent: 1
+  - uid: 1192
+    components:
+    - type: Transform
+      pos: 4.5,-23.5
+      parent: 1
+  - uid: 1193
+    components:
+    - type: Transform
+      pos: 3.5,-23.5
+      parent: 1
+  - uid: 1194
+    components:
+    - type: Transform
+      pos: 2.5,-23.5
+      parent: 1
+  - uid: 1195
+    components:
+    - type: Transform
+      pos: 1.5,-23.5
+      parent: 1
+  - uid: 1197
+    components:
+    - type: Transform
+      pos: -0.5,-23.5
+      parent: 1
+  - uid: 1198
+    components:
+    - type: Transform
+      pos: -1.5,-23.5
+      parent: 1
+  - uid: 1199
+    components:
+    - type: Transform
+      pos: -2.5,-23.5
+      parent: 1
+  - uid: 1411
+    components:
+    - type: Transform
+      pos: -1.5,-3.5
+      parent: 1
+  - uid: 1556
+    components:
+    - type: Transform
+      pos: 0.5,-23.5
+      parent: 1
+  - uid: 1557
+    components:
+    - type: Transform
+      pos: 6.5,-23.5
+      parent: 1
+  - uid: 1561
+    components:
+    - type: Transform
+      pos: 4.5,-31.5
+      parent: 1
+  - uid: 1563
+    components:
+    - type: Transform
+      pos: 4.5,-28.5
+      parent: 1
+  - uid: 1564
+    components:
+    - type: Transform
+      pos: 2.5,-24.5
+      parent: 1
+  - uid: 1588
+    components:
+    - type: Transform
+      pos: 4.5,-29.5
+      parent: 1
+  - uid: 1634
+    components:
+    - type: Transform
+      pos: 4.5,-24.5
+      parent: 1
+  - uid: 1638
+    components:
+    - type: Transform
+      pos: 2.5,-27.5
+      parent: 1
+  - uid: 1639
+    components:
+    - type: Transform
+      pos: 2.5,-26.5
+      parent: 1
+  - uid: 1641
+    components:
+    - type: Transform
+      pos: 3.5,-31.5
+      parent: 1
+  - uid: 1642
+    components:
+    - type: Transform
+      pos: 3.5,-32.5
+      parent: 1
+  - uid: 1643
+    components:
+    - type: Transform
+      pos: 3.5,-33.5
+      parent: 1
+  - uid: 1651
+    components:
+    - type: Transform
+      pos: 3.5,-34.5
+      parent: 1
+  - uid: 1660
+    components:
+    - type: Transform
+      pos: 4.5,-37.5
+      parent: 1
+  - uid: 1667
+    components:
+    - type: Transform
+      pos: 2.5,-28.5
+      parent: 1
+  - uid: 1669
+    components:
+    - type: Transform
+      pos: 2.5,-29.5
+      parent: 1
+  - uid: 1671
+    components:
+    - type: Transform
+      pos: 2.5,-31.5
+      parent: 1
+  - uid: 1673
+    components:
+    - type: Transform
+      pos: 2.5,-30.5
+      parent: 1
+  - uid: 1691
+    components:
+    - type: Transform
+      pos: 3.5,-27.5
+      parent: 1
+  - uid: 2090
+    components:
+    - type: Transform
+      pos: -0.5,-14.5
+      parent: 1
+  - uid: 2091
+    components:
+    - type: Transform
+      pos: 0.5,-14.5
+      parent: 1
+  - uid: 2092
+    components:
+    - type: Transform
+      pos: 1.5,-14.5
+      parent: 1
+  - uid: 2093
+    components:
+    - type: Transform
+      pos: 2.5,-14.5
+      parent: 1
+  - uid: 2094
+    components:
+    - type: Transform
+      pos: 3.5,-14.5
+      parent: 1
+  - uid: 2095
+    components:
+    - type: Transform
+      pos: 4.5,-14.5
+      parent: 1
+  - uid: 2096
+    components:
+    - type: Transform
+      pos: 5.5,-14.5
+      parent: 1
+  - uid: 2097
+    components:
+    - type: Transform
+      pos: 6.5,-14.5
+      parent: 1
+  - uid: 2098
+    components:
+    - type: Transform
+      pos: 7.5,-14.5
+      parent: 1
+  - uid: 2099
+    components:
+    - type: Transform
+      pos: 8.5,-14.5
+      parent: 1
+  - uid: 2100
+    components:
+    - type: Transform
+      pos: 9.5,-14.5
+      parent: 1
+- proto: CableHV
+  entities:
+  - uid: 1692
+    components:
+    - type: Transform
+      pos: 2.5,-23.5
+      parent: 1
+  - uid: 1693
+    components:
+    - type: Transform
+      pos: 1.5,-23.5
+      parent: 1
+  - uid: 1694
+    components:
+    - type: Transform
+      pos: 4.5,-23.5
+      parent: 1
+  - uid: 1695
+    components:
+    - type: Transform
+      pos: 5.5,-23.5
+      parent: 1
+  - uid: 1696
+    components:
+    - type: Transform
+      pos: 4.5,-24.5
+      parent: 1
+  - uid: 1697
+    components:
+    - type: Transform
+      pos: 3.5,-24.5
+      parent: 1
+  - uid: 1698
+    components:
+    - type: Transform
+      pos: 2.5,-24.5
+      parent: 1
+  - uid: 1699
+    components:
+    - type: Transform
+      pos: 3.5,-25.5
+      parent: 1
+  - uid: 1700
+    components:
+    - type: Transform
+      pos: 4.5,-25.5
+      parent: 1
+  - uid: 1701
+    components:
+    - type: Transform
+      pos: 2.5,-25.5
+      parent: 1
+- proto: CableMV
+  entities:
+  - uid: 24
+    components:
+    - type: Transform
+      pos: -1.5,-3.5
+      parent: 1
+  - uid: 178
+    components:
+    - type: Transform
+      pos: 4.5,-11.5
+      parent: 1
+  - uid: 185
+    components:
+    - type: Transform
+      pos: 5.5,-11.5
+      parent: 1
+  - uid: 189
+    components:
+    - type: Transform
+      pos: 6.5,-11.5
+      parent: 1
+  - uid: 195
+    components:
+    - type: Transform
+      pos: 7.5,-11.5
+      parent: 1
+  - uid: 230
+    components:
+    - type: Transform
+      pos: 9.5,-11.5
+      parent: 1
+  - uid: 437
+    components:
+    - type: Transform
+      pos: -1.5,-11.5
+      parent: 1
+  - uid: 449
+    components:
+    - type: Transform
+      pos: -0.5,-11.5
+      parent: 1
+  - uid: 453
+    components:
+    - type: Transform
+      pos: 0.5,-11.5
+      parent: 1
+  - uid: 454
+    components:
+    - type: Transform
+      pos: 1.5,-11.5
+      parent: 1
+  - uid: 456
+    components:
+    - type: Transform
+      pos: 2.5,-11.5
+      parent: 1
+  - uid: 458
+    components:
+    - type: Transform
+      pos: 3.5,-11.5
+      parent: 1
+  - uid: 464
+    components:
+    - type: Transform
+      pos: 3.5,-10.5
+      parent: 1
+  - uid: 477
+    components:
+    - type: Transform
+      pos: 8.5,-11.5
+      parent: 1
+  - uid: 480
+    components:
+    - type: Transform
+      pos: -2.5,-11.5
+      parent: 1
+  - uid: 826
+    components:
+    - type: Transform
+      pos: 3.5,-9.5
+      parent: 1
+  - uid: 1414
+    components:
+    - type: Transform
+      pos: 2.5,-15.5
+      parent: 1
+  - uid: 1415
+    components:
+    - type: Transform
+      pos: 2.5,-16.5
+      parent: 1
+  - uid: 1416
+    components:
+    - type: Transform
+      pos: 1.5,-16.5
+      parent: 1
+  - uid: 1417
+    components:
+    - type: Transform
+      pos: 0.5,-16.5
+      parent: 1
+  - uid: 1418
+    components:
+    - type: Transform
+      pos: -0.5,-16.5
+      parent: 1
+  - uid: 1419
+    components:
+    - type: Transform
+      pos: -1.5,-16.5
+      parent: 1
+  - uid: 1420
+    components:
+    - type: Transform
+      pos: -2.5,-16.5
+      parent: 1
+  - uid: 1421
+    components:
+    - type: Transform
+      pos: -3.5,-16.5
+      parent: 1
+  - uid: 1422
+    components:
+    - type: Transform
+      pos: -3.5,-15.5
+      parent: 1
+  - uid: 1423
+    components:
+    - type: Transform
+      pos: -3.5,-14.5
+      parent: 1
+  - uid: 1424
+    components:
+    - type: Transform
+      pos: -3.5,-13.5
+      parent: 1
+  - uid: 1425
+    components:
+    - type: Transform
+      pos: -3.5,-12.5
+      parent: 1
+  - uid: 1426
+    components:
+    - type: Transform
+      pos: -3.5,-11.5
+      parent: 1
+  - uid: 1427
+    components:
+    - type: Transform
+      pos: -3.5,-10.5
+      parent: 1
+  - uid: 1428
+    components:
+    - type: Transform
+      pos: -3.5,-9.5
+      parent: 1
+  - uid: 1429
+    components:
+    - type: Transform
+      pos: -3.5,-8.5
+      parent: 1
+  - uid: 1430
+    components:
+    - type: Transform
+      pos: -3.5,-7.5
+      parent: 1
+  - uid: 1431
+    components:
+    - type: Transform
+      pos: -3.5,-6.5
+      parent: 1
+  - uid: 1432
+    components:
+    - type: Transform
+      pos: -3.5,-5.5
+      parent: 1
+  - uid: 1433
+    components:
+    - type: Transform
+      pos: -3.5,-4.5
+      parent: 1
+  - uid: 1434
+    components:
+    - type: Transform
+      pos: -3.5,-3.5
+      parent: 1
+  - uid: 1435
+    components:
+    - type: Transform
+      pos: -3.5,-2.5
+      parent: 1
+  - uid: 1436
+    components:
+    - type: Transform
+      pos: -3.5,-1.5
+      parent: 1
+  - uid: 1437
+    components:
+    - type: Transform
+      pos: -3.5,-0.5
+      parent: 1
+  - uid: 1438
+    components:
+    - type: Transform
+      pos: -3.5,0.5
+      parent: 1
+  - uid: 1439
+    components:
+    - type: Transform
+      pos: -3.5,1.5
+      parent: 1
+  - uid: 1440
+    components:
+    - type: Transform
+      pos: -3.5,2.5
+      parent: 1
+  - uid: 1441
+    components:
+    - type: Transform
+      pos: -3.5,3.5
+      parent: 1
+  - uid: 1442
+    components:
+    - type: Transform
+      pos: -3.5,4.5
+      parent: 1
+  - uid: 1443
+    components:
+    - type: Transform
+      pos: -3.5,5.5
+      parent: 1
+  - uid: 1444
+    components:
+    - type: Transform
+      pos: -3.5,6.5
+      parent: 1
+  - uid: 1445
+    components:
+    - type: Transform
+      pos: -3.5,7.5
+      parent: 1
+  - uid: 1446
+    components:
+    - type: Transform
+      pos: -3.5,8.5
+      parent: 1
+  - uid: 1447
+    components:
+    - type: Transform
+      pos: -3.5,9.5
+      parent: 1
+  - uid: 1448
+    components:
+    - type: Transform
+      pos: -3.5,10.5
+      parent: 1
+  - uid: 1449
+    components:
+    - type: Transform
+      pos: -3.5,11.5
+      parent: 1
+  - uid: 1450
+    components:
+    - type: Transform
+      pos: -3.5,12.5
+      parent: 1
+  - uid: 1451
+    components:
+    - type: Transform
+      pos: -3.5,13.5
+      parent: 1
+  - uid: 1452
+    components:
+    - type: Transform
+      pos: -2.5,13.5
+      parent: 1
+  - uid: 1453
+    components:
+    - type: Transform
+      pos: -1.5,13.5
+      parent: 1
+  - uid: 1454
+    components:
+    - type: Transform
+      pos: -0.5,13.5
+      parent: 1
+  - uid: 1455
+    components:
+    - type: Transform
+      pos: 0.5,13.5
+      parent: 1
+  - uid: 1456
+    components:
+    - type: Transform
+      pos: 1.5,13.5
+      parent: 1
+  - uid: 1457
+    components:
+    - type: Transform
+      pos: 2.5,13.5
+      parent: 1
+  - uid: 1458
+    components:
+    - type: Transform
+      pos: 3.5,13.5
+      parent: 1
+  - uid: 1459
+    components:
+    - type: Transform
+      pos: 4.5,13.5
+      parent: 1
+  - uid: 1460
+    components:
+    - type: Transform
+      pos: 5.5,13.5
+      parent: 1
+  - uid: 1461
+    components:
+    - type: Transform
+      pos: 6.5,13.5
+      parent: 1
+  - uid: 1462
+    components:
+    - type: Transform
+      pos: 7.5,13.5
+      parent: 1
+  - uid: 1463
+    components:
+    - type: Transform
+      pos: 8.5,13.5
+      parent: 1
+  - uid: 1464
+    components:
+    - type: Transform
+      pos: 9.5,13.5
+      parent: 1
+  - uid: 1465
+    components:
+    - type: Transform
+      pos: 10.5,13.5
+      parent: 1
+  - uid: 1466
+    components:
+    - type: Transform
+      pos: 10.5,12.5
+      parent: 1
+  - uid: 1467
+    components:
+    - type: Transform
+      pos: 10.5,11.5
+      parent: 1
+  - uid: 1468
+    components:
+    - type: Transform
+      pos: 10.5,10.5
+      parent: 1
+  - uid: 1469
+    components:
+    - type: Transform
+      pos: 10.5,9.5
+      parent: 1
+  - uid: 1470
+    components:
+    - type: Transform
+      pos: 10.5,8.5
+      parent: 1
+  - uid: 1471
+    components:
+    - type: Transform
+      pos: 10.5,7.5
+      parent: 1
+  - uid: 1472
+    components:
+    - type: Transform
+      pos: 10.5,6.5
+      parent: 1
+  - uid: 1473
+    components:
+    - type: Transform
+      pos: 10.5,5.5
+      parent: 1
+  - uid: 1474
+    components:
+    - type: Transform
+      pos: 10.5,4.5
+      parent: 1
+  - uid: 1475
+    components:
+    - type: Transform
+      pos: 10.5,3.5
+      parent: 1
+  - uid: 1476
+    components:
+    - type: Transform
+      pos: 10.5,2.5
+      parent: 1
+  - uid: 1477
+    components:
+    - type: Transform
+      pos: 10.5,1.5
+      parent: 1
+  - uid: 1478
+    components:
+    - type: Transform
+      pos: 10.5,0.5
+      parent: 1
+  - uid: 1479
+    components:
+    - type: Transform
+      pos: 10.5,-0.5
+      parent: 1
+  - uid: 1480
+    components:
+    - type: Transform
+      pos: 10.5,-1.5
+      parent: 1
+  - uid: 1481
+    components:
+    - type: Transform
+      pos: 10.5,-2.5
+      parent: 1
+  - uid: 1482
+    components:
+    - type: Transform
+      pos: 10.5,-3.5
+      parent: 1
+  - uid: 1483
+    components:
+    - type: Transform
+      pos: 10.5,-4.5
+      parent: 1
+  - uid: 1484
+    components:
+    - type: Transform
+      pos: 10.5,-5.5
+      parent: 1
+  - uid: 1485
+    components:
+    - type: Transform
+      pos: 10.5,-6.5
+      parent: 1
+  - uid: 1486
+    components:
+    - type: Transform
+      pos: 10.5,-7.5
+      parent: 1
+  - uid: 1487
+    components:
+    - type: Transform
+      pos: 10.5,-8.5
+      parent: 1
+  - uid: 1488
+    components:
+    - type: Transform
+      pos: 10.5,-9.5
+      parent: 1
+  - uid: 1489
+    components:
+    - type: Transform
+      pos: 10.5,-10.5
+      parent: 1
+  - uid: 1490
+    components:
+    - type: Transform
+      pos: 10.5,-11.5
+      parent: 1
+  - uid: 1491
+    components:
+    - type: Transform
+      pos: 10.5,-12.5
+      parent: 1
+  - uid: 1492
+    components:
+    - type: Transform
+      pos: 10.5,-13.5
+      parent: 1
+  - uid: 1493
+    components:
+    - type: Transform
+      pos: 10.5,-14.5
+      parent: 1
+  - uid: 1494
+    components:
+    - type: Transform
+      pos: 10.5,-15.5
+      parent: 1
+  - uid: 1495
+    components:
+    - type: Transform
+      pos: 10.5,-16.5
+      parent: 1
+  - uid: 1496
+    components:
+    - type: Transform
+      pos: 9.5,-16.5
+      parent: 1
+  - uid: 1497
+    components:
+    - type: Transform
+      pos: 8.5,-16.5
+      parent: 1
+  - uid: 1498
+    components:
+    - type: Transform
+      pos: 7.5,-16.5
+      parent: 1
+  - uid: 1499
+    components:
+    - type: Transform
+      pos: 6.5,-16.5
+      parent: 1
+  - uid: 1500
+    components:
+    - type: Transform
+      pos: 5.5,-16.5
+      parent: 1
+  - uid: 1501
+    components:
+    - type: Transform
+      pos: 4.5,-16.5
+      parent: 1
+  - uid: 1502
+    components:
+    - type: Transform
+      pos: 3.5,-16.5
+      parent: 1
+  - uid: 1503
+    components:
+    - type: Transform
+      pos: -2.5,-3.5
+      parent: 1
+  - uid: 1509
+    components:
+    - type: Transform
+      pos: 0.5,12.5
+      parent: 1
+  - uid: 1702
+    components:
+    - type: Transform
+      pos: 3.5,-25.5
+      parent: 1
+  - uid: 1703
+    components:
+    - type: Transform
+      pos: 3.5,-26.5
+      parent: 1
+  - uid: 1704
+    components:
+    - type: Transform
+      pos: 3.5,-27.5
+      parent: 1
+  - uid: 1705
+    components:
+    - type: Transform
+      pos: 4.5,-25.5
+      parent: 1
+  - uid: 1706
+    components:
+    - type: Transform
+      pos: 5.5,-25.5
+      parent: 1
+  - uid: 1707
+    components:
+    - type: Transform
+      pos: 6.5,-25.5
+      parent: 1
+  - uid: 1708
+    components:
+    - type: Transform
+      pos: 7.5,-25.5
+      parent: 1
+  - uid: 1709
+    components:
+    - type: Transform
+      pos: 8.5,-25.5
+      parent: 1
+  - uid: 1710
+    components:
+    - type: Transform
+      pos: 2.5,-25.5
+      parent: 1
+  - uid: 1711
+    components:
+    - type: Transform
+      pos: 1.5,-25.5
+      parent: 1
+  - uid: 1712
+    components:
+    - type: Transform
+      pos: 0.5,-25.5
+      parent: 1
+  - uid: 1713
+    components:
+    - type: Transform
+      pos: -0.5,-25.5
+      parent: 1
+  - uid: 1714
+    components:
+    - type: Transform
+      pos: -1.5,-25.5
+      parent: 1
+  - uid: 1715
+    components:
+    - type: Transform
+      pos: -1.5,-24.5
+      parent: 1
+  - uid: 1716
+    components:
+    - type: Transform
+      pos: 8.5,-24.5
+      parent: 1
+  - uid: 1717
+    components:
+    - type: Transform
+      pos: 9.5,-17.5
+      parent: 1
+  - uid: 1718
+    components:
+    - type: Transform
+      pos: 9.5,-18.5
+      parent: 1
+  - uid: 1719
+    components:
+    - type: Transform
+      pos: 9.5,-19.5
+      parent: 1
+  - uid: 1720
+    components:
+    - type: Transform
+      pos: 9.5,-20.5
+      parent: 1
+  - uid: 1721
+    components:
+    - type: Transform
+      pos: 9.5,-21.5
+      parent: 1
+  - uid: 1722
+    components:
+    - type: Transform
+      pos: 9.5,-22.5
+      parent: 1
+  - uid: 1723
+    components:
+    - type: Transform
+      pos: 9.5,-23.5
+      parent: 1
+  - uid: 1724
+    components:
+    - type: Transform
+      pos: 9.5,-24.5
+      parent: 1
+  - uid: 1725
+    components:
+    - type: Transform
+      pos: -2.5,-24.5
+      parent: 1
+  - uid: 1726
+    components:
+    - type: Transform
+      pos: -2.5,-23.5
+      parent: 1
+  - uid: 1727
+    components:
+    - type: Transform
+      pos: -2.5,-22.5
+      parent: 1
+  - uid: 1728
+    components:
+    - type: Transform
+      pos: -2.5,-21.5
+      parent: 1
+  - uid: 1729
+    components:
+    - type: Transform
+      pos: -2.5,-20.5
+      parent: 1
+  - uid: 1730
+    components:
+    - type: Transform
+      pos: -2.5,-19.5
+      parent: 1
+  - uid: 1731
+    components:
+    - type: Transform
+      pos: -2.5,-18.5
+      parent: 1
+  - uid: 1732
+    components:
+    - type: Transform
+      pos: -2.5,-17.5
+      parent: 1
+- proto: Catwalk
+  entities:
+  - uid: 1874
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-23.5
+      parent: 1
+  - uid: 1875
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-23.5
+      parent: 1
+  - uid: 1876
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-23.5
+      parent: 1
+  - uid: 1877
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-23.5
+      parent: 1
+  - uid: 1878
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-23.5
+      parent: 1
+  - uid: 1879
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-24.5
+      parent: 1
+  - uid: 1880
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-24.5
+      parent: 1
+  - uid: 1881
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-24.5
+      parent: 1
+  - uid: 1882
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-25.5
+      parent: 1
+  - uid: 1883
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-25.5
+      parent: 1
+  - uid: 1884
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-25.5
+      parent: 1
+- proto: Chair
+  entities:
+  - uid: 2006
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-2.5
+      parent: 1
+  - uid: 2007
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-2.5
+      parent: 1
+  - uid: 2010
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-2.5
+      parent: 1
+  - uid: 2013
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-2.5
+      parent: 1
+  - uid: 2014
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-2.5
+      parent: 1
+  - uid: 2015
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-2.5
+      parent: 1
+- proto: ChairPilotSeat
+  entities:
+  - uid: 15
+    components:
+    - type: Transform
+      pos: 7.5,-4.5
+      parent: 1
+  - uid: 215
+    components:
+    - type: Transform
+      pos: -0.5,-4.5
+      parent: 1
+  - uid: 216
+    components:
+    - type: Transform
+      pos: 1.5,-4.5
+      parent: 1
+  - uid: 326
+    components:
+    - type: Transform
+      pos: 0.5,-4.5
+      parent: 1
+  - uid: 378
+    components:
+    - type: Transform
+      pos: 6.5,-4.5
+      parent: 1
+  - uid: 379
+    components:
+    - type: Transform
+      pos: 5.5,-4.5
+      parent: 1
+  - uid: 424
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,-6.5
+      parent: 1
+  - uid: 425
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,-6.5
+      parent: 1
+  - uid: 426
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-6.5
+      parent: 1
+  - uid: 427
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-6.5
+      parent: 1
+  - uid: 485
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,9.5
+      parent: 1
+  - uid: 493
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,9.5
+      parent: 1
+  - uid: 611
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,14.5
+      parent: 1
+  - uid: 650
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,7.5
+      parent: 1
+  - uid: 651
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,8.5
+      parent: 1
+  - uid: 654
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,7.5
+      parent: 1
+  - uid: 655
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,8.5
+      parent: 1
+  - uid: 656
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,7.5
+      parent: 1
+  - uid: 657
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,8.5
+      parent: 1
+  - uid: 658
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,8.5
+      parent: 1
+  - uid: 659
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,7.5
+      parent: 1
+  - uid: 686
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,14.5
+      parent: 1
+  - uid: 687
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,14.5
+      parent: 1
+  - uid: 701
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,14.5
+      parent: 1
+  - uid: 702
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,14.5
+      parent: 1
+  - uid: 1584
+    components:
+    - type: Transform
+      pos: -0.5,5.5
+      parent: 1
+  - uid: 1585
+    components:
+    - type: Transform
+      pos: 7.5,5.5
+      parent: 1
+  - uid: 1688
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-25.5
+      parent: 1
+  - uid: 1689
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-25.5
+      parent: 1
+- proto: ClosetWallEmergencyFilledRandom
+  entities:
+  - uid: 175
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,2.5
+      parent: 1
+  - uid: 176
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-5.5
+      parent: 1
+  - uid: 2101
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-14.5
+      parent: 1
+  - uid: 2102
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,-14.5
+      parent: 1
+  - uid: 2103
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,-5.5
+      parent: 1
+  - uid: 2104
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,2.5
+      parent: 1
+- proto: ClosetWallFireFilledRandom
+  entities:
+  - uid: 140
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,6.5
+      parent: 1
+  - uid: 304
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-9.5
+      parent: 1
+  - uid: 305
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-1.5
+      parent: 1
+  - uid: 2105
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,6.5
+      parent: 1
+  - uid: 2106
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,-1.5
+      parent: 1
+  - uid: 2107
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,-9.5
+      parent: 1
+- proto: ComputerAlert
+  entities:
+  - uid: 697
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,14.5
+      parent: 1
+  - uid: 1687
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-25.5
+      parent: 1
+- proto: ComputerCloningConsole
+  entities:
+  - uid: 214
+    components:
+    - type: Transform
+      pos: 3.5,-6.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        330:
+        - MedicalScannerSender: MedicalScannerReceiver
+        - CloningPodSender: MedicalScannerReceiver
+        370:
+        - MedicalScannerSender: CloningPodReceiver
+        - CloningPodSender: CloningPodReceiver
+- proto: ComputerComms
+  entities:
+  - uid: 698
+    components:
+    - type: Transform
+      pos: 4.5,15.5
+      parent: 1
+- proto: ComputerEmergencyShuttle
+  entities:
+  - uid: 685
+    components:
+    - type: Transform
+      pos: 3.5,15.5
+      parent: 1
+- proto: ComputerId
+  entities:
+  - uid: 696
+    components:
+    - type: Transform
+      pos: 2.5,15.5
+      parent: 1
+- proto: ComputerPowerMonitoring
+  entities:
+  - uid: 1686
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-25.5
+      parent: 1
+- proto: ComputerRadar
+  entities:
+  - uid: 699
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,14.5
+      parent: 1
+- proto: CrateFilledSpawner
+  entities:
+  - uid: 1925
+    components:
+    - type: Transform
+      pos: 2.5,-34.5
+      parent: 1
+  - uid: 1928
+    components:
+    - type: Transform
+      pos: 5.5,-24.5
+      parent: 1
+- proto: CrowbarRed
+  entities:
+  - uid: 2079
+    components:
+    - type: Transform
+      pos: 0.33350086,-23.568808
+      parent: 1
+  - uid: 2080
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.07526481,-16.473337
+      parent: 1
+  - uid: 2081
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.24713436,11.426374
+      parent: 1
+- proto: DefibrillatorCabinetFilled
+  entities:
+  - uid: 14
+    components:
+    - type: Transform
+      pos: 1.5,-3.5
+      parent: 1
+  - uid: 1186
+    components:
+    - type: Transform
+      pos: 5.5,-3.5
+      parent: 1
+- proto: DisposalBend
+  entities:
+  - uid: 1849
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-14.5
+      parent: 1
+  - uid: 1854
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-19.5
+      parent: 1
+  - uid: 1855
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-19.5
+      parent: 1
+  - uid: 1856
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,-24.5
+      parent: 1
+  - uid: 1857
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-24.5
+      parent: 1
+- proto: DisposalJunction
+  entities:
+  - uid: 1805
+    components:
+    - type: Transform
+      pos: -3.5,-13.5
+      parent: 1
+  - uid: 1806
+    components:
+    - type: Transform
+      pos: 10.5,-14.5
+      parent: 1
+- proto: DisposalJunctionFlipped
+  entities:
+  - uid: 1807
+    components:
+    - type: Transform
+      pos: 10.5,-13.5
+      parent: 1
+- proto: DisposalPipe
+  entities:
+  - uid: 1808
+    components:
+    - type: Transform
+      pos: 10.5,-12.5
+      parent: 1
+  - uid: 1809
+    components:
+    - type: Transform
+      pos: 10.5,-11.5
+      parent: 1
+  - uid: 1810
+    components:
+    - type: Transform
+      pos: 10.5,-10.5
+      parent: 1
+  - uid: 1811
+    components:
+    - type: Transform
+      pos: 10.5,-9.5
+      parent: 1
+  - uid: 1812
+    components:
+    - type: Transform
+      pos: 10.5,-8.5
+      parent: 1
+  - uid: 1813
+    components:
+    - type: Transform
+      pos: 10.5,-7.5
+      parent: 1
+  - uid: 1814
+    components:
+    - type: Transform
+      pos: 10.5,-6.5
+      parent: 1
+  - uid: 1815
+    components:
+    - type: Transform
+      pos: 10.5,-5.5
+      parent: 1
+  - uid: 1816
+    components:
+    - type: Transform
+      pos: 10.5,-4.5
+      parent: 1
+  - uid: 1817
+    components:
+    - type: Transform
+      pos: 10.5,-3.5
+      parent: 1
+  - uid: 1818
+    components:
+    - type: Transform
+      pos: 10.5,-2.5
+      parent: 1
+  - uid: 1819
+    components:
+    - type: Transform
+      pos: 10.5,-1.5
+      parent: 1
+  - uid: 1820
+    components:
+    - type: Transform
+      pos: 10.5,-0.5
+      parent: 1
+  - uid: 1821
+    components:
+    - type: Transform
+      pos: 10.5,0.5
+      parent: 1
+  - uid: 1822
+    components:
+    - type: Transform
+      pos: -3.5,0.5
+      parent: 1
+  - uid: 1823
+    components:
+    - type: Transform
+      pos: -3.5,-0.5
+      parent: 1
+  - uid: 1824
+    components:
+    - type: Transform
+      pos: -3.5,-1.5
+      parent: 1
+  - uid: 1825
+    components:
+    - type: Transform
+      pos: -3.5,-2.5
+      parent: 1
+  - uid: 1826
+    components:
+    - type: Transform
+      pos: -3.5,-3.5
+      parent: 1
+  - uid: 1827
+    components:
+    - type: Transform
+      pos: -3.5,-4.5
+      parent: 1
+  - uid: 1828
+    components:
+    - type: Transform
+      pos: -3.5,-5.5
+      parent: 1
+  - uid: 1829
+    components:
+    - type: Transform
+      pos: -3.5,-6.5
+      parent: 1
+  - uid: 1830
+    components:
+    - type: Transform
+      pos: -3.5,-7.5
+      parent: 1
+  - uid: 1831
+    components:
+    - type: Transform
+      pos: -3.5,-8.5
+      parent: 1
+  - uid: 1832
+    components:
+    - type: Transform
+      pos: -3.5,-9.5
+      parent: 1
+  - uid: 1833
+    components:
+    - type: Transform
+      pos: -3.5,-10.5
+      parent: 1
+  - uid: 1834
+    components:
+    - type: Transform
+      pos: -3.5,-11.5
+      parent: 1
+  - uid: 1835
+    components:
+    - type: Transform
+      pos: -3.5,-12.5
+      parent: 1
+  - uid: 1836
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-14.5
+      parent: 1
+  - uid: 1837
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-14.5
+      parent: 1
+  - uid: 1838
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-14.5
+      parent: 1
+  - uid: 1839
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-14.5
+      parent: 1
+  - uid: 1840
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-14.5
+      parent: 1
+  - uid: 1841
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-14.5
+      parent: 1
+  - uid: 1842
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-14.5
+      parent: 1
+  - uid: 1843
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-14.5
+      parent: 1
+  - uid: 1844
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-14.5
+      parent: 1
+  - uid: 1845
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-14.5
+      parent: 1
+  - uid: 1846
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-14.5
+      parent: 1
+  - uid: 1847
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-14.5
+      parent: 1
+  - uid: 1848
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,-14.5
+      parent: 1
+  - uid: 1850
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,-15.5
+      parent: 1
+  - uid: 1851
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,-16.5
+      parent: 1
+  - uid: 1852
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,-17.5
+      parent: 1
+  - uid: 1853
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,-18.5
+      parent: 1
+  - uid: 1858
+    components:
+    - type: Transform
+      pos: 6.5,-25.5
+      parent: 1
+  - uid: 1859
+    components:
+    - type: Transform
+      pos: 6.5,-26.5
+      parent: 1
+  - uid: 1860
+    components:
+    - type: Transform
+      pos: 6.5,-27.5
+      parent: 1
+  - uid: 1861
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-24.5
+      parent: 1
+  - uid: 1862
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-24.5
+      parent: 1
+  - uid: 1863
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-23.5
+      parent: 1
+  - uid: 1864
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-22.5
+      parent: 1
+  - uid: 1865
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-21.5
+      parent: 1
+  - uid: 1866
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-20.5
+      parent: 1
+- proto: DisposalTrunk
+  entities:
+  - uid: 29
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,-28.5
+      parent: 1
+  - uid: 1801
+    components:
+    - type: Transform
+      pos: -3.5,1.5
+      parent: 1
+  - uid: 1802
+    components:
+    - type: Transform
+      pos: 10.5,1.5
+      parent: 1
+  - uid: 1803
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-13.5
+      parent: 1
+  - uid: 1804
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-13.5
+      parent: 1
+- proto: DisposalUnit
+  entities:
+  - uid: 1797
+    components:
+    - type: Transform
+      pos: 11.5,-13.5
+      parent: 1
+  - uid: 1798
+    components:
+    - type: Transform
+      pos: -4.5,-13.5
+      parent: 1
+  - uid: 1799
+    components:
+    - type: Transform
+      pos: -3.5,1.5
+      parent: 1
+  - uid: 1800
+    components:
+    - type: Transform
+      pos: 10.5,1.5
+      parent: 1
+- proto: DrinkBeerglass
+  entities:
+  - uid: 2025
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.3622198,-0.24730682
+      parent: 1
+- proto: DrinkMartiniGlass
+  entities:
+  - uid: 2024
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.182532,1.3542557
+      parent: 1
+  - uid: 2026
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.409095,-2.3019943
+      parent: 1
+- proto: DrinkRootBeerGlass
+  entities:
+  - uid: 2027
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.14347,-2.5676193
+      parent: 1
+- proto: DrinkShotGlass
+  entities:
+  - uid: 1936
+    components:
+    - type: Transform
+      pos: 3.613544,-2.4263215
+      parent: 1
+  - uid: 2017
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5340948,1.1433179
+      parent: 1
+  - uid: 2018
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.3622198,0.8230057
+      parent: 1
+  - uid: 2019
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.8778448,-0.5285568
+      parent: 1
+  - uid: 2020
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.95597,-0.42699432
+      parent: 1
+  - uid: 2021
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.1044073,-0.6223068
+      parent: 1
+  - uid: 2022
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.346595,-0.38011932
+      parent: 1
+  - uid: 2023
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.46629024,-2.3254237
+      parent: 1
+- proto: EmergencyLight
+  entities:
+  - uid: 2046
+    components:
+    - type: Transform
+      pos: 3.5,15.5
+      parent: 1
+  - uid: 2047
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,11.5
+      parent: 1
+  - uid: 2048
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,11.5
+      parent: 1
+  - uid: 2049
+    components:
+    - type: Transform
+      pos: 3.5,11.5
+      parent: 1
+  - uid: 2050
+    components:
+    - type: Transform
+      pos: 3.5,5.5
+      parent: 1
+  - uid: 2051
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,4.5
+      parent: 1
+  - uid: 2052
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,-3.5
+      parent: 1
+  - uid: 2053
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,-11.5
+      parent: 1
+  - uid: 2054
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-11.5
+      parent: 1
+  - uid: 2055
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-3.5
+      parent: 1
+  - uid: 2056
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,4.5
+      parent: 1
+  - uid: 2057
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-16.5
+      parent: 1
+  - uid: 2058
+    components:
+    - type: Transform
+      pos: 3.5,-23.5
+      parent: 1
+  - uid: 2059
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-29.5
+      parent: 1
+  - uid: 2060
+    components:
+    - type: Transform
+      pos: 3.5,-31.5
+      parent: 1
+  - uid: 2062
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-20.5
+      parent: 1
+  - uid: 2063
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-20.5
+      parent: 1
+- proto: EmergencyMedipen
+  entities:
+  - uid: 213
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.459274,-8.414546
+      parent: 1
+  - uid: 368
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.3577113,-4.391109
+      parent: 1
+- proto: EmergencyRollerBedSpawnFolded
+  entities:
+  - uid: 1868
+    components:
+    - type: Transform
+      pos: 2.729817,-5.306182
+      parent: 1
+  - uid: 1869
+    components:
+    - type: Transform
+      pos: 3.136067,-5.337432
+      parent: 1
+- proto: EpinephrineChemistryBottle
+  entities:
+  - uid: 352
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.3577118,-8.211421
+      parent: 1
+- proto: FirelockGlass
+  entities:
+  - uid: 21
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-17.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1893
+      - 1894
+  - uid: 23
+    components:
+    - type: Transform
+      pos: 0.5,6.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1885
+      - 1887
+  - uid: 78
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,0.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1904
+      - 1885
+  - uid: 79
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,0.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1904
+      - 1885
+  - uid: 80
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-7.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1894
+      - 1904
+  - uid: 86
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-1.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1904
+      - 1891
+  - uid: 87
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-1.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1905
+      - 1891
+  - uid: 88
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-5.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1892
+      - 1905
+  - uid: 89
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,-7.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1894
+      - 1905
+  - uid: 90
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,0.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1905
+      - 1885
+  - uid: 91
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,8.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1885
+      - 1889
+  - uid: 93
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-7.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1894
+      - 1905
+  - uid: 246
+    components:
+    - type: Transform
+      pos: 6.5,6.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1885
+      - 1887
+  - uid: 262
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,0.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1905
+      - 1885
+  - uid: 263
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,8.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1885
+      - 1889
+  - uid: 286
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-7.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1894
+      - 1904
+  - uid: 288
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,8.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1888
+  - uid: 289
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,8.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1888
+  - uid: 295
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-5.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1904
+      - 1892
+  - uid: 679
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,13.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1888
+      - 1890
+  - uid: 681
+    components:
+    - type: Transform
+      pos: 9.5,-22.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1896
+      - 1895
+  - uid: 682
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,10.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1888
+      - 1887
+  - uid: 689
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-18.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1895
+  - uid: 722
+    components:
+    - type: Transform
+      pos: -2.5,-22.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1896
+      - 1893
+  - uid: 1737
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-17.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1893
+      - 1894
+  - uid: 1738
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-17.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1895
+      - 1894
+  - uid: 1739
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,-17.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1895
+      - 1894
+- proto: FloorDrain
+  entities:
+  - uid: 2085
+    components:
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+  - uid: 2087
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,9.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+- proto: FloraTree02
+  entities:
+  - uid: 1923
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.753403,-7.232706
+      parent: 1
+  - uid: 1924
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.6932545,7.499033
+      parent: 1
+- proto: FloraTree04
+  entities:
+  - uid: 1926
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.759519,-6.5801034
+      parent: 1
+- proto: FloraTreeLarge04
+  entities:
+  - uid: 1927
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.259198,1.1817689
+      parent: 1
+- proto: FoodBreadGarlicSlice
+  entities:
+  - uid: 1937
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.27879024,-2.4894862
+      parent: 1
+- proto: FoodMothBakedCheesePlatter
+  entities:
+  - uid: 420
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.2249378,1.5739474
+      parent: 1
+- proto: FoodPlateSmall
+  entities:
+  - uid: 423
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.3421254,-0.48073995
+      parent: 1
+  - uid: 1950
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.24754024,-2.6301112
+      parent: 1
+- proto: ForkPlastic
+  entities:
+  - uid: 421
+    components:
+    - type: Transform
+      pos: 0.33226132,-0.42738038
+      parent: 1
+- proto: GasMixer
+  entities:
+  - uid: 728
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-18.5
+      parent: 1
+    - type: GasMixer
+      inletTwoConcentration: 0.8
+      inletOneConcentration: 0.2
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasOutletInjector
+  entities:
+  - uid: 1014
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-21.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+  - uid: 1015
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,-21.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+- proto: GasPassiveVent
+  entities:
+  - uid: 1021
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-21.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#00CCFFFF'
+  - uid: 1022
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-21.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF0000FF'
+  - uid: 1558
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-28.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: GasPipeBend
+  entities:
+  - uid: 132
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-19.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 597
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-19.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 703
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 706
+    components:
+    - type: Transform
+      pos: 11.5,12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 709
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 729
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-18.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 737
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-18.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 749
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,-18.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1025
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF0000FF'
+  - uid: 1026
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF0000FF'
+  - uid: 1027
+    components:
+    - type: Transform
+      pos: 5.5,-19.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF0000FF'
+  - uid: 1028
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-19.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF0000FF'
+  - uid: 1029
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-18.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#00CCFFFF'
+  - uid: 1185
+    components:
+    - type: Transform
+      pos: 9.5,13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1382
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1391
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,14.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1392
+    components:
+    - type: Transform
+      pos: 3.5,14.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1393
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1526
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-23.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1527
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,-24.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1759
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-24.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1760
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-23.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1761
+    components:
+    - type: Transform
+      pos: -2.5,-19.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1762
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-18.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1763
+    components:
+    - type: Transform
+      pos: -1.5,-18.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1774
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-19.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasPipeFourway
+  entities:
+  - uid: 1075
+    components:
+    - type: Transform
+      pos: -4.5,5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1083
+    components:
+    - type: Transform
+      pos: -4.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1091
+    components:
+    - type: Transform
+      pos: -4.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1105
+    components:
+    - type: Transform
+      pos: 11.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1113
+    components:
+    - type: Transform
+      pos: -2.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1121
+    components:
+    - type: Transform
+      pos: -2.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1136
+    components:
+    - type: Transform
+      pos: 11.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1144
+    components:
+    - type: Transform
+      pos: 11.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1152
+    components:
+    - type: Transform
+      pos: 9.5,5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1160
+    components:
+    - type: Transform
+      pos: -2.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1168
+    components:
+    - type: Transform
+      pos: 9.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1176
+    components:
+    - type: Transform
+      pos: 9.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1283
+    components:
+    - type: Transform
+      pos: 6.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1296
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasPipeStraight
+  entities:
+  - uid: 74
+    components:
+    - type: Transform
+      pos: 0.5,-27.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 75
+    components:
+    - type: Transform
+      pos: -0.5,-24.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 77
+    components:
+    - type: Transform
+      pos: 0.5,-26.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 135
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-19.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 164
+    components:
+    - type: Transform
+      pos: 9.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 596
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 598
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 724
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-23.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 725
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-23.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 730
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 735
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-24.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 741
+    components:
+    - type: Transform
+      pos: 8.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 742
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-24.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 743
+    components:
+    - type: Transform
+      pos: 8.5,-22.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 837
+    components:
+    - type: Transform
+      pos: 9.5,-21.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 849
+    components:
+    - type: Transform
+      pos: 9.5,-23.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 850
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-24.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 852
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-24.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 853
+    components:
+    - type: Transform
+      pos: 8.5,-19.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 969
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-24.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1013
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-18.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1018
+    components:
+    - type: Transform
+      pos: 0.5,-20.5
+      parent: 1
+  - uid: 1019
+    components:
+    - type: Transform
+      pos: 6.5,-20.5
+      parent: 1
+  - uid: 1020
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1030
+    components:
+    - type: Transform
+      pos: 2.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#00CCFFFF'
+  - uid: 1039
+    components:
+    - type: Transform
+      pos: 5.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1040
+    components:
+    - type: Transform
+      pos: 5.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1042
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1043
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1045
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1046
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1047
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1050
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1051
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1053
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1054
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1055
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1056
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1057
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1058
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1059
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1060
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1061
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1062
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1063
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1064
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1065
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1066
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1067
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1070
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1074
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1076
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1077
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1078
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-9.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1079
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1080
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1082
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1084
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1085
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1086
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1087
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1088
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1090
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1092
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1093
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1094
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1095
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1096
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1098
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1099
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1100
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1101
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-14.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1103
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1104
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1106
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-9.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1107
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1108
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1109
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1111
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1112
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1114
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1115
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1116
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1117
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1119
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1120
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1122
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1123
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1124
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1125
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,9.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1127
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1128
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1129
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1130
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1132
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,9.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1133
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1134
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1135
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1137
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1138
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1140
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1141
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1142
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1143
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1145
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1146
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1148
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1149
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1150
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1151
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-9.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1153
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1154
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1156
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-14.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1157
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,-15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1159
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,-13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1161
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,-11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1162
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1163
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,-9.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1164
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,-8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1165
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,-7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1167
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,-5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1169
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,-3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1170
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1171
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,-1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1172
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,-0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1173
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1175
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1177
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1178
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1179
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1180
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1181
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1183
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1196
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-24.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1201
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1202
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1203
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1204
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1205
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1206
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1207
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1208
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1209
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1210
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1211
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1212
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1213
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1214
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1215
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1216
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1217
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1218
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1219
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1220
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1221
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1222
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1223
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1224
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1225
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1226
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1227
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1228
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1229
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1230
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1231
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1232
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1233
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1234
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1235
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1236
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1237
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1238
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1239
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1240
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1241
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1242
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1243
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1244
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1245
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1246
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1247
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1248
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1249
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1250
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1251
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1252
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1253
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1254
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1256
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1257
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1258
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1259
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1260
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1261
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1262
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1263
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1264
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1265
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1266
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1267
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1269
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1270
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1271
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1272
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1273
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1274
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1275
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1276
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1277
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1278
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1279
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1280
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1281
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1282
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1284
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1285
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1286
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1287
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1288
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1289
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1290
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1291
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1292
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1293
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1294
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1295
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1297
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1298
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1299
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1300
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1301
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1302
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1303
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1304
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1305
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1306
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1307
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1308
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1309
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1310
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1311
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1312
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1313
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1314
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1315
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1316
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1317
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1318
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1319
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1320
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1321
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1322
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1323
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1324
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1325
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1326
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1354
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1355
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1356
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1357
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1358
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1359
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1360
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1361
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1362
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1365
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1366
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1367
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1368
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1369
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1370
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1371
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1372
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1373
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1374
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1375
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1377
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1378
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1379
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1380
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1381
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1385
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1386
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1387
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1388
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1389
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1396
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1397
+    components:
+    - type: Transform
+      pos: 0.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1402
+    components:
+    - type: Transform
+      pos: 6.5,-3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1403
+    components:
+    - type: Transform
+      pos: 6.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1404
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1405
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1406
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1407
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1504
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-23.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1547
+    components:
+    - type: Transform
+      pos: 9.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1551
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-24.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1553
+    components:
+    - type: Transform
+      pos: 9.5,-22.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1604
+    components:
+    - type: Transform
+      pos: 0.5,-25.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1750
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-23.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1751
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-23.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1752
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-23.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1753
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-23.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1754
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-23.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1758
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-23.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1764
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-24.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1765
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-23.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1766
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-22.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1768
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1769
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-19.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1770
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1771
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1772
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1775
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-19.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1776
+    components:
+    - type: Transform
+      pos: -2.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1777
+    components:
+    - type: Transform
+      pos: -2.5,-21.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1778
+    components:
+    - type: Transform
+      pos: -2.5,-22.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1781
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasPipeTJunction
+  entities:
+  - uid: 101
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 600
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-18.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 705
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,9.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 707
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 734
+    components:
+    - type: Transform
+      pos: 0.5,-24.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 740
+    components:
+    - type: Transform
+      pos: 7.5,-24.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 854
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-21.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1012
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-18.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1038
+    components:
+    - type: Transform
+      pos: 1.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1041
+    components:
+    - type: Transform
+      pos: 5.5,-15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1071
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1081
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1089
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1097
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1102
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-14.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1110
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1118
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1131
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,9.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1139
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1147
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1155
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-14.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1158
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1166
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1174
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1182
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1184
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1190
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1255
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1268
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1376
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1384
+    components:
+    - type: Transform
+      pos: 2.5,14.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1394
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,-15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1395
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1757
+    components:
+    - type: Transform
+      pos: -0.5,-23.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1767
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-21.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1773
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-18.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasPort
+  entities:
+  - uid: 1016
+    components:
+    - type: Transform
+      pos: 0.5,-19.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+  - uid: 1017
+    components:
+    - type: Transform
+      pos: 6.5,-19.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+- proto: GasPressurePump
+  entities:
+  - uid: 1023
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-19.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#00CCFFFF'
+  - uid: 1024
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-19.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF0000FF'
+- proto: GasVentPump
+  entities:
+  - uid: 85
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-18.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1893
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 726
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-25.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1896
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1048
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-18.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1333
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-10.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1334
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-2.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1335
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,5.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1336
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,5.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1337
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,-2.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1338
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,-10.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1341
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-13.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1894
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1342
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-13.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1894
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1345
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-5.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1904
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1346
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-5.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1905
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1347
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,2.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1885
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1348
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,2.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1885
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1352
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,10.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1888
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1353
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,10.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1889
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1363
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,11.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1887
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1383
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,13.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1890
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1398
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-5.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1892
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1400
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1891
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1408
+    components:
+    - type: Transform
+      pos: 2.5,7.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1756
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,-21.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1895
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasVentScrubber
+  entities:
+  - uid: 381
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,3.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 727
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,-25.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1896
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1049
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-18.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1126
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,9.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1888
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1327
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,-12.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1328
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,-4.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1330
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,3.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1331
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-4.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1332
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-12.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1339
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-14.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1894
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1340
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-14.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1894
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1343
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-6.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1904
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1344
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-6.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1905
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1349
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,1.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1885
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1350
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,1.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1885
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1351
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,9.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1889
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1364
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,11.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1887
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1390
+    components:
+    - type: Transform
+      pos: 4.5,13.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1890
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1399
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,-5.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1892
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1401
+    components:
+    - type: Transform
+      pos: 6.5,-1.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1891
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1410
+    components:
+    - type: Transform
+      pos: 4.5,7.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1562
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-21.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1893
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1755
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-18.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1895
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: Gauze
+  entities:
+  - uid: 367
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.4514618,-8.633296
+      parent: 1
+- proto: GeneratorBasic15kW
+  entities:
+  - uid: 1682
+    components:
+    - type: Transform
+      pos: 2.5,-23.5
+      parent: 1
+  - uid: 1683
+    components:
+    - type: Transform
+      pos: 1.5,-23.5
+      parent: 1
+  - uid: 1684
+    components:
+    - type: Transform
+      pos: 4.5,-23.5
+      parent: 1
+  - uid: 1685
+    components:
+    - type: Transform
+      pos: 5.5,-23.5
+      parent: 1
+- proto: GravityGeneratorMini
+  entities:
+  - uid: 1680
+    components:
+    - type: Transform
+      pos: 3.5,-23.5
+      parent: 1
+- proto: Grille
+  entities:
+  - uid: 9
+    components:
+    - type: Transform
+      pos: 10.5,0.5
+      parent: 1
+  - uid: 16
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-5.5
+      parent: 1
+  - uid: 17
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-1.5
+      parent: 1
+  - uid: 20
+    components:
+    - type: Transform
+      pos: 5.5,-17.5
+      parent: 1
+  - uid: 33
+    components:
+    - type: Transform
+      pos: 13.5,-1.5
+      parent: 1
+  - uid: 35
+    components:
+    - type: Transform
+      pos: 14.5,-5.5
+      parent: 1
+  - uid: 69
+    components:
+    - type: Transform
+      pos: 1.5,-29.5
+      parent: 1
+  - uid: 70
+    components:
+    - type: Transform
+      pos: -3.5,0.5
+      parent: 1
+  - uid: 81
+    components:
+    - type: Transform
+      pos: -1.5,-27.5
+      parent: 1
+  - uid: 120
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,6.5
+      parent: 1
+  - uid: 136
+    components:
+    - type: Transform
+      pos: 13.5,-9.5
+      parent: 1
+  - uid: 141
+    components:
+    - type: Transform
+      pos: 14.5,-9.5
+      parent: 1
+  - uid: 155
+    components:
+    - type: Transform
+      pos: -5.5,13.5
+      parent: 1
+  - uid: 171
+    components:
+    - type: Transform
+      pos: 15.5,-1.5
+      parent: 1
+  - uid: 173
+    components:
+    - type: Transform
+      pos: 14.5,-1.5
+      parent: 1
+  - uid: 179
+    components:
+    - type: Transform
+      pos: 14.5,2.5
+      parent: 1
+  - uid: 181
+    components:
+    - type: Transform
+      pos: 16.5,-11.5
+      parent: 1
+  - uid: 182
+    components:
+    - type: Transform
+      pos: 15.5,-13.5
+      parent: 1
+  - uid: 199
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,2.5
+      parent: 1
+  - uid: 203
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-5.5
+      parent: 1
+  - uid: 205
+    components:
+    - type: Transform
+      pos: -9.5,4.5
+      parent: 1
+  - uid: 206
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-1.5
+      parent: 1
+  - uid: 207
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,2.5
+      parent: 1
+  - uid: 208
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,2.5
+      parent: 1
+  - uid: 209
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-3.5
+      parent: 1
+  - uid: 210
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-1.5
+      parent: 1
+  - uid: 222
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,6.5
+      parent: 1
+  - uid: 223
+    components:
+    - type: Transform
+      pos: 13.5,2.5
+      parent: 1
+  - uid: 227
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,2.5
+      parent: 1
+  - uid: 228
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-6.5
+      parent: 1
+  - uid: 231
+    components:
+    - type: Transform
+      pos: 3.5,6.5
+      parent: 1
+  - uid: 233
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,2.5
+      parent: 1
+  - uid: 236
+    components:
+    - type: Transform
+      pos: 16.5,4.5
+      parent: 1
+  - uid: 237
+    components:
+    - type: Transform
+      pos: 15.5,-9.5
+      parent: 1
+  - uid: 240
+    components:
+    - type: Transform
+      pos: 16.5,-3.5
+      parent: 1
+  - uid: 243
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,2.5
+      parent: 1
+  - uid: 247
+    components:
+    - type: Transform
+      pos: 13.5,-13.5
+      parent: 1
+  - uid: 248
+    components:
+    - type: Transform
+      pos: 15.5,6.5
+      parent: 1
+  - uid: 250
+    components:
+    - type: Transform
+      pos: 2.5,2.5
+      parent: 1
+  - uid: 251
+    components:
+    - type: Transform
+      pos: 13.5,6.5
+      parent: 1
+  - uid: 252
+    components:
+    - type: Transform
+      pos: 15.5,-5.5
+      parent: 1
+  - uid: 264
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,2.5
+      parent: 1
+  - uid: 279
+    components:
+    - type: Transform
+      pos: 4.5,6.5
+      parent: 1
+  - uid: 290
+    components:
+    - type: Transform
+      pos: 14.5,-13.5
+      parent: 1
+  - uid: 291
+    components:
+    - type: Transform
+      pos: 14.5,6.5
+      parent: 1
+  - uid: 292
+    components:
+    - type: Transform
+      pos: 2.5,6.5
+      parent: 1
+  - uid: 297
+    components:
+    - type: Transform
+      pos: 15.5,2.5
+      parent: 1
+  - uid: 298
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,2.5
+      parent: 1
+  - uid: 299
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,2.5
+      parent: 1
+  - uid: 307
+    components:
+    - type: Transform
+      pos: -3.5,-7.5
+      parent: 1
+  - uid: 317
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-6.5
+      parent: 1
+  - uid: 321
+    components:
+    - type: Transform
+      pos: 10.5,-7.5
+      parent: 1
+  - uid: 334
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,6.5
+      parent: 1
+  - uid: 335
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-13.5
+      parent: 1
+  - uid: 336
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-13.5
+      parent: 1
+  - uid: 340
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-9.5
+      parent: 1
+  - uid: 343
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-13.5
+      parent: 1
+  - uid: 344
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,2.5
+      parent: 1
+  - uid: 348
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-5.5
+      parent: 1
+  - uid: 349
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-9.5
+      parent: 1
+  - uid: 365
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-11.5
+      parent: 1
+  - uid: 372
+    components:
+    - type: Transform
+      pos: 13.5,-5.5
+      parent: 1
+  - uid: 374
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-9.5
+      parent: 1
+  - uid: 438
+    components:
+    - type: Transform
+      pos: 12.5,10.5
+      parent: 1
+  - uid: 439
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,11.5
+      parent: 1
+  - uid: 444
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,14.5
+      parent: 1
+  - uid: 446
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,14.5
+      parent: 1
+  - uid: 447
+    components:
+    - type: Transform
+      pos: 12.5,12.5
+      parent: 1
+  - uid: 448
+    components:
+    - type: Transform
+      pos: 12.5,13.5
+      parent: 1
+  - uid: 455
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,-19.5
+      parent: 1
+  - uid: 468
+    components:
+    - type: Transform
+      pos: -5.5,12.5
+      parent: 1
+  - uid: 478
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-19.5
+      parent: 1
+  - uid: 481
+    components:
+    - type: Transform
+      pos: -5.5,10.5
+      parent: 1
+  - uid: 482
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,14.5
+      parent: 1
+  - uid: 484
+    components:
+    - type: Transform
+      pos: -5.5,9.5
+      parent: 1
+  - uid: 487
+    components:
+    - type: Transform
+      pos: 12.5,9.5
+      parent: 1
+  - uid: 489
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,14.5
+      parent: 1
+  - uid: 490
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,14.5
+      parent: 1
+  - uid: 491
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,14.5
+      parent: 1
+  - uid: 497
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,15.5
+      parent: 1
+  - uid: 499
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,15.5
+      parent: 1
+  - uid: 502
+    components:
+    - type: Transform
+      pos: 3.5,16.5
+      parent: 1
+  - uid: 503
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,15.5
+      parent: 1
+  - uid: 504
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,15.5
+      parent: 1
+  - uid: 509
+    components:
+    - type: Transform
+      pos: 2.5,16.5
+      parent: 1
+  - uid: 510
+    components:
+    - type: Transform
+      pos: 4.5,16.5
+      parent: 1
+  - uid: 519
+    components:
+    - type: Transform
+      pos: 0.5,-22.5
+      parent: 1
+  - uid: 520
+    components:
+    - type: Transform
+      pos: 1.5,-22.5
+      parent: 1
+  - uid: 521
+    components:
+    - type: Transform
+      pos: 2.5,-22.5
+      parent: 1
+  - uid: 522
+    components:
+    - type: Transform
+      pos: 4.5,-22.5
+      parent: 1
+  - uid: 523
+    components:
+    - type: Transform
+      pos: 5.5,-22.5
+      parent: 1
+  - uid: 524
+    components:
+    - type: Transform
+      pos: 6.5,-22.5
+      parent: 1
+  - uid: 529
+    components:
+    - type: Transform
+      pos: 0.5,-20.5
+      parent: 1
+  - uid: 533
+    components:
+    - type: Transform
+      pos: 1.5,-20.5
+      parent: 1
+  - uid: 534
+    components:
+    - type: Transform
+      pos: 2.5,-20.5
+      parent: 1
+  - uid: 535
+    components:
+    - type: Transform
+      pos: 4.5,-20.5
+      parent: 1
+  - uid: 536
+    components:
+    - type: Transform
+      pos: 5.5,-20.5
+      parent: 1
+  - uid: 537
+    components:
+    - type: Transform
+      pos: 6.5,-20.5
+      parent: 1
+  - uid: 581
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-18.5
+      parent: 1
+  - uid: 616
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,10.5
+      parent: 1
+  - uid: 621
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,12.5
+      parent: 1
+  - uid: 622
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,12.5
+      parent: 1
+  - uid: 624
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,12.5
+      parent: 1
+  - uid: 693
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,-18.5
+      parent: 1
+  - uid: 700
+    components:
+    - type: Transform
+      pos: 1.5,-17.5
+      parent: 1
+  - uid: 966
+    components:
+    - type: Transform
+      pos: 4.5,-17.5
+      parent: 1
+  - uid: 1200
+    components:
+    - type: Transform
+      pos: 7.5,-9.5
+      parent: 1
+  - uid: 1529
+    components:
+    - type: Transform
+      pos: 0.5,-9.5
+      parent: 1
+  - uid: 1552
+    components:
+    - type: Transform
+      pos: 6.5,-9.5
+      parent: 1
+  - uid: 1554
+    components:
+    - type: Transform
+      pos: -0.5,-9.5
+      parent: 1
+  - uid: 1560
+    components:
+    - type: Transform
+      pos: 1.5,-28.5
+      parent: 1
+  - uid: 1565
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-19.5
+      parent: 1
+  - uid: 1566
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-18.5
+      parent: 1
+  - uid: 1568
+    components:
+    - type: Transform
+      pos: 3.5,-17.5
+      parent: 1
+  - uid: 1569
+    components:
+    - type: Transform
+      pos: 2.5,-17.5
+      parent: 1
+  - uid: 1619
+    components:
+    - type: Transform
+      pos: 5.5,-29.5
+      parent: 1
+  - uid: 1622
+    components:
+    - type: Transform
+      pos: 0.5,-27.5
+      parent: 1
+  - uid: 1623
+    components:
+    - type: Transform
+      pos: 7.5,-27.5
+      parent: 1
+  - uid: 1627
+    components:
+    - type: Transform
+      pos: 5.5,-28.5
+      parent: 1
+  - uid: 1632
+    components:
+    - type: Transform
+      pos: 6.5,-27.5
+      parent: 1
+  - uid: 1646
+    components:
+    - type: Transform
+      pos: 8.5,-27.5
+      parent: 1
+  - uid: 1664
+    components:
+    - type: Transform
+      pos: -0.5,-27.5
+      parent: 1
+- proto: Gyroscope
+  entities:
+  - uid: 1661
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-37.5
+      parent: 1
+  - uid: 1662
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-36.5
+      parent: 1
+  - uid: 1663
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-38.5
+      parent: 1
+- proto: HandheldGPSBasic
+  entities:
+  - uid: 2066
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.0635476,13.659181
+      parent: 1
+- proto: HospitalCurtainsOpen
+  entities:
+  - uid: 382
+    components:
+    - type: Transform
+      pos: -0.5,-8.5
+      parent: 1
+  - uid: 383
+    components:
+    - type: Transform
+      pos: 1.5,-8.5
+      parent: 1
+  - uid: 384
+    components:
+    - type: Transform
+      pos: 3.5,-8.5
+      parent: 1
+  - uid: 385
+    components:
+    - type: Transform
+      pos: 5.5,-8.5
+      parent: 1
+  - uid: 386
+    components:
+    - type: Transform
+      pos: 7.5,-8.5
+      parent: 1
+- proto: IntercomCommon
+  entities:
+  - uid: 1009
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-9.5
+      parent: 1
+  - uid: 1921
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-9.5
+      parent: 1
+  - uid: 2114
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,2.5
+      parent: 1
+  - uid: 2120
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,1.5
+      parent: 1
+- proto: IntercomEngineering
+  entities:
+  - uid: 601
+    components:
+    - type: Transform
+      pos: -1.5,-22.5
+      parent: 1
+  - uid: 750
+    components:
+    - type: Transform
+      pos: 8.5,-22.5
+      parent: 1
+- proto: KitchenMicrowave
+  entities:
+  - uid: 412
+    components:
+    - type: Transform
+      pos: 0.5,1.5
+      parent: 1
+- proto: KnifePlastic
+  entities:
+  - uid: 2118
+    components:
+    - type: Transform
+      pos: 0.5041363,-0.44300538
+      parent: 1
+- proto: LockerElectricalSuppliesFilled
+  entities:
+  - uid: 1675
+    components:
+    - type: Transform
+      pos: -1.5,-25.5
+      parent: 1
+- proto: LockerFreezer
+  entities:
+  - uid: 411
+    components:
+    - type: Transform
+      pos: -0.5,1.5
+      parent: 1
+- proto: LockerSecurityFilled
+  entities:
+  - uid: 671
+    components:
+    - type: Transform
+      pos: 1.5,11.5
+      parent: 1
+  - uid: 672
+    components:
+    - type: Transform
+      pos: 5.5,11.5
+      parent: 1
+- proto: LockerWallMedicalDoctorFilled
+  entities:
+  - uid: 371
+    components:
+    - type: Transform
+      pos: 7.5,-3.5
+      parent: 1
+- proto: LockerWallMedicalFilled
+  entities:
+  - uid: 376
+    components:
+    - type: Transform
+      pos: -0.5,-3.5
+      parent: 1
+- proto: LockerWeldingSuppliesFilled
+  entities:
+  - uid: 1674
+    components:
+    - type: Transform
+      pos: -1.5,-26.5
+      parent: 1
+- proto: MaintenanceToolSpawner
+  entities:
+  - uid: 1932
+    components:
+    - type: Transform
+      pos: -1.5,-37.5
+      parent: 1
+  - uid: 1933
+    components:
+    - type: Transform
+      pos: 4.5,-29.5
+      parent: 1
+  - uid: 1934
+    components:
+    - type: Transform
+      pos: 11.5,9.5
+      parent: 1
+- proto: MaintenanceWeaponSpawner
+  entities:
+  - uid: 1930
+    components:
+    - type: Transform
+      pos: -0.5,-28.5
+      parent: 1
+  - uid: 1931
+    components:
+    - type: Transform
+      pos: 7.5,-37.5
+      parent: 1
+- proto: MaterialBiomass
+  entities:
+  - uid: 1913
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.4670987,-4.5731344
+      parent: 1
+- proto: MedicalBed
+  entities:
+  - uid: 283
+    components:
+    - type: Transform
+      pos: -0.5,-8.5
+      parent: 1
+  - uid: 284
+    components:
+    - type: Transform
+      pos: 1.5,-8.5
+      parent: 1
+  - uid: 311
+    components:
+    - type: Transform
+      pos: 3.5,-8.5
+      parent: 1
+  - uid: 325
+    components:
+    - type: Transform
+      pos: 5.5,-8.5
+      parent: 1
+  - uid: 327
+    components:
+    - type: Transform
+      pos: 7.5,-8.5
+      parent: 1
+- proto: MedicalScanner
+  entities:
+  - uid: 330
+    components:
+    - type: Transform
+      pos: 4.5,-6.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 214
+- proto: MedkitAdvancedFilled
+  entities:
+  - uid: 2064
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.899485,13.307618
+      parent: 1
+- proto: MedkitFilled
+  entities:
+  - uid: 366
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.1233368,-8.3442335
+      parent: 1
+- proto: MetempsychoticMachine
+  entities:
+  - uid: 370
+    components:
+    - type: Transform
+      pos: 2.5,-6.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 214
+- proto: MopBucketFull
+  entities:
+  - uid: 2083
+    components:
+    - type: Transform
+      pos: 0.4385128,-15.087053
+      parent: 1
+  - uid: 2089
+    components:
+    - type: Transform
+      pos: 10.114859,13.062706
+      parent: 1
+- proto: MopItem
+  entities:
+  - uid: 2082
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.90983415,-15.059323
+      parent: 1
+  - uid: 2088
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.657582,13.329807
+      parent: 1
+- proto: Multitool
+  entities:
+  - uid: 2121
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.3690176,-4.2755756
+      parent: 1
+- proto: NitrogenCanister
+  entities:
+  - uid: 551
+    components:
+    - type: Transform
+      pos: 5.5,-21.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+  - uid: 1010
+    components:
+    - type: Transform
+      pos: 6.5,-19.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+- proto: OxygenCanister
+  entities:
+  - uid: 555
+    components:
+    - type: Transform
+      pos: 1.5,-21.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+  - uid: 1917
+    components:
+    - type: Transform
+      pos: 0.5,-19.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+- proto: PlaqueAtmos
+  entities:
+  - uid: 2076
+    components:
+    - type: Transform
+      pos: 12.5,-20.5
+      parent: 1
+- proto: PlushieAtmosian
+  entities:
+  - uid: 2029
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.525822,-19.42031
+      parent: 1
+- proto: PlushieCarp
+  entities:
+  - uid: 2032
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.7379594,-13.590573
+      parent: 1
+- proto: PlushieHampter
+  entities:
+  - uid: 2033
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.21379477,-16.4499
+      parent: 1
+- proto: PlushieLizard
+  entities:
+  - uid: 2044
+    components:
+    - type: Transform
+      pos: 1.5054002,-4.5560694
+      parent: 1
+- proto: PlushieMoth
+  entities:
+  - uid: 2039
+    components:
+    - type: Transform
+      pos: -0.5208669,5.553047
+      parent: 1
+- proto: PlushieMothBartender
+  entities:
+  - uid: 2043
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.6825323,-0.33324432
+      parent: 1
+- proto: PlushieNuke
+  entities:
+  - uid: 2035
+    components:
+    - type: Transform
+      pos: 6.8242917,-37.207977
+      parent: 1
+- proto: PlushiePenguin
+  entities:
+  - uid: 2034
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.4982705,-20.393938
+      parent: 1
+- proto: PlushieRGBee
+  entities:
+  - uid: 2028
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.594397,12.596214
+      parent: 1
+- proto: PlushieRouny
+  entities:
+  - uid: 2036
+    components:
+    - type: Transform
+      pos: 0.6680417,-28.811207
+      parent: 1
+- proto: PlushieSharkBlue
+  entities:
+  - uid: 2030
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.478947,-20.240622
+      parent: 1
+  - uid: 2031
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.6377406,-13.52911
+      parent: 1
+- proto: PlushieSharkGrey
+  entities:
+  - uid: 2045
+    components:
+    - type: Transform
+      pos: 7.5679,-8.548257
+      parent: 1
+- proto: PlushieSharkPink
+  entities:
+  - uid: 2040
+    components:
+    - type: Transform
+      pos: 4.3150706,8.43586
+      parent: 1
+- proto: PlushieSlime
+  entities:
+  - uid: 2041
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.485022,11.572777
+      parent: 1
+- proto: PlushieSnake
+  entities:
+  - uid: 2042
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.399769,-3.016137
+      parent: 1
+- proto: PlushieSpaceLizard
+  entities:
+  - uid: 2037
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.529521,-19.893938
+      parent: 1
+- proto: PlushieXeno
+  entities:
+  - uid: 2038
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.08882213,-10.365047
+      parent: 1
+- proto: PosterContrabandAtmosiaDeclarationIndependence
+  entities:
+  - uid: 2075
+    components:
+    - type: Transform
+      pos: 10.5,-22.5
+      parent: 1
+- proto: PosterLegitPieSlice
+  entities:
+  - uid: 2016
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,1.5
+      parent: 1
+- proto: PosterLegitSafetyMothEpi
+  entities:
+  - uid: 353
+    components:
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 1
+- proto: PottedPlantRandom
+  entities:
+  - uid: 160
+    components:
+    - type: Transform
+      pos: -3.5,-21.5
+      parent: 1
+  - uid: 167
+    components:
+    - type: Transform
+      pos: 1.5,-13.5
+      parent: 1
+  - uid: 602
+    components:
+    - type: Transform
+      pos: 10.5,-21.5
+      parent: 1
+  - uid: 604
+    components:
+    - type: Transform
+      pos: 5.5,-13.5
+      parent: 1
+  - uid: 661
+    components:
+    - type: Transform
+      pos: -3.5,7.5
+      parent: 1
+  - uid: 677
+    components:
+    - type: Transform
+      pos: 8.5,-13.5
+      parent: 1
+  - uid: 720
+    components:
+    - type: Transform
+      pos: -1.5,-21.5
+      parent: 1
+  - uid: 721
+    components:
+    - type: Transform
+      pos: 8.5,-21.5
+      parent: 1
+  - uid: 736
+    components:
+    - type: Transform
+      pos: -1.5,-13.5
+      parent: 1
+  - uid: 1073
+    components:
+    - type: Transform
+      pos: 1.5,-16.5
+      parent: 1
+  - uid: 1530
+    components:
+    - type: Transform
+      pos: -1.5,-10.5
+      parent: 1
+  - uid: 1531
+    components:
+    - type: Transform
+      pos: 8.5,-10.5
+      parent: 1
+  - uid: 1532
+    components:
+    - type: Transform
+      pos: -3.5,-0.5
+      parent: 1
+  - uid: 1533
+    components:
+    - type: Transform
+      pos: -3.5,-6.5
+      parent: 1
+  - uid: 1534
+    components:
+    - type: Transform
+      pos: 10.5,-6.5
+      parent: 1
+  - uid: 1535
+    components:
+    - type: Transform
+      pos: 10.5,-0.5
+      parent: 1
+  - uid: 1536
+    components:
+    - type: Transform
+      pos: 5.5,3.5
+      parent: 1
+  - uid: 1537
+    components:
+    - type: Transform
+      pos: 8.5,3.5
+      parent: 1
+  - uid: 1538
+    components:
+    - type: Transform
+      pos: 1.5,3.5
+      parent: 1
+  - uid: 1539
+    components:
+    - type: Transform
+      pos: -1.5,3.5
+      parent: 1
+  - uid: 1540
+    components:
+    - type: Transform
+      pos: -3.5,9.5
+      parent: 1
+  - uid: 1541
+    components:
+    - type: Transform
+      pos: 10.5,9.5
+      parent: 1
+  - uid: 1542
+    components:
+    - type: Transform
+      pos: 10.5,7.5
+      parent: 1
+  - uid: 1576
+    components:
+    - type: Transform
+      pos: 1.5,-12.5
+      parent: 1
+  - uid: 1577
+    components:
+    - type: Transform
+      pos: -1.5,-12.5
+      parent: 1
+  - uid: 1578
+    components:
+    - type: Transform
+      pos: 5.5,-12.5
+      parent: 1
+  - uid: 1579
+    components:
+    - type: Transform
+      pos: 8.5,-12.5
+      parent: 1
+  - uid: 1580
+    components:
+    - type: Transform
+      pos: 1.5,5.5
+      parent: 1
+  - uid: 1581
+    components:
+    - type: Transform
+      pos: 5.5,5.5
+      parent: 1
+  - uid: 1582
+    components:
+    - type: Transform
+      pos: 8.5,5.5
+      parent: 1
+  - uid: 1583
+    components:
+    - type: Transform
+      pos: -1.5,5.5
+      parent: 1
+  - uid: 1786
+    components:
+    - type: Transform
+      pos: 5.5,-16.5
+      parent: 1
+  - uid: 1870
+    components:
+    - type: Transform
+      pos: -3.5,-8.5
+      parent: 1
+  - uid: 1871
+    components:
+    - type: Transform
+      pos: 10.5,-8.5
+      parent: 1
+  - uid: 1872
+    components:
+    - type: Transform
+      pos: 10.5,-16.5
+      parent: 1
+  - uid: 1873
+    components:
+    - type: Transform
+      pos: -3.5,-16.5
+      parent: 1
+- proto: PowerCellRecharger
+  entities:
+  - uid: 675
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,11.5
+      parent: 1
+  - uid: 712
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,13.5
+      parent: 1
+  - uid: 713
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,13.5
+      parent: 1
+  - uid: 714
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,13.5
+      parent: 1
+  - uid: 818
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,11.5
+      parent: 1
+  - uid: 1794
+    components:
+    - type: Transform
+      pos: 0.5,-8.5
+      parent: 1
+  - uid: 1795
+    components:
+    - type: Transform
+      pos: 6.5,-8.5
+      parent: 1
+- proto: Poweredlight
+  entities:
+  - uid: 13
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,4.5
+      parent: 1
+  - uid: 59
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-3.5
+      parent: 1
+  - uid: 62
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,4.5
+      parent: 1
+  - uid: 106
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-11.5
+      parent: 1
+  - uid: 107
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-3.5
+      parent: 1
+  - uid: 133
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-11.5
+      parent: 1
+  - uid: 142
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-11.5
+      parent: 1
+  - uid: 145
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,4.5
+      parent: 1
+  - uid: 146
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-3.5
+      parent: 1
+  - uid: 148
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,4.5
+      parent: 1
+  - uid: 341
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-11.5
+      parent: 1
+  - uid: 345
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-3.5
+      parent: 1
+  - uid: 435
+    components:
+    - type: Transform
+      pos: 3.5,-4.5
+      parent: 1
+  - uid: 776
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,11.5
+      parent: 1
+  - uid: 778
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,11.5
+      parent: 1
+  - uid: 819
+    components:
+    - type: Transform
+      pos: 3.5,-10.5
+      parent: 1
+  - uid: 820
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,3.5
+      parent: 1
+  - uid: 827
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,11.5
+      parent: 1
+  - uid: 828
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-24.5
+      parent: 1
+  - uid: 829
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,13.5
+      parent: 1
+  - uid: 830
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,13.5
+      parent: 1
+  - uid: 843
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,9.5
+      parent: 1
+  - uid: 844
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-0.5
+      parent: 1
+  - uid: 848
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-0.5
+      parent: 1
+  - uid: 1608
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,11.5
+      parent: 1
+  - uid: 1609
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,9.5
+      parent: 1
+  - uid: 1611
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-17.5
+      parent: 1
+  - uid: 1612
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-17.5
+      parent: 1
+  - uid: 1666
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-26.5
+      parent: 1
+  - uid: 1742
+    components:
+    - type: Transform
+      pos: 10.5,-18.5
+      parent: 1
+  - uid: 1743
+    components:
+    - type: Transform
+      pos: -3.5,-18.5
+      parent: 1
+  - uid: 1744
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-16.5
+      parent: 1
+  - uid: 1745
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,-16.5
+      parent: 1
+  - uid: 1791
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-15.5
+      parent: 1
+  - uid: 1792
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-15.5
+      parent: 1
+  - uid: 1793
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-19.5
+      parent: 1
+  - uid: 1796
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,-24.5
+      parent: 1
+- proto: PoweredSmallLightMaintenance
+  entities:
+  - uid: 979
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-21.5
+      parent: 1
+  - uid: 980
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-21.5
+      parent: 1
+  - uid: 1668
+    components:
+    - type: Transform
+      pos: 3.5,-28.5
+      parent: 1
+  - uid: 1672
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-30.5
+      parent: 1
+  - uid: 2061
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-30.5
+      parent: 1
+- proto: Rack
+  entities:
+  - uid: 92
+    components:
+    - type: Transform
+      pos: 3.5,-4.5
+      parent: 1
+  - uid: 282
+    components:
+    - type: Transform
+      pos: 2.5,-4.5
+      parent: 1
+  - uid: 285
+    components:
+    - type: Transform
+      pos: 4.5,-4.5
+      parent: 1
+  - uid: 1679
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-23.5
+      parent: 1
+- proto: RadioHandheld
+  entities:
+  - uid: 2067
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.0049468875,11.699812
+      parent: 1
+  - uid: 2068
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.04011,13.377931
+      parent: 1
+- proto: Railing
+  entities:
+  - uid: 558
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,8.5
+      parent: 1
+  - uid: 559
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -7.5,7.5
+      parent: 1
+  - uid: 561
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,10.5
+      parent: 1
+  - uid: 563
+    components:
+    - type: Transform
+      pos: -7.5,-14.5
+      parent: 1
+  - uid: 565
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-16.5
+      parent: 1
+  - uid: 567
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-19.5
+      parent: 1
+  - uid: 568
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-18.5
+      parent: 1
+  - uid: 569
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-17.5
+      parent: 1
+  - uid: 570
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-8.5
+      parent: 1
+  - uid: 571
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-7.5
+      parent: 1
+  - uid: 572
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-6.5
+      parent: 1
+  - uid: 573
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-7.5
+      parent: 1
+  - uid: 574
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-6.5
+      parent: 1
+  - uid: 575
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-18.5
+      parent: 1
+  - uid: 576
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-17.5
+      parent: 1
+  - uid: 577
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,10.5
+      parent: 1
+  - uid: 578
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,9.5
+      parent: 1
+  - uid: 579
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,11.5
+      parent: 1
+  - uid: 580
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,8.5
+      parent: 1
+  - uid: 981
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,12.5
+      parent: 1
+  - uid: 982
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,11.5
+      parent: 1
+  - uid: 986
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-15.5
+      parent: 1
+  - uid: 987
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-0.5
+      parent: 1
+  - uid: 988
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,1.5
+      parent: 1
+  - uid: 989
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,0.5
+      parent: 1
+  - uid: 990
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,9.5
+      parent: 1
+  - uid: 995
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-19.5
+      parent: 1
+  - uid: 998
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-16.5
+      parent: 1
+  - uid: 999
+    components:
+    - type: Transform
+      pos: 14.5,-14.5
+      parent: 1
+  - uid: 1000
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-15.5
+      parent: 1
+  - uid: 1001
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-8.5
+      parent: 1
+  - uid: 1002
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,7.5
+      parent: 1
+  - uid: 1005
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,12.5
+      parent: 1
+  - uid: 1006
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 15.5,0.5
+      parent: 1
+  - uid: 1007
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-0.5
+      parent: 1
+  - uid: 1008
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 15.5,1.5
+      parent: 1
+- proto: RailingCorner
+  entities:
+  - uid: 985
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-20.5
+      parent: 1
+  - uid: 991
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -6.5,13.5
+      parent: 1
+  - uid: 992
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -8.5,7.5
+      parent: 1
+  - uid: 993
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,13.5
+      parent: 1
+  - uid: 994
+    components:
+    - type: Transform
+      pos: 15.5,-14.5
+      parent: 1
+  - uid: 996
+    components:
+    - type: Transform
+      pos: 13.5,-20.5
+      parent: 1
+  - uid: 1004
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 15.5,7.5
+      parent: 1
+  - uid: 1329
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-14.5
+      parent: 1
+- proto: RailingCornerSmall
+  entities:
+  - uid: 560
+    components:
+    - type: Transform
+      pos: -6.5,7.5
+      parent: 1
+  - uid: 564
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-14.5
+      parent: 1
+  - uid: 997
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,-14.5
+      parent: 1
+  - uid: 1003
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 13.5,7.5
+      parent: 1
+- proto: RandomBoards
+  entities:
+  - uid: 1952
+    components:
+    - type: Transform
+      pos: 9.5,-24.5
+      parent: 1
+  - uid: 1953
+    components:
+    - type: Transform
+      pos: -1.5,-23.5
+      parent: 1
+  - uid: 1954
+    components:
+    - type: Transform
+      pos: 0.5,-23.5
+      parent: 1
+- proto: RandomInstruments
+  entities:
+  - uid: 2070
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 1
+  - uid: 2071
+    components:
+    - type: Transform
+      pos: 7.5,-13.5
+      parent: 1
+  - uid: 2072
+    components:
+    - type: Transform
+      pos: -0.5,-12.5
+      parent: 1
+  - uid: 2073
+    components:
+    - type: Transform
+      pos: -2.5,-2.5
+      parent: 1
+  - uid: 2074
+    components:
+    - type: Transform
+      pos: -4.5,12.5
+      parent: 1
+- proto: RandomPainting
+  entities:
+  - uid: 1955
+    components:
+    - type: Transform
+      pos: 6.5,-17.5
+      parent: 1
+  - uid: 1956
+    components:
+    - type: Transform
+      pos: 7.5,-17.5
+      parent: 1
+  - uid: 1957
+    components:
+    - type: Transform
+      pos: 0.5,-17.5
+      parent: 1
+  - uid: 1958
+    components:
+    - type: Transform
+      pos: -1.5,-8.5
+      parent: 1
+  - uid: 1959
+    components:
+    - type: Transform
+      pos: 6.5,-3.5
+      parent: 1
+  - uid: 1960
+    components:
+    - type: Transform
+      pos: 8.5,0.5
+      parent: 1
+  - uid: 1961
+    components:
+    - type: Transform
+      pos: -1.5,0.5
+      parent: 1
+  - uid: 1962
+    components:
+    - type: Transform
+      pos: -1.5,7.5
+      parent: 1
+  - uid: 1963
+    components:
+    - type: Transform
+      pos: -5.5,11.5
+      parent: 1
+  - uid: 1964
+    components:
+    - type: Transform
+      pos: 8.5,13.5
+      parent: 1
+  - uid: 1965
+    components:
+    - type: Transform
+      pos: 8.5,14.5
+      parent: 1
+  - uid: 1966
+    components:
+    - type: Transform
+      pos: 6.5,12.5
+      parent: 1
+- proto: RandomPosterLegit
+  entities:
+  - uid: 1938
+    components:
+    - type: Transform
+      pos: -5.5,7.5
+      parent: 1
+  - uid: 1939
+    components:
+    - type: Transform
+      pos: -1.5,14.5
+      parent: 1
+  - uid: 1940
+    components:
+    - type: Transform
+      pos: 8.5,12.5
+      parent: 1
+  - uid: 1941
+    components:
+    - type: Transform
+      pos: 12.5,8.5
+      parent: 1
+  - uid: 1942
+    components:
+    - type: Transform
+      pos: 12.5,0.5
+      parent: 1
+  - uid: 1943
+    components:
+    - type: Transform
+      pos: 12.5,-6.5
+      parent: 1
+  - uid: 1944
+    components:
+    - type: Transform
+      pos: 12.5,-15.5
+      parent: 1
+  - uid: 1945
+    components:
+    - type: Transform
+      pos: 12.5,-16.5
+      parent: 1
+  - uid: 1946
+    components:
+    - type: Transform
+      pos: -0.5,-17.5
+      parent: 1
+  - uid: 1947
+    components:
+    - type: Transform
+      pos: -5.5,-15.5
+      parent: 1
+  - uid: 1948
+    components:
+    - type: Transform
+      pos: -5.5,-8.5
+      parent: 1
+  - uid: 1949
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 1
+- proto: RandomSoap
+  entities:
+  - uid: 1951
+    components:
+    - type: Transform
+      pos: -6.5,-8.5
+      parent: 1
+- proto: RandomSpawner
+  entities:
+  - uid: 1971
+    components:
+    - type: Transform
+      pos: 0.5,-11.5
+      parent: 1
+  - uid: 1972
+    components:
+    - type: Transform
+      pos: 5.5,-14.5
+      parent: 1
+  - uid: 1973
+    components:
+    - type: Transform
+      pos: 4.5,-14.5
+      parent: 1
+  - uid: 1974
+    components:
+    - type: Transform
+      pos: 1.5,-19.5
+      parent: 1
+  - uid: 1975
+    components:
+    - type: Transform
+      pos: -0.5,-24.5
+      parent: 1
+  - uid: 1976
+    components:
+    - type: Transform
+      pos: 0.5,-25.5
+      parent: 1
+  - uid: 1977
+    components:
+    - type: Transform
+      pos: 6.5,-25.5
+      parent: 1
+  - uid: 1978
+    components:
+    - type: Transform
+      pos: 7.5,-29.5
+      parent: 1
+  - uid: 1979
+    components:
+    - type: Transform
+      pos: 6.5,-30.5
+      parent: 1
+  - uid: 1980
+    components:
+    - type: Transform
+      pos: 6.5,-29.5
+      parent: 1
+  - uid: 1981
+    components:
+    - type: Transform
+      pos: 6.5,-28.5
+      parent: 1
+  - uid: 1982
+    components:
+    - type: Transform
+      pos: 7.5,-28.5
+      parent: 1
+  - uid: 1983
+    components:
+    - type: Transform
+      pos: 8.5,-28.5
+      parent: 1
+  - uid: 1984
+    components:
+    - type: Transform
+      pos: 4.5,-31.5
+      parent: 1
+  - uid: 1985
+    components:
+    - type: Transform
+      pos: 2.5,-32.5
+      parent: 1
+  - uid: 1986
+    components:
+    - type: Transform
+      pos: 4.5,-35.5
+      parent: 1
+  - uid: 1987
+    components:
+    - type: Transform
+      pos: 4.5,-37.5
+      parent: 1
+  - uid: 1988
+    components:
+    - type: Transform
+      pos: 8.5,-37.5
+      parent: 1
+  - uid: 1989
+    components:
+    - type: Transform
+      pos: -0.5,-29.5
+      parent: 1
+  - uid: 1990
+    components:
+    - type: Transform
+      pos: 2.5,-29.5
+      parent: 1
+  - uid: 1991
+    components:
+    - type: Transform
+      pos: 2.5,-28.5
+      parent: 1
+  - uid: 1992
+    components:
+    - type: Transform
+      pos: 3.5,-29.5
+      parent: 1
+  - uid: 1993
+    components:
+    - type: Transform
+      pos: -0.5,-26.5
+      parent: 1
+  - uid: 1995
+    components:
+    - type: Transform
+      pos: -1.5,-20.5
+      parent: 1
+  - uid: 1996
+    components:
+    - type: Transform
+      pos: -4.5,-14.5
+      parent: 1
+  - uid: 1997
+    components:
+    - type: Transform
+      pos: -4.5,-12.5
+      parent: 1
+  - uid: 1998
+    components:
+    - type: Transform
+      pos: -3.5,-13.5
+      parent: 1
+  - uid: 1999
+    components:
+    - type: Transform
+      pos: 11.5,-11.5
+      parent: 1
+  - uid: 2000
+    components:
+    - type: Transform
+      pos: 9.5,-5.5
+      parent: 1
+  - uid: 2001
+    components:
+    - type: Transform
+      pos: 11.5,2.5
+      parent: 1
+  - uid: 2002
+    components:
+    - type: Transform
+      pos: 11.5,1.5
+      parent: 1
+  - uid: 2003
+    components:
+    - type: Transform
+      pos: -4.5,4.5
+      parent: 1
+  - uid: 2004
+    components:
+    - type: Transform
+      pos: -2.5,1.5
+      parent: 1
+  - uid: 2005
+    components:
+    - type: Transform
+      pos: 4.5,0.5
+      parent: 1
+  - uid: 2008
+    components:
+    - type: Transform
+      pos: -0.5,0.5
+      parent: 1
+- proto: RandomVendingDrinks
+  entities:
+  - uid: 1548
+    components:
+    - type: Transform
+      pos: 2.5,5.5
+      parent: 1
+  - uid: 1783
+    components:
+    - type: Transform
+      pos: 2.5,-16.5
+      parent: 1
+- proto: RandomVendingSnacks
+  entities:
+  - uid: 1549
+    components:
+    - type: Transform
+      pos: 4.5,5.5
+      parent: 1
+  - uid: 1782
+    components:
+    - type: Transform
+      pos: 4.5,-16.5
+      parent: 1
+- proto: ReinforcedPlasmaWindow
+  entities:
+  - uid: 526
+    components:
+    - type: Transform
+      pos: 0.5,-22.5
+      parent: 1
+  - uid: 527
+    components:
+    - type: Transform
+      pos: 1.5,-22.5
+      parent: 1
+  - uid: 528
+    components:
+    - type: Transform
+      pos: 2.5,-22.5
+      parent: 1
+  - uid: 530
+    components:
+    - type: Transform
+      pos: 4.5,-22.5
+      parent: 1
+  - uid: 531
+    components:
+    - type: Transform
+      pos: 5.5,-22.5
+      parent: 1
+  - uid: 532
+    components:
+    - type: Transform
+      pos: 6.5,-22.5
+      parent: 1
+  - uid: 542
+    components:
+    - type: Transform
+      pos: 0.5,-20.5
+      parent: 1
+  - uid: 543
+    components:
+    - type: Transform
+      pos: 1.5,-20.5
+      parent: 1
+  - uid: 544
+    components:
+    - type: Transform
+      pos: 2.5,-20.5
+      parent: 1
+  - uid: 545
+    components:
+    - type: Transform
+      pos: 4.5,-20.5
+      parent: 1
+  - uid: 546
+    components:
+    - type: Transform
+      pos: 5.5,-20.5
+      parent: 1
+  - uid: 547
+    components:
+    - type: Transform
+      pos: 6.5,-20.5
+      parent: 1
+- proto: ShadowTree01
+  entities:
+  - uid: 1918
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.273117,-15.984801
+      parent: 1
+  - uid: 1929
+    components:
+    - type: Transform
+      pos: -6.6538024,7.966305
+      parent: 1
+- proto: ShadowTree03
+  entities:
+  - uid: 1914
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.367117,13.323404
+      parent: 1
+  - uid: 1920
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.080735,-6.4842486
+      parent: 1
+- proto: ShadowTree04
+  entities:
+  - uid: 1915
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.303209,7.7148037
+      parent: 1
+- proto: ShadowTree05
+  entities:
+  - uid: 422
+    components:
+    - type: Transform
+      pos: 14.627447,-0.6118185
+      parent: 1
+  - uid: 1607
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.382492,13.271562
+      parent: 1
+  - uid: 1916
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.640305,-19.63101
+      parent: 1
+  - uid: 1919
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.7875977,-14.561567
+      parent: 1
+- proto: ShadowTree06
+  entities:
+  - uid: 1922
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.233812,1.3556528
+      parent: 1
+- proto: SheetSteel
+  entities:
+  - uid: 556
+    components:
+    - type: Transform
+      pos: 0.42527008,-23.257866
+      parent: 1
+  - uid: 1011
+    components:
+    - type: Transform
+      pos: 0.6355021,-23.256012
+      parent: 1
+- proto: ShuttleWindow
+  entities:
+  - uid: 2
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-1.5
+      parent: 1
+  - uid: 3
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-5.5
+      parent: 1
+  - uid: 5
+    components:
+    - type: Transform
+      pos: 5.5,-17.5
+      parent: 1
+  - uid: 6
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,6.5
+      parent: 1
+  - uid: 10
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-9.5
+      parent: 1
+  - uid: 12
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,2.5
+      parent: 1
+  - uid: 19
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-1.5
+      parent: 1
+  - uid: 31
+    components:
+    - type: Transform
+      pos: 4.5,-17.5
+      parent: 1
+  - uid: 34
+    components:
+    - type: Transform
+      pos: -3.5,-7.5
+      parent: 1
+  - uid: 40
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-13.5
+      parent: 1
+  - uid: 41
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-13.5
+      parent: 1
+  - uid: 48
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-1.5
+      parent: 1
+  - uid: 51
+    components:
+    - type: Transform
+      pos: 10.5,0.5
+      parent: 1
+  - uid: 52
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-13.5
+      parent: 1
+  - uid: 58
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,6.5
+      parent: 1
+  - uid: 68
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,-11.5
+      parent: 1
+  - uid: 72
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,-3.5
+      parent: 1
+  - uid: 83
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-6.5
+      parent: 1
+  - uid: 108
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 15.5,2.5
+      parent: 1
+  - uid: 110
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,6.5
+      parent: 1
+  - uid: 111
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,2.5
+      parent: 1
+  - uid: 126
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,6.5
+      parent: 1
+  - uid: 152
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-5.5
+      parent: 1
+  - uid: 154
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-9.5
+      parent: 1
+  - uid: 162
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-1.5
+      parent: 1
+  - uid: 163
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,-1.5
+      parent: 1
+  - uid: 177
+    components:
+    - type: Transform
+      pos: 10.5,-7.5
+      parent: 1
+  - uid: 188
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-13.5
+      parent: 1
+  - uid: 192
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-6.5
+      parent: 1
+  - uid: 198
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,6.5
+      parent: 1
+  - uid: 202
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-3.5
+      parent: 1
+  - uid: 211
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,2.5
+      parent: 1
+  - uid: 219
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-11.5
+      parent: 1
+  - uid: 225
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-9.5
+      parent: 1
+  - uid: 234
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-13.5
+      parent: 1
+  - uid: 235
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,2.5
+      parent: 1
+  - uid: 257
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,4.5
+      parent: 1
+  - uid: 273
+    components:
+    - type: Transform
+      pos: -3.5,0.5
+      parent: 1
+  - uid: 274
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-5.5
+      parent: 1
+  - uid: 277
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,-5.5
+      parent: 1
+  - uid: 296
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 15.5,6.5
+      parent: 1
+  - uid: 309
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,-9.5
+      parent: 1
+  - uid: 313
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,-13.5
+      parent: 1
+  - uid: 332
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-9.5
+      parent: 1
+  - uid: 337
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-5.5
+      parent: 1
+  - uid: 346
+    components:
+    - type: Transform
+      pos: -9.5,4.5
+      parent: 1
+  - uid: 360
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,2.5
+      parent: 1
+  - uid: 361
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-1.5
+      parent: 1
+  - uid: 364
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-5.5
+      parent: 1
+  - uid: 375
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-9.5
+      parent: 1
+  - uid: 428
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,2.5
+      parent: 1
+  - uid: 429
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,2.5
+      parent: 1
+  - uid: 430
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,2.5
+      parent: 1
+  - uid: 431
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,2.5
+      parent: 1
+  - uid: 432
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,2.5
+      parent: 1
+  - uid: 433
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,2.5
+      parent: 1
+  - uid: 434
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,2.5
+      parent: 1
+  - uid: 436
+    components:
+    - type: Transform
+      pos: 2.5,2.5
+      parent: 1
+  - uid: 440
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,14.5
+      parent: 1
+  - uid: 451
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,-18.5
+      parent: 1
+  - uid: 452
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-18.5
+      parent: 1
+  - uid: 457
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-19.5
+      parent: 1
+  - uid: 467
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,14.5
+      parent: 1
+  - uid: 471
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,-19.5
+      parent: 1
+  - uid: 472
+    components:
+    - type: Transform
+      pos: -5.5,9.5
+      parent: 1
+  - uid: 486
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,14.5
+      parent: 1
+  - uid: 492
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,14.5
+      parent: 1
+  - uid: 495
+    components:
+    - type: Transform
+      pos: 3.5,16.5
+      parent: 1
+  - uid: 496
+    components:
+    - type: Transform
+      pos: 2.5,16.5
+      parent: 1
+  - uid: 501
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,15.5
+      parent: 1
+  - uid: 505
+    components:
+    - type: Transform
+      pos: 4.5,16.5
+      parent: 1
+  - uid: 506
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,15.5
+      parent: 1
+  - uid: 511
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,15.5
+      parent: 1
+  - uid: 512
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,15.5
+      parent: 1
+  - uid: 613
+    components:
+    - type: Transform
+      pos: 2.5,6.5
+      parent: 1
+  - uid: 614
+    components:
+    - type: Transform
+      pos: 3.5,6.5
+      parent: 1
+  - uid: 615
+    components:
+    - type: Transform
+      pos: 4.5,6.5
+      parent: 1
+  - uid: 617
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,10.5
+      parent: 1
+  - uid: 628
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,11.5
+      parent: 1
+  - uid: 665
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,12.5
+      parent: 1
+  - uid: 666
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,12.5
+      parent: 1
+  - uid: 667
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,12.5
+      parent: 1
+  - uid: 683
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,14.5
+      parent: 1
+  - uid: 684
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,14.5
+      parent: 1
+  - uid: 688
+    components:
+    - type: Transform
+      pos: 3.5,-17.5
+      parent: 1
+  - uid: 691
+    components:
+    - type: Transform
+      pos: 2.5,-17.5
+      parent: 1
+  - uid: 694
+    components:
+    - type: Transform
+      pos: -5.5,13.5
+      parent: 1
+  - uid: 732
+    components:
+    - type: Transform
+      pos: -5.5,10.5
+      parent: 1
+  - uid: 753
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-18.5
+      parent: 1
+  - uid: 832
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-19.5
+      parent: 1
+  - uid: 977
+    components:
+    - type: Transform
+      pos: 12.5,12.5
+      parent: 1
+  - uid: 1567
+    components:
+    - type: Transform
+      pos: 1.5,-17.5
+      parent: 1
+  - uid: 1586
+    components:
+    - type: Transform
+      pos: 12.5,13.5
+      parent: 1
+  - uid: 1587
+    components:
+    - type: Transform
+      pos: 12.5,9.5
+      parent: 1
+  - uid: 1602
+    components:
+    - type: Transform
+      pos: -5.5,12.5
+      parent: 1
+  - uid: 1606
+    components:
+    - type: Transform
+      pos: 12.5,10.5
+      parent: 1
+  - uid: 1613
+    components:
+    - type: Transform
+      pos: 1.5,-28.5
+      parent: 1
+  - uid: 1614
+    components:
+    - type: Transform
+      pos: 7.5,-27.5
+      parent: 1
+  - uid: 1625
+    components:
+    - type: Transform
+      pos: -1.5,-27.5
+      parent: 1
+  - uid: 1629
+    components:
+    - type: Transform
+      pos: -0.5,-27.5
+      parent: 1
+  - uid: 1630
+    components:
+    - type: Transform
+      pos: 6.5,-27.5
+      parent: 1
+  - uid: 1647
+    components:
+    - type: Transform
+      pos: 1.5,-29.5
+      parent: 1
+  - uid: 1648
+    components:
+    - type: Transform
+      pos: 8.5,-27.5
+      parent: 1
+  - uid: 1649
+    components:
+    - type: Transform
+      pos: 5.5,-28.5
+      parent: 1
+  - uid: 1650
+    components:
+    - type: Transform
+      pos: 5.5,-29.5
+      parent: 1
+  - uid: 1658
+    components:
+    - type: Transform
+      pos: 0.5,-27.5
+      parent: 1
+  - uid: 1967
+    components:
+    - type: Transform
+      pos: 7.5,-9.5
+      parent: 1
+  - uid: 1968
+    components:
+    - type: Transform
+      pos: 6.5,-9.5
+      parent: 1
+  - uid: 1969
+    components:
+    - type: Transform
+      pos: 0.5,-9.5
+      parent: 1
+  - uid: 1970
+    components:
+    - type: Transform
+      pos: -0.5,-9.5
+      parent: 1
+- proto: SignAtmos
+  entities:
+  - uid: 1780
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-17.5
+      parent: 1
+- proto: SignAtmosMinsky
+  entities:
+  - uid: 2078
+    components:
+    - type: Transform
+      pos: 7.5,-19.5
+      parent: 1
+- proto: SignBar
+  entities:
+  - uid: 99
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-2.5
+      parent: 1
+  - uid: 100
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-2.5
+      parent: 1
+- proto: SignBridge
+  entities:
+  - uid: 121
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,8.5
+      parent: 1
+- proto: SignDisposalSpace
+  entities:
+  - uid: 1779
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-27.5
+      parent: 1
+- proto: SignEngineering
+  entities:
+  - uid: 1740
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-17.5
+      parent: 1
+- proto: SignEVA
+  entities:
+  - uid: 695
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,8.5
+      parent: 1
+- proto: SignMedical
+  entities:
+  - uid: 105
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-4.5
+      parent: 1
+  - uid: 184
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-4.5
+      parent: 1
+- proto: SignSec
+  entities:
+  - uid: 652
+    components:
+    - type: Transform
+      pos: -0.5,6.5
+      parent: 1
+  - uid: 653
+    components:
+    - type: Transform
+      pos: 7.5,6.5
+      parent: 1
+- proto: SignSecureMed
+  entities:
+  - uid: 2116
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,6.5
+      parent: 1
+  - uid: 2117
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,6.5
+      parent: 1
+- proto: SignShipDock
+  entities:
+  - uid: 2108
+    components:
+    - type: Transform
+      pos: -9.5,-1.5
+      parent: 1
+  - uid: 2109
+    components:
+    - type: Transform
+      pos: -9.5,6.5
+      parent: 1
+  - uid: 2110
+    components:
+    - type: Transform
+      pos: -9.5,-9.5
+      parent: 1
+  - uid: 2111
+    components:
+    - type: Transform
+      pos: 16.5,-9.5
+      parent: 1
+  - uid: 2112
+    components:
+    - type: Transform
+      pos: 16.5,-1.5
+      parent: 1
+  - uid: 2113
+    components:
+    - type: Transform
+      pos: 16.5,6.5
+      parent: 1
+- proto: SignSmoking
+  entities:
+  - uid: 2115
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-0.5
+      parent: 1
+- proto: SinkStemlessWater
+  entities:
+  - uid: 2086
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,9.5
+      parent: 1
+- proto: SinkWide
+  entities:
+  - uid: 2084
+    components:
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 1
+- proto: soda_dispenser
+  entities:
+  - uid: 419
+    components:
+    - type: Transform
+      pos: 5.5,1.5
+      parent: 1
+- proto: SpaceMedipen
+  entities:
+  - uid: 328
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5217738,-4.3676715
+      parent: 1
+- proto: SpawnMobMedibot
+  entities:
+  - uid: 1935
+    components:
+    - type: Transform
+      pos: 3.5,-7.5
+      parent: 1
+- proto: StoolBar
+  entities:
+  - uid: 399
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,1.5
+      parent: 1
+  - uid: 403
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,0.5
+      parent: 1
+  - uid: 404
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-0.5
+      parent: 1
+  - uid: 405
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-1.5
+      parent: 1
+  - uid: 406
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-1.5
+      parent: 1
+  - uid: 407
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-1.5
+      parent: 1
+  - uid: 408
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,-1.5
+      parent: 1
+  - uid: 409
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-1.5
+      parent: 1
+  - uid: 410
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-1.5
+      parent: 1
+- proto: Stunbaton
+  entities:
+  - uid: 1886
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.036196887,11.387312
+      parent: 1
+- proto: SubstationBasic
+  entities:
+  - uid: 1681
+    components:
+    - type: Transform
+      pos: 3.5,-25.5
+      parent: 1
+- proto: SuitStorageEngi
+  entities:
+  - uid: 717
+    components:
+    - type: Transform
+      pos: 8.5,-25.5
+      parent: 1
+  - uid: 719
+    components:
+    - type: Transform
+      pos: 8.5,-26.5
+      parent: 1
+- proto: SuitStorageEVAEmergency
+  entities:
+  - uid: 641
+    components:
+    - type: Transform
+      pos: 11.5,12.5
+      parent: 1
+  - uid: 704
+    components:
+    - type: Transform
+      pos: 9.5,11.5
+      parent: 1
+  - uid: 708
+    components:
+    - type: Transform
+      pos: 11.5,10.5
+      parent: 1
+  - uid: 777
+    components:
+    - type: Transform
+      pos: 11.5,11.5
+      parent: 1
+  - uid: 779
+    components:
+    - type: Transform
+      pos: 9.5,10.5
+      parent: 1
+  - uid: 1412
+    components:
+    - type: Transform
+      pos: 9.5,12.5
+      parent: 1
+- proto: SuitStorageSec
+  entities:
+  - uid: 668
+    components:
+    - type: Transform
+      pos: 2.5,11.5
+      parent: 1
+  - uid: 669
+    components:
+    - type: Transform
+      pos: 3.5,11.5
+      parent: 1
+  - uid: 670
+    components:
+    - type: Transform
+      pos: 4.5,11.5
+      parent: 1
+- proto: Syringe
+  entities:
+  - uid: 329
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.271774,-8.711421
+      parent: 1
+  - uid: 377
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.2639613,-8.398921
+      parent: 1
+- proto: TableCounterMetal
+  entities:
+  - uid: 413
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,1.5
+      parent: 1
+  - uid: 414
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,1.5
+      parent: 1
+  - uid: 662
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,11.5
+      parent: 1
+  - uid: 664
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,11.5
+      parent: 1
+  - uid: 673
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,11.5
+      parent: 1
+  - uid: 674
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,11.5
+      parent: 1
+  - uid: 710
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,13.5
+      parent: 1
+  - uid: 711
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,13.5
+      parent: 1
+  - uid: 1413
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,13.5
+      parent: 1
+  - uid: 2069
+    components:
+    - type: Transform
+      pos: 6.5,13.5
+      parent: 1
+- proto: TableCounterWood
+  entities:
+  - uid: 387
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-0.5
+      parent: 1
+  - uid: 390
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-0.5
+      parent: 1
+  - uid: 394
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-0.5
+      parent: 1
+  - uid: 395
+    components:
+    - type: Transform
+      pos: 3.5,0.5
+      parent: 1
+  - uid: 396
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-0.5
+      parent: 1
+  - uid: 397
+    components:
+    - type: Transform
+      pos: 3.5,1.5
+      parent: 1
+  - uid: 398
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-0.5
+      parent: 1
+  - uid: 400
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-0.5
+      parent: 1
+  - uid: 415
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,1.5
+      parent: 1
+  - uid: 417
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,1.5
+      parent: 1
+- proto: TableGlass
+  entities:
+  - uid: 4
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-8.5
+      parent: 1
+  - uid: 212
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-8.5
+      parent: 1
+  - uid: 331
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-8.5
+      parent: 1
+  - uid: 369
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-8.5
+      parent: 1
+- proto: TableWood
+  entities:
+  - uid: 2009
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-2.5
+      parent: 1
+  - uid: 2011
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-2.5
+      parent: 1
+  - uid: 2012
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-2.5
+      parent: 1
+- proto: TelecomServerFilled
+  entities:
+  - uid: 2065
+    components:
+    - type: Transform
+      pos: 7.5,13.5
+      parent: 1
+- proto: Thruster
+  entities:
+  - uid: 166
+    components:
+    - type: Transform
+      pos: -0.5,-36.5
+      parent: 1
+  - uid: 588
+    components:
+    - type: Transform
+      pos: -1.5,-36.5
+      parent: 1
+  - uid: 589
+    components:
+    - type: Transform
+      pos: 0.5,-36.5
+      parent: 1
+  - uid: 590
+    components:
+    - type: Transform
+      pos: 1.5,-36.5
+      parent: 1
+  - uid: 591
+    components:
+    - type: Transform
+      pos: 5.5,-36.5
+      parent: 1
+  - uid: 592
+    components:
+    - type: Transform
+      pos: 6.5,-36.5
+      parent: 1
+  - uid: 746
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-38.5
+      parent: 1
+  - uid: 748
+    components:
+    - type: Transform
+      pos: 7.5,-36.5
+      parent: 1
+  - uid: 1031
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,-38.5
+      parent: 1
+  - uid: 1032
+    components:
+    - type: Transform
+      pos: 8.5,-36.5
+      parent: 1
+  - uid: 1033
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,-38.5
+      parent: 1
+  - uid: 1034
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,-38.5
+      parent: 1
+  - uid: 1035
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-37.5
+      parent: 1
+  - uid: 1036
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,-37.5
+      parent: 1
+  - uid: 1555
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-38.5
+      parent: 1
+  - uid: 1617
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-38.5
+      parent: 1
+  - uid: 1626
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-38.5
+      parent: 1
+  - uid: 1631
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-38.5
+      parent: 1
+- proto: VendingMachineBooze
+  entities:
+  - uid: 416
+    components:
+    - type: Transform
+      pos: 7.5,1.5
+      parent: 1
+- proto: VendingMachineCigs
+  entities:
+  - uid: 94
+    components:
+    - type: Transform
+      pos: 3.5,-16.5
+      parent: 1
+  - uid: 1550
+    components:
+    - type: Transform
+      pos: 3.5,5.5
+      parent: 1
+- proto: VendingMachineTankDispenserEVA
+  entities:
+  - uid: 123
+    components:
+    - type: Transform
+      pos: -6.5,-11.5
+      parent: 1
+  - uid: 144
+    components:
+    - type: Transform
+      pos: -6.5,-3.5
+      parent: 1
+  - uid: 147
+    components:
+    - type: Transform
+      pos: -6.5,4.5
+      parent: 1
+  - uid: 258
+    components:
+    - type: Transform
+      pos: 13.5,4.5
+      parent: 1
+  - uid: 259
+    components:
+    - type: Transform
+      pos: 13.5,-11.5
+      parent: 1
+  - uid: 323
+    components:
+    - type: Transform
+      pos: 13.5,-3.5
+      parent: 1
+  - uid: 817
+    components:
+    - type: Transform
+      pos: 3.5,-28.5
+      parent: 1
+- proto: VendingMachineYouTool
+  entities:
+  - uid: 1678
+    components:
+    - type: Transform
+      pos: -0.5,-23.5
+      parent: 1
+- proto: WallShuttleDiagonal
+  entities:
+  - uid: 445
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,14.5
+      parent: 1
+  - uid: 469
+    components:
+    - type: Transform
+      pos: -1.5,15.5
+      parent: 1
+  - uid: 470
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,15.5
+      parent: 1
+  - uid: 483
+    components:
+    - type: Transform
+      pos: -5.5,14.5
+      parent: 1
+  - uid: 498
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,16.5
+      parent: 1
+  - uid: 508
+    components:
+    - type: Transform
+      pos: 1.5,16.5
+      parent: 1
+- proto: WallShuttleInterior
+  entities:
+  - uid: 7
+    components:
+    - type: Transform
+      pos: 4.5,-9.5
+      parent: 1
+  - uid: 8
+    components:
+    - type: Transform
+      pos: 12.5,-11.5
+      parent: 1
+  - uid: 11
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-13.5
+      parent: 1
+  - uid: 18
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,2.5
+      parent: 1
+  - uid: 22
+    components:
+    - type: Transform
+      pos: -1.5,8.5
+      parent: 1
+  - uid: 28
+    components:
+    - type: Transform
+      pos: 1.5,-9.5
+      parent: 1
+  - uid: 30
+    components:
+    - type: Transform
+      pos: -1.5,-8.5
+      parent: 1
+  - uid: 32
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,0.5
+      parent: 1
+  - uid: 37
+    components:
+    - type: Transform
+      pos: 3.5,-9.5
+      parent: 1
+  - uid: 39
+    components:
+    - type: Transform
+      pos: 12.5,-15.5
+      parent: 1
+  - uid: 42
+    components:
+    - type: Transform
+      pos: -5.5,1.5
+      parent: 1
+  - uid: 44
+    components:
+    - type: Transform
+      pos: 12.5,-1.5
+      parent: 1
+  - uid: 46
+    components:
+    - type: Transform
+      pos: 12.5,-3.5
+      parent: 1
+  - uid: 54
+    components:
+    - type: Transform
+      pos: 8.5,-9.5
+      parent: 1
+  - uid: 55
+    components:
+    - type: Transform
+      pos: 16.5,6.5
+      parent: 1
+  - uid: 56
+    components:
+    - type: Transform
+      pos: -5.5,7.5
+      parent: 1
+  - uid: 57
+    components:
+    - type: Transform
+      pos: 12.5,-5.5
+      parent: 1
+  - uid: 60
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-3.5
+      parent: 1
+  - uid: 64
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,-21.5
+      parent: 1
+  - uid: 65
+    components:
+    - type: Transform
+      pos: -5.5,-0.5
+      parent: 1
+  - uid: 67
+    components:
+    - type: Transform
+      pos: -1.5,-7.5
+      parent: 1
+  - uid: 73
+    components:
+    - type: Transform
+      pos: 16.5,-13.5
+      parent: 1
+  - uid: 76
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,-22.5
+      parent: 1
+  - uid: 82
+    components:
+    - type: Transform
+      pos: 12.5,-6.5
+      parent: 1
+  - uid: 84
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-3.5
+      parent: 1
+  - uid: 98
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-3.5
+      parent: 1
+  - uid: 102
+    components:
+    - type: Transform
+      pos: 12.5,-9.5
+      parent: 1
+  - uid: 109
+    components:
+    - type: Transform
+      pos: 3.5,2.5
+      parent: 1
+  - uid: 113
+    components:
+    - type: Transform
+      pos: -1.5,7.5
+      parent: 1
+  - uid: 117
+    components:
+    - type: Transform
+      pos: -5.5,-6.5
+      parent: 1
+  - uid: 118
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-7.5
+      parent: 1
+  - uid: 122
+    components:
+    - type: Transform
+      pos: 8.5,-8.5
+      parent: 1
+  - uid: 124
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,8.5
+      parent: 1
+  - uid: 125
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-15.5
+      parent: 1
+  - uid: 127
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-4.5
+      parent: 1
+  - uid: 129
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-3.5
+      parent: 1
+  - uid: 130
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,8.5
+      parent: 1
+  - uid: 131
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-3.5
+      parent: 1
+  - uid: 138
+    components:
+    - type: Transform
+      pos: -1.5,-9.5
+      parent: 1
+  - uid: 143
+    components:
+    - type: Transform
+      pos: 12.5,0.5
+      parent: 1
+  - uid: 149
+    components:
+    - type: Transform
+      pos: -1.5,2.5
+      parent: 1
+  - uid: 150
+    components:
+    - type: Transform
+      pos: 1.5,6.5
+      parent: 1
+  - uid: 153
+    components:
+    - type: Transform
+      pos: 16.5,-1.5
+      parent: 1
+  - uid: 156
+    components:
+    - type: Transform
+      pos: 16.5,2.5
+      parent: 1
+  - uid: 157
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,8.5
+      parent: 1
+  - uid: 161
+    components:
+    - type: Transform
+      pos: 7.5,6.5
+      parent: 1
+  - uid: 168
+    components:
+    - type: Transform
+      pos: 12.5,-13.5
+      parent: 1
+  - uid: 169
+    components:
+    - type: Transform
+      pos: 12.5,-0.5
+      parent: 1
+  - uid: 172
+    components:
+    - type: Transform
+      pos: -5.5,-14.5
+      parent: 1
+  - uid: 174
+    components:
+    - type: Transform
+      pos: -0.5,6.5
+      parent: 1
+  - uid: 186
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-3.5
+      parent: 1
+  - uid: 187
+    components:
+    - type: Transform
+      pos: -5.5,-8.5
+      parent: 1
+  - uid: 190
+    components:
+    - type: Transform
+      pos: 12.5,8.5
+      parent: 1
+  - uid: 191
+    components:
+    - type: Transform
+      pos: 12.5,6.5
+      parent: 1
+  - uid: 193
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-3.5
+      parent: 1
+  - uid: 194
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-2.5
+      parent: 1
+  - uid: 196
+    components:
+    - type: Transform
+      pos: 12.5,-8.5
+      parent: 1
+  - uid: 197
+    components:
+    - type: Transform
+      pos: -1.5,0.5
+      parent: 1
+  - uid: 200
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-5.5
+      parent: 1
+  - uid: 204
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-1.5
+      parent: 1
+  - uid: 217
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-9.5
+      parent: 1
+  - uid: 218
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,2.5
+      parent: 1
+  - uid: 220
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-3.5
+      parent: 1
+  - uid: 221
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-1.5
+      parent: 1
+  - uid: 232
+    components:
+    - type: Transform
+      pos: 8.5,7.5
+      parent: 1
+  - uid: 238
+    components:
+    - type: Transform
+      pos: 12.5,1.5
+      parent: 1
+  - uid: 239
+    components:
+    - type: Transform
+      pos: 8.5,1.5
+      parent: 1
+  - uid: 242
+    components:
+    - type: Transform
+      pos: 12.5,2.5
+      parent: 1
+  - uid: 244
+    components:
+    - type: Transform
+      pos: 5.5,6.5
+      parent: 1
+  - uid: 245
+    components:
+    - type: Transform
+      pos: 12.5,4.5
+      parent: 1
+  - uid: 253
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-3.5
+      parent: 1
+  - uid: 254
+    components:
+    - type: Transform
+      pos: 8.5,-7.5
+      parent: 1
+  - uid: 255
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,0.5
+      parent: 1
+  - uid: 270
+    components:
+    - type: Transform
+      pos: 5.5,-9.5
+      parent: 1
+  - uid: 275
+    components:
+    - type: Transform
+      pos: 16.5,-9.5
+      parent: 1
+  - uid: 278
+    components:
+    - type: Transform
+      pos: 16.5,-5.5
+      parent: 1
+  - uid: 280
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-4.5
+      parent: 1
+  - uid: 281
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-3.5
+      parent: 1
+  - uid: 287
+    components:
+    - type: Transform
+      pos: 12.5,7.5
+      parent: 1
+  - uid: 300
+    components:
+    - type: Transform
+      pos: 8.5,8.5
+      parent: 1
+  - uid: 301
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-2.5
+      parent: 1
+  - uid: 308
+    components:
+    - type: Transform
+      pos: 12.5,-7.5
+      parent: 1
+  - uid: 314
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-3.5
+      parent: 1
+  - uid: 315
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-3.5
+      parent: 1
+  - uid: 316
+    components:
+    - type: Transform
+      pos: 8.5,2.5
+      parent: 1
+  - uid: 318
+    components:
+    - type: Transform
+      pos: 8.5,6.5
+      parent: 1
+  - uid: 319
+    components:
+    - type: Transform
+      pos: -1.5,1.5
+      parent: 1
+  - uid: 320
+    components:
+    - type: Transform
+      pos: 12.5,-14.5
+      parent: 1
+  - uid: 322
+    components:
+    - type: Transform
+      pos: 2.5,-9.5
+      parent: 1
+  - uid: 342
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-11.5
+      parent: 1
+  - uid: 350
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-13.5
+      parent: 1
+  - uid: 351
+    components:
+    - type: Transform
+      pos: -9.5,6.5
+      parent: 1
+  - uid: 359
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-9.5
+      parent: 1
+  - uid: 362
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,6.5
+      parent: 1
+  - uid: 363
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-5.5
+      parent: 1
+  - uid: 373
+    components:
+    - type: Transform
+      pos: -1.5,6.5
+      parent: 1
+  - uid: 380
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,4.5
+      parent: 1
+  - uid: 441
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,12.5
+      parent: 1
+  - uid: 442
+    components:
+    - type: Transform
+      pos: -1.5,14.5
+      parent: 1
+  - uid: 443
+    components:
+    - type: Transform
+      pos: 8.5,14.5
+      parent: 1
+  - uid: 450
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,-20.5
+      parent: 1
+  - uid: 459
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-17.5
+      parent: 1
+  - uid: 460
+    components:
+    - type: Transform
+      pos: 12.5,-16.5
+      parent: 1
+  - uid: 462
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-17.5
+      parent: 1
+  - uid: 463
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-20.5
+      parent: 1
+  - uid: 488
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,11.5
+      parent: 1
+  - uid: 494
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,11.5
+      parent: 1
+  - uid: 500
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,15.5
+      parent: 1
+  - uid: 507
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,15.5
+      parent: 1
+  - uid: 515
+    components:
+    - type: Transform
+      pos: -0.5,-21.5
+      parent: 1
+  - uid: 516
+    components:
+    - type: Transform
+      pos: -0.5,-20.5
+      parent: 1
+  - uid: 517
+    components:
+    - type: Transform
+      pos: 7.5,-22.5
+      parent: 1
+  - uid: 518
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-22.5
+      parent: 1
+  - uid: 525
+    components:
+    - type: Transform
+      pos: 3.5,-22.5
+      parent: 1
+  - uid: 538
+    components:
+    - type: Transform
+      pos: 3.5,-21.5
+      parent: 1
+  - uid: 539
+    components:
+    - type: Transform
+      pos: 3.5,-20.5
+      parent: 1
+  - uid: 540
+    components:
+    - type: Transform
+      pos: 7.5,-20.5
+      parent: 1
+  - uid: 541
+    components:
+    - type: Transform
+      pos: 7.5,-21.5
+      parent: 1
+  - uid: 586
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-17.5
+      parent: 1
+  - uid: 587
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-17.5
+      parent: 1
+  - uid: 593
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,-17.5
+      parent: 1
+  - uid: 594
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,-17.5
+      parent: 1
+  - uid: 625
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,12.5
+      parent: 1
+  - uid: 626
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,12.5
+      parent: 1
+  - uid: 629
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,12.5
+      parent: 1
+  - uid: 630
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,12.5
+      parent: 1
+  - uid: 631
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,12.5
+      parent: 1
+  - uid: 632
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,13.5
+      parent: 1
+  - uid: 642
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,11.5
+      parent: 1
+  - uid: 660
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,12.5
+      parent: 1
+  - uid: 723
+    components:
+    - type: Transform
+      pos: 10.5,-22.5
+      parent: 1
+  - uid: 738
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-0.5
+      parent: 1
+  - uid: 739
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-0.5
+      parent: 1
+  - uid: 744
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,9.5
+      parent: 1
+  - uid: 838
+    components:
+    - type: Transform
+      pos: -1.5,-16.5
+      parent: 1
+  - uid: 974
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-23.5
+      parent: 1
+  - uid: 976
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-21.5
+      parent: 1
+  - uid: 978
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-21.5
+      parent: 1
+  - uid: 1508
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,9.5
+      parent: 1
+  - uid: 1510
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,12.5
+      parent: 1
+  - uid: 1528
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-19.5
+      parent: 1
+  - uid: 1559
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-23.5
+      parent: 1
+  - uid: 1603
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-22.5
+      parent: 1
+  - uid: 1610
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-16.5
+      parent: 1
+  - uid: 1615
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-24.5
+      parent: 1
+  - uid: 1616
+    components:
+    - type: Transform
+      pos: 5.5,-27.5
+      parent: 1
+  - uid: 1618
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,-25.5
+      parent: 1
+  - uid: 1620
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,-26.5
+      parent: 1
+  - uid: 1621
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,-23.5
+      parent: 1
+  - uid: 1624
+    components:
+    - type: Transform
+      pos: 1.5,-27.5
+      parent: 1
+  - uid: 1628
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,-27.5
+      parent: 1
+  - uid: 1633
+    components:
+    - type: Transform
+      pos: 5.5,-30.5
+      parent: 1
+  - uid: 1644
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-26.5
+      parent: 1
+  - uid: 1645
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-27.5
+      parent: 1
+  - uid: 1652
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,-23.5
+      parent: 1
+  - uid: 1653
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,-21.5
+      parent: 1
+  - uid: 1654
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-25.5
+      parent: 1
+  - uid: 1655
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-24.5
+      parent: 1
+  - uid: 1656
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-25.5
+      parent: 1
+  - uid: 1657
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-25.5
+      parent: 1
+  - uid: 1659
+    components:
+    - type: Transform
+      pos: 1.5,-30.5
+      parent: 1
+  - uid: 1665
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-30.5
+      parent: 1
+  - uid: 1670
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-27.5
+      parent: 1
+  - uid: 1733
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-17.5
+      parent: 1
+  - uid: 1734
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-17.5
+      parent: 1
+  - uid: 1735
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,-17.5
+      parent: 1
+  - uid: 1736
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,-17.5
+      parent: 1
+  - uid: 1741
+    components:
+    - type: Transform
+      pos: 8.5,-22.5
+      parent: 1
+  - uid: 1746
+    components:
+    - type: Transform
+      pos: -1.5,-22.5
+      parent: 1
+  - uid: 1749
+    components:
+    - type: Transform
+      pos: -3.5,-22.5
+      parent: 1
+  - uid: 1784
+    components:
+    - type: Transform
+      pos: -1.5,-15.5
+      parent: 1
+  - uid: 1789
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,-16.5
+      parent: 1
+  - uid: 1790
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,-15.5
+      parent: 1
+- proto: WarningWaste
+  entities:
+  - uid: 2077
+    components:
+    - type: Transform
+      pos: 1.5,-27.5
+      parent: 1
+- proto: WarpPoint
+  entities:
+  - uid: 968
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-5.5
+      parent: 1
+    - type: WarpPoint
+      location: Emergency Shuttle
+- proto: WaterCooler
+  entities:
+  - uid: 763
+    components:
+    - type: Transform
+      pos: 5.5,-10.5
+      parent: 1
+  - uid: 775
+    components:
+    - type: Transform
+      pos: 1.5,-10.5
+      parent: 1
+  - uid: 805
+    components:
+    - type: Transform
+      pos: -4.5,13.5
+      parent: 1
+- proto: WeaponCapacitorRecharger
+  entities:
+  - uid: 678
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,11.5
+      parent: 1
+  - uid: 1605
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,11.5
+      parent: 1
+  - uid: 2119
+    components:
+    - type: Transform
+      pos: 6.5,13.5
+      parent: 1
+- proto: WeaponDisabler
+  entities:
+  - uid: 1897
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.1339264,11.511697
+      parent: 1
+  - uid: 1910
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.891739,11.542947
+      parent: 1
+- proto: WindoorBarKitchenLocked
+  entities:
+  - uid: 392
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-0.5
+      parent: 1
+  - uid: 402
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,-0.5
+      parent: 1
+- proto: WindoorSecureMedicalLocked
+  entities:
+  - uid: 95
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-5.5
+      parent: 1
+  - uid: 324
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-5.5
+      parent: 1
+- proto: WindoorSecureSecurityLawyerLocked
+  entities:
+  - uid: 619
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,9.5
+      parent: 1
+  - uid: 623
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,9.5
+      parent: 1
+  - uid: 636
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,8.5
+      parent: 1
+- proto: WindoorSecureSecurityLocked
+  entities:
+  - uid: 1906
+    components:
+    - type: Transform
+      pos: -0.5,11.5
+      parent: 1
+    - type: Door
+      secondsUntilStateChange: -1406.6262
+      state: Opening
+  - uid: 1907
+    components:
+    - type: Transform
+      pos: 0.5,11.5
+      parent: 1
+  - uid: 1908
+    components:
+    - type: Transform
+      pos: 6.5,11.5
+      parent: 1
+  - uid: 1909
+    components:
+    - type: Transform
+      pos: 7.5,11.5
+      parent: 1
+- proto: WindowReinforcedDirectional
+  entities:
+  - uid: 96
+    components:
+    - type: Transform
+      pos: 3.5,-5.5
+      parent: 1
+  - uid: 97
+    components:
+    - type: Transform
+      pos: 4.5,-5.5
+      parent: 1
+  - uid: 104
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-4.5
+      parent: 1
+  - uid: 265
+    components:
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 1
+  - uid: 266
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-4.5
+      parent: 1
+  - uid: 388
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,0.5
+      parent: 1
+  - uid: 389
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-0.5
+      parent: 1
+  - uid: 391
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-0.5
+      parent: 1
+  - uid: 393
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,1.5
+      parent: 1
+  - uid: 401
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-0.5
+      parent: 1
+  - uid: 618
+    components:
+    - type: Transform
+      pos: 3.5,10.5
+      parent: 1
+  - uid: 620
+    components:
+    - type: Transform
+      pos: 4.5,10.5
+      parent: 1
+  - uid: 634
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,7.5
+      parent: 1
+  - uid: 635
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,8.5
+      parent: 1
+  - uid: 637
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,8.5
+      parent: 1
+  - uid: 638
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,8.5
+      parent: 1
+  - uid: 639
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,8.5
+      parent: 1
+  - uid: 640
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,7.5
+      parent: 1
+  - uid: 649
+    components:
+    - type: Transform
+      pos: 2.5,10.5
+      parent: 1
+  - uid: 1911
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,11.5
+      parent: 1
+  - uid: 1912
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,11.5
+      parent: 1
+...
diff --git a/Resources/Maps/Shuttles/DeltaV/NTES_Seal.yml b/Resources/Maps/Shuttles/DeltaV/NTES_Seal.yml
index 930f6c74c7..6f281d8ce8 100644
--- a/Resources/Maps/Shuttles/DeltaV/NTES_Seal.yml
+++ b/Resources/Maps/Shuttles/DeltaV/NTES_Seal.yml
@@ -5,15 +5,15 @@ tilemap:
   0: Space
   14: FloorBar
   17: FloorBlue
-  30: FloorDark
-  62: FloorLaundry
-  65: FloorMetalDiamond
-  78: FloorReinforced
-  86: FloorShuttlePurple
-  92: FloorSteel
-  107: FloorTechMaint
-  123: Lattice
-  124: Plating
+  32: FloorDark
+  64: FloorLaundry
+  67: FloorMetalDiamond
+  80: FloorReinforced
+  88: FloorShuttlePurple
+  94: FloorSteel
+  109: FloorTechMaint
+  126: Lattice
+  127: Plating
 entities:
 - proto: ""
   entities:
@@ -28,35 +28,35 @@ entities:
       chunks:
         -1,-1:
           ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAQQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAQQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAVgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAADgAAAAACDgAAAAABDgAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAACHgAAAAACXAAAAAABHgAAAAAAHgAAAAADHgAAAAAAXAAAAAAAHgAAAAADfAAAAAAADgAAAAAADgAAAAADDgAAAAADDgAAAAADDgAAAAABXAAAAAACXAAAAAAAXAAAAAAAHgAAAAADXAAAAAABHgAAAAADHgAAAAADHgAAAAADXAAAAAAAHgAAAAADfAAAAAAADgAAAAACDgAAAAADDgAAAAABDgAAAAACDgAAAAACXAAAAAACXAAAAAADXAAAAAADHgAAAAADXAAAAAACHgAAAAABHgAAAAABHgAAAAADXAAAAAAAHgAAAAAAfAAAAAAADgAAAAAADgAAAAADDgAAAAADDgAAAAABDgAAAAADXAAAAAADXAAAAAAAXAAAAAABHgAAAAACXAAAAAACHgAAAAAAHgAAAAADHgAAAAAAXAAAAAAAHgAAAAACfAAAAAAADgAAAAAADgAAAAAADgAAAAACDgAAAAADDgAAAAACXAAAAAADXAAAAAAAXAAAAAACXAAAAAADXAAAAAADXAAAAAADXAAAAAADXAAAAAADXAAAAAADXAAAAAACXAAAAAADXAAAAAADXAAAAAACXAAAAAAAXAAAAAABXAAAAAABXAAAAAACXAAAAAAAXAAAAAADXAAAAAACXAAAAAACXAAAAAAAXAAAAAACXAAAAAADXAAAAAACXAAAAAABXAAAAAABXAAAAAAAXAAAAAAAXAAAAAACXAAAAAACXAAAAAAAXAAAAAAAXAAAAAAD
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAWAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAADgAAAAACDgAAAAABDgAAAAABfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAXgAAAAACIAAAAAACXgAAAAABIAAAAAAAIAAAAAADIAAAAAAAXgAAAAAAIAAAAAADfwAAAAAADgAAAAAADgAAAAADDgAAAAADDgAAAAADDgAAAAABXgAAAAACXgAAAAAAXgAAAAAAIAAAAAADXgAAAAABIAAAAAADIAAAAAADIAAAAAADXgAAAAAAIAAAAAADfwAAAAAADgAAAAACDgAAAAADDgAAAAABDgAAAAACDgAAAAACXgAAAAACXgAAAAADXgAAAAADIAAAAAADXgAAAAACIAAAAAABIAAAAAABIAAAAAADXgAAAAAAIAAAAAAAfwAAAAAADgAAAAAADgAAAAADDgAAAAADDgAAAAABDgAAAAADXgAAAAADXgAAAAAAXgAAAAABIAAAAAACXgAAAAACIAAAAAAAIAAAAAADIAAAAAAAXgAAAAAAIAAAAAACfwAAAAAADgAAAAAADgAAAAAADgAAAAACDgAAAAADDgAAAAACXgAAAAADXgAAAAAAXgAAAAACXgAAAAADXgAAAAADXgAAAAADXgAAAAADXgAAAAADXgAAAAADXgAAAAACXgAAAAADXgAAAAADXgAAAAACXgAAAAAAXgAAAAABXgAAAAABXgAAAAACXgAAAAAAXgAAAAADXgAAAAACXgAAAAACXgAAAAAAXgAAAAACXgAAAAADXgAAAAACXgAAAAABXgAAAAABXgAAAAAAXgAAAAAAXgAAAAACXgAAAAACXgAAAAAAXgAAAAAAXgAAAAAD
           version: 6
         -1,0:
           ind: -1,0
-          tiles: XAAAAAAAfAAAAAAAVgAAAAAAEQAAAAAAVgAAAAAAfAAAAAAAHgAAAAABHgAAAAAAXAAAAAADHgAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAVgAAAAAAXAAAAAADXAAAAAACfAAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfAAAAAAAHgAAAAADHgAAAAABXAAAAAADHgAAAAABfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAXAAAAAAAXAAAAAABfAAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfAAAAAAAHgAAAAABHgAAAAADXAAAAAACHgAAAAACfAAAAAAATgAAAAAAXAAAAAAAXAAAAAADXAAAAAABXAAAAAAAXAAAAAAAfAAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfAAAAAAAHgAAAAACHgAAAAABXAAAAAAAHgAAAAABfAAAAAAATgAAAAAAXAAAAAADXAAAAAAAXAAAAAACXAAAAAAAXAAAAAACfAAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfAAAAAAAHgAAAAACHgAAAAADXAAAAAADHgAAAAACfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAXAAAAAAAVgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAABVgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAVgAAAAAAXAAAAAACewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAHgAAAAAAHgAAAAABHgAAAAAAHgAAAAACHgAAAAACHgAAAAAAHgAAAAADHgAAAAACHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAHgAAAAAAHgAAAAACHgAAAAAAVgAAAAAAHgAAAAABHgAAAAACHgAAAAAAHgAAAAACHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAVgAAAAAAVgAAAAAAfAAAAAAAfAAAAAAAHgAAAAADHgAAAAABHgAAAAADHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAVgAAAAAAVgAAAAAAHgAAAAADHgAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVgAAAAAAVgAAAAAAHgAAAAADHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVgAAAAAAVgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVgAAAAAAVgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: XgAAAAAAfwAAAAAAWAAAAAAAEQAAAAAAWAAAAAAAfwAAAAAAIAAAAAABIAAAAAAAXgAAAAADIAAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAWAAAAAAAXgAAAAADXgAAAAACfwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfwAAAAAAIAAAAAADIAAAAAABXgAAAAADIAAAAAABfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAXgAAAAAAXgAAAAABfwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfwAAAAAAIAAAAAABIAAAAAADXgAAAAACIAAAAAACfwAAAAAAUAAAAAAAXgAAAAAAXgAAAAADXgAAAAABXgAAAAAAXgAAAAAAfwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfwAAAAAAIAAAAAACIAAAAAABXgAAAAAAIAAAAAABfwAAAAAAUAAAAAAAXgAAAAADXgAAAAAAXgAAAAACXgAAAAAAXgAAAAACfwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfwAAAAAAIAAAAAACIAAAAAADXgAAAAADIAAAAAACfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAXgAAAAAAWAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAABWAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAWAAAAAAAXgAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAIAAAAAAAIAAAAAABIAAAAAAAIAAAAAACIAAAAAACIAAAAAAAIAAAAAADIAAAAAACIAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAIAAAAAAAIAAAAAACIAAAAAAAWAAAAAAAIAAAAAABIAAAAAACIAAAAAAAIAAAAAACIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAWAAAAAAAWAAAAAAAfwAAAAAAfwAAAAAAIAAAAAADIAAAAAABIAAAAAADIAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAWAAAAAAAWAAAAAAAIAAAAAADIAAAAAAAIAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAAAAAAWAAAAAAAIAAAAAADIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAAAAAAWAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAAAAAAWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAQQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAQQAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAVgAAAAAAVgAAAAAAXAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAHgAAAAADXAAAAAACHgAAAAABHgAAAAABHgAAAAAAXAAAAAACHgAAAAACXAAAAAADXAAAAAADXAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAHgAAAAACXAAAAAAAHgAAAAABHgAAAAACHgAAAAABXAAAAAADHgAAAAADXAAAAAADXAAAAAADXAAAAAABPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAHgAAAAADXAAAAAADHgAAAAADHgAAAAACHgAAAAACXAAAAAACHgAAAAABXAAAAAABXAAAAAABXAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAHgAAAAABXAAAAAABHgAAAAAAHgAAAAAAHgAAAAABXAAAAAAAHgAAAAADXAAAAAABXAAAAAABXAAAAAADXAAAAAADXAAAAAAAXAAAAAADXAAAAAADXAAAAAADXAAAAAADXAAAAAACXAAAAAAAXAAAAAACXAAAAAADXAAAAAACXAAAAAACXAAAAAAAXAAAAAABXAAAAAABXAAAAAACXAAAAAAAXAAAAAADXAAAAAADXAAAAAABXAAAAAADXAAAAAAAXAAAAAABXAAAAAABXAAAAAACXAAAAAADXAAAAAADXAAAAAAAXAAAAAABXAAAAAABXAAAAAAD
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAWAAAAAAAWAAAAAAAXgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfwAAAAAAIAAAAAADXgAAAAACIAAAAAABIAAAAAABIAAAAAAAXgAAAAACIAAAAAACXgAAAAADXgAAAAADXgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfwAAAAAAIAAAAAACXgAAAAAAIAAAAAABIAAAAAACIAAAAAABXgAAAAADIAAAAAADXgAAAAADXgAAAAADXgAAAAABQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfwAAAAAAIAAAAAADXgAAAAADIAAAAAADIAAAAAACIAAAAAACXgAAAAACIAAAAAABXgAAAAABXgAAAAABXgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfwAAAAAAIAAAAAABXgAAAAABIAAAAAAAIAAAAAAAIAAAAAABXgAAAAAAIAAAAAADXgAAAAABXgAAAAABXgAAAAADXgAAAAADXgAAAAAAXgAAAAADXgAAAAADXgAAAAADXgAAAAADXgAAAAACXgAAAAAAXgAAAAACXgAAAAADXgAAAAACXgAAAAACXgAAAAAAXgAAAAABXgAAAAABXgAAAAACXgAAAAAAXgAAAAADXgAAAAADXgAAAAABXgAAAAADXgAAAAAAXgAAAAABXgAAAAABXgAAAAACXgAAAAADXgAAAAADXgAAAAAAXgAAAAABXgAAAAABXgAAAAAD
           version: 6
         1,-1:
           ind: 1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAawAAAAAAawAAAAAAVgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAVgAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAADXAAAAAADVgAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbQAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAIAAAAAAAWAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAADXgAAAAADWAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         1,0:
           ind: 1,0
-          tiles: HgAAAAACHgAAAAADVgAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAawAAAAAAawAAAAAAVgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: IAAAAAACIAAAAAADWAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbQAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,0:
           ind: 0,0
-          tiles: VgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAABXAAAAAAAHgAAAAADHgAAAAACfAAAAAAAVgAAAAAAEQAAAAAAVgAAAAAAfAAAAAAAXAAAAAADXAAAAAABTgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAHgAAAAABXAAAAAABHgAAAAAAHgAAAAAAfAAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfAAAAAAAXAAAAAACXAAAAAABXAAAAAACXAAAAAACXAAAAAACTgAAAAAAfAAAAAAAHgAAAAADXAAAAAACHgAAAAADHgAAAAAAfAAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfAAAAAAAXAAAAAADXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAATgAAAAAAfAAAAAAAHgAAAAADXAAAAAADHgAAAAACHgAAAAACfAAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfAAAAAAAXAAAAAACXAAAAAADTgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAHgAAAAAAXAAAAAAAHgAAAAACHgAAAAAAfAAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfAAAAAAAXAAAAAADXAAAAAAAVgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAVgAAAAAAHgAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAVgAAAAAAVgAAAAAAHgAAAAADHgAAAAACHgAAAAADHgAAAAACfAAAAAAAHgAAAAACHgAAAAABHgAAAAACHgAAAAACewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAHgAAAAAAHgAAAAADHgAAAAAAHgAAAAABVgAAAAAAHgAAAAABHgAAAAADHgAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAAAHgAAAAACfAAAAAAAfAAAAAAAVgAAAAAAVgAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAABVgAAAAAAVgAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABVgAAAAAAVgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVgAAAAAAVgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: WAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAABXgAAAAAAIAAAAAADIAAAAAACfwAAAAAAWAAAAAAAEQAAAAAAWAAAAAAAfwAAAAAAXgAAAAADXgAAAAABUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAIAAAAAABXgAAAAABIAAAAAAAIAAAAAAAfwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfwAAAAAAXgAAAAACXgAAAAABXgAAAAACXgAAAAACXgAAAAACUAAAAAAAfwAAAAAAIAAAAAADXgAAAAACIAAAAAADIAAAAAAAfwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfwAAAAAAXgAAAAADXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAUAAAAAAAfwAAAAAAIAAAAAADXgAAAAADIAAAAAACIAAAAAACfwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfwAAAAAAXgAAAAACXgAAAAADUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAIAAAAAAAXgAAAAAAIAAAAAACIAAAAAAAfwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfwAAAAAAXgAAAAADXgAAAAAAWAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAWAAAAAAAIAAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAWAAAAAAAWAAAAAAAIAAAAAADIAAAAAACIAAAAAADIAAAAAACIAAAAAAAIAAAAAACIAAAAAABIAAAAAACIAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAIAAAAAAAIAAAAAADIAAAAAAAIAAAAAABWAAAAAAAIAAAAAABIAAAAAADIAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAACIAAAAAAAIAAAAAACfwAAAAAAfwAAAAAAWAAAAAAAWAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAADIAAAAAABWAAAAAAAWAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABWAAAAAAAWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAAAAAAWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -2,-1:
           ind: -2,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAVgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVgAAAAAAawAAAAAAawAAAAAAawAAAAAAXAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAXAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAVgAAAAAAHgAAAAACHgAAAAADXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAVgAAAAAAXAAAAAABXAAAAAAAXAAAAAAC
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAXgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAXgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAWAAAAAAAIAAAAAACIAAAAAADXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAWAAAAAAAXgAAAAABXgAAAAAAXgAAAAAC
           version: 6
         -2,0:
           ind: -2,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAVgAAAAAAHgAAAAADHgAAAAACXAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAXAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVgAAAAAAawAAAAAAawAAAAAAawAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAXAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAVgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAWAAAAAAAIAAAAAADIAAAAAACXgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAXgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAXgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAbQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
     - type: Broadphase
     - type: Physics
@@ -403,45 +403,7 @@ entities:
     - type: Transform
       pos: 16.5,-4.5
       parent: 60
-- proto: AirlockHeadOfSecurityLocked
-  entities:
-  - uid: 127
-    components:
-    - type: Transform
-      pos: -0.5,5.5
-      parent: 60
-- proto: AirlockMaintEngiLocked
-  entities:
-  - uid: 167
-    components:
-    - type: Transform
-      pos: 8.5,-6.5
-      parent: 60
-  - uid: 209
-    components:
-    - type: Transform
-      pos: -9.5,-6.5
-      parent: 60
-- proto: AirlockMedicalGlassLocked
-  entities:
-  - uid: 125
-    components:
-    - type: Transform
-      pos: -12.5,0.5
-      parent: 60
-  - uid: 126
-    components:
-    - type: Transform
-      pos: 11.5,0.5
-      parent: 60
-- proto: AirlockSecurityGlassLocked
-  entities:
-  - uid: 88
-    components:
-    - type: Transform
-      pos: -0.5,0.5
-      parent: 60
-- proto: AirlockShuttleEasyPryLocked
+- proto: AirlockExternalShuttleLocked
   entities:
   - uid: 98
     components:
@@ -491,6 +453,44 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 19.5,-3.5
       parent: 60
+- proto: AirlockHeadOfSecurityLocked
+  entities:
+  - uid: 127
+    components:
+    - type: Transform
+      pos: -0.5,5.5
+      parent: 60
+- proto: AirlockMaintEngiLocked
+  entities:
+  - uid: 167
+    components:
+    - type: Transform
+      pos: 8.5,-6.5
+      parent: 60
+  - uid: 209
+    components:
+    - type: Transform
+      pos: -9.5,-6.5
+      parent: 60
+- proto: AirlockMedicalGlassLocked
+  entities:
+  - uid: 125
+    components:
+    - type: Transform
+      pos: -12.5,0.5
+      parent: 60
+  - uid: 126
+    components:
+    - type: Transform
+      pos: 11.5,0.5
+      parent: 60
+- proto: AirlockSecurityGlassLocked
+  entities:
+  - uid: 88
+    components:
+    - type: Transform
+      pos: -0.5,0.5
+      parent: 60
 - proto: APCHighCapacity
   entities:
   - uid: 269
@@ -8980,31 +8980,89 @@ entities:
       rot: 3.141592653589793 rad
       pos: -3.5,2.5
       parent: 60
-- proto: WindowFrostedDirectional
+- proto: WindowReinforcedDirectional
+  entities:
+  - uid: 588
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-3.5
+      parent: 60
+  - uid: 589
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-3.5
+      parent: 60
+  - uid: 961
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,2.5
+      parent: 60
+  - uid: 962
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,2.5
+      parent: 60
+  - uid: 963
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,1.5
+      parent: 60
+  - uid: 964
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,2.5
+      parent: 60
+  - uid: 1077
+    components:
+    - type: Transform
+      pos: 10.5,6.5
+      parent: 60
+  - uid: 1078
+    components:
+    - type: Transform
+      pos: -11.5,6.5
+      parent: 60
+  - uid: 1080
+    components:
+    - type: Transform
+      pos: -12.5,6.5
+      parent: 60
+  - uid: 1081
+    components:
+    - type: Transform
+      pos: 11.5,6.5
+      parent: 60
+- proto: WindowTintedDirectional
   entities:
   - uid: 461
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 14.5,-3.5
+      pos: 14.5,-4.5
       parent: 60
   - uid: 471
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 14.5,-2.5
+      pos: 14.5,-5.5
       parent: 60
   - uid: 472
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 7.5,-2.5
+      pos: 13.5,-2.5
       parent: 60
   - uid: 473
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 13.5,-2.5
+      pos: 7.5,-2.5
       parent: 60
   - uid: 474
     components:
@@ -9022,13 +9080,13 @@ entities:
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -8.5,-2.5
+      pos: -14.5,-2.5
       parent: 60
   - uid: 478
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -14.5,-2.5
+      pos: -8.5,-2.5
       parent: 60
   - uid: 479
     components:
@@ -9046,106 +9104,68 @@ entities:
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 14.5,-4.5
+      pos: 14.5,-3.5
       parent: 60
   - uid: 561
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 14.5,-5.5
+      pos: 14.5,-2.5
       parent: 60
-  - uid: 1307
+  - uid: 1066
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -12.5,-2.5
+      pos: -10.5,-2.5
       parent: 60
-  - uid: 1308
+  - uid: 1067
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -11.5,-2.5
       parent: 60
-  - uid: 1309
+  - uid: 1068
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -10.5,-2.5
+      pos: -12.5,-2.5
       parent: 60
-  - uid: 1311
+  - uid: 1069
     components:
     - type: Transform
-      pos: -9.5,0.5
+      pos: -8.5,0.5
       parent: 60
-  - uid: 1312
+  - uid: 1070
     components:
     - type: Transform
-      pos: 8.5,0.5
+      pos: 7.5,0.5
       parent: 60
-  - uid: 1315
+  - uid: 1072
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 11.5,-2.5
+      pos: 9.5,-2.5
       parent: 60
-  - uid: 1316
+  - uid: 1073
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 10.5,-2.5
       parent: 60
-  - uid: 1317
+  - uid: 1074
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 9.5,-2.5
-      parent: 60
-  - uid: 1341
-    components:
-    - type: Transform
-      pos: -8.5,0.5
-      parent: 60
-  - uid: 1342
-    components:
-    - type: Transform
-      pos: 7.5,0.5
-      parent: 60
-- proto: WindowReinforcedDirectional
-  entities:
-  - uid: 588
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -5.5,-3.5
-      parent: 60
-  - uid: 589
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-3.5
-      parent: 60
-  - uid: 961
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,2.5
-      parent: 60
-  - uid: 962
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,2.5
+      pos: 11.5,-2.5
       parent: 60
-  - uid: 963
+  - uid: 1075
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,1.5
+      pos: -9.5,0.5
       parent: 60
-  - uid: 964
+  - uid: 1076
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,2.5
+      pos: 8.5,0.5
       parent: 60
 ...
diff --git a/Resources/Maps/Shuttles/DeltaV/sub_escape_pod.yml b/Resources/Maps/Shuttles/DeltaV/sub_escape_pod.yml
new file mode 100644
index 0000000000..1e7c3210eb
--- /dev/null
+++ b/Resources/Maps/Shuttles/DeltaV/sub_escape_pod.yml
@@ -0,0 +1,412 @@
+meta:
+  format: 6
+  postmapinit: false
+tilemap:
+  0: Space
+  65: FloorMetalDiamond
+  77: FloorRGlass
+  121: Lattice
+  122: Plating
+entities:
+- proto: ""
+  entities:
+  - uid: 29
+    components:
+    - type: MetaData
+      name: Submarine Escape Pod
+    - type: Transform
+      parent: invalid
+    - type: ProtectedGrid
+    - type: EscapePod
+    - type: MapGrid
+      chunks:
+        -1,-1:
+          ind: -1,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAATQAAAAAATQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAQQAAAAAAQQAAAAAA
+          version: 6
+        0,0:
+          ind: 0,0
+          tiles: QQAAAAAATQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAATQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -1,0:
+          ind: -1,0
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAAAQQAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAAAQQAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAQQAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAATQAAAAAATQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        0,-1:
+          ind: 0,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+    - type: Broadphase
+    - type: Physics
+      bodyStatus: InAir
+      angularDamping: 0.05
+      linearDamping: 0.05
+      fixedRotation: False
+      bodyType: Dynamic
+    - type: Fixtures
+      fixtures: {}
+    - type: BecomesStation
+      id: Empty
+    - type: OccluderTree
+    - type: Shuttle
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+    - type: DecalGrid
+      chunkCollection:
+        version: 2
+        nodes: []
+    - type: GridAtmosphere
+      version: 2
+      data:
+        tiles:
+          -1,-1:
+            0: 60928
+          0,0:
+            0: 13107
+          -1,0:
+            0: 61166
+          0,-1:
+            0: 13056
+        uniqueMixes:
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.824879
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        chunkSize: 4
+    - type: GasTileOverlay
+    - type: RadiationGridResistance
+    - type: SpreaderGrid
+    - type: GridPathfinding
+- proto: AirlockGlassShuttle
+  entities:
+  - uid: 10
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 29
+- proto: APCBasic
+  entities:
+  - uid: 11
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-1.5
+      parent: 29
+- proto: AtmosDeviceFanTiny
+  entities:
+  - uid: 20
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 29
+- proto: CableApcExtension
+  entities:
+  - uid: 3
+    components:
+    - type: Transform
+      pos: -0.5,2.5
+      parent: 29
+  - uid: 5
+    components:
+    - type: Transform
+      pos: -0.5,1.5
+      parent: 29
+  - uid: 7
+    components:
+    - type: Transform
+      pos: 0.5,-0.5
+      parent: 29
+  - uid: 24
+    components:
+    - type: Transform
+      pos: -0.5,0.5
+      parent: 29
+  - uid: 25
+    components:
+    - type: Transform
+      pos: -0.5,-0.5
+      parent: 29
+  - uid: 50
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 29
+- proto: CableHV
+  entities:
+  - uid: 14
+    components:
+    - type: Transform
+      pos: -2.5,-0.5
+      parent: 29
+  - uid: 16
+    components:
+    - type: Transform
+      pos: -1.5,-0.5
+      parent: 29
+  - uid: 17
+    components:
+    - type: Transform
+      pos: -0.5,-0.5
+      parent: 29
+  - uid: 18
+    components:
+    - type: Transform
+      pos: 0.5,-0.5
+      parent: 29
+  - uid: 48
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 29
+- proto: CableMV
+  entities:
+  - uid: 6
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 29
+  - uid: 19
+    components:
+    - type: Transform
+      pos: 0.5,-0.5
+      parent: 29
+  - uid: 49
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 29
+- proto: ChairPilotSeat
+  entities:
+  - uid: 44
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,1.5
+      parent: 29
+  - uid: 45
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,0.5
+      parent: 29
+  - uid: 46
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,1.5
+      parent: 29
+  - uid: 47
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,0.5
+      parent: 29
+  - uid: 53
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,2.5
+      parent: 29
+  - uid: 54
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,2.5
+      parent: 29
+- proto: GeneratorWallmountAPU
+  entities:
+  - uid: 22
+    components:
+    - type: Transform
+      pos: -2.5,-0.5
+      parent: 29
+- proto: GravityGeneratorMini
+  entities:
+  - uid: 56
+    components:
+    - type: Transform
+      pos: -0.5,2.5
+      parent: 29
+- proto: Grille
+  entities:
+  - uid: 13
+    components:
+    - type: Transform
+      pos: -2.5,1.5
+      parent: 29
+  - uid: 27
+    components:
+    - type: Transform
+      pos: -2.5,0.5
+      parent: 29
+  - uid: 36
+    components:
+    - type: Transform
+      pos: 1.5,1.5
+      parent: 29
+  - uid: 37
+    components:
+    - type: Transform
+      pos: 1.5,0.5
+      parent: 29
+  - uid: 42
+    components:
+    - type: Transform
+      pos: -2.5,2.5
+      parent: 29
+  - uid: 43
+    components:
+    - type: Transform
+      pos: 1.5,2.5
+      parent: 29
+- proto: IntercomCommon
+  entities:
+  - uid: 35
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-1.5
+      parent: 29
+- proto: PoweredlightRed
+  entities:
+  - uid: 15
+    components:
+    - type: Transform
+      pos: -0.5,2.5
+      parent: 29
+- proto: Screen
+  entities:
+  - uid: 31
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,3.5
+      parent: 29
+  - uid: 33
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,3.5
+      parent: 29
+  - uid: 55
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,3.5
+      parent: 29
+- proto: ShuttleWindow
+  entities:
+  - uid: 8
+    components:
+    - type: Transform
+      pos: -2.5,1.5
+      parent: 29
+  - uid: 9
+    components:
+    - type: Transform
+      pos: -2.5,2.5
+      parent: 29
+  - uid: 38
+    components:
+    - type: Transform
+      pos: -2.5,0.5
+      parent: 29
+  - uid: 41
+    components:
+    - type: Transform
+      pos: 1.5,0.5
+      parent: 29
+  - uid: 51
+    components:
+    - type: Transform
+      pos: 1.5,2.5
+      parent: 29
+  - uid: 52
+    components:
+    - type: Transform
+      pos: 1.5,1.5
+      parent: 29
+- proto: SubstationWallBasic
+  entities:
+  - uid: 21
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 29
+- proto: Thruster
+  entities:
+  - uid: 2
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-1.5
+      parent: 29
+  - uid: 12
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-1.5
+      parent: 29
+- proto: WallShuttle
+  entities:
+  - uid: 4
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 29
+  - uid: 28
+    components:
+    - type: Transform
+      pos: -1.5,-1.5
+      parent: 29
+  - uid: 30
+    components:
+    - type: Transform
+      pos: -1.5,3.5
+      parent: 29
+  - uid: 32
+    components:
+    - type: Transform
+      pos: 0.5,3.5
+      parent: 29
+  - uid: 34
+    components:
+    - type: Transform
+      pos: -0.5,3.5
+      parent: 29
+  - uid: 39
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 29
+  - uid: 40
+    components:
+    - type: Transform
+      pos: -2.5,-0.5
+      parent: 29
+- proto: WallShuttleDiagonal
+  entities:
+  - uid: 23
+    components:
+    - type: Transform
+      pos: -2.5,3.5
+      parent: 29
+  - uid: 26
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,3.5
+      parent: 29
+...
diff --git a/Resources/Maps/Shuttles/cargo.yml b/Resources/Maps/Shuttles/cargo.yml
index 3b9953d94c..8a3007dd9c 100644
--- a/Resources/Maps/Shuttles/cargo.yml
+++ b/Resources/Maps/Shuttles/cargo.yml
@@ -3,11 +3,11 @@ meta:
   postmapinit: false
 tilemap:
   0: Space
-  81: FloorShuttleBlue
-  85: FloorShuttleWhite
-  89: FloorSteel
-  104: FloorTechMaint
-  121: Plating
+  84: FloorShuttleBlue
+  89: FloorShuttleWhite
+  93: FloorSteel
+  108: FloorTechMaint
+  126: Plating
 entities:
 - proto: ""
   entities:
@@ -22,19 +22,19 @@ entities:
       chunks:
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAVQAAAAAAUQAAAAAAVQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAUQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAWQAAAAAAVAAAAAAAWQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAVAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,0:
           ind: 0,0
-          tiles: WQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: XQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-1:
           ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
     - type: Broadphase
     - type: Physics
@@ -107,98 +107,34 @@ entities:
       data:
         tiles:
           -2,-1:
-            0: 34816
-            1: 17612
-          -1,-3:
-            0: 480
-            1: 65024
+            0: 52428
           -1,-1:
-            0: 17
-            1: 65518
+            0: 65535
           -1,-2:
-            1: 65535
+            0: 61440
           -2,1:
-            0: 34944
-            1: 17484
+            0: 52428
           -1,0:
-            1: 65535
+            0: 65535
           -1,1:
-            0: 4096
-            1: 59647
-            2: 512
-            3: 1024
-            4: 256
+            0: 65535
           -1,2:
-            5: 1
-            6: 16
-            7: 4
-            8: 64
-            1: 61066
-            9: 32
-          -1,3:
-            0: 546
-            1: 52428
-          0,-3:
-            0: 240
-            1: 65280
-          0,-2:
-            1: 65535
+            0: 255
           0,-1:
-            1: 65535
-          1,-3:
-            0: 528
-            1: 12544
-          1,-2:
-            1: 13107
-          1,-1:
-            0: 17442
-            1: 4369
+            0: 4369
           0,1:
-            1: 65535
+            0: 4369
           0,2:
-            1: 65535
-          0,3:
-            1: 65535
+            0: 1
           0,0:
-            1: 65535
-          1,3:
-            0: 273
-          1,0:
-            1: 30583
-          1,1:
-            0: 25664
-            1: 4375
-          1,2:
-            0: 34
-            1: 4369
-          0,4:
-            0: 120
-            1: 7
-          -1,4:
-            0: 132
-            1: 8
+            0: 4369
           -2,0:
-            1: 52428
+            0: 52428
           -2,2:
-            1: 140
+            0: 140
           -2,-2:
-            1: 32768
+            0: 32768
         uniqueMixes:
-        - volume: 2500
-          immutable: True
-          moles:
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -214,126 +150,6 @@ entities:
           - 0
           - 0
           - 0
-        - volume: 2500
-          temperature: 268.94583
-          moles:
-          - 20.00614
-          - 75.26119
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 285.08194
-          moles:
-          - 21.218632
-          - 79.82248
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 196.33333
-          moles:
-          - 14.549919
-          - 54.735413
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 147.92499
-          moles:
-          - 10.912439
-          - 41.05156
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 184.23123
-          moles:
-          - 13.64055
-          - 51.31445
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 291.44815
-          moles:
-          - 21.696999
-          - 81.62205
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 286.34256
-          moles:
-          - 21.313358
-          - 80.178825
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 265.9203
-          moles:
-          - 19.778797
-          - 74.40595
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
         chunkSize: 4
     - type: OccluderTree
     - type: Shuttle
diff --git a/Resources/Maps/Shuttles/emergency.yml b/Resources/Maps/Shuttles/emergency.yml
index eeb7048141..20cd923055 100644
--- a/Resources/Maps/Shuttles/emergency.yml
+++ b/Resources/Maps/Shuttles/emergency.yml
@@ -3,13 +3,13 @@ meta:
   postmapinit: false
 tilemap:
   0: Space
-  29: FloorDark
-  77: FloorReinforced
-  89: FloorSteel
-  104: FloorTechMaint
-  108: FloorWhite
-  120: Lattice
-  121: Plating
+  31: FloorDark
+  79: FloorReinforced
+  93: FloorSteel
+  108: FloorTechMaint
+  112: FloorWhite
+  125: Lattice
+  126: Plating
 entities:
 - proto: ""
   entities:
@@ -24,19 +24,19 @@ entities:
       chunks:
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAWQAAAAAAHQAAAAAAWQAAAAAAWQAAAAAAHQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAWQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAWQAAAAAAHQAAAAAAWQAAAAAAWQAAAAAAHQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAHQAAAAAAWQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAWQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAHQAAAAAAWQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAHwAAAAAAXQAAAAAAXQAAAAAAHwAAAAAAXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAHwAAAAAAXQAAAAAAXQAAAAAAHwAAAAAAXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAHwAAAAAAXQAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAXQAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAHwAAAAAAXQAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-1:
           ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAHQAAAAAAWQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAWQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAHQAAAAAAWQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAHwAAAAAAXQAAAAAAfgAAAAAAbAAAAAAAbAAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAXQAAAAAAfgAAAAAAbAAAAAAAbAAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAHwAAAAAAXQAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAHQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAHQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAHQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAHwAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAHwAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,0:
           ind: 0,0
-          tiles: HQAAAAAAHQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAWQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAWQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAWQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAHQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAHQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAHQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAHQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: HwAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAHwAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAHwAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
     - type: Broadphase
     - type: Physics
@@ -135,97 +135,41 @@ entities:
       data:
         tiles:
           -2,-1:
-            0: 32703
-            1: 32768
-            2: 64
-          -1,-3:
-            1: 480
-            0: 65024
+            0: 65535
           -1,-1:
-            0: 61439
-            2: 4096
-          -1,-2:
             0: 65535
+          -1,-2:
+            0: 65280
           -2,1:
             0: 65535
           -1,0:
             0: 65535
           -1,1:
-            2: 4096
-            0: 61439
+            0: 65535
           -1,2:
             0: 65535
           -1,3:
-            1: 34
-            3: 512
-            0: 49373
-            4: 2048
-            5: 1024
-            6: 256
-          0,-3:
-            1: 240
-            0: 65280
+            0: 4095
           0,-2:
-            0: 65535
+            0: 29440
           0,-1:
-            0: 65519
-            2: 16
-          1,-3:
-            1: 528
-            0: 12544
-          1,-2:
-            0: 13107
-          1,-1:
-            1: 17442
-            0: 4369
+            0: 30583
           0,1:
-            0: 65535
+            0: 30583
           0,2:
-            2: 1
-            0: 65502
-            7: 32
+            0: 30583
           0,3:
-            0: 65229
-            8: 16
-            9: 256
-            10: 2
-            11: 32
+            0: 311
           0,0:
-            0: 65535
-          1,3:
-            1: 273
-          1,0:
             0: 30583
-          1,1:
-            1: 25664
-            0: 4375
-          1,2:
-            1: 34
-            0: 4369
-          0,4:
-            1: 120
-            0: 7
-          -1,4:
-            1: 132
-            0: 8
           -2,0:
-            0: 61167
-            12: 16
-            13: 256
-            14: 4096
+            0: 65535
           -2,2:
-            0: 65499
-            7: 32
-            2: 4
+            0: 65535
           -2,3:
-            0: 143
-            15: 32
-            16: 64
-            17: 1024
-            18: 2048
+            0: 3311
           -2,-2:
-            0: 64256
-            19: 1024
+            0: 65024
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -242,291 +186,6 @@ entities:
           - 0
           - 0
           - 0
-        - volume: 2500
-          immutable: True
-          moles:
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 20.04244
-          - 75.39776
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 122.82263
-          moles:
-          - 9.026207
-          - 33.955734
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 282.50452
-          moles:
-          - 21.024963
-          - 79.0939
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 250.56815
-          moles:
-          - 18.625212
-          - 70.06627
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 192.74052
-          moles:
-          - 14.27995
-          - 53.719814
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 21.213781
-          - 79.80423
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 292.48465
-          moles:
-          - 21.774883
-          - 81.91504
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 290.48862
-          moles:
-          - 21.6249
-          - 81.350815
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.10843
-          moles:
-          - 21.821754
-          - 82.09136
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 292.98364
-          moles:
-          - 21.812382
-          - 82.0561
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 220.53749
-          moles:
-          - 16.36866
-          - 61.57734
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 202.38438
-          moles:
-          - 15.004604
-          - 56.445892
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 197.84608
-          moles:
-          - 14.66359
-          - 55.163033
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 147.925
-          moles:
-          - 10.912439
-          - 41.05156
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 256.84375
-          moles:
-          - 19.09677
-          - 71.840225
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 138.84843
-          moles:
-          - 10.230412
-          - 38.485836
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 181.96211
-          moles:
-          - 13.470042
-          - 50.67302
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 220.5375
-          moles:
-          - 16.36866
-          - 61.57734
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
         chunkSize: 4
     - type: OccluderTree
     - type: Shuttle
diff --git a/Resources/Maps/Shuttles/infiltrator.yml b/Resources/Maps/Shuttles/infiltrator.yml
index 4e888ae05c..c6211b74e4 100644
--- a/Resources/Maps/Shuttles/infiltrator.yml
+++ b/Resources/Maps/Shuttles/infiltrator.yml
@@ -1,5674 +1,5678 @@
-meta:
-  format: 6
-  postmapinit: false
-tilemap:
-  0: Space
-  3: FloorArcadeRed
-  29: FloorDark
-  34: FloorDarkMono
-  38: FloorDarkPlastic
-  54: FloorGreenCircuit
-  77: FloorReinforced
-  84: FloorShuttleRed
-  85: FloorShuttleWhite
-  89: FloorSteel
-  100: FloorSteelMono
-  106: FloorTechMaint3
-  118: FloorWood
-  120: Lattice
-  121: Plating
-entities:
-- proto: ""
-  entities:
-  - uid: 1
-    components:
-    - type: MetaData
-      name: GX-13 Infiltrator
-    - type: Tag
-      tags:
-      - Syndicate
-    - type: Transform
-      pos: 0.64252126,4.1776605
-      parent: invalid
-    - type: MapGrid
-      chunks:
-        -1,-1:
-          ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAABHQAAAAACHQAAAAABHQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAagAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAVAAAAAAAHQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAVAAAAAAAHQAAAAACeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAVAAAAAAAHQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAHQAAAAABHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACVAAAAAAAHQAAAAACHQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAWQAAAAACZAAAAAAAVQAAAAAAHQAAAAADHQAAAAAAHQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAWQAAAAADVQAAAAAAZAAAAAABVAAAAAAAHQAAAAAAHQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAADVAAAAAAAHQAAAAACHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        0,-1:
-          ind: 0,-1
-          tiles: HQAAAAABHQAAAAABHQAAAAABHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAagAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACVAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACVAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAABVAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAABeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAABVAAAAAAAdgAAAAADeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAADHQAAAAAAHQAAAAAAdgAAAAADdgAAAAABeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAVAAAAAAAdgAAAAAAAwAAAAAAdgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAADVAAAAAAAeQAAAAAAAwAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        -1,-2:
-          ind: -1,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAANgAAAAAAIgAAAAAANgAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAANgAAAAAAIgAAAAAANgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAANgAAAAAAIgAAAAAANgAAAAAAVAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAACHQAAAAAAHQAAAAADVAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAACTQAAAAAAHQAAAAABVAAAAAAAeQAAAAAAeQAAAAAAagAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAVAAAAAAAeQAAAAAAHQAAAAAAHQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAJgAAAAAAJgAAAAAAVAAAAAAAHQAAAAADHQAAAAAAHQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAVAAAAAAAHQAAAAAAVAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAABHQAAAAAAHQAAAAADHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAagAAAAAAHQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAA
-          version: 6
-        0,-2:
-          ind: 0,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAATQAAAAAAeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAATQAAAAAAeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAATQAAAAAAeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAABHQAAAAADHQAAAAABHQAAAAADHQAAAAABVAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAADHQAAAAACHQAAAAAAHQAAAAACHQAAAAADeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHQAAAAACHQAAAAAAHQAAAAADHQAAAAABeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAABHQAAAAAAHQAAAAABHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACagAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-    - type: Broadphase
-    - type: Physics
-      bodyStatus: InAir
-      angularDamping: 0.05
-      linearDamping: 0.05
-      fixedRotation: False
-      bodyType: Dynamic
-    - type: Fixtures
-      fixtures: {}
-    - type: Gravity
-      gravityShakeSound: !type:SoundPathSpecifier
-        path: /Audio/Effects/alert.ogg
-    - type: GridAtmosphere
-      version: 2
-      data:
-        tiles:
-          -1,-4:
-            0: 65535
-          -1,-3:
-            0: 65535
-          -1,-2:
-            0: 65535
-          -1,-1:
-            0: 61439
-          0,-4:
-            0: 65535
-          0,-3:
-            0: 65535
-          0,-2:
-            0: 65535
-          0,-1:
-            0: 65535
-          1,-4:
-            0: 30591
-          1,-3:
-            0: 21879
-            1: 512
-          1,-2:
-            0: 30325
-            2: 256
-          1,-1:
-            0: 55
-          0,-5:
-            0: 65535
-          1,-5:
-            0: 65399
-          -1,-5:
-            0: 65535
-          -3,-4:
-            0: 12
-          -2,-4:
-            0: 61439
-          -2,-2:
-            0: 65516
-          -2,-1:
-            0: 2287
-          -2,-3:
-            0: 35054
-            1: 1536
-          -1,0:
-            0: 8
-          -3,-5:
-            0: 52224
-          -2,-8:
-            0: 65504
-          -2,-7:
-            0: 65535
-          -2,-6:
-            0: 65535
-          -2,-5:
-            0: 65535
-          -1,-8:
-            0: 65526
-          -1,-7:
-            0: 65535
-          -1,-6:
-            0: 65535
-          0,-8:
-            0: 65523
-          0,-7:
-            0: 61303
-            3: 4096
-            4: 136
-          0,-6:
-            3: 1
-            0: 65534
-          1,-8:
-            0: 30512
-          1,-7:
-            0: 30549
-            5: 34
-          1,-6:
-            0: 30583
-          -1,-9:
-            0: 26112
-          0,-9:
-            0: 13056
-          2,-4:
-            0: 1
-          2,-5:
-            0: 4352
-        uniqueMixes:
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 21.824879
-          - 82.10312
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.14996
-          moles:
-          - 20.078888
-          - 75.53487
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 20.619795
-          - 77.56971
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 6666.982
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 0
-          - 6666.982
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        chunkSize: 4
-    - type: DecalGrid
-      chunkCollection:
-        version: 2
-        nodes:
-        - node:
-            color: '#FFFFFFFF'
-            id: Arrows
-          decals:
-            115: -6,-24
-        - node:
-            color: '#FFFFFFFF'
-            id: Bot
-          decals:
-            112: -6,-27
-            113: -6,-26
-            114: -6,-25
-        - node:
-            color: '#79150096'
-            id: Box
-          decals:
-            110: -6,-21
-            111: -5,-21
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelCornerNe
-          decals:
-            10: 0,-4
-            43: 0,-9
-            51: 4,-20
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelCornerNw
-          decals:
-            11: -2,-4
-            42: -2,-9
-            45: -2,-20
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelCornerSe
-          decals:
-            36: 0,-14
-            50: 4,-22
-            76: 3,-18
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelCornerSw
-          decals:
-            37: -2,-14
-            46: -2,-22
-            75: -5,-18
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelLineE
-          decals:
-            6: 0,-7
-            9: 0,-5
-            32: 0,-11
-            33: 0,-10
-            34: 0,-12
-            35: 0,-13
-            52: 4,-21
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelLineN
-          decals:
-            12: -1,-4
-            53: 3,-20
-            54: 2,-20
-            55: 1,-20
-            56: 0,-20
-            63: 0,-16
-            64: 1,-16
-            65: 2,-16
-            66: -2,-16
-            67: -3,-16
-            68: -4,-16
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelLineS
-          decals:
-            47: 0,-22
-            48: 1,-22
-            49: 2,-22
-            69: 2,-18
-            70: 1,-18
-            71: 0,-18
-            72: -2,-18
-            73: -3,-18
-            74: -4,-18
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelLineW
-          decals:
-            7: -2,-7
-            8: -2,-5
-            38: -2,-13
-            39: -2,-12
-            40: -2,-11
-            41: -2,-10
-        - node:
-            color: '#79150096'
-            id: BrickTileWhiteCornerNe
-          decals:
-            104: -5,-22
-        - node:
-            color: '#79150096'
-            id: BrickTileWhiteCornerNw
-          decals:
-            103: -7,-22
-        - node:
-            color: '#79150096'
-            id: BrickTileWhiteCornerSe
-          decals:
-            105: -5,-24
-        - node:
-            color: '#79150096'
-            id: BrickTileWhiteCornerSw
-          decals:
-            106: -7,-24
-        - node:
-            color: '#79150096'
-            id: BrickTileWhiteLineE
-          decals:
-            102: -5,-23
-        - node:
-            color: '#79150096'
-            id: BrickTileWhiteLineN
-          decals:
-            109: -6,-22
-        - node:
-            color: '#79150096'
-            id: BrickTileWhiteLineS
-          decals:
-            107: -6,-24
-        - node:
-            color: '#79150096'
-            id: BrickTileWhiteLineW
-          decals:
-            108: -7,-23
-        - node:
-            color: '#79150096'
-            id: Delivery
-          decals:
-            116: -1,-23
-        - node:
-            color: '#DE3A3A96'
-            id: DeliveryGreyscale
-          decals:
-            13: 1,-6
-            31: -3,-6
-            83: -1,-19
-            84: -3,-21
-            85: -1,-15
-            86: 4,-17
-            87: -6,-17
-            88: -5,-15
-            89: 3,-15
-            90: -1,-8
-        - node:
-            color: '#DE3A3A96'
-            id: HalfTileOverlayGreyscale
-          decals:
-            29: -4,-7
-        - node:
-            color: '#DE3A3A96'
-            id: HalfTileOverlayGreyscale180
-          decals:
-            25: -4,-4
-            26: -5,-4
-        - node:
-            color: '#DE3A3A96'
-            id: HalfTileOverlayGreyscale90
-          decals:
-            27: -6,-6
-            28: -6,-5
-        - node:
-            color: '#DE3A3A96'
-            id: MonoOverlay
-          decals:
-            23: -5,-6
-            24: -4,-5
-        - node:
-            color: '#DE3A3A96'
-            id: WarnCornerGreyscaleNE
-          decals:
-            81: 3,-16
-        - node:
-            color: '#DE3A3A96'
-            id: WarnCornerGreyscaleNW
-          decals:
-            80: -5,-16
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnCornerSmallNE
-          decals:
-            99: -7,-24
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnCornerSmallNW
-          decals:
-            98: -5,-24
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnCornerSmallSE
-          decals:
-            97: -7,-22
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnCornerSmallSW
-          decals:
-            101: -5,-22
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnLineE
-          decals:
-            3: -4,-23
-            4: -4,-24
-            5: -4,-25
-            95: -7,-23
-        - node:
-            color: '#DE3A3A96'
-            id: WarnLineGreyscaleE
-          decals:
-            78: 3,-17
-        - node:
-            color: '#DE3A3A96'
-            id: WarnLineGreyscaleN
-          decals:
-            44: -1,-9
-            59: -1,-20
-            82: -1,-16
-        - node:
-            color: '#DE3A3A96'
-            id: WarnLineGreyscaleS
-          decals:
-            57: -1,-22
-            60: 3,-22
-            77: -1,-18
-        - node:
-            color: '#DE3A3A96'
-            id: WarnLineGreyscaleW
-          decals:
-            58: -2,-21
-            79: -5,-17
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnLineN
-          decals:
-            91: -5,-28
-            92: -6,-28
-            93: -7,-28
-            100: -6,-22
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnLineS
-          decals:
-            94: -5,-23
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnLineW
-          decals:
-            96: -6,-24
-        - node:
-            angle: 1.5707963267948966 rad
-            color: '#FFFFFFFF'
-            id: WarningLine
-          decals:
-            0: -4,-22
-            1: -4,-21
-            2: -4,-20
-        - node:
-            color: '#FFFFFFFF'
-            id: WoodTrimThinEndN
-          decals:
-            62: 3,-4
-        - node:
-            color: '#FFFFFFFF'
-            id: WoodTrimThinEndS
-          decals:
-            61: 3,-5
-        - node:
-            color: '#FFFFFFFF'
-            id: syndlogo10
-          decals:
-            20: -2,-7
-        - node:
-            color: '#FFFFFFFF'
-            id: syndlogo11
-          decals:
-            21: -1,-7
-        - node:
-            color: '#FFFFFFFF'
-            id: syndlogo12
-          decals:
-            22: 0,-7
-        - node:
-            color: '#FFFFFFFF'
-            id: syndlogo2
-          decals:
-            14: -2,-5
-        - node:
-            color: '#FFFFFFFF'
-            id: syndlogo3
-          decals:
-            15: -1,-5
-        - node:
-            color: '#FFFFFFFF'
-            id: syndlogo4
-          decals:
-            16: 0,-5
-        - node:
-            color: '#FFFFFFFF'
-            id: syndlogo5
-          decals:
-            30: -3,-6
-        - node:
-            color: '#FFFFFFFF'
-            id: syndlogo6
-          decals:
-            17: -2,-6
-        - node:
-            color: '#FFFFFFFF'
-            id: syndlogo7
-          decals:
-            18: -1,-6
-        - node:
-            color: '#FFFFFFFF'
-            id: syndlogo8
-          decals:
-            19: 0,-6
-    - type: IFF
-      color: '#FFC000FF'
-      flags: Hide
-    - type: OccluderTree
-    - type: Shuttle
-    - type: RadiationGridResistance
-    - type: GravityShake
-      shakeTimes: 10
-    - type: GasTileOverlay
-    - type: SpreaderGrid
-    - type: GridPathfinding
-- proto: AirlockExternalGlassShuttleSyndicateLocked
-  entities:
-  - uid: 8
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,-16.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 13
-    - type: DeviceLinkSource
-      linkedPorts:
-        13:
-        - DoorStatus: DoorBolt
-  - uid: 10
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -9.5,-16.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 3
-    - type: DeviceLinkSource
-      linkedPorts:
-        3:
-        - DoorStatus: DoorBolt
-- proto: AirlockExternalSyndicateLocked
-  entities:
-  - uid: 2
-    components:
-    - type: Transform
-      pos: -0.5,-25.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 14
-    - type: DeviceLinkSource
-      linkedPorts:
-        14:
-        - DoorStatus: DoorBolt
-  - uid: 3
-    components:
-    - type: Transform
-      pos: -5.5,-16.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 10
-    - type: DeviceLinkSource
-      linkedPorts:
-        10:
-        - DoorStatus: DoorBolt
-  - uid: 7
-    components:
-    - type: Transform
-      pos: -4.5,-14.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 12
-    - type: DeviceLinkSource
-      linkedPorts:
-        12:
-        - DoorStatus: DoorBolt
-  - uid: 9
-    components:
-    - type: Transform
-      pos: 3.5,-14.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 22
-    - type: DeviceLinkSource
-      linkedPorts:
-        22:
-        - DoorStatus: DoorBolt
-  - uid: 12
-    components:
-    - type: Transform
-      pos: -4.5,-10.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 7
-    - type: DeviceLinkSource
-      linkedPorts:
-        7:
-        - DoorStatus: DoorBolt
-  - uid: 13
-    components:
-    - type: Transform
-      pos: 4.5,-16.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 8
-    - type: DeviceLinkSource
-      linkedPorts:
-        8:
-        - DoorStatus: DoorBolt
-  - uid: 14
-    components:
-    - type: Transform
-      pos: -0.5,-22.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        2:
-        - DoorStatus: DoorBolt
-  - uid: 22
-    components:
-    - type: Transform
-      pos: 3.5,-10.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 9
-    - type: DeviceLinkSource
-      linkedPorts:
-        9:
-        - DoorStatus: DoorBolt
-- proto: AirlockSyndicateGlassLocked
-  entities:
-  - uid: 4
-    components:
-    - type: Transform
-      pos: -0.5,-7.5
-      parent: 1
-  - uid: 5
-    components:
-    - type: Transform
-      pos: 3.5,-22.5
-      parent: 1
-  - uid: 6
-    components:
-    - type: Transform
-      pos: -0.5,-18.5
-      parent: 1
-  - uid: 17
-    components:
-    - type: Transform
-      pos: -2.5,-20.5
-      parent: 1
-- proto: AirlockSyndicateLocked
-  entities:
-  - uid: 15
-    components:
-    - type: Transform
-      pos: -0.5,-14.5
-      parent: 1
-  - uid: 16
-    components:
-    - type: Transform
-      pos: 2.5,-5.5
-      parent: 1
-- proto: APCBasic
-  entities:
-  - uid: 18
-    components:
-    - type: Transform
-      pos: -3.5,-18.5
-      parent: 1
-  - uid: 19
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-8.5
-      parent: 1
-- proto: AtmosFixNitrogenMarker
-  entities:
-  - uid: 25
-    components:
-    - type: Transform
-      pos: 5.5,-26.5
-      parent: 1
-  - uid: 26
-    components:
-    - type: Transform
-      pos: 5.5,-27.5
-      parent: 1
-- proto: AtmosFixOxygenMarker
-  entities:
-  - uid: 27
-    components:
-    - type: Transform
-      pos: 3.5,-26.5
-      parent: 1
-  - uid: 28
-    components:
-    - type: Transform
-      pos: 3.5,-27.5
-      parent: 1
-- proto: BannerSyndicate
-  entities:
-  - uid: 29
-    components:
-    - type: Transform
-      pos: 2.5,-15.5
-      parent: 1
-  - uid: 30
-    components:
-    - type: Transform
-      pos: -3.5,-15.5
-      parent: 1
-- proto: Bed
-  entities:
-  - uid: 31
-    components:
-    - type: Transform
-      pos: 3.5,-3.5
-      parent: 1
-- proto: BedsheetSyndie
-  entities:
-  - uid: 32
-    components:
-    - type: Transform
-      pos: 3.5,-3.5
-      parent: 1
-- proto: BoxEncryptionKeySyndie
-  entities:
-  - uid: 34
-    components:
-    - type: Transform
-      parent: 33
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: BoxFlashbang
-  entities:
-  - uid: 42
-    components:
-    - type: Transform
-      pos: 0.49331844,-13.366474
-      parent: 1
-- proto: BoxHandcuff
-  entities:
-  - uid: 43
-    components:
-    - type: Transform
-      pos: 1.4510483,-2.399527
-      parent: 1
-- proto: Brutepack
-  entities:
-  - uid: 44
-    components:
-    - type: Transform
-      pos: -3.292087,-4.1600046
-      parent: 1
-  - uid: 45
-    components:
-    - type: Transform
-      pos: -3.354587,-4.4256296
-      parent: 1
-- proto: C4
-  entities:
-  - uid: 46
-    components:
-    - type: Transform
-      pos: 1.7857682,-12.631323
-      parent: 1
-  - uid: 47
-    components:
-    - type: Transform
-      pos: 1.5045182,-12.646948
-      parent: 1
-  - uid: 48
-    components:
-    - type: Transform
-      pos: 1.5982682,-12.646948
-      parent: 1
-  - uid: 49
-    components:
-    - type: Transform
-      pos: 1.4107682,-12.646948
-      parent: 1
-  - uid: 50
-    components:
-    - type: Transform
-      pos: 1.6920182,-12.631323
-      parent: 1
-- proto: CableApcExtension
-  entities:
-  - uid: 51
-    components:
-    - type: Transform
-      pos: -3.5,-18.5
-      parent: 1
-  - uid: 52
-    components:
-    - type: Transform
-      pos: -3.5,-17.5
-      parent: 1
-  - uid: 53
-    components:
-    - type: Transform
-      pos: -3.5,-16.5
-      parent: 1
-  - uid: 54
-    components:
-    - type: Transform
-      pos: -4.5,-16.5
-      parent: 1
-  - uid: 55
-    components:
-    - type: Transform
-      pos: -5.5,-16.5
-      parent: 1
-  - uid: 56
-    components:
-    - type: Transform
-      pos: -6.5,-16.5
-      parent: 1
-  - uid: 57
-    components:
-    - type: Transform
-      pos: -7.5,-16.5
-      parent: 1
-  - uid: 58
-    components:
-    - type: Transform
-      pos: -8.5,-16.5
-      parent: 1
-  - uid: 59
-    components:
-    - type: Transform
-      pos: -6.5,-15.5
-      parent: 1
-  - uid: 60
-    components:
-    - type: Transform
-      pos: -6.5,-17.5
-      parent: 1
-  - uid: 61
-    components:
-    - type: Transform
-      pos: -4.5,-15.5
-      parent: 1
-  - uid: 62
-    components:
-    - type: Transform
-      pos: -4.5,-14.5
-      parent: 1
-  - uid: 63
-    components:
-    - type: Transform
-      pos: -4.5,-13.5
-      parent: 1
-  - uid: 64
-    components:
-    - type: Transform
-      pos: -4.5,-12.5
-      parent: 1
-  - uid: 65
-    components:
-    - type: Transform
-      pos: -4.5,-11.5
-      parent: 1
-  - uid: 66
-    components:
-    - type: Transform
-      pos: -4.5,-10.5
-      parent: 1
-  - uid: 67
-    components:
-    - type: Transform
-      pos: -5.5,-12.5
-      parent: 1
-  - uid: 68
-    components:
-    - type: Transform
-      pos: -6.5,-12.5
-      parent: 1
-  - uid: 69
-    components:
-    - type: Transform
-      pos: -2.5,-16.5
-      parent: 1
-  - uid: 70
-    components:
-    - type: Transform
-      pos: -1.5,-16.5
-      parent: 1
-  - uid: 71
-    components:
-    - type: Transform
-      pos: -0.5,-16.5
-      parent: 1
-  - uid: 72
-    components:
-    - type: Transform
-      pos: 0.5,-16.5
-      parent: 1
-  - uid: 73
-    components:
-    - type: Transform
-      pos: 1.5,-16.5
-      parent: 1
-  - uid: 74
-    components:
-    - type: Transform
-      pos: 2.5,-16.5
-      parent: 1
-  - uid: 75
-    components:
-    - type: Transform
-      pos: 3.5,-16.5
-      parent: 1
-  - uid: 76
-    components:
-    - type: Transform
-      pos: 4.5,-16.5
-      parent: 1
-  - uid: 77
-    components:
-    - type: Transform
-      pos: 5.5,-16.5
-      parent: 1
-  - uid: 78
-    components:
-    - type: Transform
-      pos: 5.5,-15.5
-      parent: 1
-  - uid: 79
-    components:
-    - type: Transform
-      pos: 5.5,-17.5
-      parent: 1
-  - uid: 80
-    components:
-    - type: Transform
-      pos: 6.5,-16.5
-      parent: 1
-  - uid: 81
-    components:
-    - type: Transform
-      pos: 7.5,-16.5
-      parent: 1
-  - uid: 82
-    components:
-    - type: Transform
-      pos: 3.5,-15.5
-      parent: 1
-  - uid: 83
-    components:
-    - type: Transform
-      pos: 3.5,-14.5
-      parent: 1
-  - uid: 84
-    components:
-    - type: Transform
-      pos: 3.5,-13.5
-      parent: 1
-  - uid: 85
-    components:
-    - type: Transform
-      pos: 3.5,-12.5
-      parent: 1
-  - uid: 86
-    components:
-    - type: Transform
-      pos: 3.5,-11.5
-      parent: 1
-  - uid: 87
-    components:
-    - type: Transform
-      pos: 3.5,-11.5
-      parent: 1
-  - uid: 88
-    components:
-    - type: Transform
-      pos: 3.5,-10.5
-      parent: 1
-  - uid: 89
-    components:
-    - type: Transform
-      pos: 4.5,-12.5
-      parent: 1
-  - uid: 90
-    components:
-    - type: Transform
-      pos: 5.5,-12.5
-      parent: 1
-  - uid: 91
-    components:
-    - type: Transform
-      pos: -0.5,-6.5
-      parent: 1
-  - uid: 92
-    components:
-    - type: Transform
-      pos: -0.5,-7.5
-      parent: 1
-  - uid: 93
-    components:
-    - type: Transform
-      pos: -0.5,-8.5
-      parent: 1
-  - uid: 94
-    components:
-    - type: Transform
-      pos: -0.5,-9.5
-      parent: 1
-  - uid: 95
-    components:
-    - type: Transform
-      pos: -0.5,-10.5
-      parent: 1
-  - uid: 96
-    components:
-    - type: Transform
-      pos: -0.5,-11.5
-      parent: 1
-  - uid: 97
-    components:
-    - type: Transform
-      pos: -0.5,-12.5
-      parent: 1
-  - uid: 98
-    components:
-    - type: Transform
-      pos: -0.5,-13.5
-      parent: 1
-  - uid: 99
-    components:
-    - type: Transform
-      pos: -0.5,-14.5
-      parent: 1
-  - uid: 100
-    components:
-    - type: Transform
-      pos: -1.5,-12.5
-      parent: 1
-  - uid: 101
-    components:
-    - type: Transform
-      pos: 0.5,-12.5
-      parent: 1
-  - uid: 102
-    components:
-    - type: Transform
-      pos: -0.5,-5.5
-      parent: 1
-  - uid: 103
-    components:
-    - type: Transform
-      pos: 0.5,-5.5
-      parent: 1
-  - uid: 104
-    components:
-    - type: Transform
-      pos: 1.5,-5.5
-      parent: 1
-  - uid: 105
-    components:
-    - type: Transform
-      pos: 2.5,-5.5
-      parent: 1
-  - uid: 106
-    components:
-    - type: Transform
-      pos: 3.5,-5.5
-      parent: 1
-  - uid: 107
-    components:
-    - type: Transform
-      pos: 3.5,-4.5
-      parent: 1
-  - uid: 108
-    components:
-    - type: Transform
-      pos: -0.5,-4.5
-      parent: 1
-  - uid: 109
-    components:
-    - type: Transform
-      pos: -0.5,-3.5
-      parent: 1
-  - uid: 110
-    components:
-    - type: Transform
-      pos: -0.5,-2.5
-      parent: 1
-  - uid: 111
-    components:
-    - type: Transform
-      pos: 0.5,-2.5
-      parent: 1
-  - uid: 112
-    components:
-    - type: Transform
-      pos: 1.5,-2.5
-      parent: 1
-  - uid: 113
-    components:
-    - type: Transform
-      pos: -1.5,-2.5
-      parent: 1
-  - uid: 114
-    components:
-    - type: Transform
-      pos: -2.5,-2.5
-      parent: 1
-  - uid: 115
-    components:
-    - type: Transform
-      pos: -1.5,-4.5
-      parent: 1
-  - uid: 116
-    components:
-    - type: Transform
-      pos: -3.5,-4.5
-      parent: 1
-  - uid: 117
-    components:
-    - type: Transform
-      pos: -2.5,-4.5
-      parent: 1
-  - uid: 118
-    components:
-    - type: Transform
-      pos: -4.5,-4.5
-      parent: 1
-  - uid: 119
-    components:
-    - type: Transform
-      pos: -5.5,-4.5
-      parent: 1
-  - uid: 120
-    components:
-    - type: Transform
-      pos: -5.5,-5.5
-      parent: 1
-  - uid: 121
-    components:
-    - type: Transform
-      pos: -5.5,-6.5
-      parent: 1
-  - uid: 122
-    components:
-    - type: Transform
-      pos: -5.5,-3.5
-      parent: 1
-  - uid: 123
-    components:
-    - type: Transform
-      pos: 4.5,-4.5
-      parent: 1
-  - uid: 124
-    components:
-    - type: Transform
-      pos: 4.5,-3.5
-      parent: 1
-  - uid: 125
-    components:
-    - type: Transform
-      pos: 3.5,-6.5
-      parent: 1
-  - uid: 126
-    components:
-    - type: Transform
-      pos: -0.5,-17.5
-      parent: 1
-  - uid: 127
-    components:
-    - type: Transform
-      pos: -3.5,-20.5
-      parent: 1
-  - uid: 128
-    components:
-    - type: Transform
-      pos: -3.5,-19.5
-      parent: 1
-  - uid: 129
-    components:
-    - type: Transform
-      pos: -3.5,-21.5
-      parent: 1
-  - uid: 130
-    components:
-    - type: Transform
-      pos: -4.5,-21.5
-      parent: 1
-  - uid: 131
-    components:
-    - type: Transform
-      pos: -4.5,-22.5
-      parent: 1
-  - uid: 132
-    components:
-    - type: Transform
-      pos: -4.5,-23.5
-      parent: 1
-  - uid: 133
-    components:
-    - type: Transform
-      pos: -4.5,-24.5
-      parent: 1
-  - uid: 134
-    components:
-    - type: Transform
-      pos: -4.5,-25.5
-      parent: 1
-  - uid: 135
-    components:
-    - type: Transform
-      pos: -4.5,-25.5
-      parent: 1
-  - uid: 136
-    components:
-    - type: Transform
-      pos: -4.5,-26.5
-      parent: 1
-  - uid: 137
-    components:
-    - type: Transform
-      pos: -4.5,-27.5
-      parent: 1
-  - uid: 138
-    components:
-    - type: Transform
-      pos: -5.5,-27.5
-      parent: 1
-  - uid: 139
-    components:
-    - type: Transform
-      pos: -6.5,-27.5
-      parent: 1
-  - uid: 140
-    components:
-    - type: Transform
-      pos: -6.5,-26.5
-      parent: 1
-  - uid: 141
-    components:
-    - type: Transform
-      pos: -6.5,-25.5
-      parent: 1
-  - uid: 142
-    components:
-    - type: Transform
-      pos: -6.5,-24.5
-      parent: 1
-  - uid: 143
-    components:
-    - type: Transform
-      pos: -6.5,-23.5
-      parent: 1
-  - uid: 144
-    components:
-    - type: Transform
-      pos: -6.5,-22.5
-      parent: 1
-  - uid: 145
-    components:
-    - type: Transform
-      pos: -2.5,-20.5
-      parent: 1
-  - uid: 146
-    components:
-    - type: Transform
-      pos: -1.5,-20.5
-      parent: 1
-  - uid: 147
-    components:
-    - type: Transform
-      pos: -0.5,-20.5
-      parent: 1
-  - uid: 148
-    components:
-    - type: Transform
-      pos: -0.5,-21.5
-      parent: 1
-  - uid: 149
-    components:
-    - type: Transform
-      pos: -0.5,-23.5
-      parent: 1
-  - uid: 150
-    components:
-    - type: Transform
-      pos: -0.5,-22.5
-      parent: 1
-  - uid: 151
-    components:
-    - type: Transform
-      pos: -0.5,-24.5
-      parent: 1
-  - uid: 152
-    components:
-    - type: Transform
-      pos: -0.5,-25.5
-      parent: 1
-  - uid: 153
-    components:
-    - type: Transform
-      pos: -0.5,-19.5
-      parent: 1
-  - uid: 154
-    components:
-    - type: Transform
-      pos: 0.5,-20.5
-      parent: 1
-  - uid: 155
-    components:
-    - type: Transform
-      pos: 1.5,-20.5
-      parent: 1
-  - uid: 156
-    components:
-    - type: Transform
-      pos: 2.5,-20.5
-      parent: 1
-  - uid: 157
-    components:
-    - type: Transform
-      pos: 3.5,-20.5
-      parent: 1
-  - uid: 158
-    components:
-    - type: Transform
-      pos: 4.5,-20.5
-      parent: 1
-  - uid: 159
-    components:
-    - type: Transform
-      pos: 3.5,-21.5
-      parent: 1
-  - uid: 160
-    components:
-    - type: Transform
-      pos: 3.5,-22.5
-      parent: 1
-  - uid: 161
-    components:
-    - type: Transform
-      pos: 3.5,-23.5
-      parent: 1
-  - uid: 162
-    components:
-    - type: Transform
-      pos: 3.5,-24.5
-      parent: 1
-  - uid: 163
-    components:
-    - type: Transform
-      pos: 3.5,-25.5
-      parent: 1
-  - uid: 164
-    components:
-    - type: Transform
-      pos: 3.5,-26.5
-      parent: 1
-  - uid: 165
-    components:
-    - type: Transform
-      pos: 3.5,-27.5
-      parent: 1
-  - uid: 166
-    components:
-    - type: Transform
-      pos: 4.5,-27.5
-      parent: 1
-  - uid: 167
-    components:
-    - type: Transform
-      pos: 5.5,-27.5
-      parent: 1
-  - uid: 168
-    components:
-    - type: Transform
-      pos: 5.5,-26.5
-      parent: 1
-  - uid: 169
-    components:
-    - type: Transform
-      pos: 5.5,-25.5
-      parent: 1
-  - uid: 170
-    components:
-    - type: Transform
-      pos: 5.5,-24.5
-      parent: 1
-  - uid: 171
-    components:
-    - type: Transform
-      pos: 5.5,-23.5
-      parent: 1
-  - uid: 172
-    components:
-    - type: Transform
-      pos: 0.5,-8.5
-      parent: 1
-  - uid: 173
-    components:
-    - type: Transform
-      pos: 1.5,-26.5
-      parent: 1
-  - uid: 174
-    components:
-    - type: Transform
-      pos: 1.5,-8.5
-      parent: 1
-  - uid: 175
-    components:
-    - type: Transform
-      pos: -0.5,-26.5
-      parent: 1
-  - uid: 176
-    components:
-    - type: Transform
-      pos: -1.5,-26.5
-      parent: 1
-  - uid: 177
-    components:
-    - type: Transform
-      pos: 0.5,-26.5
-      parent: 1
-  - uid: 178
-    components:
-    - type: Transform
-      pos: -2.5,-26.5
-      parent: 1
-  - uid: 179
-    components:
-    - type: Transform
-      pos: -2.5,-27.5
-      parent: 1
-  - uid: 180
-    components:
-    - type: Transform
-      pos: 1.5,-27.5
-      parent: 1
-  - uid: 181
-    components:
-    - type: Transform
-      pos: -6.5,-28.5
-      parent: 1
-  - uid: 182
-    components:
-    - type: Transform
-      pos: -6.5,-29.5
-      parent: 1
-  - uid: 183
-    components:
-    - type: Transform
-      pos: -2.5,-28.5
-      parent: 1
-  - uid: 184
-    components:
-    - type: Transform
-      pos: -2.5,-29.5
-      parent: 1
-  - uid: 185
-    components:
-    - type: Transform
-      pos: -2.5,-30.5
-      parent: 1
-  - uid: 186
-    components:
-    - type: Transform
-      pos: -3.5,-30.5
-      parent: 1
-  - uid: 187
-    components:
-    - type: Transform
-      pos: -4.5,-30.5
-      parent: 1
-  - uid: 188
-    components:
-    - type: Transform
-      pos: -5.5,-30.5
-      parent: 1
-  - uid: 189
-    components:
-    - type: Transform
-      pos: 1.5,-28.5
-      parent: 1
-  - uid: 190
-    components:
-    - type: Transform
-      pos: 1.5,-29.5
-      parent: 1
-  - uid: 191
-    components:
-    - type: Transform
-      pos: 1.5,-30.5
-      parent: 1
-  - uid: 192
-    components:
-    - type: Transform
-      pos: 2.5,-30.5
-      parent: 1
-  - uid: 193
-    components:
-    - type: Transform
-      pos: 3.5,-30.5
-      parent: 1
-  - uid: 194
-    components:
-    - type: Transform
-      pos: 4.5,-30.5
-      parent: 1
-  - uid: 195
-    components:
-    - type: Transform
-      pos: 5.5,-28.5
-      parent: 1
-  - uid: 196
-    components:
-    - type: Transform
-      pos: 5.5,-29.5
-      parent: 1
-- proto: CableHV
-  entities:
-  - uid: 197
-    components:
-    - type: Transform
-      pos: -2.5,-21.5
-      parent: 1
-  - uid: 198
-    components:
-    - type: Transform
-      pos: -4.5,-26.5
-      parent: 1
-  - uid: 199
-    components:
-    - type: Transform
-      pos: -4.5,-27.5
-      parent: 1
-  - uid: 200
-    components:
-    - type: Transform
-      pos: -5.5,-27.5
-      parent: 1
-  - uid: 201
-    components:
-    - type: Transform
-      pos: -6.5,-27.5
-      parent: 1
-  - uid: 202
-    components:
-    - type: Transform
-      pos: -5.5,-23.5
-      parent: 1
-  - uid: 203
-    components:
-    - type: Transform
-      pos: -5.5,-22.5
-      parent: 1
-  - uid: 204
-    components:
-    - type: Transform
-      pos: -5.5,-20.5
-      parent: 1
-  - uid: 205
-    components:
-    - type: Transform
-      pos: -4.5,-20.5
-      parent: 1
-  - uid: 206
-    components:
-    - type: Transform
-      pos: -5.5,-19.5
-      parent: 1
-  - uid: 207
-    components:
-    - type: Transform
-      pos: -4.5,-19.5
-      parent: 1
-  - uid: 208
-    components:
-    - type: Transform
-      pos: -3.5,-19.5
-      parent: 1
-  - uid: 209
-    components:
-    - type: Transform
-      pos: -5.5,-21.5
-      parent: 1
-  - uid: 210
-    components:
-    - type: Transform
-      pos: -6.5,-26.5
-      parent: 1
-  - uid: 211
-    components:
-    - type: Transform
-      pos: -6.5,-25.5
-      parent: 1
-  - uid: 212
-    components:
-    - type: Transform
-      pos: -6.5,-24.5
-      parent: 1
-  - uid: 213
-    components:
-    - type: Transform
-      pos: -4.5,-23.5
-      parent: 1
-  - uid: 214
-    components:
-    - type: Transform
-      pos: -2.5,-20.5
-      parent: 1
-  - uid: 215
-    components:
-    - type: Transform
-      pos: -2.5,-19.5
-      parent: 1
-  - uid: 216
-    components:
-    - type: Transform
-      pos: -4.5,-25.5
-      parent: 1
-  - uid: 217
-    components:
-    - type: Transform
-      pos: -6.5,-23.5
-      parent: 1
-  - uid: 218
-    components:
-    - type: Transform
-      pos: -6.5,-20.5
-      parent: 1
-  - uid: 219
-    components:
-    - type: Transform
-      pos: -4.5,-24.5
-      parent: 1
-  - uid: 220
-    components:
-    - type: Transform
-      pos: -5.5,-18.5
-      parent: 1
-  - uid: 221
-    components:
-    - type: Transform
-      pos: -4.5,-18.5
-      parent: 1
-  - uid: 222
-    components:
-    - type: Transform
-      pos: -3.5,-18.5
-      parent: 1
-  - uid: 223
-    components:
-    - type: Transform
-      pos: -3.5,-21.5
-      parent: 1
-  - uid: 224
-    components:
-    - type: Transform
-      pos: -4.5,-21.5
-      parent: 1
-- proto: CableMV
-  entities:
-  - uid: 225
-    components:
-    - type: Transform
-      pos: -3.5,-19.5
-      parent: 1
-  - uid: 226
-    components:
-    - type: Transform
-      pos: -3.5,-18.5
-      parent: 1
-  - uid: 227
-    components:
-    - type: Transform
-      pos: -3.5,-17.5
-      parent: 1
-  - uid: 228
-    components:
-    - type: Transform
-      pos: -3.5,-16.5
-      parent: 1
-  - uid: 229
-    components:
-    - type: Transform
-      pos: -2.5,-16.5
-      parent: 1
-  - uid: 230
-    components:
-    - type: Transform
-      pos: -0.5,-16.5
-      parent: 1
-  - uid: 231
-    components:
-    - type: Transform
-      pos: -1.5,-16.5
-      parent: 1
-  - uid: 232
-    components:
-    - type: Transform
-      pos: -0.5,-15.5
-      parent: 1
-  - uid: 233
-    components:
-    - type: Transform
-      pos: -0.5,-14.5
-      parent: 1
-  - uid: 234
-    components:
-    - type: Transform
-      pos: -0.5,-13.5
-      parent: 1
-  - uid: 235
-    components:
-    - type: Transform
-      pos: -0.5,-12.5
-      parent: 1
-  - uid: 236
-    components:
-    - type: Transform
-      pos: -0.5,-11.5
-      parent: 1
-  - uid: 237
-    components:
-    - type: Transform
-      pos: -0.5,-10.5
-      parent: 1
-  - uid: 238
-    components:
-    - type: Transform
-      pos: -0.5,-9.5
-      parent: 1
-  - uid: 239
-    components:
-    - type: Transform
-      pos: -0.5,-8.5
-      parent: 1
-  - uid: 240
-    components:
-    - type: Transform
-      pos: -3.5,-20.5
-      parent: 1
-  - uid: 241
-    components:
-    - type: Transform
-      pos: -3.5,-21.5
-      parent: 1
-  - uid: 242
-    components:
-    - type: Transform
-      pos: -4.5,-21.5
-      parent: 1
-  - uid: 243
-    components:
-    - type: Transform
-      pos: -4.5,-22.5
-      parent: 1
-  - uid: 244
-    components:
-    - type: Transform
-      pos: -4.5,-23.5
-      parent: 1
-  - uid: 245
-    components:
-    - type: Transform
-      pos: -4.5,-24.5
-      parent: 1
-  - uid: 246
-    components:
-    - type: Transform
-      pos: -4.5,-25.5
-      parent: 1
-  - uid: 247
-    components:
-    - type: Transform
-      pos: -4.5,-26.5
-      parent: 1
-  - uid: 248
-    components:
-    - type: Transform
-      pos: -4.5,-27.5
-      parent: 1
-  - uid: 249
-    components:
-    - type: Transform
-      pos: 1.5,-8.5
-      parent: 1
-  - uid: 250
-    components:
-    - type: Transform
-      pos: 0.5,-8.5
-      parent: 1
-- proto: CableTerminal
-  entities:
-  - uid: 251
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-20.5
-      parent: 1
-    - type: Physics
-      canCollide: False
-    - type: Fixtures
-      fixtures: {}
-  - uid: 252
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,-20.5
-      parent: 1
-    - type: Physics
-      canCollide: False
-    - type: Fixtures
-      fixtures: {}
-- proto: Carpet
-  entities:
-  - uid: 253
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-5.5
-      parent: 1
-  - uid: 254
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-4.5
-      parent: 1
-- proto: Catwalk
-  entities:
-  - uid: 255
-    components:
-    - type: Transform
-      pos: -2.5,-26.5
-      parent: 1
-  - uid: 256
-    components:
-    - type: Transform
-      pos: -2.5,-28.5
-      parent: 1
-  - uid: 257
-    components:
-    - type: Transform
-      pos: -8.5,-16.5
-      parent: 1
-  - uid: 258
-    components:
-    - type: Transform
-      pos: -1.5,-16.5
-      parent: 1
-  - uid: 259
-    components:
-    - type: Transform
-      pos: -2.5,-16.5
-      parent: 1
-  - uid: 260
-    components:
-    - type: Transform
-      pos: 4.5,-24.5
-      parent: 1
-  - uid: 261
-    components:
-    - type: Transform
-      pos: 5.5,-24.5
-      parent: 1
-  - uid: 262
-    components:
-    - type: Transform
-      pos: -6.5,-16.5
-      parent: 1
-  - uid: 263
-    components:
-    - type: Transform
-      pos: -7.5,-16.5
-      parent: 1
-  - uid: 264
-    components:
-    - type: Transform
-      pos: -4.5,-13.5
-      parent: 1
-  - uid: 265
-    components:
-    - type: Transform
-      pos: -4.5,-12.5
-      parent: 1
-  - uid: 266
-    components:
-    - type: Transform
-      pos: -4.5,-11.5
-      parent: 1
-  - uid: 267
-    components:
-    - type: Transform
-      pos: 3.5,-13.5
-      parent: 1
-  - uid: 268
-    components:
-    - type: Transform
-      pos: 3.5,-12.5
-      parent: 1
-  - uid: 269
-    components:
-    - type: Transform
-      pos: 3.5,-11.5
-      parent: 1
-  - uid: 270
-    components:
-    - type: Transform
-      pos: 5.5,-16.5
-      parent: 1
-  - uid: 271
-    components:
-    - type: Transform
-      pos: 6.5,-16.5
-      parent: 1
-  - uid: 272
-    components:
-    - type: Transform
-      pos: -0.5,-24.5
-      parent: 1
-  - uid: 273
-    components:
-    - type: Transform
-      pos: -0.5,-23.5
-      parent: 1
-  - uid: 274
-    components:
-    - type: Transform
-      pos: -0.5,-16.5
-      parent: 1
-  - uid: 275
-    components:
-    - type: Transform
-      pos: 5.5,-9.5
-      parent: 1
-  - uid: 276
-    components:
-    - type: Transform
-      pos: 3.5,-9.5
-      parent: 1
-  - uid: 277
-    components:
-    - type: Transform
-      pos: 0.5,-16.5
-      parent: 1
-  - uid: 278
-    components:
-    - type: Transform
-      pos: 0.5,-26.5
-      parent: 1
-  - uid: 279
-    components:
-    - type: Transform
-      pos: 1.5,-27.5
-      parent: 1
-  - uid: 280
-    components:
-    - type: Transform
-      pos: -2.5,-27.5
-      parent: 1
-  - uid: 281
-    components:
-    - type: Transform
-      pos: -2.5,-29.5
-      parent: 1
-  - uid: 282
-    components:
-    - type: Transform
-      pos: 1.5,-26.5
-      parent: 1
-  - uid: 283
-    components:
-    - type: Transform
-      pos: 4.5,-9.5
-      parent: 1
-  - uid: 284
-    components:
-    - type: Transform
-      pos: -0.5,-26.5
-      parent: 1
-  - uid: 285
-    components:
-    - type: Transform
-      pos: 1.5,-28.5
-      parent: 1
-  - uid: 286
-    components:
-    - type: Transform
-      pos: 1.5,-29.5
-      parent: 1
-  - uid: 287
-    components:
-    - type: Transform
-      pos: -1.5,-26.5
-      parent: 1
-  - uid: 288
-    components:
-    - type: Transform
-      pos: -3.5,-9.5
-      parent: 1
-  - uid: 289
-    components:
-    - type: Transform
-      pos: 1.5,-16.5
-      parent: 1
-  - uid: 290
-    components:
-    - type: Transform
-      pos: 2.5,-9.5
-      parent: 1
-  - uid: 291
-    components:
-    - type: Transform
-      pos: -6.5,-9.5
-      parent: 1
-  - uid: 292
-    components:
-    - type: Transform
-      pos: -5.5,-9.5
-      parent: 1
-  - uid: 293
-    components:
-    - type: Transform
-      pos: -4.5,-9.5
-      parent: 1
-  - uid: 294
-    components:
-    - type: Transform
-      pos: 7.5,-16.5
-      parent: 1
-  - uid: 295
-    components:
-    - type: Transform
-      pos: -0.5,-13.5
-      parent: 1
-  - uid: 296
-    components:
-    - type: Transform
-      pos: -0.5,-12.5
-      parent: 1
-  - uid: 297
-    components:
-    - type: Transform
-      pos: -0.5,-11.5
-      parent: 1
-- proto: Chair
-  entities:
-  - uid: 298
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-21.5
-      parent: 1
-  - uid: 299
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,-21.5
-      parent: 1
-- proto: ChairOfficeDark
-  entities:
-  - uid: 300
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,-3.5
-      parent: 1
-- proto: ChairPilotSeat
-  entities:
-  - uid: 301
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-21.5
-      parent: 1
-  - uid: 302
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-8.5
-      parent: 1
-  - uid: 303
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-9.5
-      parent: 1
-  - uid: 304
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-10.5
-      parent: 1
-  - uid: 305
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-8.5
-      parent: 1
-  - uid: 306
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-10.5
-      parent: 1
-  - uid: 307
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-9.5
-      parent: 1
-  - uid: 308
-    components:
-    - type: Transform
-      pos: -2.5,-15.5
-      parent: 1
-  - uid: 309
-    components:
-    - type: Transform
-      pos: -1.5,-15.5
-      parent: 1
-  - uid: 310
-    components:
-    - type: Transform
-      pos: 0.5,-15.5
-      parent: 1
-  - uid: 311
-    components:
-    - type: Transform
-      pos: 1.5,-15.5
-      parent: 1
-  - uid: 312
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,-3.5
-      parent: 1
-- proto: CigPackSyndicate
-  entities:
-  - uid: 313
-    components:
-    - type: Transform
-      pos: -3.5658307,-17.516623
-      parent: 1
-- proto: ClothingBackpackDuffelSyndicateFilledMedical
-  entities:
-  - uid: 314
-    components:
-    - type: Transform
-      pos: -3.5044222,-6.293252
-      parent: 1
-- proto: ClothingHeadHatSyndie
-  entities:
-  - uid: 315
-    components:
-    - type: Transform
-      pos: -3.1200604,-17.289778
-      parent: 1
-- proto: ClothingHeadHatSyndieMAA
-  entities:
-  - uid: 35
-    components:
-    - type: Transform
-      parent: 33
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: ClothingHeadPyjamaSyndicateRed
-  entities:
-  - uid: 36
-    components:
-    - type: Transform
-      parent: 33
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: ClothingHeadsetAltSyndicate
-  entities:
-  - uid: 316
-    components:
-    - type: Transform
-      pos: 1.3157192,-13.513277
-      parent: 1
-- proto: ClothingMaskGasSyndicate
-  entities:
-  - uid: 317
-    components:
-    - type: Transform
-      pos: 0.94071925,-13.482027
-      parent: 1
-- proto: ClothingNeckMantleHOS
-  entities:
-  - uid: 37
-    components:
-    - type: MetaData
-      desc: Looted from a fallen enemy, the commander earned this in battle.
-      name: commander mantle
-    - type: Transform
-      parent: 33
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: ClothingOuterCoatSyndieCap
-  entities:
-  - uid: 38
-    components:
-    - type: Transform
-      parent: 33
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: ClothingUniformJumpskirtSyndieFormalDress
-  entities:
-  - uid: 39
-    components:
-    - type: Transform
-      parent: 33
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: ClothingUniformJumpsuitPyjamaSyndicateRed
-  entities:
-  - uid: 40
-    components:
-    - type: Transform
-      parent: 33
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: ClothingUniformJumpsuitSyndieFormal
-  entities:
-  - uid: 41
-    components:
-    - type: Transform
-      parent: 33
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: ComfyChair
-  entities:
-  - uid: 318
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-4.5
-      parent: 1
-- proto: computerBodyScanner
-  entities:
-  - uid: 319
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,-5.5
-      parent: 1
-- proto: ComputerIFFSyndicate
-  entities:
-  - uid: 320
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-3.5
-      parent: 1
-- proto: ComputerPowerMonitoring
-  entities:
-  - uid: 321
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-21.5
-      parent: 1
-- proto: ComputerRadar
-  entities:
-  - uid: 322
-    components:
-    - type: Transform
-      pos: 0.5,-2.5
-      parent: 1
-- proto: ComputerShuttleSyndie
-  entities:
-  - uid: 323
-    components:
-    - type: Transform
-      pos: -0.5,-2.5
-      parent: 1
-- proto: CrowbarRed
-  entities:
-  - uid: 324
-    components:
-    - type: Transform
-      pos: -3.492848,-22.485775
-      parent: 1
-- proto: DisposalBend
-  entities:
-  - uid: 325
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-6.5
-      parent: 1
-- proto: DisposalJunction
-  entities:
-  - uid: 326
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-19.5
-      parent: 1
-- proto: DisposalPipe
-  entities:
-  - uid: 327
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,-6.5
-      parent: 1
-  - uid: 328
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-19.5
-      parent: 1
-  - uid: 329
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-19.5
-      parent: 1
-  - uid: 330
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-19.5
-      parent: 1
-  - uid: 331
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,-19.5
-      parent: 1
-  - uid: 332
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -5.5,-19.5
-      parent: 1
-  - uid: 333
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,-19.5
-      parent: 1
-  - uid: 334
-    components:
-    - type: Transform
-      pos: -0.5,-18.5
-      parent: 1
-  - uid: 335
-    components:
-    - type: Transform
-      pos: -0.5,-17.5
-      parent: 1
-  - uid: 336
-    components:
-    - type: Transform
-      pos: -0.5,-16.5
-      parent: 1
-  - uid: 337
-    components:
-    - type: Transform
-      pos: -0.5,-15.5
-      parent: 1
-  - uid: 338
-    components:
-    - type: Transform
-      pos: -0.5,-14.5
-      parent: 1
-  - uid: 339
-    components:
-    - type: Transform
-      pos: -0.5,-13.5
-      parent: 1
-  - uid: 340
-    components:
-    - type: Transform
-      pos: -0.5,-12.5
-      parent: 1
-  - uid: 341
-    components:
-    - type: Transform
-      pos: -0.5,-11.5
-      parent: 1
-  - uid: 342
-    components:
-    - type: Transform
-      pos: -0.5,-10.5
-      parent: 1
-  - uid: 343
-    components:
-    - type: Transform
-      pos: -0.5,-9.5
-      parent: 1
-  - uid: 344
-    components:
-    - type: Transform
-      pos: -0.5,-8.5
-      parent: 1
-  - uid: 345
-    components:
-    - type: Transform
-      pos: -0.5,-7.5
-      parent: 1
-- proto: DisposalTrunk
-  entities:
-  - uid: 346
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-6.5
-      parent: 1
-  - uid: 347
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -7.5,-19.5
-      parent: 1
-  - uid: 348
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-19.5
-      parent: 1
-- proto: DisposalUnit
-  entities:
-  - uid: 349
-    components:
-    - type: Transform
-      pos: 1.5,-6.5
-      parent: 1
-  - uid: 350
-    components:
-    - type: Transform
-      pos: 0.5,-19.5
-      parent: 1
-- proto: DoubleEmergencyOxygenTankFilled
-  entities:
-  - uid: 351
-    components:
-    - type: Transform
-      pos: -1.6924903,-23.407444
-      parent: 1
-  - uid: 352
-    components:
-    - type: Transform
-      pos: -1.4112403,-23.458082
-      parent: 1
-  - uid: 353
-    components:
-    - type: Transform
-      pos: 5.390987,-17.346693
-      parent: 1
-  - uid: 354
-    components:
-    - type: Transform
-      pos: -6.6334953,-17.346693
-      parent: 1
-- proto: DrinkGlass
-  entities:
-  - uid: 355
-    components:
-    - type: Transform
-      pos: 2.0779252,-19.21155
-      parent: 1
-  - uid: 356
-    components:
-    - type: Transform
-      pos: 2.3123002,-19.21155
-      parent: 1
-- proto: DrinkMugDog
-  entities:
-  - uid: 357
-    components:
-    - type: Transform
-      pos: 2.2843437,-19.542192
-      parent: 1
-- proto: DrinkMugMetal
-  entities:
-  - uid: 358
-    components:
-    - type: Transform
-      pos: 2.0968437,-19.526567
-      parent: 1
-- proto: DrinkMugRed
-  entities:
-  - uid: 359
-    components:
-    - type: Transform
-      pos: 1.9918958,-17.588755
-      parent: 1
-- proto: DrinkVacuumFlask
-  entities:
-  - uid: 360
-    components:
-    - type: Transform
-      pos: 5.6435027,-21.180143
-      parent: 1
-  - uid: 361
-    components:
-    - type: Transform
-      pos: 5.7372527,-21.398893
-      parent: 1
-- proto: ExtendedEmergencyOxygenTankFilled
-  entities:
-  - uid: 362
-    components:
-    - type: Transform
-      pos: -5.678572,-12.319441
-      parent: 1
-  - uid: 363
-    components:
-    - type: Transform
-      pos: 4.305803,-12.272566
-      parent: 1
-- proto: FireAxeFlaming
-  entities:
-  - uid: 23
-    components:
-    - type: Transform
-      pos: -1.5018963,-3.4569345
-      parent: 1
-- proto: FoodBoxDonkpocketPizza
-  entities:
-  - uid: 364
-    components:
-    - type: Transform
-      pos: 2.7185502,-19.320925
-      parent: 1
-- proto: FoodBoxDonut
-  entities:
-  - uid: 365
-    components:
-    - type: Transform
-      pos: 5.5401826,-21.187487
-      parent: 1
-- proto: FoodPizzaDonkpocket
-  entities:
-  - uid: 366
-    components:
-    - type: Transform
-      pos: 1.4776825,-21.296862
-      parent: 1
-- proto: FoodSnackSyndi
-  entities:
-  - uid: 367
-    components:
-    - type: Transform
-      pos: 1.5361897,-17.367903
-      parent: 1
-- proto: GasMinerNitrogen
-  entities:
-  - uid: 368
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-27.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-- proto: GasMinerOxygen
-  entities:
-  - uid: 369
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-27.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-- proto: GasMixer
-  entities:
-  - uid: 370
-    components:
-    - type: MetaData
-      name: O2+N2 mixer
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-24.5
-      parent: 1
-    - type: GasMixer
-      inletTwoConcentration: 0.78
-      inletOneConcentration: 0.22
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-- proto: GasPassiveVent
-  entities:
-  - uid: 371
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-26.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-  - uid: 372
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-26.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-  - uid: 373
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-19.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-- proto: GasPipeBend
-  entities:
-  - uid: 374
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-5.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 375
-    components:
-    - type: Transform
-      pos: 5.5,-24.5
-      parent: 1
-  - uid: 376
-    components:
-    - type: Transform
-      pos: 3.5,-20.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 377
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-20.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 378
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-5.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 379
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-4.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 380
-    components:
-    - type: Transform
-      pos: 0.5,-8.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 381
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-8.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 382
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-4.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 383
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-21.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-- proto: GasPipeFourway
-  entities:
-  - uid: 384
-    components:
-    - type: Transform
-      pos: 3.5,-23.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 385
-    components:
-    - type: Transform
-      pos: -0.5,-20.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 386
-    components:
-    - type: Transform
-      pos: -0.5,-16.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 387
-    components:
-    - type: Transform
-      pos: 0.5,-17.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-- proto: GasPipeStraight
-  entities:
-  - uid: 388
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-25.5
-      parent: 1
-  - uid: 389
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-25.5
-      parent: 1
-  - uid: 390
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-24.5
-      parent: 1
-  - uid: 391
-    components:
-    - type: Transform
-      pos: 3.5,-22.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 392
-    components:
-    - type: Transform
-      pos: 3.5,-21.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 393
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-20.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 394
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-20.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 395
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-20.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 396
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-20.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 397
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-20.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 398
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-20.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 399
-    components:
-    - type: Transform
-      pos: -0.5,-19.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 400
-    components:
-    - type: Transform
-      pos: -0.5,-18.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 401
-    components:
-    - type: Transform
-      pos: -0.5,-17.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 402
-    components:
-    - type: Transform
-      pos: -0.5,-15.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 403
-    components:
-    - type: Transform
-      pos: -0.5,-14.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 404
-    components:
-    - type: Transform
-      pos: -0.5,-13.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 405
-    components:
-    - type: Transform
-      pos: -0.5,-12.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 406
-    components:
-    - type: Transform
-      pos: -0.5,-10.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 407
-    components:
-    - type: Transform
-      pos: -0.5,-9.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 408
-    components:
-    - type: Transform
-      pos: -0.5,-8.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 409
-    components:
-    - type: Transform
-      pos: -0.5,-7.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 410
-    components:
-    - type: Transform
-      pos: -0.5,-6.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 411
-    components:
-    - type: Transform
-      pos: 0.5,-18.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 412
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-16.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 413
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-16.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 414
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-16.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 415
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-16.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 416
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-16.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 417
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-16.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 418
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-19.5
-      parent: 1
-  - uid: 419
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,-19.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 420
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-19.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 421
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-6.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 422
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-17.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 423
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-17.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 424
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-17.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 425
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-17.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 426
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-17.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 427
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-17.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 428
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-16.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 429
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-15.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 430
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-14.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 431
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-13.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 432
-    components:
-    - type: Transform
-      pos: 0.5,-11.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 433
-    components:
-    - type: Transform
-      pos: 0.5,-10.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 434
-    components:
-    - type: Transform
-      pos: 0.5,-9.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 435
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-8.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 436
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-7.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 437
-    components:
-    - type: Transform
-      pos: 0.5,-20.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 438
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-21.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 439
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-21.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 440
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-21.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 441
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-5.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 442
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-4.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-- proto: GasPipeTJunction
-  entities:
-  - uid: 443
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-11.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 444
-    components:
-    - type: Transform
-      pos: 2.5,-19.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 445
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,-19.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 446
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,-12.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-- proto: GasPort
-  entities:
-  - uid: 447
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,-23.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-- proto: GasPressurePump
-  entities:
-  - uid: 448
-    components:
-    - type: MetaData
-      name: waste pump
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-19.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-- proto: GasVentPump
-  entities:
-  - uid: 449
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-11.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 450
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,-21.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 451
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-23.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 452
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,-21.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 453
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-16.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 454
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-16.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 455
-    components:
-    - type: Transform
-      pos: 0.5,-3.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-- proto: GasVentScrubber
-  entities:
-  - uid: 456
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-12.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 457
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-17.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 458
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,-20.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 459
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-17.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 460
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,-21.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 461
-    components:
-    - type: Transform
-      pos: -0.5,-3.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-- proto: GeneratorBasic15kW
-  entities:
-  - uid: 462
-    components:
-    - type: Transform
-      pos: -4.5,-26.5
-      parent: 1
-  - uid: 463
-    components:
-    - type: Transform
-      pos: -4.5,-25.5
-      parent: 1
-  - uid: 464
-    components:
-    - type: Transform
-      pos: -4.5,-24.5
-      parent: 1
-  - uid: 465
-    components:
-    - type: Transform
-      pos: -6.5,-24.5
-      parent: 1
-  - uid: 466
-    components:
-    - type: Transform
-      pos: -6.5,-25.5
-      parent: 1
-  - uid: 467
-    components:
-    - type: Transform
-      pos: -6.5,-26.5
-      parent: 1
-- proto: GeneratorWallmountAPU
-  entities:
-  - uid: 468
-    components:
-    - type: Transform
-      pos: -6.5,-20.5
-      parent: 1
-- proto: GravityGeneratorMini
-  entities:
-  - uid: 469
-    components:
-    - type: Transform
-      pos: -5.5,-22.5
-      parent: 1
-- proto: Grille
-  entities:
-  - uid: 470
-    components:
-    - type: Transform
-      pos: 2.5,-12.5
-      parent: 1
-  - uid: 471
-    components:
-    - type: Transform
-      pos: -3.5,-12.5
-      parent: 1
-  - uid: 472
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-7.5
-      parent: 1
-  - uid: 473
-    components:
-    - type: Transform
-      pos: -2.5,-1.5
-      parent: 1
-  - uid: 474
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 1
-  - uid: 475
-    components:
-    - type: Transform
-      pos: -4.5,-2.5
-      parent: 1
-  - uid: 476
-    components:
-    - type: Transform
-      pos: -6.5,-4.5
-      parent: 1
-  - uid: 477
-    components:
-    - type: Transform
-      pos: 3.5,-2.5
-      parent: 1
-  - uid: 478
-    components:
-    - type: Transform
-      pos: -1.5,-1.5
-      parent: 1
-  - uid: 479
-    components:
-    - type: Transform
-      pos: 5.5,-4.5
-      parent: 1
-  - uid: 480
-    components:
-    - type: Transform
-      pos: 0.5,-1.5
-      parent: 1
-  - uid: 481
-    components:
-    - type: Transform
-      pos: 1.5,-9.5
-      parent: 1
-  - uid: 482
-    components:
-    - type: Transform
-      pos: -2.5,-9.5
-      parent: 1
-  - uid: 483
-    components:
-    - type: Transform
-      pos: 1.5,-1.5
-      parent: 1
-  - uid: 484
-    components:
-    - type: Transform
-      pos: -2.5,-21.5
-      parent: 1
-  - uid: 485
-    components:
-    - type: Transform
-      pos: -2.5,-19.5
-      parent: 1
-  - uid: 486
-    components:
-    - type: Transform
-      pos: 2.5,-22.5
-      parent: 1
-  - uid: 487
-    components:
-    - type: Transform
-      pos: 4.5,-22.5
-      parent: 1
-  - uid: 488
-    components:
-    - type: Transform
-      pos: -1.5,-18.5
-      parent: 1
-  - uid: 489
-    components:
-    - type: Transform
-      pos: 0.5,-7.5
-      parent: 1
-  - uid: 490
-    components:
-    - type: Transform
-      pos: 3.5,-25.5
-      parent: 1
-  - uid: 491
-    components:
-    - type: Transform
-      pos: 5.5,-25.5
-      parent: 1
-  - uid: 492
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-19.5
-      parent: 1
-  - uid: 493
-    components:
-    - type: Transform
-      pos: 0.5,-18.5
-      parent: 1
-- proto: Gyroscope
-  entities:
-  - uid: 494
-    components:
-    - type: Transform
-      pos: -5.5,-13.5
-      parent: 1
-  - uid: 495
-    components:
-    - type: Transform
-      pos: 4.5,-13.5
-      parent: 1
-- proto: HospitalCurtainsOpen
-  entities:
-  - uid: 496
-    components:
-    - type: Transform
-      pos: 3.5,-3.5
-      parent: 1
-- proto: KitchenMicrowave
-  entities:
-  - uid: 497
-    components:
-    - type: Transform
-      pos: 3.5,-19.5
-      parent: 1
-- proto: KnifePlastic
-  entities:
-  - uid: 498
-    components:
-    - type: Transform
-      pos: 5.3509636,-21.445768
-      parent: 1
-- proto: Lamp
-  entities:
-  - uid: 499
-    components:
-    - type: Transform
-      pos: -1.483297,-2.2444057
-      parent: 1
-- proto: LockerSyndicatePersonal
-  entities:
-  - uid: 33
-    components:
-    - type: Transform
-      pos: 4.5,-5.5
-      parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1496
-        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:
-          - 37
-          - 39
-          - 36
-          - 40
-          - 41
-          - 38
-          - 35
-          - 34
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-- proto: MedicalBed
-  entities:
-  - uid: 500
-    components:
-    - type: Transform
-      pos: -4.5,-3.5
-      parent: 1
-- proto: MedkitCombatFilled
-  entities:
-  - uid: 501
-    components:
-    - type: Transform
-      pos: -3.401462,-3.5350046
-      parent: 1
-  - uid: 502
-    components:
-    - type: Transform
-      pos: -3.557712,-3.4256296
-      parent: 1
-- proto: Mirror
-  entities:
-  - uid: 503
-    components:
-    - type: Transform
-      pos: 4.5,-3.5
-      parent: 1
-- proto: Multitool
-  entities:
-  - uid: 504
-    components:
-    - type: Transform
-      pos: -3.383473,-22.548275
-      parent: 1
-- proto: NitrogenTankFilled
-  entities:
-  - uid: 505
-    components:
-    - type: Transform
-      pos: 4.633928,-12.616316
-      parent: 1
-  - uid: 506
-    components:
-    - type: Transform
-      pos: -5.397322,-12.569441
-      parent: 1
-  - uid: 507
-    components:
-    - type: Transform
-      pos: -6.3522453,-17.549818
-      parent: 1
-  - uid: 508
-    components:
-    - type: Transform
-      pos: 5.6633797,-17.565443
-      parent: 1
-- proto: NuclearBombUnanchored
-  entities:
-  - uid: 509
-    components:
-    - type: Transform
-      pos: -2.5,-12.5
-      parent: 1
-- proto: NukeCodePaper
-  entities:
-  - uid: 510
-    components:
-    - type: Transform
-      pos: -2.5286522,-11.44479
-      parent: 1
-- proto: Ointment
-  entities:
-  - uid: 511
-    components:
-    - type: Transform
-      pos: -3.651462,-4.5193796
-      parent: 1
-  - uid: 512
-    components:
-    - type: Transform
-      pos: -3.667087,-4.2225046
-      parent: 1
-- proto: OperatingTable
-  entities:
-  - uid: 513
-    components:
-    - type: Transform
-      pos: -5.5,-4.5
-      parent: 1
-- proto: OxygenCanister
-  entities:
-  - uid: 514
-    components:
-    - type: Transform
-      pos: -1.5,-24.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-- proto: OxygenTankFilled
-  entities:
-  - uid: 515
-    components:
-    - type: Transform
-      pos: -5.600447,-12.569441
-      parent: 1
-  - uid: 516
-    components:
-    - type: Transform
-      pos: 4.399553,-12.522566
-      parent: 1
-  - uid: 517
-    components:
-    - type: Transform
-      pos: 5.5227547,-17.440443
-      parent: 1
-  - uid: 518
-    components:
-    - type: Transform
-      pos: -6.4928703,-17.440443
-      parent: 1
-- proto: PinpointerNuclear
-  entities:
-  - uid: 519
-    components:
-    - type: Transform
-      pos: -2.4942985,-13.37949
-      parent: 1
-- proto: PlasmaReinforcedWindowDirectional
-  entities:
-  - uid: 520
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-4.5
-      parent: 1
-  - uid: 521
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-6.5
-      parent: 1
-  - uid: 522
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-3.5
-      parent: 1
-- proto: PlushieNuke
-  entities:
-  - uid: 523
-    components:
-    - type: Transform
-      pos: -2.4227936,-2.3320491
-      parent: 1
-- proto: PosterContrabandC20r
-  entities:
-  - uid: 524
-    components:
-    - type: Transform
-      pos: 1.5,-14.5
-      parent: 1
-- proto: PosterContrabandCC64KAd
-  entities:
-  - uid: 525
-    components:
-    - type: Transform
-      pos: -5.5,-18.5
-      parent: 1
-- proto: PosterContrabandCybersun600
-  entities:
-  - uid: 526
-    components:
-    - type: Transform
-      pos: 2.5,-6.5
-      parent: 1
-- proto: PosterContrabandDonk
-  entities:
-  - uid: 527
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-18.5
-      parent: 1
-- proto: PosterContrabandDonutCorp
-  entities:
-  - uid: 528
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-22.5
-      parent: 1
-- proto: PosterContrabandEnergySwords
-  entities:
-  - uid: 529
-    components:
-    - type: Transform
-      pos: 2.5,-18.5
-      parent: 1
-- proto: PosterContrabandEnlistGorlex
-  entities:
-  - uid: 530
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,-13.5
-      parent: 1
-- proto: PosterContrabandFreeSyndicateEncryptionKey
-  entities:
-  - uid: 531
-    components:
-    - type: Transform
-      pos: -2.5,-8.5
-      parent: 1
-- proto: PosterContrabandInterdyne
-  entities:
-  - uid: 532
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,-6.5
-      parent: 1
-- proto: PosterContrabandKosmicheskayaStantsiya
-  entities:
-  - uid: 533
-    components:
-    - type: Transform
-      pos: -2.5,-22.5
-      parent: 1
-- proto: PosterContrabandMoth
-  entities:
-  - uid: 534
-    components:
-    - type: Transform
-      pos: -2.5,-14.5
-      parent: 1
-  - uid: 535
-    components:
-    - type: Transform
-      pos: 2.5,-3.5
-      parent: 1
-- proto: PosterContrabandNuclearDeviceInformational
-  entities:
-  - uid: 536
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,-13.5
-      parent: 1
-  - uid: 537
-    components:
-    - type: Transform
-      pos: 0.5,-14.5
-      parent: 1
-- proto: PosterContrabandSyndicatePistol
-  entities:
-  - uid: 538
-    components:
-    - type: Transform
-      pos: 1.5,-10.5
-      parent: 1
-- proto: PosterContrabandSyndicateRecruitment
-  entities:
-  - uid: 539
-    components:
-    - type: Transform
-      pos: -1.5,-14.5
-      parent: 1
-- proto: PosterContrabandWaffleCorp
-  entities:
-  - uid: 540
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,-23.5
-      parent: 1
-- proto: Poweredlight
-  entities:
-  - uid: 541
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-8.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 542
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-4.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 543
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -6.5,-23.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 544
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -6.5,-26.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 545
-    components:
-    - type: Transform
-      pos: -4.5,-19.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 546
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-13.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 547
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-27.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 548
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-27.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 549
-    components:
-    - type: Transform
-      pos: 2.5,-15.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 550
-    components:
-    - type: Transform
-      pos: -3.5,-15.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 551
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,-5.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 552
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-2.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 553
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-6.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-- proto: PoweredSmallLight
-  entities:
-  - uid: 554
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-13.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 555
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-21.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 556
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-5.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 557
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-24.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 558
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-13.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 559
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-24.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 560
-    components:
-    - type: Transform
-      pos: -6.5,-15.5
-      parent: 1
-  - uid: 561
-    components:
-    - type: Transform
-      pos: 5.5,-15.5
-      parent: 1
-  - uid: 562
-    components:
-    - type: Transform
-      pos: 2.5,-19.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 563
-    components:
-    - type: Transform
-      pos: -1.5,-26.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 564
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-9.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 565
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-9.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-- proto: Rack
-  entities:
-  - uid: 566
-    components:
-    - type: Transform
-      pos: -3.5,-22.5
-      parent: 1
-  - uid: 567
-    components:
-    - type: Transform
-      pos: 5.5,-23.5
-      parent: 1
-  - uid: 568
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-12.5
-      parent: 1
-  - uid: 569
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-12.5
-      parent: 1
-  - uid: 570
-    components:
-    - type: Transform
-      pos: -1.5,-23.5
-      parent: 1
-  - uid: 571
-    components:
-    - type: Transform
-      pos: -6.5,-17.5
-      parent: 1
-  - uid: 572
-    components:
-    - type: Transform
-      pos: 5.5,-17.5
-      parent: 1
-- proto: ReinforcedPlasmaWindow
-  entities:
-  - uid: 573
-    components:
-    - type: Transform
-      pos: 3.5,-2.5
-      parent: 1
-  - uid: 574
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-19.5
-      parent: 1
-  - uid: 575
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 1
-  - uid: 576
-    components:
-    - type: Transform
-      pos: -6.5,-4.5
-      parent: 1
-  - uid: 577
-    components:
-    - type: Transform
-      pos: -2.5,-1.5
-      parent: 1
-  - uid: 578
-    components:
-    - type: Transform
-      pos: -4.5,-2.5
-      parent: 1
-  - uid: 579
-    components:
-    - type: Transform
-      pos: 5.5,-4.5
-      parent: 1
-  - uid: 580
-    components:
-    - type: Transform
-      pos: -1.5,-1.5
-      parent: 1
-  - uid: 581
-    components:
-    - type: Transform
-      pos: 0.5,-1.5
-      parent: 1
-  - uid: 582
-    components:
-    - type: Transform
-      pos: 1.5,-1.5
-      parent: 1
-  - uid: 583
-    components:
-    - type: Transform
-      pos: -1.5,-7.5
-      parent: 1
-  - uid: 584
-    components:
-    - type: Transform
-      pos: 4.5,-22.5
-      parent: 1
-  - uid: 585
-    components:
-    - type: Transform
-      pos: 2.5,-22.5
-      parent: 1
-  - uid: 586
-    components:
-    - type: Transform
-      pos: -2.5,-21.5
-      parent: 1
-  - uid: 587
-    components:
-    - type: Transform
-      pos: -2.5,-19.5
-      parent: 1
-  - uid: 588
-    components:
-    - type: Transform
-      pos: -2.5,-9.5
-      parent: 1
-  - uid: 589
-    components:
-    - type: Transform
-      pos: 1.5,-9.5
-      parent: 1
-  - uid: 590
-    components:
-    - type: Transform
-      pos: 0.5,-18.5
-      parent: 1
-  - uid: 591
-    components:
-    - type: Transform
-      pos: 3.5,-25.5
-      parent: 1
-  - uid: 592
-    components:
-    - type: Transform
-      pos: 5.5,-25.5
-      parent: 1
-  - uid: 593
-    components:
-    - type: Transform
-      pos: 2.5,-12.5
-      parent: 1
-  - uid: 594
-    components:
-    - type: Transform
-      pos: -3.5,-12.5
-      parent: 1
-  - uid: 595
-    components:
-    - type: Transform
-      pos: 0.5,-7.5
-      parent: 1
-  - uid: 596
-    components:
-    - type: Transform
-      pos: -1.5,-18.5
-      parent: 1
-- proto: ShuttersNormalOpen
-  entities:
-  - uid: 597
-    components:
-    - type: Transform
-      pos: -6.5,-4.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 21
-  - uid: 598
-    components:
-    - type: Transform
-      pos: 5.5,-4.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 20
-  - uid: 599
-    components:
-    - type: Transform
-      pos: 1.5,-9.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 609
-  - uid: 600
-    components:
-    - type: Transform
-      pos: -2.5,-9.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 609
-  - uid: 601
-    components:
-    - type: Transform
-      pos: -4.5,-2.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 21
-  - uid: 602
-    components:
-    - type: Transform
-      pos: 3.5,-2.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 20
-  - uid: 603
-    components:
-    - type: Transform
-      pos: 1.5,-1.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 21
-  - uid: 604
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 21
-  - uid: 605
-    components:
-    - type: Transform
-      pos: 5.5,-19.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 611
-  - uid: 606
-    components:
-    - type: Transform
-      pos: -1.5,-1.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 21
-  - uid: 607
-    components:
-    - type: Transform
-      pos: 0.5,-1.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 21
-  - uid: 608
-    components:
-    - type: Transform
-      pos: -2.5,-1.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 21
-- proto: SignalButton
-  entities:
-  - uid: 609
-    components:
-    - type: Transform
-      pos: -2.5,-10.5
-      parent: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        600:
-        - Pressed: Toggle
-        599:
-        - Pressed: Toggle
-  - uid: 611
-    components:
-    - type: Transform
-      pos: 5.5,-20.5
-      parent: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        605:
-        - Pressed: Toggle
-- proto: SignalButtonDirectional
-  entities:
-  - uid: 20
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,-4.5
-      parent: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        602:
-        - Pressed: Toggle
-        598:
-        - Pressed: Toggle
-  - uid: 21
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,-7.5
-      parent: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        597:
-        - Pressed: Toggle
-        601:
-        - Pressed: Toggle
-        608:
-        - Pressed: Toggle
-        606:
-        - Pressed: Toggle
-        604:
-        - Pressed: Toggle
-        607:
-        - Pressed: Toggle
-        603:
-        - Pressed: Toggle
-- proto: SignDirectionalEvac
-  entities:
-  - uid: 613
-    components:
-    - type: Transform
-      pos: 0.5,-22.5
-      parent: 1
-  - uid: 614
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-15.5
-      parent: 1
-  - uid: 615
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-14.5
-      parent: 1
-  - uid: 616
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-14.5
-      parent: 1
-  - uid: 617
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -5.5,-15.5
-      parent: 1
-- proto: SignElectricalMed
-  entities:
-  - uid: 618
-    components:
-    - type: Transform
-      pos: -2.5,-18.5
-      parent: 1
-- proto: SignNosmoking
-  entities:
-  - uid: 619
-    components:
-    - type: Transform
-      pos: 5.5,-22.5
-      parent: 1
-- proto: SignSecureSmallRed
-  entities:
-  - uid: 620
-    components:
-    - type: Transform
-      pos: -3.5,-11.5
-      parent: 1
-  - uid: 621
-    components:
-    - type: Transform
-      pos: 4.5,-17.5
-      parent: 1
-  - uid: 622
-    components:
-    - type: Transform
-      pos: 2.5,-11.5
-      parent: 1
-- proto: SMESBasic
-  entities:
-  - uid: 623
-    components:
-    - type: Transform
-      pos: -5.5,-19.5
-      parent: 1
-  - uid: 624
-    components:
-    - type: Transform
-      pos: -4.5,-19.5
-      parent: 1
-- proto: SoapSyndie
-  entities:
-  - uid: 625
-    components:
-    - type: Transform
-      pos: 2.4424396,-17.430403
-      parent: 1
-- proto: soda_dispenser
-  entities:
-  - uid: 626
-    components:
-    - type: Transform
-      pos: 1.5,-19.5
-      parent: 1
-- proto: StorageCanister
-  entities:
-  - uid: 627
-    components:
-    - type: Transform
-      pos: 2.5,-23.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-- proto: SubstationBasic
-  entities:
-  - uid: 628
-    components:
-    - type: Transform
-      pos: -3.5,-19.5
-      parent: 1
-- proto: SuitStorageEVASyndicate
-  entities:
-  - uid: 629
-    components:
-    - type: Transform
-      pos: 0.5,-24.5
-      parent: 1
-  - uid: 630
-    components:
-    - type: Transform
-      pos: 0.5,-23.5
-      parent: 1
-  - uid: 631
-    components:
-    - type: Transform
-      pos: 3.5,-17.5
-      parent: 1
-  - uid: 632
-    components:
-    - type: Transform
-      pos: -4.5,-17.5
-      parent: 1
-- proto: SyndieMiniBomb
-  entities:
-  - uid: 633
-    components:
-    - type: Transform
-      pos: 1.4127003,-11.973867
-      parent: 1
-  - uid: 634
-    components:
-    - type: Transform
-      pos: 1.6939503,-11.973867
-      parent: 1
-- proto: SyringeInaprovaline
-  entities:
-  - uid: 635
-    components:
-    - type: Transform
-      pos: -3.510837,-4.3787546
-      parent: 1
-  - uid: 636
-    components:
-    - type: Transform
-      pos: -3.510837,-4.0193796
-      parent: 1
-- proto: Table
-  entities:
-  - uid: 637
-    components:
-    - type: Transform
-      pos: 5.5,-21.5
-      parent: 1
-  - uid: 638
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-21.5
-      parent: 1
-  - uid: 639
-    components:
-    - type: Transform
-      pos: 3.5,-19.5
-      parent: 1
-  - uid: 640
-    components:
-    - type: Transform
-      pos: 2.5,-19.5
-      parent: 1
-  - uid: 641
-    components:
-    - type: Transform
-      pos: 1.5,-19.5
-      parent: 1
-- proto: TablePlasmaGlass
-  entities:
-  - uid: 642
-    components:
-    - type: Transform
-      pos: -3.5,-4.5
-      parent: 1
-  - uid: 643
-    components:
-    - type: Transform
-      pos: -3.5,-6.5
-      parent: 1
-  - uid: 644
-    components:
-    - type: Transform
-      pos: -3.5,-3.5
-      parent: 1
-- proto: TableReinforced
-  entities:
-  - uid: 645
-    components:
-    - type: Transform
-      pos: -2.5,-11.5
-      parent: 1
-  - uid: 646
-    components:
-    - type: Transform
-      pos: -2.5,-13.5
-      parent: 1
-  - uid: 647
-    components:
-    - type: Transform
-      pos: -1.5,-3.5
-      parent: 1
-  - uid: 648
-    components:
-    - type: Transform
-      pos: -2.5,-2.5
-      parent: 1
-  - uid: 649
-    components:
-    - type: Transform
-      pos: 0.5,-13.5
-      parent: 1
-  - uid: 650
-    components:
-    - type: Transform
-      pos: 1.5,-13.5
-      parent: 1
-  - uid: 651
-    components:
-    - type: Transform
-      pos: 1.5,-12.5
-      parent: 1
-  - uid: 652
-    components:
-    - type: Transform
-      pos: 1.5,-11.5
-      parent: 1
-  - uid: 653
-    components:
-    - type: Transform
-      pos: 2.5,-17.5
-      parent: 1
-  - uid: 654
-    components:
-    - type: Transform
-      pos: 1.5,-17.5
-      parent: 1
-  - uid: 655
-    components:
-    - type: Transform
-      pos: -2.5,-17.5
-      parent: 1
-  - uid: 656
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-2.5
-      parent: 1
-  - uid: 657
-    components:
-    - type: Transform
-      pos: -3.5,-17.5
-      parent: 1
-  - uid: 658
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-2.5
-      parent: 1
-- proto: Thruster
-  entities:
-  - uid: 659
-    components:
-    - type: Transform
-      pos: -6.5,-2.5
-      parent: 1
-  - uid: 660
-    components:
-    - type: Transform
-      pos: 5.5,-2.5
-      parent: 1
-  - uid: 661
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,-7.5
-      parent: 1
-  - uid: 662
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-7.5
-      parent: 1
-  - uid: 663
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -7.5,-13.5
-      parent: 1
-  - uid: 664
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-13.5
-      parent: 1
-  - uid: 665
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-30.5
-      parent: 1
-  - uid: 666
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,-30.5
-      parent: 1
-  - uid: 667
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-30.5
-      parent: 1
-  - uid: 668
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-30.5
-      parent: 1
-- proto: ToolboxSyndicate
-  entities:
-  - uid: 669
-    components:
-    - type: Transform
-      pos: -2.5731854,-17.414778
-      parent: 1
-- proto: ToolboxSyndicateFilled
-  entities:
-  - uid: 670
-    components:
-    - type: Transform
-      pos: 1.5034143,-11.298322
-      parent: 1
-- proto: VendingMachineTankDispenserEVA
-  entities:
-  - uid: 671
-    components:
-    - type: Transform
-      pos: 5.5,-15.5
-      parent: 1
-  - uid: 672
-    components:
-    - type: MetaData
-      name: tank dispenser
-    - type: Transform
-      pos: 2.5,-24.5
-      parent: 1
-  - uid: 673
-    components:
-    - type: Transform
-      pos: -6.5,-15.5
-      parent: 1
-- proto: VendingMachineYouTool
-  entities:
-  - uid: 674
-    components:
-    - type: Transform
-      pos: -3.5,-24.5
-      parent: 1
-- proto: WallPlastitanium
-  entities:
-  - uid: 11
-    components:
-    - type: Transform
-      pos: -1.5,-25.5
-      parent: 1
-  - uid: 675
-    components:
-    - type: Transform
-      pos: 2.5,-2.5
-      parent: 1
-  - uid: 676
-    components:
-    - type: Transform
-      pos: 4.5,-3.5
-      parent: 1
-  - uid: 677
-    components:
-    - type: Transform
-      pos: -3.5,-11.5
-      parent: 1
-  - uid: 678
-    components:
-    - type: Transform
-      pos: 2.5,-14.5
-      parent: 1
-  - uid: 679
-    components:
-    - type: Transform
-      pos: 4.5,-14.5
-      parent: 1
-  - uid: 680
-    components:
-    - type: Transform
-      pos: -2.5,-14.5
-      parent: 1
-  - uid: 681
-    components:
-    - type: Transform
-      pos: 2.5,-18.5
-      parent: 1
-  - uid: 682
-    components:
-    - type: Transform
-      pos: 1.5,-25.5
-      parent: 1
-  - uid: 683
-    components:
-    - type: Transform
-      pos: 1.5,-18.5
-      parent: 1
-  - uid: 684
-    components:
-    - type: Transform
-      pos: 7.5,-17.5
-      parent: 1
-  - uid: 685
-    components:
-    - type: Transform
-      pos: -3.5,-26.5
-      parent: 1
-  - uid: 686
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,-7.5
-      parent: 1
-  - uid: 687
-    components:
-    - type: Transform
-      pos: 2.5,-13.5
-      parent: 1
-  - uid: 688
-    components:
-    - type: Transform
-      pos: -3.5,-28.5
-      parent: 1
-  - uid: 689
-    components:
-    - type: Transform
-      pos: 2.5,-10.5
-      parent: 1
-  - uid: 690
-    components:
-    - type: Transform
-      pos: 4.5,-18.5
-      parent: 1
-  - uid: 691
-    components:
-    - type: Transform
-      pos: -2.5,-10.5
-      parent: 1
-  - uid: 692
-    components:
-    - type: Transform
-      pos: -3.5,-10.5
-      parent: 1
-  - uid: 693
-    components:
-    - type: Transform
-      pos: -6.5,-11.5
-      parent: 1
-  - uid: 694
-    components:
-    - type: Transform
-      pos: 4.5,-10.5
-      parent: 1
-  - uid: 695
-    components:
-    - type: Transform
-      pos: 4.5,-2.5
-      parent: 1
-  - uid: 696
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-7.5
-      parent: 1
-  - uid: 697
-    components:
-    - type: Transform
-      pos: -6.5,-6.5
-      parent: 1
-  - uid: 698
-    components:
-    - type: Transform
-      pos: -5.5,-6.5
-      parent: 1
-  - uid: 699
-    components:
-    - type: Transform
-      pos: 4.5,-6.5
-      parent: 1
-  - uid: 700
-    components:
-    - type: Transform
-      pos: -6.5,-5.5
-      parent: 1
-  - uid: 701
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-8.5
-      parent: 1
-  - uid: 702
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-7.5
-      parent: 1
-  - uid: 703
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-8.5
-      parent: 1
-  - uid: 704
-    components:
-    - type: Transform
-      pos: 2.5,-11.5
-      parent: 1
-  - uid: 705
-    components:
-    - type: Transform
-      pos: 5.5,-18.5
-      parent: 1
-  - uid: 706
-    components:
-    - type: Transform
-      pos: -8.5,-15.5
-      parent: 1
-  - uid: 707
-    components:
-    - type: Transform
-      pos: -8.5,-17.5
-      parent: 1
-  - uid: 708
-    components:
-    - type: Transform
-      pos: -7.5,-17.5
-      parent: 1
-  - uid: 709
-    components:
-    - type: Transform
-      pos: -5.5,-10.5
-      parent: 1
-  - uid: 710
-    components:
-    - type: Transform
-      pos: -3.5,-13.5
-      parent: 1
-  - uid: 711
-    components:
-    - type: Transform
-      pos: 3.5,-18.5
-      parent: 1
-  - uid: 712
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-6.5
-      parent: 1
-  - uid: 713
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,-7.5
-      parent: 1
-  - uid: 714
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,-8.5
-      parent: 1
-  - uid: 715
-    components:
-    - type: Transform
-      pos: 5.5,-14.5
-      parent: 1
-  - uid: 716
-    components:
-    - type: Transform
-      pos: 7.5,-15.5
-      parent: 1
-  - uid: 717
-    components:
-    - type: Transform
-      pos: -6.5,-19.5
-      parent: 1
-  - uid: 718
-    components:
-    - type: Transform
-      pos: -6.5,-18.5
-      parent: 1
-  - uid: 719
-    components:
-    - type: Transform
-      pos: -3.5,-25.5
-      parent: 1
-  - uid: 720
-    components:
-    - type: Transform
-      pos: 2.5,-25.5
-      parent: 1
-  - uid: 721
-    components:
-    - type: Transform
-      pos: 2.5,-27.5
-      parent: 1
-  - uid: 722
-    components:
-    - type: Transform
-      pos: 4.5,-17.5
-      parent: 1
-  - uid: 723
-    components:
-    - type: Transform
-      pos: -7.5,-21.5
-      parent: 1
-  - uid: 724
-    components:
-    - type: Transform
-      pos: -7.5,-27.5
-      parent: 1
-  - uid: 725
-    components:
-    - type: Transform
-      pos: -7.5,-24.5
-      parent: 1
-  - uid: 726
-    components:
-    - type: Transform
-      pos: 6.5,-21.5
-      parent: 1
-  - uid: 727
-    components:
-    - type: Transform
-      pos: 6.5,-24.5
-      parent: 1
-  - uid: 728
-    components:
-    - type: Transform
-      pos: 6.5,-26.5
-      parent: 1
-  - uid: 729
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,-3.5
-      parent: 1
-  - uid: 730
-    components:
-    - type: Transform
-      pos: 1.5,-10.5
-      parent: 1
-  - uid: 731
-    components:
-    - type: Transform
-      pos: -3.5,-27.5
-      parent: 1
-  - uid: 732
-    components:
-    - type: Transform
-      pos: -6.5,-12.5
-      parent: 1
-  - uid: 733
-    components:
-    - type: Transform
-      pos: 5.5,-12.5
-      parent: 1
-  - uid: 734
-    components:
-    - type: Transform
-      pos: 5.5,-11.5
-      parent: 1
-  - uid: 735
-    components:
-    - type: Transform
-      pos: -5.5,-11.5
-      parent: 1
-  - uid: 736
-    components:
-    - type: Transform
-      pos: -6.5,-20.5
-      parent: 1
-  - uid: 737
-    components:
-    - type: Transform
-      pos: 0.5,-14.5
-      parent: 1
-  - uid: 738
-    components:
-    - type: Transform
-      pos: -1.5,-14.5
-      parent: 1
-  - uid: 739
-    components:
-    - type: Transform
-      pos: 5.5,-20.5
-      parent: 1
-  - uid: 740
-    components:
-    - type: Transform
-      pos: -5.5,-14.5
-      parent: 1
-  - uid: 741
-    components:
-    - type: Transform
-      pos: 6.5,-17.5
-      parent: 1
-  - uid: 742
-    components:
-    - type: Transform
-      pos: -3.5,-14.5
-      parent: 1
-  - uid: 743
-    components:
-    - type: Transform
-      pos: -2.5,-18.5
-      parent: 1
-  - uid: 744
-    components:
-    - type: Transform
-      pos: 2.5,-26.5
-      parent: 1
-  - uid: 745
-    components:
-    - type: Transform
-      pos: 2.5,-28.5
-      parent: 1
-  - uid: 746
-    components:
-    - type: Transform
-      pos: 6.5,-25.5
-      parent: 1
-  - uid: 747
-    components:
-    - type: Transform
-      pos: 6.5,-22.5
-      parent: 1
-  - uid: 748
-    components:
-    - type: Transform
-      pos: -7.5,-23.5
-      parent: 1
-  - uid: 749
-    components:
-    - type: Transform
-      pos: -7.5,-26.5
-      parent: 1
-  - uid: 750
-    components:
-    - type: Transform
-      pos: -7.5,-22.5
-      parent: 1
-  - uid: 751
-    components:
-    - type: Transform
-      pos: -7.5,-20.5
-      parent: 1
-  - uid: 752
-    components:
-    - type: Transform
-      pos: 4.5,-15.5
-      parent: 1
-  - uid: 753
-    components:
-    - type: Transform
-      pos: 6.5,-28.5
-      parent: 1
-  - uid: 754
-    components:
-    - type: Transform
-      pos: 6.5,-27.5
-      parent: 1
-  - uid: 755
-    components:
-    - type: Transform
-      pos: 6.5,-23.5
-      parent: 1
-  - uid: 756
-    components:
-    - type: Transform
-      pos: 6.5,-20.5
-      parent: 1
-  - uid: 757
-    components:
-    - type: Transform
-      pos: -7.5,-25.5
-      parent: 1
-  - uid: 758
-    components:
-    - type: Transform
-      pos: -7.5,-28.5
-      parent: 1
-  - uid: 759
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-15.5
-      parent: 1
-  - uid: 760
-    components:
-    - type: Transform
-      pos: -5.5,-18.5
-      parent: 1
-  - uid: 761
-    components:
-    - type: Transform
-      pos: -5.5,-3.5
-      parent: 1
-  - uid: 762
-    components:
-    - type: Transform
-      pos: 5.5,-5.5
-      parent: 1
-  - uid: 763
-    components:
-    - type: Transform
-      pos: -3.5,-2.5
-      parent: 1
-  - uid: 764
-    components:
-    - type: Transform
-      pos: -6.5,-3.5
-      parent: 1
-  - uid: 765
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-7.5
-      parent: 1
-  - uid: 766
-    components:
-    - type: Transform
-      pos: -3.5,-18.5
-      parent: 1
-  - uid: 767
-    components:
-    - type: Transform
-      pos: -3.5,-1.5
-      parent: 1
-  - uid: 768
-    components:
-    - type: Transform
-      pos: 2.5,-1.5
-      parent: 1
-  - uid: 769
-    components:
-    - type: Transform
-      pos: -6.5,-14.5
-      parent: 1
-  - uid: 770
-    components:
-    - type: Transform
-      pos: -5.5,-2.5
-      parent: 1
-  - uid: 771
-    components:
-    - type: Transform
-      pos: 5.5,-6.5
-      parent: 1
-  - uid: 772
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,-7.5
-      parent: 1
-  - uid: 773
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,-8.5
-      parent: 1
-  - uid: 774
-    components:
-    - type: Transform
-      pos: 4.5,-11.5
-      parent: 1
-  - uid: 775
-    components:
-    - type: Transform
-      pos: -6.5,-13.5
-      parent: 1
-  - uid: 776
-    components:
-    - type: Transform
-      pos: -3.5,-30.5
-      parent: 1
-  - uid: 777
-    components:
-    - type: Transform
-      pos: 6.5,-15.5
-      parent: 1
-  - uid: 778
-    components:
-    - type: Transform
-      pos: 5.5,-13.5
-      parent: 1
-  - uid: 779
-    components:
-    - type: Transform
-      pos: -7.5,-15.5
-      parent: 1
-  - uid: 780
-    components:
-    - type: Transform
-      pos: 1.5,-14.5
-      parent: 1
-  - uid: 781
-    components:
-    - type: Transform
-      pos: -4.5,-18.5
-      parent: 1
-  - uid: 782
-    components:
-    - type: Transform
-      pos: -2.5,-25.5
-      parent: 1
-  - uid: 783
-    components:
-    - type: Transform
-      pos: 0.5,-25.5
-      parent: 1
-  - uid: 785
-    components:
-    - type: Transform
-      pos: -1.5,-22.5
-      parent: 1
-  - uid: 786
-    components:
-    - type: Transform
-      pos: 0.5,-22.5
-      parent: 1
-  - uid: 787
-    components:
-    - type: Transform
-      pos: 1.5,-24.5
-      parent: 1
-  - uid: 788
-    components:
-    - type: Transform
-      pos: 1.5,-23.5
-      parent: 1
-  - uid: 789
-    components:
-    - type: Transform
-      pos: 1.5,-22.5
-      parent: 1
-  - uid: 790
-    components:
-    - type: Transform
-      pos: -2.5,-24.5
-      parent: 1
-  - uid: 791
-    components:
-    - type: Transform
-      pos: -2.5,-23.5
-      parent: 1
-  - uid: 792
-    components:
-    - type: Transform
-      pos: -2.5,-22.5
-      parent: 1
-  - uid: 793
-    components:
-    - type: Transform
-      pos: 5.5,-22.5
-      parent: 1
-  - uid: 794
-    components:
-    - type: Transform
-      pos: -7.5,-14.5
-      parent: 1
-  - uid: 795
-    components:
-    - type: Transform
-      pos: -7.5,-18.5
-      parent: 1
-  - uid: 796
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,-28.5
-      parent: 1
-  - uid: 797
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -5.5,-28.5
-      parent: 1
-  - uid: 798
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,-28.5
-      parent: 1
-  - uid: 799
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-28.5
-      parent: 1
-  - uid: 800
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-28.5
-      parent: 1
-  - uid: 801
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-28.5
-      parent: 1
-  - uid: 802
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-6.5
-      parent: 1
-  - uid: 803
-    components:
-    - type: Transform
-      pos: 4.5,-27.5
-      parent: 1
-  - uid: 804
-    components:
-    - type: Transform
-      pos: 4.5,-26.5
-      parent: 1
-  - uid: 805
-    components:
-    - type: Transform
-      pos: 4.5,-25.5
-      parent: 1
-  - uid: 806
-    components:
-    - type: Transform
-      pos: 2.5,-4.5
-      parent: 1
-  - uid: 807
-    components:
-    - type: Transform
-      pos: 3.5,-6.5
-      parent: 1
-  - uid: 808
-    components:
-    - type: Transform
-      pos: 2.5,-30.5
-      parent: 1
-  - uid: 809
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-17.5
-      parent: 1
-  - uid: 810
-    components:
-    - type: Transform
-      pos: 3.5,-29.5
-      parent: 1
-  - uid: 811
-    components:
-    - type: Transform
-      pos: -5.5,-29.5
-      parent: 1
-  - uid: 812
-    components:
-    - type: Transform
-      pos: 4.5,-29.5
-      parent: 1
-  - uid: 813
-    components:
-    - type: Transform
-      pos: -4.5,-29.5
-      parent: 1
-  - uid: 814
-    components:
-    - type: Transform
-      pos: 5.5,-29.5
-      parent: 1
-  - uid: 815
-    components:
-    - type: Transform
-      pos: -3.5,-29.5
-      parent: 1
-  - uid: 816
-    components:
-    - type: Transform
-      pos: 2.5,-29.5
-      parent: 1
-  - uid: 817
-    components:
-    - type: Transform
-      pos: 6.5,-14.5
-      parent: 1
-  - uid: 818
-    components:
-    - type: Transform
-      pos: 6.5,-18.5
-      parent: 1
-  - uid: 819
-    components:
-    - type: Transform
-      pos: 5.5,-3.5
-      parent: 1
-  - uid: 820
-    components:
-    - type: Transform
-      pos: -6.5,-29.5
-      parent: 1
-  - uid: 821
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -6.5,-30.5
-      parent: 1
-  - uid: 822
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-30.5
-      parent: 1
-  - uid: 823
-    components:
-    - type: Transform
-      pos: 8.5,-15.5
-      parent: 1
-  - uid: 824
-    components:
-    - type: Transform
-      pos: 8.5,-17.5
-      parent: 1
-  - uid: 825
-    components:
-    - type: Transform
-      pos: -9.5,-17.5
-      parent: 1
-  - uid: 826
-    components:
-    - type: Transform
-      pos: -9.5,-15.5
-      parent: 1
-- proto: WarningN2
-  entities:
-  - uid: 827
-    components:
-    - type: Transform
-      pos: 4.5,-25.5
-      parent: 1
-- proto: WarningO2
-  entities:
-  - uid: 828
-    components:
-    - type: Transform
-      pos: 2.5,-25.5
-      parent: 1
-- proto: WarningWaste
-  entities:
-  - uid: 829
-    components:
-    - type: Transform
-      pos: 4.5,-18.5
-      parent: 1
-- proto: WaterCooler
-  entities:
-  - uid: 830
-    components:
-    - type: Transform
-      pos: 0.5,-17.5
-      parent: 1
-- proto: WeaponTurretSyndicate
-  entities:
-  - uid: 24
-    components:
-    - type: Transform
-      pos: -2.5,-6.5
-      parent: 1
-  - uid: 610
-    components:
-    - type: Transform
-      pos: -1.5,-19.5
-      parent: 1
-- proto: WindoorSecure
-  entities:
-  - uid: 831
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-5.5
-      parent: 1
-- proto: Wrench
-  entities:
-  - uid: 832
-    components:
-    - type: Transform
-      pos: 5.4749,-23.512577
-      parent: 1
-  - uid: 833
-    components:
-    - type: Transform
-      pos: 5.63115,-23.481327
-      parent: 1
-  - uid: 834
-    components:
-    - type: Transform
-      pos: 1.6061028,-13.284962
-      parent: 1
-...
+meta:
+  format: 6
+  postmapinit: false
+tilemap:
+  0: Space
+  3: FloorArcadeRed
+  31: FloorDark
+  36: FloorDarkMono
+  40: FloorDarkPlastic
+  56: FloorGreenCircuit
+  79: FloorReinforced
+  88: FloorShuttleRed
+  89: FloorShuttleWhite
+  93: FloorSteel
+  104: FloorSteelMono
+  110: FloorTechMaint3
+  122: FloorWood
+  125: Lattice
+  126: Plating
+entities:
+- proto: ""
+  entities:
+  - uid: 1
+    components:
+    - type: MetaData
+      name: GX-13 Infiltrator
+    - type: Transform
+      pos: 0.64252126,4.1776605
+      parent: invalid
+    - type: Tag
+      tags:
+      - Syndicate
+    - type: MapGrid
+      chunks:
+        -1,-1:
+          ind: -1,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAACHwAAAAABHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAWAAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAWAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAWAAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACWAAAAAAAHwAAAAACHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACaAAAAAAAWQAAAAAAHwAAAAADHwAAAAAAHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADWQAAAAAAaAAAAAABWAAAAAAAHwAAAAAAHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADWAAAAAAAHwAAAAACHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        0,-1:
+          ind: 0,-1
+          tiles: HwAAAAABHwAAAAABHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACWAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACWAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABWAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABWAAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADHwAAAAAAHwAAAAAAegAAAAADegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAWAAAAAAAegAAAAAAAwAAAAAAegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADWAAAAAAAfgAAAAAAAwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAAAAAAWAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -1,-2:
+          ind: -1,-2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAOAAAAAAAJAAAAAAAOAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAOAAAAAAAJAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAOAAAAAAAJAAAAAAAOAAAAAAAWAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAADWAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAACTwAAAAAAHwAAAAABWAAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAWAAAAAAAfgAAAAAAHwAAAAAAHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAKAAAAAAAWAAAAAAAHwAAAAADHwAAAAAAHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAWAAAAAAAHwAAAAAAWAAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbgAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAA
+          version: 6
+        0,-2:
+          ind: 0,-2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABHwAAAAADHwAAAAABHwAAAAADHwAAAAABWAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADHwAAAAACHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAABfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABHwAAAAAAHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACbgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+    - type: Broadphase
+    - type: Physics
+      bodyStatus: InAir
+      angularDamping: 0.05
+      linearDamping: 0.05
+      fixedRotation: False
+      bodyType: Dynamic
+    - type: Fixtures
+      fixtures: {}
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+    - type: GridAtmosphere
+      version: 2
+      data:
+        tiles:
+          -1,-4:
+            0: 65535
+          -1,-3:
+            0: 65535
+          -1,-2:
+            0: 65535
+          -1,-1:
+            0: 61439
+          0,-4:
+            0: 65535
+          0,-3:
+            0: 65535
+          0,-2:
+            0: 65535
+          0,-1:
+            0: 65535
+          1,-4:
+            0: 30591
+          1,-3:
+            0: 21879
+            1: 512
+          1,-2:
+            0: 30325
+            2: 256
+          1,-1:
+            0: 55
+          0,-5:
+            0: 65535
+          1,-5:
+            0: 65399
+          -1,-5:
+            0: 65535
+          -3,-4:
+            0: 12
+          -2,-4:
+            0: 61439
+          -2,-2:
+            0: 65516
+          -2,-1:
+            0: 2287
+          -2,-3:
+            0: 35054
+            1: 1536
+          -1,0:
+            0: 8
+          -3,-5:
+            0: 52224
+          -2,-8:
+            0: 65504
+          -2,-7:
+            0: 65535
+          -2,-6:
+            0: 65535
+          -2,-5:
+            0: 65535
+          -1,-8:
+            0: 65526
+          -1,-7:
+            0: 65535
+          -1,-6:
+            0: 65535
+          0,-8:
+            0: 65523
+          0,-7:
+            0: 61303
+            3: 4096
+            4: 136
+          0,-6:
+            3: 1
+            0: 65534
+          1,-8:
+            0: 30512
+          1,-7:
+            0: 30549
+            5: 34
+          1,-6:
+            0: 30583
+          -1,-9:
+            0: 26112
+          0,-9:
+            0: 13056
+          2,-4:
+            0: 1
+          2,-5:
+            0: 4352
+        uniqueMixes:
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.824879
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.14996
+          moles:
+          - 20.078888
+          - 75.53487
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 20.619795
+          - 77.56971
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 6666.982
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 0
+          - 6666.982
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        chunkSize: 4
+    - type: DecalGrid
+      chunkCollection:
+        version: 2
+        nodes:
+        - node:
+            color: '#FFFFFFFF'
+            id: Arrows
+          decals:
+            115: -6,-24
+        - node:
+            color: '#FFFFFFFF'
+            id: Bot
+          decals:
+            112: -6,-27
+            113: -6,-26
+            114: -6,-25
+        - node:
+            color: '#79150096'
+            id: Box
+          decals:
+            110: -6,-21
+            111: -5,-21
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelCornerNe
+          decals:
+            10: 0,-4
+            43: 0,-9
+            51: 4,-20
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelCornerNw
+          decals:
+            11: -2,-4
+            42: -2,-9
+            45: -2,-20
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelCornerSe
+          decals:
+            36: 0,-14
+            50: 4,-22
+            76: 3,-18
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelCornerSw
+          decals:
+            37: -2,-14
+            46: -2,-22
+            75: -5,-18
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelLineE
+          decals:
+            6: 0,-7
+            9: 0,-5
+            32: 0,-11
+            33: 0,-10
+            34: 0,-12
+            35: 0,-13
+            52: 4,-21
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelLineN
+          decals:
+            12: -1,-4
+            53: 3,-20
+            54: 2,-20
+            55: 1,-20
+            56: 0,-20
+            63: 0,-16
+            64: 1,-16
+            65: 2,-16
+            66: -2,-16
+            67: -3,-16
+            68: -4,-16
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelLineS
+          decals:
+            47: 0,-22
+            48: 1,-22
+            49: 2,-22
+            69: 2,-18
+            70: 1,-18
+            71: 0,-18
+            72: -2,-18
+            73: -3,-18
+            74: -4,-18
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelLineW
+          decals:
+            7: -2,-7
+            8: -2,-5
+            38: -2,-13
+            39: -2,-12
+            40: -2,-11
+            41: -2,-10
+        - node:
+            color: '#79150096'
+            id: BrickTileWhiteCornerNe
+          decals:
+            104: -5,-22
+        - node:
+            color: '#79150096'
+            id: BrickTileWhiteCornerNw
+          decals:
+            103: -7,-22
+        - node:
+            color: '#79150096'
+            id: BrickTileWhiteCornerSe
+          decals:
+            105: -5,-24
+        - node:
+            color: '#79150096'
+            id: BrickTileWhiteCornerSw
+          decals:
+            106: -7,-24
+        - node:
+            color: '#79150096'
+            id: BrickTileWhiteLineE
+          decals:
+            102: -5,-23
+        - node:
+            color: '#79150096'
+            id: BrickTileWhiteLineN
+          decals:
+            109: -6,-22
+        - node:
+            color: '#79150096'
+            id: BrickTileWhiteLineS
+          decals:
+            107: -6,-24
+        - node:
+            color: '#79150096'
+            id: BrickTileWhiteLineW
+          decals:
+            108: -7,-23
+        - node:
+            color: '#79150096'
+            id: Delivery
+          decals:
+            116: -1,-23
+        - node:
+            color: '#DE3A3A96'
+            id: DeliveryGreyscale
+          decals:
+            13: 1,-6
+            31: -3,-6
+            83: -1,-19
+            84: -3,-21
+            85: -1,-15
+            86: 4,-17
+            87: -6,-17
+            88: -5,-15
+            89: 3,-15
+            90: -1,-8
+        - node:
+            color: '#DE3A3A96'
+            id: HalfTileOverlayGreyscale
+          decals:
+            29: -4,-7
+        - node:
+            color: '#DE3A3A96'
+            id: HalfTileOverlayGreyscale180
+          decals:
+            25: -4,-4
+            26: -5,-4
+        - node:
+            color: '#DE3A3A96'
+            id: HalfTileOverlayGreyscale90
+          decals:
+            27: -6,-6
+            28: -6,-5
+        - node:
+            color: '#DE3A3A96'
+            id: MonoOverlay
+          decals:
+            23: -5,-6
+            24: -4,-5
+        - node:
+            color: '#DE3A3A96'
+            id: WarnCornerGreyscaleNE
+          decals:
+            81: 3,-16
+        - node:
+            color: '#DE3A3A96'
+            id: WarnCornerGreyscaleNW
+          decals:
+            80: -5,-16
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallNE
+          decals:
+            99: -7,-24
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallNW
+          decals:
+            98: -5,-24
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallSE
+          decals:
+            97: -7,-22
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallSW
+          decals:
+            101: -5,-22
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineE
+          decals:
+            3: -4,-23
+            4: -4,-24
+            5: -4,-25
+            95: -7,-23
+        - node:
+            color: '#DE3A3A96'
+            id: WarnLineGreyscaleE
+          decals:
+            78: 3,-17
+        - node:
+            color: '#DE3A3A96'
+            id: WarnLineGreyscaleN
+          decals:
+            44: -1,-9
+            59: -1,-20
+            82: -1,-16
+        - node:
+            color: '#DE3A3A96'
+            id: WarnLineGreyscaleS
+          decals:
+            57: -1,-22
+            60: 3,-22
+            77: -1,-18
+        - node:
+            color: '#DE3A3A96'
+            id: WarnLineGreyscaleW
+          decals:
+            58: -2,-21
+            79: -5,-17
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineN
+          decals:
+            91: -5,-28
+            92: -6,-28
+            93: -7,-28
+            100: -6,-22
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineS
+          decals:
+            94: -5,-23
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineW
+          decals:
+            96: -6,-24
+        - node:
+            angle: 1.5707963267948966 rad
+            color: '#FFFFFFFF'
+            id: WarningLine
+          decals:
+            0: -4,-22
+            1: -4,-21
+            2: -4,-20
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinEndN
+          decals:
+            62: 3,-4
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinEndS
+          decals:
+            61: 3,-5
+        - node:
+            color: '#FFFFFFFF'
+            id: syndlogo10
+          decals:
+            20: -2,-7
+        - node:
+            color: '#FFFFFFFF'
+            id: syndlogo11
+          decals:
+            21: -1,-7
+        - node:
+            color: '#FFFFFFFF'
+            id: syndlogo12
+          decals:
+            22: 0,-7
+        - node:
+            color: '#FFFFFFFF'
+            id: syndlogo2
+          decals:
+            14: -2,-5
+        - node:
+            color: '#FFFFFFFF'
+            id: syndlogo3
+          decals:
+            15: -1,-5
+        - node:
+            color: '#FFFFFFFF'
+            id: syndlogo4
+          decals:
+            16: 0,-5
+        - node:
+            color: '#FFFFFFFF'
+            id: syndlogo5
+          decals:
+            30: -3,-6
+        - node:
+            color: '#FFFFFFFF'
+            id: syndlogo6
+          decals:
+            17: -2,-6
+        - node:
+            color: '#FFFFFFFF'
+            id: syndlogo7
+          decals:
+            18: -1,-6
+        - node:
+            color: '#FFFFFFFF'
+            id: syndlogo8
+          decals:
+            19: 0,-6
+    - type: IFF
+      color: '#FFC000FF'
+      flags: Hide
+    - type: OccluderTree
+    - type: Shuttle
+    - type: RadiationGridResistance
+    - type: GravityShake
+      shakeTimes: 10
+    - type: GasTileOverlay
+    - type: SpreaderGrid
+    - type: GridPathfinding
+- proto: AirlockExternalGlassShuttleSyndicateLocked
+  entities:
+  - uid: 8
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-16.5
+      parent: 1
+    - type: DeviceLinkSink
+      invokeCounter: 1
+      links:
+      - 13
+    - type: DeviceLinkSource
+      linkedPorts:
+        13:
+        - DoorStatus: Close
+  - uid: 10
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-16.5
+      parent: 1
+    - type: DeviceLinkSink
+      invokeCounter: 1
+      links:
+      - 3
+    - type: DeviceLinkSource
+      linkedPorts:
+        3:
+        - DoorStatus: Close
+- proto: AirlockExternalSyndicateLocked
+  entities:
+  - uid: 2
+    components:
+    - type: Transform
+      pos: -0.5,-25.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 14
+    - type: DeviceLinkSource
+      linkedPorts:
+        14:
+        - DoorStatus: DoorBolt
+  - uid: 3
+    components:
+    - type: Transform
+      pos: -5.5,-16.5
+      parent: 1
+    - type: DeviceLinkSink
+      invokeCounter: 1
+      links:
+      - 10
+    - type: DeviceLinkSource
+      linkedPorts:
+        10:
+        - DoorStatus: Close
+  - uid: 7
+    components:
+    - type: Transform
+      pos: -4.5,-14.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 12
+    - type: DeviceLinkSource
+      linkedPorts:
+        12:
+        - DoorStatus: DoorBolt
+  - uid: 9
+    components:
+    - type: Transform
+      pos: 3.5,-14.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 22
+    - type: DeviceLinkSource
+      linkedPorts:
+        22:
+        - DoorStatus: DoorBolt
+  - uid: 12
+    components:
+    - type: Transform
+      pos: -4.5,-10.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 7
+    - type: DeviceLinkSource
+      linkedPorts:
+        7:
+        - DoorStatus: DoorBolt
+  - uid: 13
+    components:
+    - type: Transform
+      pos: 4.5,-16.5
+      parent: 1
+    - type: DeviceLinkSink
+      invokeCounter: 1
+      links:
+      - 8
+    - type: DeviceLinkSource
+      linkedPorts:
+        8:
+        - DoorStatus: Close
+  - uid: 14
+    components:
+    - type: Transform
+      pos: -0.5,-22.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        2:
+        - DoorStatus: DoorBolt
+  - uid: 22
+    components:
+    - type: Transform
+      pos: 3.5,-10.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 9
+    - type: DeviceLinkSource
+      linkedPorts:
+        9:
+        - DoorStatus: DoorBolt
+- proto: AirlockSyndicateGlassLocked
+  entities:
+  - uid: 4
+    components:
+    - type: Transform
+      pos: -0.5,-7.5
+      parent: 1
+  - uid: 5
+    components:
+    - type: Transform
+      pos: 3.5,-22.5
+      parent: 1
+  - uid: 6
+    components:
+    - type: Transform
+      pos: -0.5,-18.5
+      parent: 1
+  - uid: 17
+    components:
+    - type: Transform
+      pos: -2.5,-20.5
+      parent: 1
+- proto: AirlockSyndicateLocked
+  entities:
+  - uid: 15
+    components:
+    - type: Transform
+      pos: -0.5,-14.5
+      parent: 1
+  - uid: 16
+    components:
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 1
+- proto: APCBasic
+  entities:
+  - uid: 18
+    components:
+    - type: Transform
+      pos: -3.5,-18.5
+      parent: 1
+  - uid: 19
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-8.5
+      parent: 1
+- proto: AtmosFixNitrogenMarker
+  entities:
+  - uid: 25
+    components:
+    - type: Transform
+      pos: 5.5,-26.5
+      parent: 1
+  - uid: 26
+    components:
+    - type: Transform
+      pos: 5.5,-27.5
+      parent: 1
+- proto: AtmosFixOxygenMarker
+  entities:
+  - uid: 27
+    components:
+    - type: Transform
+      pos: 3.5,-26.5
+      parent: 1
+  - uid: 28
+    components:
+    - type: Transform
+      pos: 3.5,-27.5
+      parent: 1
+- proto: BannerSyndicate
+  entities:
+  - uid: 29
+    components:
+    - type: Transform
+      pos: 2.5,-15.5
+      parent: 1
+  - uid: 30
+    components:
+    - type: Transform
+      pos: -3.5,-15.5
+      parent: 1
+- proto: Bed
+  entities:
+  - uid: 31
+    components:
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 1
+- proto: BedsheetSyndie
+  entities:
+  - uid: 32
+    components:
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 1
+- proto: BoxEncryptionKeySyndie
+  entities:
+  - uid: 34
+    components:
+    - type: Transform
+      parent: 33
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: BoxFlashbang
+  entities:
+  - uid: 42
+    components:
+    - type: Transform
+      pos: 0.49331844,-13.366474
+      parent: 1
+- proto: BoxHandcuff
+  entities:
+  - uid: 43
+    components:
+    - type: Transform
+      pos: 1.4510483,-2.399527
+      parent: 1
+- proto: Brutepack
+  entities:
+  - uid: 44
+    components:
+    - type: Transform
+      pos: -3.292087,-4.1600046
+      parent: 1
+  - uid: 45
+    components:
+    - type: Transform
+      pos: -3.354587,-4.4256296
+      parent: 1
+- proto: C4
+  entities:
+  - uid: 46
+    components:
+    - type: Transform
+      pos: 1.7857682,-12.631323
+      parent: 1
+  - uid: 47
+    components:
+    - type: Transform
+      pos: 1.5045182,-12.646948
+      parent: 1
+  - uid: 48
+    components:
+    - type: Transform
+      pos: 1.5982682,-12.646948
+      parent: 1
+  - uid: 49
+    components:
+    - type: Transform
+      pos: 1.4107682,-12.646948
+      parent: 1
+  - uid: 50
+    components:
+    - type: Transform
+      pos: 1.6920182,-12.631323
+      parent: 1
+- proto: CableApcExtension
+  entities:
+  - uid: 51
+    components:
+    - type: Transform
+      pos: -3.5,-18.5
+      parent: 1
+  - uid: 52
+    components:
+    - type: Transform
+      pos: -3.5,-17.5
+      parent: 1
+  - uid: 53
+    components:
+    - type: Transform
+      pos: -3.5,-16.5
+      parent: 1
+  - uid: 54
+    components:
+    - type: Transform
+      pos: -4.5,-16.5
+      parent: 1
+  - uid: 55
+    components:
+    - type: Transform
+      pos: -5.5,-16.5
+      parent: 1
+  - uid: 56
+    components:
+    - type: Transform
+      pos: -6.5,-16.5
+      parent: 1
+  - uid: 57
+    components:
+    - type: Transform
+      pos: -7.5,-16.5
+      parent: 1
+  - uid: 58
+    components:
+    - type: Transform
+      pos: -8.5,-16.5
+      parent: 1
+  - uid: 59
+    components:
+    - type: Transform
+      pos: -6.5,-15.5
+      parent: 1
+  - uid: 60
+    components:
+    - type: Transform
+      pos: -6.5,-17.5
+      parent: 1
+  - uid: 61
+    components:
+    - type: Transform
+      pos: -4.5,-15.5
+      parent: 1
+  - uid: 62
+    components:
+    - type: Transform
+      pos: -4.5,-14.5
+      parent: 1
+  - uid: 63
+    components:
+    - type: Transform
+      pos: -4.5,-13.5
+      parent: 1
+  - uid: 64
+    components:
+    - type: Transform
+      pos: -4.5,-12.5
+      parent: 1
+  - uid: 65
+    components:
+    - type: Transform
+      pos: -4.5,-11.5
+      parent: 1
+  - uid: 66
+    components:
+    - type: Transform
+      pos: -4.5,-10.5
+      parent: 1
+  - uid: 67
+    components:
+    - type: Transform
+      pos: -5.5,-12.5
+      parent: 1
+  - uid: 68
+    components:
+    - type: Transform
+      pos: -6.5,-12.5
+      parent: 1
+  - uid: 69
+    components:
+    - type: Transform
+      pos: -2.5,-16.5
+      parent: 1
+  - uid: 70
+    components:
+    - type: Transform
+      pos: -1.5,-16.5
+      parent: 1
+  - uid: 71
+    components:
+    - type: Transform
+      pos: -0.5,-16.5
+      parent: 1
+  - uid: 72
+    components:
+    - type: Transform
+      pos: 0.5,-16.5
+      parent: 1
+  - uid: 73
+    components:
+    - type: Transform
+      pos: 1.5,-16.5
+      parent: 1
+  - uid: 74
+    components:
+    - type: Transform
+      pos: 2.5,-16.5
+      parent: 1
+  - uid: 75
+    components:
+    - type: Transform
+      pos: 3.5,-16.5
+      parent: 1
+  - uid: 76
+    components:
+    - type: Transform
+      pos: 4.5,-16.5
+      parent: 1
+  - uid: 77
+    components:
+    - type: Transform
+      pos: 5.5,-16.5
+      parent: 1
+  - uid: 78
+    components:
+    - type: Transform
+      pos: 5.5,-15.5
+      parent: 1
+  - uid: 79
+    components:
+    - type: Transform
+      pos: 5.5,-17.5
+      parent: 1
+  - uid: 80
+    components:
+    - type: Transform
+      pos: 6.5,-16.5
+      parent: 1
+  - uid: 81
+    components:
+    - type: Transform
+      pos: 7.5,-16.5
+      parent: 1
+  - uid: 82
+    components:
+    - type: Transform
+      pos: 3.5,-15.5
+      parent: 1
+  - uid: 83
+    components:
+    - type: Transform
+      pos: 3.5,-14.5
+      parent: 1
+  - uid: 84
+    components:
+    - type: Transform
+      pos: 3.5,-13.5
+      parent: 1
+  - uid: 85
+    components:
+    - type: Transform
+      pos: 3.5,-12.5
+      parent: 1
+  - uid: 86
+    components:
+    - type: Transform
+      pos: 3.5,-11.5
+      parent: 1
+  - uid: 87
+    components:
+    - type: Transform
+      pos: 3.5,-11.5
+      parent: 1
+  - uid: 88
+    components:
+    - type: Transform
+      pos: 3.5,-10.5
+      parent: 1
+  - uid: 89
+    components:
+    - type: Transform
+      pos: 4.5,-12.5
+      parent: 1
+  - uid: 90
+    components:
+    - type: Transform
+      pos: 5.5,-12.5
+      parent: 1
+  - uid: 91
+    components:
+    - type: Transform
+      pos: -0.5,-6.5
+      parent: 1
+  - uid: 92
+    components:
+    - type: Transform
+      pos: -0.5,-7.5
+      parent: 1
+  - uid: 93
+    components:
+    - type: Transform
+      pos: -0.5,-8.5
+      parent: 1
+  - uid: 94
+    components:
+    - type: Transform
+      pos: -0.5,-9.5
+      parent: 1
+  - uid: 95
+    components:
+    - type: Transform
+      pos: -0.5,-10.5
+      parent: 1
+  - uid: 96
+    components:
+    - type: Transform
+      pos: -0.5,-11.5
+      parent: 1
+  - uid: 97
+    components:
+    - type: Transform
+      pos: -0.5,-12.5
+      parent: 1
+  - uid: 98
+    components:
+    - type: Transform
+      pos: -0.5,-13.5
+      parent: 1
+  - uid: 99
+    components:
+    - type: Transform
+      pos: -0.5,-14.5
+      parent: 1
+  - uid: 100
+    components:
+    - type: Transform
+      pos: -1.5,-12.5
+      parent: 1
+  - uid: 101
+    components:
+    - type: Transform
+      pos: 0.5,-12.5
+      parent: 1
+  - uid: 102
+    components:
+    - type: Transform
+      pos: -0.5,-5.5
+      parent: 1
+  - uid: 103
+    components:
+    - type: Transform
+      pos: 0.5,-5.5
+      parent: 1
+  - uid: 104
+    components:
+    - type: Transform
+      pos: 1.5,-5.5
+      parent: 1
+  - uid: 105
+    components:
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 1
+  - uid: 106
+    components:
+    - type: Transform
+      pos: 3.5,-5.5
+      parent: 1
+  - uid: 107
+    components:
+    - type: Transform
+      pos: 3.5,-4.5
+      parent: 1
+  - uid: 108
+    components:
+    - type: Transform
+      pos: -0.5,-4.5
+      parent: 1
+  - uid: 109
+    components:
+    - type: Transform
+      pos: -0.5,-3.5
+      parent: 1
+  - uid: 110
+    components:
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 1
+  - uid: 111
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 1
+  - uid: 112
+    components:
+    - type: Transform
+      pos: 1.5,-2.5
+      parent: 1
+  - uid: 113
+    components:
+    - type: Transform
+      pos: -1.5,-2.5
+      parent: 1
+  - uid: 114
+    components:
+    - type: Transform
+      pos: -2.5,-2.5
+      parent: 1
+  - uid: 115
+    components:
+    - type: Transform
+      pos: -1.5,-4.5
+      parent: 1
+  - uid: 116
+    components:
+    - type: Transform
+      pos: -3.5,-4.5
+      parent: 1
+  - uid: 117
+    components:
+    - type: Transform
+      pos: -2.5,-4.5
+      parent: 1
+  - uid: 118
+    components:
+    - type: Transform
+      pos: -4.5,-4.5
+      parent: 1
+  - uid: 119
+    components:
+    - type: Transform
+      pos: -5.5,-4.5
+      parent: 1
+  - uid: 120
+    components:
+    - type: Transform
+      pos: -5.5,-5.5
+      parent: 1
+  - uid: 121
+    components:
+    - type: Transform
+      pos: -5.5,-6.5
+      parent: 1
+  - uid: 122
+    components:
+    - type: Transform
+      pos: -5.5,-3.5
+      parent: 1
+  - uid: 123
+    components:
+    - type: Transform
+      pos: 4.5,-4.5
+      parent: 1
+  - uid: 124
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 1
+  - uid: 125
+    components:
+    - type: Transform
+      pos: 3.5,-6.5
+      parent: 1
+  - uid: 126
+    components:
+    - type: Transform
+      pos: -0.5,-17.5
+      parent: 1
+  - uid: 127
+    components:
+    - type: Transform
+      pos: -3.5,-20.5
+      parent: 1
+  - uid: 128
+    components:
+    - type: Transform
+      pos: -3.5,-19.5
+      parent: 1
+  - uid: 129
+    components:
+    - type: Transform
+      pos: -3.5,-21.5
+      parent: 1
+  - uid: 130
+    components:
+    - type: Transform
+      pos: -4.5,-21.5
+      parent: 1
+  - uid: 131
+    components:
+    - type: Transform
+      pos: -4.5,-22.5
+      parent: 1
+  - uid: 132
+    components:
+    - type: Transform
+      pos: -4.5,-23.5
+      parent: 1
+  - uid: 133
+    components:
+    - type: Transform
+      pos: -4.5,-24.5
+      parent: 1
+  - uid: 134
+    components:
+    - type: Transform
+      pos: -4.5,-25.5
+      parent: 1
+  - uid: 135
+    components:
+    - type: Transform
+      pos: -4.5,-25.5
+      parent: 1
+  - uid: 136
+    components:
+    - type: Transform
+      pos: -4.5,-26.5
+      parent: 1
+  - uid: 137
+    components:
+    - type: Transform
+      pos: -4.5,-27.5
+      parent: 1
+  - uid: 138
+    components:
+    - type: Transform
+      pos: -5.5,-27.5
+      parent: 1
+  - uid: 139
+    components:
+    - type: Transform
+      pos: -6.5,-27.5
+      parent: 1
+  - uid: 140
+    components:
+    - type: Transform
+      pos: -6.5,-26.5
+      parent: 1
+  - uid: 141
+    components:
+    - type: Transform
+      pos: -6.5,-25.5
+      parent: 1
+  - uid: 142
+    components:
+    - type: Transform
+      pos: -6.5,-24.5
+      parent: 1
+  - uid: 143
+    components:
+    - type: Transform
+      pos: -6.5,-23.5
+      parent: 1
+  - uid: 144
+    components:
+    - type: Transform
+      pos: -6.5,-22.5
+      parent: 1
+  - uid: 145
+    components:
+    - type: Transform
+      pos: -2.5,-20.5
+      parent: 1
+  - uid: 146
+    components:
+    - type: Transform
+      pos: -1.5,-20.5
+      parent: 1
+  - uid: 147
+    components:
+    - type: Transform
+      pos: -0.5,-20.5
+      parent: 1
+  - uid: 148
+    components:
+    - type: Transform
+      pos: -0.5,-21.5
+      parent: 1
+  - uid: 149
+    components:
+    - type: Transform
+      pos: -0.5,-23.5
+      parent: 1
+  - uid: 150
+    components:
+    - type: Transform
+      pos: -0.5,-22.5
+      parent: 1
+  - uid: 151
+    components:
+    - type: Transform
+      pos: -0.5,-24.5
+      parent: 1
+  - uid: 152
+    components:
+    - type: Transform
+      pos: -0.5,-25.5
+      parent: 1
+  - uid: 153
+    components:
+    - type: Transform
+      pos: -0.5,-19.5
+      parent: 1
+  - uid: 154
+    components:
+    - type: Transform
+      pos: 0.5,-20.5
+      parent: 1
+  - uid: 155
+    components:
+    - type: Transform
+      pos: 1.5,-20.5
+      parent: 1
+  - uid: 156
+    components:
+    - type: Transform
+      pos: 2.5,-20.5
+      parent: 1
+  - uid: 157
+    components:
+    - type: Transform
+      pos: 3.5,-20.5
+      parent: 1
+  - uid: 158
+    components:
+    - type: Transform
+      pos: 4.5,-20.5
+      parent: 1
+  - uid: 159
+    components:
+    - type: Transform
+      pos: 3.5,-21.5
+      parent: 1
+  - uid: 160
+    components:
+    - type: Transform
+      pos: 3.5,-22.5
+      parent: 1
+  - uid: 161
+    components:
+    - type: Transform
+      pos: 3.5,-23.5
+      parent: 1
+  - uid: 162
+    components:
+    - type: Transform
+      pos: 3.5,-24.5
+      parent: 1
+  - uid: 163
+    components:
+    - type: Transform
+      pos: 3.5,-25.5
+      parent: 1
+  - uid: 164
+    components:
+    - type: Transform
+      pos: 3.5,-26.5
+      parent: 1
+  - uid: 165
+    components:
+    - type: Transform
+      pos: 3.5,-27.5
+      parent: 1
+  - uid: 166
+    components:
+    - type: Transform
+      pos: 4.5,-27.5
+      parent: 1
+  - uid: 167
+    components:
+    - type: Transform
+      pos: 5.5,-27.5
+      parent: 1
+  - uid: 168
+    components:
+    - type: Transform
+      pos: 5.5,-26.5
+      parent: 1
+  - uid: 169
+    components:
+    - type: Transform
+      pos: 5.5,-25.5
+      parent: 1
+  - uid: 170
+    components:
+    - type: Transform
+      pos: 5.5,-24.5
+      parent: 1
+  - uid: 171
+    components:
+    - type: Transform
+      pos: 5.5,-23.5
+      parent: 1
+  - uid: 172
+    components:
+    - type: Transform
+      pos: 0.5,-8.5
+      parent: 1
+  - uid: 173
+    components:
+    - type: Transform
+      pos: 1.5,-26.5
+      parent: 1
+  - uid: 174
+    components:
+    - type: Transform
+      pos: 1.5,-8.5
+      parent: 1
+  - uid: 175
+    components:
+    - type: Transform
+      pos: -0.5,-26.5
+      parent: 1
+  - uid: 176
+    components:
+    - type: Transform
+      pos: -1.5,-26.5
+      parent: 1
+  - uid: 177
+    components:
+    - type: Transform
+      pos: 0.5,-26.5
+      parent: 1
+  - uid: 178
+    components:
+    - type: Transform
+      pos: -2.5,-26.5
+      parent: 1
+  - uid: 179
+    components:
+    - type: Transform
+      pos: -2.5,-27.5
+      parent: 1
+  - uid: 180
+    components:
+    - type: Transform
+      pos: 1.5,-27.5
+      parent: 1
+  - uid: 181
+    components:
+    - type: Transform
+      pos: -6.5,-28.5
+      parent: 1
+  - uid: 182
+    components:
+    - type: Transform
+      pos: -6.5,-29.5
+      parent: 1
+  - uid: 183
+    components:
+    - type: Transform
+      pos: -2.5,-28.5
+      parent: 1
+  - uid: 184
+    components:
+    - type: Transform
+      pos: -2.5,-29.5
+      parent: 1
+  - uid: 185
+    components:
+    - type: Transform
+      pos: -2.5,-30.5
+      parent: 1
+  - uid: 186
+    components:
+    - type: Transform
+      pos: -3.5,-30.5
+      parent: 1
+  - uid: 187
+    components:
+    - type: Transform
+      pos: -4.5,-30.5
+      parent: 1
+  - uid: 188
+    components:
+    - type: Transform
+      pos: -5.5,-30.5
+      parent: 1
+  - uid: 189
+    components:
+    - type: Transform
+      pos: 1.5,-28.5
+      parent: 1
+  - uid: 190
+    components:
+    - type: Transform
+      pos: 1.5,-29.5
+      parent: 1
+  - uid: 191
+    components:
+    - type: Transform
+      pos: 1.5,-30.5
+      parent: 1
+  - uid: 192
+    components:
+    - type: Transform
+      pos: 2.5,-30.5
+      parent: 1
+  - uid: 193
+    components:
+    - type: Transform
+      pos: 3.5,-30.5
+      parent: 1
+  - uid: 194
+    components:
+    - type: Transform
+      pos: 4.5,-30.5
+      parent: 1
+  - uid: 195
+    components:
+    - type: Transform
+      pos: 5.5,-28.5
+      parent: 1
+  - uid: 196
+    components:
+    - type: Transform
+      pos: 5.5,-29.5
+      parent: 1
+- proto: CableHV
+  entities:
+  - uid: 197
+    components:
+    - type: Transform
+      pos: -2.5,-21.5
+      parent: 1
+  - uid: 198
+    components:
+    - type: Transform
+      pos: -4.5,-26.5
+      parent: 1
+  - uid: 199
+    components:
+    - type: Transform
+      pos: -4.5,-27.5
+      parent: 1
+  - uid: 200
+    components:
+    - type: Transform
+      pos: -5.5,-27.5
+      parent: 1
+  - uid: 201
+    components:
+    - type: Transform
+      pos: -6.5,-27.5
+      parent: 1
+  - uid: 202
+    components:
+    - type: Transform
+      pos: -5.5,-23.5
+      parent: 1
+  - uid: 203
+    components:
+    - type: Transform
+      pos: -5.5,-22.5
+      parent: 1
+  - uid: 204
+    components:
+    - type: Transform
+      pos: -5.5,-20.5
+      parent: 1
+  - uid: 205
+    components:
+    - type: Transform
+      pos: -4.5,-20.5
+      parent: 1
+  - uid: 206
+    components:
+    - type: Transform
+      pos: -5.5,-19.5
+      parent: 1
+  - uid: 207
+    components:
+    - type: Transform
+      pos: -4.5,-19.5
+      parent: 1
+  - uid: 208
+    components:
+    - type: Transform
+      pos: -3.5,-19.5
+      parent: 1
+  - uid: 209
+    components:
+    - type: Transform
+      pos: -5.5,-21.5
+      parent: 1
+  - uid: 210
+    components:
+    - type: Transform
+      pos: -6.5,-26.5
+      parent: 1
+  - uid: 211
+    components:
+    - type: Transform
+      pos: -6.5,-25.5
+      parent: 1
+  - uid: 212
+    components:
+    - type: Transform
+      pos: -6.5,-24.5
+      parent: 1
+  - uid: 213
+    components:
+    - type: Transform
+      pos: -4.5,-23.5
+      parent: 1
+  - uid: 214
+    components:
+    - type: Transform
+      pos: -2.5,-20.5
+      parent: 1
+  - uid: 215
+    components:
+    - type: Transform
+      pos: -2.5,-19.5
+      parent: 1
+  - uid: 216
+    components:
+    - type: Transform
+      pos: -4.5,-25.5
+      parent: 1
+  - uid: 217
+    components:
+    - type: Transform
+      pos: -6.5,-23.5
+      parent: 1
+  - uid: 218
+    components:
+    - type: Transform
+      pos: -6.5,-20.5
+      parent: 1
+  - uid: 219
+    components:
+    - type: Transform
+      pos: -4.5,-24.5
+      parent: 1
+  - uid: 220
+    components:
+    - type: Transform
+      pos: -5.5,-18.5
+      parent: 1
+  - uid: 221
+    components:
+    - type: Transform
+      pos: -4.5,-18.5
+      parent: 1
+  - uid: 222
+    components:
+    - type: Transform
+      pos: -3.5,-18.5
+      parent: 1
+  - uid: 223
+    components:
+    - type: Transform
+      pos: -3.5,-21.5
+      parent: 1
+  - uid: 224
+    components:
+    - type: Transform
+      pos: -4.5,-21.5
+      parent: 1
+- proto: CableMV
+  entities:
+  - uid: 225
+    components:
+    - type: Transform
+      pos: -3.5,-19.5
+      parent: 1
+  - uid: 226
+    components:
+    - type: Transform
+      pos: -3.5,-18.5
+      parent: 1
+  - uid: 227
+    components:
+    - type: Transform
+      pos: -3.5,-17.5
+      parent: 1
+  - uid: 228
+    components:
+    - type: Transform
+      pos: -3.5,-16.5
+      parent: 1
+  - uid: 229
+    components:
+    - type: Transform
+      pos: -2.5,-16.5
+      parent: 1
+  - uid: 230
+    components:
+    - type: Transform
+      pos: -0.5,-16.5
+      parent: 1
+  - uid: 231
+    components:
+    - type: Transform
+      pos: -1.5,-16.5
+      parent: 1
+  - uid: 232
+    components:
+    - type: Transform
+      pos: -0.5,-15.5
+      parent: 1
+  - uid: 233
+    components:
+    - type: Transform
+      pos: -0.5,-14.5
+      parent: 1
+  - uid: 234
+    components:
+    - type: Transform
+      pos: -0.5,-13.5
+      parent: 1
+  - uid: 235
+    components:
+    - type: Transform
+      pos: -0.5,-12.5
+      parent: 1
+  - uid: 236
+    components:
+    - type: Transform
+      pos: -0.5,-11.5
+      parent: 1
+  - uid: 237
+    components:
+    - type: Transform
+      pos: -0.5,-10.5
+      parent: 1
+  - uid: 238
+    components:
+    - type: Transform
+      pos: -0.5,-9.5
+      parent: 1
+  - uid: 239
+    components:
+    - type: Transform
+      pos: -0.5,-8.5
+      parent: 1
+  - uid: 240
+    components:
+    - type: Transform
+      pos: -3.5,-20.5
+      parent: 1
+  - uid: 241
+    components:
+    - type: Transform
+      pos: -3.5,-21.5
+      parent: 1
+  - uid: 242
+    components:
+    - type: Transform
+      pos: -4.5,-21.5
+      parent: 1
+  - uid: 243
+    components:
+    - type: Transform
+      pos: -4.5,-22.5
+      parent: 1
+  - uid: 244
+    components:
+    - type: Transform
+      pos: -4.5,-23.5
+      parent: 1
+  - uid: 245
+    components:
+    - type: Transform
+      pos: -4.5,-24.5
+      parent: 1
+  - uid: 246
+    components:
+    - type: Transform
+      pos: -4.5,-25.5
+      parent: 1
+  - uid: 247
+    components:
+    - type: Transform
+      pos: -4.5,-26.5
+      parent: 1
+  - uid: 248
+    components:
+    - type: Transform
+      pos: -4.5,-27.5
+      parent: 1
+  - uid: 249
+    components:
+    - type: Transform
+      pos: 1.5,-8.5
+      parent: 1
+  - uid: 250
+    components:
+    - type: Transform
+      pos: 0.5,-8.5
+      parent: 1
+- proto: CableTerminal
+  entities:
+  - uid: 251
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-20.5
+      parent: 1
+    - type: Physics
+      canCollide: False
+    - type: Fixtures
+      fixtures: {}
+  - uid: 252
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-20.5
+      parent: 1
+    - type: Physics
+      canCollide: False
+    - type: Fixtures
+      fixtures: {}
+- proto: Carpet
+  entities:
+  - uid: 253
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-5.5
+      parent: 1
+  - uid: 254
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-4.5
+      parent: 1
+- proto: Catwalk
+  entities:
+  - uid: 255
+    components:
+    - type: Transform
+      pos: -2.5,-26.5
+      parent: 1
+  - uid: 256
+    components:
+    - type: Transform
+      pos: -2.5,-28.5
+      parent: 1
+  - uid: 257
+    components:
+    - type: Transform
+      pos: -8.5,-16.5
+      parent: 1
+  - uid: 258
+    components:
+    - type: Transform
+      pos: -1.5,-16.5
+      parent: 1
+  - uid: 259
+    components:
+    - type: Transform
+      pos: -2.5,-16.5
+      parent: 1
+  - uid: 260
+    components:
+    - type: Transform
+      pos: 4.5,-24.5
+      parent: 1
+  - uid: 261
+    components:
+    - type: Transform
+      pos: 5.5,-24.5
+      parent: 1
+  - uid: 262
+    components:
+    - type: Transform
+      pos: -6.5,-16.5
+      parent: 1
+  - uid: 263
+    components:
+    - type: Transform
+      pos: -7.5,-16.5
+      parent: 1
+  - uid: 264
+    components:
+    - type: Transform
+      pos: -4.5,-13.5
+      parent: 1
+  - uid: 265
+    components:
+    - type: Transform
+      pos: -4.5,-12.5
+      parent: 1
+  - uid: 266
+    components:
+    - type: Transform
+      pos: -4.5,-11.5
+      parent: 1
+  - uid: 267
+    components:
+    - type: Transform
+      pos: 3.5,-13.5
+      parent: 1
+  - uid: 268
+    components:
+    - type: Transform
+      pos: 3.5,-12.5
+      parent: 1
+  - uid: 269
+    components:
+    - type: Transform
+      pos: 3.5,-11.5
+      parent: 1
+  - uid: 270
+    components:
+    - type: Transform
+      pos: 5.5,-16.5
+      parent: 1
+  - uid: 271
+    components:
+    - type: Transform
+      pos: 6.5,-16.5
+      parent: 1
+  - uid: 272
+    components:
+    - type: Transform
+      pos: -0.5,-24.5
+      parent: 1
+  - uid: 273
+    components:
+    - type: Transform
+      pos: -0.5,-23.5
+      parent: 1
+  - uid: 274
+    components:
+    - type: Transform
+      pos: -0.5,-16.5
+      parent: 1
+  - uid: 275
+    components:
+    - type: Transform
+      pos: 5.5,-9.5
+      parent: 1
+  - uid: 276
+    components:
+    - type: Transform
+      pos: 3.5,-9.5
+      parent: 1
+  - uid: 277
+    components:
+    - type: Transform
+      pos: 0.5,-16.5
+      parent: 1
+  - uid: 278
+    components:
+    - type: Transform
+      pos: 0.5,-26.5
+      parent: 1
+  - uid: 279
+    components:
+    - type: Transform
+      pos: 1.5,-27.5
+      parent: 1
+  - uid: 280
+    components:
+    - type: Transform
+      pos: -2.5,-27.5
+      parent: 1
+  - uid: 281
+    components:
+    - type: Transform
+      pos: -2.5,-29.5
+      parent: 1
+  - uid: 282
+    components:
+    - type: Transform
+      pos: 1.5,-26.5
+      parent: 1
+  - uid: 283
+    components:
+    - type: Transform
+      pos: 4.5,-9.5
+      parent: 1
+  - uid: 284
+    components:
+    - type: Transform
+      pos: -0.5,-26.5
+      parent: 1
+  - uid: 285
+    components:
+    - type: Transform
+      pos: 1.5,-28.5
+      parent: 1
+  - uid: 286
+    components:
+    - type: Transform
+      pos: 1.5,-29.5
+      parent: 1
+  - uid: 287
+    components:
+    - type: Transform
+      pos: -1.5,-26.5
+      parent: 1
+  - uid: 288
+    components:
+    - type: Transform
+      pos: -3.5,-9.5
+      parent: 1
+  - uid: 289
+    components:
+    - type: Transform
+      pos: 1.5,-16.5
+      parent: 1
+  - uid: 290
+    components:
+    - type: Transform
+      pos: 2.5,-9.5
+      parent: 1
+  - uid: 291
+    components:
+    - type: Transform
+      pos: -6.5,-9.5
+      parent: 1
+  - uid: 292
+    components:
+    - type: Transform
+      pos: -5.5,-9.5
+      parent: 1
+  - uid: 293
+    components:
+    - type: Transform
+      pos: -4.5,-9.5
+      parent: 1
+  - uid: 294
+    components:
+    - type: Transform
+      pos: 7.5,-16.5
+      parent: 1
+  - uid: 295
+    components:
+    - type: Transform
+      pos: -0.5,-13.5
+      parent: 1
+  - uid: 296
+    components:
+    - type: Transform
+      pos: -0.5,-12.5
+      parent: 1
+  - uid: 297
+    components:
+    - type: Transform
+      pos: -0.5,-11.5
+      parent: 1
+- proto: Chair
+  entities:
+  - uid: 298
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-21.5
+      parent: 1
+  - uid: 299
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-21.5
+      parent: 1
+- proto: ChairOfficeDark
+  entities:
+  - uid: 300
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-3.5
+      parent: 1
+- proto: ChairPilotSeat
+  entities:
+  - uid: 301
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-21.5
+      parent: 1
+  - uid: 302
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-8.5
+      parent: 1
+  - uid: 303
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-9.5
+      parent: 1
+  - uid: 304
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-10.5
+      parent: 1
+  - uid: 305
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-8.5
+      parent: 1
+  - uid: 306
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-10.5
+      parent: 1
+  - uid: 307
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-9.5
+      parent: 1
+  - uid: 308
+    components:
+    - type: Transform
+      pos: -2.5,-15.5
+      parent: 1
+  - uid: 309
+    components:
+    - type: Transform
+      pos: -1.5,-15.5
+      parent: 1
+  - uid: 310
+    components:
+    - type: Transform
+      pos: 0.5,-15.5
+      parent: 1
+  - uid: 311
+    components:
+    - type: Transform
+      pos: 1.5,-15.5
+      parent: 1
+  - uid: 312
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-3.5
+      parent: 1
+- proto: CigPackSyndicate
+  entities:
+  - uid: 313
+    components:
+    - type: Transform
+      pos: -3.5658307,-17.516623
+      parent: 1
+- proto: ClothingBackpackDuffelSyndicateFilledMedical
+  entities:
+  - uid: 314
+    components:
+    - type: Transform
+      pos: -3.5044222,-6.293252
+      parent: 1
+- proto: ClothingHeadHatSyndie
+  entities:
+  - uid: 315
+    components:
+    - type: Transform
+      pos: -3.1200604,-17.289778
+      parent: 1
+- proto: ClothingHeadHatSyndieMAA
+  entities:
+  - uid: 35
+    components:
+    - type: Transform
+      parent: 33
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ClothingHeadPyjamaSyndicateRed
+  entities:
+  - uid: 36
+    components:
+    - type: Transform
+      parent: 33
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ClothingHeadsetAltSyndicate
+  entities:
+  - uid: 316
+    components:
+    - type: Transform
+      pos: 1.3157192,-13.513277
+      parent: 1
+- proto: ClothingMaskGasSyndicate
+  entities:
+  - uid: 317
+    components:
+    - type: Transform
+      pos: 0.94071925,-13.482027
+      parent: 1
+- proto: ClothingNeckMantleHOS
+  entities:
+  - uid: 37
+    components:
+    - type: MetaData
+      desc: Looted from a fallen enemy, the commander earned this in battle.
+      name: commander mantle
+    - type: Transform
+      parent: 33
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ClothingOuterCoatSyndieCap
+  entities:
+  - uid: 38
+    components:
+    - type: Transform
+      parent: 33
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ClothingUniformJumpskirtSyndieFormalDress
+  entities:
+  - uid: 39
+    components:
+    - type: Transform
+      parent: 33
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ClothingUniformJumpsuitPyjamaSyndicateRed
+  entities:
+  - uid: 40
+    components:
+    - type: Transform
+      parent: 33
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ClothingUniformJumpsuitSyndieFormal
+  entities:
+  - uid: 41
+    components:
+    - type: Transform
+      parent: 33
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ComfyChair
+  entities:
+  - uid: 318
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-4.5
+      parent: 1
+- proto: computerBodyScanner
+  entities:
+  - uid: 319
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-5.5
+      parent: 1
+- proto: ComputerIFFSyndicate
+  entities:
+  - uid: 320
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-3.5
+      parent: 1
+- proto: ComputerPowerMonitoring
+  entities:
+  - uid: 321
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-21.5
+      parent: 1
+- proto: ComputerRadar
+  entities:
+  - uid: 322
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 1
+- proto: ComputerShuttleSyndie
+  entities:
+  - uid: 323
+    components:
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 1
+- proto: CrowbarRed
+  entities:
+  - uid: 324
+    components:
+    - type: Transform
+      pos: -3.492848,-22.485775
+      parent: 1
+- proto: DisposalBend
+  entities:
+  - uid: 325
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-6.5
+      parent: 1
+- proto: DisposalJunction
+  entities:
+  - uid: 326
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-19.5
+      parent: 1
+- proto: DisposalPipe
+  entities:
+  - uid: 327
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-6.5
+      parent: 1
+  - uid: 328
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-19.5
+      parent: 1
+  - uid: 329
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-19.5
+      parent: 1
+  - uid: 330
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-19.5
+      parent: 1
+  - uid: 331
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-19.5
+      parent: 1
+  - uid: 332
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-19.5
+      parent: 1
+  - uid: 333
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-19.5
+      parent: 1
+  - uid: 334
+    components:
+    - type: Transform
+      pos: -0.5,-18.5
+      parent: 1
+  - uid: 335
+    components:
+    - type: Transform
+      pos: -0.5,-17.5
+      parent: 1
+  - uid: 336
+    components:
+    - type: Transform
+      pos: -0.5,-16.5
+      parent: 1
+  - uid: 337
+    components:
+    - type: Transform
+      pos: -0.5,-15.5
+      parent: 1
+  - uid: 338
+    components:
+    - type: Transform
+      pos: -0.5,-14.5
+      parent: 1
+  - uid: 339
+    components:
+    - type: Transform
+      pos: -0.5,-13.5
+      parent: 1
+  - uid: 340
+    components:
+    - type: Transform
+      pos: -0.5,-12.5
+      parent: 1
+  - uid: 341
+    components:
+    - type: Transform
+      pos: -0.5,-11.5
+      parent: 1
+  - uid: 342
+    components:
+    - type: Transform
+      pos: -0.5,-10.5
+      parent: 1
+  - uid: 343
+    components:
+    - type: Transform
+      pos: -0.5,-9.5
+      parent: 1
+  - uid: 344
+    components:
+    - type: Transform
+      pos: -0.5,-8.5
+      parent: 1
+  - uid: 345
+    components:
+    - type: Transform
+      pos: -0.5,-7.5
+      parent: 1
+- proto: DisposalTrunk
+  entities:
+  - uid: 346
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-6.5
+      parent: 1
+  - uid: 347
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-19.5
+      parent: 1
+  - uid: 348
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-19.5
+      parent: 1
+- proto: DisposalUnit
+  entities:
+  - uid: 349
+    components:
+    - type: Transform
+      pos: 1.5,-6.5
+      parent: 1
+  - uid: 350
+    components:
+    - type: Transform
+      pos: 0.5,-19.5
+      parent: 1
+- proto: DoubleEmergencyOxygenTankFilled
+  entities:
+  - uid: 351
+    components:
+    - type: Transform
+      pos: -1.6924903,-23.407444
+      parent: 1
+  - uid: 352
+    components:
+    - type: Transform
+      pos: -1.4112403,-23.458082
+      parent: 1
+  - uid: 353
+    components:
+    - type: Transform
+      pos: 5.390987,-17.346693
+      parent: 1
+  - uid: 354
+    components:
+    - type: Transform
+      pos: -6.6334953,-17.346693
+      parent: 1
+- proto: DrinkGlass
+  entities:
+  - uid: 355
+    components:
+    - type: Transform
+      pos: 2.0779252,-19.21155
+      parent: 1
+  - uid: 356
+    components:
+    - type: Transform
+      pos: 2.3123002,-19.21155
+      parent: 1
+- proto: DrinkMugDog
+  entities:
+  - uid: 357
+    components:
+    - type: Transform
+      pos: 2.2843437,-19.542192
+      parent: 1
+- proto: DrinkMugMetal
+  entities:
+  - uid: 358
+    components:
+    - type: Transform
+      pos: 2.0968437,-19.526567
+      parent: 1
+- proto: DrinkMugRed
+  entities:
+  - uid: 359
+    components:
+    - type: Transform
+      pos: 1.9918958,-17.588755
+      parent: 1
+- proto: DrinkVacuumFlask
+  entities:
+  - uid: 360
+    components:
+    - type: Transform
+      pos: 5.6435027,-21.180143
+      parent: 1
+  - uid: 361
+    components:
+    - type: Transform
+      pos: 5.7372527,-21.398893
+      parent: 1
+- proto: ExtendedEmergencyOxygenTankFilled
+  entities:
+  - uid: 362
+    components:
+    - type: Transform
+      pos: -5.678572,-12.319441
+      parent: 1
+  - uid: 363
+    components:
+    - type: Transform
+      pos: 4.305803,-12.272566
+      parent: 1
+- proto: FireAxeFlaming
+  entities:
+  - uid: 23
+    components:
+    - type: Transform
+      pos: -1.5018963,-3.4569345
+      parent: 1
+- proto: FoodBoxDonkpocketPizza
+  entities:
+  - uid: 364
+    components:
+    - type: Transform
+      pos: 2.7185502,-19.320925
+      parent: 1
+- proto: FoodBoxDonut
+  entities:
+  - uid: 365
+    components:
+    - type: Transform
+      pos: 5.5401826,-21.187487
+      parent: 1
+- proto: FoodPizzaDonkpocket
+  entities:
+  - uid: 366
+    components:
+    - type: Transform
+      pos: 1.4776825,-21.296862
+      parent: 1
+- proto: FoodSnackSyndi
+  entities:
+  - uid: 367
+    components:
+    - type: Transform
+      pos: 1.5361897,-17.367903
+      parent: 1
+- proto: GasMinerNitrogen
+  entities:
+  - uid: 368
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-27.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+- proto: GasMinerOxygen
+  entities:
+  - uid: 369
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-27.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+- proto: GasMixer
+  entities:
+  - uid: 370
+    components:
+    - type: MetaData
+      name: O2+N2 mixer
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-24.5
+      parent: 1
+    - type: GasMixer
+      inletTwoConcentration: 0.78
+      inletOneConcentration: 0.22
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+- proto: GasPassiveVent
+  entities:
+  - uid: 371
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-26.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+  - uid: 372
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-26.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+  - uid: 373
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-19.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+- proto: GasPipeBend
+  entities:
+  - uid: 374
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 375
+    components:
+    - type: Transform
+      pos: 5.5,-24.5
+      parent: 1
+  - uid: 376
+    components:
+    - type: Transform
+      pos: 3.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 377
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 378
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 379
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 380
+    components:
+    - type: Transform
+      pos: 0.5,-8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 381
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 382
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 383
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-21.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+- proto: GasPipeFourway
+  entities:
+  - uid: 384
+    components:
+    - type: Transform
+      pos: 3.5,-23.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 385
+    components:
+    - type: Transform
+      pos: -0.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 386
+    components:
+    - type: Transform
+      pos: -0.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 387
+    components:
+    - type: Transform
+      pos: 0.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+- proto: GasPipeStraight
+  entities:
+  - uid: 388
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-25.5
+      parent: 1
+  - uid: 389
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-25.5
+      parent: 1
+  - uid: 390
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-24.5
+      parent: 1
+  - uid: 391
+    components:
+    - type: Transform
+      pos: 3.5,-22.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 392
+    components:
+    - type: Transform
+      pos: 3.5,-21.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 393
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 394
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 395
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 396
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 397
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 398
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 399
+    components:
+    - type: Transform
+      pos: -0.5,-19.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 400
+    components:
+    - type: Transform
+      pos: -0.5,-18.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 401
+    components:
+    - type: Transform
+      pos: -0.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 402
+    components:
+    - type: Transform
+      pos: -0.5,-15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 403
+    components:
+    - type: Transform
+      pos: -0.5,-14.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 404
+    components:
+    - type: Transform
+      pos: -0.5,-13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 405
+    components:
+    - type: Transform
+      pos: -0.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 406
+    components:
+    - type: Transform
+      pos: -0.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 407
+    components:
+    - type: Transform
+      pos: -0.5,-9.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 408
+    components:
+    - type: Transform
+      pos: -0.5,-8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 409
+    components:
+    - type: Transform
+      pos: -0.5,-7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 410
+    components:
+    - type: Transform
+      pos: -0.5,-6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 411
+    components:
+    - type: Transform
+      pos: 0.5,-18.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 412
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 413
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 414
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 415
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 416
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 417
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 418
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-19.5
+      parent: 1
+  - uid: 419
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-19.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 420
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-19.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 421
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 422
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 423
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 424
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 425
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 426
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 427
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 428
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 429
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 430
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-14.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 431
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 432
+    components:
+    - type: Transform
+      pos: 0.5,-11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 433
+    components:
+    - type: Transform
+      pos: 0.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 434
+    components:
+    - type: Transform
+      pos: 0.5,-9.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 435
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 436
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 437
+    components:
+    - type: Transform
+      pos: 0.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 438
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-21.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 439
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-21.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 440
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-21.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 441
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 442
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+- proto: GasPipeTJunction
+  entities:
+  - uid: 443
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 444
+    components:
+    - type: Transform
+      pos: 2.5,-19.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 445
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-19.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 446
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+- proto: GasPort
+  entities:
+  - uid: 447
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-23.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+- proto: GasPressurePump
+  entities:
+  - uid: 448
+    components:
+    - type: MetaData
+      name: waste pump
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-19.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+- proto: GasVentPump
+  entities:
+  - uid: 449
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-11.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 450
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-21.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 451
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-23.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 452
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-21.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 453
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-16.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 454
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-16.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 455
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+- proto: GasVentScrubber
+  entities:
+  - uid: 456
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-12.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 457
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-17.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 458
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-20.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 459
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-17.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 460
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-21.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 461
+    components:
+    - type: Transform
+      pos: -0.5,-3.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+- proto: GeneratorBasic15kW
+  entities:
+  - uid: 462
+    components:
+    - type: Transform
+      pos: -4.5,-26.5
+      parent: 1
+  - uid: 463
+    components:
+    - type: Transform
+      pos: -4.5,-25.5
+      parent: 1
+  - uid: 464
+    components:
+    - type: Transform
+      pos: -4.5,-24.5
+      parent: 1
+  - uid: 465
+    components:
+    - type: Transform
+      pos: -6.5,-24.5
+      parent: 1
+  - uid: 466
+    components:
+    - type: Transform
+      pos: -6.5,-25.5
+      parent: 1
+  - uid: 467
+    components:
+    - type: Transform
+      pos: -6.5,-26.5
+      parent: 1
+- proto: GeneratorWallmountAPU
+  entities:
+  - uid: 468
+    components:
+    - type: Transform
+      pos: -6.5,-20.5
+      parent: 1
+- proto: GravityGeneratorMini
+  entities:
+  - uid: 469
+    components:
+    - type: Transform
+      pos: -5.5,-22.5
+      parent: 1
+- proto: Grille
+  entities:
+  - uid: 470
+    components:
+    - type: Transform
+      pos: 2.5,-12.5
+      parent: 1
+  - uid: 471
+    components:
+    - type: Transform
+      pos: -3.5,-12.5
+      parent: 1
+  - uid: 472
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-7.5
+      parent: 1
+  - uid: 473
+    components:
+    - type: Transform
+      pos: -2.5,-1.5
+      parent: 1
+  - uid: 474
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 1
+  - uid: 475
+    components:
+    - type: Transform
+      pos: -4.5,-2.5
+      parent: 1
+  - uid: 476
+    components:
+    - type: Transform
+      pos: -6.5,-4.5
+      parent: 1
+  - uid: 477
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 1
+  - uid: 478
+    components:
+    - type: Transform
+      pos: -1.5,-1.5
+      parent: 1
+  - uid: 479
+    components:
+    - type: Transform
+      pos: 5.5,-4.5
+      parent: 1
+  - uid: 480
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 1
+  - uid: 481
+    components:
+    - type: Transform
+      pos: 1.5,-9.5
+      parent: 1
+  - uid: 482
+    components:
+    - type: Transform
+      pos: -2.5,-9.5
+      parent: 1
+  - uid: 483
+    components:
+    - type: Transform
+      pos: 1.5,-1.5
+      parent: 1
+  - uid: 484
+    components:
+    - type: Transform
+      pos: -2.5,-21.5
+      parent: 1
+  - uid: 485
+    components:
+    - type: Transform
+      pos: -2.5,-19.5
+      parent: 1
+  - uid: 486
+    components:
+    - type: Transform
+      pos: 2.5,-22.5
+      parent: 1
+  - uid: 487
+    components:
+    - type: Transform
+      pos: 4.5,-22.5
+      parent: 1
+  - uid: 488
+    components:
+    - type: Transform
+      pos: -1.5,-18.5
+      parent: 1
+  - uid: 489
+    components:
+    - type: Transform
+      pos: 0.5,-7.5
+      parent: 1
+  - uid: 490
+    components:
+    - type: Transform
+      pos: 3.5,-25.5
+      parent: 1
+  - uid: 491
+    components:
+    - type: Transform
+      pos: 5.5,-25.5
+      parent: 1
+  - uid: 492
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-19.5
+      parent: 1
+  - uid: 493
+    components:
+    - type: Transform
+      pos: 0.5,-18.5
+      parent: 1
+- proto: Gyroscope
+  entities:
+  - uid: 494
+    components:
+    - type: Transform
+      pos: -5.5,-13.5
+      parent: 1
+  - uid: 495
+    components:
+    - type: Transform
+      pos: 4.5,-13.5
+      parent: 1
+- proto: HospitalCurtainsOpen
+  entities:
+  - uid: 496
+    components:
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 1
+- proto: KitchenMicrowave
+  entities:
+  - uid: 497
+    components:
+    - type: Transform
+      pos: 3.5,-19.5
+      parent: 1
+- proto: KnifePlastic
+  entities:
+  - uid: 498
+    components:
+    - type: Transform
+      pos: 5.3509636,-21.445768
+      parent: 1
+- proto: Lamp
+  entities:
+  - uid: 499
+    components:
+    - type: Transform
+      pos: -1.483297,-2.2444057
+      parent: 1
+- proto: LockerSyndicatePersonal
+  entities:
+  - uid: 33
+    components:
+    - type: Transform
+      pos: 4.5,-5.5
+      parent: 1
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.1496
+        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:
+          - 37
+          - 39
+          - 36
+          - 40
+          - 41
+          - 38
+          - 35
+          - 34
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+- proto: MedicalBed
+  entities:
+  - uid: 500
+    components:
+    - type: Transform
+      pos: -4.5,-3.5
+      parent: 1
+- proto: MedkitCombatFilled
+  entities:
+  - uid: 501
+    components:
+    - type: Transform
+      pos: -3.401462,-3.5350046
+      parent: 1
+  - uid: 502
+    components:
+    - type: Transform
+      pos: -3.557712,-3.4256296
+      parent: 1
+- proto: Mirror
+  entities:
+  - uid: 503
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 1
+- proto: Multitool
+  entities:
+  - uid: 504
+    components:
+    - type: Transform
+      pos: -3.383473,-22.548275
+      parent: 1
+- proto: NitrogenTankFilled
+  entities:
+  - uid: 505
+    components:
+    - type: Transform
+      pos: 4.633928,-12.616316
+      parent: 1
+  - uid: 506
+    components:
+    - type: Transform
+      pos: -5.397322,-12.569441
+      parent: 1
+  - uid: 507
+    components:
+    - type: Transform
+      pos: -6.3522453,-17.549818
+      parent: 1
+  - uid: 508
+    components:
+    - type: Transform
+      pos: 5.6633797,-17.565443
+      parent: 1
+- proto: NuclearBombUnanchored
+  entities:
+  - uid: 509
+    components:
+    - type: Transform
+      pos: -2.5,-12.5
+      parent: 1
+- proto: NukeCodePaper
+  entities:
+  - uid: 510
+    components:
+    - type: Transform
+      pos: -2.5286522,-11.44479
+      parent: 1
+- proto: Ointment
+  entities:
+  - uid: 511
+    components:
+    - type: Transform
+      pos: -3.651462,-4.5193796
+      parent: 1
+  - uid: 512
+    components:
+    - type: Transform
+      pos: -3.667087,-4.2225046
+      parent: 1
+- proto: OperatingTable
+  entities:
+  - uid: 513
+    components:
+    - type: Transform
+      pos: -5.5,-4.5
+      parent: 1
+- proto: OxygenCanister
+  entities:
+  - uid: 514
+    components:
+    - type: Transform
+      pos: -1.5,-24.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+- proto: OxygenTankFilled
+  entities:
+  - uid: 515
+    components:
+    - type: Transform
+      pos: -5.600447,-12.569441
+      parent: 1
+  - uid: 516
+    components:
+    - type: Transform
+      pos: 4.399553,-12.522566
+      parent: 1
+  - uid: 517
+    components:
+    - type: Transform
+      pos: 5.5227547,-17.440443
+      parent: 1
+  - uid: 518
+    components:
+    - type: Transform
+      pos: -6.4928703,-17.440443
+      parent: 1
+- proto: PinpointerNuclear
+  entities:
+  - uid: 519
+    components:
+    - type: Transform
+      pos: -2.4942985,-13.37949
+      parent: 1
+- proto: PlasmaReinforcedWindowDirectional
+  entities:
+  - uid: 520
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-4.5
+      parent: 1
+  - uid: 521
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-6.5
+      parent: 1
+  - uid: 522
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-3.5
+      parent: 1
+- proto: PlushieNuke
+  entities:
+  - uid: 523
+    components:
+    - type: Transform
+      pos: -2.4227936,-2.3320491
+      parent: 1
+- proto: PosterContrabandC20r
+  entities:
+  - uid: 524
+    components:
+    - type: Transform
+      pos: 1.5,-14.5
+      parent: 1
+- proto: PosterContrabandCC64KAd
+  entities:
+  - uid: 525
+    components:
+    - type: Transform
+      pos: -5.5,-18.5
+      parent: 1
+- proto: PosterContrabandCybersun600
+  entities:
+  - uid: 526
+    components:
+    - type: Transform
+      pos: 2.5,-6.5
+      parent: 1
+- proto: PosterContrabandDonk
+  entities:
+  - uid: 527
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-18.5
+      parent: 1
+- proto: PosterContrabandDonutCorp
+  entities:
+  - uid: 528
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-22.5
+      parent: 1
+- proto: PosterContrabandEnergySwords
+  entities:
+  - uid: 529
+    components:
+    - type: Transform
+      pos: 2.5,-18.5
+      parent: 1
+- proto: PosterContrabandEnlistGorlex
+  entities:
+  - uid: 530
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-13.5
+      parent: 1
+- proto: PosterContrabandFreeSyndicateEncryptionKey
+  entities:
+  - uid: 531
+    components:
+    - type: Transform
+      pos: -2.5,-8.5
+      parent: 1
+- proto: PosterContrabandInterdyne
+  entities:
+  - uid: 532
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-6.5
+      parent: 1
+- proto: PosterContrabandKosmicheskayaStantsiya
+  entities:
+  - uid: 533
+    components:
+    - type: Transform
+      pos: -2.5,-22.5
+      parent: 1
+- proto: PosterContrabandMoth
+  entities:
+  - uid: 534
+    components:
+    - type: Transform
+      pos: -2.5,-14.5
+      parent: 1
+  - uid: 535
+    components:
+    - type: Transform
+      pos: 2.5,-3.5
+      parent: 1
+- proto: PosterContrabandNuclearDeviceInformational
+  entities:
+  - uid: 536
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-13.5
+      parent: 1
+  - uid: 537
+    components:
+    - type: Transform
+      pos: 0.5,-14.5
+      parent: 1
+- proto: PosterContrabandSyndicatePistol
+  entities:
+  - uid: 538
+    components:
+    - type: Transform
+      pos: 1.5,-10.5
+      parent: 1
+- proto: PosterContrabandSyndicateRecruitment
+  entities:
+  - uid: 539
+    components:
+    - type: Transform
+      pos: -1.5,-14.5
+      parent: 1
+- proto: PosterContrabandWaffleCorp
+  entities:
+  - uid: 540
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-23.5
+      parent: 1
+- proto: Poweredlight
+  entities:
+  - uid: 541
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-8.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 542
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-4.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 543
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-23.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 544
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-26.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 545
+    components:
+    - type: Transform
+      pos: -4.5,-19.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 546
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-13.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 547
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-27.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 548
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-27.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 549
+    components:
+    - type: Transform
+      pos: 2.5,-15.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 550
+    components:
+    - type: Transform
+      pos: -3.5,-15.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 551
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-5.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 552
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-2.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 553
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-6.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+- proto: PoweredSmallLight
+  entities:
+  - uid: 554
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-13.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 555
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-21.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 556
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-5.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 557
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-24.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 558
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-13.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 559
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-24.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 560
+    components:
+    - type: Transform
+      pos: -6.5,-15.5
+      parent: 1
+  - uid: 561
+    components:
+    - type: Transform
+      pos: 5.5,-15.5
+      parent: 1
+  - uid: 562
+    components:
+    - type: Transform
+      pos: 2.5,-19.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 563
+    components:
+    - type: Transform
+      pos: -1.5,-26.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 564
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-9.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 565
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-9.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+- proto: Rack
+  entities:
+  - uid: 566
+    components:
+    - type: Transform
+      pos: -3.5,-22.5
+      parent: 1
+  - uid: 567
+    components:
+    - type: Transform
+      pos: 5.5,-23.5
+      parent: 1
+  - uid: 568
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-12.5
+      parent: 1
+  - uid: 569
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-12.5
+      parent: 1
+  - uid: 570
+    components:
+    - type: Transform
+      pos: -1.5,-23.5
+      parent: 1
+  - uid: 571
+    components:
+    - type: Transform
+      pos: -6.5,-17.5
+      parent: 1
+  - uid: 572
+    components:
+    - type: Transform
+      pos: 5.5,-17.5
+      parent: 1
+- proto: ReinforcedPlasmaWindow
+  entities:
+  - uid: 573
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 1
+  - uid: 574
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-19.5
+      parent: 1
+  - uid: 575
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 1
+  - uid: 576
+    components:
+    - type: Transform
+      pos: -6.5,-4.5
+      parent: 1
+  - uid: 577
+    components:
+    - type: Transform
+      pos: -2.5,-1.5
+      parent: 1
+  - uid: 578
+    components:
+    - type: Transform
+      pos: -4.5,-2.5
+      parent: 1
+  - uid: 579
+    components:
+    - type: Transform
+      pos: 5.5,-4.5
+      parent: 1
+  - uid: 580
+    components:
+    - type: Transform
+      pos: -1.5,-1.5
+      parent: 1
+  - uid: 581
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 1
+  - uid: 582
+    components:
+    - type: Transform
+      pos: 1.5,-1.5
+      parent: 1
+  - uid: 583
+    components:
+    - type: Transform
+      pos: -1.5,-7.5
+      parent: 1
+  - uid: 584
+    components:
+    - type: Transform
+      pos: 4.5,-22.5
+      parent: 1
+  - uid: 585
+    components:
+    - type: Transform
+      pos: 2.5,-22.5
+      parent: 1
+  - uid: 586
+    components:
+    - type: Transform
+      pos: -2.5,-21.5
+      parent: 1
+  - uid: 587
+    components:
+    - type: Transform
+      pos: -2.5,-19.5
+      parent: 1
+  - uid: 588
+    components:
+    - type: Transform
+      pos: -2.5,-9.5
+      parent: 1
+  - uid: 589
+    components:
+    - type: Transform
+      pos: 1.5,-9.5
+      parent: 1
+  - uid: 590
+    components:
+    - type: Transform
+      pos: 0.5,-18.5
+      parent: 1
+  - uid: 591
+    components:
+    - type: Transform
+      pos: 3.5,-25.5
+      parent: 1
+  - uid: 592
+    components:
+    - type: Transform
+      pos: 5.5,-25.5
+      parent: 1
+  - uid: 593
+    components:
+    - type: Transform
+      pos: 2.5,-12.5
+      parent: 1
+  - uid: 594
+    components:
+    - type: Transform
+      pos: -3.5,-12.5
+      parent: 1
+  - uid: 595
+    components:
+    - type: Transform
+      pos: 0.5,-7.5
+      parent: 1
+  - uid: 596
+    components:
+    - type: Transform
+      pos: -1.5,-18.5
+      parent: 1
+- proto: ShuttersNormalOpen
+  entities:
+  - uid: 597
+    components:
+    - type: Transform
+      pos: -6.5,-4.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 21
+  - uid: 598
+    components:
+    - type: Transform
+      pos: 5.5,-4.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 20
+  - uid: 599
+    components:
+    - type: Transform
+      pos: 1.5,-9.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 609
+  - uid: 600
+    components:
+    - type: Transform
+      pos: -2.5,-9.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 609
+  - uid: 601
+    components:
+    - type: Transform
+      pos: -4.5,-2.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 21
+  - uid: 602
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 20
+  - uid: 603
+    components:
+    - type: Transform
+      pos: 1.5,-1.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 21
+  - uid: 604
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 21
+  - uid: 605
+    components:
+    - type: Transform
+      pos: 5.5,-19.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 611
+  - uid: 606
+    components:
+    - type: Transform
+      pos: -1.5,-1.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 21
+  - uid: 607
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 21
+  - uid: 608
+    components:
+    - type: Transform
+      pos: -2.5,-1.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 21
+- proto: SignalButton
+  entities:
+  - uid: 609
+    components:
+    - type: Transform
+      pos: -2.5,-10.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        600:
+        - Pressed: Toggle
+        599:
+        - Pressed: Toggle
+  - uid: 611
+    components:
+    - type: Transform
+      pos: 5.5,-20.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        605:
+        - Pressed: Toggle
+- proto: SignalButtonDirectional
+  entities:
+  - uid: 20
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-4.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        602:
+        - Pressed: Toggle
+        598:
+        - Pressed: Toggle
+  - uid: 21
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-7.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        597:
+        - Pressed: Toggle
+        601:
+        - Pressed: Toggle
+        608:
+        - Pressed: Toggle
+        606:
+        - Pressed: Toggle
+        604:
+        - Pressed: Toggle
+        607:
+        - Pressed: Toggle
+        603:
+        - Pressed: Toggle
+- proto: SignDirectionalEvac
+  entities:
+  - uid: 613
+    components:
+    - type: Transform
+      pos: 0.5,-22.5
+      parent: 1
+  - uid: 614
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-15.5
+      parent: 1
+  - uid: 615
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-14.5
+      parent: 1
+  - uid: 616
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-14.5
+      parent: 1
+  - uid: 617
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-15.5
+      parent: 1
+- proto: SignElectricalMed
+  entities:
+  - uid: 618
+    components:
+    - type: Transform
+      pos: -2.5,-18.5
+      parent: 1
+- proto: SignNosmoking
+  entities:
+  - uid: 619
+    components:
+    - type: Transform
+      pos: 5.5,-22.5
+      parent: 1
+- proto: SignSecureSmallRed
+  entities:
+  - uid: 620
+    components:
+    - type: Transform
+      pos: -3.5,-11.5
+      parent: 1
+  - uid: 621
+    components:
+    - type: Transform
+      pos: 4.5,-17.5
+      parent: 1
+  - uid: 622
+    components:
+    - type: Transform
+      pos: 2.5,-11.5
+      parent: 1
+- proto: SMESBasic
+  entities:
+  - uid: 623
+    components:
+    - type: Transform
+      pos: -5.5,-19.5
+      parent: 1
+  - uid: 624
+    components:
+    - type: Transform
+      pos: -4.5,-19.5
+      parent: 1
+- proto: SoapSyndie
+  entities:
+  - uid: 625
+    components:
+    - type: Transform
+      pos: 2.4424396,-17.430403
+      parent: 1
+- proto: soda_dispenser
+  entities:
+  - uid: 626
+    components:
+    - type: Transform
+      pos: 1.5,-19.5
+      parent: 1
+- proto: StorageCanister
+  entities:
+  - uid: 627
+    components:
+    - type: Transform
+      pos: 2.5,-23.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+- proto: SubstationBasic
+  entities:
+  - uid: 628
+    components:
+    - type: Transform
+      pos: -3.5,-19.5
+      parent: 1
+- proto: SuitStorageEVASyndicate
+  entities:
+  - uid: 629
+    components:
+    - type: Transform
+      pos: 0.5,-24.5
+      parent: 1
+  - uid: 630
+    components:
+    - type: Transform
+      pos: 0.5,-23.5
+      parent: 1
+  - uid: 631
+    components:
+    - type: Transform
+      pos: 3.5,-17.5
+      parent: 1
+  - uid: 632
+    components:
+    - type: Transform
+      pos: -4.5,-17.5
+      parent: 1
+- proto: SyndieMiniBomb
+  entities:
+  - uid: 633
+    components:
+    - type: Transform
+      pos: 1.4127003,-11.973867
+      parent: 1
+  - uid: 634
+    components:
+    - type: Transform
+      pos: 1.6939503,-11.973867
+      parent: 1
+- proto: SyringeInaprovaline
+  entities:
+  - uid: 635
+    components:
+    - type: Transform
+      pos: -3.510837,-4.3787546
+      parent: 1
+  - uid: 636
+    components:
+    - type: Transform
+      pos: -3.510837,-4.0193796
+      parent: 1
+- proto: Table
+  entities:
+  - uid: 637
+    components:
+    - type: Transform
+      pos: 5.5,-21.5
+      parent: 1
+  - uid: 638
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-21.5
+      parent: 1
+  - uid: 639
+    components:
+    - type: Transform
+      pos: 3.5,-19.5
+      parent: 1
+  - uid: 640
+    components:
+    - type: Transform
+      pos: 2.5,-19.5
+      parent: 1
+  - uid: 641
+    components:
+    - type: Transform
+      pos: 1.5,-19.5
+      parent: 1
+- proto: TablePlasmaGlass
+  entities:
+  - uid: 642
+    components:
+    - type: Transform
+      pos: -3.5,-4.5
+      parent: 1
+  - uid: 643
+    components:
+    - type: Transform
+      pos: -3.5,-6.5
+      parent: 1
+  - uid: 644
+    components:
+    - type: Transform
+      pos: -3.5,-3.5
+      parent: 1
+- proto: TableReinforced
+  entities:
+  - uid: 645
+    components:
+    - type: Transform
+      pos: -2.5,-11.5
+      parent: 1
+  - uid: 646
+    components:
+    - type: Transform
+      pos: -2.5,-13.5
+      parent: 1
+  - uid: 647
+    components:
+    - type: Transform
+      pos: -1.5,-3.5
+      parent: 1
+  - uid: 648
+    components:
+    - type: Transform
+      pos: -2.5,-2.5
+      parent: 1
+  - uid: 649
+    components:
+    - type: Transform
+      pos: 0.5,-13.5
+      parent: 1
+  - uid: 650
+    components:
+    - type: Transform
+      pos: 1.5,-13.5
+      parent: 1
+  - uid: 651
+    components:
+    - type: Transform
+      pos: 1.5,-12.5
+      parent: 1
+  - uid: 652
+    components:
+    - type: Transform
+      pos: 1.5,-11.5
+      parent: 1
+  - uid: 653
+    components:
+    - type: Transform
+      pos: 2.5,-17.5
+      parent: 1
+  - uid: 654
+    components:
+    - type: Transform
+      pos: 1.5,-17.5
+      parent: 1
+  - uid: 655
+    components:
+    - type: Transform
+      pos: -2.5,-17.5
+      parent: 1
+  - uid: 656
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-2.5
+      parent: 1
+  - uid: 657
+    components:
+    - type: Transform
+      pos: -3.5,-17.5
+      parent: 1
+  - uid: 658
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-2.5
+      parent: 1
+- proto: Thruster
+  entities:
+  - uid: 659
+    components:
+    - type: Transform
+      pos: -6.5,-2.5
+      parent: 1
+  - uid: 660
+    components:
+    - type: Transform
+      pos: 5.5,-2.5
+      parent: 1
+  - uid: 661
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-7.5
+      parent: 1
+  - uid: 662
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-7.5
+      parent: 1
+  - uid: 663
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-13.5
+      parent: 1
+  - uid: 664
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-13.5
+      parent: 1
+  - uid: 665
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-30.5
+      parent: 1
+  - uid: 666
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-30.5
+      parent: 1
+  - uid: 667
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-30.5
+      parent: 1
+  - uid: 668
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-30.5
+      parent: 1
+- proto: ToolboxSyndicate
+  entities:
+  - uid: 669
+    components:
+    - type: Transform
+      pos: -2.5731854,-17.414778
+      parent: 1
+- proto: ToolboxSyndicateFilled
+  entities:
+  - uid: 670
+    components:
+    - type: Transform
+      pos: 1.5034143,-11.298322
+      parent: 1
+- proto: VendingMachineTankDispenserEVA
+  entities:
+  - uid: 671
+    components:
+    - type: Transform
+      pos: 5.5,-15.5
+      parent: 1
+  - uid: 672
+    components:
+    - type: MetaData
+      name: tank dispenser
+    - type: Transform
+      pos: 2.5,-24.5
+      parent: 1
+  - uid: 673
+    components:
+    - type: Transform
+      pos: -6.5,-15.5
+      parent: 1
+- proto: VendingMachineYouTool
+  entities:
+  - uid: 674
+    components:
+    - type: Transform
+      pos: -3.5,-24.5
+      parent: 1
+- proto: WallPlastitanium
+  entities:
+  - uid: 11
+    components:
+    - type: Transform
+      pos: -1.5,-25.5
+      parent: 1
+  - uid: 675
+    components:
+    - type: Transform
+      pos: 2.5,-2.5
+      parent: 1
+  - uid: 676
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 1
+  - uid: 677
+    components:
+    - type: Transform
+      pos: -3.5,-11.5
+      parent: 1
+  - uid: 678
+    components:
+    - type: Transform
+      pos: 2.5,-14.5
+      parent: 1
+  - uid: 679
+    components:
+    - type: Transform
+      pos: 4.5,-14.5
+      parent: 1
+  - uid: 680
+    components:
+    - type: Transform
+      pos: -2.5,-14.5
+      parent: 1
+  - uid: 681
+    components:
+    - type: Transform
+      pos: 2.5,-18.5
+      parent: 1
+  - uid: 682
+    components:
+    - type: Transform
+      pos: 1.5,-25.5
+      parent: 1
+  - uid: 683
+    components:
+    - type: Transform
+      pos: 1.5,-18.5
+      parent: 1
+  - uid: 684
+    components:
+    - type: Transform
+      pos: 7.5,-17.5
+      parent: 1
+  - uid: 685
+    components:
+    - type: Transform
+      pos: -3.5,-26.5
+      parent: 1
+  - uid: 686
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-7.5
+      parent: 1
+  - uid: 687
+    components:
+    - type: Transform
+      pos: 2.5,-13.5
+      parent: 1
+  - uid: 688
+    components:
+    - type: Transform
+      pos: -3.5,-28.5
+      parent: 1
+  - uid: 689
+    components:
+    - type: Transform
+      pos: 2.5,-10.5
+      parent: 1
+  - uid: 690
+    components:
+    - type: Transform
+      pos: 4.5,-18.5
+      parent: 1
+  - uid: 691
+    components:
+    - type: Transform
+      pos: -2.5,-10.5
+      parent: 1
+  - uid: 692
+    components:
+    - type: Transform
+      pos: -3.5,-10.5
+      parent: 1
+  - uid: 693
+    components:
+    - type: Transform
+      pos: -6.5,-11.5
+      parent: 1
+  - uid: 694
+    components:
+    - type: Transform
+      pos: 4.5,-10.5
+      parent: 1
+  - uid: 695
+    components:
+    - type: Transform
+      pos: 4.5,-2.5
+      parent: 1
+  - uid: 696
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-7.5
+      parent: 1
+  - uid: 697
+    components:
+    - type: Transform
+      pos: -6.5,-6.5
+      parent: 1
+  - uid: 698
+    components:
+    - type: Transform
+      pos: -5.5,-6.5
+      parent: 1
+  - uid: 699
+    components:
+    - type: Transform
+      pos: 4.5,-6.5
+      parent: 1
+  - uid: 700
+    components:
+    - type: Transform
+      pos: -6.5,-5.5
+      parent: 1
+  - uid: 701
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-8.5
+      parent: 1
+  - uid: 702
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-7.5
+      parent: 1
+  - uid: 703
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-8.5
+      parent: 1
+  - uid: 704
+    components:
+    - type: Transform
+      pos: 2.5,-11.5
+      parent: 1
+  - uid: 705
+    components:
+    - type: Transform
+      pos: 5.5,-18.5
+      parent: 1
+  - uid: 706
+    components:
+    - type: Transform
+      pos: -8.5,-15.5
+      parent: 1
+  - uid: 707
+    components:
+    - type: Transform
+      pos: -8.5,-17.5
+      parent: 1
+  - uid: 708
+    components:
+    - type: Transform
+      pos: -7.5,-17.5
+      parent: 1
+  - uid: 709
+    components:
+    - type: Transform
+      pos: -5.5,-10.5
+      parent: 1
+  - uid: 710
+    components:
+    - type: Transform
+      pos: -3.5,-13.5
+      parent: 1
+  - uid: 711
+    components:
+    - type: Transform
+      pos: 3.5,-18.5
+      parent: 1
+  - uid: 712
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-6.5
+      parent: 1
+  - uid: 713
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-7.5
+      parent: 1
+  - uid: 714
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-8.5
+      parent: 1
+  - uid: 715
+    components:
+    - type: Transform
+      pos: 5.5,-14.5
+      parent: 1
+  - uid: 716
+    components:
+    - type: Transform
+      pos: 7.5,-15.5
+      parent: 1
+  - uid: 717
+    components:
+    - type: Transform
+      pos: -6.5,-19.5
+      parent: 1
+  - uid: 718
+    components:
+    - type: Transform
+      pos: -6.5,-18.5
+      parent: 1
+  - uid: 719
+    components:
+    - type: Transform
+      pos: -3.5,-25.5
+      parent: 1
+  - uid: 720
+    components:
+    - type: Transform
+      pos: 2.5,-25.5
+      parent: 1
+  - uid: 721
+    components:
+    - type: Transform
+      pos: 2.5,-27.5
+      parent: 1
+  - uid: 722
+    components:
+    - type: Transform
+      pos: 4.5,-17.5
+      parent: 1
+  - uid: 723
+    components:
+    - type: Transform
+      pos: -7.5,-21.5
+      parent: 1
+  - uid: 724
+    components:
+    - type: Transform
+      pos: -7.5,-27.5
+      parent: 1
+  - uid: 725
+    components:
+    - type: Transform
+      pos: -7.5,-24.5
+      parent: 1
+  - uid: 726
+    components:
+    - type: Transform
+      pos: 6.5,-21.5
+      parent: 1
+  - uid: 727
+    components:
+    - type: Transform
+      pos: 6.5,-24.5
+      parent: 1
+  - uid: 728
+    components:
+    - type: Transform
+      pos: 6.5,-26.5
+      parent: 1
+  - uid: 729
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-3.5
+      parent: 1
+  - uid: 730
+    components:
+    - type: Transform
+      pos: 1.5,-10.5
+      parent: 1
+  - uid: 731
+    components:
+    - type: Transform
+      pos: -3.5,-27.5
+      parent: 1
+  - uid: 732
+    components:
+    - type: Transform
+      pos: -6.5,-12.5
+      parent: 1
+  - uid: 733
+    components:
+    - type: Transform
+      pos: 5.5,-12.5
+      parent: 1
+  - uid: 734
+    components:
+    - type: Transform
+      pos: 5.5,-11.5
+      parent: 1
+  - uid: 735
+    components:
+    - type: Transform
+      pos: -5.5,-11.5
+      parent: 1
+  - uid: 736
+    components:
+    - type: Transform
+      pos: -6.5,-20.5
+      parent: 1
+  - uid: 737
+    components:
+    - type: Transform
+      pos: 0.5,-14.5
+      parent: 1
+  - uid: 738
+    components:
+    - type: Transform
+      pos: -1.5,-14.5
+      parent: 1
+  - uid: 739
+    components:
+    - type: Transform
+      pos: 5.5,-20.5
+      parent: 1
+  - uid: 740
+    components:
+    - type: Transform
+      pos: -5.5,-14.5
+      parent: 1
+  - uid: 741
+    components:
+    - type: Transform
+      pos: 6.5,-17.5
+      parent: 1
+  - uid: 742
+    components:
+    - type: Transform
+      pos: -3.5,-14.5
+      parent: 1
+  - uid: 743
+    components:
+    - type: Transform
+      pos: -2.5,-18.5
+      parent: 1
+  - uid: 744
+    components:
+    - type: Transform
+      pos: 2.5,-26.5
+      parent: 1
+  - uid: 745
+    components:
+    - type: Transform
+      pos: 2.5,-28.5
+      parent: 1
+  - uid: 746
+    components:
+    - type: Transform
+      pos: 6.5,-25.5
+      parent: 1
+  - uid: 747
+    components:
+    - type: Transform
+      pos: 6.5,-22.5
+      parent: 1
+  - uid: 748
+    components:
+    - type: Transform
+      pos: -7.5,-23.5
+      parent: 1
+  - uid: 749
+    components:
+    - type: Transform
+      pos: -7.5,-26.5
+      parent: 1
+  - uid: 750
+    components:
+    - type: Transform
+      pos: -7.5,-22.5
+      parent: 1
+  - uid: 751
+    components:
+    - type: Transform
+      pos: -7.5,-20.5
+      parent: 1
+  - uid: 752
+    components:
+    - type: Transform
+      pos: 4.5,-15.5
+      parent: 1
+  - uid: 753
+    components:
+    - type: Transform
+      pos: 6.5,-28.5
+      parent: 1
+  - uid: 754
+    components:
+    - type: Transform
+      pos: 6.5,-27.5
+      parent: 1
+  - uid: 755
+    components:
+    - type: Transform
+      pos: 6.5,-23.5
+      parent: 1
+  - uid: 756
+    components:
+    - type: Transform
+      pos: 6.5,-20.5
+      parent: 1
+  - uid: 757
+    components:
+    - type: Transform
+      pos: -7.5,-25.5
+      parent: 1
+  - uid: 758
+    components:
+    - type: Transform
+      pos: -7.5,-28.5
+      parent: 1
+  - uid: 759
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-15.5
+      parent: 1
+  - uid: 760
+    components:
+    - type: Transform
+      pos: -5.5,-18.5
+      parent: 1
+  - uid: 761
+    components:
+    - type: Transform
+      pos: -5.5,-3.5
+      parent: 1
+  - uid: 762
+    components:
+    - type: Transform
+      pos: 5.5,-5.5
+      parent: 1
+  - uid: 763
+    components:
+    - type: Transform
+      pos: -3.5,-2.5
+      parent: 1
+  - uid: 764
+    components:
+    - type: Transform
+      pos: -6.5,-3.5
+      parent: 1
+  - uid: 765
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-7.5
+      parent: 1
+  - uid: 766
+    components:
+    - type: Transform
+      pos: -3.5,-18.5
+      parent: 1
+  - uid: 767
+    components:
+    - type: Transform
+      pos: -3.5,-1.5
+      parent: 1
+  - uid: 768
+    components:
+    - type: Transform
+      pos: 2.5,-1.5
+      parent: 1
+  - uid: 769
+    components:
+    - type: Transform
+      pos: -6.5,-14.5
+      parent: 1
+  - uid: 770
+    components:
+    - type: Transform
+      pos: -5.5,-2.5
+      parent: 1
+  - uid: 771
+    components:
+    - type: Transform
+      pos: 5.5,-6.5
+      parent: 1
+  - uid: 772
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-7.5
+      parent: 1
+  - uid: 773
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-8.5
+      parent: 1
+  - uid: 774
+    components:
+    - type: Transform
+      pos: 4.5,-11.5
+      parent: 1
+  - uid: 775
+    components:
+    - type: Transform
+      pos: -6.5,-13.5
+      parent: 1
+  - uid: 776
+    components:
+    - type: Transform
+      pos: -3.5,-30.5
+      parent: 1
+  - uid: 777
+    components:
+    - type: Transform
+      pos: 6.5,-15.5
+      parent: 1
+  - uid: 778
+    components:
+    - type: Transform
+      pos: 5.5,-13.5
+      parent: 1
+  - uid: 779
+    components:
+    - type: Transform
+      pos: -7.5,-15.5
+      parent: 1
+  - uid: 780
+    components:
+    - type: Transform
+      pos: 1.5,-14.5
+      parent: 1
+  - uid: 781
+    components:
+    - type: Transform
+      pos: -4.5,-18.5
+      parent: 1
+  - uid: 782
+    components:
+    - type: Transform
+      pos: -2.5,-25.5
+      parent: 1
+  - uid: 783
+    components:
+    - type: Transform
+      pos: 0.5,-25.5
+      parent: 1
+  - uid: 785
+    components:
+    - type: Transform
+      pos: -1.5,-22.5
+      parent: 1
+  - uid: 786
+    components:
+    - type: Transform
+      pos: 0.5,-22.5
+      parent: 1
+  - uid: 787
+    components:
+    - type: Transform
+      pos: 1.5,-24.5
+      parent: 1
+  - uid: 788
+    components:
+    - type: Transform
+      pos: 1.5,-23.5
+      parent: 1
+  - uid: 789
+    components:
+    - type: Transform
+      pos: 1.5,-22.5
+      parent: 1
+  - uid: 790
+    components:
+    - type: Transform
+      pos: -2.5,-24.5
+      parent: 1
+  - uid: 791
+    components:
+    - type: Transform
+      pos: -2.5,-23.5
+      parent: 1
+  - uid: 792
+    components:
+    - type: Transform
+      pos: -2.5,-22.5
+      parent: 1
+  - uid: 793
+    components:
+    - type: Transform
+      pos: 5.5,-22.5
+      parent: 1
+  - uid: 794
+    components:
+    - type: Transform
+      pos: -7.5,-14.5
+      parent: 1
+  - uid: 795
+    components:
+    - type: Transform
+      pos: -7.5,-18.5
+      parent: 1
+  - uid: 796
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-28.5
+      parent: 1
+  - uid: 797
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-28.5
+      parent: 1
+  - uid: 798
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-28.5
+      parent: 1
+  - uid: 799
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-28.5
+      parent: 1
+  - uid: 800
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-28.5
+      parent: 1
+  - uid: 801
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-28.5
+      parent: 1
+  - uid: 802
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-6.5
+      parent: 1
+  - uid: 803
+    components:
+    - type: Transform
+      pos: 4.5,-27.5
+      parent: 1
+  - uid: 804
+    components:
+    - type: Transform
+      pos: 4.5,-26.5
+      parent: 1
+  - uid: 805
+    components:
+    - type: Transform
+      pos: 4.5,-25.5
+      parent: 1
+  - uid: 806
+    components:
+    - type: Transform
+      pos: 2.5,-4.5
+      parent: 1
+  - uid: 807
+    components:
+    - type: Transform
+      pos: 3.5,-6.5
+      parent: 1
+  - uid: 808
+    components:
+    - type: Transform
+      pos: 2.5,-30.5
+      parent: 1
+  - uid: 809
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-17.5
+      parent: 1
+  - uid: 810
+    components:
+    - type: Transform
+      pos: 3.5,-29.5
+      parent: 1
+  - uid: 811
+    components:
+    - type: Transform
+      pos: -5.5,-29.5
+      parent: 1
+  - uid: 812
+    components:
+    - type: Transform
+      pos: 4.5,-29.5
+      parent: 1
+  - uid: 813
+    components:
+    - type: Transform
+      pos: -4.5,-29.5
+      parent: 1
+  - uid: 814
+    components:
+    - type: Transform
+      pos: 5.5,-29.5
+      parent: 1
+  - uid: 815
+    components:
+    - type: Transform
+      pos: -3.5,-29.5
+      parent: 1
+  - uid: 816
+    components:
+    - type: Transform
+      pos: 2.5,-29.5
+      parent: 1
+  - uid: 817
+    components:
+    - type: Transform
+      pos: 6.5,-14.5
+      parent: 1
+  - uid: 818
+    components:
+    - type: Transform
+      pos: 6.5,-18.5
+      parent: 1
+  - uid: 819
+    components:
+    - type: Transform
+      pos: 5.5,-3.5
+      parent: 1
+  - uid: 820
+    components:
+    - type: Transform
+      pos: -6.5,-29.5
+      parent: 1
+  - uid: 821
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -6.5,-30.5
+      parent: 1
+  - uid: 822
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-30.5
+      parent: 1
+  - uid: 823
+    components:
+    - type: Transform
+      pos: 8.5,-15.5
+      parent: 1
+  - uid: 824
+    components:
+    - type: Transform
+      pos: 8.5,-17.5
+      parent: 1
+  - uid: 825
+    components:
+    - type: Transform
+      pos: -9.5,-17.5
+      parent: 1
+  - uid: 826
+    components:
+    - type: Transform
+      pos: -9.5,-15.5
+      parent: 1
+- proto: WarningN2
+  entities:
+  - uid: 827
+    components:
+    - type: Transform
+      pos: 4.5,-25.5
+      parent: 1
+- proto: WarningO2
+  entities:
+  - uid: 828
+    components:
+    - type: Transform
+      pos: 2.5,-25.5
+      parent: 1
+- proto: WarningWaste
+  entities:
+  - uid: 829
+    components:
+    - type: Transform
+      pos: 4.5,-18.5
+      parent: 1
+- proto: WaterCooler
+  entities:
+  - uid: 830
+    components:
+    - type: Transform
+      pos: 0.5,-17.5
+      parent: 1
+- proto: WeaponTurretSyndicate
+  entities:
+  - uid: 24
+    components:
+    - type: Transform
+      pos: -2.5,-6.5
+      parent: 1
+  - uid: 610
+    components:
+    - type: Transform
+      pos: -1.5,-19.5
+      parent: 1
+- proto: WindoorSecure
+  entities:
+  - uid: 831
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-5.5
+      parent: 1
+- proto: Wrench
+  entities:
+  - uid: 832
+    components:
+    - type: Transform
+      pos: 5.4749,-23.512577
+      parent: 1
+  - uid: 833
+    components:
+    - type: Transform
+      pos: 5.63115,-23.481327
+      parent: 1
+  - uid: 834
+    components:
+    - type: Transform
+      pos: 1.6061028,-13.284962
+      parent: 1
+...
diff --git a/Resources/Prototypes/Accents/word_replacements.yml b/Resources/Prototypes/Accents/word_replacements.yml
index 147aebb5c5..92b3d7de9b 100644
--- a/Resources/Prototypes/Accents/word_replacements.yml
+++ b/Resources/Prototypes/Accents/word_replacements.yml
@@ -1,4 +1,4 @@
-# Accents that work off of word replacements.
+# Accents that work off of word replacements.
 
 # this is kind of dumb but localization demands it.
 # i guess you could just specify the prefix ('mobster') and count and let the system fill it
@@ -263,7 +263,7 @@
     accent-pirate-replaced-30: accent-pirate-replacement-30
     accent-pirate-replaced-31: accent-pirate-replacement-31
     accent-pirate-replaced-32: accent-pirate-replacement-32
-    
+
 - type: accent
   id: cowboy
   wordReplacements:
@@ -366,7 +366,7 @@
     accent-cowboy-words-97: accent-cowboy-replacement-97
     accent-cowboy-words-98: accent-cowboy-replacement-98
     accent-cowboy-words-99: accent-cowboy-replacement-99
-  
+
 
 # For the chat sanitization system
 - type: accent
@@ -409,8 +409,9 @@
     # chatsan-word-35: chatsan-replacement-35
     # chatsan-word-36: chatsan-replacement-36
     chatsan-word-37: chatsan-replacement-37
-    # chatsan-word-38: chatsan-replacement-38
-    # chatsan-word-39: chatsan-replacement-etcetera
-    # chatsan-word-40: chatsan-replacement-etcetera
-    # chatsan-word-41: chatsan-replacement-41
-    # chatsan-word-42: chatsan-replacement-42
+    chatsan-word-38: chatsan-replacement-38
+    chatsan-word-39: chatsan-replacement-etcetera
+    chatsan-word-40: chatsan-replacement-etcetera
+    chatsan-word-41: chatsan-replacement-41
+    chatsan-word-42: chatsan-replacement-42
+    chatsan-word-43: chatsan-replacement-43
diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml
index f50825d0bc..23021eb4e2 100644
--- a/Resources/Prototypes/Access/misc.yml
+++ b/Resources/Prototypes/Access/misc.yml
@@ -45,3 +45,4 @@
   - Musician # DeltaV - Add Musician access
   - Reporter # DeltaV - Add Reporter access
   - Zookeeper # DeltaV - Add Zookeeper access
+  - Corpsman # DeltaV - Add Corpsman access
diff --git a/Resources/Prototypes/Access/security.yml b/Resources/Prototypes/Access/security.yml
index 4a0743d174..cfb6e60060 100644
--- a/Resources/Prototypes/Access/security.yml
+++ b/Resources/Prototypes/Access/security.yml
@@ -28,6 +28,7 @@
   #- Brig #Delta V removed
   - Detective
   - Cryogenics
+  - Corpsman # DeltaV - add Corpsman access
 
 - type: accessGroup
   id: Armory
diff --git a/Resources/Prototypes/Actions/crit.yml b/Resources/Prototypes/Actions/crit.yml
index bdd09d697e..705ee6ee6b 100644
--- a/Resources/Prototypes/Actions/crit.yml
+++ b/Resources/Prototypes/Actions/crit.yml
@@ -1,4 +1,4 @@
-# Actions added to mobs in crit.
+# Actions added to mobs in crit.
 - type: entity
   id: ActionCritSuccumb
   name: Succumb
@@ -8,6 +8,7 @@
   - type: InstantAction
     itemIconStyle: NoItem
     checkCanInteract: false
+    checkConsciousness: false
     icon:
       sprite: Mobs/Ghosts/ghost_human.rsi
       state: icon
@@ -22,6 +23,7 @@
   - type: InstantAction
     itemIconStyle: NoItem
     checkCanInteract: false
+    checkConsciousness: false
     icon:
       sprite: Interface/Actions/actions_crit.rsi
       state: fakedeath
@@ -37,6 +39,7 @@
   - type: InstantAction
     itemIconStyle: NoItem
     checkCanInteract: false
+    checkConsciousness: false
     icon:
       sprite: Interface/Actions/actions_crit.rsi
       state: lastwords
diff --git a/Resources/Prototypes/Actions/diona.yml b/Resources/Prototypes/Actions/diona.yml
index 73bc1ba529..11db30386a 100644
--- a/Resources/Prototypes/Actions/diona.yml
+++ b/Resources/Prototypes/Actions/diona.yml
@@ -5,9 +5,12 @@
   noSpawn: true
   components:
   - type: InstantAction
-    icon: Mobs/Species/Diona/organs.rsi/brain.png
+    icon:
+      sprite: Mobs/Species/Diona/organs.rsi
+      state: brain
     event: !type:GibActionEvent {}
     checkCanInteract: false
+    checkConsciousness: false
 
 - type: entity
   id: DionaReformAction
@@ -16,6 +19,8 @@
   noSpawn: true
   components:
   - type: InstantAction
-    icon: Mobs/Species/Diona/parts.rsi/full.png
+    icon:
+      sprite: Mobs/Species/Diona/parts.rsi
+      state: full
     event: !type:ReformEvent {}
     useDelay: 600 # Once every 10 minutes. Keep them dead for a fair bit before reforming
diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml
index 2d5ec9a678..22f16bd956 100644
--- a/Resources/Prototypes/Actions/types.yml
+++ b/Resources/Prototypes/Actions/types.yml
@@ -29,6 +29,7 @@
   components:
   - type: InstantAction
     checkCanInteract: false
+    checkConsciousness: false
     icon: Interface/Actions/zombie-turn.png
     event: !type:ZombifySelfActionEvent
 
@@ -40,7 +41,7 @@
   components:
   - type: InstantAction
     icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
-    iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
+    iconOn: { sprite: Objects/Tools/flashlight.rsi, state: flashlight-on }
     event: !type:ToggleActionEvent
 
 - type: entity
@@ -66,6 +67,7 @@
   components:
   - type: InstantAction
     checkCanInteract: false
+    checkConsciousness: false
     itemIconStyle: BigAction
     priority: -20
     icon:
@@ -82,6 +84,7 @@
   components:
   - type: InstantAction
     checkCanInteract: false
+    checkConsciousness: false
     itemIconStyle: BigAction
     priority: -20
     icon:
@@ -117,7 +120,7 @@
     priority: -20
     icon:
       sprite: Objects/Devices/communication.rsi
-      state: old-radio
+      state: radio
     event: !type:OpenUplinkImplantEvent
 
 - type: entity
@@ -143,6 +146,7 @@
   noSpawn: true
   components:
   - type: InstantAction
+    checkCanInteract: false
     charges: 2
     useDelay: 5
     itemIconStyle: BigAction
@@ -186,6 +190,7 @@
   components:
   - type: InstantAction
     checkCanInteract: false
+    checkConsciousness: false
     icon: Interface/Actions/harmOff.png
     iconOn: Interface/Actions/harm.png
     event: !type:ToggleCombatActionEvent
@@ -256,6 +261,7 @@
   - type: InstantAction
     clientExclusive: true
     checkCanInteract: false
+    checkConsciousness: false
     temporary: true
     icon: { sprite: Objects/Tools/multitool.rsi, state: icon }
     event: !type:ClearAllOverlaysEvent
@@ -279,6 +285,7 @@
   components:
   - type: InstantAction
     checkCanInteract: false
+    checkConsciousness: false
     icon: { sprite: Clothing/Head/Hats/pyjamasyndicatered.rsi, state: icon }
     event: !type:SleepActionEvent
 
@@ -291,6 +298,7 @@
   - type: InstantAction
     icon: { sprite: Clothing/Head/Hats/pyjamasyndicatered.rsi, state: icon }
     checkCanInteract: false
+    checkConsciousness: false
     event: !type:WakeActionEvent
 
 - type: entity
@@ -328,6 +336,7 @@
     event: !type:ToggleEyesActionEvent
     useDelay: 1 # so u cant give yourself and observers eyestrain by rapidly spamming the action
     checkCanInteract: false
+    checkConsciousness: false
 
 - type: entity
   id: ActionToggleWagging
diff --git a/Resources/Prototypes/Body/Organs/diona.yml b/Resources/Prototypes/Body/Organs/diona.yml
index 8b4b78cac0..69fc630b9e 100644
--- a/Resources/Prototypes/Body/Organs/diona.yml
+++ b/Resources/Prototypes/Body/Organs/diona.yml
@@ -46,7 +46,7 @@
       food:
         maxVol: 5
         reagents:
-        - ReagentId: UncookedAnimalProteins
+        - ReagentId: GreyMatter
           Quantity: 5
 
 - type: entity
diff --git a/Resources/Prototypes/Body/Organs/human.yml b/Resources/Prototypes/Body/Organs/human.yml
index fe33c11029..69081020ce 100644
--- a/Resources/Prototypes/Body/Organs/human.yml
+++ b/Resources/Prototypes/Body/Organs/human.yml
@@ -53,7 +53,21 @@
   - type: Tag
     tags:
       - Meat
-
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: GreyMatter
+          Quantity: 5
+  - type: FlavorProfile
+    flavors:
+      - people
+  
 - type: entity
   id: OrganHumanEyes
   parent: BaseHumanOrgan
diff --git a/Resources/Prototypes/Body/Organs/slime.yml b/Resources/Prototypes/Body/Organs/slime.yml
index 46b1801077..3da76c5d4a 100644
--- a/Resources/Prototypes/Body/Organs/slime.yml
+++ b/Resources/Prototypes/Body/Organs/slime.yml
@@ -27,10 +27,14 @@
         food:
           maxVol: 5
           reagents:
-          - ReagentId: UncookedAnimalProteins
+          - ReagentId: GreyMatter
             Quantity: 5
+        organ:
+          reagents:
+          - ReagentId: Slime
+            Quantity: 10
 
-
+      
 - type: entity
   id: OrganSlimeLungs
   parent: BaseHumanOrgan
@@ -56,7 +60,7 @@
     solutions:
       organ:
         reagents:
-        - ReagentId: Nutriment
+        - ReagentId: Slime
           Quantity: 10
       Lung:
         maxVol: 100.0
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
index 399181b4fa..6341042bf8 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
@@ -5,7 +5,7 @@
     state: icon
   product: CrateArmorySMG
   cost: 9000
-  category: Armory
+  category: cargoproduct-category-name-armory
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: icon
   product: CrateArmoryShotgun
   cost: 7000
-  category: Armory
+  category: cargoproduct-category-name-armory
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: implanter0
   product: CrateTrackingImplants
   cost: 1000
-  category: Armory
+  category: cargoproduct-category-name-armory
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: training-bomb
   product: CrateTrainingBombs
   cost: 3000
-  category: Armory
+  category: cargoproduct-category-name-armory
   group: market
 
 - type: cargoProduct
@@ -45,7 +45,7 @@
     state: icon
   product: CrateArmoryLaser
   cost: 4800
-  category: Armory
+  category: cargoproduct-category-name-armory
   group: market
 
 - type: cargoProduct
@@ -55,5 +55,5 @@
     state: icon
   product: CrateArmoryPistols
   cost: 5200
-  category: Armory
+  category: cargoproduct-category-name-armory
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml b/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml
index 0aa4938399..c85210adf6 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml
@@ -5,7 +5,7 @@
     state: grey
   product: AirCanister
   cost: 1100
-  category: Atmospherics
+  category: cargoproduct-category-name-atmospherics
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: blue
   product: OxygenCanister
   cost: 1100
-  category: Atmospherics
+  category: cargoproduct-category-name-atmospherics
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: blue
   product: LiquidOxygenCanister
   cost: 2500
-  category: Atmospherics
+  category: cargoproduct-category-name-atmospherics
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: red
   product: NitrogenCanister
   cost: 1100
-  category: Atmospherics
+  category: cargoproduct-category-name-atmospherics
   group: market
 
 - type: cargoProduct
@@ -45,7 +45,7 @@
     state: red
   product: LiquidNitrogenCanister
   cost: 2500
-  category: Atmospherics
+  category: cargoproduct-category-name-atmospherics
   group: market
 
 - type: cargoProduct
@@ -55,7 +55,7 @@
     state: black
   product: CarbonDioxideCanister
   cost: 2200 # Until someone fixes it co2 can be used to oneshot people so it's more expensive
-  category: Atmospherics
+  category: cargoproduct-category-name-atmospherics
   group: market
 
 - type: cargoProduct
@@ -65,7 +65,7 @@
     state: black
   product: LiquidCarbonDioxideCanister
   cost: 4000
-  category: Atmospherics
+  category: cargoproduct-category-name-atmospherics
   group: market
 
 - type: cargoProduct
@@ -75,7 +75,7 @@
     state: yellow
   product: StorageCanister
   cost: 1010 # No gases in it so it's cheaper
-  category: Atmospherics
+  category: cargoproduct-category-name-atmospherics
   group: market
 
 #- type: cargoProduct
@@ -87,7 +87,7 @@
 #    state: water_vapor
 #  product: WaterVaporCanister
 #  cost: 2600
-#  category: Atmospherics
+#  category: cargoproduct-category-name-atmospherics
 #  group: market
 
 - type: cargoProduct
@@ -97,7 +97,7 @@
     state: orange
   product: PlasmaCanister
   cost: 4000
-  category: Atmospherics
+  category: cargoproduct-category-name-atmospherics
   group: market
 
 #- type: cargoProduct
@@ -109,5 +109,5 @@
 #    state: green
 #  product: TritiumCanister
 #  cost: 15500
-#  category: Atmospherics
+#  category: cargoproduct-category-name-atmospherics
 #  group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml b/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml
index 4a80b76a3f..a6671ff099 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml
@@ -5,7 +5,7 @@
     state: seed
   product: CrateHydroponicsSeedsExotic
   cost: 1000
-  category: Hydroponics
+  category: cargoproduct-category-name-hydroponics
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: seed
   product: CrateHydroponicsSeedsMedicinal
   cost: 500
-  category: Hydroponics
+  category: cargoproduct-category-name-hydroponics
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: icon
   product: CrateHydroponicsTools
   cost: 500
-  category: Hydroponics
+  category: cargoproduct-category-name-hydroponics
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: seed
   product: CrateHydroponicsSeeds
   cost: 550
-  category: Hydroponics
+  category: cargoproduct-category-name-hydroponics
   group: market
 
 - type: cargoProduct
@@ -45,5 +45,5 @@
     state: jug
   product: CratePlantBGone
   cost: 750
-  category: Hydroponics
+  category: cargoproduct-category-name-hydroponics
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml b/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml
index 9dac47b6f1..fb3b2da41a 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml
@@ -15,7 +15,7 @@
     state: orebox
   product: OreBox
   cost: 500
-  category: Logistics # DeltaV - Logistics Department replacing Cargo
+  category: cargoproduct-category-name-cargo
   group: market
 
 - type: cargoProduct
@@ -25,5 +25,5 @@
     state: icon
   product: CrateCargoLuxuryHardsuit
   cost: 15000
-  category: Logistics # DeltaV - Logistics Department replacing Cargo
+  category: cargoproduct-category-name-cargo
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_circuitboards.yml b/Resources/Prototypes/Catalog/Cargo/cargo_circuitboards.yml
index 0af5b5db01..a96780fc3e 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_circuitboards.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_circuitboards.yml
@@ -5,5 +5,5 @@
     state: cpuboard
   product: CrateCrewMonitoringBoards
   cost: 2000
-  category: Circuitboards
+  category: cargoproduct-category-name-circuitboards
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
index 2777f859a0..2715e0c350 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
@@ -5,7 +5,7 @@
     state: icon
   product: CrateEmergencyExplosive
   cost: 650
-  category: Emergency
+  category: cargoproduct-category-name-emergency
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: fire_extinguisher_closed
   product: CrateEmergencyFire
   cost: 1500
-  category: Emergency
+  category: cargoproduct-category-name-emergency
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: icon
   product: CrateEmergencyInternals
   cost: 500
-  category: Emergency
+  category: cargoproduct-category-name-emergency
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: icon
   product: CrateEmergencyInternalsLarge
   cost: 2000
-  category: Emergency
+  category: cargoproduct-category-name-emergency
   group: market
 
 - type: cargoProduct
@@ -45,7 +45,7 @@
     state: radiation
   product: CrateEmergencyRadiation
   cost: 1000
-  category: Emergency
+  category: cargoproduct-category-name-emergency
   group: market
 
 - type: cargoProduct
@@ -55,7 +55,7 @@
     state: item_wall
   product: CrateEmergencyInflatablewall
   cost: 500
-  category: Emergency
+  category: cargoproduct-category-name-emergency
   group: market
 
 - type: cargoProduct
@@ -65,7 +65,7 @@
     state: icon
   product: CrateSlimepersonLifeSupport
   cost: 300
-  category: Emergency
+  category: cargoproduct-category-name-emergency
   group: market
 
 - type: cargoProduct
@@ -75,5 +75,5 @@
     state: icon
   product: CrateGenericBiosuit
   cost: 800
-  category: Emergency
+  category: cargoproduct-category-name-emergency
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml
index b5468fd982..754e30f133 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml
@@ -5,7 +5,7 @@
     state: coillv-30
   product: CrateEngineeringCableLV
   cost: 300
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: coilmv-30
   product: CrateEngineeringCableMV
   cost: 300
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: coilhv-30
   product: CrateEngineeringCableHV
   cost: 300
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: coilall-30
   product: CrateEngineeringCableBulk
   cost: 750
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -45,7 +45,7 @@
     state: icon
   product: CrateEngineeringElectricalSupplies
   cost: 4500
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -55,7 +55,7 @@
     state: icon
   product: CrateEngineeringStationBeaconBundle
   cost: 500
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -65,7 +65,7 @@
     state: icon
   product: CrateEngineeringJetpack
   cost: 1000
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -75,7 +75,7 @@
     state: icon
   product: CrateEngineeringMiniJetpack
   cost: 750
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -85,7 +85,7 @@
     state: icon
   product: CrateAirlockKit
   cost: 1100
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -95,7 +95,7 @@
     state: icon
   product: CrateEvaKit
   cost: 5000
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -105,7 +105,7 @@
     state: ammo
   product: CrateRCDAmmo
   cost: 2500
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -115,7 +115,7 @@
     state: icon
   product: CrateRCD
   cost: 800
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -125,7 +125,7 @@
     state: base
   product: CrateParticleDecelerators
   cost: 15000
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -135,5 +135,5 @@
     state: sheaterOff
   product: SpaceHeaterAnchored
   cost: 300
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
index ece817b746..bd00b0c2d4 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
@@ -5,7 +5,7 @@
     state: jar
   product: CrateEngineeringAMEJar
   cost: 2000
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: icon
   product: CrateEngineeringSingularityGenerator
   cost: 4000
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: icon
   product: CrateEngineeringSingularityContainment
   cost: 1000
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 #- type: cargoProduct
@@ -37,7 +37,7 @@
 #    state: emitter2
 #  product: CrateEngineeringSingularityEmitter
 #  cost: 3000
-#  category: Engineering
+#  category: cargoproduct-category-name-engineering
 #  group: market
 
 - type: cargoProduct
@@ -47,7 +47,7 @@
     state: ca_on
   product: CrateEngineeringSingularityCollector
   cost: 1000
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -57,7 +57,7 @@
     state: completed
   product: CrateEngineeringParticleAccelerator
   cost: 2000
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -67,18 +67,18 @@
     state: solar-assembly-part
   product: CrateEngineeringSolar
   cost: 500
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
-#- type: cargoProduct
-#  id: EngineTeslaGenerator
-#  icon:
-#    sprite: Structures/Power/Generation/Tesla/generator.rsi
-#    state: icon
-#  product: CrateEngineeringTeslaGenerator
-#  cost: 4000
-#  category: Engineering
-#  group: market
+- type: cargoProduct
+  id: EngineTeslaGenerator
+  icon:
+    sprite: Structures/Power/Generation/Tesla/generator.rsi
+    state: icon
+  product: CrateEngineeringTeslaGenerator
+  cost: 4000
+  category: cargoproduct-category-name-engineering
+  group: market
 
 - type: cargoProduct
   id: EngineTeslaCoil
@@ -87,7 +87,7 @@
     state: coil
   product: CrateEngineeringTeslaCoil
   cost: 1200
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -97,5 +97,5 @@
     state: grounding_rod
   product: CrateEngineeringTeslaGroundingRod
   cost: 400
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml
index e506995929..1a6f838096 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml
@@ -5,7 +5,7 @@
     state: margherita-slice
   product: CrateFoodPizza
   cost: 450
-  category: Food
+  category: cargoproduct-category-name-food
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: margherita
   product: CrateFoodPizzaLarge
   cost: 1800
-  category: Food
+  category: cargoproduct-category-name-food
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: nutribrick
   product: CrateFoodMRE
   cost: 1000
-  category: Food
+  category: cargoproduct-category-name-food
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: flour-big
   product: CrateFoodCooking
   cost: 750
-  category: Food
+  category: cargoproduct-category-name-food
   group: market
 
 - type: cargoProduct
@@ -45,7 +45,7 @@
     state: tin
   product: CrateFoodDinnerware
   cost: 750
-  category: Food
+  category: cargoproduct-category-name-food
   group: market
 
 - type: cargoProduct
@@ -55,7 +55,7 @@
     state: icon
   product: CrateFoodBarSupply
   cost: 750
-  category: Food
+  category: cargoproduct-category-name-food
   group: market
 
 - type: cargoProduct
@@ -65,7 +65,7 @@
     state: icon
   product: CrateFoodSoftdrinks
   cost: 1200
-  category: Food
+  category: cargoproduct-category-name-food
   group: market
 
 - type: cargoProduct
@@ -75,5 +75,5 @@
     state: icon
   product: CrateFoodSoftdrinksLarge
   cost: 2400
-  category: Food
+  category: cargoproduct-category-name-food
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
index 2d5acf5c90..c29458a1ee 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
@@ -5,7 +5,7 @@
     state: icon
   product: CrateFunInstrumentsVariety
   cost: 2000
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: tuba
   product: CrateFunInstrumentsBrass
   cost: 2500
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: icon
   product: CrateFunInstrumentsString
   cost: 2500
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: icon
   product: CrateFunInstrumentsWoodwind
   cost: 2500
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -45,7 +45,7 @@
     state: icon
   product: CrateFunInstrumentsKeyedPercussion
   cost: 2500
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -55,7 +55,7 @@
     state: icon
   product: CrateFunInstrumentsSpecial
   cost: 10000
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -65,6 +65,16 @@
     state: box
   product: CrateFunArtSupplies
   cost: 500
+  category: cargoproduct-category-name-fun
+  group: market
+
+- type: cargoProduct
+  id: FunSprayPaints
+  icon:
+    sprite: Objects/Fun/spraycans.rsi
+    state: death2_cap
+  product: CrateFunSprayPaints
+  cost: 2000
   category: Fun
   group: market
 
@@ -75,7 +85,7 @@
     state: birthday
   product: CrateFunParty
   cost: 1000
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -85,7 +95,7 @@
     state: display
   product: CrateFunWaterGuns
   cost: 750
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -95,7 +105,7 @@
     state: plushie_h
   product: CrateFunPlushie
   cost: 1000
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -105,7 +115,7 @@
     state: plushie_lizard
   product: CrateFunLizardPlushieBulk
   cost: 500
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -115,7 +125,7 @@
     state: d6_6
   product: CrateFunBoardGames
   cost: 1500
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -125,7 +135,7 @@
     state: implanter0
   product: CrateFunSadTromboneImplants
   cost: 1000
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -135,7 +145,7 @@
     state: implanter0
   product: CrateFunLightImplants
   cost: 1000
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -145,7 +155,7 @@
     state: icon
   product: CrateFunBoxing
   cost: 500
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -155,7 +165,7 @@
     state: crate_icon
   product: CrateFunPirate
   cost: 400
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -165,7 +175,7 @@
     state: crate_icon
   product: CrateFunToyBox
   cost: 900
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -175,7 +185,7 @@
     state: implanter0
   product: CrateFunBikeHornImplants
   cost: 1000
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -185,7 +195,7 @@
     state: fig_box
   product: CrateFunMysteryFigurines
   cost: 4000
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
 - type: cargoProduct
@@ -195,15 +205,15 @@
     state: icon
   product: CrateFunDartsSet
   cost: 900
-  category: Fun
+  category: cargoproduct-category-name-fun
   group: market
 
-#- type: cargoProduct
-#  id: FunCrateGambling
-#  icon:
-#    sprite: Objects/Economy/cash.rsi
-#    state: cash_1000000
-#  product: CrateCargoGambling
-#  cost: 10000
-#  category: Fun
-#  group: market
+- type: cargoProduct
+  id: FunCrateGambling
+  icon:
+    sprite: Objects/Economy/cash.rsi
+    state: cash_1000000
+  product: CrateCargoGambling
+  cost: 10000
+  category: cargoproduct-category-name-fun
+  group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
index 6ef0ab4e21..922e2951b6 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
@@ -5,7 +5,7 @@
     state: 0
   product: CrateNPCBee
   cost: 7000
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: butterfly
   product: CrateNPCButterflies
   cost: 4400
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: cat
   product: CrateNPCCat
   cost: 1200
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: icon-1
   product: CrateNPCChicken
   cost: 4000
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -45,7 +45,7 @@
     state: crab
   product: CrateNPCCrab
   cost: 3000
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -55,7 +55,7 @@
     state: icon-0
   product: CrateNPCDuck
   cost: 6000
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -65,7 +65,7 @@
     state: corgi
   product: CrateNPCCorgi
   cost: 1200
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -75,7 +75,7 @@
     state: puppy
   product: CrateNPCPuppyCorgi
   cost: 1200
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -85,7 +85,7 @@
     state: cow
   product: CrateNPCCow
   cost: 3200
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -95,7 +95,7 @@
     state: goat
   product: CrateNPCGoat
   cost: 1200
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -105,7 +105,7 @@
     state: goose
   product: CrateNPCGoose
   cost: 2100
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -115,7 +115,7 @@
     state: icon
   product: CrateNPCGorilla
   cost: 1100
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -125,7 +125,7 @@
     state: box
   product: CrateNPCMonkeyCube
   cost: 2000
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -135,7 +135,7 @@
     state: box_kobold
   product: CrateNPCKoboldCube
   cost: 2000
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -145,7 +145,7 @@
     state: icon-0
   product: CrateNPCMouse
   cost: 4400
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -155,7 +155,7 @@
     state: parrot
   product: CrateNPCParrot
   cost: 3000
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -165,7 +165,7 @@
     state: penguin
   product: CrateNPCPenguin
   cost: 2100
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -175,7 +175,7 @@
     state: pig
   product: CrateNPCPig
   cost: 1100
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -185,7 +185,7 @@
     state: snake
   product: CrateNPCSnake
   cost: 3000
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -195,7 +195,7 @@
     state: icon-0
   product: CrateNPCHamster
   cost: 2800
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -205,7 +205,7 @@
     state: lizard
   product: CrateNPCLizard
   cost: 1100
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -215,7 +215,7 @@
     state: kangaroo
   product: CrateNPCKangaroo
   cost: 2800
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
 
 - type: cargoProduct
@@ -225,5 +225,5 @@
     state: mothroach
   product: CrateNPCMothroach
   cost: 5000
-  category: Livestock
+  category: cargoproduct-category-name-livestock
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
index e3b07af13b..6f945001d9 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
@@ -5,7 +5,7 @@
     state: glass_3
   product: CrateMaterialGlass
   cost: 1000
-  category: Materials
+  category: cargoproduct-category-name-materials
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: steel_3
   product: CrateMaterialSteel
   cost: 1000
-  category: Materials
+  category: cargoproduct-category-name-materials
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: plastic_3
   product: CrateMaterialPlastic
   cost: 1500
-  category: Materials
+  category: cargoproduct-category-name-materials
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: brass_3
   product: CrateMaterialBrass
   cost: 2500
-  category: Materials
+  category: cargoproduct-category-name-materials
   group: market
 
 - type: cargoProduct
@@ -45,7 +45,7 @@
     state: plasteel_3
   product: CrateMaterialPlasteel
   cost: 3000
-  category: Materials
+  category: cargoproduct-category-name-materials
   group: market
 
 - type: cargoProduct
@@ -55,7 +55,7 @@
     state: cloth_3
   product: CrateMaterialTextiles
   cost: 1000
-  category: Materials
+  category: cargoproduct-category-name-materials
   group: market
 
 - type: cargoProduct
@@ -65,7 +65,7 @@
     state: plasma_3
   product: CrateMaterialPlasma
   cost: 2000
-  category: Materials
+  category: cargoproduct-category-name-materials
   group: market
 
 - type: cargoProduct
@@ -75,7 +75,7 @@
     state: cardboard_3
   product: CrateMaterialCardboard
   cost: 750
-  category: Materials
+  category: cargoproduct-category-name-materials
   group: market
 
 - type: cargoProduct
@@ -85,7 +85,7 @@
     state: paper_3
   product: CrateMaterialPaper
   cost: 1000
-  category: Materials
+  category: cargoproduct-category-name-materials
   group: market
 
 - type: cargoProduct
@@ -95,7 +95,7 @@
     state: fueltank
   product: WeldingFuelTankFull
   cost: 1500
-  category: Materials
+  category: cargoproduct-category-name-materials
   group: market
 
 - type: cargoProduct
@@ -105,5 +105,5 @@
     state: watertank
   product: WaterTankFull
   cost: 1000
-  category: Materials
+  category: cargoproduct-category-name-materials
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml
index 01a7192b35..1addf523e4 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml
@@ -5,7 +5,7 @@
     state: firstaid
   product: CrateMedicalSupplies
   cost: 2400
-  category: Medical
+  category: cargoproduct-category-name-medical
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: beaker
   product: CrateChemistrySupplies
   cost: 750
-  category: Medical
+  category: cargoproduct-category-name-medical
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: vial
   product: CrateChemistryVials
   cost: 1000
-  category: Medical
+  category: cargoproduct-category-name-medical
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: burnkit
   product: CrateEmergencyBurnKit
   cost: 700
-  category: Medical
+  category: cargoproduct-category-name-medical
   group: market
 
 - type: cargoProduct
@@ -45,7 +45,7 @@
     state: toxinkit
   product: CrateEmergencyToxinKit
   cost: 600
-  category: Medical
+  category: cargoproduct-category-name-medical
   group: market
 
 - type: cargoProduct
@@ -55,7 +55,7 @@
     state: o2kit
   product: CrateEmergencyO2Kit
   cost: 600
-  category: Medical
+  category: cargoproduct-category-name-medical
   group: market
 
 - type: cargoProduct
@@ -65,7 +65,7 @@
     state: brutekit
   product: CrateEmergencyBruteKit
   cost: 600
-  category: Medical
+  category: cargoproduct-category-name-medical
   group: market
 
 - type: cargoProduct
@@ -75,7 +75,7 @@
     state: advkit
   product: CrateEmergencyAdvancedKit
   cost: 1200
-  category: Medical
+  category: cargoproduct-category-name-medical
   group: market
 
 - type: cargoProduct
@@ -85,7 +85,7 @@
     state: radkit
   product: CrateEmergencyRadiationKit
   cost: 600
-  category: Medical
+  category: cargoproduct-category-name-medical
   group: market
 
 - type: cargoProduct
@@ -95,7 +95,7 @@
     state: bag_folded
   product: CrateBodyBags
   cost: 700
-  category: Medical
+  category: cargoproduct-category-name-medical
   group: market
 
 - type: cargoProduct
@@ -105,7 +105,7 @@
     state: icon
   product: CrateVirologyBiosuit
   cost: 800
-  category: Medical
+  category: cargoproduct-category-name-medical
   group: market
 
 - type: cargoProduct
@@ -115,7 +115,7 @@
     state: implanter0
   product: CrateMindShieldImplants
   cost: 3000
-  category: Medical
+  category: cargoproduct-category-name-medical
   group: market
 
 - type: cargoProduct
@@ -125,7 +125,7 @@
     state: icon
   product: CrateChemistryP
   cost: 850
-  category: Medical
+  category: cargoproduct-category-name-medical
   group: market
 
 - type: cargoProduct
@@ -135,7 +135,7 @@
     state: icon
   product: CrateChemistryS
   cost: 750
-  category: Medical
+  category: cargoproduct-category-name-medical
   group: market
 
 - type: cargoProduct
@@ -145,5 +145,5 @@
     state: icon
   product: CrateChemistryD
   cost: 750
-  category: Medical
+  category: cargoproduct-category-name-medical
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_science.yml b/Resources/Prototypes/Catalog/Cargo/cargo_science.yml
index f370155e07..756a223e74 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_science.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_science.yml
@@ -5,7 +5,7 @@
     state: artifact_container_icon
   product: CrateArtifactContainer
   cost: 500
-  category: Epistemics # DeltaV - Epistemics Department replacing Science
+  category: cargoproduct-category-name-science
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: ano13
   product: RandomArtifactSpawner
   cost: 2000
-  category: Epistemics # DeltaV - Epistemics Department replacing Science
+  category: cargoproduct-category-name-science
   group: market
 
 - type: cargoProduct
@@ -25,5 +25,5 @@
     state: icon
   product: CrateScienceBiosuit
   cost: 800
-  category: Epistemics # DeltaV - Epistemics Department replacing Science
+  category: cargoproduct-category-name-science
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml
index a616202bdb..2ad7628ddb 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml
@@ -4,8 +4,8 @@
     sprite: DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi # DeltaV - resprite
     state: icon
   product: CrateSecurityArmor
-  cost: 1000 # DeltaV - raise price for buffed armour
-  category: Security
+  cost: 800
+  category: cargoproduct-category-name-security
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: icon
   product: CrateSecurityHelmet
   cost: 550
-  category: Security
+  category: cargoproduct-category-name-security
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: base
   product: CrateSecurityNonlethal
   cost: 4000
-  category: Security
+  category: cargoproduct-category-name-security
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: icon
   product: CrateSecurityRiot
   cost: 5500
-  category: Security
+  category: cargoproduct-category-name-security
   group: market
 
 - type: cargoProduct
@@ -45,7 +45,7 @@
     state: box_security
   product: CrateSecuritySupplies
   cost: 500
-  category: Security
+  category: cargoproduct-category-name-security
   group: market
 
 - type: cargoProduct
@@ -55,7 +55,7 @@
     state: handcuff
   product: CrateRestraints
   cost: 1000
-  category: Security
+  category: cargoproduct-category-name-security
   group: market
 
 - type: cargoProduct
@@ -65,7 +65,7 @@
     state: icon
   product: CrateSecurityBiosuit
   cost: 800
-  category: Security
+  category: cargoproduct-category-name-security
   group: market
 
 - type: cargoProduct
@@ -75,5 +75,5 @@
     state: idle
   product: DeployableBarrier
   cost: 1000
-  category: Security
+  category: cargoproduct-category-name-security
   group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
index a2c0af9ce7..f27adb65a4 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
@@ -5,7 +5,7 @@
     state: cleaner
   product: CrateServiceJanitorialSupplies
   cost: 560
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: normal
   product: CrateServiceReplacementLights
   cost: 600
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -25,7 +25,7 @@
     state: mousetrap
   product: CrateMousetrapBoxes
   cost: 500
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -35,7 +35,7 @@
     state: icon
   product: CrateServiceTheatre
   cost: 1800
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -45,7 +45,7 @@
     state: closed
   product: CrateServiceSmokeables
   cost: 1500
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -55,7 +55,7 @@
     state: closed
   product: CrateServiceCustomSmokable
   cost: 1000
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -65,7 +65,7 @@
     state: pen
   product: CrateServiceBureaucracy
   cost: 1000
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -75,7 +75,7 @@
     state: default
   product: CrateServicePersonnel
   cost: 1000
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -85,7 +85,7 @@
     state: book0
   product: CrateServiceBooks
   cost: 1000
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -95,7 +95,7 @@
     state: book_engineering2
   product: CrateServiceGuidebooks
   cost: 1300
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -105,7 +105,7 @@
     state: icon
   product: CrateServiceSodaDispenser
   cost: 850
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -115,7 +115,7 @@
     state: icon
   product: CrateServiceBoozeDispenser
   cost: 750
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -125,7 +125,7 @@
     state: box
   product: CrateServiceBox
   cost: 400
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -135,7 +135,7 @@
     state: icon
   product: CrateJanitorBiosuit
   cost: 800
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -145,7 +145,7 @@
     state: icon-hot
   product: FoodCartHot
   cost: 2000
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -155,7 +155,7 @@
     state: icon-cold
   product: FoodCartCold
   cost: 2000
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -165,7 +165,7 @@
     state: icon
   product: PetCarrier
   cost: 500
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -175,7 +175,7 @@
     state: icon
   product: CrateJanitorExplosive
   cost: 1000
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -185,6 +185,6 @@
     state: icon-cart
   product: JanitorialTrolley
   cost: 300
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml b/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml
index 96a193881e..278104caed 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml
@@ -5,7 +5,7 @@
     state: base
   product: CrateEngineeringThruster
   cost: 1500
-  category: Shuttle
+  category: cargoproduct-category-name-shuttle
   group: market
 
 - type: cargoProduct
@@ -15,7 +15,7 @@
     state: base
   product: CrateEngineeringGyroscope
   cost: 4000
-  category: Shuttle
+  category: cargoproduct-category-name-shuttle
   group: market
 
 # - type: cargoProduct
@@ -25,6 +25,6 @@
     # state: avionics-systems
   # product: CrateEngineeringShuttle
   # cost: 3000
-  # category: Shuttle
+  # category: cargoproduct-category-name-shuttle
   # group: market
 #  locked: true   # only the QM has permission to order by default
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
index 6287710182..3e303c3212 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
@@ -13,7 +13,7 @@
     state: base
   product: CrateVendingMachineRestockBoozeFilled
   cost: 3500
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -24,7 +24,7 @@
     state: base
   product: CrateVendingMachineRestockChefvendFilled
   cost: 680
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -33,8 +33,8 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockClothesFilled
-  cost: 7250 #DeltaV
-  category: Service
+  cost: 8050
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -44,7 +44,7 @@
     state: base
   product: CrateVendingMachineRestockDinnerwareFilled
   cost: 2000
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -55,7 +55,7 @@
     state: base
   product: CrateVendingMachineRestockCondimentStationFilled
   cost: 300
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -65,7 +65,7 @@
     state: base
   product: CrateVendingMachineRestockEngineeringFilled
   cost: 3200
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -75,7 +75,7 @@
     state: base
   product: CrateVendingMachineRestockGamesFilled
   cost: 750
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -85,7 +85,7 @@
     state: base
   product: CrateVendingMachineRestockHotDrinksFilled
   cost: 1200
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -95,7 +95,7 @@
     state: base
   product: CrateVendingMachineRestockMedicalFilled
   cost: 1750
-  category: Medical
+  category: cargoproduct-category-name-medical
   group: market
 
 - type: cargoProduct
@@ -104,8 +104,8 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockChemVendFilled
-  cost: 6300 #Delta V - was 3820, see rebase PR #53
-  category: Medical
+  cost: 3820
+  category: cargoproduct-category-name-medical
   group: market
 
 - type: cargoProduct
@@ -115,7 +115,7 @@
     state: base
   product: CrateVendingMachineRestockNutriMaxFilled
   cost: 2400
-  category: Hydroponics
+  category: cargoproduct-category-name-hydroponics
   group: market
 
 - type: cargoProduct
@@ -125,7 +125,7 @@
     state: base
   product: CrateVendingMachineRestockPTechFilled
   cost: 1200
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -135,7 +135,7 @@
     state: base
   product: CrateVendingMachineRestockRobustSoftdrinksFilled
   cost: 1200
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -145,7 +145,7 @@
     state: base
   product: CrateVendingMachineRestockSalvageEquipmentFilled
   cost: 1000
-  category: Engineering
+  category: cargoproduct-category-name-engineering
   group: market
 
 - type: cargoProduct
@@ -155,7 +155,7 @@
     state: base
   product: CrateVendingMachineRestockSecTechFilled
   cost: 2200
-  category: Security
+  category: cargoproduct-category-name-security
   group: market
 
 - type: cargoProduct
@@ -165,7 +165,7 @@
     state: base
   product: CrateVendingMachineRestockSeedsFilled
   cost: 3375
-  category: Hydroponics
+  category: cargoproduct-category-name-hydroponics
   group: market
 
 - type: cargoProduct
@@ -175,7 +175,7 @@
     state: base
   product: CrateVendingMachineRestockSmokesFilled
   cost: 1200
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -185,7 +185,7 @@
     state: base
   product: CrateVendingMachineRestockVendomatFilled
   cost: 1200
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -195,7 +195,7 @@
     state: base
   product: CrateVendingMachineRestockRoboticsFilled
   cost: 1600
-  category: Epistemics # DeltaV - Epistemics Department replacing Science
+  category: cargoproduct-category-name-science
   group: market
 
 - type: cargoProduct
@@ -205,7 +205,7 @@
     state: base
   product: CrateVendingMachineRestockTankDispenserFilled
   cost: 1000
-  category: Atmospherics
+  category: cargoproduct-category-name-atmospherics
   group: market
 
 - type: cargoProduct
@@ -215,7 +215,7 @@
     state: base
   product: CrateVendingMachineRestockHappyHonkFilled
   cost: 2100
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -225,7 +225,7 @@
     state: base
   product: CrateVendingMachineRestockGetmoreChocolateCorpFilled
   cost: 1200
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -235,7 +235,7 @@
     state: base
   product: CrateVendingMachineRestockChangFilled
   cost: 1200
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -245,7 +245,7 @@
     state: base
   product: CrateVendingMachineRestockDiscountDansFilled
   cost: 1200
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
 
 - type: cargoProduct
@@ -255,5 +255,5 @@
     state: base
   product: CrateVendingMachineRestockDonutFilled
   cost: 1200
-  category: Service
+  category: cargoproduct-category-name-service
   group: market
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
index 14bf5e7718..c07b0eccf1 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -236,17 +236,18 @@
   id: ClothingBackpackChameleonFill
   suffix: Fill, Chameleon
   components:
-  - type: StorageFill
-    contents:
-      - id: ClothingUniformJumpsuitChameleon
-      - id: ClothingOuterChameleon
-      - id: ClothingNeckChameleon
-      - id: ClothingMaskGasChameleon
-      - id: ClothingHeadHatChameleon
-      - id: ClothingHandsChameleon
-      - id: ClothingEyesChameleon
-      - id: ClothingHeadsetChameleon
-      - id: ClothingShoesChameleon
+    - type: StorageFill
+      contents:
+        - id: ClothingUniformJumpsuitChameleon
+        - id: ClothingOuterChameleon
+        - id: ClothingNeckChameleon
+        - id: ClothingMaskGasChameleon
+        - id: ClothingHeadHatChameleon
+        - id: ClothingHandsChameleon
+        - id: ClothingEyesChameleon
+        - id: ClothingHeadsetChameleon
+        - id: ClothingShoesChameleon
+        - id: BarberScissors
 
 - type: entity
   parent: ClothingBackpackDuffelSyndicateBundle
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/service.yml b/Resources/Prototypes/Catalog/Fills/Boxes/service.yml
new file mode 100644
index 0000000000..99c256520d
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/service.yml
@@ -0,0 +1,14 @@
+- type: entity
+  name: cleanades box
+  parent: BoxCardboard
+  id: BoxCleanerGrenades
+  description: A box full of cleanades.
+  components:
+  - type: StorageFill
+    contents:
+      - id: CleanerGrenade
+        amount: 4
+  - type: Sprite
+    layers:
+      - state: box
+      - state: flashbang
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
index 8ffb4ed970..f10fd010f6 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
@@ -56,10 +56,14 @@
       - id: PlantBGoneSpray
       - id: WeedSpray
       - id: PestSpray
+      - id: HydroponicsToolClippers
       - id: HydroponicsToolScythe
+      - id: HydroponicsToolSpade
       - id: HydroponicsToolHatchet
       - id: ClothingOuterApronBotanist
       - id: ClothingHandsGlovesLeather
+      - id: EZNutrientChemistryBottle
+        amount: 2
 
 - type: entity
   id: CrateHydroponicsSeeds
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
index 1db0c3121e..cc5e3b1d17 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -292,14 +292,21 @@
     contents:
       - id: SnapPopBox
       - id: CrazyGlue
-        amount: 2
       - id: PlasticBanana
+      - id: FunnyPaint
+        orGroup: Paint
+        prob: 0.5
+      - id: FunnyPaintYellow
+        orGroup: Paint
+        prob: 0.5
       - id: WhoopieCushion
       - id: ToyHammer
       - id: MrChips
-        orGroup: GiftPool
+        prob: 0.5
+        orGroup: Dummy
       - id: MrDips
-        orGroup: Giftpool
+        prob: 0.5
+        orGroup: Dummy
       - id: RevolverCapGun
       - id: BalloonNT
       - id: ClothingShoesClownLarge
@@ -332,6 +339,41 @@
         amount: 15
         prob: 0.05
 
+- type: entity
+  id: CrateFunSprayPaints
+  name: spray paint crate
+  description: a crate filled with spray paint.
+  parent: CratePlastic
+  suffix: Spray Paint
+  components:
+  - type: StorageFill
+    contents:
+      - id: SprayPaintBlue
+        amount: 2
+        prob: 0.33
+      - id: SprayPaintRed
+        amount: 2
+        prob: 0.33
+      - id: SprayPaintOrange
+        amount: 2
+        prob: 0.33
+      - id: SprayPaintBlack
+        amount: 2
+        prob: 0.33
+      - id: SprayPaintGreen
+        amount: 2
+        prob: 0.33
+      - id: SprayPaintPurple
+        amount: 2
+        prob: 0.33
+      - id: SprayPaintWhite
+        amount: 2
+        prob: 0.33
+      - id: DeathPaint
+        amount: 2
+      - id: DeathPaintTwo
+        amount: 2
+
 - type: entity
   name: dartboard box set
   description: A box with everything you need for a fun game of darts.
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
index 8f8c1a114f..141f98edab 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -19,7 +19,8 @@
         amount: 2
       - id: Plunger
         amount: 2
-
+      - id: BoxCleanerGrenades
+      
 - type: entity
   id: CrateServiceReplacementLights
   parent: CrateGenericSteel
diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
index 976d2a4307..27dd4c7e9a 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -63,8 +63,8 @@
     contents:
       - id: Soap #Make a soap group and pick between when i'm not lazy
       - id: SprayBottleSpaceCleaner
-      #- name: GrenadeChem
-      #- name: GrenadeChem
+      - id: CleanerGrenade
+        amount: 2
       - id: FlashlightLantern
 
 - type: entity
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
index e0b40689c9..4ca95adff8 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
@@ -26,6 +26,8 @@
         prob: 0.3
       - id: ClothingNeckSalvager # DeltaV - salvage cloak
         prob: 0.2
+      - id: LunchboxLogisticsFilledRandom # DeltaV - Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerSalvageSpecialistFilled
@@ -54,3 +56,5 @@
         prob: 0.3
       - id: ClothingNeckSalvager # DeltaV - salvage cloak
         prob: 0.2
+      - id: LunchboxLogisticsFilledRandom # DeltaV - Lunchboxes!
+        prob: 0.3
\ No newline at end of file
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
index 384c27b0df..e4d995e52e 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
@@ -90,6 +90,8 @@
       - id: DoorRemoteFirefight
       - id: RCD
       - id: RCDAmmo
+      - id: LunchboxEngineeringFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerAtmosphericsFilled
@@ -107,6 +109,8 @@
       - id: DoorRemoteFirefight
       - id: RCD
       - id: RCDAmmo
+      - id: LunchboxEngineeringFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerEngineerFilledHardsuit
@@ -121,6 +125,8 @@
       - id: ClothingShoesBootsMag
       - id: RCD
       - id: RCDAmmo
+      - id: LunchboxEngineeringFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerEngineerFilled
@@ -134,6 +140,8 @@
       - id: trayScanner
       - id: RCD
       - id: RCDAmmo
+      - id: LunchboxEngineeringFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: ClosetRadiationSuitFilled
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index aecb2f7715..752591da37 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -20,7 +20,8 @@
       - id: SpaceCashLuckyBill # DeltaV - LO steal objective, see Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml
       - id: BoxPDACargo # Delta-V
       - id: QuartermasterIDCard # Delta-V
-      - id: ClothingShoesBootsWinterLogisticsOfficer #Delta V: Add departmental winter boots
+      - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerCaptainFilledHardsuit
@@ -34,7 +35,6 @@
       - id: PinpointerNuclear
 #     - id: CaptainIDCard # DeltaV - Replaced by the spare ID system
       - id: ClothingOuterHardsuitCap
-      - id: ClothingMaskGasCaptain
       - id: WeaponDisabler
       - id: CommsComputerCircuitboard
       - id: ClothingHeadsetAltCommand
@@ -49,10 +49,8 @@
 #     - id: WeaponAntiqueLaser # DeltaV - Remove in favor of the glass box
       - id: JetpackCaptainFilled
       - id: MedalCase
-      - id: ClothingHeadHatBeretCap # Nyanotrasen - Captain's Beret
-      - id: ClothingShoesLeather # DeltaV - add fancy shoes for HoP and cap
-      - id: ClothingShoesMiscWhite # DeltaV - add fancy shoes for HoP and cap
-      - id: ClothingShoesBootsWinterCap #Delta V: Add departmental winter boots
+      - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerCaptainFilled
@@ -80,9 +78,8 @@
       - id: JetpackCaptainFilled
       - id: MedalCase
       - id: ClothingHeadHatBeretCap # Nyanotrasen - Captain's Beret
-      - id: ClothingShoesLeather # DeltaV - add fancy shoes for HoP and cap
-      - id: ClothingShoesMiscWhite # DeltaV - add fancy shoes for HoP and cap
-      - id: ClothingShoesBootsWinterCap #Delta V: Add departmental winter boots
+      - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerCaptainFilledNoLaser
@@ -109,9 +106,8 @@
       - id: JetpackCaptainFilled
       - id: MedalCase
       - id: ClothingHeadHatBeretCap # Nyanotrasen - Captain's Beret
-      - id: ClothingShoesLeather # DeltaV - add fancy shoes for HoP and cap
-      - id: ClothingShoesMiscWhite # DeltaV - add fancy shoes for HoP and cap
-      - id: ClothingShoesBootsWinterCap #Delta V: Add departmental winter boots
+      - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerHeadOfPersonnelFilled
@@ -129,7 +125,6 @@
       - id: WeaponDisabler
       - id: ClothingOuterCoatHoPArmored # DeltaV
       - id: ClothingOuterArmorDuraVest # DeltaV - replaced HoP's armoured coat with a standard stabproof, pending HoPcoat resprite
-      - id: ClothingOuterCoatHoPFormal # DeltaV - formal jacket
       - id: CigarGoldCase
         prob: 0.25
         # Fuck the HoP they don't deserve fucking cigars.
@@ -139,17 +134,11 @@
       - id: RubberStampHop
       - id: BoxEncryptionKeyPassenger
       - id: BoxEncryptionKeyService
-      - id: ClothingBackpackIan
-        prob: 0.5
       - id: AccessConfigurator
       - id: BookIanDossier # DeltaV - HoP steal objective, see Resources/Prototypes/DeltaV/Entities/Objects/Misc/ian_dossier.yml
       - id: ClothingHandsGlovesInspection # DeltaV - Add inspection gloves for HoP.
-      - id: ClothingUniformJumpsuitHoPMess # DeltaV - Add mess kit for HoP.
-      - id: ClothingUniformJumpskirtHoPMess # DeltaV - Add mess kit for HoP.
-      - id: ClothingUniformJumpsuitBoatswain # DeltaV - Add turtleneck for HoP.
-      - id: ClothingShoesBootsLaceup # DeltaV - add fancy shoes for HoP and cap
-      - id: ClothingShoesMiscWhite # DeltaV - add fancy shoes for HoP and cap
-      - id: ClothingShoesBootsWinterHeadOfPersonel #Delta V: Add departmental winter boots
+      - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerChiefEngineerFilledHardsuit
@@ -176,7 +165,8 @@
       - id: RCD
       - id: RCDAmmo
       - id: CEIDCard # Delta-V
-      - id: ClothingShoesBootsWinterChiefEngineer #Delta V: Add departmental winter boots
+      - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerChiefEngineerFilled
@@ -197,9 +187,10 @@
       - id: AccessConfigurator
       - id: BoxPDAEngineering # Delta-V
       - id: CEIDCard # Delta-V
-      - id: ClothingShoesBootsWinterChiefEngineer #Delta V: Add departmental winter boots
       - id: RCD
       - id: RCDAmmo
+      - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerChiefMedicalOfficerFilledHardsuit
@@ -212,7 +203,6 @@
       - id: ClothingHandsGlovesNitrile
       - id: ClothingEyesHudMedical
       - id: ClothingHeadsetAltMedical
-      - id: ClothingCloakCmo
       - id: ClothingBackpackDuffelSurgeryFilled
       - id: ClothingMaskSterile
       - id: ClothingHeadHatBeretCmo
@@ -227,7 +217,8 @@
       - id: BoxPDAMedical # Delta-V
       - id: ClothingBeltMilitaryWebbingCMO # DeltaV - add webbing for CMO. ON THIS STATION, IT'S DRIP OR [die], CAPTAIN!
       - id: CMOIDCard # Delta-V
-      - id: ClothingShoesBootsWinterChiefMedicalOfficer #Delta V: Add departmental winter boots
+      - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerChiefMedicalOfficerFilled
@@ -241,7 +232,6 @@
       - id: ClothingEyesHudMedical
       - id: ClothingHeadsetAltMedical
       - id: ClothingBackpackDuffelSurgeryFilled
-      - id: ClothingMaskSterile
       - id: Hypospray
       - id: HandheldCrewMonitor
       - id: DoorRemoteMedical
@@ -251,7 +241,8 @@
       - id: BoxPDAMedical # Delta-V
       - id: ClothingBeltMilitaryWebbingCMO # DeltaV - add webbing for CMO. ON THIS STATION, IT'S DRIP OR [die], CAPTAIN!
       - id: CMOIDCard # Delta-V
-      - id: ClothingShoesBootsWinterChiefMedicalOfficer #Delta V: Add departmental winter boots
+      - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerResearchDirectorFilledHardsuit
@@ -271,9 +262,10 @@
       - id: BoxEncryptionKeyScience
       - id: BoxPDAScience # Delta-V
       - id: RDIDCard # Delta-V
-      - id: ClothingShoesBootsWinterMystagogue #Delta V: Add departmental winter boots
       - id: ClothingHeadsetAltScience
       - id: EncryptionKeyBinary
+      - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerResearchDirectorFilled
@@ -292,9 +284,10 @@
       - id: BoxEncryptionKeyScience
       - id: BoxPDAScience # Delta-V
       - id: RDIDCard # Delta-V
-      - id: ClothingShoesBootsWinterMystagogue #Delta V: Add departmental winter boots
       - id: ClothingHeadsetAltScience
       - id: EncryptionKeyBinary
+      - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerHeadOfSecurityFilledHardsuit
@@ -308,7 +301,6 @@
       - id: ClothingOuterCoatHoSTrench
       - id: ClothingMaskNeckGaiter
       - id: ClothingOuterHardsuitCombatHoS # DeltaV - ClothingOuterHardsuitSecurityRed replaced in favour of head of security's advanced combat hardsuit.
-      - id: ClothingMaskGasSwat
       - id: ClothingBeltSecurityFilled
       - id: ClothingHeadsetAltSecurity
       - id: ClothingEyesGlassesSunglasses
@@ -325,7 +317,8 @@
       - id: BoxPDASecurity # Delta-V
       - id: WeaponEnergyGunMultiphase # DeltaV - HoS Energy Gun
       - id: HoSIDCard # Delta-V
-      - id: ClothingShoesBootsWinterHeadOfSecurity #Delta V: Add departmental winter boots
+      - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerHeadOfSecurityFilled
@@ -353,7 +346,8 @@
       - id: BoxPDASecurity # Delta-V
       - id: WeaponEnergyGunMultiphase # DeltaV - HoS Energy Gun
       - id: HoSIDCard # Delta-V
-      - id: ClothingShoesBootsWinterHeadOfSecurity #Delta V: Add departmental winter boots
+      - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerFreezerVaultFilled
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
index 3dff55b968..f217791683 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
@@ -108,6 +108,8 @@
       - id: NitrousOxideTankFilled
         prob: 0.3
       - id: ClothingMaskSterile
+      - id: LunchboxMedicalFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3 
 
 - type: entity
   parent: LockerWallMedical
@@ -142,6 +144,8 @@
         prob: 0.05
         orGroup: Surgshrubs
       - id: ClothingMaskSterile
+      - id: LunchboxMedicalFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3 
 
 - type: entity
   id: LockerChemistryFilled
@@ -182,6 +186,8 @@
       - id: ClothingShoesBootsWinterParamedic #Delta V: Add departmental winter boots
       - id: MedkitFilled
         prob: 0.3
+      - id: LunchboxMedicalFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3 
 
 - type: entity
   id: LockerParamedicFilledHardsuit #Delta V - Paramedic locker with suit
@@ -204,3 +210,5 @@
       - id: HandheldGPSBasic
       - id: MedkitFilled
         prob: 0.3
+      - id: LunchboxMedicalFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3 
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
index 81ec76dae6..f4083f4257 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
@@ -112,6 +112,16 @@
           prob: 0.44
         - id: PlushieCarp
           prob: 0.2
+          orGroup: carp
+        - id: PlushieHolocarp
+          prob: 0.05
+          orGroup: carp
+        - id: PlushieMagicarp
+          prob: 0.05
+          orGroup: carp
+        - id: PlushieRainbowCarp
+          prob: 0.03
+          orGroup: carp
         - id: PlushieSlime
           prob: 0.2
         - id: PlushieSnake
@@ -132,6 +142,10 @@
           prob: 0.25
         - id: StrangePill
           prob: 0.20
+        - id: DeathPaint
+          prob: 0.05
+        - id: DeathPaintTwo
+          prob: 0.05
         - id: DrinkMopwataBottleRandom
           prob: 0.20
         - id: ModularReceiver
@@ -205,6 +219,16 @@
           prob: 0.44
         - id: PlushieCarp
           prob: 0.2
+          orGroup: carp
+        - id: PlushieHolocarp
+          prob: 0.05
+          orGroup: carp
+        - id: PlushieMagicarp
+          prob: 0.05
+          orGroup: carp
+        - id: PlushieRainbowCarp
+          prob: 0.03
+          orGroup: carp
         - id: PlushieSlime
           prob: 0.2
         - id: PlushieSnake
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/science.yml b/Resources/Prototypes/Catalog/Fills/Lockers/science.yml
index 4f09061f9a..215ae02a76 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/science.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/science.yml
@@ -13,3 +13,5 @@
       - id: NodeScanner
       - id: NetworkConfigurator
         prob: 0.5
+      - id: LunchboxEpistemicsFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index 89376ed4cc..e2d7ad1483 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -24,7 +24,9 @@
       - id: BoxPDAPrisoner # Delta-V
       - id: ClothingShoesBootsWinterWarden #Delta V: Add departmental winter boots
       - id: BoxEncryptionKeyPrisoner #Delta-V
-      
+      - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
+        prob: 0.3
+
 - type: entity
   id: LockerWardenFilled
   suffix: Filled
@@ -50,6 +52,8 @@
       - id: BoxPDAPrisoner # Delta-V
       - id: ClothingShoesBootsWinterWarden #Delta V: Add departmental winter boots
       - id: BoxEncryptionKeyPrisoner #Delta-V
+      - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerSecurityFilled
@@ -93,6 +97,8 @@
       - id: ClothingEyesHudSecurity
       - id: HoloprojectorSecurity
         prob: 0.6
+      - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerBrigmedicFilled
@@ -129,6 +135,8 @@
         prob: 0.7
 ##      - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse # DeltaV - why
 ##        prob: 0.15
+      - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
+        prob: 0.3
 
 # DeltaV - adding corpsman locker w/ hardsuit
 
@@ -160,6 +168,8 @@
         prob: 0.3
       - id: MedkitBurnFilled
         prob: 0.7
+      - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
+        prob: 0.3
 
 # DeltaV - end addition
 
@@ -185,6 +195,8 @@
       - id: RubberStampDetective
       - id: HoloprojectorSecurity
       - id: BoxEvidenceMarkers
+      - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: ClosetBombFilled
@@ -283,7 +295,7 @@
     contents:
     - id: WeaponSubMachineGunWt550
       amount: 2
-    - id: MagazinePistolSubMachineGun
+    - id: MagazinePistolSubMachineGunTopMounted
       amount: 4
 
 - type: entity
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
index b755c6c924..110d62f62a 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
@@ -21,6 +21,8 @@
         amount: 2
       - id: RagItem
         amount: 2
+      - id: LunchboxServiceFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 #- type: entity
 #  id: LockerFormalFilled
@@ -52,6 +54,8 @@
       - id: DrinkMilkCarton
         amount: 2
       - id: DrinkSoyMilkCarton
+      - id: LunchboxServiceFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: ClosetJanitorFilled
@@ -77,6 +81,8 @@
         amount: 2
       - id: Plunger
         amount: 2
+      - id: LunchboxServiceFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: ClosetLegalFilled
@@ -111,6 +117,8 @@
       - id: ClothingUniformOveralls
       - id: ClothingHeadHatTrucker
         prob: 0.1
+      - id: LunchboxServiceFilledRandom # Delta-V Lunchboxes!
+        prob: 0.3
 
 - type: entity
   id: LockerBotanistLoot
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
index 73b7021461..ac5cb47cc9 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
@@ -275,6 +275,8 @@
       - id: OxygenTankFilled
       - id: ClothingOuterHardsuitCombatCorpsman
       - id: ClothingMaskBreath
+  - type: AccessReader
+    access: [ [ "Corpsman" ] ]
 
 # DeltaV - End Changes
 
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml
index 0c7661452a..2038ef0013 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml
@@ -24,46 +24,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingUniformJumpsuitColorWhite
-        prob: 0.25
-      - id: ClothingUniformJumpskirtColorWhite
-        prob: 0.25
-      - id: ClothingUniformJumpsuitColorBlue
-        prob: 0.25
-      - id: ClothingUniformJumpskirtColorBlue
-        prob: 0.25
-      - id: ClothingUniformJumpsuitColorYellow
-        prob: 0.25
-      - id: ClothingUniformJumpskirtColorYellow
-        prob: 0.25
-      - id: ClothingUniformJumpsuitColorGreen
-        prob: 0.25
-      - id: ClothingUniformJumpskirtColorGreen
-        prob: 0.25
-      - id: ClothingUniformJumpsuitColorOrange
-        prob: 0.25
-      - id: ClothingUniformJumpskirtColorOrange
-        prob: 0.25
-      - id: ClothingUniformJumpsuitColorPink
-        prob: 0.25
-      - id: ClothingUniformJumpskirtColorPink
-        prob: 0.25
-      - id: ClothingUniformJumpsuitColorRed
-        prob: 0.25
-      - id: ClothingUniformJumpskirtColorRed
-        prob: 0.25
-      - id: ClothingUniformJumpsuitColorDarkBlue
-        prob: 0.25
-      - id: ClothingUniformJumpskirtColorDarkBlue
-        prob: 0.25
-      - id: ClothingUniformJumpsuitColorTeal
-        prob: 0.25
-      - id: ClothingUniformJumpskirtColorTeal
-        prob: 0.25
-      - id: ClothingUniformJumpsuitColorPurple
-        prob: 0.25
-      - id: ClothingUniformJumpskirtColorPurple
-        prob: 0.25
       - id: ClothingShoesColorBlack
         amount: 1
       - id: ClothingShoesColorBrown
@@ -74,6 +34,16 @@
         prob: 0.4
       - id: ClothingOuterCoatGentle
         prob: 0.3
+      - id: ClothingUniformRandomShorts
+        amount: 3
+      - id: ClothingUniformRandomArmless
+        amount: 5
+      - id: ClothingUniformRandomStandart
+        amount: 5
+      - id: ClothingUniformRandomBra
+        amount: 5
+      - id: ClothingUniformRandomShirt
+        amount: 4
 
 - type: entity
   id: WardrobeYellowFilled
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/lawdrobe.yml
index 8d3c0ca53d..5f3892d0f9 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/lawdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/lawdrobe.yml
@@ -4,5 +4,15 @@
     - advertisement-lawdrobe-1
     - advertisement-lawdrobe-2
     - advertisement-lawdrobe-3
+    - advertisement-lawdrobe-4
+    - advertisement-lawdrobe-5
+    - advertisement-lawdrobe-6
+    - advertisement-lawdrobe-7
+    - advertisement-lawdrobe-8
   thankyous:
     - vending-machine-thanks
+    - thankyou-lawdrobe-1
+    - thankyou-lawdrobe-2
+    - thankyou-lawdrobe-3
+    - thankyou-lawdrobe-4
+    - thankyou-lawdrobe-5
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
index 1d1c9f8cd3..bc6ddc96fb 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
@@ -20,4 +20,4 @@
     FoodButter: 4
     FoodCheese: 1
     FoodMeat: 6
-    
+    LunchboxGenericFilledRandom: 5 # Delta-V Adds Lunchbox
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
index 9085bcb4fb..2c4c27137f 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
@@ -5,6 +5,7 @@
     ClothingBackpackDuffel: 5
     ClothingBackpackSatchel: 3
     ClothingBackpackSatchelLeather: 2
+    ClothingRandomSpawner: 8
     ClothingHeadHatBeret: 4
     ClothingHeadBandBlack: 2
     ClothingHeadBandBlue: 2
@@ -84,6 +85,16 @@
     ClothingOuterCoatLettermanRed: 2 # Nyano - Clothing addition
     ClothingOuterDenimJacket: 2 # DeltaV - Clothing addition
     ClothingOuterCorporateJacket: 2 # DeltaV - Clothing addition
+    ClothingOuterCsCorporateJacket: 2 # Einstein Engines - Clothing addition
+    ClothingOuterEeCorporateJacket: 2 # Einstein Engines - Clothing addition
+    ClothingOuterHiCorporateJacket: 2 # Einstein Engines - Clothing addition
+    ClothingOuterHmCorporateJacket: 2 # Einstein Engines - Clothing addition
+    ClothingOuterIdCorporateJacket: 2 # Einstein Engines - Clothing addition
+    ClothingOuterZhCorporateJacket: 2 # Einstein Engines - Clothing addition
+    ClothingOuterGeCorporateJacket: 2 # Einstein Engines - Clothing addition
+    ClothingOuterFaCorporateJacket: 2 # Einstein Engines - Clothing addition
+    ClothingOuterDdCorporateJacket: 2 # Einstein Engines - Clothing addition
+    ClothingOuterBcCorporateJacket: 2 # Einstein Engines - Clothing addition
     ClothingShoesBootsFishing: 2 # Nyano - Clothing addition
     ClothingHeadTinfoil: 2 # Nyano - Clothing addition
     ClothingHeadFishCap: 2
@@ -99,6 +110,7 @@
     ClothingHandsGlovesColorGreen: 2
     ClothingHandsGlovesColorOrange: 2
     ClothingHandsGlovesColorPurple: 2
+    ClothingEyesGlassesCheapSunglasses: 3
   contrabandInventory:
     ClothingMaskNeckGaiter: 2
     ClothingUniformJumpsuitTacticool: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml
index 86f35b5269..0b9a73aa6e 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml
@@ -24,3 +24,4 @@
     DrinkMugOne: 1
     DrinkMugRainbow: 2
     DrinkMugRed: 2
+    LunchboxGeneric: 10 # Delta-V Adds Lunchbox
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
index 69dec7c241..fd91bc71ed 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
@@ -16,5 +16,10 @@
     ClothingNeckLawyerbadge: 2
     ClothingOuterCoatOvercoat: 2 # DeltaV - add overcoat to LawDrobe
     RubberStampLawyer: 1 # DeltaV
+    LuxuryPen: 2
+  contrabandInventory:
+    ClothingOuterRobesJudge: 1
+    ClothingHeadHatPwig: 1
+    SpaceCash100: 2 # "Legally" obtained currency
   emaggedInventory:
     CyberPen: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
index 92e4032b0c..bb21bc36d4 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
@@ -87,6 +87,7 @@
     ClothingShoesBootsCowboyBrown: 1
     ClothingShoesBootsCowboyBlack: 1
     ClothingShoesBootsCowboyWhite: 1
+    ClothingMaskNeckGaiterRed: 2
   emaggedInventory:
     ClothingShoesBling: 1
     ClothingShoesBootsCowboyFancy: 1
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index f18deb5c0d..1e81cdf2dd 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -254,6 +254,16 @@
       tags:
       - NukeOpsUplink
 
+- type: listing
+  id: UplinkSyndicateBombFake
+  name: uplink-exploding-syndicate-bomb-fake-name
+  description: uplink-exploding-syndicate-bomb-fake-desc
+  productEntity: SyndicateBombFake
+  cost:
+    Telecrystal: 4
+  categories:
+    - UplinkExplosives
+
 - type: listing
   id: UplinkClusterGrenade
   name: uplink-cluster-grenade-name
@@ -308,11 +318,6 @@
     Telecrystal: 2
   categories:
   - UplinkAmmo
-  conditions:
-  - !type:StoreWhitelistCondition
-    whitelist:
-      tags:
-      - NukeOpsUplink
 
 # For the Cobra
 - type: listing
@@ -423,7 +428,7 @@
   name: uplink-reinforcement-radio-name
   description: uplink-reinforcement-radio-desc
   productEntity: ReinforcementRadioSyndicate
-  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio }
+  icon: { sprite: Objects/Devices/communication.rsi, state: radio }
   cost:
     Telecrystal: 16
   categories:
@@ -439,7 +444,7 @@
   name: uplink-reinforcement-radio-name
   description: uplink-reinforcement-radio-desc
   productEntity: ReinforcementRadioSyndicateNukeops
-  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio }
+  icon: { sprite: Objects/Devices/communication.rsi, state: radio }
   cost:
     Telecrystal: 16
   categories:
@@ -471,7 +476,7 @@
   name: uplink-reinforcement-radio-monkey-name
   description: uplink-reinforcement-radio-monkey-desc
   productEntity: ReinforcementRadioSyndicateMonkey
-  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio }
+  icon: { sprite: Objects/Devices/communication.rsi, state: radio }
   cost:
     Telecrystal: 8
   categories:
@@ -487,9 +492,9 @@
   name: uplink-reinforcement-radio-monkey-name
   description: uplink-reinforcement-radio-monkey-desc
   productEntity: ReinforcementRadioSyndicateMonkeyNukeops
-  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio }
+  icon: { sprite: Objects/Devices/communication.rsi, state: radio }
   cost:
-    Telecrystal: 8
+    Telecrystal: 6
   categories:
   - UplinkUtility
   conditions:
@@ -551,7 +556,7 @@
     Telecrystal: 2
   categories:
   - UplinkUtility
-  
+
 - type: listing
   id: UplinkClothingEyesHudSyndicate
   name: uplink-clothing-eyes-hud-syndicate-name
@@ -714,12 +719,12 @@
       whitelist:
         tags:
           - NukeOpsUplink
- 
+
 - type: listing
   id: UplinkUplinkImplanter # uplink uplink real
   name: uplink-uplink-implanter-name
   description: uplink-uplink-implanter-desc
-  icon: { sprite: /Textures/Objects/Devices/communication.rsi, state: old-radio }
+  icon: { sprite: /Textures/Objects/Devices/communication.rsi, state: radio }
   productEntity: UplinkImplanter
   cost:
     Telecrystal: 2
@@ -1502,8 +1507,28 @@
         tags:
           - NukeOpsUplink
 
+- type: listing
+  id: UplinkBackpackSyndicate
+  name: uplink-backpack-syndicate-name
+  description: uplink-backpack-syndicate-desc
+  productEntity: ClothingBackpackSyndicate
+  cost:
+    Telecrystal: 2
+  categories:
+    - UplinkPointless
+
  # Pointless
 
+- type: listing
+  id: UplinkBarberScissors
+  name: uplink-barber-scissors-name
+  description: uplink-barber-scissors-desc
+  productEntity: BarberScissors
+  cost:
+    Telecrystal: 1
+  categories:
+  - UplinkPointless
+
 - type: listing
   id: UplinkRevolverCapGun
   name: uplink-revolver-cap-gun-name
diff --git a/Resources/Prototypes/Datasets/tips.yml b/Resources/Prototypes/Datasets/tips.yml
index 1f288aa023..3ee82727fd 100644
--- a/Resources/Prototypes/Datasets/tips.yml
+++ b/Resources/Prototypes/Datasets/tips.yml
@@ -129,8 +129,8 @@
   - "In a pinch, you can throw drinks or other reagent containers behind you to create a spill that can slip people chasing you."
   - "Some weapons, such as knives & shivs, have a fast attack speed."
   - "The jaws of life can be used to open powered doors."
-  - "You can drink blood to heal back some of your blood volume, albeit very inefficiently."
-  - "If you're not a lizard, don't drink blood! It makes you sick and you begin to take damage."
+  - "If you're not a human, you can drink blood to heal back some of your blood volume, albeit very inefficiently."
+  - "If you're a human, don't drink blood! It makes you sick and you'll begin to take damage."
   - "There is a chemical metabolism limit that limits the amount of reagents of a certain type you can digest at once. Certain species have higher metabolism limits, such as slimes."
   - "Welding without proper eye protection can cause eye damage, which must be cured with oculine."
   - "Zombies are very vulnerable to heat damage, making welding tools and laser guns extremely effective against them."
diff --git a/Resources/Prototypes/DeltaV/Access/misc.yml b/Resources/Prototypes/DeltaV/Access/misc.yml
index c1260b3995..df3f60a4f8 100644
--- a/Resources/Prototypes/DeltaV/Access/misc.yml
+++ b/Resources/Prototypes/DeltaV/Access/misc.yml
@@ -15,6 +15,7 @@
     - Command
     - Security
     - Detective
+    - Corpsman
 #    - Armory
     - Lawyer
     - Engineering
diff --git a/Resources/Prototypes/DeltaV/Access/security.yml b/Resources/Prototypes/DeltaV/Access/security.yml
new file mode 100644
index 0000000000..6a54aea852
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Access/security.yml
@@ -0,0 +1,3 @@
+- type: accessLevel
+  id: Corpsman
+  name: id-card-access-level-corpsman
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Paper/manuals.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Paper/manuals.yml
new file mode 100644
index 0000000000..fcb93c1c91
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Paper/manuals.yml
@@ -0,0 +1,26 @@
+- type: entity
+  parent: Paper
+  id: PaperWrittenNoteFromMumGeneric
+  name: note from mom
+  suffix: Lunchbox, Generic
+  components:
+  - type: Paper
+    content: book-text-lunchbox-generic
+    
+- type: entity
+  parent: PaperWrittenNoteFromMumGeneric
+  id: PaperWrittenNoteFromMumHealthy
+  name: note from mom
+  suffix: Lunchbox, Healthy
+  components:
+  - type: Paper
+    content: book-text-lunchbox-healthy
+    
+- type: entity
+  parent: PaperWrittenNoteFromMumGeneric
+  id: PaperWrittenNoteFromMumUnhealthy
+  name: note from mom
+  suffix: Lunchbox, Unhealthy
+  components:
+  - type: Paper
+    content: book-text-lunchbox-unhealthy
\ No newline at end of file
diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/courierdrobe.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/courierdrobe.yml
index 9878e4bf89..eb9d3d038a 100644
--- a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/courierdrobe.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/courierdrobe.yml
@@ -6,3 +6,6 @@
     - advertisement-courierdrobe-3
     - advertisement-courierdrobe-4
     - advertisement-courierdrobe-5
+  thankyous:
+    - thankyou-courierdrobe-1
+    - thankyou-courierdrobe-2
diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml
index f24ff8fa51..77f5a20858 100644
--- a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml
@@ -3,4 +3,7 @@
   advertisements:
   - advertisement-pride-1
   - advertisement-pride-2
-  - advertisement-pride-3
\ No newline at end of file
+  - advertisement-pride-3
+  thankyous:
+  - thankyou-pride-1
+  - thankyou-pride-2
diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/anti_anomaly_zone.yml b/Resources/Prototypes/DeltaV/Entities/Markers/anti_anomaly_zone.yml
new file mode 100644
index 0000000000..f6609c8343
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Markers/anti_anomaly_zone.yml
@@ -0,0 +1,33 @@
+- type: entity
+  name: anti anomaly zone
+  description: Anomalies will not be able to appear within a 10 block radius of this point.
+  id: AntiAnomalyZone
+  suffix: "range 10"
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    sprite: Structures/Specific/Anomalies/ice_anom.rsi
+    layers:
+      - state: anom
+      - sprite: Markers/cross.rsi
+        state: pink
+  - type: AntiAnomalyZone
+    zoneRadius: 10
+
+- type: entity
+  parent: AntiAnomalyZone
+  id: AntiAnomalyZone20
+  suffix: "range 20"
+  description: Anomalies will not be able to appear within a 20 block radius of this point.
+  components:
+  - type: AntiAnomalyZone
+    zoneRadius: 20
+
+- type: entity
+  parent: AntiAnomalyZone
+  id: AntiAnomalyZone50
+  suffix: "range 50"
+  description: Anomalies will not be able to appear within a 50 block radius of this point.
+  components:
+  - type: AntiAnomalyZone
+    zoneRadius: 50
diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/warp_point.yml b/Resources/Prototypes/DeltaV/Entities/Markers/warp_point.yml
new file mode 100644
index 0000000000..e2fec5fa00
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Markers/warp_point.yml
@@ -0,0 +1,272 @@
+# Off station
+- type: entity
+  id: WarpPointEvacShuttle
+  parent: WarpPoint
+  suffix: Evac Shuttle
+  components:
+  - type: WarpPoint
+    location: Evac Shuttle
+
+- type: entity
+  id: WarpPointShuttle
+  parent: WarpPoint
+  suffix: Shuttle
+  components:
+  - type: WarpPoint
+    location: Shuttle
+
+- type: entity
+  id: WarpPointDebris
+  parent: WarpPoint
+  suffix: Space Debris
+  components:
+  - type: WarpPoint
+    location: Space Debris
+
+- type: entity
+  id: WarpPointRuin
+  parent: WarpPoint
+  suffix: Space Ruin
+  components:
+  - type: WarpPoint
+    location: Space Ruin
+
+# Command
+- type: entity
+  id: WarpPointBridge
+  parent: WarpPoint
+  suffix: Bridge
+  components:
+  - type: WarpPoint
+    location: Bridge
+
+- type: entity
+  id: WarpPointVault
+  parent: WarpPoint
+  suffix: Vault
+  components:
+  - type: WarpPoint
+    location: Vault
+
+# Security
+- type: entity
+  id: WarpPointSecurity
+  parent: WarpPoint
+  suffix: Security
+  components:
+  - type: WarpPoint
+    location: Security
+
+- type: entity
+  id: WarpPointPerma
+  parent: WarpPoint
+  suffix: Perma
+  components:
+  - type: WarpPoint
+    location: Perma
+
+- type: entity
+  id: WarpPointDetective
+  parent: WarpPoint
+  suffix: Detective
+  components:
+  - type: WarpPoint
+    location: Detective
+
+- type: entity
+  id: WarpPointCourt
+  parent: WarpPoint
+  suffix: Courtroom
+  components:
+  - type: WarpPoint
+    location: Courtroom
+
+#Medical
+- type: entity
+  id: WarpPointMedical
+  parent: WarpPoint
+  suffix: Medical
+  components:
+  - type: WarpPoint
+    location: Medical
+
+- type: entity
+  id: WarpPointMorgue
+  parent: WarpPoint
+  suffix: Morgue
+  components:
+  - type: WarpPoint
+    location: Morgue
+
+#Epistemics
+- type: entity
+  id: WarpPointEpistemics
+  parent: WarpPoint
+  suffix: Epistemics
+  components:
+  - type: WarpPoint
+    location: Epistemics
+
+#Logistics
+- type: entity
+  id: WarpPointLogistics
+  parent: WarpPoint
+  suffix: Logistics
+  components:
+  - type: WarpPoint
+    location: Logistics
+
+- type: entity
+  id: WarpPointSalvage
+  parent: WarpPoint
+  suffix: Salvage
+  components:
+  - type: WarpPoint
+    location: Salvage
+
+#Engineering
+- type: entity
+  id: WarpPointEngineering
+  parent: WarpPoint
+  suffix: Engineering
+  components:
+  - type: WarpPoint
+    location: Engineering
+
+- type: entity
+  id: WarpPointSingulo
+  parent: WarpPoint
+  suffix: Singularity
+  components:
+  - type: WarpPoint
+    location: Singularity
+
+- type: entity
+  id: WarpPointAtmos
+  parent: WarpPoint
+  suffix: Atmos
+  components:
+  - type: WarpPoint
+    location: Atmos
+
+#Service
+- type: entity
+  id: WarpPointHOP
+  parent: WarpPoint
+  suffix: HoP
+  components:
+  - type: WarpPoint
+    location: HoP
+
+- type: entity
+  id: WarpPointKitchen
+  parent: WarpPoint
+  suffix: Kitchen
+  components:
+  - type: WarpPoint
+    location: Kitchen
+
+- type: entity
+  id: WarpPointBar
+  parent: WarpPoint
+  suffix: Bar
+  components:
+  - type: WarpPoint
+    location: Bar
+
+- type: entity
+  id: WarpPointBotany
+  parent: WarpPoint
+  suffix: Botany
+  components:
+  - type: WarpPoint
+    location: Botany
+
+- type: entity
+  id: WarpPointJanitor
+  parent: WarpPoint
+  suffix: Janitor
+  components:
+  - type: WarpPoint
+    location: Janitor
+
+- type: entity
+  id: WarpPointReporter
+  parent: WarpPoint
+  suffix: Reporter
+  components:
+  - type: WarpPoint
+    location: Reporter
+
+- type: entity
+  id: WarpPointLawyer
+  parent: WarpPoint
+  suffix: Lawyer
+  components:
+  - type: WarpPoint
+    location: Lawyer
+
+#Misc
+- type: entity
+  id: WarpPointAI
+  parent: WarpPoint
+  suffix: AI
+  components:
+  - type: WarpPoint
+    location: AI
+
+- type: entity
+  id: WarpPointArrivals
+  parent: WarpPoint
+  suffix: Arrivals
+  components:
+  - type: WarpPoint
+    location: Arrivals
+
+- type: entity
+  id: WarpPointEvac
+  parent: WarpPoint
+  suffix: Evac
+  components:
+  - type: WarpPoint
+    location: Evac
+
+- type: entity
+  id: WarpPointCryo
+  parent: WarpPoint
+  suffix: Cryo
+  components:
+  - type: WarpPoint
+    location: Cryo
+
+- type: entity
+  id: WarpPointChapel
+  parent: WarpPoint
+  suffix: Chapel
+  components:
+  - type: WarpPoint
+    location: Chapel
+
+- type: entity
+  id: WarpPointLibrary
+  parent: WarpPoint
+  suffix: Library
+  components:
+  - type: WarpPoint
+    location: Library
+
+- type: entity
+  id: WarpPointDorms
+  parent: WarpPoint
+  suffix: Dorms
+  components:
+  - type: WarpPoint
+    location: Dorms
+
+- type: entity
+  id: WarpPointDisposals
+  parent: WarpPoint
+  suffix: Disposals
+  components:
+  - type: WarpPoint
+    location: Disposals
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/Oni_horns.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/Oni_horns.yml
new file mode 100644
index 0000000000..fbf78c92e5
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/Oni_horns.yml
@@ -0,0 +1,19 @@
+- type: marking
+  id: OniHornShaved
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: DeltaV/Mobs/Customization/Oni/oni_horns.rsi
+    state: shaved
+
+- type: marking
+  id: OniHornBull
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  forcedColoring: false
+  speciesRestriction: [Oni]
+  sprites:
+  - sprite: DeltaV/Mobs/Customization/Oni/oni_horns.rsi
+    state: bull
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
index b4be935f49..771da36719 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
@@ -31,6 +31,7 @@
             - FlyingMobLayer
   - type: Bloodstream
     bloodReagent: Phlogiston
+    bloodMaxVolume: 0
   - type: MeleeWeapon
     altDisarm: false # No shoving
     angle: 0
@@ -99,6 +100,10 @@
     makeSentient: true
     allowMovement: true
     allowSpeech: true
+    requirements:
+    - !type:DepartmentTimeRequirement
+      department: Epistemics
+      time: 14400 # DeltaV - 4 hours
 
 - type: entity
   parent: WelderExperimental
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
new file mode 100644
index 0000000000..1d0eb4e850
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
@@ -0,0 +1,123 @@
+- type: entity
+  parent: DrinkBase
+  id: DrinkJuiceBoxBaseFull
+  abstract: true
+  components:
+  - type: Openable
+    sound:
+      collection: bottleOpenSounds #Could use a new sound someday ¯\_(ツ)_/¯
+  - type: Sealable
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 20
+  - type: Item
+    size: Small
+  - type: MeleeWeapon
+    soundNoDamage:
+      path: "/Audio/Effects/Fluids/splat.ogg"
+    damage:
+      types:
+        Blunt: 0
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 10
+      behaviors:
+      - !type:SpillBehavior { }
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+        #In future maybe add generic plastic scrap trash/debris
+  - type: TrashOnSolutionEmpty
+    solution: drink
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "icon_open"}
+          False: {state: "icon"}
+  - type: Sprite
+    layers:
+      - state: icon
+        map: ["enum.OpenableVisuals.Layer"]
+
+- type: entity
+  parent: DrinkJuiceBoxBaseFull
+  id: DrinkJuiceOrangeJuicebox
+  name: orange juice box
+  description: A great source of vitamins. Stay healthy!
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: JuiceOrange
+          Quantity: 20
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi
+
+- type: entity
+  parent: DrinkJuiceBoxBaseFull
+  id: DrinkJuicePineappleJuicebox
+  name: pineapple juice box
+  description: Everyone's favourite juice.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: JuicePineapple
+          Quantity: 20
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi
+
+- type: entity
+  parent: DrinkJuiceBoxBaseFull
+  id: DrinkJuiceAppleJuicebox
+  name: apple juice box
+  description: Sweet apple juice. Don't be late for school!
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: JuiceApple
+          Quantity: 20
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi
+
+- type: entity
+  parent: DrinkJuiceBoxBaseFull
+  id: DrinkJuiceGrapeJuicebox
+  name: grape juice box
+  description: Tasty grape juice in a fun little container. Non-alcoholic!
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: JuiceGrape
+          Quantity: 20
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi
+
+- type: entity
+  parent: DrinkJuiceBoxBaseFull
+  id: DrinkChocolateJuicebox
+  name: chocolate milk juice box
+  description: Tasty chocolate juice and milk in a small box. Contains Theobromine.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: HotCocoa
+          Quantity: 10
+        - ReagentId: Milk # The milk of chocolate milk
+          Quantity: 10
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks.yml
index 8f05f0f55f..4e3b3e938e 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -1,7 +1,7 @@
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkHealthViolationGlass
-  name: health code violation
+  suffix: health code violation
   description: Allegedly it's a cocktail. The warning cone motif seems apt.
   components:
   - type: SolutionContainerManager
@@ -11,13 +11,14 @@
         reagents:
         - ReagentId: HealthViolation
           Quantity: 30
-  - type: Sprite
-    sprite: DeltaV/Objects/Consumable/Drinks/dulleavene.rsi
+  - type: Icon
+    sprite: DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkGunmetalGlass
-  name: gunmetal glass
+  suffix: gunmetal
   description: A cloudy mix of rum, cream, and... is that welding fuel? Probably tasty.
   components:
   - type: SolutionContainerManager
@@ -27,13 +28,14 @@
         reagents:
         - ReagentId: Gunmetal
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: DeltaV/Objects/Consumable/Drinks/gunmetal.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkLemonDropGlass
-  name: lemon drop
+  suffix: lemon drop
   description: A martini glass filled with a translucent mix of refreshing lemony goodness.
   components:
   - type: SolutionContainerManager
@@ -43,13 +45,14 @@
         reagents:
         - ReagentId: LemonDrop
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: DeltaV/Objects/Consumable/Drinks/lemondrop.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkGreenGrassGlass
-  name: green grass
+  suffix: green grass
   description: An odd green cocktail, topped with oranges, ice, and a plastic straw. Curious.
   components:
   - type: SolutionContainerManager
@@ -59,13 +62,14 @@
         reagents:
         - ReagentId: GreenGrass
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: DeltaV/Objects/Consumable/Drinks/greengrass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkDaiquiriGlass
-  name: classic daiquiri
+  suffix: classic daiquiri
   description: Rum, lime, and simple syrup. Such class, such refinement.
   components:
   - type: SolutionContainerManager
@@ -75,13 +79,14 @@
         reagents:
         - ReagentId: Daiquiri
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: DeltaV/Objects/Consumable/Drinks/daiquiri.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkArsonistsBrewGlass
-  name: arsonist's brew
+  suffix: arsonist's brew
   description: It's probably not concerning that it's glowing faintly. Or bubbling. Or smoking. No, not at all.
   components:
   - type: SolutionContainerManager
@@ -91,13 +96,14 @@
         reagents:
         - ReagentId: ArsonistsBrew
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: DeltaV/Objects/Consumable/Drinks/arsonist.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkKvassGlass
-  name: kvass glass
+  suffix: kvass
   description: A cool refreshing drink with a taste of socialism.
   components:
     - type: SolutionContainerManager
@@ -107,13 +113,14 @@
           reagents:
             - ReagentId: Kvass
               Quantity: 30
-    - type: Sprite
-      sprite: Objects/Consumable/Drinks/kvass.rsi
+    - type: Icon
+      sprite: DeltaV/Objects/Consumable/Drinks/kvass.rsi
+      state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkMothamphetamineGlass
-  name: mothamphetamine
+  suffix: mothamphetamine
   description: A strangely... Fuzzy drink. It has a chaotic aura.
   components:
     - type: SolutionContainerManager
@@ -123,5 +130,6 @@
           reagents:
             - ReagentId: Mothamphetamine
               Quantity: 30
-    - type: Sprite
+    - type: Icon
       sprite: DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi
+      state: icon
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/Containers/lunchbox.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/Containers/lunchbox.yml
new file mode 100644
index 0000000000..46e689615b
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/Containers/lunchbox.yml
@@ -0,0 +1,412 @@
+- type: entity
+  id: LunchboxGeneric
+  parent: [ BoxCardboard, BaseBagOpenClose ]
+  name: lunchbox
+  description: For on-the-go meal carrying needs.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Storage/lunchbox.rsi
+    layers:
+    - state: generic
+    - state: generic-open
+      map: ["openLayer"]
+  - type: Item
+    size: Large
+    shape: null
+    sprite: DeltaV/Objects/Storage/lunchbox.rsi
+    heldPrefix: generic
+  - type: Storage
+    maxItemSize: Normal
+    grid:
+    - 0,0,1,1
+    - 3,0,1,1
+    - 4,0,4,1
+  - type: PhysicalComposition
+    materialComposition:
+      Plastic: 100
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 2
+    soundHit:
+      path: "/Audio/Weapons/click.ogg"
+  - type: StaticPrice
+    price: 10
+
+- type: entity
+  parent: LunchboxGeneric
+  id: LunchboxGenericFilledRandom
+  suffix: Filled, Random
+  name: pre-packed lunchbox
+  description: Packed with love.
+  components:
+  - type: StorageFill
+    contents:
+    #Main
+    - id: FoodPizzaArnoldSlice
+      orGroup: HealthyOrUnhealthyMain
+      prob: 0.2
+      amount: 2
+    - id: FoodBurgerCheese
+      orGroup: HealthyOrUnhealthyMain
+      prob: 0.2
+    - id: FoodCarrot
+      orGroup: HealthyOrUnhealthyMain
+      prob: 0.2
+    - id: FoodMothCapreseSalad
+      orGroup: HealthyOrUnhealthyMain
+      prob: 0.2
+    - id: FoodEggBoiled
+      orGroup: HealthyOrUnhealthyMain
+      prob: 0.2
+    #Drink
+    - id: DrinkJuiceOrangeJuicebox
+      orGroup: HealthyOrUnhealthyDrink
+      prob: 0.15
+    - id: DrinkJuicePineappleJuicebox
+      orGroup: HealthyOrUnhealthyDrink
+      prob: 0.15
+    - id: DrinkJuiceAppleJuicebox
+      orGroup: HealthyOrUnhealthyDrink
+      prob: 0.15
+    - id: DrinkJuiceGrapeJuicebox
+      orGroup: HealthyOrUnhealthyDrink
+      prob: 0.15
+    - id: DrinkChocolateJuicebox
+      orGroup: HealthyOrUnhealthyDrink
+      prob: 0.15
+    - id: DrinkWaterBottleFull
+      orGroup: HealthyOrUnhealthyDrink
+      prob: 0.15
+    #Snack
+    - id: FoodSnackCheesie
+      orGroup: HealthyOrUnhealthySnack
+      prob: 0.15
+    - id: FoodSnackBoritos
+      orGroup: HealthyOrUnhealthySnack
+      prob: 0.15
+    - id: FoodSnackChips
+      orGroup: HealthyOrUnhealthySnack
+      prob: 0.15
+    - id: FoodSnackPistachios
+      orGroup: HealthyOrUnhealthySnack
+      prob: 0.15
+    - id: FoodSnackChocolate
+      orGroup: HealthyOrUnhealthySnack
+      prob: 0.15
+    - id: FoodSnackSus
+      orGroup: HealthyOrUnhealthySnack
+      prob: 0.15
+    - id: FoodMothMoffin
+      orGroup: HealthyOrUnhealthySnack
+      prob: 0.05
+    - id: FoodMothMothmallowSlice
+      orGroup: HealthyOrUnhealthySnack
+      prob: 0.05
+    - id: FoodApple
+      orGroup: HealthyOrUnhealthySnack
+      prob: 0.15
+    - id: FoodBanana
+      orGroup: HealthyOrUnhealthySnack
+      prob: 0.15
+    #Note
+    - id: PaperWrittenNoteFromMumGeneric
+      prob: 0.1
+
+- type: entity
+  parent: LunchboxGeneric
+  id: LunchboxGenericFilledHealthy
+  suffix: Filled, Healthy
+  name: pre-packed lunchbox
+  description: Packed with healthy love.
+  components:
+  - type: StorageFill
+    contents:
+    #Main
+    - id: FoodCarrot
+      orGroup: HealthyMain
+      prob: 0.5
+    - id: FoodMothCapreseSalad
+      orGroup: HealthyMain
+      prob: 0.5
+    - id: FoodEggBoiled
+      orGroup: HealthyMain
+      prob: 0.25
+    #Drink
+    - id: DrinkWaterBottleFull
+    #Snack
+    - id: FoodApple
+      orGroup: HealthySnack
+      prob: 0.5
+    - id: FoodBanana
+      orGroup: HealthySnack
+      prob: 0.5
+    #Note
+    - id: PaperWrittenNoteFromMumHealthy
+      prob: 0.1
+
+- type: entity
+  parent: LunchboxGeneric
+  id: LunchboxGenericFilledUnhealthy
+  suffix: Filled, Unhealthy
+  name: pre-packed lunchbox
+  description: Packed with love.
+  components:
+  - type: StorageFill
+    contents:
+    #Main
+    - id: FoodPizzaArnoldSlice
+      amount: 2
+    #Drink
+    - id: DrinkJuiceOrangeJuicebox
+      orGroup: UnhealthyDrink
+      prob: 0.2
+    - id: DrinkJuicePineappleJuicebox
+      orGroup: UnhealthyDrink
+      prob: 0.2
+    - id: DrinkJuiceAppleJuicebox
+      orGroup: UnhealthyDrink
+      prob: 0.2
+    - id: DrinkJuiceGrapeJuicebox
+      orGroup: UnhealthyDrink
+      prob: 0.2
+    - id: DrinkChocolateJuicebox
+      orGroup: UnhealthyDrink
+      prob: 0.2
+    #Snack
+    - id: FoodSnackCheesie
+      orGroup: UnhealthySnack
+      prob: 0.15
+    - id: FoodSnackBoritos
+      orGroup: UnhealthySnack
+      prob: 0.15
+    - id: FoodSnackChips
+      orGroup: UnhealthySnack
+      prob: 0.15
+    - id: FoodSnackPistachios
+      orGroup: UnhealthySnack
+      prob: 0.15
+    - id: FoodSnackChocolate
+      orGroup: UnhealthySnack
+      prob: 0.15
+    - id: FoodSnackSus
+      orGroup: UnhealthySnack
+      prob: 0.15
+    - id: FoodMothMoffin
+      orGroup: UnhealthySnack
+      prob: 0.05
+    - id: FoodMothMothmallowSlice
+      orGroup: UnhealthySnack
+      prob: 0.05
+    #Note
+    - id: PaperWrittenNoteFromMumUnhealthy
+      prob: 0.1
+
+- type: entity
+  parent: LunchboxGeneric
+  id: LunchboxCommand
+  suffix: Command
+  components:
+  - type: Sprite
+    layers:
+    - state: command
+    - state: command-open
+      map: [ "openLayer" ]
+  - type: Item
+    heldPrefix: command
+
+- type: entity
+  parent: LunchboxGenericFilledRandom
+  id: LunchboxCommandFilledRandom
+  suffix: Command, Filled, Random
+  components:
+  - type: Sprite
+    layers:
+    - state: command
+    - state: command-open
+      map: [ "openLayer" ]
+  - type: Item
+    heldPrefix: command
+
+- type: entity
+  parent: LunchboxGeneric
+  id: LunchboxSecurity
+  suffix: Security
+  components:
+  - type: Sprite
+    layers:
+    - state: security
+    - state: security-open
+      map: [ "openLayer" ]
+  - type: Item
+    heldPrefix: security
+
+- type: entity
+  parent: LunchboxGenericFilledRandom
+  id: LunchboxSecurityFilledRandom
+  suffix: Security, Filled, Random
+  components:
+  - type: Sprite
+    layers:
+    - state: security
+    - state: security-open
+      map: [ "openLayer" ]
+  - type: Item
+    heldPrefix: security
+
+- type: entity
+  parent: LunchboxGeneric
+  id: LunchboxMedical
+  suffix: Medical
+  components:
+  - type: Sprite
+    layers:
+    - state: medical
+    - state: medical-open
+      map: [ "openLayer" ]
+  - type: Item
+    heldPrefix: medical
+
+- type: entity
+  parent: LunchboxGenericFilledRandom
+  id: LunchboxMedicalFilledRandom
+  suffix: Medical, Filled, Random
+  components:
+  - type: Sprite
+    layers:
+    - state: medical
+    - state: medical-open
+      map: [ "openLayer" ]
+  - type: Item
+    heldPrefix: medical
+
+- type: entity
+  parent: LunchboxGeneric
+  id: LunchboxLogistics
+  suffix: Logistics
+  components:
+  - type: Sprite
+    layers:
+    - state: logistics
+    - state: logistics-open
+      map: [ "openLayer" ]
+  - type: Item
+    heldPrefix: logistics
+
+- type: entity
+  parent: LunchboxGenericFilledRandom
+  id: LunchboxLogisticsFilledRandom
+  suffix: Logistics, Filled, Random
+  components:
+  - type: Sprite
+    layers:
+    - state: logistics
+    - state: logistics-open
+      map: [ "openLayer" ]
+  - type: Item
+    heldPrefix: logistics
+
+- type: entity
+  parent: LunchboxGeneric
+  id: LunchboxEngineering
+  suffix: Engineering
+  components:
+  - type: Sprite
+    layers:
+    - state: engineering
+    - state: engineering-open
+      map: [ "openLayer" ]
+  - type: Item
+    heldPrefix: engineering
+
+- type: entity
+  parent: LunchboxGenericFilledRandom
+  id: LunchboxEngineeringFilledRandom
+  suffix: Engineering, Filled, Random
+  components:
+  - type: Sprite
+    layers:
+    - state: engineering
+    - state: engineering-open
+      map: [ "openLayer" ]
+  - type: Item
+    heldPrefix: engineering
+
+- type: entity
+  parent: LunchboxGeneric
+  id: LunchboxEpistemics
+  suffix: Epistemics
+  components:
+  - type: Sprite
+    layers:
+    - state: epistemics
+    - state: epistemics-open
+      map: [ "openLayer" ]
+  - type: Item
+    heldPrefix: epistemics
+
+- type: entity
+  parent: LunchboxGenericFilledRandom
+  id: LunchboxEpistemicsFilledRandom
+  suffix: Epistemics, Filled, Random
+  components:
+  - type: Sprite
+    layers:
+    - state: epistemics
+    - state: epistemics-open
+      map: [ "openLayer" ]
+  - type: Item
+    heldPrefix: epistemics
+
+
+- type: entity
+  parent: LunchboxGeneric
+  id: LunchboxService
+  suffix: Service
+  components:
+  - type: Sprite
+    layers:
+    - state: service
+    - state: service-open
+      map: [ "openLayer" ]
+  - type: Item
+    heldPrefix: service
+
+- type: entity
+  parent: LunchboxGenericFilledRandom
+  id: LunchboxServiceFilledRandom
+  suffix: Service, Filled, Random
+  components:
+  - type: Sprite
+    layers:
+    - state: service
+    - state: service-open
+      map: [ "openLayer" ]
+  - type: Item
+    heldPrefix: service
+
+- type: entity
+  parent: LunchboxGeneric
+  id: LunchboxSyndicate
+  suffix: Syndicate
+  components:
+  - type: Sprite
+    layers:
+    - state: syndicate
+    - state: syndicate-open
+      map: [ "openLayer" ]
+  - type: Item
+    heldPrefix: syndicate
+
+- type: entity
+  parent: LunchboxGenericFilledRandom
+  id: LunchboxSyndicateFilledRandom
+  suffix: Syndicate, Filled, Random
+  components:
+  - type: Sprite
+    layers:
+    - state: syndicate
+    - state: syndicate-open
+      map: [ "openLayer" ]
+  - type: Item
+    heldPrefix: syndicate
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml
index 74993ae94a..d1e26bf27f 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml
@@ -27,7 +27,7 @@
 - type: entity
   parent: DefaultStationBeaconMedical
   id: DefaultStationBeaconExam
-  suffix: Exam Room
+  suffix: Exam
   components:
   - type: NavMapBeacon
     text: station-beacon-exam
@@ -43,7 +43,7 @@
 - type: entity
   parent: DefaultStationBeaconMedical
   id: DefaultStationBeaconPsychologist
-  suffix: Psychologist
+  suffix: Psych
   components:
   - type: NavMapBeacon
     text: station-beacon-psych
@@ -52,7 +52,7 @@
 - type: entity
   parent: DefaultStationBeaconScience
   id: DefaultStationBeaconProber
-  suffix: Glimmer Prober
+  suffix: Prober
   components:
   - type: NavMapBeacon
     text: station-beacon-glimmer-prober
@@ -60,7 +60,7 @@
 - type: entity
   parent: DefaultStationBeaconScience
   id: DefaultStationBeaconMantis
-  suffix: Forensic Mantis
+  suffix: Mantis
   components:
   - type: NavMapBeacon
     text: station-beacon-forensic-mantis
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml
index 2e60a19c4a..fc9f2902ad 100644
--- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml
@@ -1,3 +1,4 @@
+# Delta V specific roles
 - type: entity
   parent: AirlockScience
   id: AirlockMantisLocked
@@ -13,3 +14,245 @@
   components:
   - type: AccessReader
     access: [["Mantis"]]
+
+- type: entity
+  parent: AirlockSecurity
+  id: AirlockCorpsmanLocked
+  suffix: Corpsman, Locked
+  components:
+  - type: AccessReader
+    access: [["Corpsman"]]
+
+- type: entity
+  parent: AirlockSecurityGlass
+  id: AirlockCorpsmanGlassLocked
+  suffix: Corpsman, Locked
+  components:
+  - type: AccessReader
+    access: [["Corpsman"]]
+
+- type: entity
+  parent: AirlockGlassShuttle
+  id: AirlockExternalGlassShuttleEscapeSub
+  suffix: External, Escape Sub, Glass, Docking
+  components:
+    - type: GridFill
+      path: /Maps/Shuttles/DeltaV/sub_escape_pod.yml
+
+- type: entity
+  parent: Airlock
+  id: AirlockBoxerLocked
+  suffix: Boxer, Locked
+  components:
+  - type: AccessReader
+    access: [["Boxer"]]
+
+- type: entity
+  parent: Airlock
+  id: AirlockClownLocked
+  suffix: Clown, Locked
+  components:
+  - type: AccessReader
+    access: [["Clown"]]
+
+- type: entity
+  parent: Airlock
+  id: AirlockMimeLocked
+  suffix: Mime, Locked
+  components:
+  - type: AccessReader
+    access: [["Mime"]]
+
+- type: entity
+  parent: Airlock
+  id: AirlockMusicianLocked
+  suffix: Musician, Locked
+  components:
+  - type: AccessReader
+    access: [["Musician"]]
+
+- type: entity
+  parent: Airlock
+  id: AirlockReporterLocked
+  suffix: Reporter, Locked
+  components:
+  - type: AccessReader
+    access: [["Reporter"]]
+
+- type: entity
+  parent: Airlock
+  id: AirlockLibraryLocked
+  suffix: Library, Locked
+  components:
+  - type: AccessReader
+    access: [["Library"]]
+
+- type: entity
+  parent: Airlock
+  id: AirlockZookeeperLocked
+  suffix: Zookeeper, Locked
+  components:
+  - type: AccessReader
+    access: [["Zookeeper"]]
+
+- type: entity
+  parent: AirlockExternal
+  id: AirlockExternalSalvageLocked
+  suffix: External, Salvage, Locked
+  components:
+  - type: AccessReader
+    access: [["Salvage"]]
+
+- type: entity
+  parent: AirlockMedical
+  id: AirlockPsychologistLocked
+  suffix: Psychologist, Locked
+  components:
+  - type: AccessReader
+    access: [["Psychologist"]]
+
+# Glass Airlocks
+- type: entity
+  parent: AirlockGlass
+  id: AirlockBoxerGlassLocked
+  suffix: Boxer, Locked
+  components:
+  - type: AccessReader
+    access: [["Boxer"]]
+
+- type: entity
+  parent: AirlockGlass
+  id: AirlockClownGlassLocked
+  suffix: Clown, Locked
+  components:
+  - type: AccessReader
+    access: [["Clown"]]
+
+- type: entity
+  parent: AirlockGlass
+  id: AirlockMimeGlassLocked
+  suffix: Mime, Locked
+  components:
+  - type: AccessReader
+    access: [["Mime"]]
+
+- type: entity
+  parent: AirlockGlass
+  id: AirlockMusicianGlassLocked
+  suffix: Musician, Locked
+  components:
+  - type: AccessReader
+    access: [["Musician"]]
+
+- type: entity
+  parent: AirlockGlass
+  id: AirlockReporterGlassLocked
+  suffix: Reporter, Locked
+  components:
+  - type: AccessReader
+    access: [["Reporter"]]
+
+- type: entity
+  parent: AirlockGlass
+  id: AirlockLibraryGlassLocked
+  suffix: Library, Locked
+  components:
+  - type: AccessReader
+    access: [["Library"]]
+
+- type: entity
+  parent: AirlockGlass
+  id: AirlockZookeeperGlassLocked
+  suffix: Zookeeper, Locked
+  components:
+  - type: AccessReader
+    access: [["Zookeeper"]]
+
+- type: entity
+  parent: AirlockExternalGlass
+  id: AirlockExternalGlassSalvageLocked
+  suffix: External, Glass, Salvage, Locked
+  components:
+  - type: AccessReader
+    access: [["Salvage"]]
+
+- type: entity
+  parent: AirlockMedicalGlass
+  id: AirlockPsychologistGlassLocked
+  suffix: Psychologist, Locked
+  components:
+  - type: AccessReader
+    access: [["Psychologist"]]
+
+# Maintenance Hatches
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintBoxerLocked
+  suffix: Boxer, Locked
+  components:
+  - type: AccessReader
+    access: [["Boxer"]]
+
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintClownLocked
+  suffix: Clown, Locked
+  components:
+  - type: AccessReader
+    access: [["Clown"]]
+
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintMimeLocked
+  suffix: Mime, Locked
+  components:
+  - type: AccessReader
+    access: [["Mime"]]
+
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintMusicianLocked
+  suffix: Musician, Locked
+  components:
+  - type: AccessReader
+    access: [["Musician"]]
+
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintReporterLocked
+  suffix: Reporter, Locked
+  components:
+  - type: AccessReader
+    access: [["Reporter"]]
+
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintLibraryLocked
+  suffix: Library, Locked
+  components:
+  - type: AccessReader
+    access: [["Library"]]
+
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintZookeeperLocked
+  suffix: Zookeeper, Locked
+  components:
+  - type: AccessReader
+    access: [["Zookeeper"]]
+
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintPsychologistLocked
+  suffix: Psychologist, Locked
+  components:
+  - type: AccessReader
+    access: [["Psychologist"]]
+
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintSecurityLawyerLocked
+  suffix: Security/Lawyer, Locked
+  components:
+  - type: AccessReader
+    access: [["Security"], ["Lawyer"]]
diff --git a/Resources/Prototypes/DeltaV/Flavors/flavors.yml b/Resources/Prototypes/DeltaV/Flavors/flavors.yml
index f3c7876a8a..382868db63 100644
--- a/Resources/Prototypes/DeltaV/Flavors/flavors.yml
+++ b/Resources/Prototypes/DeltaV/Flavors/flavors.yml
@@ -87,9 +87,9 @@
 
 #Delta V
 - type: flavor
-  id: dulleavene
+  id: healthcodeviolation
   flavorType: Complex
-  description: flavor-complex-dulleavene
+  description: flavor-complex-healthcodeviolation
 
 - type: flavor
   id: gunmetal
diff --git a/Resources/Prototypes/DeltaV/GameRules/events.yml b/Resources/Prototypes/DeltaV/GameRules/events.yml
index 73b0ca6549..9391756492 100644
--- a/Resources/Prototypes/DeltaV/GameRules/events.yml
+++ b/Resources/Prototypes/DeltaV/GameRules/events.yml
@@ -52,9 +52,8 @@
   noSpawn: true
   components:
   - type: StationEvent
-    earliestStart: 15
-    weight: 5
-    minimumPlayers: 25
+    weight: 7.5
+    minimumPlayers: 10
     maxOccurrences: 1
     duration: 1
   - type: PirateRadioSpawnRule
diff --git a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml
index 816aa57444..c568c1bc75 100644
--- a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml
@@ -4,11 +4,14 @@
   parent: BaseDrink
   desc: reagent-desc-healthviolation
   physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: dulleavene
+  flavor: healthcodeviolation
   color: "#ff7f00"
   metamorphicSprite:
-    sprite: DeltaV/Objects/Consumable/Drinks/dulleavene.rsi
-    state: icon
+    sprite: DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -41,7 +44,10 @@
   color: "#994422"
   metamorphicSprite:
     sprite: DeltaV/Objects/Consumable/Drinks/gunmetal.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -67,7 +73,9 @@
   color: "#fff789"
   metamorphicSprite:
     sprite: DeltaV/Objects/Consumable/Drinks/lemondrop.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 3
+  metamorphicFillBaseName: fill-
   metabolisms:
     Drink:
       effects:
@@ -87,7 +95,9 @@
   color: "#66aa55"
   metamorphicSprite:
     sprite: DeltaV/Objects/Consumable/Drinks/greengrass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
   metabolisms:
     Drink:
       effects:
@@ -107,7 +117,10 @@
   color: "#ddffdd"
   metamorphicSprite:
     sprite: DeltaV/Objects/Consumable/Drinks/daiquiri.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 3
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -127,7 +140,10 @@
   color: "#fff789"
   metamorphicSprite:
     sprite: DeltaV/Objects/Consumable/Drinks/arsonist.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -158,8 +174,11 @@
   flavor: bread
   color: "#381600"
   metamorphicSprite:
-    sprite: Objects/Consumable/Drinks/kvass.rsi
-    state: icon
+    sprite: DeltaV/Objects/Consumable/Drinks/kvass.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
 
 - type: reagent
   id: Mothamphetamine
@@ -171,7 +190,10 @@
   color: "#2fa1ef"
   metamorphicSprite:
     sprite: DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml
index cc262380e4..d3bd543eaa 100644
--- a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml
+++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml
@@ -21,6 +21,7 @@
   #- Brig #Delta V: Removed brig access
   - Maintenance
   - External
+  - Corpsman
   extendedAccess:
   - Chemistry
   special:
diff --git a/Resources/Prototypes/DeltaV/StatusEffects/job.yml b/Resources/Prototypes/DeltaV/StatusEffects/job.yml
index 4b61fd46d7..949ac6a99e 100644
--- a/Resources/Prototypes/DeltaV/StatusEffects/job.yml
+++ b/Resources/Prototypes/DeltaV/StatusEffects/job.yml
@@ -2,5 +2,5 @@
   parent: JobIcon
   id: JobIconMedicalBorg
   icon:
-    sprite: DeltaV/Interface/Misc/job_icons.rsi
+    sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
     state: MedicalBorg
diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
index ed462c4f7b..5dbefa1684 100644
--- a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
@@ -28,25 +28,25 @@
       collection: HarpyGrowls
     Purr:
       collection: HarpyPurrs
-    Ring:
+    HarpyRing:
       collection: HarpyRings
-    HonkHarpy:
+    HarpyHonk:
       collection: HarpyHonks
-    Pew:
+    HarpyPew:
       collection: HarpyPews
-    Bang:
+    HarpyBang:
       collection: HarpyBangs
-    Beep:
+    HarpyBeep:
       collection: HarpyBeeps
-    Rev:
+    HarpyRev:
       collection: HarpyRevs
-#    Click:
-#      collection: HarpyClicks
+    Click:
+      collection: HarpyClicks
     Chitter:
       collection: HarpyChitter
     Squeak:
       collection: HarpySqueak
-    Caw:
+    HarpyCaw:
       collection: HarpyCaws
     Chirp:
       collection: HarpyChirps
@@ -58,6 +58,10 @@
       collection: VulpkaninWhines
     Howl:
       collection: VulpkaninHowls
+    Honk:
+      collection: BikeHorn
+    Weh:
+      collection: Weh
 
 - type: emoteSounds
   id: MaleVulpkanin
@@ -72,12 +76,20 @@
       collection: MaleSneezes
     Cough:
       collection: MaleCoughs
+    Yawn:
+      collection: MaleYawn
+    Snore:
+      collection: Snores
+    Honk:
+      collection: BikeHorn
+    Sigh:
+      collection: MaleSigh
     Crying:
       collection: MaleCry
     Whistle:
       collection: Whistles
-    Sigh:
-      collection: MaleSigh
+    Weh:
+      collection: Weh
     Growl:
       collection: VulpkaninGrowls
     Snarl:
@@ -102,12 +114,20 @@
       collection: FemaleSneezes
     Cough:
       collection: FemaleCoughs
+    Yawn:
+      collection: FemaleYawn
+    Snore:
+      collection: Snores
+    Honk:
+      collection: CluwneHorn
+    Sigh:
+      collection: FemaleSigh
     Crying:
       collection: FemaleCry
     Whistle:
       collection: Whistles
-    Sigh:
-      collection: FemaleSigh
+    Weh:
+      collection: Weh
     Growl:
       collection: VulpkaninGrowls
     Snarl:
diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml
index 45eec7cb41..2cef3fd038 100644
--- a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml
@@ -1,89 +1,157 @@
 # Harpy
 - type: emote
-  id: HonkHarpy
+  id: HarpyHonk
   category: Vocal
   chatMessages: [honks.]
   chatTriggers:
+    - honk
     - honk.
+    - honk!
+    - honk?
+    - honks
     - honks.
     - honks!
+    - honks?
+    - honking
     - honking.
+    - honking!
+    - honking?
+    - honked
     - honked.
+    - honked!
+    - honked?
 
 - type: emote
-  id: Ring
+  id: HarpyRing
   category: Vocal
   chatMessages: [rings.]
   chatTriggers:
+    - ring
     - ring.
+    - ring!
+    - ring?
+    - rings
     - rings.
     - rings!
+    - rings?
+    - ringing
     - ringing.
+    - ringing!
+    - ringing?
+    - ringed
     - ringed.
+    - ringed!
+    - ringed?
+    - rang
+    - rang.
+    - rang!
+    - rang?
 
 - type: emote
-  id: Pew
+  id: HarpyPew
   category: Vocal
   chatMessages: [pews.]
   chatTriggers:
+    - pew
     - pew.
-    - pews.
     - pew!
+    - pew?
+    - pews
+    - pews.
+    - pews!
+    - pews?
+    - pewpew
+    - pewpew.
+    - pewpew!
+    - pewpew?
 
 - type: emote
-  id: Bang
+  id: HarpyBang
   category: Vocal
   chatMessages: [bangs.]
   chatTriggers:
-    - bangs.
+    - bang
     - bang.
     - bang!
+    - bang?
+    - bangs
+    - bangs.
+    - bangs!
+    - bangs?
+    - banging
     - banging.
+    - banging!
+    - banging?
+    - banged
     - banged.
+    - banged!
+    - banged?
 
 - type: emote
-  id: Beep
+  id: HarpyBeep
   category: Vocal
   chatMessages: [beeps.]
   chatTriggers:
-    - beeps.
+    - beep
     - beep.
     - beep!
+    - beep?
+    - beeps
+    - beeps.
+    - beeps!
+    - beeps?
+    - beeping
     - beeping.
+    - beeping!
+    - beeping?
+    - beeped
     - beeped.
+    - beeped!
+    - beeped?
 
 - type: emote
-  id: Rev
+  id: HarpyRev
   category: Vocal
   chatMessages: [revs.]
   chatTriggers:
-    - revs.
+    - rev
     - rev.
     - rev!
+    - rev?
+    - revs
+    - revs.
+    - revs!
+    - revs?
     - revving
+    - revving.
+    - revving!
+    - revving?
     - revved
-
-#- type: emote
-#  id: Click
-#  category: Vocal
-#  chatMessages: [clicks.]
-#  chatTriggers:
-#    - clicks.
-#    - click.
-#    - click!
-#    - clicking.
-#    - clicked.
+    - revved.
+    - revved!
+    - revved?
 
 - type: emote
-  id: Caw
+  id: HarpyCaw
   category: Vocal
   chatMessages: [caws.]
   chatTriggers:
-    - caws.
+    - caw
     - caw.
     - caw!
+    - caw?
+    - caws
+    - caws.
+    - caws!
+    - caws?
     - cawing
+    - cawing.
+    - cawing!
+    - cawing?
     - cawed
+    - cawed.
+    - cawed!
+    - cawed?
 
 #Vulpkanin
 - type: emote
@@ -91,48 +159,85 @@
   category: Vocal
   chatMessages: [barks.]
   chatTriggers:
+    - bark
     - bark.
     - bark!
+    - bark?
+    - barks
     - barks.
     - barks!
+    - barks?
+    - barked
     - barked.
     - barked!
+    - barked?
+    - barking
     - barking.
+    - barking!
+    - barking?
 
 - type: emote
   id: Snarl
   category: Vocal
   chatMessages: [snarls.]
   chatTriggers:
+    - snarl
     - snarl.
     - snarl!
+    - snarl?
+    - snarls
     - snarls.
     - snarls!
+    - snarls?
+    - snarled
     - snarled.
     - snarled!
+    - snarled?
+    - snarling
     - snarling.
+    - snarling!
+    - snarling?
 
 - type: emote
   id: Whine
   category: Vocal
   chatMessages: [whines.]
   chatTriggers:
+    - whine
     - whine.
     - whine!
+    - whine?
+    - whines
     - whines.
     - whines!
+    - whines?
+    - whined
     - whined.
     - whined!
+    - whined?
+    - whining
     - whining.
+    - whining!
+    - whining?
 
 - type: emote
   id: Howl
   category: Vocal
   chatMessages: [howls.]
   chatTriggers:
+    - howl
     - howl.
     - howl!
+    - howl?
+    - howls
     - howls.
     - howls!
+    - howls?
+    - howling
     - howling.
+    - howling!
+    - howling?
+    - howled
     - howled.
+    - howling!
+    - howling?
diff --git a/Resources/Prototypes/DeltaV/siliconlaws.yml b/Resources/Prototypes/DeltaV/siliconlaws.yml
index 2d22fc3cd4..fa7fad6e29 100644
--- a/Resources/Prototypes/DeltaV/siliconlaws.yml
+++ b/Resources/Prototypes/DeltaV/siliconlaws.yml
@@ -284,7 +284,7 @@
   lawString: law-silicon-police-6
 
 - type: siliconLawset
-  id: SiliconPolice1
+  id: SiliconPolice
   laws:
   - SiliconPolice1
   - SiliconPolice2
diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
index d5cdd354a9..fbd5a02fa0 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -248,6 +248,18 @@
   - type: Sprite
     sprite: Clothing/Back/Backpacks/ertclown.rsi
 
+#Syndicate
+- type: entity
+  parent: ClothingBackpack
+  id: ClothingBackpackSyndicate
+  name: syndicate backpack
+  description:
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Backpacks/syndicate.rsi
+  - type: ExplosionResistance
+    damageCoefficient: 0.1         
+
 #Special
 - type: entity
   parent: ClothingBackpack
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index b84033a787..1f90b42152 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -41,6 +41,7 @@
         - Geiger
         - TrayScanner
         - GasAnalyzer
+        - HandLabeler
   - type: ItemMapper
     mapLayers:
       drill:
@@ -223,6 +224,7 @@
         - Plunger
       components:
         - LightReplacer
+        - SmokeOnTrigger
     maxItemSize: Large
   - type: ItemMapper
     mapLayers:
@@ -265,10 +267,12 @@
         - PillCanister
         - Radio
         - DiscreteHealthAnalyzer
+        - SurgeryTool
       components:
         - Hypospray
         - Injector
         - Pill
+        - HandLabeler
   - type: ItemMapper
     mapLayers:
       bottle:
@@ -341,6 +345,7 @@
       components:
         - Seed
         - Smokable
+        - HandLabeler
   - type: ItemMapper
     mapLayers:
       hatchet:
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
index 79446d8633..9af8edb002 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
@@ -129,17 +129,14 @@
 
 - type: entity
   parent: ClothingEyesBase
-  id: ClothingEyesGlassesSunglasses
-  name: sun glasses
-  description: A pair of black sunglasses.
+  id: ClothingEyesGlassesCheapSunglasses
+  name: cheap sunglasses
+  description: A pair of black sunglasses. Doesn't block light well, more of an accessory than something useful.
   components:
   - type: Sprite
     sprite: Clothing/Eyes/Glasses/sunglasses.rsi
   - type: Clothing
     sprite: Clothing/Eyes/Glasses/sunglasses.rsi
-  - type: FlashImmunity
-  - type: EyeProtection
-    protectionTime: 5
   - type: Tag
     tags:
     - HamsterWearable
@@ -148,6 +145,16 @@
   - type: IdentityBlocker
     coverage: EYES
 
+- type: entity
+  parent: ClothingEyesGlassesCheapSunglasses
+  id: ClothingEyesGlassesSunglasses
+  name: sun glasses
+  description: A pair of black sunglasses.
+  components:
+  - type: FlashImmunity
+  - type: EyeProtection
+    protectionTime: 5
+
 - type: entity
   parent: ClothingEyesBase
   id: ClothingEyesGlassesSecurity
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml b/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml
index 3e291f5dff..15cda5a69f 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml
@@ -62,6 +62,9 @@
   - type: ContainerContainer
     containers:
       cell_slot: !type:ContainerSlot
+  - type: Tag
+    tags:
+    - WhitelistChameleon
 
 - type: entity
   parent: ClothingHeadHatHardhatBase
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index 43d6c7c9b7..c845d7cc4a 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -809,8 +809,8 @@
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatMagician
-  name: magician's top hat.
-  description: "A magician's top hat."
+  name: magician's tophat
+  description: "A magician's tophat."
   components:
   - type: Icon
     sprite: Clothing/Head/Hats/magician.rsi
@@ -827,6 +827,7 @@
   - type: Item
     size: Small
     sprite: Clothing/Head/Hats/magician.rsi
+    storedRotation: 0
   - type: Storage
     grid:
     - 0,0,0,0
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
index 1f70211caa..ad738792a7 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -514,6 +514,16 @@
     tags:
     - WhitelistChameleon
 
+- type: entity
+  parent: ClothingMaskNeckGaiter
+  id: ClothingMaskNeckGaiterRed
+  name: red neck gaiter
+  components:
+  - type: Sprite
+    sprite: Clothing/Mask/neckgaiterred.rsi
+  - type: Clothing
+    sprite: Clothing/Mask/neckgaiterred.rsi
+
 - type: entity
   parent: ClothingMaskClownBase
   id: ClothingMaskSexyClown
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
index 05067ff68a..6b4be3c9f8 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/misc.yml
@@ -73,7 +73,9 @@
   noSpawn: true
   components:
   - type: EntityTargetAction
-    icon: Clothing/Neck/Misc/stethoscope.rsi/icon.png
+    icon:
+      sprite: Clothing/Neck/Misc/stethoscope.rsi
+      state: icon
     event: !type:StethoscopeActionEvent
     checkCanInteract: false
     priority: -1
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
index bd82df57d4..d17fb275c1 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
@@ -90,6 +90,9 @@
     sprite: Clothing/OuterClothing/Misc/cardborg.rsi
   - type: TypingIndicatorClothing
     proto: robot
+  - type: Tag
+    tags:
+    - WhitelistChameleon
 
 - type: entity
   parent: ClothingOuterBaseToggleable
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
index 4f0a0d0aaf..f3610178b9 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -32,7 +32,7 @@
     - ClothMade
     - WhitelistChameleon
   - type: StaticPrice
-    price: 70
+    price: 50
 
 - type: entity
   parent: ClothingOuterWinterCoat
@@ -541,3 +541,113 @@
           Quantity: 20
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterWeb
+
+- type: entity
+  parent: ClothingOuterWinterCoat
+  id: ClothingOuterCsCorporateJacket
+  name: Cybersun Corporate Jacket
+  description: A cozy jacket with the Cybersun logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi
+
+- type: entity
+  parent: ClothingOuterWinterCoat
+  id: ClothingOuterEeCorporateJacket
+  name: Einstein Engines Corporate Jacket
+  description: A cozy jacket with the Einstein Engines logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi
+
+- type: entity
+  parent: ClothingOuterWinterCoat
+  id: ClothingOuterHiCorporateJacket
+  name: Hephaestus Industries Corporate Jacket
+  description: A cozy jacket with the Hephaestus Industries logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi
+
+- type: entity
+  parent: ClothingOuterWinterCoat
+  id: ClothingOuterHmCorporateJacket
+  name: Hawkmoon Acquisitions Corporate Jacket
+  description: A cozy jacket with the Hawkmoon Acquisitions logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi
+
+- type: entity
+  parent: ClothingOuterWinterCoat
+  id: ClothingOuterIdCorporateJacket
+  name: Interdyne Corporate Jacket
+  description: A cozy jacket with the Interdyne logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi
+
+- type: entity
+  parent: ClothingOuterWinterCoat
+  id: ClothingOuterBcCorporateJacket
+  name: Bishop Cybernetics Corporate Jacket
+  description: A cozy jacket with the Bishop Cybernetics logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi
+
+- type: entity
+  parent: ClothingOuterWinterCoat
+  id: ClothingOuterDdCorporateJacket
+  name: Discount Dan's Corporate Jacket
+  description: A cozy jacket with the Discount Dan's logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi
+
+- type: entity
+  parent: ClothingOuterWinterCoat
+  id: ClothingOuterFaCorporateJacket
+  name: Five Points Armory Corporate Jacket
+  description: A cozy jacket with the Five Points Armory logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi
+
+- type: entity
+  parent: ClothingOuterWinterCoat
+  id: ClothingOuterGeCorporateJacket
+  name: Gilthari Exports Corporate Jacket
+  description: A cozy jacket with the Gilthari Exports logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi
+
+- type: entity
+  parent: ClothingOuterWinterCoat
+  id: ClothingOuterZhCorporateJacket
+  name: Zeng-Hu Pharmaceuticals Corporate Jacket
+  description: A cozy jacket with the Zeng-Hu Pharmaceuticals logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
index 8d7dde5928..1119d5cda7 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
@@ -45,7 +45,7 @@
   - type: ItemSlots
     slots:
       item:
-        name: clothing-military-boots-sidearm
+        name: clothing-boots-sidearm
         whitelist:
           tags:
           - Knife
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
index ee1708caef..d1f6e083f4 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
@@ -47,6 +47,9 @@
       collection: FootstepDuck
       params:
         variation: 0.07
+  - type: Construction
+    graph: ClothingShoeSlippersDuck
+    node: shoes
 
 - type: entity
   parent: ClothingShoesBaseButcherable
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
index 4a49c804cd..4b9cbeef42 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
@@ -9,8 +9,26 @@
   - type: Clothing
     sprite: Clothing/Shoes/Specific/chef.rsi
 
+# stuff common to all clown & jester shoes
 - type: entity
-  parent: ClothingShoesBaseButcherable
+  abstract: true
+  parent: [ClothingShoesBaseButcherable, ClothingSlotBase]
+  id: ClothingShoesClownBase
+  components:
+  - type: ItemSlots
+    slots:
+      item:
+        name: clothing-boots-sidearm
+        whitelist:
+          tags:
+          - Knife
+          - ToySidearm
+        blacklist:
+          components:
+          - Sharp
+
+- type: entity
+  parent: ClothingShoesClownBase
   id: ClothingShoesClown
   name: clown shoes
   description: "The prankster's standard-issue clowning shoes. Damn they're huge!"
@@ -49,7 +67,7 @@
     acceleration: 5
 
 - type: entity
-  parent: ClothingShoesBaseButcherable
+  parent: ClothingShoesClownBase
   id: ClothingShoesBling
   name: bling clown shoes
   description: Made of refined bananium and shined with the pulp of a fresh banana peel. These make a flashy statement.
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
index 9f98e396ca..de9875b3ad 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
@@ -62,5 +62,4 @@
   - type: Tag #DeltaV, needed for species with nonhuman legs/can only wear skirts
     tags:
     - Skirt
-    - ClothMade
-    - WhitelistChameleon
+    - ClothMade # Delta-V - allows moths to eat this
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
index d98207da37..23c35fbc8a 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -276,6 +276,12 @@
     controlsLocked: true
     randomMode: false
     mode: SensorCords
+  - type: Tag
+    tags:
+    - ClothMade
+    - WhitelistChameleon
+    - PrisonUniform
+    - Skirt # Delta-V - Skirt Tag so Harpies can wear it.
 
 - type: entity
   parent: ClothingUniformSkirtBase
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/random_suit.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/random_suit.yml
new file mode 100644
index 0000000000..88278077b5
--- /dev/null
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/random_suit.yml
@@ -0,0 +1,169 @@
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformRandom
+  abstract: true
+  description: Generated by neural networks based on the latest fashion trends.
+  suffix: Random visual
+  components:
+  - type: SuitSensor
+  - type: Sprite
+    sprite: Clothing/Uniforms/procedural.rsi
+    layers:
+    - state: base_torso_standart
+      map: [ "torso" ]
+    - state: base_leg_standart
+      map: [ "leg" ]
+    - state: mask_null
+      map: [ "decor" ]
+    - state: mask_null
+      map: [ "overlay" ]
+  - type: Clothing
+    femaleMask: UniformTop
+    maleMask: UniformTop
+    sprite: Clothing/Uniforms/procedural.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: base_torso_standart
+        map: [ "torso" ]
+      - state: base_leg_standart
+        map: [ "leg" ]
+      - state: mask_null
+        map: [ "decor" ]
+      - state: mask_null
+        map: [ "overlay" ]
+
+- type: entity
+  parent: ClothingUniformRandom
+  id: ClothingRandomSpawner
+  name: random colorful costume
+  components:
+  - type: RandomSpawner
+    offset: 0
+    prototypes:
+    - ClothingUniformRandomArmless
+    - ClothingUniformRandomStandart
+    - ClothingUniformRandomBra
+    - ClothingUniformRandomShorts
+    - ClothingUniformRandomShirt
+
+- type: entity
+  parent: ClothingUniformRandom
+  id: ClothingUniformRandomArmless
+  name: colorful hands-free costume
+  components:
+  - type: RandomSprite
+    available:
+      - torso:
+          base_torso_armless: Sixteen
+        leg:
+          base_leg_standart: Sixteen
+          base_leg_short: Sixteen
+          base_leg_skirt: Sixteen
+          base_leg_skirt_long: Sixteen
+        decor:
+          decor_torso_armless1: Sixteen
+          decor_torso_armless2: Sixteen
+          decor_torso_armless3: Sixteen
+          decor_torso_armless4: Sixteen
+          decor_torso_armless5: Sixteen
+          decor_torso_armless6: Sixteen
+          decor_torso_armless7: Sixteen
+          decor_torso_armless8: Sixteen
+          decor_torso_armless9: Sixteen
+          decor_torso_armless10: Sixteen
+          mask_null: ""
+
+- type: entity
+  parent: ClothingUniformRandom
+  id: ClothingUniformRandomStandart
+  name: colorful costume
+  components:
+  - type: RandomSprite
+    available:
+      - torso:
+          base_torso_standart: Sixteen
+          base_torso_standart2: Sixteen
+        leg:
+          base_leg_standart: Sixteen
+          base_leg_short: Sixteen
+          base_leg_skirt: Sixteen
+          base_leg_skirt_long: Sixteen
+        decor:
+          decor_torso_armless1: Sixteen
+          decor_torso_armless2: Sixteen
+          decor_torso_armless3: Sixteen
+          decor_torso_armless4: Sixteen
+          decor_torso_armless5: Sixteen
+          decor_torso_armless6: Sixteen
+          decor_torso_armless7: Sixteen
+          decor_torso_armless8: Sixteen
+          decor_torso_armless9: Sixteen
+          decor_torso_armless10: Sixteen
+          decor_torso_standart1: Sixteen
+          decor_torso_standart2: Sixteen
+          decor_torso_standart3: Sixteen
+          decor_torso_standart4: Sixteen
+          decor_torso_standart5: Sixteen
+          decor_torso_standart6: Sixteen
+          decor_torso_standart7: Sixteen
+          decor_torso_standart8: Sixteen
+          decor_torso_standart9: Sixteen
+          mask_null: ""
+
+- type: entity
+  parent: ClothingUniformRandom
+  id: ClothingUniformRandomBra
+  name: colorful bra
+  components:
+  - type: RandomSprite
+    available:
+      - torso:
+          base_torso_bra: Sixteen
+        leg:
+          base_leg_standart: Sixteen
+          base_leg_short: Sixteen
+          base_leg_skirt: Sixteen
+          base_leg_skirt_long: Sixteen
+        decor:
+          decor_torso_bra1: Sixteen
+          decor_torso_bra2: Sixteen
+          decor_torso_bra3: Sixteen
+          decor_torso_bra4: Sixteen
+          decor_torso_bra5: Sixteen
+          mask_null: ""
+
+- type: entity
+  parent: ClothingUniformRandom
+  id: ClothingUniformRandomShorts
+  name: colorful pants
+  components:
+  - type: RandomSprite
+    available:
+      - torso:
+          mask_null: ""
+        leg:
+          base_leg_standart: Sixteen
+          base_leg_short: Sixteen
+          base_leg_skirt: Sixteen
+          base_leg_skirt_long: Sixteen
+
+- type: entity
+  parent: ClothingUniformRandom
+  id: ClothingUniformRandomShirt
+  name: colorful costume
+  components:
+  - type: RandomSprite
+    available:
+      - torso:
+          base_torso_armless: Sixteen
+          mask_null: ""
+        leg:
+          base_leg_standart: Sixteen
+          base_leg_short: Sixteen
+        decor:
+          base_torso_shirt: Sixteen
+        overlay:
+          decor_torso_shirt1: Sixteen
+          decor_torso_shirt2: Sixteen
+          decor_torso_shirt3: Sixteen
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml
index 19793f873f..d7a5e2b787 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml
@@ -20,4 +20,4 @@
     - type: UserInterface
       interfaces:
         - key: enum.ChameleonUiKey.Key
-          type: ChameleonBoundUserInterface
+          type: ChameleonBoundUserInterface
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
index ae7e5bcf76..883182aae8 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
@@ -44,6 +44,7 @@
         - CrateMaterialPlastic
         - CrateMaterialWood
         - CrateMaterialPlasteel
+        - CrateFunSprayPaints
         - CrateFunArtSupplies
         - CrateEngineeringCableLV
         - CrateEngineeringCableMV
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/fancytables.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/fancytables.yml
new file mode 100644
index 0000000000..274db34437
--- /dev/null
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/fancytables.yml
@@ -0,0 +1,22 @@
+- type: entity
+  name: random fancy table spawner
+  id: FancyTableSpawner
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Structures/Furniture/Tables/Fancy/blue.rsi
+          state: full
+    - type: RandomSpawner
+      prototypes:
+        - TableFancyBlue
+        - TableFancyCyan
+        - TableFancyBlack
+        - TableFancyRed
+        - TableFancyPurple
+        - TableFancyPink
+        - TableFancyGreen
+        - TableFancyOrange
+        - TableFancyWhite
+      offset: 0.0
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
index 879c168929..10fb034d0d 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -174,7 +174,12 @@
         - MaterialCloth10
         - MaterialWoodPlank10
         - ResearchDisk
+        - DeathPaint
         - Plunger
+        - SprayPaintBlue
+        - SprayPaintRed
+        - SprayPaintGreen
+        - SprayPaintOrange
         - TechnologyDisk
         - PowerCellMedium
         - PowerCellSmall
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
index af4114ce48..449f8aa2cd 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
@@ -61,6 +61,13 @@
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: long_bedhead
+- type: marking
+  id: HumanHairLongBedhead2
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: long_bedhead2
 - type: marking
   id: HumanHairFloorlengthBedhead
   bodyPart: Hair
@@ -397,6 +404,13 @@
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: crewcut
+- type: marking
+  id: HumanHairCrewcut2
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: crewcut2
 - type: marking
   id: HumanHairCurls
   bodyPart: Hair
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index bd2f09d92f..244093b86b 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1058,6 +1058,8 @@
     bloodMaxVolume: 300
     # if you fuck with the gorilla he will harambe you
   - type: MeleeWeapon
+    soundHit:
+      collection: Punch
     damage:
       types:
         Blunt: 20
@@ -1248,6 +1250,15 @@
       path: /Audio/Animals/ferret_happy.ogg
     interactFailureSound:
       path: /Audio/Items/wirecutter.ogg
+  - type: MeleeWeapon
+    soundHit:
+      path: /Audio/Effects/bite.ogg
+    angle: 30
+    animation: WeaponArcBite
+    damage:
+      types:
+        Blunt: 3
+        Piercing: 3
   - type: Butcherable
     butcheringType: Spike
     spawned:
@@ -1381,19 +1392,20 @@
   - type: MobThresholds
     thresholds:
       0: Alive
-      40: Critical
-      80: Dead
+      60: Critical
+      125: Dead
   - type: MovementSpeedModifier
     baseWalkSpeed: 3.5
     baseSprintSpeed: 5
   - type: MeleeWeapon
     soundHit:
-      path: /Audio/Weapons/pierce.ogg
+      collection: AlienClaw
     angle: 30
-    animation: WeaponArcPunch
+    animation: WeaponArcClaw
     damage:
       types:
-        Piercing: 9
+        Slash: 5
+        Piercing: 4
   - type: Temperature
     heatDamageThreshold: 360
     coldDamageThreshold: 285
@@ -1911,6 +1923,13 @@
     spawned:
     - id: FoodMeat
       amount: 1
+  - type: Speech
+    speechSounds: Parrot
+    speechVerb: Parrot
+  - type: Vocal
+    sounds:
+      Unsexed: Parrot
+  - type: ParrotAccent
   - type: InteractionPopup
     successChance: 0.6
     interactSuccessString: petting-success-bird
@@ -2492,6 +2511,22 @@
       gender: epicene
   - type: Bloodstream
     bloodMaxVolume: 100
+  - type: MeleeWeapon
+    angle: 0
+    animation: WeaponArcBite
+    soundHit:
+      path: /Audio/Effects/bite.ogg
+    damage:
+      types:
+        Piercing: 8
+  - type: NpcFactionMember
+    factions:
+    - Passive
+  - type: NPCRetaliation
+    attackMemoryLength: 10
+  - type: HTN
+    rootTask:
+      task: RuminantHostileCompound
   - type: Tag
     tags:
     - VimPilot
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
index 7308267473..3e6c603626 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -70,6 +70,7 @@
       tags:
         - Carp
         - DoorBumpOpener
+        - NoPaint
     - type: ReplacementAccent
       accent: genericAggressive
     - type: Speech
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index 6ba1506958..12a6c7e985 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -597,8 +597,6 @@
     - CannotSuicide
     - Hamster
     - VimPilot
-  - type: StealTarget
-    stealGroup: AnimalHamlet
 
 - type: entity
   name: Geoff
@@ -771,8 +769,6 @@
     attributes:
       proper: true
       gender: female
-  - type: StealTarget
-    stealGroup: AnimalSmile
 
 - type: entity
   name: Pun Pun
@@ -807,8 +803,6 @@
     attributes:
       proper: true
       gender: male
-  - type: StealTarget
-    stealGroup: AnimalPunPun
 
 - type: entity
   name: Tropico
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
index 396094eeaf..89a6f16e52 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -26,6 +26,9 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: regalrat
+    - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
+      state: eyes
+      shader: unshaded
   - type: Physics
     bodyType: KinematicController
   - type: Fixtures
@@ -77,6 +80,7 @@
     states:
       Alive:
         Base: regalrat
+        BaseUnshaded: eyes
       Critical:
         Base: critical
       Dead:
@@ -127,6 +131,9 @@
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: regalrat
+    - map: [ "enum.DamageStateVisualLayers.BaseUnshaded"]
+      state: eyes
+      shader: unshaded
   - type: MobState
   - type: MobThresholds
     thresholds:
@@ -181,17 +188,21 @@
     - SimpleHostile
   - type: Sprite
     drawdepth: SmallMobs
-    sprite: Mobs/Animals/mouse.rsi
+    sprite: Mobs/Animals/rat.rsi
     layers:
     - map: ["enum.DamageStateVisualLayers.Base", "movement"]
-      state: mouse-3
+      state: rat
+    - map: [ "enum.DamageStateVisualLayers.BaseUnshaded"]
+      state: eyes
+      shader: unshaded
+
   - type: SpriteMovement
     movementLayers:
       movement:
-        state: mouse-moving-3
+        state: rat-moving
     noMovementLayers:
       movement:
-        state: mouse-3
+        state: rat
   - type: Physics
     bodyType: KinematicController
   - type: Fixtures
@@ -244,11 +255,12 @@
   - type: DamageStateVisuals
     states:
       Alive:
-        Base: mouse-3
+        Base: rat
+        BaseUnshaded: eyes
       Critical:
-        Base: dead-3
+        Base: dead
       Dead:
-        Base: splat-3
+        Base: splat
   - type: Butcherable
     spawned:
     - id: FoodMeatRat
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
index 28355bb459..ec1ed3a58f 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
@@ -97,3 +97,6 @@
     - RevenantTheme
   - type: Speech
     speechVerb: Ghost
+  - type: Tag
+    tags:
+      - NoPaint
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
index 39460be3f3..0a294805cf 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -52,7 +52,7 @@
     animation: WeaponArcClaw
     damage:
       types:
-        Brute: 5
+        Blunt: 5
         Slash: 10
   - type: Tag
     tags:
diff --git a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
index d892b31fac..9f0d54ee64 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -104,6 +104,7 @@
     - type: Tag
       tags:
         - CannotSuicide
+        - NoPaint
 
 # From the uplink injector
 - type: entity
@@ -212,6 +213,7 @@
       tags:
         - CannotSuicide
         - FootstepSound
+        - NoPaint
     - type: Inventory
       templateId: holoclown
     - type: Hands
@@ -253,3 +255,4 @@
     event: !type:GuardianToggleActionEvent
     useDelay: 2
     checkCanInteract: false
+    checkConsciousness: false
diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml
index b864984a7f..6197c82c02 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml
@@ -9,9 +9,9 @@
 #Syndie
 - type: entity
   parent: MobHuman
-  id: MobHumanSyndicateAgent
+  id: MobHumanSyndicateAgentBase
   name: syndicate agent
-  suffix: Human
+  suffix: Human, Base
   components:
     - type: Loadout
       prototypes: [SyndicateOperativeGearExtremelyBasic]
@@ -22,9 +22,20 @@
       - Syndicate
 
 - type: entity
-  parent: MobHumanSyndicateAgent
+  parent: MobHumanSyndicateAgentBase
+  id: MobHumanSyndicateAgent
+  name: syndicate agent
+  suffix: Human, Traitor
+  components:
+    # make the player a traitor once its taken
+    - type: AutoTraitor
+      giveUplink: false
+      giveObjectives: false
+
+- type: entity
+  parent: MobHumanSyndicateAgentBase
   id: MobHumanSyndicateAgentNukeops # Reinforcement exclusive to nukeops uplink
-  suffix: NukeOps
+  suffix: Human, NukeOps
   components:
     - type: NukeOperative
 
diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
index d6a6087266..c135ac2b82 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
@@ -51,7 +51,7 @@
   - type: MeleeWeapon
     animation: WeaponArcBite
     soundHit:
-      collection: AlienClaw
+      path: /Audio/Effects/bite.ogg
     damage:
       types:
         Piercing: 5
diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
index c893fab449..09e86b1996 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
@@ -41,7 +41,7 @@
     damageModifierSet: Scale
   - type: MeleeWeapon
     soundHit:
-      path: /Audio/Weapons/pierce.ogg
+      collection: AlienClaw
     angle: 30
     animation: WeaponArcClaw
     damage:
diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
index 184711ec1e..a271e9d084 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
@@ -14,6 +14,8 @@
   - type:  HumanoidAppearance
     species: Vox
     #- type: VoxAccent # Not yet coded
+  - type: Inventory
+    speciesId: vox
   - type: Speech
     speechVerb: Vox
     speechSounds: Vox
@@ -41,7 +43,7 @@
     bloodReagent: AmmoniaBlood
   - type: MeleeWeapon
     soundHit:
-      path: /Audio/Weapons/pierce.ogg
+      collection: AlienClaw
     angle: 30
     animation: WeaponArcClaw
     damage:
diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml
index d4e9a561c5..ac9aabbead 100644
--- a/Resources/Prototypes/Entities/Mobs/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/base.yml
@@ -102,6 +102,8 @@
   - type: CombatMode
   - type: MeleeWeapon
     hidden: true
+    soundHit:
+      collection: MetalThud
     damage:
       groups:
         Brute: 5
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
index 95bfe6b6b4..bdce1d4408 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
@@ -29,7 +29,7 @@
   - type: Tag
     tags:
     - Pizza
-    - Fruit # Tomato? idk
+    - ReptilianFood
 
 - type: entity
   parent: FoodInjectableBase # Not sliceable
@@ -58,7 +58,7 @@
   - type: Tag
     tags:
     - Pizza
-    - Fruit
+    - ReptilianFood
 
 # Pizza
 
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
index f8565a793e..85de407988 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -400,6 +400,9 @@
           Quantity: 3
         - ReagentId: Fat
           Quantity: 3
+  - type: SliceableFood
+    count: 3
+    slice: FoodMeatCutlet
 
 - type: entity
   name: raw lizard meat
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
index 51bf229f2c..6c16a541cd 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
@@ -97,7 +97,7 @@
 
 - type: entity
   name: lizard-tail kebab
-  parent: FoodSkewerBase
+  parent: FoodMeatKebab
   id: FoodMeatLizardtailKebab
   description: Severed lizard tail on a stick.
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
index a2dda827be..f35d222d39 100644
--- a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
@@ -38,7 +38,6 @@
   description: Yep, it's a tree.
   abstract: true
   components:
-  - type: IgnoreWeather
   - type: SpriteFade
   - type: Clickable
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
index e5c1884d1c..75d9b071be 100644
--- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
@@ -68,6 +68,12 @@
         orGroup: GiftPool
       - id: PlushieCarp
         orGroup: GiftPool
+      - id: PlushieMagicarp
+        orGroup: GiftPool
+      - id: PlushieHolocarp
+        orGroup: GiftPool
+      - id: PlushieRainbowCarp
+        orGroup: GiftPool
       - id: PlushieSlime
         orGroup: GiftPool
       - id: PlushieSnake
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
index f6d57f53a5..a8489866fc 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
@@ -7,7 +7,7 @@
   - type: Sprite
     sprite: Objects/Devices/communication.rsi
     layers:
-    - state: old-radio
+    - state: radio
   - type: GhostRole
     name: ghost-role-information-syndicate-reinforcement-name
     description: ghost-role-information-syndicate-reinforcement-description
diff --git a/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml b/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
index a2419101c6..736f73d915 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
@@ -9,7 +9,7 @@
     sprite: Objects/Devices/door_remote.rsi
   - type: Item
     storedRotation: -90
-  - type: Access
+  - type: Access #No access, useless
   - type: DoorRemote
   - type: StealTarget
     stealGroup: DoorRemote
@@ -28,7 +28,7 @@
       color: "#9f9f00"
   - type: Access
     groups:
-    - Command
+    - AllAccess #Cap must be able to control the station
 
 - type: entity
   parent: DoorRemoteDefault
diff --git a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
index 57c542f31b..5cbf64c560 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
@@ -25,6 +25,16 @@
     tags:
       - HolosignProjector
 
+- type: entity
+  parent: Holoprojector
+  id: HoloprojectorEmpty
+  suffix: Empty
+  components:
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+
 - type: entity
   parent: Holoprojector
   id: HoloprojectorBorg
@@ -61,6 +71,16 @@
     recipes:
       - HolofanProjector
 
+- type: entity
+  parent: HolofanProjector
+  id: HolofanProjectorEmpty
+  suffix: Empty
+  components:
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+
 - type: entity
   parent: Holoprojector
   id: HoloprojectorField
@@ -79,6 +99,16 @@
     - type: StaticPrice
       price: 130
 
+- type: entity
+  parent: HoloprojectorField
+  id: HoloprojectorFieldEmpty
+  suffix: Empty
+  components:
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+
 - type: entity
   parent: Holoprojector
   id: HoloprojectorSecurity
diff --git a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
index b68257083c..e5a1d0412a 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
@@ -24,7 +24,7 @@
   - type: NavMapBeacon
     text: station-beacon-general
     color: "#D4D4D496"
-  - type: WarpPoint
+  #- type: WarpPoint # Delta V - Removes in favor of Warp Point Markers
   - type: ActivatableUI
     key: enum.NavMapBeaconUiKey.Key
     singleUser: true
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
index 8c3aed0d06..edad2b4063 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
@@ -89,6 +89,7 @@
     program: 125
   - type: Item
     size: Small
+    storedRotation: -90
 
 - type: entity
   parent: BaseHandheldInstrument
@@ -118,6 +119,7 @@
   - type: Item
     size: Small
     sprite: Objects/Fun/Instruments/gunpet.rsi
+    storedRotation: -90
   - type: Tag
     tags:
     - Sidearm
@@ -141,6 +143,7 @@
   - type: Item
     sprite: Objects/Fun/Instruments/bike_horn.rsi
     size: Small
+    storedRotation: -90
   - type: Clothing
     sprite: Objects/Fun/Instruments/bike_horn.rsi
     slots: [Belt]
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
index a255ab4a32..b09ea96f7b 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
@@ -98,6 +98,8 @@
   - type: Tag
     tags:
     - KeyedInstrument
+  - type: Item
+    size: Small
 
 - type: entity
   parent: BaseHandheldInstrument
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml
index c8a098b586..e99f825d48 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml
@@ -52,7 +52,7 @@
     - KeyedInstrument
 
 - type: entity
-  parent: BaseHandheldInstrument
+  parent: [BaseHandheldInstrument, Clothing]
   id: HarmonicaInstrument
   name: harmonica
   components:
@@ -64,6 +64,13 @@
   - type: Item
     size: Small
     sprite: Objects/Fun/Instruments/harmonica.rsi
+    storedRotation: -90
+  - type: Clothing
+    quickEquip: false
+    slots:
+    - neck
+  - type: ActivatableUI
+    inHandsOnly: false  
   - type: Tag
     tags:
     - WoodwindInstrument
@@ -134,7 +141,7 @@
     sprite: Objects/Fun/Instruments/panflute.rsi
     state: icon
   - type: Item
-    size: Normal
+    size: Small
     sprite: Objects/Fun/Instruments/panflute.rsi
   - type: Tag
     tags:
@@ -153,8 +160,9 @@
     sprite: Objects/Fun/Instruments/ocarina.rsi
     state: icon
   - type: Item
-    size: Normal
+    size: Small
     sprite: Objects/Fun/Instruments/ocarina.rsi
+    storedRotation: -90
   - type: Tag
     tags:
     - WoodwindInstrument
diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
index 36e20c22a9..537562f461 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
@@ -138,6 +138,7 @@
   components:
   - type: InstantAction
     checkCanInteract: false
+    checkConsciousness: false
     icon: Interface/Actions/pai-midi.png
     event: !type:OpenUiActionEvent
       key: enum.InstrumentUiKey.Key
@@ -150,6 +151,7 @@
   components:
     - type: InstantAction
       checkCanInteract: false
+      checkConsciousness: false
       icon: { sprite: Interface/Actions/pai-map.rsi, state: icon }
       event: !type:OpenUiActionEvent
         key: enum.StationMapUiKey.Key
diff --git a/Resources/Prototypes/Entities/Objects/Fun/spray_paint.yml b/Resources/Prototypes/Entities/Objects/Fun/spray_paint.yml
new file mode 100644
index 0000000000..1b417f6cde
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Fun/spray_paint.yml
@@ -0,0 +1,292 @@
+# Base Paints
+- type: entity
+  parent: BaseItem
+  id: PaintBase
+  name: spray paint
+  description: A tin of spray paint.
+  noSpawn: true
+  components:
+  - type: Appearance
+  - type: Sprite
+    sprite: Objects/Fun/spraycans.rsi
+    state: clown_cap
+    layers:
+      - state: clown_cap
+        map: ["enum.OpenableVisuals.Layer"]
+  - type: Paint
+    consumptionUnit: 10
+    blacklist:
+      tags:
+        - NoPaint
+  - type: Item
+    sprite: Objects/Fun/spraycans.rsi
+    heldPrefix: spray
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 50
+        reagents:
+        - ReagentId: SpaceGlue
+          Quantity: 50
+  - type: TrashOnSolutionEmpty
+    solution: drink
+  - type: Sealable
+  - type: Openable
+    sound:
+      path: /Audio/Effects/pop_high.ogg
+    closeable: true
+    closeSound:
+      path: /Audio/Effects/pop_high.ogg
+
+# Paints
+
+# funnypaint
+- type: entity
+  parent: PaintBase
+  id: FunnyPaint
+  name: funny paint
+  description:  A tin of funny paint, manufactured by Honk! Co.
+  components:
+  - type: Paint
+    color: "#fa74df"
+  - type: Item
+    sprite: Objects/Fun/spraycans.rsi
+    heldPrefix: clown
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "clown"}
+          False: {state: "clown_cap"}
+
+- type: entity
+  parent: PaintBase
+  id: FunnyPaintYellow
+  name: funny paint
+  description:  A tin of funny paint, manufactured by Honk! Co.
+  components:
+  - type: Paint
+    color: "#d5e028"
+  - type: Item
+    sprite: Objects/Fun/spraycans.rsi
+    heldPrefix: clown
+  - type: Sprite
+    sprite: Objects/Fun/spraycans.rsi
+    state: clown2_cap
+    layers:
+      - state: clown2_cap
+        map: ["enum.OpenableVisuals.Layer"]
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "clown2"}
+          False: {state: "clown2_cap"}
+
+#death paint
+- type: entity
+  parent: PaintBase
+  id: DeathPaint
+  components:
+  - type: Paint
+    color: "#ff20c8"
+  - type: Item
+    sprite: Objects/Fun/spraycans.rsi
+    heldPrefix: spray
+  - type: Sprite
+    sprite: Objects/Fun/spraycans.rsi
+    state: death_cap
+    layers:
+      - state: death_cap
+        map: ["enum.OpenableVisuals.Layer"]
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "death"}
+          False: {state: "death_cap"}
+
+- type: entity
+  parent: PaintBase
+  id: DeathPaintTwo
+  components:
+  - type: Paint
+    color: "#ff2020"
+  - type: Item
+    sprite: Objects/Fun/spraycans.rsi
+    heldPrefix: spray
+  - type: Sprite
+    sprite: Objects/Fun/spraycans.rsi
+    state: death2_cap
+    layers:
+      - state: death2_cap
+        map: ["enum.OpenableVisuals.Layer"]
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "death2"}
+          False: {state: "death2_cap"}
+
+#Sprays
+
+#Blue
+- type: entity
+  parent: PaintBase
+  id: SprayPaintBlue
+  suffix: Blue
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/spraycans.rsi
+    layers:
+      - state: spray
+        map: ["Base"]
+      - state: spray_cap_colors
+        map: ["enum.OpenableVisuals.Layer"]
+        color: "#5890f7"
+  - type: Paint
+    color: "#5890f7"
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "spray_colors" , color: "#5890f7"}
+          False: {state: "spray_cap_colors" , color: "#5890f7"}
+
+#Red
+- type: entity
+  parent: PaintBase
+  id: SprayPaintRed
+  suffix: Red
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/spraycans.rsi
+    layers:
+      - state: spray
+        map: ["Base"]
+      - state: spray_cap_colors
+        map: ["enum.OpenableVisuals.Layer"]
+        color: "#ff3b3b"
+  - type: Paint
+    color: "#ff3b3b"
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "spray_colors" , color: "#ff3b3b"}
+          False: {state: "spray_cap_colors" , color: "#ff3b3b"}
+
+#Green
+- type: entity
+  parent: PaintBase
+  id: SprayPaintGreen
+  suffix: Green
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/spraycans.rsi
+    layers:
+      - state: spray
+        map: ["Base"]
+      - state: spray_cap_colors
+        map: ["enum.OpenableVisuals.Layer"]
+        color: "#73f170"
+  - type: Paint
+    color: "#73f170"
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "spray_colors" , color: "#73f170"}
+          False: {state: "spray_cap_colors" , color: "#73f170"}
+
+#Black
+- type: entity
+  parent: PaintBase
+  id: SprayPaintBlack
+  suffix: Black
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/spraycans.rsi
+    layers:
+      - state: spray
+        map: ["Base"]
+      - state: spray_cap_colors
+        map: ["enum.OpenableVisuals.Layer"]
+        color: "#3a3a3a"
+  - type: Paint
+    color: "#3a3a3a"
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "spray_colors" , color: "#3a3a3a"}
+          False: {state: "spray_cap_colors" , color: "#3a3a3a"}
+
+#Orange
+- type: entity
+  parent: PaintBase
+  id: SprayPaintOrange
+  suffix: Orange
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/spraycans.rsi
+    layers:
+      - state: spray
+        map: ["Base"]
+      - state: spray_cap_colors
+        map: ["enum.OpenableVisuals.Layer"]
+        color: "#f6a44b"
+  - type: Paint
+    color: "#f6a44b"
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "spray_colors" , color: "#f6a44b"}
+          False: {state: "spray_cap_colors" , color: "#f6a44b"}
+
+#Purple
+- type: entity
+  parent: PaintBase
+  id: SprayPaintPurple
+  suffix: Purple
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/spraycans.rsi
+    layers:
+      - state: spray
+        map: ["Base"]
+      - state: spray_cap_colors
+        map: ["enum.OpenableVisuals.Layer"]
+        color: "#c063f5"
+  - type: Paint
+    color: "#c063f5"
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "spray_colors" , color: "#c063f5"}
+          False: {state: "spray_cap_colors" , color: "#c063f5"}
+
+#White
+- type: entity
+  parent: PaintBase
+  id: SprayPaintWhite
+  suffix: White
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/spraycans.rsi
+    layers:
+      - state: spray
+        map: ["Base"]
+      - state: spray_cap_colors
+        map: ["enum.OpenableVisuals.Layer"]
+        color: "#f2f2f2"
+  - type: Paint
+    color: "#f2f2f2"
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: {state: "spray_colors" , color: "#f2f2f2"}
+          False: {state: "spray_cap_colors" , color: "#f2f2f2"}
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index ccb67b5ae1..67c6e1194b 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -279,6 +279,15 @@
       reagents:
       - ReagentId: JuiceThatMakesYouWeh
         Quantity: 30
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Fiber
+          Quantity: 10
+        - ReagentId: JuiceThatMakesYouWeh
+          Quantity: 10
 
 - type: entity
   parent: PlushieLizard
@@ -322,6 +331,15 @@
       reagents:
       - ReagentId: JuiceThatMakesYouWeh
         Quantity: 30
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Fiber
+          Quantity: 10
+        - ReagentId: JuiceThatMakesYouWeh
+          Quantity: 10
 
 - type: entity
   parent: BasePlushie
@@ -506,6 +524,38 @@
     tags:
     - PlushieCarp # DeltaV - fish labeler craft
 
+- type: entity
+  parent: PlushieCarp
+  id: PlushieMagicarp
+  name: magicarp plushie
+  description: An adorable stuffed toy resembling the exceedingly rare magicarp.
+  components:
+  - type: Sprite
+    state: magicplush
+
+- type: entity
+  parent: PlushieCarp
+  id: PlushieRainbowCarp
+  name: rainbow carp plushie
+  description: An adorable stuffed toy resembling the legendary rainbow carp.
+  components:
+  - type: Sprite
+    state: rainbowcarpplush
+  - type: PointLight
+    radius: 1.5
+    energy: 2
+  - type: RgbLightController
+    layers: [ 0 ]
+
+- type: entity
+  parent: PlushieCarp
+  id: PlushieHolocarp
+  name: holocarp plushie
+  description: A holographic stuffed toy resembling science's nemesis - the holocarp.
+  components:
+  - type: Sprite
+    state: holoplush
+
 - type: entity
   parent: BasePlushie
   id: PlushieSlime
@@ -593,6 +643,9 @@
     requiresSpecialDigestion: true
     useSound:
       path: /Audio/Items/Toys/mousesqueek.ogg
+  - type: Tag
+    tags:
+    - ToyRubberDuck
 
 - type: entity
   parent: BasePlushie
@@ -882,6 +935,7 @@
   - type: Tag
     tags:
     - Sidearm
+    - ToySidearm
   - type: Gun
     selectedMode: SemiAuto
     availableModes:
@@ -914,14 +968,14 @@
   suffix: Fake
   description: Looks almost like the real thing! Ages 8 and up.
   components:
-    - type: RevolverAmmoProvider
-      whitelist:
-        tags:
-          - CartridgeCap
-          - SpeedLoaderCap
-          - CartridgeMagnum
-          - SpeedLoaderMagnum
-      proto: CartridgeMagnumAP
+  - type: RevolverAmmoProvider
+    whitelist:
+      tags:
+        - CartridgeCap
+        - SpeedLoaderCap
+        - CartridgeMagnum
+        - SpeedLoaderMagnum
+    proto: CartridgeMagnumAP
 
 - type: entity
   parent: BaseItem
@@ -1196,7 +1250,7 @@
 - type: entity
   parent: BasePlushie
   id: ToyAmongPequeno
-  name: among pequeno
+  name: among pequeño
   description: sus!
   components:
   - type: Sprite
@@ -1414,6 +1468,9 @@
             Quantity: 100
   - type: TrashOnSolutionEmpty
     solution: drink
+  - type: Tag
+    tags:
+      - DrinkSpaceGlue
 
 - type: entity
   parent: BaseItem
diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
index 89613efe14..7a7e631f85 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
@@ -16,6 +16,7 @@
   - type: Tag
     tags:
     - Sheet
+    - NoPaint
   - type: Material
   - type: Damageable
     damageContainer: Inorganic
diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
index 8cd965676c..5c021f396b 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
@@ -16,6 +16,7 @@
     tags:
     - Sheet
     - Metal
+    - NoPaint
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic
diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
index 8c9c2c4b3b..25a65567cd 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
@@ -13,6 +13,7 @@
   - type: Tag
     tags:
     - Sheet
+    - NoPaint
   - type: Damageable
     damageContainer: Inorganic
   - type: Destructible
@@ -111,6 +112,7 @@
   - type: Tag
     tags:
     - Sheet
+    - NoPaint
 
 - type: entity
   parent: SheetPlasma
@@ -133,6 +135,7 @@
     tags:
     - Plastic
     - Sheet
+    - NoPaint
   - type: Material
   - type: PhysicalComposition
     materialComposition:
diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index d30702e3d7..91c99f093e 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -13,6 +13,7 @@
   - type: Tag
     tags:
       - RawMaterial
+      - NoPaint
   - type: Damageable
     damageContainer: Inorganic
   - type: Destructible
diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
index b234bf1e7c..ad2b3bd0c9 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -47,6 +47,8 @@
     damage:
       types:
         Slash: 2
+  - type: EmbeddableProjectile
+    sound: /Audio/Weapons/bladeslice.ogg
   - type: Tag
     tags:
     - Trash
diff --git a/Resources/Prototypes/Entities/Objects/Misc/authorbooks.yml b/Resources/Prototypes/Entities/Objects/Misc/authorbooks.yml
index c3f5170001..70d984240e 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/authorbooks.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/authorbooks.yml
@@ -387,3 +387,17 @@
         - state: book6
     - type: Paper
       content: book-text-inspiration
+
+- type: entity
+  parent: BookBase
+  id: BookJanitorTale
+  name: the tales of a tired janitor
+  description: A clean looking book, smelling vaguely of soap and bleach. 
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/books.rsi
+    layers:
+    - state: book0 
+  - type: Paper
+    content: book-text-janitor
+
diff --git a/Resources/Prototypes/Entities/Objects/Misc/carpets.yml b/Resources/Prototypes/Entities/Objects/Misc/carpets.yml
index d8f3266730..dca2d40aed 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/carpets.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/carpets.yml
@@ -15,7 +15,7 @@
   - type: Stack
     stackType: FloorCarpetRed
   - type: Tag
-    tags: 
+    tags:
     - CarpetRed
   - type: SpawnAfterInteract #Nuke after convert to FloorTile
     prototype: Carpet
@@ -34,7 +34,7 @@
   - type: Stack
     stackType: FloorCarpetBlack
   - type: Tag
-    tags: 
+    tags:
     - CarpetBlack
   - type: SpawnAfterInteract #Nuke after convert to FloorTile
     prototype: CarpetBlack
@@ -53,7 +53,7 @@
   - type: Stack
     stackType: FloorCarpetBlue
   - type: Tag
-    tags: 
+    tags:
     - CarpetBlue
   - type: SpawnAfterInteract #Nuke after convert to FloorTile
     prototype: CarpetBlue
@@ -72,7 +72,7 @@
   - type: Stack
     stackType: FloorCarpetGreen
   - type: Tag
-    tags: 
+    tags:
     - CarpetGreen
   - type: SpawnAfterInteract #Nuke after convert to FloorTile
     prototype: CarpetGreen
@@ -91,7 +91,7 @@
   - type: Stack
     stackType: FloorCarpetOrange
   - type: Tag
-    tags: 
+    tags:
     - CarpetOrange
   - type: SpawnAfterInteract #Nuke after convert to FloorTile
     prototype: CarpetOrange
@@ -109,6 +109,9 @@
     heldPrefix: carpet-skyblue
   - type: Stack
     stackType: FloorCarpetSkyBlue
+  - type: Tag
+    tags:
+    - CarpetSBlue
   - type: SpawnAfterInteract #Nuke after convert to FloorTile
     prototype: CarpetSBlue
     doAfter: 0.5
@@ -126,7 +129,7 @@
   - type: Stack
     stackType: FloorCarpetPurple
   - type: Tag
-    tags: 
+    tags:
     - CarpetPurple
   - type: SpawnAfterInteract #Nuke after convert to FloorTile
     prototype: CarpetPurple
@@ -145,7 +148,7 @@
   - type: Stack
     stackType: FloorCarpetPink
   - type: Tag
-    tags: 
+    tags:
     - CarpetPink
   - type: SpawnAfterInteract #Nuke after convert to FloorTile
     prototype: CarpetPink
@@ -164,7 +167,7 @@
   - type: Stack
     stackType: FloorCarpetCyan
   - type: Tag
-    tags: 
+    tags:
     - CarpetCyan
   - type: SpawnAfterInteract #Nuke after convert to FloorTile
     prototype: CarpetCyan
@@ -183,7 +186,7 @@
   - type: Stack
     stackType: FloorCarpetWhite
   - type: Tag
-    tags: 
+    tags:
     - CarpetWhite
   - type: SpawnAfterInteract #Nuke after convert to FloorTile
     prototype: CarpetWhite
diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index 1c6a003cc5..0b86677a8e 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -591,8 +591,8 @@
   id: AgentIDCard
   suffix: Agent
   components:
-  - type: IdCard
-    jobTitle: Passenger
+  - type: PresetIdCard
+    job: Passenger
   - type: Access
     tags:
     - Maintenance
diff --git a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml
index 64989ccc5b..c09deb1307 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml
@@ -119,6 +119,8 @@
           implantOnly:
             True: {state: broken}
             False: {state: implanter1}
+    - type: Tag
+      tags: []
 
 #Fun implanters
 
diff --git a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
index 5de1f0b7f9..657201912e 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
@@ -82,7 +82,7 @@
     - type: AtmosExposed
       growthTickChance: 0.3
       spreadChance: 0.4
-    - type: SlowContacts
+    - type: SpeedModifierContacts
       walkSpeedModifier: 0.2
       sprintSpeedModifier: 0.2
       ignoreWhitelist:
@@ -123,7 +123,7 @@
     - type: Kudzu
       spriteVariants: 5
       spreadChance: 0.01
-    - type: SlowContacts
+    - type: SpeedModifierContacts
       walkSpeedModifier: 0.8
       sprintSpeedModifier: 0.8
       ignoreWhitelist:
@@ -237,7 +237,7 @@
          Heat: 3
       growthTickChance: 0.3
     - type: AtmosExposed
-    - type: SlowContacts
+    - type: SpeedModifierContacts
       walkSpeedModifier: 0.3
       sprintSpeedModifier: 0.3
       ignoreWhitelist:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml b/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml
index af65ac95a8..e1f4d086d4 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml
@@ -72,7 +72,7 @@
         Flammable: [Touch]
         Extinguish: [Touch]
     - type: SpiderWebObject
-    - type: SlowContacts
+    - type: SpeedModifierContacts
       walkSpeedModifier: 0.5
       sprintSpeedModifier: 0.5
       ignoreWhitelist:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
index 8e29c3c27e..99f9ccaa87 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
@@ -1,7 +1,7 @@
 - type: entity
   parent: BaseItem
   id: FloorTileItemBase
-  description: These could work as a pretty decent throwing weapon.
+  description: The floor was meant to hold this, not you.
   abstract: true
   components:
   - type: Sprite
@@ -12,9 +12,14 @@
   - type: DamageOtherOnHit
     damage:
       types:
-        Blunt: 5
+        Blunt: 2
+  - type: EmbeddableProjectile
+    sound: /Audio/Weapons/star_hit.ogg
   - type: Stack
     count: 1
+  - type: Tag
+    tags:
+      - NoPaint
   - type: Damageable
     damageContainer: Inorganic
   - type: Destructible
@@ -59,6 +64,12 @@
   - type: Construction
     graph: TileSteel
     node: steeltile
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Blunt: 5 #Metal floor tiles deal more damage than standard
+  - type: EmbeddableProjectile
+    sound: /Audio/Weapons/block_metal1.ogg
 
 - type: entity
   name: steel dark checker tile
@@ -86,7 +97,7 @@
 
 - type: entity
   name: steel tile
-  parent: FloorTileItemBase
+  parent: FloorTileItemSteel
   id: FloorTileItemMetalDiamond
   components:
   - type: Sprite
@@ -143,7 +154,7 @@
 
 - type: entity
   name: dark tile
-  parent: FloorTileItemBase
+  parent: FloorTileItemSteel
   id: FloorTileItemDark
   components:
   - type: Sprite
@@ -162,7 +173,7 @@
 
 - type: entity
   name: techmaint floor
-  parent: FloorTileItemBase
+  parent: FloorTileItemSteel
   id: FloorTileItemTechmaint
   components:
   - type: Sprite
@@ -178,7 +189,7 @@
 
 - type: entity
   name: reinforced tile
-  parent: FloorTileItemBase
+  parent: FloorTileItemSteel
   id: FloorTileItemReinforced
   components:
   - type: Sprite
@@ -282,7 +293,7 @@
 
 - type: entity
   name: elevator shaft tile
-  parent: FloorTileItemBase
+  parent: FloorTileItemSteel
   id: FloorTileItemElevatorShaft
   components:
   - type: Sprite
@@ -362,7 +373,7 @@
 
 - type: entity
   name: dark mining tile
-  parent: FloorTileItemBase
+  parent: FloorTileItemSteel
   id: FloorTileItemMiningDark
   components:
   - type: Sprite
@@ -378,7 +389,7 @@
 
 - type: entity
   name: light mining tile
-  parent: FloorTileItemBase
+  parent: FloorTileItemSteel
   id: FloorTileItemMiningLight
   components:
   - type: Sprite
@@ -1048,6 +1059,40 @@
   - type: Stack
     stackType: FloorTileAstroGrass
 
+- type: entity
+  id: FloorTileItemMowedAstroGrass
+  parent: FloorTileItemBase
+  name: mowed astro-grass
+  description: Fake grass that covers up wires and even comes with realistic NanoTrimmings!
+  components:
+  - type: Sprite
+    state: grass
+  - type: Item
+    heldPrefix: grass
+  - type: FloorTile
+    outputs:
+    - Plating
+    - FloorMowedAstroGrass
+  - type: Stack
+    stackType: FloorTileAstroGrass
+
+- type: entity
+  id: FloorTileItemJungleAstroGrass
+  parent: FloorTileItemBase
+  name: jungle astro-grass
+  description: Fake grass that covers up wires and even comes with realistic NanoTrimmings!
+  components:
+  - type: Sprite
+    state: grassjungle
+  - type: Item
+    heldPrefix: grass
+  - type: FloorTile
+    outputs:
+    - Plating
+    - FloorJungleAstroGrass
+  - type: Stack
+    stackType: FloorTileAstroGrass
+
 - type: entity
   id: FloorTileItemAstroIce
   parent: FloorTileItemBase
@@ -1065,6 +1110,23 @@
   - type: Stack
     stackType: FloorTileAstroIce
 
+- type: entity
+  id: FloorTileItemAstroSnow
+  parent: FloorTileItemBase
+  name: astro-snow
+  description: Fake snow that's as fluffy as the real thing, while being easily removable!
+  components:
+  - type: Sprite
+    state: snow
+  - type: Item
+    heldPrefix: snow
+  - type: FloorTile
+    outputs:
+    - Plating
+    - FloorAstroSnow
+  - type: Stack
+    stackType: FloorTileAstroSnow
+
 - type: entity
   name: large wood floor
   parent: FloorTileItemBase
@@ -1082,4 +1144,4 @@
     stackType: FloorTileWoodLarge
   - type: Construction
     graph: TileWoodLarge
-    node: woodtilelarge
\ No newline at end of file
+    node: woodtilelarge
diff --git a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
index 4ac05e1e4b..4250669581 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
@@ -7,9 +7,6 @@
     sprite: Objects/Misc/utensils.rsi
   - type: Item # TODO add inhand sprites for all utensils
     sprite: Objects/Misc/utensils.rsi
-  - type: Tag
-    tags:
-    - Metal
   - type: SpaceGarbage
 
 - type: entity
@@ -23,8 +20,14 @@
     price: 0
   - type: Tag
     tags:
-     - Plastic
-     - Trash
+    - Plastic
+    - Trash
+  - type: MeleeWeapon
+    wideAnimationRotation: 180
+    attackRate: 1.5
+    damage:
+      types:
+        Blunt: 0
 
 - type: entity
   parent: UtensilBase
@@ -66,6 +69,9 @@
   name: spoon
   description: There is no spoon.
   components:
+  - type: Tag
+    tags:
+    - Metal
   - type: Sprite
     state: spoon
   - type: Item
@@ -99,7 +105,7 @@
     speedModifier: 0.1 # you can try
 
 - type: entity
-  parent: UtensilBase
+  parent: UtensilBasePlastic
   id: KnifePlastic
   name: plastic knife
   description: That's not a knife. This is a knife.
@@ -109,3 +115,8 @@
   - type: Utensil
     types:
     - Knife
+  - type: Tag
+    tags:
+    - Plastic
+    - Trash
+    - Knife
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml
index e87fec22ac..b847416211 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml
@@ -17,8 +17,7 @@
         reagents:
         - ReagentId: THC
           Quantity: 15
-  - type: StealTarget
-    stealGroup: Cannabis
+
 
 - type: entity
   name: dried cannabis leaves
@@ -38,8 +37,6 @@
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/tobacco.rsi
     state: dried
-  - type: StealTarget
-    stealGroup: Cannabis
 
 - type: entity
   name: ground cannabis
@@ -68,8 +65,7 @@
       - Smokable
   - type: Item
     size: Tiny
-  - type: StealTarget
-    stealGroup: Cannabis
+
 
 - type: entity
   name: tobacco leaves
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
index 00224fd318..727c75c879 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
@@ -106,6 +106,8 @@
       types:
         Blunt: 8
         Piercing: 2 # I guess you can stab it into them?
+    soundHit:
+      collection: MetalThud
   - type: Item
     sprite: Objects/Tools/Hydroponics/spade.rsi
   - type: Shovel
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
index 5678de6baf..56786057d5 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
@@ -62,6 +62,7 @@
     solution: soap
   - type: DeleteOnSolutionEmpty
     solution: soap
+  - type: PaintRemover
   - type: FlavorProfile
     flavors:
       - clean
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
index 0e132541e1..5a2587ff71 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
@@ -48,6 +48,8 @@
       types:
         Blunt: 25 #thwack
         Structural: 20
+    soundHit:
+      collection: MetalThud
   - type: Puller
     needsHands: false
   - type: InputMover
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
index bd789214f9..9fde67afb4 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@@ -786,7 +786,7 @@
 # Syringes
 - type: entity
   name: ephedrine syringe
-  parent: BaseSyringe
+  parent: PrefilledSyringe
   id: SyringeEphedrine
   components:
   - type: SolutionContainerManager
@@ -799,7 +799,7 @@
 
 - type: entity
   name: inaprovaline syringe
-  parent: BaseSyringe
+  parent: PrefilledSyringe
   id: SyringeInaprovaline
   components:
   - type: SolutionContainerManager
@@ -812,7 +812,7 @@
 
 - type: entity
   name: tranexamic acid syringe
-  parent: BaseSyringe
+  parent: PrefilledSyringe
   id: SyringeTranexamicAcid
   components:
   - type: SolutionContainerManager
@@ -825,7 +825,7 @@
 
 - type: entity
   name: bicaridine syringe
-  parent: BaseSyringe
+  parent: PrefilledSyringe
   id: SyringeBicaridine
   components:
   - type: SolutionContainerManager
@@ -838,7 +838,7 @@
 
 - type: entity
   name: dermaline syringe
-  parent: BaseSyringe
+  parent: PrefilledSyringe
   id: SyringeDermaline
   components:
   - type: SolutionContainerManager
@@ -851,7 +851,7 @@
 
 - type: entity
   name: hyronalin syringe
-  parent: BaseSyringe
+  parent: PrefilledSyringe
   id: SyringeHyronalin
   components:
   - type: SolutionContainerManager
@@ -864,7 +864,7 @@
 
 - type: entity
   name: ipecac syringe
-  parent: BaseSyringe
+  parent: PrefilledSyringe
   id: SyringeIpecac
   components:
   - type: SolutionContainerManager
@@ -877,7 +877,7 @@
 
 - type: entity
   name: ambuzol syringe
-  parent: BaseSyringe
+  parent: PrefilledSyringe
   id: SyringeAmbuzol
   components:
     - type: SolutionContainerManager
@@ -890,7 +890,7 @@
 
 - type: entity
   name: sigynate syringe
-  parent: BaseSyringe
+  parent: PrefilledSyringe
   id: SyringeSigynate
   components:
     - type: SolutionContainerManager
@@ -903,7 +903,7 @@
 
 - type: entity
   name: ethylredoxrazine syringe
-  parent: BaseSyringe
+  parent: PrefilledSyringe
   id: SyringeEthylredoxrazine
   components:
     - type: SolutionContainerManager
@@ -916,7 +916,7 @@
 
 - type: entity
   name: phalanximine syringe
-  parent: BaseSyringe
+  parent: PrefilledSyringe
   id: SyringePhalanximine
   components:
     - type: SolutionContainerManager
@@ -929,7 +929,7 @@
 
 - type: entity
   name: saline syringe
-  parent: BaseSyringe
+  parent: PrefilledSyringe
   id: SyringeSaline
   components:
     - type: SolutionContainerManager
@@ -943,7 +943,7 @@
 #this is where all the syringes are so i didn't know where to put it
 - type: entity
   name: romerol syringe
-  parent: BaseSyringe
+  parent: PrefilledSyringe
   id: SyringeRomerol
   components:
   - type: SolutionContainerManager
@@ -956,7 +956,7 @@
 
 - type: entity
   name: stimulants syringe
-  parent: BaseSyringe
+  parent: PrefilledSyringe
   id: SyringeStimulants
   components:
   - type: SolutionContainerManager
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
index 6dc78455ea..aa0cf46187 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
@@ -8,6 +8,9 @@
   - type: Sprite
   - type: StaticPrice
     price: 20
+  - type: Tag
+    tags:
+    - SurgeryTool
 
 # Cautery
 
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index 8d195a25be..e14f29746d 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -177,7 +177,7 @@
     - Screwdriver
     - Wirecutter
     - Multitool
-    - Welder
+    - WelderIndustrial
 
 # cargo modules
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
index ab65940fab..ae4aaed7d2 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -364,6 +364,13 @@
     - Syringe
     - Trash
 
+- type: entity
+  parent: BaseSyringe
+  id: PrefilledSyringe
+  components:
+  - type: Injector
+    toggleState: Inject
+
 - type: entity
   id: SyringeBluespace
   parent: BaseSyringe
diff --git a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml
index 2b5762aaef..883f66816d 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml
@@ -57,10 +57,10 @@
   - type: Sprite
     sprite: Objects/Devices/communication.rsi
     layers:
-    - state: old-radio
+    - state: radio
   - type: Item
     sprite: Objects/Devices/communication.rsi
-    heldPrefix: old-radio
+    heldPrefix: radio
   - type: UserInterface
     interfaces:
     - key: enum.StoreUiKey.Key
diff --git a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
index 721a065468..16be537891 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
@@ -32,6 +32,7 @@
       - ChiefEngineer
       - ChiefMedicalOfficer
       - Clown #Delta V: Add Clown Access
+      - Corpsman # DeltaV: Add Corpsman access
       - Command
       - Engineering
       - External
diff --git a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
index bfb3069efb..8f9fb382f5 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
@@ -18,7 +18,8 @@
     sprite: Objects/Tools/cable-coils.rsi
   - type: Item
     sprite: Objects/Tools/cable-coils.rsi
-    size: Normal
+    size: Small
+    storedRotation: -90
   - type: CablePlacer
   - type: Clickable
   - type: StaticPrice
diff --git a/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml b/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
index ddd3592d49..977a8a931b 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
@@ -14,7 +14,7 @@
     wideAnimationRotation: -90
     damage:
       types:
-        Pierce: 0
+        Piercing: 0
     attackRate: 2
   - type: Tool
     qualities:
diff --git a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
index cbc42b7587..d22e919092 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
@@ -111,7 +111,8 @@
     damage:
       types:
         Blunt: 10
-    bluntStaminaDamageFactor: 2.0 # DeltaV - seclite is now a viable nonlethal takedown tool against unarmoured targets.
+    soundHit:
+      collection: MetalThud
   - type: Item
     sprite: Objects/Tools/seclite.rsi
   - type: PointLight
diff --git a/Resources/Prototypes/Entities/Objects/Tools/jammer.yml b/Resources/Prototypes/Entities/Objects/Tools/jammer.yml
index e0a68156e0..beb3695627 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/jammer.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/jammer.yml
@@ -2,7 +2,7 @@
   name: radio jammer
   parent: BaseItem
   id: RadioJammer
-  description: This device will disrupt any nearby outgoing radio communication when activated.
+  description: This device will disrupt any nearby outgoing radio communication as well as suit sensors when activated.
   components:
   - type: Sprite
     sprite: Objects/Devices/jammer.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
index bb8545d91f..8e2b759797 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
@@ -47,6 +47,8 @@
     damage:
       types:
         Blunt: 10
+    soundHit:
+      collection: MetalThud
 
 - type: entity
   name: syndicate jaws of life
diff --git a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
index 71b27ed31e..89101e34ff 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
@@ -61,6 +61,9 @@
       quickEquip: false
       slots:
         - Belt
+    - type: Tag
+      tags:
+      - Flashlight
 
 - type: entity
   parent: Lantern
diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
index c0a6a6a980..f1bf2ff98e 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -114,6 +114,8 @@
     damage:
       types:
         Blunt: 4.5
+    soundHit:
+      collection: MetalThud
   - type: Tool
     qualities:
       - Anchoring
@@ -151,6 +153,8 @@
     damage:
       types:
         Blunt: 8
+    soundHit:
+      collection: MetalThud
   - type: Tool
     qualities:
       - Prying
@@ -504,6 +508,8 @@
     damage:
       types:
         Blunt: 14
+    soundHit:
+      collection: MetalThud
   - type: Item
     size: Normal
     sprite: Objects/Tools/shovel.rsi
@@ -544,6 +550,8 @@
     damage:
       types:
         Blunt: 7
+    soundHit:
+      collection: MetalThud
   - type: Tool
     qualities:
     - Rolling
diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
index 42b16ba053..9bf3f2e2cb 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
@@ -47,6 +47,8 @@
       params:
         variation: 0.250
         volume: -12
+    deactivatedSoundOnHitNoDamage:
+      collection: MetalThud
     activatedDamage:
         types:
             Heat: 8
@@ -70,6 +72,8 @@
     damage:
       types:
         Blunt: 5 #i mean... i GUESS you could use it like that
+    soundHit:
+      collection: MetalThud
   - type: RefillableSolution
     solution: Welder
   - type: SolutionContainerManager
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
index b7b98ba699..e26c4e9540 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
@@ -130,22 +130,23 @@
     maxTransferAmount: 7
   - type: SpentAmmoVisuals
     state: "practice"
-
-#Not yet craftable due to balance concerns. Should take a good bit of setup to create like the /tg/station recipe.
-#Either the improvised shotgun or its recipe (as of July 2023) will also probably have to be nerfed if you decide to make this craftable.
+    
 - type: entity
   id: ShellShotgunImprovised
   name: improvised shotgun shell
-  description: A homemade shotgun shell that shoots painful metal shrapnel. The spread is so wide that it couldn't hit the broad side of a barn.
+  description: A homemade shotgun shell that shoots painful glass shrapnel. The spread is so wide that it couldn't hit the broad side of a barn.
   parent: BaseShellShotgun
   components:
   - type: Sprite
     layers:
       - state: improvised
         map: [ "enum.AmmoVisualLayers.Base" ]
+  - type: Construction
+    graph: ImprovisedShotgunShellGraph
+    node: shell
   - type: CartridgeAmmo
     count: 10
-    spread: 45 #deadly if you can get up close... otherwise, good luck doing any kind of real damage
+    spread: 45 
     proto: PelletShotgunImprovised
   - type: SpentAmmoVisuals
     state: "improvised"
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
index e62fb9115e..757b8934d4 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
@@ -81,12 +81,13 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
-    state: buckshot
+    state: shard
   - type: Projectile
     damage:
       types:
         Piercing: 3
-        Slash: 3 #remember, it's metal shrapnel!
+        Slash: 3 
+        
 
 - type: entity
   id: PelletShotgunTranquilizer
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index 00d1260684..202604b8bf 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -84,6 +84,7 @@
     quickEquip: false
     slots:
     - Belt
+    - suitStorage
 
 - type: entity
   id: BaseWeaponPowerCellSmall
@@ -578,6 +579,7 @@
     tags:
     - HighRiskItem
     - Sidearm
+    - WeaponAntiqueLaser
   - type: StaticPrice
     price: 750
   - type: StealTarget
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
index 8b31bf40ed..594ffb4d4d 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
@@ -33,6 +33,9 @@
         map: ["enum.GunVisualLayers.Base"]
   - type: Clothing
     sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi
+    slots:
+    - Back
+    - suitStorage
   - type: AmmoCounter
   - type: Gun
     fireRate: 1
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
index 753f109a17..c97459629c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -16,6 +16,7 @@
     quickEquip: false
     slots:
     - Back
+    - suitStorage
   - type: AmmoCounter
   - type: Gun
     fireRate: 0.75
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
index cfcc0a01cd..9b046a7aae 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
@@ -36,3 +36,4 @@
     quickEquip: false
     slots:
     - Belt
+    - suitStorage
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
index b7fae7aced..8ba643a115 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
@@ -13,6 +13,8 @@
       types:
         Blunt: 10
         Structural: 5
+    soundHit:
+      collection: MetalThud
   - type: Wieldable
   - type: IncreaseDamageOnWield
     damage:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml
index db24d3e2cd..ecb6479de7 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml
@@ -67,6 +67,8 @@
         Blunt: 10
         Slash: 10
         Structural: 5
+    soundHit:
+      collection: MetalThud
   - type: Wieldable
   - type: IncreaseDamageOnWield
     damage:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index bc376df5ea..ccbbcc2de8 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -78,6 +78,9 @@
     malus: 0
   - type: Reflect
     enabled: false
+  - type: Tag
+    tags:
+      - NoPaint
   - type: IgnitionSource
     temperature: 700
 
@@ -156,6 +159,7 @@
   - type: Tag
     tags:
     - Write
+    - NoPaint
   - type: DisarmMalus
     malus: 0
 
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
index b46ee09633..93765ec40c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
@@ -21,6 +21,8 @@
         Blunt: 5
         Slash: 10
         Structural: 10
+    soundHit:
+      collection: MetalThud
   - type: Wieldable
   - type: IncreaseDamageOnWield
     damage:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
index eee65a1ca7..ccf45bf59a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
@@ -49,6 +49,8 @@
       types:
         Blunt: 10
         Slash: 5
+    soundHit:
+      collection: MetalThud
   - type: Wieldable
   - type: IncreaseDamageOnWield
     damage:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
index e566f90968..0c75015d9a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
@@ -13,6 +13,8 @@
       types:
         Blunt: 10
         Structural: 10
+    soundHit:
+      collection: MetalThud
   - type: Wieldable
   - type: IncreaseDamageOnWield
     damage:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
index b9d6de8594..426be1386a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -175,7 +175,7 @@
       attackRate: 10
       damage:
         types:
-          Structure: 150
+          Structural: 150
           Slash: 20 #Horror
           Blunt: 20
           Heat: 20
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
index 326fd41aca..1cad73e30e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -358,11 +358,28 @@
     duration: 30
     spreadAmount: 50
   - type: SoundOnTrigger
-    sound: /Audio/Effects/smoke.ogg
+    sound: /Audio/Items/smoke_grenade_smoke.ogg
   - type: DeleteOnTrigger
   - type: TimerTriggerVisuals
     primingSound:
-      path: /Audio/Effects/Smoke-grenade.ogg
+      path: /Audio/Items/smoke_grenade_prime.ogg
+
+- type: entity
+  parent: SmokeGrenade
+  id: CleanerGrenade
+  name: cleanade
+  description: Special grenade for janitors, releasing large cloud of space cleaner foam
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Grenades/janitor.rsi
+  - type: SmokeOnTrigger
+    duration: 15
+    spreadAmount: 50
+    smokePrototype: Foam
+    solution:
+      reagents:
+      - ReagentId: SpaceCleaner
+        Quantity: 30
 
 - type: entity
   parent: SmokeGrenade
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
index eec5ee833a..9ac737e9cb 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml
@@ -96,11 +96,13 @@
     damage:
       types:
         Blunt: 20
+    soundHit:
+      collection: MetalThud
     bluntStaminaDamageFactor: 1.5
   - type: Item
     size: Normal
   - type: Clothing
-    sprite: Objects\Weapons\Melee\truncheon.rsi
+    sprite: Objects/Weapons/Melee/truncheon.rsi
     quickEquip: false
     slots:
     - Belt
diff --git a/Resources/Prototypes/Entities/Stations/base.yml b/Resources/Prototypes/Entities/Stations/base.yml
index 5cbe349416..2502243e0c 100644
--- a/Resources/Prototypes/Entities/Stations/base.yml
+++ b/Resources/Prototypes/Entities/Stations/base.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: BaseStation
   abstract: true
   components:
@@ -46,15 +46,16 @@
       path: /Maps/Shuttles/cargo.yml
     - type: GridSpawn
       groups:
-#        trade:
-#          addComponents:
-#          - type: ProtectedGrid
-#          - type: TradeStation
-#          paths:
-#          - /Maps/Shuttles/trading_outpost.yml
-#        mining:
-#          paths:
-#          - /Maps/Shuttles/mining.yml
+        trade:
+          addComponents:
+          - type: ProtectedGrid
+          # If you comment out the tradestation, make sure to also set cargo.tradestation_spawns_in_ftl_map to TRUE
+          - type: TradeStation
+          paths:
+          - /Maps/Shuttles/trading_outpost.yml
+        mining:
+          paths:
+          - /Maps/Shuttles/mining.yml
         # Spawn last
         ruins:
           hide: true
@@ -80,9 +81,9 @@
         cargo:
           paths:
           - /Maps/Shuttles/cargo_core.yml
-#        mining:
-#          paths:
-#          - /Maps/Shuttles/mining.yml
+        mining:
+          paths:
+          - /Maps/Shuttles/mining.yml
         ruins:
           hide: true
           nameGrid: true
diff --git a/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml b/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml
index 7777153bba..f82fe8b51b 100644
--- a/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml
@@ -31,6 +31,9 @@
     sound:
       path: /Audio/Ambience/Objects/fireplace.ogg
   - type: AlwaysHot
+  - type: Tag
+    tags:
+      - NoPaint
 
 - type: entity
   id: LegionnaireBonfire
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
index 82cdcde7c0..d07a73b022 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -6,6 +6,8 @@
   components:
   - type: AccessReader
     access: [["Service"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: Airlock
@@ -14,6 +16,8 @@
   components:
   - type: AccessReader
     access: [["Lawyer"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: Airlock
@@ -22,6 +26,8 @@
   components:
   - type: AccessReader
     access: [["Theatre"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockScience # DeltaV - Chapel is in Epistemics
@@ -30,6 +36,8 @@
   components:
   - type: AccessReader
     access: [["Chapel"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: Airlock
@@ -38,6 +46,8 @@
   components:
   - type: AccessReader
     access: [["Janitor"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: Airlock
@@ -46,6 +56,8 @@
   components:
   - type: AccessReader
     access: [["Kitchen"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: Airlock
@@ -54,6 +66,8 @@
   components:
   - type: AccessReader
     access: [["Bar"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: Airlock
@@ -62,6 +76,8 @@
   components:
   - type: AccessReader
     access: [["Hydroponics"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: Airlock
@@ -70,6 +86,8 @@
   components:
   - type: AccessReader
     access: [["Captain"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockExternal
@@ -86,6 +104,8 @@
   components:
   - type: AccessReader
     access: [["Cargo"]]
+  - type: Wires
+    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockExternal
@@ -94,6 +114,8 @@
   components:
   - type: AccessReader
     access: [["Engineering"]]
+  - type: Wires
+    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockExternal
@@ -102,6 +124,8 @@
   components:
   - type: AccessReader
     access: [["Atmospherics"]]
+  - type: Wires
+    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockExternal
@@ -126,6 +150,8 @@
   components:
   - type: AccessReader
     access: [["Kitchen"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockFreezer
@@ -134,6 +160,8 @@
   components:
   - type: AccessReader
     access: [["Kitchen"], ["Hydroponics"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockFreezer
@@ -142,6 +170,8 @@
   components:
   - type: AccessReader
     access: [["Hydroponics"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockEngineering
@@ -150,6 +180,8 @@
   components:
   - type: AccessReader
     access: [["Engineering"]]
+  - type: Wires
+    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockAtmospherics
@@ -158,6 +190,8 @@
   components:
   - type: AccessReader
     access: [["Atmospherics"]]
+  - type: Wires
+    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockCargo
@@ -166,6 +200,8 @@
   components:
   - type: AccessReader
     access: [["Cargo"]]
+  - type: Wires
+    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockCargo
@@ -174,6 +210,8 @@
   components:
   - type: AccessReader
     access: [["Salvage"]]
+  - type: Wires
+    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockMining
@@ -182,6 +220,8 @@
   components:
   - type: AccessReader
     access: [["Salvage"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMedical
@@ -190,6 +230,8 @@
   components:
   - type: AccessReader
     access: [["Medical"]]
+  - type: Wires
+    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockMedical
@@ -206,6 +248,8 @@
   components:
   - type: AccessReader
     access: [["Medical"]]
+  - type: Wires
+    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockChemistry
@@ -214,6 +258,8 @@
   components:
   - type: AccessReader
     access: [["Chemistry"]]
+  - type: Wires
+    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockScience
@@ -222,6 +268,8 @@
   components:
   - type: AccessReader
     access: [["Research"]]
+  - type: Wires
+    layoutId: AirlockScience
 
 - type: entity
   parent: AirlockScience
@@ -230,6 +278,8 @@
   components:
   - type: AccessReader
     access: [["Research"], ["Medical"]]
+  - type: Wires
+    layoutId: AirlockScience
 
 - type: entity
   parent: AirlockCentralCommand
@@ -258,6 +308,8 @@
   components:
   - type: AccessReader
     access: [["Captain"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommand
@@ -266,6 +318,8 @@
   components:
   - type: AccessReader
     access: [["ChiefMedicalOfficer"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommand
@@ -274,6 +328,8 @@
   components:
   - type: AccessReader
     access: [["ChiefEngineer"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommand
@@ -282,6 +338,8 @@
   components:
   - type: AccessReader
     access: [["HeadOfSecurity"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommand
@@ -290,6 +348,8 @@
   components:
   - type: AccessReader
     access: [["ResearchDirector"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommand
@@ -298,6 +358,8 @@
   components:
   - type: AccessReader
     access: [["HeadOfPersonnel"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommand
@@ -306,6 +368,8 @@
   components:
   - type: AccessReader
     access: [["Quartermaster"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockSecurity
@@ -365,6 +429,8 @@
   components:
   - type: AccessReader
     access: [["Security", "Command"]]
+  - type: Wires
+    layoutId: AirlockSecurity
 
 - type: entity
   parent: AirlockCommand
@@ -373,80 +439,8 @@
   components:
   - type: AccessReader
     access: [["External"]]
-
-#Delta V: Add Airlocks
-- type: entity
-  parent: Airlock
-  id: AirlockBoxerLocked
-  suffix: Boxer, Locked
-  components:
-  - type: AccessReader
-    access: [["Boxer"]]
-
-- type: entity
-  parent: Airlock
-  id: AirlockClownLocked
-  suffix: Clown, Locked
-  components:
-  - type: AccessReader
-    access: [["Clown"]]
-
-- type: entity
-  parent: Airlock
-  id: AirlockMimeLocked
-  suffix: Mime, Locked
-  components:
-  - type: AccessReader
-    access: [["Mime"]]
-
-- type: entity
-  parent: Airlock
-  id: AirlockMusicianLocked
-  suffix: Musician, Locked
-  components:
-  - type: AccessReader
-    access: [["Musician"]]
-
-- type: entity
-  parent: Airlock
-  id: AirlockReporterLocked
-  suffix: Reporter, Locked
-  components:
-  - type: AccessReader
-    access: [["Reporter"]]
-
-- type: entity
-  parent: Airlock
-  id: AirlockLibraryLocked
-  suffix: Library, Locked
-  components:
-  - type: AccessReader
-    access: [["Library"]]
-
-- type: entity
-  parent: Airlock
-  id: AirlockZookeeperLocked
-  suffix: Zookeeper, Locked
-  components:
-  - type: AccessReader
-    access: [["Zookeeper"]]
-
-- type: entity
-  parent: AirlockExternal
-  id: AirlockExternalSalvageLocked
-  suffix: External, Salvage, Locked
-  components:
-  - type: AccessReader
-    access: [["Salvage"]]
-
-- type: entity
-  parent: AirlockMedical
-  id: AirlockPsychologistLocked
-  suffix: Psychologist, Locked
-  components:
-  - type: AccessReader
-    access: [["Psychologist"]]
-#End of Delta V
+  - type: Wires
+    layoutId: AirlockCommand
 
 # Glass Airlocks
 - type: entity
@@ -456,6 +450,8 @@
   components:
   - type: AccessReader
     access: [["Service"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockGlass
@@ -464,6 +460,8 @@
   components:
   - type: AccessReader
     access: [["Lawyer"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockGlass
@@ -472,6 +470,8 @@
   components:
   - type: AccessReader
     access: [["Theatre"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockGlass
@@ -480,6 +480,8 @@
   components:
   - type: AccessReader
     access: [["Bar"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockExternalGlass
@@ -496,6 +498,8 @@
   components:
   - type: AccessReader
     access: [["Cargo"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockExternalGlass
@@ -520,6 +524,8 @@
   components:
   - type: AccessReader
     access: [["Engineering"]]
+  - type: Wires
+    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockExternalGlass
@@ -528,6 +534,8 @@
   components:
   - type: AccessReader
     access: [["Atmospherics"]]
+  - type: Wires
+    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockGlass
@@ -536,6 +544,8 @@
   components:
   - type: AccessReader
     access: [["Kitchen"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockGlass
@@ -544,6 +554,8 @@
   components:
   - type: AccessReader
     access: [["Janitor"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockGlass
@@ -552,6 +564,8 @@
   components:
   - type: AccessReader
     access: [["Hydroponics"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockScienceGlass  # DeltaV - Chapel is in Epistemics
@@ -560,6 +574,8 @@
   components:
   - type: AccessReader
     access: [["Chapel"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockEngineeringGlass
@@ -568,6 +584,8 @@
   components:
   - type: AccessReader
     access: [["Engineering"]]
+  - type: Wires
+    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockAtmosphericsGlass
@@ -576,6 +594,8 @@
   components:
   - type: AccessReader
     access: [["Atmospherics"]]
+  - type: Wires
+    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockCargoGlass
@@ -584,6 +604,8 @@
   components:
   - type: AccessReader
     access: [["Cargo"]]
+  - type: Wires
+    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockCargoGlass
@@ -592,6 +614,8 @@
   components:
   - type: AccessReader
     access: [["Salvage"]]
+  - type: Wires
+    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockMiningGlass
@@ -600,6 +624,8 @@
   components:
   - type: AccessReader
     access: [["Salvage"]]
+  - type: Wires
+    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockChemistryGlass
@@ -608,6 +634,8 @@
   components:
   - type: AccessReader
     access: [["Chemistry"]]
+  - type: Wires
+    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockMedicalGlass
@@ -616,6 +644,8 @@
   components:
   - type: AccessReader
     access: [["Medical"]]
+  - type: Wires
+    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockMedicalGlass
@@ -632,6 +662,8 @@
   components:
   - type: AccessReader
     access: [["Medical"]]
+  - type: Wires
+    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockScienceGlass
@@ -640,6 +672,8 @@
   components:
   - type: AccessReader
     access: [["Research"]]
+  - type: Wires
+    layoutId: AirlockScience
 
 - type: entity
   parent: AirlockScienceGlass
@@ -648,6 +682,8 @@
   components:
   - type: AccessReader
     access: [["Research"], ["Medical"]]
+  - type: Wires
+    layoutId: AirlockScience
 
 - type: entity
   parent: AirlockCentralCommandGlass
@@ -666,6 +702,8 @@
   components:
   - type: AccessReader
     access: [["Command"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommandGlass
@@ -674,6 +712,8 @@
   components:
   - type: AccessReader
     access: [["Captain"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommandGlass
@@ -682,6 +722,8 @@
   components:
   - type: AccessReader
     access: [["ChiefMedicalOfficer"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommandGlass
@@ -690,6 +732,8 @@
   components:
   - type: AccessReader
     access: [["ChiefEngineer"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommandGlass
@@ -698,6 +742,8 @@
   components:
   - type: AccessReader
     access: [["HeadOfSecurity"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommandGlass
@@ -706,6 +752,8 @@
   components:
   - type: AccessReader
     access: [["ResearchDirector"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommandGlass
@@ -714,6 +762,8 @@
   components:
   - type: AccessReader
     access: [["HeadOfPersonnel"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommandGlass
@@ -722,6 +772,8 @@
   components:
   - type: AccessReader
     access: [["Quartermaster"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockSecurityGlass
@@ -730,6 +782,8 @@
   components:
   - type: AccessReader
     access: [["Security"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockSecurityGlass
@@ -738,8 +792,9 @@
   components:
   - type: AccessReader
     access: [["Detective"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
-#Delta V: Removed Brig Access
 #- type: entity
 #  parent: AirlockSecurityGlass
 #  id: AirlockBrigGlassLocked
@@ -747,6 +802,8 @@
 #  components:
 #  - type: AccessReader
 #    access: [["Brig"]]
+#  - type: Wires
+#    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockSecurityGlass
@@ -755,6 +812,8 @@
   components:
   - type: AccessReader
     access: [["Security"], ["Lawyer"]]
+  - type: Wires
+    layoutId: AirlockSecurity
 
 - type: entity
   parent: AirlockSecurityGlass
@@ -763,6 +822,8 @@
   components:
   - type: AccessReader
     access: [["Armory"]]
+  - type: Wires
+    layoutId: AirlockSecurity
 
 - type: entity
   parent: AirlockCommandGlassLocked
@@ -788,80 +849,6 @@
   - type: AccessReader
     access: [["NuclearOperative"]]
 
-#Delta V: Add Airlocks
-- type: entity
-  parent: AirlockGlass
-  id: AirlockBoxerGlassLocked
-  suffix: Boxer, Locked
-  components:
-  - type: AccessReader
-    access: [["Boxer"]]
-
-- type: entity
-  parent: AirlockGlass
-  id: AirlockClownGlassLocked
-  suffix: Clown, Locked
-  components:
-  - type: AccessReader
-    access: [["Clown"]]
-
-- type: entity
-  parent: AirlockGlass
-  id: AirlockMimeGlassLocked
-  suffix: Mime, Locked
-  components:
-  - type: AccessReader
-    access: [["Mime"]]
-
-- type: entity
-  parent: AirlockGlass
-  id: AirlockMusicianGlassLocked
-  suffix: Musician, Locked
-  components:
-  - type: AccessReader
-    access: [["Musician"]]
-
-- type: entity
-  parent: AirlockGlass
-  id: AirlockReporterGlassLocked
-  suffix: Reporter, Locked
-  components:
-  - type: AccessReader
-    access: [["Reporter"]]
-
-- type: entity
-  parent: AirlockGlass
-  id: AirlockLibraryGlassLocked
-  suffix: Library, Locked
-  components:
-  - type: AccessReader
-    access: [["Library"]]
-
-- type: entity
-  parent: AirlockGlass
-  id: AirlockZookeeperGlassLocked
-  suffix: Zookeeper, Locked
-  components:
-  - type: AccessReader
-    access: [["Zookeeper"]]
-
-- type: entity
-  parent: AirlockExternalGlass
-  id: AirlockExternalGlassSalvageLocked
-  suffix: External, Glass, Salvage, Locked
-  components:
-  - type: AccessReader
-    access: [["Salvage"]]
-
-- type: entity
-  parent: AirlockMedicalGlass
-  id: AirlockPsychologistGlassLocked
-  suffix: Psychologist, Locked
-  components:
-  - type: AccessReader
-    access: [["Psychologist"]]
-#End of Delta V
-
 # Maintenance Hatches
 - type: entity
   parent: AirlockMaint
@@ -886,6 +873,8 @@
   components:
   - type: AccessReader
     access: [["Salvage"]]
+  - type: Wires
+    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockMaint
@@ -894,6 +883,8 @@
   components:
   - type: AccessReader
     access: [["Cargo"]]
+  - type: Wires
+    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockMaint
@@ -902,6 +893,8 @@
   components:
   - type: AccessReader
     access: [["Command"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockMaint
@@ -918,6 +911,8 @@
   components:
   - type: AccessReader
     access: [["Engineering"]]
+  - type: Wires
+    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockMaint
@@ -926,6 +921,8 @@
   components:
   - type: AccessReader
     access: [["Atmospherics"]]
+  - type: Wires
+    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockMaint
@@ -934,6 +931,8 @@
   components:
   - type: AccessReader
     access: [["Bar"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMaint
@@ -942,6 +941,8 @@
   components:
   - type: AccessReader
     access: [["Chapel"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMaint
@@ -950,6 +951,8 @@
   components:
   - type: AccessReader
     access: [["Hydroponics"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMaint
@@ -958,6 +961,8 @@
   components:
   - type: AccessReader
     access: [["Janitor"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMaint
@@ -966,6 +971,8 @@
   components:
   - type: AccessReader
     access: [["Lawyer"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMaint
@@ -974,6 +981,8 @@
   components:
   - type: AccessReader
     access: [["Service"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMaint
@@ -982,6 +991,8 @@
   components:
   - type: AccessReader
     access: [["Theatre"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMaint
@@ -990,6 +1001,8 @@
   components:
   - type: AccessReader
     access: [["Kitchen"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMaint
@@ -1006,6 +1019,8 @@
   components:
   - type: AccessReader
     access: [["Medical"]]
+  - type: Wires
+    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockMaint
@@ -1014,6 +1029,8 @@
   components:
   - type: AccessReader
     access: [["Chemistry"]]
+  - type: Wires
+    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockMaint
@@ -1022,6 +1039,8 @@
   components:
   - type: AccessReader
     access: [["Research"]]
+  - type: Wires
+    layoutId: AirlockScience
 
 - type: entity
   parent: AirlockMaint
@@ -1030,6 +1049,8 @@
   components:
   - type: AccessReader
     access: [["Research"], ["Medical"]]
+  - type: Wires
+    layoutId: AirlockScience
 
 - type: entity
   parent: AirlockMaint
@@ -1038,6 +1059,8 @@
   components:
   - type: AccessReader
     access: [["Security"]]
+  - type: Wires
+    layoutId: AirlockSecurity
 
 - type: entity
   parent: AirlockMaint
@@ -1046,6 +1069,8 @@
   components:
   - type: AccessReader
     access: [["Detective"]]
+  - type: Wires
+    layoutId: AirlockSecurity
 
 - type: entity
   parent: AirlockMaint
@@ -1054,6 +1079,8 @@
   components:
   - type: AccessReader
     access: [["HeadOfPersonnel"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockMaint
@@ -1062,6 +1089,8 @@
   components:
   - type: AccessReader
     access: [["Captain"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockMaint
@@ -1070,6 +1099,8 @@
   components:
   - type: AccessReader
     access: [["ChiefEngineer"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockMaint
@@ -1078,6 +1109,8 @@
   components:
   - type: AccessReader
     access: [["ChiefMedicalOfficer"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockMaint
@@ -1086,6 +1119,8 @@
   components:
   - type: AccessReader
     access: [["HeadOfSecurity"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockMaint
@@ -1094,6 +1129,8 @@
   components:
   - type: AccessReader
     access: [["ResearchDirector"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockMaint
@@ -1102,80 +1139,8 @@
   components:
   - type: AccessReader
     access: [["Armory"]]
-
-#Delta V: Add Airlocks
-- type: entity
-  parent: AirlockMaint
-  id: AirlockMaintBoxerLocked
-  suffix: Boxer, Locked
-  components:
-  - type: AccessReader
-    access: [["Boxer"]]
-
-- type: entity
-  parent: AirlockMaint
-  id: AirlockMaintClownLocked
-  suffix: Clown, Locked
-  components:
-  - type: AccessReader
-    access: [["Clown"]]
-
-- type: entity
-  parent: AirlockMaint
-  id: AirlockMaintMimeLocked
-  suffix: Mime, Locked
-  components:
-  - type: AccessReader
-    access: [["Mime"]]
-
-- type: entity
-  parent: AirlockMaint
-  id: AirlockMaintMusicianLocked
-  suffix: Musician, Locked
-  components:
-  - type: AccessReader
-    access: [["Musician"]]
-
-- type: entity
-  parent: AirlockMaint
-  id: AirlockMaintReporterLocked
-  suffix: Reporter, Locked
-  components:
-  - type: AccessReader
-    access: [["Reporter"]]
-
-- type: entity
-  parent: AirlockMaint
-  id: AirlockMaintLibraryLocked
-  suffix: Library, Locked
-  components:
-  - type: AccessReader
-    access: [["Library"]]
-
-- type: entity
-  parent: AirlockMaint
-  id: AirlockMaintZookeeperLocked
-  suffix: Zookeeper, Locked
-  components:
-  - type: AccessReader
-    access: [["Zookeeper"]]
-
-- type: entity
-  parent: AirlockMaint
-  id: AirlockMaintPsychologistLocked
-  suffix: Psychologist, Locked
-  components:
-  - type: AccessReader
-    access: [["Psychologist"]]
-
-- type: entity
-  parent: AirlockMaint
-  id: AirlockMaintSecurityLawyerLocked
-  suffix: Security/Lawyer, Locked
-  components:
-  - type: AccessReader
-    access: [["Security"], ["Lawyer"]]
-#End of Delta V
+  - type: Wires
+    layoutId: AirlockSecurity
 
 - type: entity
   parent: AirlockSyndicate
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
index a185d45353..4bc43b5559 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
@@ -131,9 +131,6 @@
     - board
   - type: PlacementReplacement
     key: walls
-  - type: IconSmooth
-    key: walls
-    mode: NoSprite
   - type: PaintableAirlock
     group: Standard
     department: Civilian
@@ -147,6 +144,7 @@
       - Airlock
       # This tag is used to nagivate the Airlock construction graph. It's needed because the construction graph is shared between Airlock, AirlockGlass, and HighSecDoor
   - type: PryUnpowered
+  - type: BlockWeather
   placement:
     mode: SnapgridCenter
 
diff --git a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
index d3b8521a9b..644976eb9c 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
@@ -52,10 +52,8 @@
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
-  - type: IconSmooth
-    key: walls
-    mode: NoSprite
   - type: Occluder
+  - type: BlockWeather
 
 - type: entity
   parent: BaseMaterialDoor
diff --git a/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml b/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
index 154467213a..2c54d3cd41 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
@@ -64,6 +64,7 @@
   - type: ContainerContainer
     containers:
       battery-container: !type:Container
+  - type: BlockWeather
 
 - type: entity
   id: BaseSecretDoorAssembly
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
index 87fd8ef010..7d3af93a64 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
@@ -73,9 +73,6 @@
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
-  - type: IconSmooth
-    key: walls
-    mode: NoSprite
   - type: DoorSignalControl
   - type: DeviceNetwork
     deviceNetId: Wireless
@@ -97,6 +94,7 @@
     messagePerceivedByOthers: comp-window-knock
     interactSuccessSound:
       path: /Audio/Effects/glass_knock.ogg
+  - type: BlockWeather
 
 - type: entity
   id: ShuttersNormal
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml b/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml
index 86f6719f77..792f076679 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml
@@ -68,3 +68,4 @@
   - type: Construction
     graph: Bookshelf
     node: bookshelf
+  - type: BlockWeather
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
index cc8cc325fb..0b3c291af2 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
@@ -4,7 +4,7 @@
   abstract: true
   description: You sit in this. Either by will or force.
   placement:
-    mode: SnapgridCenter
+    mode: PlaceFree
   components:
   - type: Clickable
   - type: InteractionOutline
@@ -65,6 +65,8 @@
   id: ChairBase
   abstract: true
   parent: UnanchoredChairBase
+  placement:
+    mode: SnapgridCenter
   components:
   - type: Physics
     bodyType: Static
@@ -87,6 +89,8 @@
   id: StoolBase
   parent: OfficeChairBase
   abstract: true
+  placement:
+    mode: SnapgridCenter
   components:
   - type: Physics
     bodyType: Static
@@ -116,7 +120,7 @@
 - type: entity
   name: stool
   id: Stool
-  parent: ChairBase
+  parent: UnanchoredChairBase
   description: Apply butt.
   components:
   - type: Sprite
@@ -241,7 +245,7 @@
 
 - type: entity
   id: ChairMeat
-  parent: ChairBase
+  parent: UnanchoredChairBase
   name: meat chair
   description: Uncomfortably sweaty.
   components:
@@ -285,7 +289,7 @@
   name: web chair
   id: ChairWeb
   description: For true web developers.
-  parent: ChairBase
+  parent: UnanchoredChairBase
   components:
   - type: Sprite
     sprite: Structures/Web/chair.rsi
@@ -339,6 +343,8 @@
     damage:
       types:
         Blunt: 8
+    soundHit:
+      collection: MetalThud
   - type: Construction
     graph: Seat
     node: chairFolding
@@ -347,8 +353,6 @@
   parent: ChairFolding
   id: ChairFoldingSpawnFolded
   suffix: folded
-  placement:
-    mode: PlaceFree
   components:
   - type: Foldable
     folded: true
@@ -365,3 +369,32 @@
     graph: Seat
     node: chairSteelBench
 
+- type: entity
+  name: wooden bench
+  id: WoodenBench
+  parent: ChairBase
+  description: Did you get a splinter? Well, at least it’s eco friendly.
+  components:
+  - type: Sprite
+    state: wooden-bench
+  - type: Construction
+    graph: Seat
+    node: chairWoodBench
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroy
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MaterialWoodPlank:
+            min: 2
+            max: 4
+  - type: StaticPrice
+    price: 20
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
index 2caa4010ca..fa029c035a 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
@@ -53,6 +53,18 @@
   components:
   - type: StorageFill
     contents:
+      - id: ClothingUniformRandomArmless
+        prob: 0.05
+        orGroup: dressermainloot
+      - id: ClothingUniformRandomStandart
+        prob: 0.05
+        orGroup: dressermainloot
+      - id: ClothingUniformRandomBra
+        prob: 0.05
+        orGroup: dressermainloot
+      - id: ClothingUniformRandomShorts
+        prob: 0.05
+        orGroup: dressermainloot
       - id: ClothingNeckLGBTPin
         prob: 0.06
         orGroup: dressermainloot
diff --git a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
index d2a5853fcb..b8717cf6cc 100644
--- a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
+++ b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
@@ -25,6 +25,9 @@
         behaviors:
           - !type:DoActsBehavior
             acts: [ "Destruction" ]
+  - type: Tag
+    tags:
+      - NoPaint
 
 - type: entity
   id: HoloFan
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
index 37f22bbb62..b75893d164 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
@@ -63,6 +63,9 @@
     - PlushieSpaceLizard
     - PlushieNuke
     - PlushieCarp
+    - PlushieMagicarp
+    - PlushieHolocarp
+    - PlushieRainbowCarp
     - PlushieRatvar
     - PlushieNar
     - PlushieSnake
diff --git a/Resources/Prototypes/Entities/Structures/Machines/bombs.yml b/Resources/Prototypes/Entities/Structures/Machines/bombs.yml
index 580253f118..89cadab6b1 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/bombs.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/bombs.yml
@@ -127,6 +127,18 @@
       intensitySlope: 3
       maxIntensity: 400
 
+- type: entity
+  parent: SyndicateBomb
+  id: SyndicateBombFake
+  suffix: fake
+  components:
+    - type: Explosive
+      explosionType: Default
+      totalIntensity: 5.0
+      intensitySlope: 5
+      maxIntensity: 4
+      canCreateVacuum: false
+
 - type: entity
   parent: SyndicateBomb
   id: DebugHardBomb
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 02eeca1dd1..011f2a3b64 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -335,7 +335,10 @@
       - JawsOfLife
       - CoreSilver # Nyanotrasen - Silver Golem core
       - FauxTileAstroGrass
+      - FauxTileMowedAstroGrass
+      - FauxTileJungleAstroGrass
       - FauxTileAstroIce
+      - FauxTileAstroSnow
       - OreBagOfHolding
       - DeviceQuantumSpinInverter
   - type: EmagLatheRecipes
@@ -852,6 +855,8 @@
       whitelist:
         tags:
           - Sheet
+          - RawMaterial
+          - Ingot
 
 - type: entity
   id: MedicalTechFab
@@ -979,6 +984,8 @@
       - ClothingUniformJumpskirtDetective
       - ClothingUniformJumpsuitEngineering
       - ClothingUniformJumpskirtEngineering
+      - ClothingUniformJumpsuitSeniorEngineer
+      - ClothingUniformJumpskirtSeniorEngineer
       - ClothingHeadHatHopcap
       - ClothingUniformJumpsuitHoP
       - ClothingUniformJumpskirtHoP
@@ -1012,11 +1019,15 @@
       - ClothingHeadHatBeretSeniorPhysician
       - ClothingUniformJumpsuitMedicalDoctor
       - ClothingUniformJumpskirtMedicalDoctor
+      - ClothingUniformJumpsuitSeniorPhysician
+      - ClothingUniformJumpskirtSeniorPhysician
       - ClothingUniformJumpsuitMime
       - ClothingUniformJumpskirtMime
       - ClothingUniformJumpsuitMusician
       - ClothingUniformJumpsuitParamedic
       - ClothingUniformJumpskirtParamedic
+      - ClothingUniformJumpsuitSeniorOfficer
+      - ClothingUniformJumpskirtSeniorOfficer
       - ClothingUniformJumpsuitPrisoner
       - ClothingUniformJumpskirtPrisoner
       - ClothingHeadHatQMsoft
@@ -1031,6 +1042,8 @@
       - ClothingUniformJumpskirtResearchDirector
       - ClothingUniformJumpsuitScientist
       - ClothingUniformJumpskirtScientist
+      - ClothingUniformJumpsuitSeniorResearcher
+      - ClothingUniformJumpskirtSeniorResearcher
       - ClothingHeadHatBeretSecurity
       - ClothingUniformJumpsuitSec
       - ClothingUniformJumpskirtSec
@@ -1180,6 +1193,9 @@
         - IngotGold30
         - IngotSilver30
         - MaterialBananium10
+    - type: MaterialStorageMagnetPickup # Delta V - Summary: Adds magnet pull from Frontier
+      magnetEnabled: True
+      range: 0.30 # Delta V - End Magnet Pull
 
 - type: entity
   parent: OreProcessor
diff --git a/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml b/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml
index 829525439e..6b082845bd 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml
@@ -77,6 +77,7 @@
       - Material
       - Pda
       - IdCard
+      - Brain
       tags:
       - HighRiskItem
     soundCooldown: 0
@@ -103,3 +104,6 @@
     solution: output
   - type: StaticPrice
     price: 500
+  - type: MaterialReclaimerMagnetPickup # Delta V - Summary: Adds magnet pull from Frontier
+    magnetEnabled: True
+    range: 0.30 # Delta V - End Magnet Pull
diff --git a/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml b/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml
index 5f7182f7dd..c523e7d68d 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml
@@ -7,6 +7,11 @@
   - type: StasisBed
     baseMultiplier: 10
   - type: AntiRotOnBuckle
+  - type: HealOnBuckle
+    damage:
+      types:
+        Poison: -0.001
+        Blunt: -0.001
   - type: Sprite
     sprite: Structures/Machines/stasis_bed.rsi
     noRot: true
diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index 4c2217e6ff..64b6b068c7 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -359,6 +359,7 @@
     screenState: screen
     ejectDelay: 5
     soundVend: /Audio/Machines/machine_vend_hot_drink.ogg
+    initialStockQuality: 0.33
   - type: Advertise
     pack: HotDrinksMachineAds
   - type: Speech
@@ -396,6 +397,7 @@
     ejectState: eject-unshaded
     denyState: deny-unshaded
     ejectDelay: 1.9
+    initialStockQuality: 0.33
   - type: Advertise
     pack: RobustSoftdrinksAds
   - type: Speech
@@ -539,6 +541,7 @@
     ejectState: eject-unshaded
     denyState: deny-unshaded
     ejectDelay: 1.9
+    initialStockQuality: 0.33
   - type: Advertise
     pack: RobustSoftdrinksAds
   - type: Speech
@@ -573,6 +576,7 @@
     ejectState: eject-unshaded
     denyState: deny-unshaded
     ejectDelay: 1.9
+    initialStockQuality: 0.33
   - type: Advertise
     pack: RobustSoftdrinksAds
   - type: Speech
@@ -607,6 +611,7 @@
     ejectState: eject-unshaded
     denyState: deny-unshaded
     ejectDelay: 1.9
+    initialStockQuality: 0.33
   - type: Advertise
     pack: RobustSoftdrinksAds
   - type: Speech
@@ -697,6 +702,7 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
+    initialStockQuality: 0.33
   - type: Advertise
     pack: DiscountDansAds
   - type: Speech
@@ -902,6 +908,7 @@
     normalState: normal-unshaded
     ejectState: eject-unshaded
     denyState: deny-unshaded
+    initialStockQuality: 0.33
   - type: Advertise
     pack: GetmoreChocolateCorpAds
   - type: Speech
@@ -1045,6 +1052,7 @@
     normalState: normal-unshaded
     ejectState: eject-unshaded
     denyState: deny-unshaded
+    initialStockQuality: 0.33
   - type: Advertise
     pack: BodaAds
   - type: Speech
@@ -1236,6 +1244,7 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
+    initialStockQuality: 0.33
   - type: Advertise
     pack: ChangAds
   - type: Speech
@@ -1258,7 +1267,7 @@
   parent: VendingMachine
   id: VendingMachineSalvage
   name: Salvage Vendor
-  description: A dwarves best friend!
+  description: A dwarf's best friend!
   components:
   - type: VendingMachine
     pack: SalvageEquipmentInventory
@@ -1299,6 +1308,7 @@
     offState: off
     brokenState: broken
     normalState: normal-unshaded
+    initialStockQuality: 0.33
   - type: Advertise
     pack: DonutAds
   - type: Speech
@@ -1911,6 +1921,7 @@
     denyState: deny-unshaded
     ejectDelay: 1.9
     soundVend: /Audio/Items/bikehorn.ogg
+    initialStockQuality: 1.0 # Nobody knows how Honk does it, but their vending machines always seem well-stocked...
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/happyhonk.rsi
     layers:
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
index c2f8fa339d..06f2fb2d18 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
@@ -60,6 +60,7 @@
     - type: Sprite
       drawdepth: FloorObjects
       sprite: Structures/Piping/Atmospherics/vent.rsi
+      noRot: true
       layers:
         - sprite: Structures/Piping/Atmospherics/pipe.rsi
           state: pipeHalf
@@ -101,6 +102,7 @@
     - type: Sprite
       drawdepth: FloorObjects
       sprite: Structures/Piping/Atmospherics/vent.rsi
+      noRot: true
       layers:
         - sprite: Structures/Piping/Atmospherics/pipe.rsi
           state: pipeHalf
@@ -151,6 +153,7 @@
     - type: Sprite
       drawdepth: FloorObjects
       sprite: Structures/Piping/Atmospherics/scrubber.rsi
+      noRot: true
       layers:
         - sprite: Structures/Piping/Atmospherics/pipe.rsi
           state: pipeHalf
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
index c5f04d80a1..1193182d09 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
@@ -16,6 +16,8 @@
       map: [ "enum.DisposalUnitVisualLayers.Unanchored" ]
     - state: disposal
       map: [ "enum.DisposalUnitVisualLayers.Base" ]
+    - state: disposal-charging
+      map: [ "enum.DisposalUnitVisualLayers.BaseCharging" ]
     - state: disposal-flush
       map: [ "enum.DisposalUnitVisualLayers.BaseFlush" ]
     - state: dispover-charge
diff --git a/Resources/Prototypes/Entities/Structures/Specific/church-bell.yml b/Resources/Prototypes/Entities/Structures/Specific/church-bell.yml
new file mode 100644
index 0000000000..837a7bc0b3
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Specific/church-bell.yml
@@ -0,0 +1,41 @@
+- type: entity
+  id: ChurchBell
+  name: church bell
+  description: You feel your soul grow ever closer to the realms beyond for every chime this bell tolls...
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Transform
+    anchored: true
+  - type: Sprite
+    noRot: true
+    sprite: Structures/Specific/church-bell.rsi
+    layers:
+    - state: church-bell
+  - type: InteractionPopup
+    interactDelay: 1
+    successChance: 1
+    interactSuccessSound:
+      collection: ChurchBell
+  - type: Clickable
+  - type: Rotatable
+  - type: CollisionWake
+    enabled: false
+  - type: Physics
+    canCollide: false
+    bodyType: Static
+  - type: Fixtures
+  - type: InteractionOutline
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 150
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
index 897b7be6ff..cd44f5f585 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
@@ -74,7 +74,7 @@
             bounds: "-0.25,-0.25,0.25,0.25"
           density: 190
           mask:
-          - MachineMask
+          - SmallMobMask
           layer:
           - MachineLayer
     - type: AtmosDevice
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
index 7ab24f6b5c..783bec3ba0 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
@@ -44,6 +44,11 @@
           SheetSteel1:
             min: 1
             max: 2
+  - type: Construction
+    graph: ClosetSteel
+    node: done
+    containers:
+    - entity_storage
 
 - type: entity
   id: LockerBaseSecure
@@ -61,3 +66,8 @@
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
+  - type: Construction
+    graph: ClosetSteelSecure
+    node: done
+    containers:
+    - entity_storage
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
index dbbd9b16ae..b38a77b82b 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -18,6 +18,18 @@
     openSound:
       path: /Audio/Effects/woodenclosetopen.ogg
 
+# Basic
+- type: entity
+  id: LockerSteel
+  parent: LockerBaseSecure
+  name: secure closet
+  components:
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: secure
+    stateDoorOpen: secure_open
+    stateDoorClosed: secure_door
+
 # Cargo
 - type: entity
   id: LockerQuarterMaster
@@ -321,7 +333,7 @@
     stateDoorOpen: armory_open
     stateDoorClosed: brigmedic_door
   - type: AccessReader
-    access: [["Medical"]]
+    access: [["Corpsman"]] # DeltaV - add corpsman access
 
 # Security Officer
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
index 66647d168f..0ef99b9f47 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
@@ -171,6 +171,11 @@
           SheetSteel1:
             min: 1
             max: 1
+  - type: Construction
+    graph: ClosetWall
+    node: done
+    containers:
+    - entity_storage
 
 #Wall locker
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
index b854fb2fc6..4ebe8d04eb 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
@@ -283,6 +283,18 @@
   - type: AccessReader
     access: [["Armory"]]
 
+- type: entity
+  parent: CrateBaseSecure
+  suffix: Armory, Secure
+  id: CrateContrabandStorageSecure
+  name: contraband storage crate
+  description: An armory access locked crate for storing contraband confiscated from suspects or prisoners.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Crates/sec_gear.rsi
+  - type: AccessReader
+    access: [["Armory"]]
+
 - type: entity
   parent: CrateBaseSecure
   id: CrateCommandSecure
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml
index 070c6e526d..acd865aa62 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml
@@ -3,9 +3,27 @@
   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.
   components:
-  - type: Damageable # adding destructible causes the entity inside to be deleted when the cabinet is destroyed :(
+  - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Glass
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 300
+        behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+      - trigger:
+          !type:DamageTrigger
+          damage: 200 #20ish crowbar hits
+        behaviors:
+        - !type:EmptyAllContainersBehaviour
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+        - !type:PlaySoundBehavior
+          sound:
+            collection: MetalGlassBreak
   - type: MeleeSound
     soundGroups:
       Brute:
diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
index d1a6587d19..a8cb0b1cb8 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
@@ -214,7 +214,7 @@
 - type: entity
   id: AsteroidRockTinCrab
   parent: AsteroidRockTin
-  suffix: Iron
+  suffix: Iron Crab
   components:
     - type: OreVein
       oreChance: 1.0
@@ -299,7 +299,7 @@
   id: AsteroidRockMining
   parent: AsteroidRock
   name: asteroid rock
-  suffix: higher ore yield
+  suffix: higher ore yield .33
   description: An asteroid.
   components:
   - type: OreVein
diff --git a/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml b/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml
new file mode 100644
index 0000000000..f2b03aaeb8
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml
@@ -0,0 +1,418 @@
+- type: entity
+  parent: BaseStructure
+  id: BaseFenceWood
+  name: wooden fence
+  description: Wooden piece of fencing. I hope there is babushka's garden behind it.
+  abstract: true
+  components:
+  - type: MeleeSound
+    soundGroups:
+      Brute:
+        path:
+          "/Audio/Weapons/boxingpunch1.ogg"
+  - type: Tag
+    tags:
+    - RCDDeconstructWhitelist
+    - Wooden
+  - type: Sprite
+    sprite: Structures/Walls/wooden_fence.rsi
+    drawdepth: WallTops
+  - type: Physics
+    bodyType: Static
+  - type: Transform
+    anchored: true
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Wood
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 125
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroy
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MaterialWoodPlank:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Climbable
+    delay: 5.0
+  - type: Appearance
+
+- type: entity
+  parent: BaseFenceWood
+  id: BaseFenceWoodSmall
+  name: small wooden fence
+  description: Wooden piece of small fence. The best protection for the fencing of a private territory!
+  abstract: true
+  components:
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 75
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroy
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MaterialWoodPlank:
+            min: 0
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Climbable
+    delay: 2.5
+
+
+#High
+- type: entity
+  parent: BaseFenceWood
+  id: FenceWoodHighStraight
+  suffix: Straight
+  components:
+  - type: Icon
+    sprite: Structures/Walls/wooden_fence.rsi
+    state: straight
+  - type: Sprite
+    layers:
+    - state: straight
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.10,-0.5,0.10,0.5"
+        density: 1000
+        mask:
+        - FullTileMask
+        layer:
+        - MidImpassable
+        - LowImpassable
+  - type: Construction
+    graph: FenceWood
+    node: straight
+
+- type: entity
+  parent: BaseFenceWood
+  id: FenceWoodHighEnd
+  suffix: End
+  components:
+  - type: Icon
+    sprite: Structures/Walls/wooden_fence.rsi
+    state: end
+  - type: Sprite
+    layers:
+    - state: end
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.1,-0.5,0.1,0.0"
+        density: 1000
+        mask:
+        - FullTileMask
+        layer:
+        - MidImpassable
+        - LowImpassable
+  - type: Construction
+    graph: FenceWood
+    node: end
+
+- type: entity
+  parent: BaseFenceWood
+  id: FenceWoodHighCorner
+  suffix: Corner
+  components:
+  - type: Icon
+    sprite: Structures/Walls/wooden_fence.rsi
+    state: corner
+  - type: Sprite
+    layers:
+    - state: corner
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.1,-0.1,0.1,0.5"
+        density: 1000
+        mask:
+        - TableMask
+        layer:
+        - TableLayer
+      fix2:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.5,-0.1,-0.1,0.1"
+        density: 1000
+        mask:
+        - TableMask
+        layer:
+        - MidImpassable
+        - LowImpassable
+  - type: Construction
+    graph: FenceWood
+    node: corner
+
+- type: entity
+  parent: BaseFenceWood
+  id: FenceWoodHighTJunction
+  suffix: T-Junction
+  components:
+  - type: Icon
+    sprite: Structures/Walls/wooden_fence.rsi
+    state: tjunction
+  - type: Sprite
+    layers:
+    - state: tjunction
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.10,-0.5,0.10,0.5"
+        density: 1000
+        mask:
+        - TableMask
+        layer:
+        - TableLayer
+      fix2:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.5,-0.1,-0.1,0.1"
+        density: 1000
+        mask:
+        - TableMask
+        layer:
+        - MidImpassable
+        - LowImpassable
+  - type: Construction
+    graph: FenceWood
+    node: tjunction
+
+- type: entity
+  parent: BaseFenceWood
+  id: FenceWoodHighGate
+  name: wooden fence gate
+  description: Do you have any idea what awaits you behind these gates? It can be either a toilet or a luxurious mansion. But you continue to love your emo boys.
+  components:
+  - type: Sprite
+    layers:
+    - state: end
+      map: ["enum.DoorVisualLayers.Base"]
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.5,-0.1,0.5,0.1"
+        density: 1000
+        mask:
+        - FullTileMask
+        layer:
+        - MidImpassable
+        - LowImpassable
+  - type: InteractionOutline
+  - type: Door
+    openSpriteState: door_opened
+    closedSpriteState: door_closed
+    canPry: false
+    occludes: false
+    changeAirtight: false
+    bumpOpen: false
+    clickOpen: true
+    canCrush: false
+    closeTimeOne: 0
+    closeTimeTwo: 0
+    openTimeOne: 0
+    openTimeTwo: 0
+    openingAnimationTime: 0
+    closingAnimationTime: 0
+    openSound:
+      path: /Audio/Effects/door_open.ogg
+    closeSound:
+      path: /Audio/Effects/door_close.ogg
+  - type: Construction
+    graph: FenceWood
+    node: gate
+
+#Small
+- type: entity
+  parent: BaseFenceWoodSmall
+  id: FenceWoodSmallStraight
+  suffix: Straight
+  components:
+  - type: Icon
+    sprite: Structures/Walls/wooden_fence.rsi
+    state: straight_small
+  - type: Sprite
+    layers:
+    - state: straight_small
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.10,-0.5,0.10,0.5"
+        density: 1000
+        mask:
+        - FullTileMask
+        layer:
+        - MidImpassable
+        - LowImpassable
+  - type: Construction
+    graph: FenceWood
+    node: straight_small
+
+- type: entity
+  parent: BaseFenceWoodSmall
+  id: FenceWoodSmallEnd
+  suffix: End
+  components:
+  - type: Icon
+    sprite: Structures/Walls/wooden_fence.rsi
+    state: end_small
+  - type: Sprite
+    layers:
+    - state: end_small
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.1,-0.5,0.1,0.0"
+        density: 1000
+        mask:
+        - FullTileMask
+        layer:
+        - MidImpassable
+        - LowImpassable
+  - type: Construction
+    graph: FenceWood
+    node: end_small
+
+- type: entity
+  parent: BaseFenceWoodSmall
+  id: FenceWoodSmallCorner
+  suffix: Corner
+  components:
+  - type: Icon
+    sprite: Structures/Walls/wooden_fence.rsi
+    state: corner_small
+  - type: Sprite
+    layers:
+    - state: corner_small
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.1,-0.1,0.1,0.5"
+        density: 1000
+        mask:
+        - TableMask
+        layer:
+        - TableLayer
+      fix2:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.5,-0.1,-0.1,0.1"
+        density: 1000
+        mask:
+        - TableMask
+        layer:
+        - MidImpassable
+        - LowImpassable
+  - type: Construction
+    graph: FenceWood
+    node: corner_small
+
+- type: entity
+  parent: BaseFenceWoodSmall
+  id: FenceWoodSmallTJunction
+  suffix: T-Junction
+  components:
+  - type: Icon
+    sprite: Structures/Walls/wooden_fence.rsi
+    state: tjunction_small
+  - type: Sprite
+    layers:
+    - state: tjunction_small
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.10,-0.5,0.10,0.5"
+        density: 1000
+        mask:
+        - TableMask
+        layer:
+        - TableLayer
+      fix2:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.5,-0.1,-0.1,0.1"
+        density: 1000
+        mask:
+        - TableMask
+        layer:
+        - MidImpassable
+        - LowImpassable
+  - type: Construction
+    graph: FenceWood
+    node: tjunction_small
+
+- type: entity
+  parent: BaseFenceWoodSmall
+  id: FenceWoodSmallGate
+  name: wooden fence gate
+  description: Looking at this gate, a familiar image pops up in your head. Where's my piggy?
+  components:
+  - type: Sprite
+    layers:
+    - state: end_small
+      map: ["enum.DoorVisualLayers.Base"]
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.5,-0.1,0.5,0.1"
+        density: 1000
+        mask:
+        - FullTileMask
+        layer:
+        - MidImpassable
+        - LowImpassable
+  - type: InteractionOutline
+  - type: Door
+    openSpriteState: door_opened_small
+    closedSpriteState: door_closed_small
+    canPry: false
+    occludes: false
+    changeAirtight: false
+    bumpOpen: false
+    clickOpen: true
+    canCrush: false
+    closeTimeOne: 0
+    closeTimeTwo: 0
+    openTimeOne: 0
+    openTimeTwo: 0
+    openingAnimationTime: 0
+    closingAnimationTime: 0
+    openSound:
+      path: /Audio/Effects/door_open.ogg
+    closeSound:
+      path: /Audio/Effects/door_close.ogg
+  - type: Construction
+    graph: FenceWood
+    node: gate_small
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
index a6b6b02361..53d9a5224e 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -49,6 +49,7 @@
     price: 75
   - type: RadiationBlocker
     resistance: 2
+  - type: BlockWeather
 
 - type: entity
   parent: BaseWall
diff --git a/Resources/Prototypes/Entities/Structures/Windows/clockwork.yml b/Resources/Prototypes/Entities/Structures/Windows/clockwork.yml
index 9902edda86..d6b024bf36 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/clockwork.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/clockwork.yml
@@ -133,6 +133,11 @@
         - FullTileMask
         layer:
         - GlassLayer
+  - type: Airtight
+    noAirWhenFullyAirBlocked: false
+    airBlockedDirection:
+    - South
+    - East
   - type: DamageVisuals
     damageOverlay:
       sprite: Structures/Windows/cracks_diagonal.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Windows/mining.yml b/Resources/Prototypes/Entities/Structures/Windows/mining.yml
index fc49b9e401..910c3daae2 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/mining.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/mining.yml
@@ -84,6 +84,11 @@
         - FullTileMask
         layer:
         - GlassLayer
+  - type: Airtight
+    noAirWhenFullyAirBlocked: false
+    airBlockedDirection:
+    - South
+    - East
   - type: DamageVisuals
     damageOverlay:
       sprite: Structures/Windows/cracks_diagonal.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml
index 5503ea856c..0dd2a1b06c 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml
@@ -131,6 +131,11 @@
         - FullTileMask
         layer:
         - GlassLayer
+  - type: Airtight
+    noAirWhenFullyAirBlocked: false
+    airBlockedDirection:
+    - South
+    - East
   - type: DamageVisuals
     damageOverlay:
       sprite: Structures/Windows/cracks_diagonal.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml b/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml
index 915faa7f48..cb05f80cd1 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml
@@ -84,6 +84,11 @@
         - FullTileMask
         layer:
         - GlassLayer
+  - type: Airtight
+    noAirWhenFullyAirBlocked: false
+    airBlockedDirection:
+    - South
+    - East
   - type: DamageVisuals
     damageOverlay:
       sprite: Structures/Windows/cracks_diagonal.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
index 18da78f1b5..1c79644ce4 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
@@ -160,6 +160,11 @@
         - FullTileMask
         layer:
         - GlassLayer
+  - type: Airtight
+    noAirWhenFullyAirBlocked: false
+    airBlockedDirection:
+    - South
+    - East
   - type: DamageVisuals
     damageOverlay:
       sprite: Structures/Windows/cracks_diagonal.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml b/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
index 9281e0c7ff..d81204be07 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
@@ -143,6 +143,11 @@
         - FullTileMask
         layer:
         - GlassLayer
+  - type: Airtight
+    noAirWhenFullyAirBlocked: false
+    airBlockedDirection:
+    - South
+    - East
   - type: DamageVisuals
     damageOverlay:
       sprite: Structures/Windows/cracks_diagonal.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml b/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml
index 7b486dd3aa..6ed2cc5926 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml
@@ -134,6 +134,11 @@
         - FullTileMask
         layer:
         - GlassLayer
+  - type: Airtight
+    noAirWhenFullyAirBlocked: false
+    airBlockedDirection:
+    - South
+    - East
   - type: DamageVisuals
     damageOverlay:
       sprite: Structures/Windows/cracks_diagonal.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
index 532755dfa3..df0874b3f4 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
@@ -81,6 +81,11 @@
         - FullTileMask
         layer:
         - GlassLayer
+  - type: Airtight
+    noAirWhenFullyAirBlocked: false
+    airBlockedDirection:
+    - South
+    - East
   - type: DamageVisuals
     damageOverlay:
       sprite: Structures/Windows/cracks_diagonal.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Windows/uranium.yml b/Resources/Prototypes/Entities/Structures/Windows/uranium.yml
index 4152665fe0..b956d369fa 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/uranium.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/uranium.yml
@@ -129,6 +129,11 @@
         - FullTileMask
         layer:
         - GlassLayer
+  - type: Airtight
+    noAirWhenFullyAirBlocked: false
+    airBlockedDirection:
+    - South
+    - East
   - type: DamageVisuals
     damageOverlay:
       sprite: Structures/Windows/cracks_diagonal.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Windows/window.yml b/Resources/Prototypes/Entities/Structures/Windows/window.yml
index 2ca6b51e5c..ee2ad6bc28 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/window.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml
@@ -69,7 +69,7 @@
         acts: [ "Destruction" ]
   - type: Airtight
   - type: IconSmooth
-    key: windows
+    key: walls
     base: window
   - type: InteractionPopup
     interactSuccessString: comp-window-knock
@@ -88,6 +88,7 @@
       sprite: Structures/Windows/cracks.rsi
   - type: StaticPrice
     price: 100
+  - type: BlockWeather
 
 - type: entity
   id: WindowDirectional
@@ -231,9 +232,14 @@
         - FullTileMask
         layer:
         - GlassLayer
+  - type: Airtight
+    noAirWhenFullyAirBlocked: false
+    airBlockedDirection:
+    - South
+    - East
   - type: DamageVisuals
     damageOverlay:
       sprite: Structures/Windows/cracks_diagonal.rsi
   - type: Construction
     graph: WindowDiagonal
-    node: windowDiagonal
\ No newline at end of file
+    node: windowDiagonal
diff --git a/Resources/Prototypes/Entities/Structures/hydro_tray.yml b/Resources/Prototypes/Entities/Structures/hydro_tray.yml
index 1ab1fd5b2f..43b8bd197a 100644
--- a/Resources/Prototypes/Entities/Structures/hydro_tray.yml
+++ b/Resources/Prototypes/Entities/Structures/hydro_tray.yml
@@ -92,6 +92,9 @@
   - type: GuideHelp
     guides:
     - Botany
+  - type: Tag
+    tags:
+      - NoPaint
 
 - type: entity
   parent: hydroponicsTray
diff --git a/Resources/Prototypes/Entities/Structures/stairs.yml b/Resources/Prototypes/Entities/Structures/stairs.yml
index 628c933148..0ff3b0d7d3 100644
--- a/Resources/Prototypes/Entities/Structures/stairs.yml
+++ b/Resources/Prototypes/Entities/Structures/stairs.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: Stairs
   name: stairs
-  suffix: steel
+  suffix: Steel
   description: The greatest invention since rocket-propelled grenades.
   placement:
     mode: SnapgridCenter
@@ -39,7 +39,7 @@
 - type: entity
   id: StairStage
   parent: Stairs
-  suffix: steel, stage
+  suffix: Steel, stage
   components:
   - type: Sprite
     sprite: Structures/stairs.rsi
@@ -49,7 +49,7 @@
 - type: entity
   id: StairWhite
   parent: Stairs
-  suffix: white
+  suffix: White
   components:
   - type: Sprite
     sprite: Structures/stairs.rsi
@@ -59,7 +59,7 @@
 - type: entity
   id: StairStageWhite
   parent: Stairs
-  suffix: white, stage 
+  suffix: White, stage 
   components:
   - type: Sprite
     sprite: Structures/stairs.rsi
@@ -69,7 +69,7 @@
 - type: entity
   id: StairDark
   parent: Stairs
-  suffix: dark
+  suffix: Dark
   components:
   - type: Sprite
     sprite: Structures/stairs.rsi
@@ -79,9 +79,29 @@
 - type: entity
   id: StairStageDark
   parent: Stairs
-  suffix: dark, stage
+  suffix: Dark, stage
   components:
   - type: Sprite
     sprite: Structures/stairs.rsi
     state: stairs_stage_dark
     drawdepth: FloorTiles
+
+- type: entity
+  id: StairWood
+  parent: Stairs
+  suffix: Wood
+  components:
+  - type: Sprite
+    sprite: Structures/stairs.rsi
+    state: stairs_wood
+    drawdepth: FloorTiles
+
+- type: entity
+  id: StairStageWood
+  parent: Stairs
+  suffix: Wood, stage
+  components:
+  - type: Sprite
+    sprite: Structures/stairs.rsi
+    state: stairs_stage_wood
+    drawdepth: FloorTiles
diff --git a/Resources/Prototypes/Entities/Tiles/water.yml b/Resources/Prototypes/Entities/Tiles/water.yml
index e2c0421aef..2fd1c8547d 100644
--- a/Resources/Prototypes/Entities/Tiles/water.yml
+++ b/Resources/Prototypes/Entities/Tiles/water.yml
@@ -32,7 +32,7 @@
         Quantity: 100
   - type: DrainableSolution
     solution: pool
-  - type: SlowContacts
+  - type: SpeedModifierContacts
     walkSpeedModifier: 0.5
     sprintSpeedModifier: 0.5
   - type: Physics
diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml
index ed231e224b..254b563aff 100644
--- a/Resources/Prototypes/Flavors/flavors.yml
+++ b/Resources/Prototypes/Flavors/flavors.yml
@@ -174,6 +174,11 @@
   flavorType: Base
   description: flavor-base-clean
 
+- type: flavor
+  id: mindful
+  flavorType: Base
+  description: flavor-base-mindful
+
 - type: flavor
   id: mustard
   flavorType: Complex
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index db99266cba..6812ca14f7 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -463,7 +463,6 @@
   components:
   - type: StationEvent
     weight: 10
-    earliestStart: 20
     reoccurrenceDelay: 20
     duration: 1
   - type: IonStormRule
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml
new file mode 100644
index 0000000000..05f51baf1c
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/captain.yml
@@ -0,0 +1,148 @@
+- type: loadout
+  id: LoadoutCommandCapNeckMantle
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Captain
+  items:
+    - ClothingNeckMantleCap
+
+- type: loadout
+  id: LoadoutCommandCapNeckCloak
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Captain
+  items:
+    - ClothingNeckCloakCap
+
+- type: loadout
+  id: LoadoutCommandCapNeckCloakFormal
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Captain
+  items:
+    - ClothingNeckCloakCapFormal
+
+- type: loadout
+  id: LoadoutCommandCapJumpsuitFormal
+  category: Jobs
+  cost: 3
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Captain
+  items:
+    - ClothingUniformJumpsuitCapFormal
+
+- type: loadout
+  id: LoadoutCommandCapJumpskirtFormal
+  category: Jobs
+  cost: 3
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Captain
+  items:
+    - ClothingUniformJumpskirtCapFormalDress
+
+- type: loadout
+  id: LoadoutCommandCapOuterWinter
+  category: Jobs
+  cost: 2
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Captain
+  items:
+    - ClothingOuterWinterCap
+
+- type: loadout
+  id: LoadoutCommandCapGloves
+  category: Jobs
+  cost: 1
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Captain
+  items:
+    - ClothingHandsGlovesCaptain
+
+- type: loadout
+  id: LoadoutCommandCapHat
+  category: Jobs
+  cost: 1
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Captain
+  items:
+    - ClothingHeadHatCaptain
+
+- type: loadout
+  id: LoadoutCommandCapHatCapcap
+  category: Jobs
+  cost: 1
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Captain
+  items:
+    - ClothingHeadHatCapcap
+
+- type: loadout
+  id: LoadoutCommandCapHatBeret
+  category: Jobs
+  cost: 1
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Captain
+  items:
+    - ClothingHeadHatBeretCap
+
+- type: loadout
+  id: LoadoutCommandCapMaskGas
+  category: Jobs
+  cost: 1
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Captain
+  items:
+    - ClothingMaskGasCaptain
+
+- type: loadout
+  id: LoadoutCommandCapShoesBootsWinter
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Captain
+  items:
+    - ClothingShoesBootsWinterCap
+
+- type: loadout
+  id: LoadoutCommandCapItemDrinkFlask
+  category: Jobs
+  cost: 1
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Captain
+  items:
+    - DrinkFlask
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml
new file mode 100644
index 0000000000..e184e0a60a
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/chiefEngineer.yml
@@ -0,0 +1,46 @@
+- type: loadout
+  id: LoadoutCommandCENeckMantle
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - ChiefEngineer
+  items:
+    - ClothingNeckMantleCE
+
+- type: loadout
+  id: LoadoutCommandCENeckCloak
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - ChiefEngineer
+  items:
+    - ClothingNeckCloakCe
+
+- type: loadout
+  id: LoadoutCommandCEOuterWinter
+  category: Jobs
+  cost: 2
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - ChiefEngineer
+  items:
+    - ClothingOuterWinterCE
+
+- type: loadout
+  id: LoadoutCommandCEShoesBootsWinter
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - ChiefEngineer
+  items:
+    - ClothingShoesBootsWinterChiefEngineer
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/chiefMedicalOfficer.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/chiefMedicalOfficer.yml
new file mode 100644
index 0000000000..32e1a6e43e
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/chiefMedicalOfficer.yml
@@ -0,0 +1,68 @@
+- type: loadout
+  id: LoadoutCommandCMONeckMantle
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - ChiefMedicalOfficer
+  items:
+    - ClothingNeckMantleCMO
+
+- type: loadout
+  id: LoadoutCommandCMONeckCloak
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - ChiefMedicalOfficer
+  items:
+    - ClothingCloakCmo
+
+- type: loadout
+  id: LoadoutCommandCMOOuterWinter
+  category: Jobs
+  cost: 2
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - ChiefMedicalOfficer
+  items:
+    - ClothingOuterWinterCMO
+
+- type: loadout
+  id: LoadoutCommandCMOOuterLab
+  category: Jobs
+  cost: 1
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - ChiefMedicalOfficer
+  items:
+    - ClothingOuterCoatLabCmo
+
+- type: loadout
+  id: LoadoutCommandCMOHatBeret
+  category: Jobs
+  cost: 1
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - ChiefMedicalOfficer
+  items:
+    - ClothingHeadHatBeretCmo
+
+- type: loadout
+  id: LoadoutCommandCMOShoesBootsWinter
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - ChiefMedicalOfficer
+  items:
+    - ClothingShoesBootsWinterChiefMedicalOfficer
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml
new file mode 100644
index 0000000000..f4a583e39a
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml
@@ -0,0 +1,104 @@
+- type: loadout
+  id: LoadoutCommandHOPNeckMantle
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - HeadOfPersonnel
+  items:
+    - ClothingNeckMantleHOP
+
+- type: loadout
+  id: LoadoutCommandHOPNeckCloak
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - HeadOfPersonnel
+  items:
+    - ClothingNeckCloakHop
+
+- type: loadout
+  id: LoadoutCommandHOPJumpsuitTurtleneckBoatswain
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - HeadOfPersonnel
+  items:
+    - ClothingUniformJumpsuitBoatswain
+
+- type: loadout
+  id: LoadoutCommandHOPJumpsuitMess
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - HeadOfPersonnel
+  items:
+    - ClothingUniformJumpsuitHoPMess
+
+- type: loadout
+  id: LoadoutCommandHOPJumpskirtMess
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - HeadOfPersonnel
+  items:
+    - ClothingUniformJumpskirtHoPMess
+
+- type: loadout
+  id: LoadoutcommandHOPOuterCoatFormal
+  category: Jobs
+  cost: 2
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - HeadOfPersonnel
+  items:
+    - ClothingOuterCoatHoPFormal
+
+- type: loadout
+  id: LoadoutCommandHOPBackIan
+  category: Jobs
+  cost: 4
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - HeadOfPersonnel
+  items:
+    - ClothingBackpackIan
+
+- type: loadout
+  id: LoadoutCommandHOPHatCap
+  category: Jobs
+  cost: 1
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - HeadOfPersonnel
+  items:
+    - ClothingHeadHatHopcap
+
+- type: loadout
+  id: LoadoutCommandHOPShoesBootsWinter
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - HeadOfPersonnel
+  items:
+    - ClothingShoesBootsWinterHeadOfPersonel
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/headOfSecurity.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/headOfSecurity.yml
new file mode 100644
index 0000000000..60c6bbdb00
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/headOfSecurity.yml
@@ -0,0 +1,175 @@
+- type: loadout
+  id: LoadoutCommandHOSNeckMantle
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - HeadOfSecurity
+  items:
+    - ClothingNeckMantleHOS
+
+- type: loadout
+  id: LoadoutCommandHOSNeckCloak
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - HeadOfSecurity
+  items:
+    - ClothingNeckCloakHos
+
+- type: loadout
+  id: LoadoutCommandHOSJumpsuitAlt
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - HeadOfSecurity
+  items:
+    - ClothingUniformJumpsuitHoSAlt
+
+- type: loadout
+  id: LoadoutCommandHOSJumpsuitBlue
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - HeadOfSecurity
+  items:
+    - ClothingUniformJumpsuitHoSBlue
+
+- type: loadout
+  id: LoadoutCommandHOSJumpsuitGrey
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - HeadOfSecurity
+  items:
+    - ClothingUniformJumpsuitHoSGrey
+
+- type: loadout
+  id: LoadoutCommandHOSJumpsuitParade
+  category: Jobs
+  cost: 3
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - HeadOfSecurity
+  items:
+    - ClothingUniformJumpsuitHoSParadeMale
+
+- type: loadout
+  id: LoadoutCommandHOSJumpsuitFormal
+  category: Jobs
+  cost: 3
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - HeadOfSecurity
+  items:
+    - ClothingUniformJumpsuitHosFormal
+
+- type: loadout
+  id: LoadoutCommandHOSJumpskirtAlt
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - HeadOfSecurity
+  items:
+    - ClothingUniformJumpskirtHoSAlt
+
+- type: loadout
+  id: LoadoutCommandHOSJumpskirtParade
+  category: Jobs
+  cost: 3
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - HeadOfSecurity
+  items:
+    - ClothingUniformJumpskirtHoSParadeMale
+
+- type: loadout
+  id: LoadoutCommandHOSJumpskirtFormal
+  category: Jobs
+  cost: 3
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - HeadOfSecurity
+  items:
+    - ClothingUniformJumpskirtHosFormal
+
+- type: loadout
+  id: LoadoutCommandHOSOuterWinter
+  category: Jobs
+  cost: 2
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - HeadOfSecurity
+  items:
+    - ClothingOuterWinterHoS
+
+- type: loadout
+  id: LoadoutCommandHOSOuterTrench
+  category: Jobs
+  cost: 2
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - HeadOfSecurity
+  items:
+    - ClothingOuterCoatHoSTrench
+
+- type: loadout
+  id: LoadoutCommandHOSHatBeret
+  category: Jobs
+  cost: 1
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - HeadOfSecurity
+  items:
+    - ClothingHeadHatBeretHoS
+
+- type: loadout
+  id: LoadoutCommandHOSHatHoshat
+  category: Jobs
+  cost: 1
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - HeadOfSecurity
+  items:
+    - ClothingHeadHatHoshat
+
+- type: loadout
+  id: LoadoutCommandHOSShoesBootsWinter
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - HeadOfSecurity
+  items:
+    - ClothingShoesBootsWinterHeadOfSecurity
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/quarterMaster.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/quarterMaster.yml
new file mode 100644
index 0000000000..802bc65de5
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/quarterMaster.yml
@@ -0,0 +1,71 @@
+# What? This isn't a thing?? :(
+# - type: loadout
+#   id: LoadoutCommandQMNeckMantle
+#   category: Jobs
+#   cost: 2
+#   exclusive: true
+#   requirements:
+#     - !type:LoadoutJobRequirement
+#       jobs:
+#         - Quartermaster
+#   items:
+#     - ClothingNeckMantleQM
+
+- type: loadout
+  id: LoadoutCommandQMNeckCloak
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Quartermaster
+  items:
+    - ClothingNeckCloakQm
+
+- type: loadout
+  id: LoadoutCommandQMUniformTurtleneck
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Quartermaster
+  items:
+    - ClothingUniformJumpsuitQMTurtleneck
+
+- type: loadout
+  id: LoadoutCommandQMUniformTurtleneckSkirt
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Quartermaster
+  items:
+    - ClothingUniformJumpskirtQMTurtleneck
+
+- type: loadout
+  id: LoadoutCommandQMHeadSoft
+  category: Jobs
+  cost: 1
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Quartermaster
+  items:
+    - ClothingHeadHatQMsoft
+
+- type: loadout
+  id: LoadoutCommandQMShoesBootsWinter
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Quartermaster
+  items:
+    - ClothingShoesBootsWinterLogisticsOfficer
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/researchDirector.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/researchDirector.yml
new file mode 100644
index 0000000000..cf24ffd852
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/researchDirector.yml
@@ -0,0 +1,57 @@
+- type: loadout
+  id: LoadoutCommandRDNeckMantle
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - ResearchDirector
+  items:
+    - ClothingNeckMantleRD
+
+- type: loadout
+  id: LoadoutCommandRDNeckCloak
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - ResearchDirector
+  items:
+    - ClothingNeckCloakRd
+
+- type: loadout
+  id: LoadoutCommandRDOuterWinter
+  category: Jobs
+  cost: 2
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - ResearchDirector
+  items:
+    - ClothingOuterWinterRD
+
+- type: loadout
+  id: LoadoutCommandRDOuterMysta
+  category: Jobs
+  cost: 2
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - ResearchDirector
+  items:
+    - ClothingOuterCoatRndMysta
+
+- type: loadout
+  id: LoadoutCommandRDShoesBootsWinter
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - ResearchDirector
+  items:
+    - ClothingShoesBootsWinterMystagogue
diff --git a/Resources/Prototypes/Loadouts/Jobs/cargo.yml b/Resources/Prototypes/Loadouts/Jobs/cargo.yml
new file mode 100644
index 0000000000..fe835d6823
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/Jobs/cargo.yml
@@ -0,0 +1,14 @@
+- type: loadout
+  id: LoadoutCargoNeckGoliathCloak
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - SalvageSpecialist
+    - !type:LoadoutPlaytimeRequirement
+      tracker: JobSalvageSpecialist
+      min: 36000 # 10 hours
+  items:
+    - ClothingNeckCloakGoliathCloak
diff --git a/Resources/Prototypes/Loadouts/Jobs/engineering.yml b/Resources/Prototypes/Loadouts/Jobs/engineering.yml
new file mode 100644
index 0000000000..820825e236
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/Jobs/engineering.yml
@@ -0,0 +1,170 @@
+- type: loadout
+  id: LoadoutEngineeringUniformHazard
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - StationEngineer
+  items:
+    - ClothingUniformJumpsuitEngineeringHazard
+
+- type: loadout
+  id: LoadoutEngineeringOuterHazard
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - StationEngineer
+  items:
+    - ClothingOuterVestHazard
+
+- type: loadout
+  id: LoadoutEngineeringUniformJumpskirtSenior
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - StationEngineer
+    - !type:LoadoutPlaytimeRequirement
+      tracker: JobAtmosphericTechnician
+      min: 21600 # 6 hours
+    - !type:LoadoutPlaytimeRequirement
+      tracker: JobStationEngineer
+      min: 21600 # 6 hours
+    - !type:LoadoutDepartmentTimeRequirement
+      department: Engineering
+      min: 216000 # 60 hours
+  items:
+    - ClothingUniformJumpskirtSeniorEngineer
+
+- type: loadout
+  id: LoadoutEngineeringUniformJumpsuitSenior
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - StationEngineer
+    - !type:LoadoutPlaytimeRequirement
+      tracker: JobAtmosphericTechnician
+      min: 21600 # 6 hours
+    - !type:LoadoutPlaytimeRequirement
+      tracker: JobStationEngineer
+      min: 21600 # 6 hours
+    - !type:LoadoutDepartmentTimeRequirement
+      department: Engineering
+      min: 216000 # 60 hours
+  items:
+    - ClothingUniformJumpsuitSeniorEngineer
+
+- type: loadout
+  id: LoadoutEngineeringChickenSuit # :)
+  category: Jobs
+  cost: 3
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - AtmosphericTechnician
+  items:
+    - ClothingOuterSuitChicken
+    - ClothingHeadHatChickenhead
+
+- type: loadout
+  id: LoadoutEngineeringEyesMeson
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - StationEngineer
+        - AtmosphericTechnician
+  items:
+    - ClothingEyesGlassesMeson
+
+- type: loadout
+  id: LoadoutEngineeringHeadBeret
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - StationEngineer
+        - AtmosphericTechnician
+        - ChiefEngineer
+  items:
+    - ClothingHeadHatBeretEngineering
+
+- type: loadout
+  id: LoadoutEngineeringHeadHardhatBlue
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - StationEngineer
+        - AtmosphericTechnician
+  items:
+    - ClothingHeadHatHardhatBlue
+
+- type: loadout
+  id: LoadoutEngineeringHeadHardhatOrange
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - StationEngineer
+        - AtmosphericTechnician
+  items:
+    - ClothingHeadHatHardhatOrange
+
+- type: loadout
+  id: LoadoutEngineeringHeadHardhatYellow
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - StationEngineer
+        - AtmosphericTechnician
+  items:
+    - ClothingHeadHatHardhatYellow
+
+- type: loadout
+  id: LoadoutEngineeringHeadHardhatWhite
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - StationEngineer
+        - AtmosphericTechnician
+  items:
+    - ClothingHeadHatHardhatWhite
+
+- type: loadout
+  id: LoadoutEngineeringHeadHardhatRed
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - StationEngineer
+        - AtmosphericTechnician
+  items:
+    - ClothingHeadHatHardhatRed
diff --git a/Resources/Prototypes/Loadouts/Jobs/medical.yml b/Resources/Prototypes/Loadouts/Jobs/medical.yml
new file mode 100644
index 0000000000..37af839f3c
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/Jobs/medical.yml
@@ -0,0 +1,197 @@
+- type: loadout
+  id: LoadoutMedicalGlovesNitrile
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Paramedic
+        - ChiefMedicalOfficer
+  items:
+    - ClothingHandsGlovesNitrile
+
+- type: loadout
+  id: LoadoutMedicalOuterLabcoat
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Chemist
+  items:
+    - ClothingOuterCoatLab
+
+- type: loadout
+  id: LoadoutMedicalNeckStethoscope
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - MedicalDoctor
+        - ChiefMedicalOfficer
+  items:
+    - ClothingNeckStethoscope
+
+- type: loadout
+  id: LoadoutMedicalUniformScrubsBlue
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - MedicalDoctor
+  items:
+    - UniformScrubsColorBlue
+
+- type: loadout
+  id: LoadoutMedicalUniformScrubsGreen
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - MedicalDoctor
+  items:
+    - UniformScrubsColorGreen
+
+- type: loadout
+  id: LoadoutMedicalUniformScrubsPurple
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - MedicalDoctor
+  items:
+    - UniformScrubsColorPurple
+
+- type: loadout
+  id: LoadoutMedicalOuterLabcoatChem
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Chemist
+  items:
+    - ClothingOuterCoatLabChem
+
+- type: loadout
+  id: LoadoutMedicalItemHandLabeler
+  category: Jobs
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Chemist
+  items:
+    - HandLabeler
+
+- type: loadout
+  id: LoadoutMedicalUniformParamedicJumpsuit
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Paramedic
+  items:
+    - ClothingUniformJumpsuitParamedic
+
+- type: loadout
+  id: LoadoutMedicalUniformParamedicJumpskirt
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Paramedic
+  items:
+    - ClothingUniformJumpskirtParamedic
+
+- type: loadout
+  id: LoadoutMedicalUniformJumpskirtSenior
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - MedicalDoctor
+    - !type:LoadoutPlaytimeRequirement
+      tracker: JobChemist
+      min: 21600 # 6 hours
+    - !type:LoadoutPlaytimeRequirement
+      tracker: JobMedicalDoctor
+      min: 21600 # 6 hours
+    - !type:LoadoutDepartmentTimeRequirement
+      department: Medical
+      min: 216000 # 60 hours
+  items:
+    - ClothingUniformJumpskirtSeniorPhysician
+
+- type: loadout
+  id: LoadoutMedicalUniformJumpsuitSenior
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - MedicalDoctor
+    - !type:LoadoutPlaytimeRequirement
+      tracker: JobChemist
+      min: 21600 # 6 hours
+    - !type:LoadoutPlaytimeRequirement
+      tracker: JobMedicalDoctor
+      min: 21600 # 6 hours
+    - !type:LoadoutDepartmentTimeRequirement
+      department: Medical
+      min: 216000 # 60 hours
+  items:
+    - ClothingUniformJumpsuitSeniorPhysician
+
+- type: loadout
+  id: LoadoutMedicalHeadNurse
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - MedicalDoctor
+  items:
+    - ClothingHeadNurseHat
+
+- type: loadout
+  id: LoadoutMedicalHeadBeretSeniorPhysician
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - MedicalDoctor
+    - !type:LoadoutPlaytimeRequirement
+      tracker: JobChemist
+      min: 21600 # 6 hours
+    - !type:LoadoutPlaytimeRequirement
+      tracker: JobMedicalDoctor
+      min: 21600 # 6 hours
+    - !type:LoadoutDepartmentTimeRequirement
+      department: Medical
+      min: 216000 # 60 hours
+  items:
+    - ClothingHeadHatBeretSeniorPhysician
diff --git a/Resources/Prototypes/Loadouts/Jobs/science.yml b/Resources/Prototypes/Loadouts/Jobs/science.yml
new file mode 100644
index 0000000000..f65b69c46a
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/Jobs/science.yml
@@ -0,0 +1,86 @@
+- type: loadout
+  id: LoadoutScienceUniformJumpskirtSenior
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Scientist
+    - !type:LoadoutDepartmentTimeRequirement
+      department: Epistemics
+      min: 216000 # 60 hours
+  items:
+    - ClothingUniformJumpskirtSeniorResearcher
+
+- type: loadout
+  id: LoadoutScienceUniformJumpsuitSenior
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Scientist
+    - !type:LoadoutDepartmentTimeRequirement
+      department: Epistemics
+      min: 216000 # 60 hours
+  items:
+    - ClothingUniformJumpsuitSeniorResearcher
+
+- type: loadout
+  id: LoadoutScienceOuterCoat
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Scientist
+        - ResearchAssistant
+        - ResearchDirector
+  items:
+    - ClothingOuterCoatRnd
+
+- type: loadout
+  id: LoadoutScienceOuterLabcoat
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Scientist
+        - ResearchAssistant
+        - ResearchDirector
+  items:
+    - ClothingOuterCoatLab
+
+- type: loadout
+  id: LoadoutScienceOuterLabcoatSeniorResearcher
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Scientist
+    - !type:LoadoutDepartmentTimeRequirement
+      department: Epistemics
+      min: 216000 # 60 hours
+  items:
+    - ClothingOuterCoatLabSeniorResearcher
+
+- type: loadout
+  id: LoadoutScienceHatBeret
+  category: Jobs
+  cost: 1
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Scientist
+        - ResearchAssistant
+        - ResearchDirector
+  items:
+    - ClothingHeadHatBeretRND
diff --git a/Resources/Prototypes/Loadouts/Jobs/security.yml b/Resources/Prototypes/Loadouts/Jobs/security.yml
new file mode 100644
index 0000000000..47c4b040d3
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/Jobs/security.yml
@@ -0,0 +1,89 @@
+- type: loadout
+  id: LoadoutSecurityUniformGrey
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - SecurityOfficer
+        - SecurityCadet
+        - Warden
+  items:
+    - ClothingUniformJumpsuitSecGrey
+
+- type: loadout
+  id: LoadoutSecurityUniformJumpskirtSenior
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - SecurityOfficer
+    - !type:LoadoutPlaytimeRequirement
+      tracker: JobWarden
+      min: 21600 # 6 hours
+    - !type:LoadoutPlaytimeRequirement
+      tracker: JobDetective
+      min: 7200 # 2 hours
+    - !type:LoadoutPlaytimeRequirement
+      tracker: JobSecurityOfficer
+      min: 21600 # 6 hours
+    - !type:LoadoutDepartmentTimeRequirement
+      department: Security
+      min: 216000 # 60 hours
+  items:
+    - ClothingUniformJumpskirtSeniorOfficer
+
+- type: loadout
+  id: LoadoutSecurityUniformJumpsuitSenior
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - SecurityOfficer
+    - !type:LoadoutPlaytimeRequirement
+      tracker: JobWarden
+      min: 21600 # 6 hours
+    - !type:LoadoutPlaytimeRequirement
+      tracker: JobDetective
+      min: 7200 # 2 hours
+    - !type:LoadoutPlaytimeRequirement
+      tracker: JobSecurityOfficer
+      min: 21600 # 6 hours
+    - !type:LoadoutDepartmentTimeRequirement
+      department: Security
+      min: 216000 # 60 hours
+  items:
+    - ClothingUniformJumpsuitSeniorOfficer
+
+- type: loadout
+  id: LoadoutSecurityMaskGasSwat
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Warden
+        - HeadOfSecurity
+  items:
+    - ClothingMaskGasSwat
+
+- type: loadout
+  id: LoadoutSecurityShoesJackboots
+  category: Jobs
+  cost: 1
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Detective
+        - SecurityOfficer
+        - SecurityCadet
+        - Warden
+        - HeadOfSecurity
+  items:
+    - ClothingShoesBootsJack
diff --git a/Resources/Prototypes/Loadouts/Jobs/service.yml b/Resources/Prototypes/Loadouts/Jobs/service.yml
new file mode 100644
index 0000000000..4372f891ad
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/Jobs/service.yml
@@ -0,0 +1,183 @@
+- type: loadout
+  id: LoadoutServiceClownOutfitJester
+  category: Jobs
+  cost: 3
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Clown
+  items:
+    - ClothingUniformJumpsuitJester
+    - ClothingHeadHatJester
+    - ClothingShoesJester
+
+- type: loadout
+  id: LoadoutServiceClownOutfitJesterAlt
+  category: Jobs
+  cost: 3
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Clown
+  items:
+    - ClothingUniformJumpsuitJesterAlt
+    - ClothingHeadHatJesterAlt
+    - ClothingShoesJester
+
+- type: loadout
+  id: LoadoutServiceBartenderUniformPurple
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Bartender
+  items:
+    - ClothingUniformJumpsuitBartenderPurple
+
+- type: loadout
+  id: LoadoutServiceBotanistUniformOveralls
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+     jobs:
+        - Botanist
+  items:
+    - ClothingUniformOveralls
+
+- type: loadout
+  id: LoadoutServiceLawyerUniformBlueSuit
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+     jobs:
+        - Lawyer
+  items:
+    - ClothingUniformJumpsuitLawyerBlue
+
+- type: loadout
+  id: LoadoutServiceLawyerUniformBlueSkirt
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Lawyer
+  items:
+    - ClothingUniformJumpskirtLawyerBlue
+
+- type: loadout
+  id: LoadoutServiceLawyerUniformRedSuit
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Lawyer
+  items:
+    - ClothingUniformJumpsuitLawyerRed
+
+- type: loadout
+  id: LoadoutServiceLawyerUniformRedSkirt
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Lawyer
+  items:
+    - ClothingUniformJumpskirtLawyerRed
+
+- type: loadout
+  id: LoadoutServiceLawyerUniformPurpleSuit
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Lawyer
+  items:
+    - ClothingUniformJumpsuitLawyerPurple
+
+- type: loadout
+  id: LoadoutServiceLawyerUniformPurpleSkirt
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Lawyer
+  items:
+    - ClothingUniformJumpskirtLawyerPurple
+
+- type: loadout
+  id: LoadoutServiceLawyerUniformGoodSuit
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Lawyer
+  items:
+    - ClothingUniformJumpsuitLawyerGood
+
+- type: loadout
+  id: LoadoutServiceLawyerUniformGoodSkirt
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Lawyer
+  items:
+    - ClothingUniformJumpskirtLawyerGood
+
+- type: loadout
+  id: LoadoutServiceReporterUniformJournalist
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Reporter
+  items:
+    - ClothingUniformJumpsuitJournalist
+
+- type: loadout
+  id: LoadoutServiceReporterUniformDetectivesuit
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Reporter
+  items:
+    - ClothingUniformJumpsuitDetective
+
+- type: loadout
+  id: LoadoutServiceReporterUniformDetectiveskirt
+  category: Jobs
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Reporter
+  items:
+    - ClothingUniformJumpskirtDetective
diff --git a/Resources/Prototypes/Loadouts/categories.yml b/Resources/Prototypes/Loadouts/categories.yml
new file mode 100644
index 0000000000..b231b397f7
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/categories.yml
@@ -0,0 +1,18 @@
+# Alphabetically ordered
+- type: loadoutCategory
+  id: Accessories
+
+- type: loadoutCategory
+  id: Items
+
+- type: loadoutCategory
+  id: Jobs
+
+- type: loadoutCategory
+  id: Outer
+
+- type: loadoutCategory
+  id: Uncategorized
+
+- type: loadoutCategory
+  id: Uniform
diff --git a/Resources/Prototypes/Loadouts/eyes.yml b/Resources/Prototypes/Loadouts/eyes.yml
new file mode 100644
index 0000000000..a7a8cbd773
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/eyes.yml
@@ -0,0 +1,13 @@
+- type: loadout
+  id: LoadoutEyesEyepatch
+  category: Accessories
+  cost: 1
+  items:
+    - ClothingEyesEyepatch
+
+- type: loadout
+  id: LoadoutEyesBlindfold
+  category: Accessories
+  cost: 2
+  items:
+    - ClothingEyesBlindfold
diff --git a/Resources/Prototypes/Loadouts/head.yml b/Resources/Prototypes/Loadouts/head.yml
new file mode 100644
index 0000000000..33a2f0b19b
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/head.yml
@@ -0,0 +1,125 @@
+- type: loadout
+  id: LoadoutHeadBeaverHat
+  category: Accessories
+  cost: 2
+  items:
+    - ClothingHeadHatBeaverHat
+
+- type: loadout
+  id: LoadoutHeadTophat
+  category: Accessories
+  cost: 2
+  items:
+    - ClothingHeadHatTophat
+
+- type: loadout
+  id: LoadoutHeadHatBluesoft
+  category: Accessories
+  cost: 1
+  items:
+    - ClothingHeadHatBluesoft
+
+- type: loadout
+  id: LoadoutHeadHatBluesoftFlipped
+  category: Accessories
+  cost: 1
+  items:
+    - ClothingHeadHatBluesoftFlipped
+
+- type: loadout
+  id: LoadoutHeadHatCorpsoft
+  category: Accessories
+  cost: 1
+  items:
+    - ClothingHeadHatCorpsoft
+
+- type: loadout
+  id: LoadoutHeadHatCorpsoftFlipped
+  category: Accessories
+  cost: 1
+  items:
+    - ClothingHeadHatCorpsoftFlipped
+
+- type: loadout
+  id: LoadoutHeadHatGreensoft
+  category: Accessories
+  cost: 1
+  items:
+    - ClothingHeadHatGreensoft
+
+- type: loadout
+  id: LoadoutHeadHatGreensoftFlipped
+  category: Accessories
+  cost: 1
+  items:
+    - ClothingHeadHatGreensoftFlipped
+
+- type: loadout
+  id: LoadoutHeadHatGreysoft
+  category: Accessories
+  cost: 1
+  items:
+    - ClothingHeadHatGreysoft
+
+- type: loadout
+  id: LoadoutHeadHatGreysoftFlipped
+  category: Accessories
+  cost: 1
+  items:
+    - ClothingHeadHatGreysoftFlipped
+
+- type: loadout
+  id: LoadoutHeadHatOrangesoft
+  category: Accessories
+  cost: 1
+  items:
+    - ClothingHeadHatOrangesoft
+
+- type: loadout
+  id: LoadoutHeadHatOrangesoftFlipped
+  category: Accessories
+  cost: 1
+  items:
+    - ClothingHeadHatOrangesoftFlipped
+
+- type: loadout
+  id: LoadoutHeadHatPurplesoft
+  category: Accessories
+  cost: 1
+  items:
+    - ClothingHeadHatPurplesoft
+
+- type: loadout
+  id: LoadoutHeadHatPurplesoftFlipped
+  category: Accessories
+  cost: 1
+  items:
+    - ClothingHeadHatPurplesoftFlipped
+
+- type: loadout
+  id: LoadoutHeadHatRedsoft
+  category: Accessories
+  cost: 1
+  items:
+    - ClothingHeadHatRedsoft
+
+- type: loadout
+  id: LoadoutHeadHatRedsoftFlipped
+  category: Accessories
+  cost: 1
+  items:
+    - ClothingHeadHatRedsoftFlipped
+
+- type: loadout
+  id: LoadoutHeadHatYellowsoft
+  category: Accessories
+  cost: 1
+  items:
+    - ClothingHeadHatYellowsoft
+
+- type: loadout
+  id: LoadoutHeadHatYellowsoftFlipped
+  category: Accessories
+  cost: 1
+  items:
+    - ClothingHeadHatYellowsoftFlipped
diff --git a/Resources/Prototypes/Loadouts/items.yml b/Resources/Prototypes/Loadouts/items.yml
new file mode 100644
index 0000000000..6ce8d26061
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/items.yml
@@ -0,0 +1,90 @@
+- type: loadout
+  id: LoadoutItemCig
+  category: Items
+  cost: 1
+  items:
+    - Cigarette
+
+- type: loadout
+  id: LoadoutItemCigsGreen
+  category: Items
+  cost: 2
+  items:
+    - CigPackGreen
+
+- type: loadout
+  id: LoadoutItemCigsRed
+  category: Items
+  cost: 2
+  items:
+    - CigPackRed
+
+- type: loadout
+  id: LoadoutItemCigsBlue
+  category: Items
+  cost: 2
+  items:
+    - CigPackBlue
+
+- type: loadout
+  id: LoadoutItemCigsBlack
+  category: Items
+  cost: 2
+  items:
+    - CigPackBlack
+
+- type: loadout
+  id: LoadoutItemPAI
+  category: Items
+  cost: 3
+  items:
+    - PersonalAI
+
+- type: loadout
+  id: LoadoutItemLighter
+  category: Items
+  cost: 2
+  items:
+    - Lighter
+
+- type: loadout
+  id: LoadoutItemLighterCheap
+  category: Items
+  cost: 1
+  items:
+    - CheapLighter
+
+- type: loadout
+  id: LoadoutItemMatches
+  category: Items
+  cost: 1
+  items:
+    - Matchbox
+
+- type: loadout
+  id: LoadoutItemPlushieSharkBlue
+  category: Items
+  cost: 2
+  items:
+    - PlushieSharkBlue
+
+- type: loadout
+  id: LoadoutItemPlushieSharkPink
+  category: Items
+  cost: 2
+  items:
+    - PlushieSharkPink
+
+- type: loadout
+  id: LoadoutItemPlushieSharkGrey
+  category: Items
+  cost: 2
+  items:
+    - PlushieSharkGrey
+
+- type: loadout
+  id: LoadoutItemPlushieCarp
+  category: Items
+  cost: 2
+  items:
+    - PlushieCarp
diff --git a/Resources/Prototypes/Loadouts/neck.yml b/Resources/Prototypes/Loadouts/neck.yml
new file mode 100644
index 0000000000..7e5526f966
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/neck.yml
@@ -0,0 +1,27 @@
+- type: loadout
+  id: LoadoutNeckScarfStripedRed
+  category: Accessories
+  cost: 1
+  items:
+    - ClothingNeckScarfStripedRed
+
+- type: loadout
+  id: LoadoutNeckScarfStripedBlue
+  category: Accessories
+  cost: 1
+  items:
+    - ClothingNeckScarfStripedBlue
+
+- type: loadout
+  id: LoadoutNeckScarfStripedGreen
+  category: Accessories
+  cost: 1
+  items:
+    - ClothingNeckScarfStripedGreen
+
+- type: loadout
+  id: LoadoutNeckScarfStripedZebra
+  category: Accessories
+  cost: 1
+  items:
+    - ClothingNeckScarfStripedZebra
diff --git a/Resources/Prototypes/Loadouts/outerClothing.yml b/Resources/Prototypes/Loadouts/outerClothing.yml
new file mode 100644
index 0000000000..078cf530ba
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/outerClothing.yml
@@ -0,0 +1,111 @@
+- type: loadout
+  id: LoadoutOuterGhostSheet
+  category: Outer
+  cost: 2
+  items:
+    - ClothingOuterGhostSheet
+
+- type: loadout
+  id: LoadoutOuterCoatBomberjacket
+  category: Outer
+  cost: 3
+  items:
+    - ClothingOuterCoatBomber
+
+- type: loadout
+  id: LoadoutOuterCoatHoodieBlack
+  category: Outer
+  cost: 2
+  items:
+    - ClothingOuterHoodieBlack
+
+- type: loadout
+  id: LoadoutOuterCoatHoodieGrey
+  category: Outer
+  cost: 2
+  items:
+    - ClothingOuterHoodieGrey
+
+- type: loadout
+  id: LoadoutOuterCoatWinterCoat
+  category: Outer
+  cost: 3
+  items:
+    - ClothingOuterWinterCoat
+
+- type: loadout
+  id: LoadoutOuterCorporateJacket
+  category: Outer
+  cost: 2
+  items:
+    - ClothingOuterCorporateJacket
+
+- type: loadout
+  id: LoadoutOuterCsCorporateJacket
+  category: Outer
+  cost: 2
+  items:
+    - ClothingOuterCsCorporateJacket
+
+- type: loadout
+  id: LoadoutOuterEeCorporateJacket
+  category: Outer
+  cost: 2
+  items:
+    - ClothingOuterEeCorporateJacket
+
+- type: loadout
+  id: LoadoutOuterHiCorporateJacket
+  category: Outer
+  cost: 2
+  items:
+    - ClothingOuterHiCorporateJacket
+
+- type: loadout
+  id: LoadoutOuterHmCorporateJacket
+  category: Outer
+  cost: 2
+  items:
+    - ClothingOuterHmCorporateJacket
+
+- type: loadout
+  id: LoadoutOuterIdCorporateJacket
+  category: Outer
+  cost: 2
+  items:
+    - ClothingOuterIdCorporateJacket
+
+- type: loadout
+  id: LoadoutOuterBcCorporateJacket
+  category: Outer
+  cost: 2
+  items:
+    - ClothingOuterBcCorporateJacket
+
+- type: loadout
+  id: LoadoutOuterDdCorporateJacket
+  category: Outer
+  cost: 2
+  items:
+    - ClothingOuterDdCorporateJacket
+
+- type: loadout
+  id: LoadoutOuterFaCorporateJacket
+  category: Outer
+  cost: 2
+  items:
+    - ClothingOuterFaCorporateJacket
+
+- type: loadout
+  id: LoadoutOuterGeCorporateJacket
+  category: Outer
+  cost: 2
+  items:
+    - ClothingOuterGeCorporateJacket
+
+- type: loadout
+  id: LoadoutOuterZhCorporateJacket
+  category: Outer
+  cost: 2
+  items:
+    - ClothingOuterZhCorporateJacket
diff --git a/Resources/Prototypes/Loadouts/shoes.yml b/Resources/Prototypes/Loadouts/shoes.yml
new file mode 100644
index 0000000000..4a1880b5e2
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/shoes.yml
@@ -0,0 +1,98 @@
+# Colored
+- type: loadout
+  id: LoadoutShoesBlack
+  category: Accessories
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingShoesColorBlack
+
+- type: loadout
+  id: LoadoutShoesBlue
+  category: Accessories
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingShoesColorBlue
+
+- type: loadout
+  id: LoadoutShoesBrown
+  category: Accessories
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingShoesColorBrown
+
+- type: loadout
+  id: LoadoutShoesGreen
+  category: Accessories
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingShoesColorGreen
+
+- type: loadout
+  id: LoadoutShoesOrange
+  category: Accessories
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingShoesColorOrange
+
+- type: loadout
+  id: LoadoutShoesPurple
+  category: Accessories
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingShoesColorPurple
+
+- type: loadout
+  id: LoadoutShoesRed
+  category: Accessories
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingShoesColorRed
+
+- type: loadout
+  id: LoadoutShoesWhite
+  category: Accessories
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingShoesColorWhite
+
+- type: loadout
+  id: LoadoutShoesYellow
+  category: Accessories
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingShoesColorYellow
+
+
+# Miscellaneous
+- type: loadout
+  id: LoadoutShoesSlippersDuck
+  category: Accessories
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingShoeSlippersDuck
+
+- type: loadout
+  id: LoadoutShoesLeather
+  category: Accessories
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingShoesLeather
+
+- type: loadout
+  id: LoadoutShoesMiscWhite
+  category: Accessories
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingShoesMiscWhite
diff --git a/Resources/Prototypes/Loadouts/uniform.yml b/Resources/Prototypes/Loadouts/uniform.yml
new file mode 100644
index 0000000000..097577feba
--- /dev/null
+++ b/Resources/Prototypes/Loadouts/uniform.yml
@@ -0,0 +1,261 @@
+- type: loadout
+  id: LoadoutUniformAncientJumpsuit
+  category: Uniform
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Passenger
+  items:
+    - ClothingUniformJumpsuitAncient
+
+# Colored jumpsuits
+
+- type: loadout
+  id: LoadoutUniformJumpsuitColorBlack
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformJumpsuitColorBlack
+
+- type: loadout
+  id: LoadoutUniformJumpskirtColorBlack
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformJumpskirtColorBlack
+
+- type: loadout
+  id: LoadoutUniformJumpsuitColorBlue
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformJumpsuitColorBlue
+
+- type: loadout
+  id: LoadoutUniformJumpskirtColorBlue
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformJumpskirtColorBlue
+
+- type: loadout
+  id: LoadoutUniformJumpsuitColorGreen
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformJumpsuitColorGreen
+
+- type: loadout
+  id: LoadoutUniformJumpskirtColorGreen
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformJumpskirtColorGreen
+
+- type: loadout
+  id: LoadoutUniformJumpsuitColorOrange
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformJumpsuitColorOrange
+
+- type: loadout
+  id: LoadoutUniformJumpskirtColorOrange
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformJumpskirtColorOrange
+
+- type: loadout
+  id: LoadoutUniformJumpsuitColorPink
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformJumpsuitColorPink
+
+- type: loadout
+  id: LoadoutUniformJumpskirtColorPink
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformJumpskirtColorPink
+
+- type: loadout
+  id: LoadoutUniformJumpsuitColorRed
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformJumpsuitColorRed
+
+- type: loadout
+  id: LoadoutUniformJumpskirtColorRed
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformJumpskirtColorRed
+
+- type: loadout
+  id: LoadoutUniformJumpsuitColorWhite
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformJumpsuitColorWhite
+
+- type: loadout
+  id: LoadoutUniformJumpskirtColorWhite
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformJumpskirtColorWhite
+
+- type: loadout
+  id: LoadoutUniformJumpsuitColorYellow
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformJumpsuitColorYellow
+
+- type: loadout
+  id: LoadoutUniformJumpskirtColorYellow
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformJumpskirtColorYellow
+
+- type: loadout
+  id: LoadoutUniformJumpsuitColorDarkBlue
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformJumpsuitColorDarkBlue
+
+- type: loadout
+  id: LoadoutUniformJumpskirtColorDarkBlue
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformJumpskirtColorDarkBlue
+
+- type: loadout
+  id: LoadoutUniformJumpsuitColorTeal
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformJumpsuitColorTeal
+
+- type: loadout
+  id: LoadoutUniformJumpskirtColorTeal
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformJumpskirtColorTeal
+
+- type: loadout
+  id: LoadoutUniformJumpsuitColorPurple
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformJumpsuitColorPurple
+
+- type: loadout
+  id: LoadoutUniformJumpskirtColorPurple
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformJumpskirtColorPurple
+
+- type: loadout
+  id: LoadoutUniformJumpsuitColorDarkGreen
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformJumpsuitColorDarkGreen
+
+- type: loadout
+  id: LoadoutUniformJumpskirtColorDarkGreen
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformJumpskirtColorDarkGreen
+
+- type: loadout
+  id: LoadoutUniformJumpsuitColorLightBrown
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformJumpsuitColorLightBrown
+
+- type: loadout
+  id: LoadoutUniformJumpskirtColorLightBrown
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformJumpskirtColorLightBrown
+
+- type: loadout
+  id: LoadoutUniformJumpsuitColorBrown
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformJumpsuitColorBrown
+
+- type: loadout
+  id: LoadoutUniformJumpskirtColorBrown
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformJumpskirtColorBrown
+
+- type: loadout
+  id: LoadoutUniformJumpsuitColorMaroon
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformJumpsuitColorMaroon
+
+- type: loadout
+  id: LoadoutUniformJumpskirtColorMaroon
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformJumpskirtColorMaroon
+
+- type: loadout
+  id: LoadoutUniformJumpsuitColorRainbow
+  category: Uniform
+  cost: 2
+  exclusive: true
+  items:
+    - ClothingUniformColorRainbow
diff --git a/Resources/Prototypes/Maps/salvage.yml b/Resources/Prototypes/Maps/salvage.yml
index a191fec6b8..4d61f0ac48 100644
--- a/Resources/Prototypes/Maps/salvage.yml
+++ b/Resources/Prototypes/Maps/salvage.yml
@@ -110,6 +110,10 @@
   id: Meatball
   mapPath: /Maps/Salvage/meatball.yml
 
+- type: salvageMap
+  id: VeganMeatball
+  mapPath: /Maps/Salvage/vegan-meatball.yml
+
 - type: salvageMap
   id: MediumHaulingShuttleWreck
   mapPath: /Maps/Salvage/hauling-shuttle.yml
diff --git a/Resources/Prototypes/NPCs/Combat/melee.yml b/Resources/Prototypes/NPCs/Combat/melee.yml
index 282e794ee7..2facfaa542 100644
--- a/Resources/Prototypes/NPCs/Combat/melee.yml
+++ b/Resources/Prototypes/NPCs/Combat/melee.yml
@@ -11,7 +11,7 @@
           - type: MeleeWeapon
             damage:
               types:
-                Brute: 0
+                Blunt: 0
           invert: true
       tasks:
         - !type:HTNCompoundTask
@@ -34,7 +34,7 @@
             - type: MeleeWeapon
               damage:
                 types:
-                  Brute: 0
+                  Blunt: 0
           invert: true
       tasks:
         - !type:HTNCompoundTask
diff --git a/Resources/Prototypes/NPCs/utility_queries.yml b/Resources/Prototypes/NPCs/utility_queries.yml
index d62e1a7e8c..3d5385ecbc 100644
--- a/Resources/Prototypes/NPCs/utility_queries.yml
+++ b/Resources/Prototypes/NPCs/utility_queries.yml
@@ -129,7 +129,7 @@
         - type: MeleeWeapon
           damage:
             types:
-              Brute: 0
+              Blunt: 0
         - type: Item
   considerations:
     - !type:TargetMeleeCon
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/coats.yml
index bbb04cad67..a16f6cd221 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/coats.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/OuterClothing/coats.yml
@@ -19,7 +19,7 @@
     coefficient: 0.3
 
 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: ClothingOuterStorageToggleableBase
   id: ClothingOuterCoatRndMysta
   name: mystagogue lab coat # Delta V - Mystagogue new coat
   description: Similar to the standard model but with more purple and gold. # Delta V - Mystagogue new coat
@@ -32,3 +32,5 @@
     modifiers:
       coefficients:
         Caustic: 0.75
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHoodMysta
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml
index 28340ead40..59e3690b6b 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml
@@ -45,6 +45,7 @@
       - BookMap
       - BookJourney
       - BookInspiration
+      - BookJanitorTale
       # Guidebook Books
       - BookSpaceEncyclopedia
       - BookTheBookOfControl
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/boxes.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/boxes.yml
index a75f31cf0f..181bacca45 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/boxes.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/boxes.yml
@@ -36,6 +36,7 @@
       - BoxCandle
       - BoxCandleSmall
       - BoxDarts
+      - BoxCartridgeBB
     chance: 0.7
     rarePrototypes:
       - BoxHugHealing
@@ -49,6 +50,7 @@
       - PresentRandom
       - BoxHolyWater
       - MysteryFigureBox
+      - BoxCleanerGrenades
     rareChance: 0.05
 
 
@@ -100,6 +102,8 @@
       - BoxMagazineCaselessRifleRubber
       - BoxMagazineUniversalMagnumPractice
       - BoxMagazineUniversalMagnumRubber
+      - MagazineBoxSpecialRubber
+      - MagazineBoxSpecialPractice
     chance: 0.15
     rarePrototypes:
       - BoxMagazinePistolCaselessRifle
@@ -121,4 +125,8 @@
       - BoxShellSoulbreaker
       - BoxMagazineUniversalMagnum
       - BoxSpeedLoaderLightRifle
+      - MagazineBoxSpecial
+      - MagazineBoxSpecialIncendiary
+      - MagazineBoxSpecialUranium
+      - MagazineBoxSpecialMindbreaker
     rareChance: 0.015
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/devices.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/devices.yml
index 12f05c3248..abd4d86a1e 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/devices.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/devices.yml
@@ -1,7 +1,7 @@
 - type: entity
   parent: MarkerBase
   id: RandomBoards
-  name: random machine board spawner
+  name: random device & board spawner
   components:
   - type: Sprite
     layers:
@@ -71,11 +71,21 @@
       - HotplateMachineCircuitboard
       - ElectricGrillMachineCircuitboard
       - FatExtractorMachineCircuitboard
+      - SpaceHeaterMachineCircuitBoard
+      - StationMapCircuitboard
+      - Igniter
+      - IntercomElectronics
+      - DoorRemoteFirefight
+      - RadiationCollectorFlatpack
+      - ContainmentFieldGeneratorFlatpack
+      - SolarAssemblyFlatpack
+      - StationBeaconPart
+      - HandheldStationMap
     chance: 0.8
     rarePrototypes:
       - TraversalDistorterMachineCircuitboard
       - CloningPodMachineCircuitboard
-      # - MetempsychoticMachineCircuitboard
+      - MetempsychoticMachineCircuitboard
       - ReverseEngineeringMachineCircuitboard
       - MedicalScannerMachineCircuitboard
       - DawInstrumentMachineCircuitboard
@@ -107,4 +117,26 @@
       - ShockCollar
       - GlimmerMonitorCartridge
       - PotatoAIChip
+      - CargoTelepadMachineCircuitboard
+      - FlatpackerMachineCircuitboard
+      - OreProcessorIndustrialMachineCircuitboard
+      - TurboItemRechargerCircuitboard
+      - PowerCageRechargerCircuitboard
+      - HellfireHeaterMachineCircuitBoard
+      - HellfireFreezerMachineCircuitBoard
+      - BiofabricatorMachineCircuitboard
+      - SalvageExpeditionsComputerCircuitboard
+      - RadarConsoleCircuitboard
+      - RipleyCentralElectronics
+      - RipleyPeripheralsElectronics
+      - HamtrCentralElectronics
+      - HamtrPeripheralsElectronics
+      - HonkerCentralElectronics
+      - HonkerPeripheralsElectronics
+      - HonkerTargetingElectronics
+      - RemoteSignallerAdvanced
+      - SignalTimerElectronics
+      - LogProbeCartridge
+      - HoloprojectorField
+      - DeviceQuantumSpinInverter
     rareChance: 0.25
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/hats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/hats.yml
index b9def15132..f0dd470903 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/hats.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/hats.yml
@@ -42,6 +42,18 @@
         - ClothingHeadCage
         - ClothingHeadHelmetKendoMen
         - ClothingHeadBandMerc
+        - ClothingHeadHatCowboyWhite
+        - ClothingHeadHatCowboyGrey
+        - ClothingHeadHatCowboyBrown
+        - ClothingHeadHatBrownFlatcap
+        - ClothingHeadHatGreyFlatcap
+        - ClothingHeadHatPartyRed
+        - ClothingHeadHatPartyYellow
+        - ClothingHeadHatPartyGreen
+        - ClothingHeadHatPartyBlue
+        - ClothingHeadHatWatermelon
+        - WaterDropletHat
+        - ClothingHeadHatRedRacoon
       rareChance: 0.03
       prototypes:
         - ClothingHeadHatAnimalCat
@@ -98,5 +110,13 @@
         - ClothingHeadHatFlatBrown
         - ClothingHeadTinfoil
         - ClothingHeadHatStrawHat
+        - ClothingHeadHatCowboyBountyHunter
+        - ClothingHeadHatCowboyRed
+        - ClothingHeadHatCowboyBlack
+        - ClothingHeadHatGladiator
+        - ClothingHeadHatMagician
+        - ClothingHeadHatHetmanHat
+        - ClothingHeadHatTacticalMaidHeadband
+        - ClothingHeadHatPirateTricord
       chance: 0.5
       offset: 0.2
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/machineparts.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/machineparts.yml
index 7785e5aaa8..61a99faa2f 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/machineparts.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/machineparts.yml
@@ -36,5 +36,5 @@
         - MatterBinStockPart
         - CrateMaterialSteel
         - CrateMaterialGlass
-      chance: 0.45
+      chance: 0.50
       offset: 0.0
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml
index 9f183dcefb..0c3370890c 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml
@@ -48,6 +48,7 @@
         - PeaSeeds
         - PumpkinSeeds
         - CottonSeeds
+        - LilySeeds
       chance: 0.95
       offset: 0.0
       rarePrototypes:
@@ -64,4 +65,6 @@
         - LemoonSeeds
         - SteelcapSeeds
         - KoibeanSeeds
+        - SpacemansTrumpetSeeds
+        - LaughinPeaSeeds
       rareChance: 0.05
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Drinks/drinks.yml
index 45706fe447..567c5ff52c 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -1,24 +1,25 @@
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkSakeGlass
-  name: sake glass
+  suffix: sake
   description: Wine made from rice, it's sake!
   components:
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 30
         reagents:
         - ReagentId: Sake
-          Quantity: 50
+          Quantity: 30
   - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Nyanotrasen/Objects/Consumable/Drinks/sakeglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkOrangeCreamiceGlass
-  name: orange creamcicle glass
+  suffix: orange creamcicle
   description: Orangy, creamy goodness.
   components:
   - type: SolutionContainerManager
@@ -28,13 +29,14 @@
         reagents:
         - ReagentId: OrangeCreamice
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Nyanotrasen/Objects/Consumable/Drinks/orangecreamcicle.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkSilverjackGlass
-  name: silverjack glass
+  suffix: silverjack
   description: Reminds you of family.
   components:
   - type: SolutionContainerManager
@@ -44,13 +46,14 @@
         reagents:
         - ReagentId: Silverjack
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Nyanotrasen/Objects/Consumable/Drinks/silverjack.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkBrainbombGlass
-  name: brainbomb glass
+  suffix: brainbomb
   description: Toxic to about anything alive, especially your liver.
   components:
   - type: SolutionContainerManager
@@ -60,13 +63,14 @@
         reagents:
         - ReagentId: Brainbomb
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Nyanotrasen/Objects/Consumable/Drinks/brainbomb.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkClownBloodGlass
-  name: clown blood glass
+  suffix: clown blood
   description: Security Officers favorite drink after a long day.
   components:
   - type: SolutionContainerManager
@@ -76,13 +80,14 @@
         reagents:
         - ReagentId: ClownBlood
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Nyanotrasen/Objects/Consumable/Drinks/clownblood.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkCircusJuiceGlass
-  name: circus juice glass
+  suffix: circus juice
   description: Honkmother would be proud.
   components:
   - type: SolutionContainerManager
@@ -92,13 +97,14 @@
         reagents:
         - ReagentId: CircusJuice
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Nyanotrasen/Objects/Consumable/Drinks/circusjuice.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkSapoPicanteGlass
-  name: sapo picante glass
+  suffix: sapo picante
   description: Tastes nothing like a toad.
   components:
   - type: SolutionContainerManager
@@ -108,13 +114,14 @@
         reagents:
         - ReagentId: SapoPicante
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Nyanotrasen/Objects/Consumable/Drinks/sapopicante.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkGraveyardGlass
-  name: graveyard glass
+  suffix: graveyard
   description: For those shifts that never seem to end.
   components:
   - type: SolutionContainerManager
@@ -124,13 +131,14 @@
         reagents:
         - ReagentId: Graveyard
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Nyanotrasen/Objects/Consumable/Drinks/graveyard.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkAtomicPunchGlass
-  name: atomic punch glass
+  suffix: atomic punch
   description: Will NOT make you immune to bullets; Isotopes included!
   components:
   - type: SolutionContainerManager
@@ -140,13 +148,14 @@
         reagents:
         - ReagentId: AtomicPunch
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Nyanotrasen/Objects/Consumable/Drinks/atomicpunch.rsi
-    
+    state: icon
+
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkPinkDrinkGlass
-  name: pink drink glass
+  suffix: pink drink
   description: Entire civilizations have crumbled trying to decide if this drink really tastes like pink...
   components:
   - type: SolutionContainerManager
@@ -156,13 +165,14 @@
         reagents:
         - ReagentId: PinkDrink
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Nyanotrasen/Objects/Consumable/Drinks/pinkdrink.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkBubbleTeaGlass
-  name: bubble tea glass
+  suffix: bubble tea
   description: Big straw not included.
   components:
   - type: SolutionContainerManager
@@ -172,5 +182,6 @@
         reagents:
         - ReagentId: BubbleTea
           Quantity: 30
-  - type: Sprite
-    sprite: Nyanotrasen/Objects/Consumable/Drinks/bubbletea.rsi
\ No newline at end of file
+  - type: Icon
+    sprite: Nyanotrasen/Objects/Consumable/Drinks/bubbletea.rsi
+    state: icon
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml
index 0e4c262b54..fc40ea1639 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml
@@ -65,3 +65,19 @@
     - type: ReverseEngineering
       recipes:
         - DeepFryerMachineCircuitboard
+
+- type: entity
+  id: MailTeleporterMachineCircuitboard
+  parent: BaseMachineCircuitboard
+  name: mail teleporter machine board
+  components:
+    - type: Sprite
+      state: supply
+    - type: MachineBoard
+      prototype: MailTeleporter
+      requirements:
+        Capacitor: 1
+        MatterBin: 1
+      materialRequirements:
+        Steel: 4
+        Cable: 4
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/mailTeleporter.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/mailTeleporter.yml
index 9bcaef52bb..6430e94105 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/mailTeleporter.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/mailTeleporter.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: MailTeleporter
-  parent: BaseStructureDynamic
+  parent: [ BaseMachinePowered, ConstructibleMachine ]
   name: mail teleporter
   description: Teleports mail addressed to the crew of this station.
   components:
@@ -37,11 +37,11 @@
         !type:DamageTrigger
         damage: 75
       behaviors:
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          SheetSteel1:
-            min: 1
-            max: 1
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalGlassBreak
+      - !type:ChangeConstructionNodeBehavior
+        node: machineFrame
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: ApcPowerReceiver
@@ -56,3 +56,5 @@
           True: {visible: true}
           False: {visible: false}
   - type: PowerSwitch
+  - type: Machine
+    board: MailTeleporterMachineCircuitboard
diff --git a/Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Drink/alcohol.yml
index 3d79c0bc07..972fc08239 100644
--- a/Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Drink/alcohol.yml
+++ b/Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Drink/alcohol.yml
@@ -8,7 +8,10 @@
   color: "#DDDDDD"
   metamorphicSprite:
     sprite: Nyanotrasen/Objects/Consumable/Drinks/sakeglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 3
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -28,7 +31,10 @@
   color: "#DDDDDD"
   metamorphicSprite:
     sprite: Nyanotrasen/Objects/Consumable/Drinks/sojuglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -48,7 +54,10 @@
   color: "#efaa16"
   metamorphicSprite:
     sprite: Nyanotrasen/Objects/Consumable/Drinks/orangecreamcicle.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -68,7 +77,10 @@
   color: "#978647"
   metamorphicSprite:
     sprite: Nyanotrasen/Objects/Consumable/Drinks/silverjack.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -88,7 +100,10 @@
   color: "#6f7a2c"
   metamorphicSprite:
     sprite: Nyanotrasen/Objects/Consumable/Drinks/brainbomb.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -121,7 +136,10 @@
   color: "#94001c"
   metamorphicSprite:
     sprite: Nyanotrasen/Objects/Consumable/Drinks/clownblood.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -141,7 +159,10 @@
   color: "#c47872"
   metamorphicSprite:
     sprite: Nyanotrasen/Objects/Consumable/Drinks/circusjuice.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -164,7 +185,10 @@
   color: "#c0501a"
   metamorphicSprite:
     sprite: Nyanotrasen/Objects/Consumable/Drinks/sapopicante.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -186,7 +210,10 @@
   color: "#4f1b1b"
   metamorphicSprite:
     sprite: Nyanotrasen/Objects/Consumable/Drinks/graveyard.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
diff --git a/Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Drink/drinks.yml
index eb306d8c3c..24d83be943 100644
--- a/Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/Nyanotrasen/Reagents/Consumable/Drink/drinks.yml
@@ -8,7 +8,10 @@
   color: "#d04949"
   metamorphicSprite:
     sprite: Nyanotrasen/Objects/Consumable/Drinks/atomicpunch.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -28,7 +31,11 @@
   color: "#d04949"
   metamorphicSprite:
     sprite: Nyanotrasen/Objects/Consumable/Drinks/pinkdrink.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+
   metabolisms:
     Drink:
       effects:
@@ -45,7 +52,10 @@
   color: "#d2b18c"
   metamorphicSprite:
     sprite: Nyanotrasen/Objects/Consumable/Drinks/bubbletea.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
diff --git a/Resources/Prototypes/Nyanotrasen/StatusEffects/job.yml b/Resources/Prototypes/Nyanotrasen/StatusEffects/job.yml
index 64a597d590..943660199b 100644
--- a/Resources/Prototypes/Nyanotrasen/StatusEffects/job.yml
+++ b/Resources/Prototypes/Nyanotrasen/StatusEffects/job.yml
@@ -2,33 +2,33 @@
   parent: JobIcon
   id: JobIconGladiator
   icon:
-    sprite: DeltaV/Interface/Misc/job_icons.rsi
+    sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
     state: nyanoGladiator
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconPrisonGuard
   icon:
-    sprite: DeltaV/Interface/Misc/job_icons.rsi
+    sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
     state: nyanoPrisonGuard
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconMailCarrier
   icon:
-    sprite: DeltaV/Interface/Misc/job_icons.rsi
+    sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
     state: nyanoMailCarrier
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconMartialArtist
   icon:
-    sprite: DeltaV/Interface/Misc/job_icons.rsi
+    sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
     state: nyanoMartialArtist
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconForensicMantis
   icon:
-    sprite: DeltaV/Interface/Misc/job_icons.rsi
+    sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
     state: nyanoMantis
diff --git a/Resources/Prototypes/Nyanotrasen/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Nyanotrasen/Voice/speech_emote_sounds.yml
index aa88242795..b752e94020 100644
--- a/Resources/Prototypes/Nyanotrasen/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/Nyanotrasen/Voice/speech_emote_sounds.yml
@@ -12,10 +12,20 @@
       collection: MaleSneezes
     Cough:
       collection: MaleCoughs
+    Yawn:
+      collection: MaleYawn
+    Snore:
+      collection: Snores
+    Honk:
+      collection: BikeHorn
+    Sigh:
+      collection: MaleSigh
     Crying:
       collection: MaleCry
     Whistle:
       collection: Whistles
+    Weh:
+      collection: Weh
     Hiss:
       collection: FelinidHisses
     Meow:
@@ -26,8 +36,6 @@
       collection: FelinidGrowls
     Purr:
       collection: FelinidPurrs
-    Sigh:
-      collection: MaleSigh
 
 - type: emoteSounds
   id: FemaleFelinid
@@ -42,10 +50,20 @@
       collection: FemaleSneezes
     Cough:
       collection: FemaleCoughs
+    Yawn:
+      collection: FemaleYawn
+    Snore:
+      collection: Snores
+    Honk:
+      collection: CluwneHorn
+    Sigh:
+      collection: FemaleSigh
     Crying:
       collection: FemaleCry
     Whistle:
       collection: Whistles
+    Weh:
+      collection: Weh
     Hiss:
       collection: FelinidHisses
     Meow:
@@ -56,13 +74,3 @@
       collection: FelinidGrowls
     Purr:
       collection: FelinidPurrs
-    Sigh:
-      collection: FemaleSigh
-
-# mobs
-- type: emoteSounds
-  id: Mothroach
-  sound:
-    path: /Audio/Voice/Moth/moth_squeak.ogg
-    params:
-      variation: 0.125
diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml
index 3cdc657dec..6b71544960 100644
--- a/Resources/Prototypes/Objectives/objectiveGroups.yml
+++ b/Resources/Prototypes/Objectives/objectiveGroups.yml
@@ -125,10 +125,7 @@
     WalterStealObjective: 1
     MortyStealObjective: 1
     RenaultStealObjective: 1
-    HamletStealObjective: 1
     ShivaStealObjective: 1
-    SmileStealObjective: 1
-    PunPunStealObjective: 1
     TropicoStealObjective: 1
 
 - type: weightedRandom
diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml
index d2a9690ae2..006c061666 100644
--- a/Resources/Prototypes/Objectives/stealTargetGroups.yml
+++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml
@@ -142,12 +142,7 @@
     sprite: Objects/Misc/id_cards.rsi
     state: default
 
-- type: stealTargetGroup
-  id: Cannabis
-  name: cannabis
-  sprite:
-    sprite: Objects/Specific/Hydroponics/cannabis.rsi
-    state: produce
+
 
 - type: stealTargetGroup
   id: LAMP
@@ -386,13 +381,6 @@
     sprite: Mobs/Animals/fox.rsi
     state: fox
 
-- type: stealTargetGroup
-  id: AnimalHamlet
-  name: Hamlet
-  sprite:
-    sprite: Mobs/Pets/hamlet.rsi
-    state: hamster-0
-
 - type: stealTargetGroup
   id: AnimalShiva
   name: Shiva
@@ -400,20 +388,6 @@
     sprite: Mobs/Pets/shiva.rsi
     state: shiva
 
-- type: stealTargetGroup
-  id: AnimalSmile
-  name: Smile
-  sprite:
-    sprite: Mobs/Aliens/slimes.rsi
-    state: rainbow_baby_slime
-
-- type: stealTargetGroup
-  id: AnimalPunPun
-  name: Pun Pun
-  sprite:
-    sprite: Mobs/Animals/monkey.rsi
-    state: monkey
-
 - type: stealTargetGroup
   id: AnimalTropico
   name: Tropico
diff --git a/Resources/Prototypes/Objectives/thief.yml b/Resources/Prototypes/Objectives/thief.yml
index 5ee8bd25d1..1815485097 100644
--- a/Resources/Prototypes/Objectives/thief.yml
+++ b/Resources/Prototypes/Objectives/thief.yml
@@ -142,20 +142,7 @@
   - type: Objective
     difficulty: 0.7
 
-- type: entity
-  noSpawn: true
-  parent: BaseThiefStealCollectionObjective
-  id: CannabisStealCollectionObjective
-  components:
-  - type: NotJobRequirement
-    job: Botanist
-  - type: StealCondition
-    stealGroup: Cannabis
-    minCollectionSize: 20
-    maxCollectionSize: 30
-    verifyMapExistence: false
-  - type: Objective
-    difficulty: 0.5
+
 
 - type: entity
   noSpawn: true
@@ -533,18 +520,6 @@
   - type: Objective
     difficulty: 2
 
-- type: entity
-  noSpawn: true
-  parent: BaseThiefStealAnimalObjective
-  id: HamletStealObjective
-  components:
-  - type: NotJobRequirement
-    job: Captain
-  - type: StealCondition
-    stealGroup: AnimalHamlet
-  - type: Objective
-    difficulty: 1
-
 - type: entity
   noSpawn: true
   parent: BaseThiefStealAnimalObjective
@@ -557,30 +532,6 @@
   - type: Objective
     difficulty: 2
 
-- type: entity
-  noSpawn: true
-  parent: BaseThiefStealAnimalObjective
-  id: SmileStealObjective
-  components:
-  - type: NotJobRequirement
-    job: Scientist
-  - type: StealCondition
-    stealGroup: AnimalSmile
-  - type: Objective
-    difficulty: 1
-
-- type: entity
-  noSpawn: true
-  parent: BaseThiefStealAnimalObjective
-  id: PunPunStealObjective
-  components:
-  - type: NotJobRequirement
-    job: Bartender
-  - type: StealCondition
-    stealGroup: AnimalPunPun
-  - type: Objective
-    difficulty: 2
-
 - type: entity
   noSpawn: true
   parent: BaseThiefStealAnimalObjective
diff --git a/Resources/Prototypes/Procedural/Themes/haunted.yml b/Resources/Prototypes/Procedural/Themes/haunted.yml
new file mode 100644
index 0000000000..9a69b4daa3
--- /dev/null
+++ b/Resources/Prototypes/Procedural/Themes/haunted.yml
@@ -0,0 +1,308 @@
+# Rooms
+# Large
+# - 17x5
+- type: dungeonRoom
+  id: Haunted17x5a
+  size: 17,5
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 0,0
+  tags:
+    - Haunted
+
+- type: dungeonRoom
+  id: Haunted17x5b
+  size: 17,5
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 18,0
+  tags:
+    - Haunted
+
+# - 7x7
+- type: dungeonRoom
+  id: Haunted7x7a
+  size: 7,7
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 0,42
+  tags:
+    - Haunted
+
+- type: dungeonRoom
+  id: Haunted7x7b
+  size: 7,7
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 8,42
+  tags:
+    - Haunted
+
+- type: dungeonRoom
+  id: Haunted7x7c
+  size: 7,7
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 16,42
+  tags:
+    - Haunted
+
+- type: dungeonRoom
+  id: Haunted7x7d
+  size: 7,7
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 24,42
+  tags:
+    - Haunted
+
+# Medium
+# - 11x5
+- type: dungeonRoom
+  id: Haunted11x5a
+  size: 11,5
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 0,6
+  tags:
+    - Haunted
+
+- type: dungeonRoom
+  id: Haunted11x5b
+  size: 11,5
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 12,6
+  tags:
+    - Haunted
+
+- type: dungeonRoom
+  id: Haunted11x5c
+  size: 11,5
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 24,6
+  tags:
+    - Haunted
+
+# - 7x5
+- type: dungeonRoom
+  id: Haunted7x5a
+  size: 7,5
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 0,12
+  tags:
+    - Haunted
+
+- type: dungeonRoom
+  id: Haunted7x5b
+  size: 7,5
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 8,12
+  tags:
+    - Haunted
+
+- type: dungeonRoom
+  id: Haunted7x5c
+  size: 7,5
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 16,12
+  tags:
+    - Haunted
+
+- type: dungeonRoom
+  id: Haunted7x5d
+  size: 7,5
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 24,12
+  tags:
+    - Haunted
+
+# - 13x3
+- type: dungeonRoom
+  id: Haunted13x3a
+  size: 13,3
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 0,30
+  tags:
+    - Haunted
+
+- type: dungeonRoom
+  id: Haunted13x3b
+  size: 13,3
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 14,30
+  tags:
+    - Haunted
+
+# - 11x3
+- type: dungeonRoom
+  id: Haunted11x3a
+  size: 11,3
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 0,34
+  tags:
+    - Haunted
+
+- type: dungeonRoom
+  id: Haunted11x3b
+  size: 11,3
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 12,34
+  tags:
+    - Haunted
+
+- type: dungeonRoom
+  id: Haunted11x3c
+  size: 11,3
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 24,34
+  tags:
+    - Haunted
+
+# - 7x3
+- type: dungeonRoom
+  id: Haunted7x3a
+  size: 7,3
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 0,38
+  tags:
+    - Haunted
+
+- type: dungeonRoom
+  id: Haunted7x3b
+  size: 7,3
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 8,38
+  tags:
+    - Haunted
+
+- type: dungeonRoom
+  id: Haunted7x3c
+  size: 7,3
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 16,38
+  tags:
+    - Haunted
+
+- type: dungeonRoom
+  id: Haunted7x3d
+  size: 7,3
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 24,38
+  tags:
+    - Haunted
+
+# Small
+# - 5x5
+- type: dungeonRoom
+  id: Haunted5x5a
+  size: 5,5
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 0,18
+  tags:
+    - Haunted
+
+- type: dungeonRoom
+  id: Haunted5x5b
+  size: 5,5
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 6,18
+  tags:
+    - Haunted
+
+- type: dungeonRoom
+  id: Haunted5x5c
+  size: 5,5
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 12,18
+  tags:
+    - Haunted
+
+- type: dungeonRoom
+  id: Haunted5x5d
+  size: 5,5
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 18,18
+  tags:
+    - Haunted
+
+- type: dungeonRoom
+  id: Haunted5x5e
+  size: 5,5
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 24,18
+  tags:
+    - Haunted
+
+- type: dungeonRoom
+  id: Haunted5x5f
+  size: 5,5
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 30,18
+  tags:
+    - Haunted
+
+# - 3x5
+- type: dungeonRoom
+  id: Haunted3x5a
+  size: 3,5
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 0,24
+  tags:
+    - Haunted
+
+- type: dungeonRoom
+  id: Haunted3x5b
+  size: 3,5
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 4,24
+  tags:
+    - Haunted
+
+- type: dungeonRoom
+  id: Haunted3x5c
+  size: 3,5
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 8,24
+  tags:
+    - Haunted
+
+- type: dungeonRoom
+  id: Haunted3x5d
+  size: 3,5
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 12,24
+  tags:
+    - Haunted
+
+- type: dungeonRoom
+  id: Haunted3x5e
+  size: 3,5
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 16,24
+  tags:
+    - Haunted
+
+- type: dungeonRoom
+  id: Haunted3x5f
+  size: 3,5
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 20,24
+  tags:
+    - Haunted
+
+- type: dungeonRoom
+  id: Haunted3x5g
+  size: 3,5
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 24,24
+  tags:
+    - Haunted
+
+- type: dungeonRoom
+  id: Haunted3x5h
+  size: 3,5
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 28,24
+  tags:
+    - Haunted
+
+- type: dungeonRoom
+  id: Haunted3x5i
+  size: 3,5
+  atlas: /Maps/Dungeon/haunted.yml
+  offset: 32,24
+  tags:
+    - Haunted
diff --git a/Resources/Prototypes/Procedural/dungeon_configs.yml b/Resources/Prototypes/Procedural/dungeon_configs.yml
index 49837507ae..9e8d3a4409 100644
--- a/Resources/Prototypes/Procedural/dungeon_configs.yml
+++ b/Resources/Prototypes/Procedural/dungeon_configs.yml
@@ -175,15 +175,15 @@
       - SpaceShip
       - Tall
   postGeneration:
-  
+
   - !type:CorridorPostGen
       tile: FloorCaveDrought
       width: 3
-      
+
   - !type:DungeonEntrancePostGen
       count: 5
       tile: FloorCaveDrought
-      entities: 
+      entities:
         - RandomWoodenWall
 
   - !type:RoomEntrancePostGen
@@ -195,12 +195,12 @@
       tile: FloorCaveDrought
       entities:
         - RandomWoodenWall
-      
+
   - !type:ExternalWindowPostGen
       tile: FloorCaveDrought
       entities:
         - RandomWoodenWall
-  
+
   - !type:WallMountPostGen
       tile: FloorCaveDrought
       spawns:
@@ -217,7 +217,7 @@
         - id: WallMining
           prob: 0.8
           orGroup: content
-          
+
   - !type:BoundaryWallPostGen
       tile: FloorCaveDrought
       wall: WallRock
@@ -225,13 +225,13 @@
 
   - !type:AutoCablingPostGen
       entity: Catwalk
-    
+
   - !type:JunctionPostGen
       tile: FloorCaveDrought
       width: 3
       entities:
         - RandomWoodenSupport
-  
+
   - !type:CornerClutterPostGen
       contents:
         - id: RandomStalagmiteOrCrystal
@@ -321,4 +321,41 @@
         SouthWest: BrickTileWhiteInnerSw
         SouthEast: BrickTileWhiteInnerSe
         NorthWest: BrickTileWhiteInnerNw
-        NorthEast: BrickTileWhiteInnerNe
\ No newline at end of file
+        NorthEast: BrickTileWhiteInnerNe
+
+# todo: Add a biome dungeon generator
+# Add corridor first gens that place rooms on top
+# Add a worm corridor gen (place subsequent corridors somewhere randomly along the path)
+# Place room entrances on ends of corridors touching a tile
+# Remove all room tiles from corridors
+# Fix paths up and try to reconnect all corridor tiles
+# Add a postgen step to spread rooms out, though it shouldn't spread into corridor exteriors
+
+- type: dungeonConfig
+  id: Haunted
+  generator: !type:PrefabDunGen
+    tile: FloorCaveDrought
+    roomWhitelist:
+    - Mineshaft
+    presets:
+    - Bucket
+    - Wow
+    - SpaceShip
+    - Tall
+  postGeneration:
+    - !type:WormCorridorPostGen
+      width: 3
+      tile: FloorCaveDrought
+
+    - !type:CorridorClutterPostGen
+      contents:
+      - id: FloraStalagmite1
+      - id: FloraStalagmite2
+      - id: FloraStalagmite3
+      - id: FloraStalagmite4
+      - id: FloraStalagmite5
+      - id: FloraStalagmite6
+
+    - !type:BoundaryWallPostGen
+      tile: FloorCaveDrought
+      wall: WallRock
diff --git a/Resources/Prototypes/Procedural/salvage_mods.yml b/Resources/Prototypes/Procedural/salvage_mods.yml
index 4da7a3bf0f..6c2bf67862 100644
--- a/Resources/Prototypes/Procedural/salvage_mods.yml
+++ b/Resources/Prototypes/Procedural/salvage_mods.yml
@@ -241,4 +241,10 @@
   id: SnowyLabs
   proto: SnowyLabs
   biomes:
-    - Snow
\ No newline at end of file
+    - Snow
+    
+- type: salvageDungeonMod
+  id: Haunted
+  proto: Haunted
+  biomes:
+    - Caves
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
index bcbd877ea8..63ae5b25d5 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
@@ -162,6 +162,10 @@
     Poison:
       effects:
       - !type:HealthChange
+        conditions:
+        - !type:OrganType
+          type: Slime
+          shouldHave: false
         damage:
           types:
             Poison: 1
diff --git a/Resources/Prototypes/Reagents/biological.yml b/Resources/Prototypes/Reagents/biological.yml
index af6f2557ba..c24c073f03 100644
--- a/Resources/Prototypes/Reagents/biological.yml
+++ b/Resources/Prototypes/Reagents/biological.yml
@@ -201,3 +201,24 @@
     collection: FootstepBlood
     params:
       volume: 6
+
+- type: reagent
+  id: GreyMatter
+  name: reagent-name-grey-matter
+  group: Biological
+  desc: reagent-desc-grey-matter
+  physicalDesc: reagent-physical-desc-neural
+  flavor: mindful
+  color: "#C584B8"
+  slippery: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateHunger
+        factor: 1.5
+    Poison:
+      effects:
+      - !type:HealthChange
+        damage:
+          types:
+            Cellular: 2
diff --git a/Resources/Prototypes/Reagents/botany.yml b/Resources/Prototypes/Reagents/botany.yml
index f6c55cf394..a03c3826a4 100644
--- a/Resources/Prototypes/Reagents/botany.yml
+++ b/Resources/Prototypes/Reagents/botany.yml
@@ -143,7 +143,7 @@
         damage:
           types:
             Asphyxiation: 1
-            Burn: 2
+            Heat: 2
             Poison: 1
     Medicine:
       effects:
diff --git a/Resources/Prototypes/Reagents/fun.yml b/Resources/Prototypes/Reagents/fun.yml
index 9597627e87..befa8d8296 100644
--- a/Resources/Prototypes/Reagents/fun.yml
+++ b/Resources/Prototypes/Reagents/fun.yml
@@ -249,7 +249,7 @@
         damage:
           types:
              Cold: 0.01 # slightly nips directly, other cold damage comes from the temp change
-             Burn: -3 # ghetto burn chem. i don't think anyone would use this intentionally but it's funny
+             Heat: -3 # ghetto burn chem. i don't think anyone would use this intentionally but it's funny
       - !type:PopupMessage
         conditions:
         - !type:ReagentThreshold
diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml
index c0491716d7..a5b9a3e9bc 100644
--- a/Resources/Prototypes/Reagents/toxins.yml
+++ b/Resources/Prototypes/Reagents/toxins.yml
@@ -460,6 +460,7 @@
   physicalDesc: reagent-physical-desc-necrotic
   flavor: bitter
   color: "#7e916e"
+  worksOnTheDead: true
   metabolisms:
     Medicine:
       effects:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/ducky_slippers.yml b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/ducky_slippers.yml
new file mode 100644
index 0000000000..e017096fa9
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/ducky_slippers.yml
@@ -0,0 +1,22 @@
+- type: constructionGraph
+  id: ClothingShoeSlippersDuck
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: shoes
+          steps:
+            - tag: ToyRubberDuck
+              name: a rubber ducky
+              icon:
+                sprite: Objects/Fun/ducky.rsi
+                state: icon
+              doAfter: 1
+            - tag: ToyRubberDuck
+              name: a rubber ducky
+              icon:
+                sprite: Objects/Fun/ducky.rsi
+                state: icon
+              doAfter: 1
+    - node: shoes
+      entity: ClothingShoeSlippersDuck
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/food/egg.yml b/Resources/Prototypes/Recipes/Construction/Graphs/food/egg.yml
index f5eea53bcc..3c3bca2585 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/food/egg.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/food/egg.yml
@@ -15,7 +15,8 @@
       completed:
       - !type:DamageEntity
         damage:
-          Blunt: 10
+          types:
+            Blunt: 10
       steps:
       # egg explodes some time after the water in it boils and increases pressure, guessing ~110C
       - minTemperature: 383
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml
index f859daabc9..c587e47efb 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: chairWoodBench
+          steps:
+            - material: WoodPlank
+              amount: 4
+              doAfter: 2
         - to: redComfBench
           steps:
             - material: Steel
@@ -226,6 +231,18 @@
             - tool: Screwing
               doAfter: 1
 
+    - node: chairWoodBench
+      entity: WoodenBench
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: MaterialWoodPlank1
+              amount: 4
+          steps:
+            - tool: Screwing
+              doAfter: 2
+
     - node: redComfBench
       entity: BenchRedComfy
       edges:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/fence_wood.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/fence_wood.yml
new file mode 100644
index 0000000000..081328f161
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/fence_wood.yml
@@ -0,0 +1,176 @@
+- type: constructionGraph
+  id: FenceWood
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: straight
+          steps:
+            - material: WoodPlank
+              amount: 2
+              doAfter: 2.0
+        - to: end
+          steps:
+            - material: WoodPlank
+              amount: 2
+              doAfter: 2.0
+        - to: corner
+          steps:
+            - material: WoodPlank
+              amount: 2
+              doAfter: 2.0
+        - to: tjunction
+          steps:
+            - material: WoodPlank
+              amount: 2
+              doAfter: 2.0
+        - to: gate
+          steps:
+            - material: WoodPlank
+              amount: 2
+              doAfter: 2.0
+        - to: straight_small
+          steps:
+            - material: WoodPlank
+              amount: 2
+              doAfter: 2.0
+        - to: end_small
+          steps:
+            - material: WoodPlank
+              amount: 2
+              doAfter: 2.0
+        - to: corner_small
+          steps:
+            - material: WoodPlank
+              amount: 2
+              doAfter: 2.0
+        - to: tjunction_small
+          steps:
+            - material: WoodPlank
+              amount: 2
+              doAfter: 2.0
+        - to: gate_small
+          steps:
+            - material: WoodPlank
+              amount: 2
+              doAfter: 2.0
+    - node: straight
+      entity: FenceWoodHighStraight
+      edges:
+        - to: start
+          steps:
+            - tool: Prying
+              doAfter: 5.0
+          completed:
+            - !type:SpawnPrototype
+              prototype: MaterialWoodPlank1
+              amount: 2
+            - !type:DeleteEntity {}
+    - node: end
+      entity: FenceWoodHighEnd
+      edges:
+        - to: start
+          steps:
+            - tool: Prying
+              doAfter: 2.5
+          completed:
+            - !type:SpawnPrototype
+              prototype: MaterialWoodPlank1
+              amount: 2
+            - !type:DeleteEntity {}
+    - node: corner
+      entity: FenceWoodHighCorner
+      edges:
+        - to: start
+          steps:
+            - tool: Prying
+              doAfter: 5.0
+          completed:
+            - !type:SpawnPrototype
+              prototype: MaterialWoodPlank1
+              amount: 2
+            - !type:DeleteEntity {}
+    - node: tjunction
+      entity: FenceWoodHighTJunction
+      edges:
+        - to: start
+          steps:
+            - tool: Prying
+              doAfter: 5.0
+          completed:
+            - !type:SpawnPrototype
+              prototype: MaterialWoodPlank1
+              amount: 2
+            - !type:DeleteEntity {}
+    - node: gate
+      entity: FenceWoodHighGate
+      edges:
+        - to: start
+          steps:
+            - tool: Prying
+              doAfter: 5.0
+          completed:
+            - !type:SpawnPrototype
+              prototype: MaterialWoodPlank1
+              amount: 2
+            - !type:DeleteEntity {}
+    - node: straight_small
+      entity: FenceWoodSmallStraight
+      edges:
+        - to: start
+          steps:
+            - tool: Prying
+              doAfter: 2.5
+          completed:
+            - !type:SpawnPrototype
+              prototype: MaterialWoodPlank1
+              amount: 1
+            - !type:DeleteEntity {}
+    - node: end_small
+      entity: FenceWoodSmallEnd
+      edges:
+        - to: start
+          steps:
+            - tool: Prying
+              doAfter: 1.25
+          completed:
+            - !type:SpawnPrototype
+              prototype: MaterialWoodPlank1
+              amount: 1
+            - !type:DeleteEntity {}
+    - node: corner_small
+      entity: FenceWoodSmallCorner
+      edges:
+        - to: start
+          steps:
+            - tool: Prying
+              doAfter: 2.5
+          completed:
+            - !type:SpawnPrototype
+              prototype: MaterialWoodPlank1
+              amount: 1
+            - !type:DeleteEntity {}
+    - node: tjunction_small
+      entity: FenceWoodSmallTJunction
+      edges:
+        - to: start
+          steps:
+            - tool: Prying
+              doAfter: 2.5
+          completed:
+            - !type:SpawnPrototype
+              prototype: MaterialWoodPlank1
+              amount: 1
+            - !type:DeleteEntity {}
+    - node: gate_small
+      entity: FenceWoodSmallGate
+      edges:
+        - to: start
+          steps:
+            - tool: Prying
+              doAfter: 2.5
+          completed:
+            - !type:SpawnPrototype
+              prototype: MaterialWoodPlank1
+              amount: 1
+            - !type:DeleteEntity {}
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Construction/clothing.yml b/Resources/Prototypes/Recipes/Construction/clothing.yml
index 4fe2c474bb..f1eb270af7 100644
--- a/Resources/Prototypes/Recipes/Construction/clothing.yml
+++ b/Resources/Prototypes/Recipes/Construction/clothing.yml
@@ -85,3 +85,14 @@
   description: Two huds joined by arms
   icon: { sprite: Clothing/Eyes/Hud/medsec.rsi, state: icon }
   objectType: Item
+
+- type: construction
+  name: ducky slippers
+  id: ClothingShoeSlippersDuck
+  graph: ClothingShoeSlippersDuck
+  startNode: start
+  targetNode: shoes
+  category: construction-category-clothing
+  description: Comfy, yet haunted by the ghosts of ducks you fed bread to as a child.
+  icon: { sprite: Clothing/Shoes/Misc/duck-slippers.rsi, state: icon }
+  objectType: Item
diff --git a/Resources/Prototypes/Recipes/Construction/furniture.yml b/Resources/Prototypes/Recipes/Construction/furniture.yml
index 4e05a4dfb8..1a17b2f856 100644
--- a/Resources/Prototypes/Recipes/Construction/furniture.yml
+++ b/Resources/Prototypes/Recipes/Construction/furniture.yml
@@ -220,6 +220,23 @@
   conditions:
     - !type:TileNotBlocked
 
+- type: construction
+  name: wooden bench
+  id: ChairWoodBench
+  graph: Seat
+  startNode: start
+  targetNode: chairWoodBench
+  category: construction-category-furniture
+  description: Did you get a splinter? Well, at least it’s eco friendly.
+  icon:
+    sprite: Structures/Furniture/chairs.rsi
+    state: wooden-bench
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
 - type: construction
   name: comfortable red bench
   id: RedComfBench
diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml
index efc4236389..32117812ee 100644
--- a/Resources/Prototypes/Recipes/Construction/structures.yml
+++ b/Resources/Prototypes/Recipes/Construction/structures.yml
@@ -996,6 +996,179 @@
   conditions:
   - !type:TileNotBlocked
 
+#Wooden fence high
+- type: construction
+  name: wooden high fence
+  id: FenceWood
+  graph: FenceWood
+  startNode: start
+  targetNode: straight
+  category: construction-category-structures
+  description: Part of a wooden fence meant to cordon off areas.
+  icon:
+    sprite: Structures/Walls/wooden_fence.rsi
+    state: straight
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked
+
+- type: construction
+  name: wooden high fence end
+  id: FenceWoodEnd
+  graph: FenceWood
+  startNode: start
+  targetNode: end
+  category: construction-category-structures
+  description: Part of a wooden fence meant to cordon off areas.
+  icon:
+    sprite: Structures/Walls/wooden_fence.rsi
+    state: end
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked
+
+- type: construction
+  name: wooden high fence corner
+  id: FenceWoodCorner
+  graph: FenceWood
+  startNode: start
+  targetNode: corner
+  category: construction-category-structures
+  description: Part of a wooden fence meant to cordon off areas.
+  icon:
+    sprite: Structures/Walls/wooden_fence.rsi
+    state: corner
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked
+
+- type: construction
+  name: wooden high fence t-junction
+  id: FenceWoodTJunction
+  graph: FenceWood
+  startNode: start
+  targetNode: tjunction
+  category: construction-category-structures
+  description: Part of a wooden fence meant to cordon off areas.
+  icon:
+    sprite: Structures/Walls/wooden_fence.rsi
+    state: tjunction
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked
+
+- type: construction
+  name: wooden high fence gate
+  id: FenceWoodGate
+  graph: FenceWood
+  startNode: start
+  targetNode: gate
+  category: construction-category-structures
+  description: Part of a wooden fence meant to cordon off areas.
+  icon:
+    sprite: Structures/Walls/wooden_fence.rsi
+    state: door_closed
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked
+
+#Wooden fence small
+- type: construction
+  name: wooden small fence
+  id: FenceWoodSmall
+  graph: FenceWood
+  startNode: start
+  targetNode: straight_small
+  category: construction-category-structures
+  description: Part of a wooden fence meant to cordon off areas.
+  icon:
+    sprite: Structures/Walls/wooden_fence.rsi
+    state: straight_small
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked
+
+- type: construction
+  name: wooden small fence end
+  id: FenceWoodEndSmall
+  graph: FenceWood
+  startNode: start
+  targetNode: end_small
+  category: construction-category-structures
+  description: Part of a wooden fence meant to cordon off areas.
+  icon:
+    sprite: Structures/Walls/wooden_fence.rsi
+    state: end_small
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked
+
+- type: construction
+  name: wooden small fence corner
+  id: FenceWoodCornerSmall
+  graph: FenceWood
+  startNode: start
+  targetNode: corner_small
+  category: construction-category-structures
+  description: Part of a wooden fence meant to cordon off areas.
+  icon:
+    sprite: Structures/Walls/wooden_fence.rsi
+    state: corner_small
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked
+
+- type: construction
+  name: wooden small fence t-junction
+  id: FenceWoodTJunctionSmall
+  graph: FenceWood
+  startNode: start
+  targetNode: tjunction_small
+  category: construction-category-structures
+  description: Part of a wooden fence meant to cordon off areas.
+  icon:
+    sprite: Structures/Walls/wooden_fence.rsi
+    state: tjunction_small
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked
+
+- type: construction
+  name: wooden small fence gate
+  id: FenceWoodGateSmall
+  graph: FenceWood
+  startNode: start
+  targetNode: gate_small
+  category: construction-category-structures
+  description: Part of a wooden fence meant to cordon off areas.
+  icon:
+    sprite: Structures/Walls/wooden_fence.rsi
+    state: door_closed_small
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+  - !type:TileNotBlocked
+
+#Airlocks
 - type: construction
   name: airlock
   id: Airlock
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun_shell.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun_shell.yml
new file mode 100644
index 0000000000..9f666dd61c
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun_shell.yml
@@ -0,0 +1,76 @@
+- type: constructionGraph
+  id: ImprovisedShotgunShellGraph
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: shell
+          steps:
+            - material: Steel
+              amount: 1
+              doAfter: 0.5 
+            - material: Plastic
+              amount: 1
+              doAfter: 0.5 
+            - tag: GlassShard
+              name: glass shard
+              icon:
+                sprite: Objects/Materials/Shards/shard.rsi
+                state: shard1
+              doAfter: 0.5 
+            - tag: GlassShard
+              name: glass shard
+              icon:
+                sprite: Objects/Materials/Shards/shard.rsi
+                state: shard2
+              doAfter: 0.5 
+            - tag: GlassShard
+              name: glass shard
+              icon:
+                sprite: Objects/Materials/Shards/shard.rsi
+                state: shard1
+              doAfter: 0.5 
+            - tag: GlassShard
+              name: glass shard
+              icon:
+                sprite: Objects/Materials/Shards/shard.rsi
+                state: shard3
+              doAfter: 0.5 
+            - tag: Matchstick
+              name: match stick
+              icon:
+                sprite: Objects/Tools/matches.rsi
+                state: match_unlit
+              doAfter: 0.5 
+            - tag: Matchstick
+              name: match stick
+              icon:
+                sprite: Objects/Tools/matches.rsi
+                state: match_unlit
+              doAfter: 0.5 
+            - tag: Matchstick
+              name: match stick
+              icon:
+                sprite: Objects/Tools/matches.rsi
+                state: match_unlit
+              doAfter: 0.5 
+            - tag: Matchstick
+              name: match stick
+              icon:
+                sprite: Objects/Tools/matches.rsi
+                state: match_unlit
+              doAfter: 0.5 
+            - tag: Matchstick
+              name: match stick
+              icon:
+                sprite: Objects/Tools/matches.rsi
+                state: match_unlit
+              doAfter: 0.5 
+            - tag: Matchstick
+              name: match stick
+              icon:
+                sprite: Objects/Tools/matches.rsi
+                state: match_unlit
+              doAfter: 0.5
+    - node: shell
+      entity: ShellShotgunImprovised
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml
index 5b0cc1f9a2..e72c56ff44 100644
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml
@@ -25,3 +25,66 @@
         amount: 4
       - !type:EmptyAllContainers
       - !type:DeleteEntity
+
+- type: constructionGraph
+  id: ClosetSteelSecure
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: done
+      steps:
+      - material: Steel
+        amount: 4
+      - material: Cable
+        amount: 2
+        doAfter: 5
+  - node: done
+    entity: LockerSteel
+    edges:
+    - to: start
+      steps:
+      - tool: Screwing
+        doAfter: 5
+      conditions:
+      - !type:StorageWelded
+        welded: false
+      - !type:Locked
+        locked: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 4
+      - !type:SpawnPrototype
+        prototype: CableApcStack1
+        amount: 2
+      - !type:EmptyAllContainers
+      - !type:DeleteEntity
+
+- type: constructionGraph
+  id: ClosetWall
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: done
+      steps:
+      - material: Steel
+        amount: 4
+        doAfter: 5
+  - node: done
+    entity: ClosetWall
+    edges:
+    - to: start
+      steps:
+      - tool: Screwing
+        doAfter: 5
+      conditions:
+      - !type:StorageWelded
+        welded: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 4
+      - !type:EmptyAllContainers
+      - !type:DeleteEntity
diff --git a/Resources/Prototypes/Recipes/Crafting/improvised.yml b/Resources/Prototypes/Recipes/Crafting/improvised.yml
index 12fbe97e28..23b9eb2c92 100644
--- a/Resources/Prototypes/Recipes/Crafting/improvised.yml
+++ b/Resources/Prototypes/Recipes/Crafting/improvised.yml
@@ -163,6 +163,19 @@
     sprite: Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi
     state: icon
 
+- type: construction
+  name: improvised shotgun shell
+  id: ShellShotgunImprovised
+  graph: ImprovisedShotgunShellGraph
+  startNode: start
+  targetNode: shell
+  category: construction-category-weapons
+  objectType: Item
+  description: A homemade shotgun shell that shoots painful glass shrapnel. The spread is so wide that it couldn't hit the broad side of a Barn
+  icon:
+    sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi
+    state: improvised
+
 - type: construction
   name: rifle stock
   id: riflestock
diff --git a/Resources/Prototypes/Recipes/Crafting/tallbox.yml b/Resources/Prototypes/Recipes/Crafting/tallbox.yml
index 09469093f7..21a7ec8225 100644
--- a/Resources/Prototypes/Recipes/Crafting/tallbox.yml
+++ b/Resources/Prototypes/Recipes/Crafting/tallbox.yml
@@ -8,3 +8,30 @@
   description: A tall steel box that cannot be locked.
   icon: { sprite: Structures/Storage/closet.rsi, state: generic_icon }
   objectType: Structure
+
+- type: construction
+  id: ClosetSteelSecure
+  name: secure closet
+  graph: ClosetSteelSecure
+  startNode: start
+  targetNode: done
+  category: construction-category-storage
+  description: A tall steel box that can be locked.
+  icon: { sprite: Structures/Storage/closet.rsi, state: secure_icon }
+  objectType: Structure
+
+- type: construction
+  id: ClosetWall
+  name: wall closet
+  graph: ClosetWall
+  startNode: start
+  targetNode: done
+  category: construction-category-storage
+  description: A standard-issue Nanotrasen storage unit, now on walls.
+  icon: { sprite: Structures/Storage/wall_locker.rsi, state: generic_icon }
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canRotate: true
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml
index 626ec82a91..19b2fbb883 100644
--- a/Resources/Prototypes/Recipes/Lathes/clothing.yml
+++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml
@@ -245,6 +245,20 @@
   materials:
     Cloth: 300
 
+- type: latheRecipe
+  id: ClothingUniformJumpsuitSeniorEngineer
+  result: ClothingUniformJumpsuitSeniorEngineer
+  completetime: 4
+  materials:
+    Cloth: 300
+
+- type: latheRecipe
+  id: ClothingUniformJumpskirtSeniorEngineer
+  result: ClothingUniformJumpskirtSeniorEngineer
+  completetime: 4
+  materials:
+    Cloth: 300
+
 - type: latheRecipe
   id: ClothingUniformJumpsuitHoP
   result: ClothingUniformJumpsuitHoP
@@ -404,6 +418,20 @@
   materials:
     Cloth: 300
 
+- type: latheRecipe
+  id: ClothingUniformJumpsuitSeniorPhysician
+  result: ClothingUniformJumpsuitSeniorPhysician
+  completetime: 4
+  materials:
+    Cloth: 300
+
+- type: latheRecipe
+  id: ClothingUniformJumpskirtSeniorPhysician
+  result: ClothingUniformJumpskirtSeniorPhysician
+  completetime: 4
+  materials:
+    Cloth: 300
+
 - type: latheRecipe
   id: ClothingUniformJumpsuitMime
   result: ClothingUniformJumpsuitMime
@@ -453,6 +481,20 @@
   materials:
     Cloth: 300
 
+- type: latheRecipe
+  id: ClothingUniformJumpsuitSeniorOfficer
+  result: ClothingUniformJumpsuitSeniorOfficer
+  completetime: 4
+  materials:
+    Cloth: 300
+
+- type: latheRecipe
+  id: ClothingUniformJumpskirtSeniorOfficer
+  result: ClothingUniformJumpskirtSeniorOfficer
+  completetime: 4
+  materials:
+    Cloth: 300
+
 - type: latheRecipe
   id: ClothingUniformJumpsuitPrisoner
   result: ClothingUniformJumpsuitPrisoner
@@ -532,6 +574,20 @@
   materials:
     Cloth: 300
 
+- type: latheRecipe
+  id: ClothingUniformJumpsuitSeniorResearcher
+  result: ClothingUniformJumpsuitSeniorResearcher
+  completetime: 4
+  materials:
+    Cloth: 300
+
+- type: latheRecipe
+  id: ClothingUniformJumpskirtSeniorResearcher
+  result: ClothingUniformJumpskirtSeniorResearcher
+  completetime: 4
+  materials:
+    Cloth: 300
+
 - type: latheRecipe
   id: ClothingUniformJumpsuitSec
   result: ClothingUniformJumpsuitSec
diff --git a/Resources/Prototypes/Recipes/Lathes/janitorial.yml b/Resources/Prototypes/Recipes/Lathes/janitorial.yml
index 2fd153852f..a3b968a331 100644
--- a/Resources/Prototypes/Recipes/Lathes/janitorial.yml
+++ b/Resources/Prototypes/Recipes/Lathes/janitorial.yml
@@ -66,7 +66,7 @@
 
 - type: latheRecipe
   id: Holoprojector
-  result: Holoprojector
+  result: HoloprojectorEmpty
   completetime: 3
   materials:
     Plastic: 250
diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml
index 1334788376..ab13dc4573 100644
--- a/Resources/Prototypes/Recipes/Lathes/misc.yml
+++ b/Resources/Prototypes/Recipes/Lathes/misc.yml
@@ -150,6 +150,20 @@
   materials:
     Plastic: 100
 
+- type: latheRecipe
+  id: FauxTileMowedAstroGrass
+  result: FloorTileItemMowedAstroGrass
+  completetime: 1
+  materials:
+    Plastic: 100
+
+- type: latheRecipe
+  id: FauxTileJungleAstroGrass
+  result: FloorTileItemJungleAstroGrass
+  completetime: 1
+  materials:
+    Plastic: 100
+
 - type: latheRecipe
   id: FauxTileAstroIce
   result: FloorTileItemAstroIce
@@ -157,6 +171,13 @@
   materials:
     Plastic: 100
 
+- type: latheRecipe
+  id: FauxTileAstroSnow
+  result: FloorTileItemAstroSnow
+  completetime: 1
+  materials:
+    Plastic: 100
+
 - type: latheRecipe
   id: FloorGreenCircuit
   result: FloorTileItemGCircuit4
diff --git a/Resources/Prototypes/Recipes/Lathes/tools.yml b/Resources/Prototypes/Recipes/Lathes/tools.yml
index 2b335ae6dc..03d8a8511e 100644
--- a/Resources/Prototypes/Recipes/Lathes/tools.yml
+++ b/Resources/Prototypes/Recipes/Lathes/tools.yml
@@ -189,14 +189,13 @@
 
 - type: latheRecipe
   id: HolofanProjector
-  result: HolofanProjector
+  result: HolofanProjectorEmpty
   category: Tools
   completetime: 8
-  materials: # Inherited materials and time from PowerCellMedium recipe
-    Steel: 600
-    Glass: 350
-    Plastic: 150
-    Gold: 10
+  materials:
+    Steel: 300
+    Glass: 50
+    Plastic: 50
 
 - type: latheRecipe
   id: RPED
@@ -239,7 +238,7 @@
 
 - type: latheRecipe
   id: HoloprojectorField
-  result: HoloprojectorField
+  result: HoloprojectorFieldEmpty
   category: Tools
   completetime: 3
   materials:
diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml
index e5afdbd6de..7608369b2c 100644
--- a/Resources/Prototypes/Recipes/Reactions/drinks.yml
+++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml
@@ -454,11 +454,11 @@
   id: IrishCoffee
   reactants:
     Coffee:
-      amount: 2
+      amount: 1
     IrishCream:
-      amount: 2
+      amount: 1
   products:
-    IrishCoffee: 4
+    IrishCoffee: 2
 
 - type: reaction
   id: IrishCream
diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
index c3f83e0fc5..61f95894ee 100644
--- a/Resources/Prototypes/Research/civilianservices.yml
+++ b/Resources/Prototypes/Research/civilianservices.yml
@@ -110,7 +110,10 @@
   cost: 5000
   recipeUnlocks:
   - FauxTileAstroGrass
+  - FauxTileMowedAstroGrass
+  - FauxTileJungleAstroGrass
   - FauxTileAstroIce
+  - FauxTileAstroSnow
 
 - type: technology
   id: BiochemicalStasis
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
index bc3b1a0434..8e7f92ad7f 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
@@ -47,5 +47,7 @@
   - type: InstantAction
     priority: -1
     useDelay: 30
-    icon: Structures/Walls/solid.rsi/full.png
+    icon:
+      sprite: Structures/Walls/solid.rsi
+      state: full
     event: !type:InvisibleWallActionEvent
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
index ab82fd7517..d291979803 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
@@ -44,7 +44,6 @@
 - type: startingGear
   id: ChiefEngineerGear
   equipment:
-    head: ClothingHeadHatHardhatWhite
     jumpsuit: ClothingUniformJumpsuitChiefEngineer
     back: ClothingBackpackChiefEngineerFilled
     shoes: ClothingShoesColorBrown
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
index f7ee9e9e4d..0af5013d87 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
@@ -21,11 +21,9 @@
 - type: startingGear
   id: StationEngineerGear
   equipment:
-    head: ClothingHeadHatHardhatYellow
     jumpsuit: ClothingUniformJumpsuitEngineering
     back: ClothingBackpackEngineeringFilled
     shoes: ClothingShoesBootsWork
-    outerClothing: ClothingOuterVestHazard
     id: EngineerPDA
     eyes: ClothingEyesGlassesMeson
     belt: ClothingBeltUtilityEngineering
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
index 6fcee832db..dca50cc59c 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
@@ -22,11 +22,9 @@
     jumpsuit: ClothingUniformJumpsuitChemistry
     back: ClothingBackpackChemistryFilled
     shoes: ClothingShoesColorWhite
-    outerClothing: ClothingOuterCoatLabChem
     id: ChemistryPDA
     ears: ClothingHeadsetMedical
     belt: ChemBag
-    pocket1: HandLabeler
     # the purple glasses?
   innerClothingSkirt: ClothingUniformJumpskirtChemistry
   satchel: ClothingBackpackSatchelChemistryFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
index ec8ae30661..4f7e06ea67 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
@@ -46,7 +46,6 @@
     jumpsuit: ClothingUniformJumpsuitCMO
     back: ClothingBackpackCMOFilled
     shoes: ClothingShoesColorBrown
-    outerClothing: ClothingOuterCoatLabCmo
     id: CMOPDA
     ears: ClothingHeadsetCMO
     belt: ClothingBeltMedicalFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
index 4fdf6bd2c9..8b027a40de 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
@@ -23,7 +23,6 @@
     jumpsuit: ClothingUniformJumpsuitMedicalDoctor
     back: ClothingBackpackMedicalFilled
     shoes: ClothingShoesColorWhite
-    outerClothing: ClothingOuterCoatLab
     id: MedicalPDA
     ears: ClothingHeadsetMedical
     belt: ClothingBeltMedicalFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
index 32ed405906..a25b2a4bf9 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -43,8 +43,6 @@
     jumpsuit: ClothingUniformJumpsuitResearchDirector
     back: ClothingBackpackResearchDirectorFilled
     shoes: ClothingShoesColorBrown
-    head: ClothingHeadHoodMysta # DeltaV - Mystagogue new hat
-    outerClothing: ClothingOuterCoatRndMysta # DeltaV - Mystagogue new coat
     id: RnDPDA
     ears: ClothingHeadsetRD
     belt: BibleMystagogue # Nyanotrasen - Mystagogue book for their Ifrit
diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
index 832dd5ab79..128b365f37 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -30,6 +30,7 @@
   - Service
   - External
   - Detective
+  - Corpsman # DeltaV - added Corpsman access
   - Cryogenics
   special:
   - !type:AddImplantSpecial
@@ -48,9 +49,7 @@
     jumpsuit: ClothingUniformJumpsuitHoS
     back: ClothingBackpackHOSFilled
     shoes: ClothingShoesBootsCombatFilled
-    outerClothing: ClothingOuterCoatHoSTrench
     eyes: ClothingEyesGlassesSunglasses
-    head: ClothingHeadHatBeretHoS
     id: HoSPDA
     gloves: ClothingHandsGlovesCombat
     ears: ClothingHeadsetAltSecurity
diff --git a/Resources/Prototypes/SoundCollections/NukeMusic.yml b/Resources/Prototypes/SoundCollections/NukeMusic.yml
index 3d33fadc12..51782d8bd5 100644
--- a/Resources/Prototypes/SoundCollections/NukeMusic.yml
+++ b/Resources/Prototypes/SoundCollections/NukeMusic.yml
@@ -3,3 +3,4 @@
   files:
     - /Audio/StationEvents/running_out.ogg
     - /Audio/StationEvents/countdown.ogg
+    - /Audio/StationEvents/clearly_nuclear.ogg
\ No newline at end of file
diff --git a/Resources/Prototypes/SoundCollections/church_bell.yml b/Resources/Prototypes/SoundCollections/church_bell.yml
new file mode 100644
index 0000000000..909bb9f4c4
--- /dev/null
+++ b/Resources/Prototypes/SoundCollections/church_bell.yml
@@ -0,0 +1,7 @@
+- type: soundCollection
+  id: ChurchBell
+  files:
+    - /Audio/Effects/church_bell1.ogg
+    - /Audio/Effects/church_bell2.ogg
+    - /Audio/Effects/church_bell3.ogg
+    - /Audio/Effects/church_bell4.ogg
diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
index b469f55c59..c5e37013b8 100644
--- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml
+++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
@@ -475,6 +475,20 @@
   maxCount: 30
   itemSize: 5
 
+- type: stack
+  id: FloorTileMowedAstroGrass
+  name: mowed astro-grass floor
+  spawn: FloorTileItemMowedAstroGrass
+  maxCount: 30
+  itemSize: 5
+
+- type: stack
+  id: FloorTileJungleAstroGrass
+  name: jungle astro-grass floor
+  spawn: FloorTileItemJungleAstroGrass
+  maxCount: 30
+  itemSize: 5
+
 - type: stack
   id: FloorTileAstroIce
   name: astro-ice floor
@@ -482,6 +496,13 @@
   maxCount: 30
   itemSize: 5
 
+- type: stack
+  id: FloorTileAstroSnow
+  name: astro-snow floor
+  spawn: FloorTileItemAstroSnow
+  maxCount: 30
+  itemSize: 5
+
 - type: stack
   id: FloorTileWoodLarge
   name: large wood floor
diff --git a/Resources/Prototypes/StatusEffects/health.yml b/Resources/Prototypes/StatusEffects/health.yml
index 0a1df020c0..12c16e57f0 100644
--- a/Resources/Prototypes/StatusEffects/health.yml
+++ b/Resources/Prototypes/StatusEffects/health.yml
@@ -4,4 +4,29 @@
   icon:
     sprite: /Textures/Interface/Misc/health_icons.rsi
     state: Fine
-  locationPreference: Right
\ No newline at end of file
+  locationPreference: Right
+
+- type: statusIcon
+  id: HealthIconCritical
+  priority: 1
+  icon:
+    sprite: /Textures/Interface/Misc/health_icons.rsi
+    state: Critical
+  locationPreference: Right
+
+- type: statusIcon
+  id: HealthIconDead
+  priority: 1
+  icon:
+    sprite: /Textures/Interface/Misc/health_icons.rsi
+    state: Dead
+  locationPreference: Right
+
+- type: statusIcon
+  id: HealthIconRotting
+  priority: 1
+  icon:
+    sprite: /Textures/Interface/Misc/health_icons.rsi
+    state: Rotting
+  locationPreference: Right
+
diff --git a/Resources/Prototypes/StatusEffects/security.yml b/Resources/Prototypes/StatusEffects/security.yml
new file mode 100644
index 0000000000..aeb2c1e9d5
--- /dev/null
+++ b/Resources/Prototypes/StatusEffects/security.yml
@@ -0,0 +1,40 @@
+- type: statusIcon
+  id: SecurityIcon
+  abstract: true
+  priority: 1
+  locationPreference: Left
+
+- type: statusIcon
+  parent: SecurityIcon
+  id: SecurityIconDischarged
+  icon:
+    sprite: Interface/Misc/security_icons.rsi
+    state: hud_discharged
+
+- type: statusIcon
+  parent: SecurityIcon
+  id: SecurityIconIncarcerated
+  icon:
+    sprite: Interface/Misc/security_icons.rsi
+    state: hud_incarcerated
+
+- type: statusIcon
+  parent: SecurityIcon
+  id: SecurityIconParoled
+  icon:
+    sprite: Interface/Misc/security_icons.rsi
+    state: hud_paroled
+
+- type: statusIcon
+  parent: SecurityIcon
+  id: SecurityIconSuspected
+  icon:
+    sprite: Interface/Misc/security_icons.rsi
+    state: hud_suspected
+
+- type: statusIcon
+  parent: SecurityIcon
+  id: SecurityIconWanted
+  icon:
+    sprite: Interface/Misc/security_icons.rsi
+    state: hud_wanted
diff --git a/Resources/Prototypes/StatusIcon/antag.yml b/Resources/Prototypes/StatusIcon/antag.yml
index 3b64517530..41bb095741 100644
--- a/Resources/Prototypes/StatusIcon/antag.yml
+++ b/Resources/Prototypes/StatusIcon/antag.yml
@@ -5,6 +5,13 @@
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Zombie
 
+- type: statusIcon
+  id: InitialInfectedFaction
+  priority: 11
+  icon:
+    sprite: /Textures/Interface/Misc/job_icons.rsi
+    state: InitialInfected
+
 - type: statusIcon
   id: RevolutionaryFaction
   priority: 11
diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml
index 15c80a8e5f..59fa88be2b 100644
--- a/Resources/Prototypes/Tiles/floors.yml
+++ b/Resources/Prototypes/Tiles/floors.yml
@@ -1874,12 +1874,30 @@
     West: /Textures/Tiles/Planet/Grass/double_edge.png
   baseTurf: Plating
   isSubfloor: false
-  deconstructTools: [ Prying ]
+  deconstructTools: [ Cutting ]
   footstepSounds:
     collection: FootstepGrass
   itemDrop: FloorTileItemAstroGrass
   heatCapacity: 10000
 
+- type: tile
+  id: FloorMowedAstroGrass
+  name: tiles-mowed-astro-grass
+  parent: FloorGrass
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Cutting ]
+  itemDrop: FloorTileItemMowedAstroGrass
+
+- type: tile
+  id: FloorJungleAstroGrass
+  name: tiles-jungle-astro-grass
+  parent: FloorGrassJungle
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Cutting ]
+  itemDrop: FloorTileItemJungleAstroGrass
+
 # Ice
 - type: tile
   id: FloorAstroIce
@@ -1895,6 +1913,15 @@
   mobAcceleration: 2
   itemDrop: FloorTileItemAstroIce
 
+- type: tile
+  id: FloorAstroSnow
+  name: tiles-astro-snow
+  parent: FloorSnow
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  itemDrop: FloorTileItemAstroSnow
+
 - type: tile
   id: FloorWoodLarge
   name: tiles-wood-large
diff --git a/Resources/Prototypes/Traits/disabilities.yml b/Resources/Prototypes/Traits/disabilities.yml
index 064b34adba..2f1a7f92d2 100644
--- a/Resources/Prototypes/Traits/disabilities.yml
+++ b/Resources/Prototypes/Traits/disabilities.yml
@@ -60,3 +60,10 @@
   description: trait-frontal-lisp-desc
   components:
     - type: FrontalLisp
+
+- type: trait
+  id: Snoring
+  name: trait-snoring-name
+  description: trait-snoring-desc
+  components:
+    - type: Snoring
diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml
index ee76fa33d2..01fabbadf3 100644
--- a/Resources/Prototypes/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml
@@ -380,3 +380,10 @@
   sounds:
     Chirp:
       path: /Audio/Animals/nymph_chirp.ogg
+
+- type: emoteSounds
+  id: Parrot
+  sound:
+    path: /Audio/Animals/parrot_raught.ogg
+    params:
+      variation: 0.125
diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml
index 8e33f483aa..7eb2bd4f6a 100644
--- a/Resources/Prototypes/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/Voice/speech_emotes.yml
@@ -170,9 +170,19 @@
    - click
    - click.
    - click!
+   - click?
    - clicks
    - clicks.
    - clicks!
+   - clicks?
+   - clicked
+   - clicked.
+   - clicked!
+   - clicked?
+   - clicking
+   - clicking.
+   - clicking!
+   - clicking?
 
 # hand emotes
 - type: emote
@@ -253,14 +263,18 @@
   chatMessages: [chirps!]
   chatTriggers:
     - chirp
-    - chirp!
     - chirp.
+    - chirp!
+    - chirp?
     - chirps
-    - churps.
+    - chirps.
     - chirps!
+    - chirps?
     - chirped
     - chirped.
     - chirped!
+    - chirped?
     - chirping
     - chirping.
     - chirping!
+    - chirping?
diff --git a/Resources/Prototypes/Voice/speech_sounds.yml b/Resources/Prototypes/Voice/speech_sounds.yml
index eb47b5363b..2e7e7bf989 100644
--- a/Resources/Prototypes/Voice/speech_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_sounds.yml
@@ -70,6 +70,15 @@
   exclaimSound:
     path: /Audio/Animals/monkey_scream.ogg
 
+- type: speechSounds
+  id: Parrot
+  saySound:
+    path: /Audio/Animals/parrot_raught.ogg
+  askSound:
+    path: /Audio/Animals/parrot_raught.ogg
+  exclaimSound:
+    path: /Audio/Animals/parrot_raught.ogg
+
 - type: speechSounds
   id: Lizard
   saySound:
diff --git a/Resources/Prototypes/Voice/speech_verbs.yml b/Resources/Prototypes/Voice/speech_verbs.yml
index 1cdda32ece..26e9370c01 100644
--- a/Resources/Prototypes/Voice/speech_verbs.yml
+++ b/Resources/Prototypes/Voice/speech_verbs.yml
@@ -113,6 +113,13 @@
   - chat-speech-verb-monkey-1
   - chat-speech-verb-monkey-2
 
+- type: speechVerb
+  id: Parrot
+  speechVerbStrings:
+  - chat-speech-verb-parrot-1
+  - chat-speech-verb-parrot-2
+  - chat-speech-verb-parrot-3
+
 - type: speechVerb
   id: Cluwne
   speechVerbStrings:
diff --git a/Resources/Prototypes/Wires/layouts.yml b/Resources/Prototypes/Wires/layouts.yml
index 338bf188ba..b30e68545d 100644
--- a/Resources/Prototypes/Wires/layouts.yml
+++ b/Resources/Prototypes/Wires/layouts.yml
@@ -15,6 +15,26 @@
 
 - type: wireLayout
   parent: Airlock
+  id: AirlockService
+
+- type: wireLayout
+  parent: Airlock
+  id: AirlockCargo
+
+- type: wireLayout
+  parent: Airlock
+  id: AirlockEngineering
+
+- type: wireLayout
+  parent: Airlock
+  id: AirlockMedical
+
+- type: wireLayout
+  parent: Airlock
+  id: AirlockScience
+
+- type: wireLayout
+  parent: HighSec
   id: AirlockCommand
 
 - type: wireLayout
diff --git a/Resources/Prototypes/audio.yml b/Resources/Prototypes/audio.yml
index 666bac4a2f..f6b3b41353 100644
--- a/Resources/Prototypes/audio.yml
+++ b/Resources/Prototypes/audio.yml
@@ -175,6 +175,7 @@
     - /Audio/Ambience/ambiruin6.ogg
     - /Audio/Ambience/ambiruin7.ogg
     - /Audio/Ambience/voyage_neverending.ogg
+    - /Audio/Ambience/unanchored.ogg
 
 - type: soundCollection
   id: AmbienceRuins
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 9f06df7bcb..c6a0ab3f8f 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -271,6 +271,9 @@
 - type: Tag
   id: CarpetPurple
 
+- type: Tag
+  id: CarpetSBlue
+
 - type: Tag
   id: CarpetPink
 
@@ -647,6 +650,9 @@
 - type: Tag
   id: Hardsuit # Prevent melee injectors that can't penetrate hardsuits from injecting the wearer (nettles)
 
+- type: Tag
+  id: Haunted
+
 - type: Tag
   id: Head
 
@@ -871,6 +877,9 @@
 - type: Tag
   id: NoBlockAnchoring
 
+- type: Tag
+  id: NoPaint
+
 - type: Tag
   id: NozzleBackTank
 
@@ -1139,6 +1148,9 @@
 - type: Tag
   id: SuitEVA
 
+- type: Tag
+  id: SurgeryTool
+
 - type: Tag
   id: SurveillanceCameraMonitorCircuitboard
 
@@ -1178,6 +1190,12 @@
 - type: Tag
   id: Torch
 
+- type: Tag
+  id: ToyRubberDuck
+
+- type: Tag
+  id: ToySidearm
+
 - type: Tag
   id: Trash
 
diff --git a/Resources/ServerInfo/Guidebook/Engineering/TEG.xml b/Resources/ServerInfo/Guidebook/Engineering/TEG.xml
index a2a04e03ef..9e8697a9e1 100644
--- a/Resources/ServerInfo/Guidebook/Engineering/TEG.xml
+++ b/Resources/ServerInfo/Guidebook/Engineering/TEG.xml
@@ -1,18 +1,18 @@
-<Document>
+<Document>
   # Thermo-electric Engine (TEG)
 
-  The TEG generates power by exchanging heat between hot and cold gases. On station, hot gas is usually created by burning plasma, and an array of heat-exchanging pipes in space radiates away heat to make a cold side.
+  The TEG generates power by exchanging heat between hot and cold gases. On the station, hot gas is usually created by burning plasma, and an array of heat-exchanging pipes in space radiates away heat to cool down circulated gases.
 
-  The TEG relies heavily on atmospherics piping. The only truly special component about it is the generator core, the rest is all off-the-shelf atmospherics equipment. Note that while the exact layout may vary significantly depending on station, the general components and setup are usually the same.
+  The TEG relies heavily on atmospherics piping. The only truly special component about it is the generator core and circulators; the rest is all off-the-shelf atmospherics equipment. Note that while the exact layout may vary significantly depending on station, the general components and setup are usually the same.
 
   ## Generator
 
-  The main generator itself is a machine made up of multiple parts: the core generator and two "circulators", in this arrangement:
+  The main generator itself is a machine made up of 3 major parts: the central generator and two "circulators", in this arrangement:
 
   <Box>
-    <GuideEntityEmbed Entity="TegCirculator" Rotation="180" Caption="" Margin="0" />
-    <GuideEntityEmbed Entity="TegCenter" Rotation="90" Caption="" Margin="0" />
-    <GuideEntityEmbed Entity="TegCirculator" Caption="" Margin="0" />
+    <GuideEntityEmbed Entity="TegCirculator" Rotation="180" Caption="" Margin="0"/>
+    <GuideEntityEmbed Entity="TegCenter" Rotation="90" Caption="" Margin="0"/>
+    <GuideEntityEmbed Entity="TegCirculator" Caption="" Margin="0"/>
   </Box>
 
   The circulators take in either a hot or cold gas, and pass it through the machine to exchange heat. The gas then gets output on the other end of the circulator. The generator produces the actual power and outputs it over an HV wire.
@@ -21,19 +21,172 @@
 
   There is no preference for which side must be hot or cold, there need only be a difference in temperature between them. The gases in the two "loops" are never mixed, only energy is exchanged between them. The hot side will cool down, the cold side will heat up.
 
-  ## Burn Chamber
+  ## The Pipes
+
+  There are 2 major pipenets to worry about here: The Hot Loop (where gas will be burnt for heat), and The Cold Loop (where circulated, heated waste gas will either be removed into space or cooled back down). Make sure that [bold]both pipenets do NOT mix[/bold], as only heat should be transferred between the two through the TEG.
+
+  # The Hot Loop
+
+  As I'm sure a wise person once said: the best way to make something hot is to light it on fire. Well, depending on context, that may not be very wise, but luckily your engineering department has just what's needed to do it wisely after all.
+
+  As stated above, there are many different layouts one can follow to heat up (or cool down) gases; this part of the guide will cover 2 common methods one will often see for the hot loop when the TEG is setup: The Pipe Burn, and the Burn chamber.
+
+  Side note: Plasma fires burn relatively cool compared to, for example, Tritium fires. It may be viable to extract Tritium from an extraction setup (using a 97/3 ratio of O2/Plasma) and react it with Oxygen to get truly hellish temperatures for power. Although, this is just a recommendation; I'm not ya mum.
+
+  ## The Pipe Burn
+
+  Also known as the naive method, this is generally discouraged when working for efficiency. However, if all you need is a smidge of power to run the station, and you don't feel like setting up the burn chamber, this method will do.
+
+  TODO: Remove this section when atmos pipes are updated to have pressure/temperature limits in a future atmos refactor.
+
+  Most (if not all) pipe burns follow this general layout:
+  <Box>
+    Gas input -> High-pressure pump -> Pipe segment (with heater) -> Low-pressure pump -> Circulator
+  </Box>
+  <Box>
+    <GuideEntityEmbed Entity="GasMixer" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPressurePump" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="0" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPressurePump" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="TegCirculator" Rotation="90" Caption="" Margin="-3"/>
+  </Box>
+  <Box>
+    <GuideEntityEmbed Entity="GasThermoMachineHeaterEnabled" Caption="" Rotation="180" Margin="0"/>
+  </Box>
+  - The Gas input is pretty self-explanatory; this is where you will input the O2-Plasma mix to be burnt. A 2:1 (67/33) ratio of Oxygen to Plasma is recommended for the hottest burn.
+  - The High-pressure pump serves 2 purposes; first, it prevents the burn from backwashing into the supply pipe, which would be.. bad, for many reasons. Second, it maintains a positive pressure in the following pipe segment, which is important to allow the burn to continue, especially since hot gases expand.
+  - The Pipe segment is where the burn actually occurs; to start it off, one can use a heater to increase the temperature up to the ignition temperature of Plasma. Afterwards, the reaction should be self-sustaining, so long as the Pressure and Moles supplied remains high enough. Be warned; if you wish to remove the heater, it will carry some of this superheated gas with it, transferring it to the next pipenet you connect it to. Best to space the gas through a space vent, if you must.
+  - The Low-pressure pump (whose pressure should be [italics]slightly lower[/italics] than the input pump) prevents [italics]all[/italics] the gas from passing through the circulator, which could result in the loss of the Moles required to sustain a burn.
+  - The Circulator is where this generated heat will flow to the cold loop; afterwards, feel free to space the waste gases.
+
+  Note: Pressure pumps are used here as, while they pump on pressure (not flow-rate, which is comparatively faster), they are a bit easier to control when it comes to the limited Plasma supply on-station. However, the steps shown can be followed with volumetric pumps too.
+
+  ## The Burn Chamber
+
+  The burn chamber is the preferred method for heating up gases, and it is commonly used for other purposes too. (see: Tritium production)
+
+  Most (if not all) stations have the burn chamber separated from the main atmospherics block by a 1-wide spaced grid, presumably to prevent conduction. The chambers consist of 3(+1) important parts:
+  - The Air Injector/Passive Vent
+  - The Space Vent
+  - The Radiator Loop
+
+  Most normal burn chambers don't come with Heat-Exchangers; instead, they have air scrubbers (and optionally, an air alarm) to help filter for Tritium, which is a highly reactive, hot-burning gas that can also be used to heat the TEG efficiently.
+  However, this is a slightly more advanced setup than just burning plasma, as it needs 2 burn chambers instead of 1 (one for tritium production, one for burning said tritium), so remove the scrubbers and retrofit the burn chamber with a parallel array of heat-exchangers instead.
+  
+  The air injector (or Passive Vent) injects air (or allows air to flow) into the burn chamber. Either should be supplemented with a pump before it, to keep pressures high.
+  There is a notable difference between the passive vent and the air injector; the air injector can only keep injecting air up to 9MPa, which can be reached very easily with a good burn. Ideally, switch out the air injector for a passive vent connected to a volume pump.
+
+  The space vent (designated as a blast door to space on one side of the burn chamber) allows waste gases to be expelled and destroyed. Open this to keep the pressure under control.
+
+  The radiator loop collects heat from the burnt gases and brings it to the TEG. To maximize efficiency, hook up the heat-exchangers [italics]in parallel to each other[/italics], with a pressure pump at max pressure after the array and a volumetric pump before the array.
+  The pressure of the volumetric pump should be set to ( 200 / number of heat-exchangers ) L/s. For example, having 2 heat-exchangers would mean you should set the pressure to 100 L/s. 
+  Finally, fill the whole loop with (ideally) a high heat capacity gas, like Frezon or Plasma. (Yes, Frezon =/= Cold. Frezon has one of the highest heat capacities in the game; so long as it isn't reacting with Nitrogen, it can actually be heated and can store heat really well!)
+
+  # The Cold Loop
+
+  As with the Hot Loop, the Cold Loop must also be setup in order to operate the TEG. However, the Cold Loop is usually a lot more low-tech than the Hot Loop; in reality, the Cold Loop only has to be "relatively" cooler -- hey, room temperature is technically cooler than the surface of the sun, right?
+
+  There are 3 main methods you will see used for the Cold Loop: The Water Cooler (see: Liltenhead's video on the TEG), the Coolant Array and the Freezer Loop.
+
+  ## The Water Cooler
 
-  As I'm sure a wise person once said: the best way to make something hot is to light it on fire. Well, depending on context that may not be very wise, but luckily your engineering department has just what's needed to do it wisely after all.
+  An equally naive method as the Pipe Burn, this simply involves taking some useless gas (in this case, Water Vapour) and flowing it through the TEG and into space. It's dirt-cheap and simple, at the cost of efficiency and permanant loss of gas.
 
-  TODO: somebody fill this out once we settle on a general mapped layout for burn chambers.
+  Setting this up is so simple, even Hamlet could manage it. Just take an output of a gas (here, Water Vapour), send it through the Cold side of the TEG, and then vent it into space.
+
+  <Box>
+    <GuideEntityEmbed Entity="GasPressurePump" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeStraight" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="TegCirculator" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeStraight" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="WallReinforced" Rotation="0" Caption="" Margin="0"/>
+    <GuideEntityEmbed Entity="GasPassiveVent" Rotation="270" Caption="" Margin="-1"/>
+  </Box>
+
+  TODO: Remove this section when gas miners are removed in a future atmos refactor.
 
   ## Coolant Array
 
-  A whole bunch of heat-exchanger piping in space. There's not much to say here: gas goes through and cools down.
+  This is the default method for the Cold Loop you will see on a variety of stations. Being of moderate complexity and having no losses of any resource, this [italics]should[/italics] be the main method of cooling down the TEG. However, every station at the moment somehow has their heat exchangers hooked up wrong, reducing efficiency greatly. (Thanks a bunch, NT!)
 
-  ## The Pipes
+  To use heat-exchangers properly, they must be setup in [italics]parallel[/italics], not in series (like what you see on most stations). A gas pump at max pressure should be placed after, and a volumetric pump before the heat-exchangers.
+  The flow-rate of the volumetric pump should be set to ( 200 / number of heat-exchangers ) L/s.
 
-  TODO: somebody fill this out once we settle on a general mapped layout for burn chambers.
+  Simply speaking, the Coolant Array consists of 3 major parts: An input connector port, a few pumps and the heat-exchanger array out in space. It can be setup like so:
 
+  <Box>
+    <GuideEntityEmbed Entity="GasPipeBend" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="0" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="0" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="0" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="0" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeBend" Rotation="0" Caption="" Margin="-1"/>
+  </Box>
+  <Box>
+    <GuideEntityEmbed Entity="HeatExchanger" Rotation="0" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="HeatExchanger" Rotation="0" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="HeatExchanger" Rotation="0" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="HeatExchanger" Rotation="0" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="HeatExchanger" Rotation="0" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeStraight" Rotation="0" Caption="" Margin="-1"/>
+  </Box>
+  <Box>
+    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="180" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="180" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="180" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeBend" Rotation="270" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeStraight" Rotation="0" Caption="" Margin="-1"/>
+  </Box>
+  <Box>
+    <GuideEntityEmbed Entity="WallReinforced" Rotation="0" Caption="" Margin="0"/>
+    <GuideEntityEmbed Entity="ReinforcedWindow" Rotation="0" Caption="" Margin="0"/>
+    <GuideEntityEmbed Entity="ReinforcedWindow" Rotation="0" Caption="" Margin="0"/>
+    <GuideEntityEmbed Entity="ReinforcedWindow" Rotation="0" Caption="" Margin="0"/>
+    <GuideEntityEmbed Entity="ReinforcedWindow" Rotation="0" Caption="" Margin="0"/>
+    <GuideEntityEmbed Entity="WallReinforced" Rotation="0" Caption="" Margin="0"/>
+  </Box>
+  <Box>
+    <GuideEntityEmbed Entity="GasPipeBend" Rotation="180" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPressurePump" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="TegCirculator" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="0" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasVolumePump" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeBend" Rotation="270" Caption="" Margin="-1"/>
+  </Box>
+  <Box>
+    <GuideEntityEmbed Entity="TegCenter" Rotation="0" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPort" Rotation="180" Caption="" Margin="-1"/>
+  </Box>
+
+  - Connector Port: Use this to input a gas with high heat capacity; most of the time, Plasma or Frezon is used to do so, as they both have very high specific heat capacities (although most any gas will do). (Yes, Plasma =/= Hot. You can cool it down, and it acts as a really good heat exchange medium.)
+  - Input/Output Pumps: Used to make sure gas keeps flowing through both the Circulator and the Heat-Exchanger array. As the gas cools down and heats up (and as it flows through the Exchanger), pressure must be applied for it to keep flowing.
+  - Heat-Exchanger: Basically, just a bunch of heat-exchanger pipes in space. Not much to say, besides the fact that it cools down the gas inside it. Make sure the heat-exchangers are placed on lattice, not plating! Otherwise, the heat-exchange efficiency will be greatly reduced, as the heat-exchangers aren't directly exposed to space below them.
+
+  ## The Freezer Loop
+
+  Most of the time, you will see this method being used in efficient TEG setups. It's basically just the Coolant array, but replacing the Heat-Exchangers with a freezer. Even though the freezer does use power, it is only a small fraction of what the TEG can generate, and it's better than the default Coolant array at the moment, so go fish.
+
+  Just follow the steps for the Coolant array, but use a freezer in place of the Heat-Exchangers. As so:
+  <Box>
+    <GuideEntityEmbed Entity="GasPort" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeBend" Rotation="0" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasThermoMachineFreezerEnabled" Caption="" Rotation="0" Margin="0"/>
+  </Box>
+  <Box>
+    <GuideEntityEmbed Entity="GasPipeBend" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasVolumePump" Rotation="270" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="180" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeTJunction" Rotation="180" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeBend" Rotation="0" Caption="" Margin="-1"/>
+  </Box>
+  <Box>
+    <GuideEntityEmbed Entity="GasPipeBend" Rotation="180" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeStraight" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="TegCirculator" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeStraight" Rotation="90" Caption="" Margin="-1"/>
+    <GuideEntityEmbed Entity="GasPipeBend" Rotation="270" Caption="" Margin="-1"/>
+  </Box>
 
+  Once again, use Plasma or Frezon in the loop for max efficiency (although most any gas will do).
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml b/Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml
index ad97f1b2d7..ef6e1a49e8 100644
--- a/Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml
+++ b/Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml
@@ -41,7 +41,7 @@ Once things have been set up, you're going to require a specific medication, Cry
 
 ## Additional Information:
 
-The standard pressure for a gas pump is 1.325 kpa. Cryoxadone works at under 170K, but it is standard practice to set the freezer to 100K for faster freezing.
+The standard pressure for a gas pump is 100.325 kpa. Cryoxadone works at under 170K, but it is standard practice to set the freezer to 100K for faster freezing.
 
 <GuideReagentEmbed Reagent="Cryoxadone"/>
 <GuideReagentEmbed Reagent="Doxarubixadone"/>
diff --git a/Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml b/Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
index 3d7e5131ca..a377c980e5 100644
--- a/Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
+++ b/Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
@@ -14,7 +14,7 @@ A large portion of Xenoarchaeology gameplay revolves around the interpretation o
 
 - [color=#a4885c]Edges:[/color] the amount of nodes that are connected to the current node. Using this, you can calculate the total number of nodes as well as organize a map of their connections.
 
-- [color=#a4885c]Current value:[/color] the amount of research points an artifact is currently worth. This is an important factor in choosing when to stop research and destroy the artifact in exchange for points.
+- [color=#a4885c]Current value:[/color] the amount of research points an artifact is currently worth. Extracting will set this to zero and traversing new nodes will increase it.
 
 Reports are a helpful tool in manipulating an artifact, especially in the later stages where you are traversing nodes that have already been activated. 
 <Box>
diff --git a/Resources/Textures/Clothing/Back/Backpacks/syndicate.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/syndicate.rsi/equipped-BACKPACK.png
new file mode 100644
index 0000000000..a7bf0a8b42
Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/syndicate.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/Clothing/Back/Backpacks/syndicate.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/syndicate.rsi/icon.png
new file mode 100644
index 0000000000..2c60bb0007
Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/syndicate.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Back/Backpacks/syndicate.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/syndicate.rsi/inhand-left.png
new file mode 100644
index 0000000000..02acae54c9
Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/syndicate.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Back/Backpacks/syndicate.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/syndicate.rsi/inhand-right.png
new file mode 100644
index 0000000000..6faa13ba39
Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/syndicate.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Back/Backpacks/syndicate.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/syndicate.rsi/meta.json
new file mode 100644
index 0000000000..f087cc75d1
--- /dev/null
+++ b/Resources/Textures/Clothing/Back/Backpacks/syndicate.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by gabova (discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-BACKPACK",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Ears/Headsets/base.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/base.rsi/icon.png
index 44e093f26a..76cf88f02e 100644
Binary files a/Resources/Textures/Clothing/Ears/Headsets/base.rsi/icon.png and b/Resources/Textures/Clothing/Ears/Headsets/base.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/base.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/base.rsi/meta.json
index df6ee47d08..50d4add03c 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/base.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/base.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/icon.png
index 608b9ef7a0..805de4537d 100644
Binary files a/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/icon.png and b/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/meta.json
index 774e33fbe7..687531cde5 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Edited by Flareguy for Space Station 14. Originally from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Edited by Flareguy for Space Station 14. Originally from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/icon.png
index 671111e4bc..fa790f7e99 100644
Binary files a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/icon.png and b/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/icon_alt.png
index 439a4b6e52..d943c63418 100644
Binary files a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/icon_alt.png and b/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/icon_alt.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/meta.json
index 1e84b43d94..84f0203236 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/cargo.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/icon.png
index 4ee60687d0..070bbfd16a 100644
Binary files a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/icon.png and b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/icon_alt.png
index 0927232ed5..c1dbd8ca3c 100644
Binary files a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/icon_alt.png and b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/icon_alt.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/meta.json
index 1e84b43d94..84f0203236 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/centcom.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/icon.png
index 30e1697c3c..9023333660 100644
Binary files a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/icon.png and b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/icon_alt.png
index a01e0c6c13..51a87cef79 100644
Binary files a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/icon_alt.png and b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/icon_alt.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/meta.json
index 1e84b43d94..4a16d0c71f 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/command.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/icon.png
index d39d3680df..536a991199 100644
Binary files a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/icon.png and b/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/icon_alt.png
index f1559927e0..98259eb070 100644
Binary files a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/icon_alt.png and b/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/icon_alt.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/meta.json
index 1e84b43d94..84f0203236 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/engineering.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon.png
index 0ff3f2c989..fa790f7e99 100644
Binary files a/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon.png and b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon_alt.png
index d3be4bc497..d943c63418 100644
Binary files a/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon_alt.png and b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon_alt.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/meta.json
index 5567eaaf37..8e58bce368 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprite modified by PursuitInAshes (Github) for SS14, original sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Sprite modified by PursuitInAshes (Github) for SS14, original sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/icon.png
index e18fee6225..5ba1c7269d 100644
Binary files a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/icon.png and b/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/icon_alt.png
index 1087400c3c..e68f78e061 100644
Binary files a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/icon_alt.png and b/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/icon_alt.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/meta.json
index 1e84b43d94..4a16d0c71f 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/medical.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/icon.png
index 5e773624bc..4b38069004 100644
Binary files a/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/icon.png and b/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/meta.json
index 3d37ed5434..37ee397b98 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/medicalscience.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/medicalscience.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/icon.png
index cdb552f140..498a0af688 100644
Binary files a/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/icon.png and b/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/meta.json
index df6ee47d08..9c2f13fda0 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/mining.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/mining.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/icon.png
index 3d247f05be..4a67c2aa6e 100644
Binary files a/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/icon.png and b/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/meta.json
index df6ee47d08..8182d05a8c 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/robotics.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/robotics.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/icon.png
index e292512c97..d55fc0798e 100644
Binary files a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/icon.png and b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/icon_alt.png
index c86c128c24..c935e5a13b 100644
Binary files a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/icon_alt.png and b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/icon_alt.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/meta.json
index 1e84b43d94..50f9fe3394 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/science.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/icon.png
index cced512164..195117997d 100644
Binary files a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/icon.png and b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/icon_alt.png
index 219918544c..b47392ea07 100644
Binary files a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/icon_alt.png and b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/icon_alt.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/meta.json
index 1e84b43d94..4a16d0c71f 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/security.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/service.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/service.rsi/icon.png
index a4ad6eb957..87d994febb 100644
Binary files a/Resources/Textures/Clothing/Ears/Headsets/service.rsi/icon.png and b/Resources/Textures/Clothing/Ears/Headsets/service.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/service.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/service.rsi/meta.json
index 1e84b43d94..4a16d0c71f 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/service.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/service.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/icon.png
index 0b1f751416..87d994febb 100644
Binary files a/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/icon.png and b/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/meta.json
index dd2fdcc360..62fac00b4e 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/icon_alt.png
index f7cddb85c0..892f6d12f0 100644
Binary files a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/icon_alt.png and b/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/icon_alt.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json
index a36cd58203..9a2c8fdc0e 100644
--- a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/meta.json
+++ b/Resources/Textures/Clothing/Ears/Headsets/syndicate.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK-reptilian.png
new file mode 100644
index 0000000000..88542905cf
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK-reptilian.png differ
diff --git a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK.png
new file mode 100644
index 0000000000..e34c9a995e
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK.png differ
diff --git a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/icon.png b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/icon.png
new file mode 100644
index 0000000000..e1c0aecc28
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/inhand-left.png
new file mode 100644
index 0000000000..5a37ace23e
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/inhand-right.png
new file mode 100644
index 0000000000..47cfa5ae34
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json
new file mode 100644
index 0000000000..9094fa918f
--- /dev/null
+++ b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Originally sprited by belay5 (Discord) then recolored by Nairod (Github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-MASK",
+      "directions": 4
+    },
+    {
+      "name": "equipped-MASK-reptilian",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..5eadcdc1c1
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/icon.png
new file mode 100644
index 0000000000..dbb09f8ed0
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/meta.json
new file mode 100644
index 0000000000..42d21c3d8a
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "leonardo_dabepis on discord / @leonardo-dabepis on Tumblr, Edited by heartparkyheart on Discord",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..631fcc2c94
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/icon.png
new file mode 100644
index 0000000000..f78a89945c
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/meta.json
new file mode 100644
index 0000000000..42d21c3d8a
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "leonardo_dabepis on discord / @leonardo-dabepis on Tumblr, Edited by heartparkyheart on Discord",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..6377db6f2e
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/icon.png
new file mode 100644
index 0000000000..c7fd65e30b
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/meta.json
new file mode 100644
index 0000000000..42d21c3d8a
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "leonardo_dabepis on discord / @leonardo-dabepis on Tumblr, Edited by heartparkyheart on Discord",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..1055ce095c
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/icon.png
new file mode 100644
index 0000000000..ba72253098
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/meta.json
new file mode 100644
index 0000000000..42d21c3d8a
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/ee_corpo_jacket.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "leonardo_dabepis on discord / @leonardo-dabepis on Tumblr, Edited by heartparkyheart on Discord",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..fa468b2390
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/icon.png
new file mode 100644
index 0000000000..635845bab2
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/meta.json
new file mode 100644
index 0000000000..42d21c3d8a
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "leonardo_dabepis on discord / @leonardo-dabepis on Tumblr, Edited by heartparkyheart on Discord",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..87fd745850
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/icon.png
new file mode 100644
index 0000000000..2af90d92f7
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/meta.json
new file mode 100644
index 0000000000..42d21c3d8a
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "leonardo_dabepis on discord / @leonardo-dabepis on Tumblr, Edited by heartparkyheart on Discord",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..e1f137dca3
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/icon.png
new file mode 100644
index 0000000000..cc3d8767a7
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/meta.json
new file mode 100644
index 0000000000..42d21c3d8a
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "leonardo_dabepis on discord / @leonardo-dabepis on Tumblr, Edited by heartparkyheart on Discord",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..2d103cfa66
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/icon.png
new file mode 100644
index 0000000000..d80b56558a
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/meta.json
new file mode 100644
index 0000000000..42d21c3d8a
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "leonardo_dabepis on discord / @leonardo-dabepis on Tumblr, Edited by heartparkyheart on Discord",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..ceb7045818
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/icon.png
new file mode 100644
index 0000000000..c864d60dc0
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/meta.json
new file mode 100644
index 0000000000..42d21c3d8a
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "leonardo_dabepis on discord / @leonardo-dabepis on Tumblr, Edited by heartparkyheart on Discord",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..b138d1416b
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/icon.png
new file mode 100644
index 0000000000..d85eeb0592
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/meta.json
new file mode 100644
index 0000000000..42d21c3d8a
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "leonardo_dabepis on discord / @leonardo-dabepis on Tumblr, Edited by heartparkyheart on Discord",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_leg_short.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_leg_short.png
new file mode 100644
index 0000000000..e3b74ba7b6
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_leg_short.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_leg_skirt.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_leg_skirt.png
new file mode 100644
index 0000000000..3341ff4418
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_leg_skirt.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_leg_skirt_long.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_leg_skirt_long.png
new file mode 100644
index 0000000000..5c83cae137
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_leg_skirt_long.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_leg_standart.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_leg_standart.png
new file mode 100644
index 0000000000..7140a3869c
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_leg_standart.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_torso_armless.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_torso_armless.png
new file mode 100644
index 0000000000..2864e1c04e
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_torso_armless.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_torso_bra.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_torso_bra.png
new file mode 100644
index 0000000000..03c8d493fb
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_torso_bra.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_torso_shirt.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_torso_shirt.png
new file mode 100644
index 0000000000..b03f394279
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_torso_shirt.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_torso_standart.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_torso_standart.png
new file mode 100644
index 0000000000..1db1be4c68
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_torso_standart.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_torso_standart2.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_torso_standart2.png
new file mode 100644
index 0000000000..5397d8e8d7
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/base_torso_standart2.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_armless1.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_armless1.png
new file mode 100644
index 0000000000..d2110b9f5a
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_armless1.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_armless10.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_armless10.png
new file mode 100644
index 0000000000..4060a0d6a5
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_armless10.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_armless2.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_armless2.png
new file mode 100644
index 0000000000..7f504cbc7a
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_armless2.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_armless3.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_armless3.png
new file mode 100644
index 0000000000..6897496738
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_armless3.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_armless4.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_armless4.png
new file mode 100644
index 0000000000..7f464aabec
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_armless4.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_armless5.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_armless5.png
new file mode 100644
index 0000000000..e971de5bd4
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_armless5.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_armless6.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_armless6.png
new file mode 100644
index 0000000000..fbc8f296ee
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_armless6.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_armless7.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_armless7.png
new file mode 100644
index 0000000000..6055cdc652
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_armless7.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_armless8.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_armless8.png
new file mode 100644
index 0000000000..979b9b8078
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_armless8.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_armless9.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_armless9.png
new file mode 100644
index 0000000000..3e5919e126
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_armless9.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_bra1.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_bra1.png
new file mode 100644
index 0000000000..da752a9f45
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_bra1.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_bra2.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_bra2.png
new file mode 100644
index 0000000000..a92430a43b
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_bra2.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_bra3.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_bra3.png
new file mode 100644
index 0000000000..516e059ac5
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_bra3.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_bra4.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_bra4.png
new file mode 100644
index 0000000000..f7c46e8ed6
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_bra4.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_bra5.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_bra5.png
new file mode 100644
index 0000000000..7a4c269dda
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_bra5.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_shirt1.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_shirt1.png
new file mode 100644
index 0000000000..c742af5197
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_shirt1.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_shirt2.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_shirt2.png
new file mode 100644
index 0000000000..79f1cf1a83
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_shirt2.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_shirt3.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_shirt3.png
new file mode 100644
index 0000000000..6223263eaa
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_shirt3.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart1.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart1.png
new file mode 100644
index 0000000000..4771eb9456
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart1.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart2.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart2.png
new file mode 100644
index 0000000000..3882611398
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart2.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart3.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart3.png
new file mode 100644
index 0000000000..30533972f2
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart3.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart4.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart4.png
new file mode 100644
index 0000000000..38879be4bd
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart4.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart5.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart5.png
new file mode 100644
index 0000000000..fc747a3e99
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart5.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart6.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart6.png
new file mode 100644
index 0000000000..e6b7276801
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart6.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart7.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart7.png
new file mode 100644
index 0000000000..f2aa726ae6
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart7.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart8.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart8.png
new file mode 100644
index 0000000000..042b7f9d09
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart8.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart9.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart9.png
new file mode 100644
index 0000000000..11e048f48b
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/decor_torso_standart9.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/mask_null.png b/Resources/Textures/Clothing/Uniforms/procedural.rsi/mask_null.png
new file mode 100644
index 0000000000..2975c479be
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/procedural.rsi/mask_null.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/procedural.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/procedural.rsi/meta.json
new file mode 100644
index 0000000000..08133fc00b
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/procedural.rsi/meta.json
@@ -0,0 +1,159 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "The sprite base is taken from  tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, separated into layers and added new ones by TheShuEd (github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base_leg_short",
+      "directions": 4
+    },
+    {
+      "name": "base_leg_skirt",
+      "directions": 4
+    },
+    {
+      "name": "base_leg_skirt_long",
+      "directions": 4
+    },
+    {
+      "name": "base_leg_standart",
+      "directions": 4
+    },
+    {
+      "name": "base_torso_armless",
+      "directions": 4
+    },
+    {
+      "name": "base_torso_bra",
+      "directions": 4
+    },
+    {
+      "name": "base_torso_shirt",
+      "directions": 4
+    },
+    {
+      "name": "base_torso_standart",
+      "directions": 4
+    },
+    {
+      "name": "base_torso_standart2",
+      "directions": 4
+    },
+    {
+      "name": "decor_torso_armless1",
+      "directions": 4
+    },
+    {
+      "name": "decor_torso_armless2",
+      "directions": 4
+    },
+    {
+      "name": "decor_torso_armless3",
+      "directions": 4
+    },
+    {
+      "name": "decor_torso_armless4",
+      "directions": 4
+    },
+    {
+      "name": "decor_torso_armless5",
+      "directions": 4
+    },
+    {
+      "name": "decor_torso_armless6",
+      "directions": 4
+    },
+    {
+      "name": "decor_torso_armless7",
+      "directions": 4
+    },
+    {
+      "name": "decor_torso_armless8",
+      "directions": 4
+    },
+    {
+      "name": "decor_torso_armless9",
+      "directions": 4
+    },
+    {
+      "name": "decor_torso_armless10",
+      "directions": 4
+    },
+    {
+      "name": "decor_torso_bra1",
+      "directions": 4
+    },
+    {
+      "name": "decor_torso_bra2",
+      "directions": 4
+    },
+    {
+      "name": "decor_torso_bra3",
+      "directions": 4
+    },
+    {
+      "name": "decor_torso_bra4",
+      "directions": 4
+    },
+    {
+      "name": "decor_torso_bra5",
+      "directions": 4
+    },
+    {
+      "name": "decor_torso_shirt1",
+      "directions": 4
+    },
+    {
+      "name": "decor_torso_shirt2",
+      "directions": 4
+    },
+    {
+      "name": "decor_torso_shirt3",
+      "directions": 4
+    },
+    {
+      "name": "decor_torso_standart1",
+      "directions": 4
+    },
+    {
+      "name": "decor_torso_standart2",
+      "directions": 4
+    },
+    {
+      "name": "decor_torso_standart3",
+      "directions": 4
+    },
+    {
+      "name": "decor_torso_standart4",
+      "directions": 4
+    },
+    {
+      "name": "decor_torso_standart5",
+      "directions": 4
+    },
+    {
+      "name": "decor_torso_standart6",
+      "directions": 4
+    },
+    {
+      "name": "decor_torso_standart7",
+      "directions": 4
+    },
+    {
+      "name": "decor_torso_standart8",
+      "directions": 4
+    },
+    {
+      "name": "decor_torso_standart9",
+      "directions": 4
+    },
+    {
+      "name": "mask_null",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/icon.png
index 354b1eee71..b6f68da96e 100644
Binary files a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/icon.png and b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/meta.json
index 33e08c9522..d2bd34f483 100644
--- a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Resprited by DangerRevolution from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Resprited by DangerRevolution from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/securitymedical.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/securitymedical.rsi/icon.png
index 0e1840978d..195117997d 100644
Binary files a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/securitymedical.rsi/icon.png and b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/securitymedical.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/securitymedical.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/securitymedical.rsi/meta.json
index 529b60f838..1a52b67cf0 100644
--- a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/securitymedical.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/securitymedical.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprited by PuroSlavKing (github) for SS14",
+  "copyright": "Sprited by PuroSlavKing (github) for SS14 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/service.rsi/icon_alt.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/service.rsi/icon_alt.png
index 5052bcd78e..51a87cef79 100644
Binary files a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/service.rsi/icon_alt.png and b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/service.rsi/icon_alt.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/service.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/service.rsi/meta.json
index 5dd6839da5..b62adfa1f3 100644
--- a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/service.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/service.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428. Modified by TJohnson.",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428. Modified by TJohnson. // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi/icon_alt.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi/icon_alt.png
index 0354a3ad03..892f6d12f0 100644
Binary files a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi/icon_alt.png and b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi/icon_alt.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi/meta.json
index 9879138a5c..c5495e43df 100644
--- a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Resprited by DangerRevolution (github) from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "copyright": "Resprited by DangerRevolution (github) from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Oni/oni_horns.rsi/bull.png b/Resources/Textures/DeltaV/Mobs/Customization/Oni/oni_horns.rsi/bull.png
new file mode 100644
index 0000000000..4d1c5ebf86
Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Oni/oni_horns.rsi/bull.png differ
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Oni/oni_horns.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Oni/oni_horns.rsi/meta.json
new file mode 100644
index 0000000000..7d86318e7b
--- /dev/null
+++ b/Resources/Textures/DeltaV/Mobs/Customization/Oni/oni_horns.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by PS3MOIRA",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "shaved",
+            "directions": 4
+        },
+        {
+            "name": "bull",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Oni/oni_horns.rsi/shaved.png b/Resources/Textures/DeltaV/Mobs/Customization/Oni/oni_horns.rsi/shaved.png
new file mode 100644
index 0000000000..1afcdb7c53
Binary files /dev/null and b/Resources/Textures/DeltaV/Mobs/Customization/Oni/oni_horns.rsi/shaved.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/arsonist.rsi/fill-1.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/arsonist.rsi/fill-1.png
new file mode 100644
index 0000000000..992465a8ca
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/arsonist.rsi/fill-1.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/arsonist.rsi/fill-2.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/arsonist.rsi/fill-2.png
new file mode 100644
index 0000000000..d856b52822
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/arsonist.rsi/fill-2.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/arsonist.rsi/fill-3.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/arsonist.rsi/fill-3.png
new file mode 100644
index 0000000000..e080e2638a
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/arsonist.rsi/fill-3.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/arsonist.rsi/fill-4.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/arsonist.rsi/fill-4.png
new file mode 100644
index 0000000000..8ea2bba5b6
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/arsonist.rsi/fill-4.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/arsonist.rsi/icon_empty.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/arsonist.rsi/icon_empty.png
new file mode 100644
index 0000000000..fb9a171a76
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/arsonist.rsi/icon_empty.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/arsonist.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/arsonist.rsi/meta.json
index 313980abcc..1d7812ab2d 100644
--- a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/arsonist.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/arsonist.rsi/meta.json
@@ -1,15 +1,30 @@
 {
-  "version": 1,
-  "license": "CC0-1.0",
-  "copyright": "Original work by TJohnson.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon",
-      "delays": [[0.25, 0.25, 0.25, 0.25]]
-    }
-  ]
-}
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC0-1.0",
+    "copyright": "Original work by TJohnson.",
+    "states": [
+        {
+            "name": "icon",
+            "delays": [[0.25, 0.25, 0.25, 0.25]]
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/daiquiri.rsi/fill-1.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/daiquiri.rsi/fill-1.png
new file mode 100644
index 0000000000..00e60a6d6d
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/daiquiri.rsi/fill-1.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/daiquiri.rsi/fill-2.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/daiquiri.rsi/fill-2.png
new file mode 100644
index 0000000000..e70ad2618f
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/daiquiri.rsi/fill-2.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/daiquiri.rsi/fill-3.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/daiquiri.rsi/fill-3.png
new file mode 100644
index 0000000000..f7f56ad32a
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/daiquiri.rsi/fill-3.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/daiquiri.rsi/icon_empty.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/daiquiri.rsi/icon_empty.png
new file mode 100644
index 0000000000..4d3c3f60d3
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/daiquiri.rsi/icon_empty.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/daiquiri.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/daiquiri.rsi/meta.json
index 4c0b620dfd..f1449ce61a 100644
--- a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/daiquiri.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/daiquiri.rsi/meta.json
@@ -1,14 +1,26 @@
 {
-  "version": 1,
-  "license": "CC0-1.0",
-  "copyright": "Original work by TJohnson.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    }
-  ]
-}
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC0-1.0",
+    "copyright": "Original work by TJohnson.",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/dulleavene.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/dulleavene.rsi/icon.png
deleted file mode 100644
index 49aa80be1d..0000000000
Binary files a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/dulleavene.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/dulleavene.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/dulleavene.rsi/meta.json
deleted file mode 100644
index 86851510b0..0000000000
--- a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/dulleavene.rsi/meta.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "version": 1,
-  "license": "CC0-1.0",
-  "copyright": "Artwork by Leonardo_DaBepis. https://leonardo-dabepis.tumblr.com/",
-  "size": {
-    "x": 13,
-    "y": 17
-  },
-  "states": [
-    {
-      "name": "icon"
-    }
-  ]
-}
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/greengrass.rsi/fill-1.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/greengrass.rsi/fill-1.png
new file mode 100644
index 0000000000..087c698fcd
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/greengrass.rsi/fill-1.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/greengrass.rsi/fill-2.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/greengrass.rsi/fill-2.png
new file mode 100644
index 0000000000..f596e55cfa
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/greengrass.rsi/fill-2.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/greengrass.rsi/fill-3.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/greengrass.rsi/fill-3.png
new file mode 100644
index 0000000000..26c6cc7fed
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/greengrass.rsi/fill-3.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/greengrass.rsi/fill-4.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/greengrass.rsi/fill-4.png
new file mode 100644
index 0000000000..9d99f2d837
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/greengrass.rsi/fill-4.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/greengrass.rsi/fill-5.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/greengrass.rsi/fill-5.png
new file mode 100644
index 0000000000..a697bbbf6d
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/greengrass.rsi/fill-5.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/greengrass.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/greengrass.rsi/icon.png
index 0852b6bdf9..e558e125e0 100644
Binary files a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/greengrass.rsi/icon.png and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/greengrass.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/greengrass.rsi/icon_empty.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/greengrass.rsi/icon_empty.png
new file mode 100644
index 0000000000..04c5b78819
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/greengrass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/greengrass.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/greengrass.rsi/meta.json
index 4c0b620dfd..3375793187 100644
--- a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/greengrass.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/greengrass.rsi/meta.json
@@ -1,14 +1,32 @@
 {
-  "version": 1,
-  "license": "CC0-1.0",
-  "copyright": "Original work by TJohnson.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    }
-  ]
-}
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC0-1.0",
+    "copyright": "Original work by TJohnson.",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/gunmetal.rsi/fill-1.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/gunmetal.rsi/fill-1.png
new file mode 100644
index 0000000000..138c835597
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/gunmetal.rsi/fill-1.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/gunmetal.rsi/fill-2.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/gunmetal.rsi/fill-2.png
new file mode 100644
index 0000000000..c11695450c
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/gunmetal.rsi/fill-2.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/gunmetal.rsi/fill-3.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/gunmetal.rsi/fill-3.png
new file mode 100644
index 0000000000..dba48d0076
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/gunmetal.rsi/fill-3.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/gunmetal.rsi/fill-4.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/gunmetal.rsi/fill-4.png
new file mode 100644
index 0000000000..d3133dc9e3
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/gunmetal.rsi/fill-4.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/gunmetal.rsi/fill-5.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/gunmetal.rsi/fill-5.png
new file mode 100644
index 0000000000..690e598921
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/gunmetal.rsi/fill-5.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/gunmetal.rsi/icon_empty.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/gunmetal.rsi/icon_empty.png
new file mode 100644
index 0000000000..0651b3e952
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/gunmetal.rsi/icon_empty.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/gunmetal.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/gunmetal.rsi/meta.json
index 4c0b620dfd..3375793187 100644
--- a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/gunmetal.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/gunmetal.rsi/meta.json
@@ -1,14 +1,32 @@
 {
-  "version": 1,
-  "license": "CC0-1.0",
-  "copyright": "Original work by TJohnson.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    }
-  ]
-}
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC0-1.0",
+    "copyright": "Original work by TJohnson.",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi/fill-1.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi/fill-1.png
new file mode 100644
index 0000000000..c1b3364bfe
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi/fill-1.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi/fill-2.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi/fill-2.png
new file mode 100644
index 0000000000..cb905619b6
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi/fill-2.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi/fill-3.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi/fill-3.png
new file mode 100644
index 0000000000..9d8344cfdc
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi/fill-3.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi/fill-4.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi/fill-4.png
new file mode 100644
index 0000000000..7a4178c0cd
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi/fill-4.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi/fill-5.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi/fill-5.png
new file mode 100644
index 0000000000..ce38e781eb
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi/fill-5.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi/icon.png
new file mode 100644
index 0000000000..67afd25143
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi/icon_empty.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi/icon_empty.png
new file mode 100644
index 0000000000..9862fe49d9
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi/icon_empty.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi/meta.json
new file mode 100644
index 0000000000..1fbe393269
--- /dev/null
+++ b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi/meta.json
@@ -0,0 +1,32 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC0-1.0",
+    "copyright": "Artwork by Leonardo_DaBepis. https://leonardo-dabepis.tumblr.com/",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/icon.png
new file mode 100644
index 0000000000..e8fd6f9878
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/icon_open.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/icon_open.png
new file mode 100644
index 0000000000..06a5ba1f4e
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/icon_open.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/meta.json
new file mode 100644
index 0000000000..bf25cd2897
--- /dev/null
+++ b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from from tgstation at https://github.com/tgstation/tgstation/commit/cbb527fcec6fb1a79dce98f7e8b093307a63980e",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon_open"
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/icon.png
new file mode 100644
index 0000000000..d115d69833
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/icon_open.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/icon_open.png
new file mode 100644
index 0000000000..8021fdc840
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/icon_open.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/meta.json
new file mode 100644
index 0000000000..719567215e
--- /dev/null
+++ b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from from tgstation at https://github.com/tgstation/tgstation/commit/cbb527fcec6fb1a79dce98f7e8b093307a63980e and modified by Floofers",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon_open"
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/icon.png
new file mode 100644
index 0000000000..3a47b14169
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/icon_open.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/icon_open.png
new file mode 100644
index 0000000000..55b8790640
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/icon_open.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/meta.json
new file mode 100644
index 0000000000..bf25cd2897
--- /dev/null
+++ b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from from tgstation at https://github.com/tgstation/tgstation/commit/cbb527fcec6fb1a79dce98f7e8b093307a63980e",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon_open"
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi/icon.png
new file mode 100644
index 0000000000..ebe1a123d6
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi/icon_open.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi/icon_open.png
new file mode 100644
index 0000000000..fefe447542
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi/icon_open.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi/meta.json
new file mode 100644
index 0000000000..bf25cd2897
--- /dev/null
+++ b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from from tgstation at https://github.com/tgstation/tgstation/commit/cbb527fcec6fb1a79dce98f7e8b093307a63980e",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon_open"
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/icon.png
new file mode 100644
index 0000000000..2402cff41e
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/icon_open.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/icon_open.png
new file mode 100644
index 0000000000..db97ee7d3d
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/icon_open.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/meta.json
new file mode 100644
index 0000000000..bf25cd2897
--- /dev/null
+++ b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from from tgstation at https://github.com/tgstation/tgstation/commit/cbb527fcec6fb1a79dce98f7e8b093307a63980e",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon_open"
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/kvass.rsi/fill-1.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/kvass.rsi/fill-1.png
new file mode 100644
index 0000000000..db910a5a1f
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/kvass.rsi/fill-1.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/kvass.rsi/fill-2.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/kvass.rsi/fill-2.png
new file mode 100644
index 0000000000..a52531c67b
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/kvass.rsi/fill-2.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/kvass.rsi/fill-3.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/kvass.rsi/fill-3.png
new file mode 100644
index 0000000000..befe1fee89
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/kvass.rsi/fill-3.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/kvass.rsi/fill-4.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/kvass.rsi/fill-4.png
new file mode 100644
index 0000000000..6ff9030f02
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/kvass.rsi/fill-4.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/kvass.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/kvass.rsi/icon.png
new file mode 100644
index 0000000000..58a6f21576
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/kvass.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/kvass.rsi/icon_empty.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/kvass.rsi/icon_empty.png
new file mode 100644
index 0000000000..c748e25033
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/kvass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/kvass.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/kvass.rsi/meta.json
new file mode 100644
index 0000000000..46e8201343
--- /dev/null
+++ b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/kvass.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/TauCetiStation/TauCetiClassic/commit/c449d65dff642f44f3e0d8a312f70aec43ab2eae modified by Floofers",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemondrop.rsi/fill-1.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemondrop.rsi/fill-1.png
new file mode 100644
index 0000000000..971a973332
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemondrop.rsi/fill-1.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemondrop.rsi/fill-2.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemondrop.rsi/fill-2.png
new file mode 100644
index 0000000000..4726576610
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemondrop.rsi/fill-2.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemondrop.rsi/fill-3.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemondrop.rsi/fill-3.png
new file mode 100644
index 0000000000..e734aa69dc
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemondrop.rsi/fill-3.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemondrop.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemondrop.rsi/icon.png
index 494f567b52..cf7b5d589c 100644
Binary files a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemondrop.rsi/icon.png and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemondrop.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemondrop.rsi/icon_empty.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemondrop.rsi/icon_empty.png
new file mode 100644
index 0000000000..5db51797e7
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemondrop.rsi/icon_empty.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemondrop.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemondrop.rsi/meta.json
index 4c0b620dfd..f1449ce61a 100644
--- a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemondrop.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemondrop.rsi/meta.json
@@ -1,14 +1,26 @@
 {
-  "version": 1,
-  "license": "CC0-1.0",
-  "copyright": "Original work by TJohnson.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    }
-  ]
-}
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC0-1.0",
+    "copyright": "Original work by TJohnson.",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi/fill-1.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi/fill-1.png
new file mode 100644
index 0000000000..25b2262ff8
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi/fill-1.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi/fill-2.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi/fill-2.png
new file mode 100644
index 0000000000..aca6a87419
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi/fill-2.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi/fill-3.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi/fill-3.png
new file mode 100644
index 0000000000..9dd5c81f4c
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi/fill-3.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi/fill-4.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi/fill-4.png
new file mode 100644
index 0000000000..1b6b28dd19
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi/fill-4.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi/icon_empty.png b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi/icon_empty.png
new file mode 100644
index 0000000000..f86d44d757
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi/icon_empty.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi/meta.json
index 507c921294..531f1903f0 100644
--- a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi/meta.json
@@ -1,14 +1,29 @@
 {
-  "version": 1,
-  "license": "CC0-1.0",
-  "copyright": "Artwork by @Leonardo_DaBepis. https://leonardo-dabepis.tumblr.com/",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    }
-  ]
-}
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC0-1.0",
+    "copyright": "Artwork by @Leonardo_DaBepis. https://leonardo-dabepis.tumblr.com/",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/command-inhand-left.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/command-inhand-left.png
new file mode 100644
index 0000000000..86b16b5a78
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/command-inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/command-inhand-right.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/command-inhand-right.png
new file mode 100644
index 0000000000..5cd17b0e6d
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/command-inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/command-open.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/command-open.png
new file mode 100644
index 0000000000..34efb4dd63
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/command-open.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/command.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/command.png
new file mode 100644
index 0000000000..0d5d0bfa22
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/command.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/engineering-inhand-left.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/engineering-inhand-left.png
new file mode 100644
index 0000000000..194981597a
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/engineering-inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/engineering-inhand-right.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/engineering-inhand-right.png
new file mode 100644
index 0000000000..1a52ca2ebf
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/engineering-inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/engineering-open.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/engineering-open.png
new file mode 100644
index 0000000000..950bc8304f
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/engineering-open.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/engineering.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/engineering.png
new file mode 100644
index 0000000000..a5a197b7b0
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/engineering.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/epistemics-inhand-left.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/epistemics-inhand-left.png
new file mode 100644
index 0000000000..dad73747e8
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/epistemics-inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/epistemics-inhand-right.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/epistemics-inhand-right.png
new file mode 100644
index 0000000000..4388f7839d
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/epistemics-inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/epistemics-open.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/epistemics-open.png
new file mode 100644
index 0000000000..14cb5417f6
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/epistemics-open.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/epistemics.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/epistemics.png
new file mode 100644
index 0000000000..e3ebd39ca8
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/epistemics.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/generic-inhand-left.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/generic-inhand-left.png
new file mode 100644
index 0000000000..7436ccc512
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/generic-inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/generic-inhand-right.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/generic-inhand-right.png
new file mode 100644
index 0000000000..f41664fe88
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/generic-inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/generic-open.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/generic-open.png
new file mode 100644
index 0000000000..dda397af9b
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/generic-open.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/generic.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/generic.png
new file mode 100644
index 0000000000..8d7f88baee
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/generic.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/logistics-inhand-left.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/logistics-inhand-left.png
new file mode 100644
index 0000000000..81f03493d3
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/logistics-inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/logistics-inhand-right.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/logistics-inhand-right.png
new file mode 100644
index 0000000000..23b89a07df
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/logistics-inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/logistics-open.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/logistics-open.png
new file mode 100644
index 0000000000..fc001d591c
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/logistics-open.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/logistics.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/logistics.png
new file mode 100644
index 0000000000..5db3289dd0
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/logistics.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/medical-inhand-left.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/medical-inhand-left.png
new file mode 100644
index 0000000000..c961f024da
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/medical-inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/medical-inhand-right.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/medical-inhand-right.png
new file mode 100644
index 0000000000..51ad78bdcb
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/medical-inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/medical-open.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/medical-open.png
new file mode 100644
index 0000000000..5b6e804ab2
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/medical-open.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/medical.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/medical.png
new file mode 100644
index 0000000000..44a90acec0
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/medical.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/meta.json
new file mode 100644
index 0000000000..3a1567e3ed
--- /dev/null
+++ b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/meta.json
@@ -0,0 +1,137 @@
+{
+    "version":1,
+    "license":"CC-BY-SA-3.0",
+    "copyright":"made by noctyrnal (github) from the honkbox sprite made by brainfood1183 (github)",
+    "size":{
+        "x":32,
+        "y":32
+    },
+    "states":[
+        {
+            "name":"command"
+        },
+        {
+            "name":"command-open"
+        },
+        {
+            "name":"command-inhand-left",
+            "directions":4
+        },
+        {
+            "name":"command-inhand-right",
+            "directions":4
+        },
+        {
+            "name":"engineering"
+        },
+        {
+            "name":"engineering-open"
+        },
+        {
+            "name":"engineering-inhand-left",
+            "directions":4
+        },
+        {
+            "name":"engineering-inhand-right",
+            "directions":4
+        },
+        {
+            "name":"epistemics"
+        },
+        {
+            "name":"epistemics-open"
+        },
+        {
+            "name":"epistemics-inhand-left",
+            "directions":4
+        },
+        {
+            "name":"epistemics-inhand-right",
+            "directions":4
+        },
+        {
+            "name":"generic"
+        },
+        {
+            "name":"generic-open"
+        },
+        {
+            "name":"generic-inhand-left",
+            "directions":4
+        },
+        {
+            "name":"generic-inhand-right",
+            "directions":4
+        },
+        {
+            "name":"logistics"
+        },
+        {
+            "name":"logistics-open"
+        },
+        {
+            "name":"logistics-inhand-left",
+            "directions":4
+        },
+        {
+            "name":"logistics-inhand-right",
+            "directions":4
+        },
+        {
+            "name":"medical"
+        },
+        {
+            "name":"medical-open"
+        },
+        {
+            "name":"medical-inhand-left",
+            "directions":4
+        },
+        {
+            "name":"medical-inhand-right",
+            "directions":4
+        },
+        {
+            "name":"security"
+        },
+        {
+            "name":"security-open"
+        },
+        {
+            "name":"security-inhand-left",
+            "directions":4
+        },
+        {
+            "name":"security-inhand-right",
+            "directions":4
+        },
+        {
+            "name":"service"
+        },
+        {
+            "name":"service-open"
+        },
+        {
+            "name":"service-inhand-left",
+            "directions":4
+        },
+        {
+            "name":"service-inhand-right",
+            "directions":4
+        },
+        {
+            "name":"syndicate"
+        },
+        {
+            "name":"syndicate-open"
+        },
+        {
+            "name":"syndicate-inhand-left",
+            "directions":4
+        },
+        {
+            "name":"syndicate-inhand-right",
+            "directions":4
+        }
+    ]
+}
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/security-inhand-left.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/security-inhand-left.png
new file mode 100644
index 0000000000..269099c8fa
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/security-inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/security-inhand-right.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/security-inhand-right.png
new file mode 100644
index 0000000000..ec7cdef08b
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/security-inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/security-open.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/security-open.png
new file mode 100644
index 0000000000..496848d0e8
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/security-open.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/security.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/security.png
new file mode 100644
index 0000000000..a4da12b8d9
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/security.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/service-inhand-left.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/service-inhand-left.png
new file mode 100644
index 0000000000..550ed30dab
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/service-inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/service-inhand-right.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/service-inhand-right.png
new file mode 100644
index 0000000000..bbf16c764b
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/service-inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/service-open.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/service-open.png
new file mode 100644
index 0000000000..7184161315
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/service-open.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/service.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/service.png
new file mode 100644
index 0000000000..80db2c562c
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/service.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/syndicate-inhand-left.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/syndicate-inhand-left.png
new file mode 100644
index 0000000000..4d64d2f508
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/syndicate-inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/syndicate-inhand-right.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/syndicate-inhand-right.png
new file mode 100644
index 0000000000..aac2e633c5
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/syndicate-inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/syndicate-open.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/syndicate-open.png
new file mode 100644
index 0000000000..e6bec8b4e9
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/syndicate-open.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/syndicate.png b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/syndicate.png
new file mode 100644
index 0000000000..56bd7657ac
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi/syndicate.png differ
diff --git a/Resources/Textures/Fluids/puddle.rsi/meta.json b/Resources/Textures/Fluids/puddle.rsi/meta.json
index b47a24b44d..5e0b79b314 100644
--- a/Resources/Textures/Fluids/puddle.rsi/meta.json
+++ b/Resources/Textures/Fluids/puddle.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Made by Alekshhh on github",
+    "copyright": "Made by Alekshhh and modified by potato1234x on github",
     "states": [
         {
             "name": "splata"
diff --git a/Resources/Textures/Fluids/puddle.rsi/splat10.png b/Resources/Textures/Fluids/puddle.rsi/splat10.png
index 2b2abe9c32..96bd6b8cc2 100644
Binary files a/Resources/Textures/Fluids/puddle.rsi/splat10.png and b/Resources/Textures/Fluids/puddle.rsi/splat10.png differ
diff --git a/Resources/Textures/Fluids/puddle.rsi/splat11.png b/Resources/Textures/Fluids/puddle.rsi/splat11.png
index b3f0497f72..86334a69c6 100644
Binary files a/Resources/Textures/Fluids/puddle.rsi/splat11.png and b/Resources/Textures/Fluids/puddle.rsi/splat11.png differ
diff --git a/Resources/Textures/Fluids/puddle.rsi/splat12.png b/Resources/Textures/Fluids/puddle.rsi/splat12.png
index a8a2e7f90c..cd0c9b32c7 100644
Binary files a/Resources/Textures/Fluids/puddle.rsi/splat12.png and b/Resources/Textures/Fluids/puddle.rsi/splat12.png differ
diff --git a/Resources/Textures/Fluids/puddle.rsi/splat13.png b/Resources/Textures/Fluids/puddle.rsi/splat13.png
index a1cb82ad90..52c6b80abd 100644
Binary files a/Resources/Textures/Fluids/puddle.rsi/splat13.png and b/Resources/Textures/Fluids/puddle.rsi/splat13.png differ
diff --git a/Resources/Textures/Fluids/puddle.rsi/splat14.png b/Resources/Textures/Fluids/puddle.rsi/splat14.png
index fa2c45ae75..811c4f6557 100644
Binary files a/Resources/Textures/Fluids/puddle.rsi/splat14.png and b/Resources/Textures/Fluids/puddle.rsi/splat14.png differ
diff --git a/Resources/Textures/Fluids/puddle.rsi/splat3.png b/Resources/Textures/Fluids/puddle.rsi/splat3.png
index dbffc99bb7..73bd680478 100644
Binary files a/Resources/Textures/Fluids/puddle.rsi/splat3.png and b/Resources/Textures/Fluids/puddle.rsi/splat3.png differ
diff --git a/Resources/Textures/Fluids/puddle.rsi/splat5.png b/Resources/Textures/Fluids/puddle.rsi/splat5.png
index ca044c8285..97e0003022 100644
Binary files a/Resources/Textures/Fluids/puddle.rsi/splat5.png and b/Resources/Textures/Fluids/puddle.rsi/splat5.png differ
diff --git a/Resources/Textures/Fluids/puddle.rsi/splat6.png b/Resources/Textures/Fluids/puddle.rsi/splat6.png
index 02ca2579e5..05f90e61e7 100644
Binary files a/Resources/Textures/Fluids/puddle.rsi/splat6.png and b/Resources/Textures/Fluids/puddle.rsi/splat6.png differ
diff --git a/Resources/Textures/Fluids/puddle.rsi/splat7.png b/Resources/Textures/Fluids/puddle.rsi/splat7.png
index 05bbc5b8a9..d8e8633e08 100644
Binary files a/Resources/Textures/Fluids/puddle.rsi/splat7.png and b/Resources/Textures/Fluids/puddle.rsi/splat7.png differ
diff --git a/Resources/Textures/Fluids/puddle.rsi/splat9.png b/Resources/Textures/Fluids/puddle.rsi/splat9.png
index 05122c6752..b6f3f4f279 100644
Binary files a/Resources/Textures/Fluids/puddle.rsi/splat9.png and b/Resources/Textures/Fluids/puddle.rsi/splat9.png differ
diff --git a/Resources/Textures/Interface/Misc/health_icons.rsi/Critical.png b/Resources/Textures/Interface/Misc/health_icons.rsi/Critical.png
new file mode 100644
index 0000000000..779874eaae
Binary files /dev/null and b/Resources/Textures/Interface/Misc/health_icons.rsi/Critical.png differ
diff --git a/Resources/Textures/Interface/Misc/health_icons.rsi/Dead.png b/Resources/Textures/Interface/Misc/health_icons.rsi/Dead.png
new file mode 100644
index 0000000000..beceebd05c
Binary files /dev/null and b/Resources/Textures/Interface/Misc/health_icons.rsi/Dead.png differ
diff --git a/Resources/Textures/Interface/Misc/health_icons.rsi/Fine.png b/Resources/Textures/Interface/Misc/health_icons.rsi/Fine.png
index 8d07f93496..45725aa73c 100644
Binary files a/Resources/Textures/Interface/Misc/health_icons.rsi/Fine.png and b/Resources/Textures/Interface/Misc/health_icons.rsi/Fine.png differ
diff --git a/Resources/Textures/Interface/Misc/health_icons.rsi/Rotting.png b/Resources/Textures/Interface/Misc/health_icons.rsi/Rotting.png
new file mode 100644
index 0000000000..8965b1308d
Binary files /dev/null and b/Resources/Textures/Interface/Misc/health_icons.rsi/Rotting.png differ
diff --git a/Resources/Textures/Interface/Misc/health_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/health_icons.rsi/meta.json
index 9bc6327145..fb584d6b7f 100644
--- a/Resources/Textures/Interface/Misc/health_icons.rsi/meta.json
+++ b/Resources/Textures/Interface/Misc/health_icons.rsi/meta.json
@@ -5,10 +5,29 @@
         "y": 8
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/tgstation/tgstation/blob/master/icons/mob/huds/hud.dmi",
+    "copyright": "Taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/20ae083f140ac5b4da7e8bc40f95349001b6c086",
     "states": [
         {
             "name": "Fine"
+        },
+        {
+            "name": "Critical"
+        },
+        {
+            "name": "Dead",
+            "delays": [
+                [
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125
+                ]
+            ]
+        },
+        {
+            "name": "Rotting"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/InitialInfected.png b/Resources/Textures/Interface/Misc/job_icons.rsi/InitialInfected.png
new file mode 100644
index 0000000000..3684fc4488
Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/InitialInfected.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 1c9539e1ba..e5743c31e4 100644
--- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
+++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
@@ -185,6 +185,9 @@
         },
         {
             "name": "Visitor"
+        },
+        {
+            "name": "InitialInfected"
         }
     ]
 }
diff --git a/Resources/Textures/Interface/Misc/security_icons.rsi/hud_discharged.png b/Resources/Textures/Interface/Misc/security_icons.rsi/hud_discharged.png
new file mode 100644
index 0000000000..2e012349e0
Binary files /dev/null and b/Resources/Textures/Interface/Misc/security_icons.rsi/hud_discharged.png differ
diff --git a/Resources/Textures/Interface/Misc/security_icons.rsi/hud_incarcerated.png b/Resources/Textures/Interface/Misc/security_icons.rsi/hud_incarcerated.png
new file mode 100644
index 0000000000..1dc03f7b86
Binary files /dev/null and b/Resources/Textures/Interface/Misc/security_icons.rsi/hud_incarcerated.png differ
diff --git a/Resources/Textures/Interface/Misc/security_icons.rsi/hud_paroled.png b/Resources/Textures/Interface/Misc/security_icons.rsi/hud_paroled.png
new file mode 100644
index 0000000000..042fb147b1
Binary files /dev/null and b/Resources/Textures/Interface/Misc/security_icons.rsi/hud_paroled.png differ
diff --git a/Resources/Textures/Interface/Misc/security_icons.rsi/hud_suspected.png b/Resources/Textures/Interface/Misc/security_icons.rsi/hud_suspected.png
new file mode 100644
index 0000000000..cfb34742bf
Binary files /dev/null and b/Resources/Textures/Interface/Misc/security_icons.rsi/hud_suspected.png differ
diff --git a/Resources/Textures/Interface/Misc/security_icons.rsi/hud_wanted.png b/Resources/Textures/Interface/Misc/security_icons.rsi/hud_wanted.png
new file mode 100644
index 0000000000..2df379d112
Binary files /dev/null and b/Resources/Textures/Interface/Misc/security_icons.rsi/hud_wanted.png differ
diff --git a/Resources/Textures/Interface/Misc/security_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/security_icons.rsi/meta.json
new file mode 100644
index 0000000000..042eda20c6
--- /dev/null
+++ b/Resources/Textures/Interface/Misc/security_icons.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/blob/7f654b6e8e59021607a9e888dfeb79920401c372/icons/mob/huds/hud.dmi",
+  "size": {
+    "x": 8,
+    "y": 8
+  },
+  "states": [
+    {
+      "name": "hud_discharged"
+    },
+    {
+      "name": "hud_incarcerated"
+    },
+    {
+      "name": "hud_paroled"
+    },
+    {
+      "name": "hud_suspected"
+    },
+    {
+      "name": "hud_wanted"
+    }
+  ]
+}
diff --git a/Resources/Textures/Interface/VerbIcons/paint.svg b/Resources/Textures/Interface/VerbIcons/paint.svg
new file mode 100644
index 0000000000..78a56e3570
--- /dev/null
+++ b/Resources/Textures/Interface/VerbIcons/paint.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="svg834"
+   sodipodi:docname="plus.svg"
+   inkscape:version="1.1.2 (b8e25be833, 2022-02-05)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs838" />
+  <sodipodi:namedview
+     id="namedview836"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:pageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="33.666667"
+     inkscape:cx="11.985149"
+     inkscape:cy="7.2475248"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg834" />
+  <path
+     d="M 22.69307,10.252475 H 13.806931 V 1.3663366 H 10.252475 V 10.252475 H 1.3663366 v 3.554455 h 8.8861384 v 8.886139 h 3.554456 V 13.80693 h 8.886139 z"
+     id="path832"
+     inkscape:label="path832"
+     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke-width:0.888614" />
+</svg>
diff --git a/Resources/Textures/Interface/VerbIcons/paint.svg.192dpi.png b/Resources/Textures/Interface/VerbIcons/paint.svg.192dpi.png
new file mode 100644
index 0000000000..b7bd88245f
Binary files /dev/null and b/Resources/Textures/Interface/VerbIcons/paint.svg.192dpi.png differ
diff --git a/Resources/Textures/Interface/VerbIcons/paint.svg.192dpi.png.yml b/Resources/Textures/Interface/VerbIcons/paint.svg.192dpi.png.yml
new file mode 100644
index 0000000000..5c43e23305
--- /dev/null
+++ b/Resources/Textures/Interface/VerbIcons/paint.svg.192dpi.png.yml
@@ -0,0 +1,2 @@
+sample:
+  filter: true
diff --git a/Resources/Textures/Logo/icon-license.txt b/Resources/Textures/Logo/icon-license.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/Resources/Textures/Logo/source/EE_bannger.svg b/Resources/Textures/Logo/source/EE_bannger.svg
new file mode 100644
index 0000000000..91fef68b73
--- /dev/null
+++ b/Resources/Textures/Logo/source/EE_bannger.svg
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="a" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 367.72 152.89">
+  <defs>
+    <style>
+      .l {
+        fill: url(#c);
+      }
+
+      .l, .m, .n, .o, .p, .q, .r, .s, .t, .u, .v, .w {
+        stroke-width: 0px;
+      }
+
+      .x {
+        stroke: #231f20;
+      }
+
+      .x, .y {
+        fill: none;
+        stroke-width: 3px;
+      }
+
+      .m {
+        fill: url(#e);
+      }
+
+      .n {
+        fill: url(#g);
+      }
+
+      .o {
+        fill: url(#i);
+      }
+
+      .p {
+        fill: url(#b);
+      }
+
+      .q {
+        fill: url(#h);
+      }
+
+      .r {
+        fill: #fff;
+      }
+
+      .s {
+        fill: url(#j);
+      }
+
+      .t {
+        fill: url(#d);
+      }
+
+      .u {
+        fill: #231f20;
+      }
+
+      .v {
+        fill: url(#f);
+      }
+
+      .y {
+        stroke: #fff;
+      }
+
+      .w {
+        fill: url(#k);
+      }
+    </style>
+    <radialGradient id="b" data-name="Steel Radial" cx="315.67" cy="39.91" fx="315.67" fy="39.91" r="35.7" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#e5e2df"/>
+      <stop offset="0" stop-color="#f1efed"/>
+      <stop offset="0" stop-color="#fff"/>
+      <stop offset=".13" stop-color="#f0f0f0"/>
+      <stop offset=".37" stop-color="#c9cacb"/>
+      <stop offset=".52" stop-color="#adaeb0"/>
+      <stop offset=".6" stop-color="#a3a5a7"/>
+      <stop offset=".74" stop-color="#898d8f"/>
+      <stop offset=".91" stop-color="#5e6669"/>
+      <stop offset="1" stop-color="#465053"/>
+    </radialGradient>
+    <radialGradient id="c" data-name="Copper Radial" cx="315.79" cy="80.35" fx="315.79" fy="80.35" r="47.61" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#fff2db"/>
+      <stop offset=".31" stop-color="#d7b189"/>
+      <stop offset=".75" stop-color="#91562d"/>
+      <stop offset=".78" stop-color="#8d5027"/>
+      <stop offset="1" stop-color="#541513"/>
+    </radialGradient>
+    <radialGradient id="d" data-name="Copper Radial" cx="317.13" cy="38.32" fx="317.13" fy="38.32" r="8.5" xlink:href="#c"/>
+    <radialGradient id="e" data-name="Copper Radial" cx="317.13" cy="38.32" fx="317.13" fy="38.32" r="5.5" xlink:href="#c"/>
+    <radialGradient id="f" data-name="Pewter Radial" cx="342.13" cy="67.94" fx="342.13" fy="67.94" r="20.87" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#aeb0b7"/>
+      <stop offset=".32" stop-color="#a9a9a8"/>
+      <stop offset=".35" stop-color="#a9a9a6"/>
+      <stop offset=".5" stop-color="#9a9d9e"/>
+      <stop offset=".67" stop-color="#838c92"/>
+      <stop offset="1" stop-color="#657076"/>
+    </radialGradient>
+    <radialGradient id="g" data-name="Pewter Radial" cx="283.41" cy="117.32" fx="283.41" fy="117.32" r="22.49" xlink:href="#f"/>
+    <radialGradient id="h" data-name="Copper Radial" cx="328.45" cy="106.89" fx="328.45" fy="106.89" r="10" xlink:href="#c"/>
+    <radialGradient id="i" data-name="Copper Radial" cx="328.45" cy="106.89" fx="328.45" fy="106.89" r="6.4" xlink:href="#c"/>
+    <linearGradient id="j" data-name="Blue Steel" x1="3.61" y1="87.14" x2="45.95" y2="87.14" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#7da7d9"/>
+      <stop offset=".07" stop-color="#35517d"/>
+      <stop offset=".5" stop-color="#dee6f5"/>
+      <stop offset=".62" stop-color="#bacdea"/>
+      <stop offset=".67" stop-color="#b6cae8"/>
+      <stop offset=".71" stop-color="#aac3e5"/>
+      <stop offset=".76" stop-color="#96b6df"/>
+      <stop offset=".81" stop-color="#7aa5d8"/>
+      <stop offset=".81" stop-color="#7aa5d8"/>
+      <stop offset="1" stop-color="#174d6b"/>
+    </linearGradient>
+    <radialGradient id="k" data-name="Pewter Radial" cx="1843.67" cy="213.03" fx="1843.67" fy="213.03" r="17.69" gradientTransform="translate(1947.96 323.31) rotate(-180)" xlink:href="#f"/>
+  </defs>
+  <g>
+    <g>
+      <path class="r" d="m313.92,77.17c-3.04-.16-5.97-.66-8.71-1.48-1.3-.39-2.65-.88-4.12-1.52-.89-.38-1.48-1.24-1.51-2.21l-.25-7.42-6.38,2.9c-.33.15-.68.22-1.03.22-.63,0-1.25-.24-1.72-.69-3.31-3.15-6-6.86-7.98-11.03-.41-.86-.3-1.87.29-2.62l4-5.1-5.84-1.62c-.97-.27-1.69-1.1-1.81-2.1-.58-4.68-.25-9.41.97-14.06.24-.91.98-1.61,1.9-1.81l5.44-1.15-2.99-4.36c-.56-.81-.59-1.88-.07-2.72,2.54-4.15,5.83-7.71,9.77-10.59.44-.32.96-.48,1.48-.48.4,0,.81.1,1.18.29l4.48,2.39.49-5.03c.09-.96.73-1.78,1.63-2.11,4.11-1.5,8.4-2.26,12.77-2.26.49,0,.99,0,1.48.03.98.04,1.85.65,2.22,1.56l1.95,4.85,3.91-3.84c.48-.47,1.11-.72,1.75-.72.27,0,.54.04.81.14,4.56,1.56,8.69,3.92,12.27,7.02.76.66,1.05,1.71.74,2.67l-1.85,5.67,6.36-.49c.06,0,.13,0,.19,0,.87,0,1.69.46,2.14,1.21,2.38,3.96,3.99,8.27,4.78,12.8.18,1-.28,2.01-1.14,2.55l-5.86,3.65,5.99,4.28c.79.56,1.18,1.52,1.01,2.48-.27,1.51-.59,2.86-.97,4.13-.83,2.8-2.06,5.57-3.63,8.25-.45.77-1.28,1.23-2.15,1.23-.12,0-.23,0-.35-.02l-7.59-1.08,1.96,7.63c.25.96-.09,1.97-.87,2.59-3.45,2.72-7.31,4.8-11.46,6.17-.26.08-.52.13-.78.13-.7,0-1.38-.29-1.86-.83l-5.28-5.88-3.33,6.97c-.42.87-1.3,1.42-2.25,1.42-.04,0-.09,0-.13,0Zm1.98-43.68c-2.83,0-5.38,1.9-6.19,4.62-.49,1.65-.31,3.4.51,4.92.82,1.52,2.18,2.63,3.84,3.12.61.18,1.23.27,1.85.27,2.83,0,5.38-1.9,6.19-4.62.49-1.65.31-3.4-.51-4.92-.82-1.52-2.18-2.63-3.84-3.12-.61-.18-1.23-.27-1.85-.27Z"/>
+      <path class="r" d="m315.87,5.11c.46,0,.92,0,1.38.03l3.35,8.32,6.58-6.46c4.32,1.48,8.17,3.72,11.45,6.55l-3.01,9.22,10.09-.78c2.2,3.66,3.72,7.7,4.46,11.94l-9.04,5.63,9.03,6.45c-.23,1.29-.52,2.57-.9,3.86-.82,2.76-1.99,5.32-3.39,7.7l-11.3-1.6,2.9,11.25c-3.2,2.53-6.82,4.48-10.7,5.76l-7.78-8.66-4.95,10.34c-2.7-.14-5.42-.57-8.13-1.38-1.33-.4-2.61-.89-3.85-1.42l-.38-11.16-9.78,4.45c-3.11-2.96-5.62-6.45-7.45-10.29l6.3-8.05-9.44-2.63c-.53-4.28-.25-8.71.91-13.11l9.1-1.92-5.1-7.44c2.4-3.91,5.51-7.25,9.11-9.88l7.78,4.15.85-8.76c3.77-1.38,7.8-2.11,11.91-2.11m.04,43.81c3.86,0,7.42-2.51,8.58-6.4,1.42-4.74-1.28-9.73-6.02-11.15-.86-.26-1.72-.38-2.57-.38-3.86,0-7.42,2.51-8.58,6.4-1.42,4.74,1.28,9.73,6.02,11.15.86.26,1.72.38,2.57.38m-.04-48.81s0,0,0,0c-4.66,0-9.24.81-13.63,2.42-1.81.66-3.07,2.3-3.26,4.21l-.13,1.31-1.17-.63c-.74-.39-1.55-.59-2.35-.59-1.04,0-2.08.32-2.95.96-4.2,3.07-7.71,6.87-10.42,11.3-1.03,1.68-.98,3.81.14,5.44l.87,1.27-1.77.38c-1.85.39-3.32,1.79-3.8,3.62-1.31,4.96-1.65,10.01-1.03,15,.25,2,1.68,3.66,3.62,4.2l2.23.62-1.69,2.16c-1.17,1.49-1.39,3.52-.58,5.23,2.12,4.44,4.98,8.4,8.52,11.76.95.9,2.19,1.38,3.45,1.38.7,0,1.4-.15,2.07-.45l2.97-1.35.12,3.68c.07,1.93,1.24,3.66,3.02,4.42,1.57.67,3.01,1.21,4.4,1.62,2.93.87,6.05,1.4,9.29,1.58.09,0,.18,0,.27,0,1.92,0,3.68-1.1,4.51-2.84l1.72-3.59,2.78,3.09c.96,1.07,2.32,1.66,3.72,1.66.52,0,1.05-.08,1.57-.25,4.43-1.46,8.55-3.68,12.23-6.58,1.55-1.23,2.24-3.26,1.75-5.17l-1.03-4,3.89.55c.23.03.47.05.7.05,1.75,0,3.4-.92,4.31-2.46,1.68-2.86,2.98-5.82,3.88-8.81.41-1.36.74-2.8,1.03-4.4.34-1.9-.44-3.83-2.01-4.95l-2.94-2.1,2.68-1.67c1.73-1.08,2.63-3.1,2.28-5.11-.85-4.83-2.56-9.43-5.1-13.65-.91-1.51-2.54-2.43-4.29-2.43-.13,0-.26,0-.39.02l-2.63.2.69-2.11c.62-1.91.04-4.02-1.48-5.33-3.83-3.31-8.23-5.83-13.09-7.49-.53-.18-1.08-.27-1.62-.27-1.29,0-2.55.5-3.5,1.43l-1.24,1.22-.56-1.38c-.74-1.83-2.47-3.05-4.44-3.13-.53-.02-1.05-.03-1.58-.03h0Zm.04,43.81c-.38,0-.76-.06-1.14-.17-2.09-.62-3.29-2.84-2.66-4.93.5-1.67,2.06-2.83,3.79-2.83.38,0,.76.06,1.14.17,2.09.62,3.29,2.84,2.66,4.93-.5,1.67-2.06,2.83-3.79,2.83h0Z"/>
+    </g>
+    <g>
+      <path class="r" d="m289.95,135.39c-9.1,0-16.5-7.4-16.5-16.5s7.4-16.5,16.5-16.5c3.51,0,6.86,1.09,9.7,3.16,1.29.94,2.82,1.44,4.42,1.44.8,0,1.59-.13,2.35-.38,2.29-.76,4.09-2.59,4.81-4.9,1.9-6.13,7.19-10.85,13.48-12.03,2.62-.49,4.79-2.35,5.68-4.86.89-2.51.38-5.33-1.35-7.36-2.52-2.97-3.91-6.76-3.91-10.65,0-1.91.32-3.78.96-5.55.87-2.42.45-5.09-1.13-7.13-1.41-1.82-3.63-2.91-5.93-2.91-.23,0-.46.01-.69.03-.4.04-.81.06-1.22.06-7.17,0-13-5.83-13-13s5.83-13,13-13,13,5.83,13,13c0,1.06-.13,2.12-.38,3.13-.62,2.5.07,5.11,1.84,6.97,1.41,1.48,3.39,2.33,5.44,2.33.48,0,.96-.05,1.44-.14,1.04-.2,2.1-.3,3.17-.3,9.1,0,16.5,7.4,16.5,16.5,0,7.74-5.49,14.53-13.06,16.14-2.6.55-4.74,2.47-5.57,5s-.25,5.33,1.52,7.32c2.85,3.21,4.42,7.33,4.42,11.61,0,9.65-7.85,17.5-17.5,17.5-3.91,0-7.61-1.27-10.7-3.66-1.31-1.01-2.94-1.57-4.6-1.57-.73,0-1.45.11-2.15.31-2.31.69-4.16,2.47-4.95,4.75-2.29,6.68-8.57,11.17-15.62,11.17Z"/>
+      <path class="r" d="m317.13,27.82c5.79,0,10.5,4.71,10.5,10.5,0,.86-.1,1.71-.31,2.53-.82,3.32.1,6.82,2.46,9.3,1.91,2.01,4.54,3.11,7.25,3.11.64,0,1.28-.06,1.91-.18.88-.17,1.78-.26,2.69-.26,7.72,0,14,6.28,14,14,0,6.57-4.66,12.33-11.08,13.7-3.48.74-6.31,3.28-7.42,6.66s-.34,7.1,2.03,9.76c2.44,2.75,3.79,6.28,3.79,9.95,0,8.27-6.73,15-15,15-3.35,0-6.52-1.08-9.16-3.14-1.78-1.38-3.94-2.1-6.13-2.1-.96,0-1.92.14-2.86.42-3.09.92-5.55,3.28-6.59,6.34-1.94,5.67-7.27,9.48-13.25,9.48-7.72,0-14-6.28-14-14s6.28-14,14-14c2.98,0,5.82.93,8.22,2.68,1.73,1.27,3.8,1.92,5.9,1.92,1.05,0,2.12-.17,3.14-.51,3.06-1.01,5.45-3.45,6.41-6.53,1.63-5.25,6.17-9.3,11.55-10.31,3.5-.66,6.39-3.13,7.58-6.48s.51-7.09-1.8-9.81c-2.14-2.52-3.32-5.73-3.32-9.03,0-1.62.27-3.2.81-4.71,1.16-3.22.59-6.8-1.5-9.5-1.9-2.46-4.83-3.88-7.91-3.88-.3,0-.61.01-.92.04-.33.03-.66.05-.99.05-5.79,0-10.5-4.71-10.5-10.5s4.71-10.5,10.5-10.5m0-5c-8.55,0-15.5,6.95-15.5,15.5s6.95,15.5,15.5,15.5c.48,0,.97-.02,1.45-.07.15-.01.3-.02.46-.02,1.53,0,3.01.73,3.95,1.94,1.05,1.36,1.33,3.13.75,4.75-.73,2.04-1.11,4.2-1.11,6.4,0,4.49,1.6,8.84,4.5,12.27,1.15,1.35,1.49,3.23.9,4.91-.59,1.67-2.05,2.91-3.79,3.24-7.19,1.35-13.23,6.74-15.41,13.74-.48,1.54-1.67,2.76-3.2,3.26-.51.17-1.04.25-1.57.25-1.07,0-2.09-.33-2.95-.96-3.27-2.38-7.13-3.64-11.17-3.64-10.48,0-19,8.52-19,19s8.52,19,19,19c8.12,0,15.34-5.17,17.98-12.85.52-1.52,1.75-2.71,3.3-3.17.46-.14.95-.21,1.43-.21,1.1,0,2.19.37,3.07,1.05,3.53,2.74,7.76,4.18,12.23,4.18,11.03,0,20-8.97,20-20,0-4.89-1.79-9.61-5.05-13.27-1.18-1.33-1.57-3.2-1.01-4.88.55-1.69,1.98-2.96,3.71-3.33,8.72-1.85,15.04-9.67,15.04-18.59,0-10.48-8.52-19-19-19-1.23,0-2.45.12-3.65.35-.31.06-.64.09-.96.09-1.36,0-2.68-.57-3.62-1.56-1.18-1.25-1.64-2.98-1.23-4.65.3-1.21.46-2.47.46-3.74,0-8.55-6.95-15.5-15.5-15.5h0Z"/>
+    </g>
+    <g>
+      <circle class="r" cx="317.13" cy="38.32" r="10"/>
+      <path class="r" d="m317.13,30.82c4.14,0,7.5,3.36,7.5,7.5s-3.36,7.5-7.5,7.5-7.5-3.36-7.5-7.5,3.36-7.5,7.5-7.5m0-5c-6.89,0-12.5,5.61-12.5,12.5s5.61,12.5,12.5,12.5,12.5-5.61,12.5-12.5-5.61-12.5-12.5-12.5h0Z"/>
+    </g>
+    <g>
+      <circle class="r" cx="317.13" cy="38.32" r="7"/>
+      <path class="r" d="m317.13,33.82c2.49,0,4.5,2.01,4.5,4.5s-2.01,4.5-4.5,4.5-4.5-2.01-4.5-4.5,2.01-4.5,4.5-4.5m0-5c-5.24,0-9.5,4.26-9.5,9.5s4.26,9.5,9.5,9.5,9.5-4.26,9.5-9.5-4.26-9.5-9.5-9.5h0Z"/>
+    </g>
+    <g>
+      <path class="r" d="m342.13,90.32c-.58,0-1.15-.04-1.72-.08-1-.08-1.86-.75-2.18-1.7l-.3-.89-.64.69c-.48.52-1.15.81-1.84.81-.28,0-.57-.05-.84-.15-2.57-.92-4.92-2.27-6.98-4.03-.76-.65-1.06-1.7-.76-2.65l.29-.91-.94.19c-.17.03-.33.05-.49.05-.81,0-1.59-.4-2.06-1.09-1.52-2.22-2.62-4.7-3.26-7.37-.24-.98.14-2,.94-2.59l.76-.56-.85-.39c-.91-.42-1.49-1.34-1.46-2.35.08-2.75.64-5.4,1.66-7.88.38-.93,1.28-1.54,2.29-1.55h.96s-.46-.83-.46-.83c-.49-.88-.42-1.96.2-2.76,1.66-2.15,3.68-3.96,5.99-5.39.4-.25.86-.37,1.31-.37.51,0,1.02.16,1.45.46l.76.54.11-.95c.12-1,.82-1.83,1.78-2.11,2.06-.6,4.18-.91,6.29-.91.58,0,1.15.04,1.72.08,1,.08,1.86.75,2.18,1.7l.3.89.64-.69c.48-.52,1.15-.81,1.84-.81.28,0,.57.05.84.15,2.57.92,4.92,2.27,6.98,4.03.76.65,1.07,1.7.76,2.65l-.29.9.94-.19c.17-.03.33-.05.49-.05.81,0,1.59.4,2.06,1.09,1.52,2.22,2.62,4.7,3.26,7.37.24.98-.14,2-.94,2.59l-.76.56.85.39c.91.42,1.49,1.34,1.46,2.34-.08,2.75-.64,5.4-1.66,7.88-.38.93-1.28,1.54-2.29,1.55h-.96s.46.83.46.83c.49.88.42,1.96-.2,2.75-1.66,2.15-3.67,3.96-5.99,5.39-.4.25-.86.37-1.31.37-.51,0-1.02-.16-1.45-.46l-.77-.55-.11.95c-.12,1-.82,1.83-1.78,2.11-2.07.61-4.18.91-6.29.91Zm0-27.83c-3,0-5.45,2.44-5.45,5.45s2.45,5.45,5.45,5.45,5.45-2.44,5.45-5.45-2.45-5.45-5.45-5.45Z"/>
+      <path class="r" d="m342.13,48.07c.52,0,1.02.04,1.53.08l1.64,4.91,3.5-3.81c2.29.82,4.39,2.03,6.2,3.58l-1.56,4.94,5.09-1.03c1.34,1.96,2.32,4.17,2.89,6.54l-4.16,3.08,4.7,2.15c-.07,2.47-.58,4.83-1.47,7l-5.19.05,2.54,4.51c-1.47,1.9-3.27,3.52-5.32,4.79l-4.21-3-.6,5.15c-1.77.52-3.65.81-5.59.81-.52,0-1.02-.04-1.53-.08l-1.64-4.91-3.5,3.81c-2.29-.82-4.39-2.03-6.2-3.58l1.56-4.94-5.09,1.03c-1.34-1.96-2.32-4.17-2.89-6.54l4.16-3.08-4.7-2.15c.07-2.47.58-4.83,1.47-7l5.19-.05-2.54-4.51c1.47-1.9,3.27-3.52,5.32-4.79l4.21,3,.6-5.15c1.77-.52,3.65-.81,5.59-.81m0,27.82c4.39,0,7.95-3.56,7.95-7.95s-3.56-7.95-7.95-7.95-7.95,3.56-7.95,7.95,3.56,7.95,7.95,7.95m0-32.82c-2.35,0-4.7.34-6.99,1.01-1.14.33-2.09,1.05-2.73,1.99-.22-.03-.45-.05-.67-.05-.91,0-1.82.25-2.62.74-2.57,1.59-4.81,3.6-6.66,5.99-.72.93-1.07,2.07-1.04,3.2-1.01.54-1.82,1.41-2.28,2.51-1.14,2.76-1.76,5.71-1.85,8.77-.03,1.18.35,2.3,1.04,3.2-.49,1.02-.64,2.2-.36,3.35.71,2.97,1.93,5.72,3.63,8.2.67.98,1.65,1.66,2.74,1.98.2,1.11.78,2.15,1.68,2.92,2.29,1.95,4.9,3.46,7.76,4.48.55.2,1.12.29,1.68.29s1.15-.1,1.69-.29c.82.79,1.9,1.29,3.08,1.38.56.04,1.2.09,1.91.09,2.35,0,4.7-.34,6.99-1.01,1.14-.33,2.09-1.05,2.73-1.99.22.03.45.05.67.05.91,0,1.82-.25,2.62-.74,2.57-1.59,4.81-3.6,6.66-5.99.72-.93,1.07-2.07,1.04-3.2,1.01-.54,1.82-1.41,2.28-2.51,1.14-2.76,1.76-5.71,1.85-8.77.03-1.18-.35-2.3-1.04-3.2.49-1.02.64-2.2.36-3.35-.71-2.97-1.93-5.72-3.63-8.2-.67-.98-1.65-1.66-2.74-1.98-.2-1.11-.78-2.15-1.68-2.92-2.29-1.95-4.9-3.46-7.76-4.48-.55-.2-1.12-.29-1.68-.29-.58,0-1.15.1-1.69.29-.82-.79-1.9-1.29-3.08-1.38-.56-.04-1.2-.09-1.91-.09h0Zm0,27.82c-1.63,0-2.95-1.32-2.95-2.95s1.32-2.95,2.95-2.95,2.95,1.32,2.95,2.95-1.32,2.95-2.95,2.95h0Z"/>
+    </g>
+    <g>
+      <path class="r" d="m283.41,141.32c-.66,0-1.26-.05-1.85-.09-1-.08-1.86-.75-2.18-1.7l-.43-1.29-.92,1.01c-.48.52-1.15.81-1.84.81-.28,0-.57-.05-.84-.15-2.76-.99-5.28-2.44-7.48-4.32-.76-.65-1.07-1.7-.76-2.65l.41-1.31-1.36.27c-.17.03-.33.05-.49.05-.81,0-1.59-.4-2.06-1.09-1.63-2.38-2.81-5.04-3.5-7.91-.23-.98.14-2,.94-2.59l1.1-.81-1.24-.57c-.91-.42-1.49-1.34-1.46-2.34.08-2.95.68-5.79,1.78-8.46.38-.93,1.28-1.54,2.29-1.55h1.38s-.67-1.2-.67-1.2c-.49-.88-.42-1.96.2-2.75,1.78-2.3,3.94-4.25,6.43-5.78.4-.25.86-.37,1.31-.37.51,0,1.02.16,1.45.46l1.11.79.16-1.37c.12-1,.82-1.83,1.78-2.11,2.22-.65,4.49-.98,6.75-.98.66,0,1.29.05,1.85.09,1,.08,1.86.75,2.18,1.7l.43,1.29.92-1c.48-.52,1.15-.81,1.84-.81.28,0,.57.05.84.15,2.76.99,5.28,2.44,7.49,4.32.76.65,1.06,1.7.76,2.65l-.41,1.31,1.36-.27c.17-.03.33-.05.49-.05.81,0,1.59.4,2.06,1.09,1.63,2.38,2.8,5.04,3.5,7.9.24.98-.14,2-.94,2.59l-1.1.81,1.24.57c.91.42,1.49,1.34,1.46,2.34-.08,2.95-.68,5.8-1.78,8.46-.38.93-1.28,1.54-2.29,1.55h-1.38s.67,1.2.67,1.2c.49.88.42,1.96-.2,2.76-1.78,2.3-3.94,4.25-6.43,5.78-.4.25-.86.37-1.31.37-.51,0-1.02-.16-1.45-.46l-1.11-.79-.16,1.37c-.12,1-.82,1.83-1.78,2.11-2.22.65-4.49.98-6.75.98Zm0-30.1c-3.36,0-6.1,2.74-6.1,6.1s2.74,6.1,6.1,6.1,6.1-2.74,6.1-6.1-2.74-6.1-6.1-6.1Z"/>
+      <path class="r" d="m283.41,95.82c.56,0,1.11.04,1.66.08l1.78,5.31,3.79-4.12c2.48.88,4.74,2.2,6.71,3.87l-1.68,5.35,5.51-1.11c1.45,2.12,2.51,4.51,3.13,7.08l-4.5,3.33,5.09,2.33c-.08,2.68-.63,5.23-1.59,7.57l-5.62.05,2.75,4.88c-1.59,2.06-3.54,3.81-5.76,5.18l-4.56-3.25-.64,5.57c-1.92.56-3.94.88-6.04.88-.56,0-1.11-.04-1.66-.08l-1.78-5.31-3.79,4.12c-2.48-.88-4.74-2.2-6.71-3.87l1.68-5.35-5.51,1.11c-1.45-2.12-2.51-4.51-3.13-7.08l4.5-3.33-5.09-2.33c.08-2.68.63-5.23,1.59-7.57l5.62-.05-2.75-4.88c1.59-2.06,3.54-3.81,5.76-5.18l4.56,3.25.64-5.57c1.92-.56,3.94-.88,6.04-.88m0,30.1c4.75,0,8.6-3.85,8.6-8.6s-3.85-8.6-8.6-8.6-8.6,3.85-8.6,8.6,3.85,8.6,8.6,8.6m0-35.1c-2.5,0-5,.36-7.45,1.08-1.22.36-2.24,1.16-2.87,2.21-.31-.06-.62-.09-.93-.09-.91,0-1.82.25-2.62.74-2.74,1.69-5.13,3.83-7.09,6.38-.78,1-1.12,2.24-1.03,3.45-1.11.52-2.02,1.44-2.51,2.62-1.21,2.94-1.88,6.08-1.97,9.34-.04,1.27.41,2.47,1.2,3.4-.59,1.07-.78,2.34-.48,3.58.76,3.16,2.06,6.1,3.86,8.73.72,1.05,1.8,1.77,2.99,2.05.15,1.21.75,2.35,1.72,3.17,2.44,2.08,5.22,3.68,8.27,4.77.55.2,1.12.29,1.68.29.66,0,1.32-.13,1.93-.39.84.89,1.99,1.46,3.26,1.56.6.05,1.28.1,2.04.1,2.5,0,5-.36,7.45-1.08,1.22-.36,2.24-1.16,2.87-2.21.31.06.62.09.93.09.91,0,1.82-.25,2.62-.74,2.74-1.69,5.13-3.83,7.09-6.38.78-1,1.12-2.24,1.03-3.45,1.11-.52,2.02-1.44,2.51-2.62,1.21-2.94,1.88-6.08,1.97-9.34.04-1.27-.41-2.47-1.2-3.4.59-1.07.78-2.34.48-3.58-.76-3.16-2.06-6.1-3.86-8.73-.72-1.05-1.8-1.77-2.99-2.05-.15-1.21-.75-2.35-1.72-3.17-2.44-2.08-5.22-3.68-8.27-4.77-.55-.2-1.12-.29-1.68-.29-.66,0-1.32.13-1.93.39-.84-.89-1.99-1.46-3.26-1.56-.6-.05-1.28-.1-2.04-.1h0Zm0,30.1c-1.99,0-3.6-1.61-3.6-3.6s1.61-3.6,3.6-3.6,3.6,1.61,3.6,3.6-1.61,3.6-3.6,3.6h0Z"/>
+    </g>
+    <g>
+      <circle class="r" cx="328.45" cy="106.89" r="11.5"/>
+      <path class="r" d="m328.45,97.89c4.97,0,9,4.03,9,9s-4.03,9-9,9-9-4.03-9-9,4.03-9,9-9m0-5c-7.72,0-14,6.28-14,14s6.28,14,14,14,14-6.28,14-14-6.28-14-14-14h0Z"/>
+    </g>
+    <g>
+      <circle class="r" cx="328.45" cy="106.89" r="7.9"/>
+      <path class="r" d="m328.45,101.49c2.98,0,5.4,2.42,5.4,5.4s-2.42,5.4-5.4,5.4-5.4-2.42-5.4-5.4,2.42-5.4,5.4-5.4m0-5c-5.73,0-10.4,4.67-10.4,10.4s4.67,10.4,10.4,10.4,10.4-4.67,10.4-10.4-4.67-10.4-10.4-10.4h0Z"/>
+    </g>
+  </g>
+  <g>
+    <path class="u" d="m48.27,80.1v-40.44h20.28v40.44h-20.28Zm0-41.55v-15.46h6.33c7.7,0,13.96,6.26,13.96,13.96v1.5h-20.28Z"/>
+    <path class="r" d="m54.59,24.59c6.88,0,12.46,5.58,12.46,12.46h0s-17.28,0-17.28,0v-12.46h4.83m12.46,16.56v37.44h-17.28v-37.44h17.28m-12.46-19.56h-7.83v60h23.28v-44.55c0-8.52-6.93-15.46-15.46-15.46h0Z"/>
+  </g>
+  <g>
+    <path class="u" d="m156.84,80.1v-25.78h-13.36c5.85,1.64,9.3,6.09,9.3,12.4,0,8-5.96,13.38-14.82,13.38h-44.05v-21.23c0-1.95-.63-2.1-1.6-2.1-.45,0-.96.08-1.45.23v23.1h-20.28v-40.45h20.28v4.15c2.97-3.25,7.06-5.15,11.46-5.15,7.32,0,11.87,5.35,11.87,13.95v12.62h10.18c-5.8-1.65-9.22-6.14-9.22-12.54,0-7.43,6.22-13.03,14.46-13.03h27.23v-10.44h20.28v10.44h6.01v14.67h-6.01v25.78h-20.28Z"/>
+    <path class="r" d="m175.62,30.71v10.44h6.01v11.67h-6.01v25.78h-17.28v-25.78h-25.56c-1.08,0-1.37.58-1.37,1.15,0,.51.29,1.15,1.37,1.15h5.25c8.64,0,13.25,4.68,13.25,11.6s-4.97,11.88-13.32,11.88h-42.55v-19.73c0-2.45-1.01-3.6-3.1-3.6-1,0-2.08.29-2.95.72v22.61h-17.28v-37.45h17.28v7.57c2.52-5.33,7.49-8.57,12.96-8.57,6.34,0,10.37,4.53,10.37,12.45v14.12h23.04c1.01,0,1.37-.58,1.37-1.16,0-.64-.43-1.15-1.37-1.15h-6.05c-8.42,0-13.03-4.75-13.03-11.73s5.69-11.53,12.96-11.53h28.73v-10.44h17.28m3-3h-23.28v10.44h-25.73c-6.77,0-12.3,3.46-14.69,8.65-1.74-6-6.31-9.65-12.6-9.65-3.65,0-7.09,1.18-9.96,3.28v-2.28h-23.28v43.45h23.28v-23.33s0,0,.01,0c.02.13.04.33.04.6v22.73h45.55c9.76,0,16.32-5.98,16.32-14.88,0-4.6-1.71-8.35-4.74-10.9h5.8v25.78h23.28v-25.78h6.01v-17.67h-6.01v-10.44h0Zm-62.93,36.01v-3.16c.72,1.2,1.62,2.26,2.68,3.16h-2.68Z"/>
+  </g>
+  <g>
+    <g>
+      <path class="p" d="m314,75.68c-2.92-.16-5.73-.63-8.36-1.42-1.24-.37-2.54-.85-3.96-1.46l-.58-.25-.35-10.3-9.03,4.11-.49-.46c-3.18-3.03-5.76-6.59-7.66-10.58l-.27-.56,5.76-7.36-8.65-2.41-.08-.66c-.56-4.48-.24-9.02.93-13.49l.16-.6,8.24-1.74-4.62-6.74.34-.55c2.44-3.98,5.59-7.4,9.37-10.16l.51-.37,7.01,3.74.77-7.89.59-.22c3.94-1.44,8.07-2.17,12.25-2.17.47,0,.95,0,1.42.03l.65.03,3.04,7.54,5.96-5.84.58.2c4.38,1.5,8.34,3.77,11.78,6.74l.5.44-2.75,8.43,9.22-.72.32.53c2.28,3.8,3.83,7.94,4.59,12.29l.12.66-8.34,5.2,8.33,5.95-.11.62c-.26,1.45-.56,2.75-.93,3.97-.8,2.68-1.97,5.34-3.49,7.92l-.34.58-10.48-1.48,2.69,10.43-.51.4c-3.31,2.61-7.01,4.6-11,5.92l-.62.2-7.22-8.03-4.59,9.6-.67-.04Zm1.9-43.68c-3.49,0-6.63,2.34-7.62,5.69-.61,2.04-.39,4.19.62,6.06,1.01,1.87,2.69,3.24,4.73,3.84.74.22,1.51.33,2.28.33,3.49,0,6.63-2.34,7.62-5.69.61-2.04.39-4.19-.62-6.06-1.01-1.87-2.69-3.24-4.73-3.84-.74-.22-1.51-.33-2.28-.33Z"/>
+      <path class="u" d="m315.87,5.11c.46,0,.92,0,1.38.03l3.35,8.32,6.58-6.46c4.32,1.48,8.17,3.72,11.45,6.55l-3.01,9.22,10.09-.78c2.2,3.66,3.72,7.7,4.46,11.94l-9.04,5.63,9.03,6.45c-.23,1.29-.52,2.57-.9,3.86-.82,2.76-1.99,5.32-3.39,7.7l-11.3-1.6,2.9,11.25c-3.2,2.53-6.82,4.48-10.7,5.76l-7.78-8.66-4.95,10.34c-2.7-.14-5.42-.57-8.13-1.38-1.33-.4-2.61-.89-3.85-1.42l-.38-11.16-9.78,4.45c-3.11-2.96-5.62-6.45-7.45-10.29l6.3-8.05-9.44-2.63c-.53-4.28-.25-8.71.91-13.11l9.1-1.92-5.1-7.44c2.4-3.91,5.51-7.25,9.11-9.88l7.78,4.15.85-8.76c3.77-1.38,7.8-2.11,11.91-2.11m.04,43.81c3.86,0,7.42-2.51,8.58-6.4,1.42-4.74-1.28-9.73-6.02-11.15-.86-.26-1.72-.38-2.57-.38-3.86,0-7.42,2.51-8.58,6.4-1.42,4.74,1.28,9.73,6.02,11.15.86.26,1.72.38,2.57.38m-.04-45.81h0c-4.31,0-8.54.75-12.6,2.23l-1.18.43-.12,1.25-.56,5.78-5.14-2.74-1.11-.59-1.01.74c-3.88,2.84-7.13,6.35-9.64,10.45l-.68,1.11.73,1.07,3.41,4.97-6.17,1.3-1.21.26-.31,1.19c-1.21,4.59-1.53,9.26-.96,13.87l.16,1.32,1.28.36,6.56,1.83-4.46,5.69-.76.98.53,1.12c1.96,4.11,4.61,7.77,7.88,10.88l.98.93,1.23-.56,7.06-3.21.28,8.17.04,1.27,1.16.5c1.46.63,2.79,1.12,4.07,1.5,2.7.81,5.59,1.3,8.59,1.46l1.33.07.58-1.21,3.65-7.64,5.78,6.43.87.97,1.24-.41c4.1-1.35,7.91-3.4,11.31-6.09l1.02-.81-.33-1.26-2.15-8.35,8.34,1.18,1.33.19.68-1.15c1.56-2.65,2.76-5.39,3.59-8.14.37-1.26.69-2.59.95-4.07l.22-1.24-1.03-.74-6.59-4.71,6.5-4.05,1.14-.71-.23-1.33c-.78-4.47-2.37-8.72-4.72-12.63l-.64-1.06-1.23.1-7.11.55,2.08-6.38.41-1.26-1.01-.87c-3.54-3.05-7.61-5.39-12.11-6.93l-1.17-.4-.88.86-4.45,4.36-2.23-5.55-.48-1.2-1.29-.05c-.49-.02-.97-.03-1.46-.03h0Zm.04,43.81c-.67,0-1.34-.1-1.99-.29-3.68-1.1-5.78-4.98-4.68-8.66.87-2.93,3.62-4.97,6.67-4.97.67,0,1.34.1,1.99.29,1.78.53,3.25,1.73,4.13,3.36.88,1.64,1.08,3.52.55,5.3-.87,2.93-3.62,4.97-6.67,4.97h0Z"/>
+    </g>
+    <g>
+      <path class="l" d="m289.95,133.89c-8.27,0-15-6.73-15-15s6.73-15,15-15c3.19,0,6.24.99,8.81,2.87,1.55,1.13,3.39,1.73,5.31,1.73.96,0,1.91-.15,2.83-.46,2.75-.91,4.91-3.11,5.77-5.88,1.74-5.6,6.58-9.92,12.33-11,3.14-.59,5.75-2.83,6.82-5.84,1.07-3.01.45-6.39-1.62-8.83-2.29-2.7-3.55-6.14-3.55-9.68,0-1.74.29-3.43.87-5.04,1.05-2.91.54-6.11-1.35-8.55-1.69-2.19-4.35-3.49-7.12-3.49-.27,0-.55.01-.83.04-.36.03-.72.05-1.08.05-6.34,0-11.5-5.16-11.5-11.5s5.16-11.5,11.5-11.5,11.5,5.16,11.5,11.5c0,.94-.11,1.87-.34,2.77-.75,3,.08,6.13,2.21,8.37,1.69,1.78,4.07,2.8,6.52,2.8.58,0,1.16-.06,1.72-.17.94-.18,1.91-.28,2.88-.28,8.27,0,15,6.73,15,15,0,7.04-5,13.21-11.88,14.67-3.12.66-5.68,2.96-6.68,6-1,3.03-.3,6.4,1.82,8.79,2.61,2.93,4.04,6.7,4.04,10.61,0,8.82-7.18,16-16,16-3.57,0-6.95-1.16-9.78-3.35-1.57-1.22-3.53-1.89-5.52-1.89-.87,0-1.74.13-2.58.38-2.78.83-5,2.96-5.93,5.7-2.08,6.07-7.79,10.15-14.2,10.15Z"/>
+      <path class="u" d="m317.13,27.82c5.79,0,10.5,4.71,10.5,10.5,0,.86-.1,1.71-.31,2.53-.82,3.32.1,6.82,2.46,9.3,1.91,2.01,4.54,3.11,7.25,3.11.64,0,1.28-.06,1.91-.18.88-.17,1.78-.26,2.69-.26,7.72,0,14,6.28,14,14,0,6.57-4.66,12.33-11.08,13.7-3.48.74-6.31,3.28-7.42,6.66s-.34,7.1,2.03,9.76c2.44,2.75,3.79,6.28,3.79,9.95,0,8.27-6.73,15-15,15-3.35,0-6.52-1.08-9.16-3.14-1.78-1.38-3.94-2.1-6.13-2.1-.96,0-1.92.14-2.86.42-3.09.92-5.55,3.28-6.59,6.34-1.94,5.67-7.27,9.48-13.25,9.48-7.72,0-14-6.28-14-14s6.28-14,14-14c2.98,0,5.82.93,8.22,2.68,1.73,1.27,3.8,1.92,5.9,1.92,1.05,0,2.12-.17,3.14-.51,3.06-1.01,5.45-3.45,6.41-6.53,1.63-5.25,6.17-9.3,11.55-10.31,3.5-.66,6.39-3.13,7.58-6.48s.51-7.09-1.8-9.81c-2.14-2.52-3.32-5.73-3.32-9.03,0-1.62.27-3.2.81-4.71,1.16-3.22.59-6.8-1.5-9.5-1.9-2.46-4.83-3.88-7.91-3.88-.3,0-.61.01-.92.04-.33.03-.66.05-.99.05-5.79,0-10.5-4.71-10.5-10.5s4.71-10.5,10.5-10.5m0-2c-6.89,0-12.5,5.61-12.5,12.5s5.61,12.5,12.5,12.5c.39,0,.78-.02,1.17-.05.24-.02.49-.03.73-.03,2.46,0,4.82,1.16,6.32,3.1,1.68,2.17,2.13,5.02,1.2,7.6-.62,1.72-.93,3.53-.93,5.38,0,3.78,1.35,7.44,3.79,10.33,1.84,2.17,2.39,5.17,1.44,7.85-.95,2.68-3.27,4.66-6.06,5.19-6.11,1.15-11.25,5.73-13.1,11.68-.76,2.46-2.68,4.41-5.13,5.22-.81.27-1.66.41-2.51.41-1.71,0-3.34-.53-4.72-1.54-2.75-2-6-3.06-9.4-3.06-8.82,0-16,7.18-16,16s7.18,16,16,16c6.84,0,12.92-4.35,15.14-10.83.84-2.44,2.81-4.33,5.28-5.07.74-.22,1.51-.34,2.29-.34,1.77,0,3.51.6,4.9,1.68,3,2.33,6.59,3.56,10.39,3.56,9.37,0,17-7.63,17-17,0-4.16-1.53-8.16-4.3-11.28-1.89-2.12-2.51-5.11-1.62-7.81s3.16-4.74,5.94-5.33c7.34-1.56,12.67-8.14,12.67-15.65,0-8.82-7.18-16-16-16-1.03,0-2.07.1-3.07.3-.5.1-1.02.15-1.53.15-2.18,0-4.3-.91-5.8-2.49-1.89-1.99-2.63-4.77-1.97-7.44.24-.98.37-1.99.37-3.01,0-6.89-5.61-12.5-12.5-12.5h0Z"/>
+    </g>
+    <path class="t" d="m317.13,30.82c4.14,0,7.5,3.36,7.5,7.5s-3.36,7.5-7.5,7.5-7.5-3.36-7.5-7.5,3.36-7.5,7.5-7.5m0-1c-4.69,0-8.5,3.81-8.5,8.5s3.81,8.5,8.5,8.5,8.5-3.81,8.5-8.5-3.81-8.5-8.5-8.5h0Z"/>
+    <path class="m" d="m317.13,33.82c2.49,0,4.5,2.01,4.5,4.5s-2.01,4.5-4.5,4.5-4.5-2.01-4.5-4.5,2.01-4.5,4.5-4.5m0-1c-3.03,0-5.5,2.47-5.5,5.5s2.47,5.5,5.5,5.5,5.5-2.47,5.5-5.5-2.47-5.5-5.5-5.5h0Z"/>
+    <g>
+      <path class="v" d="m342.13,88.82c-.54,0-1.08-.04-1.61-.08l-.66-.05-1.32-3.93-2.81,3.05-.62-.22c-2.4-.86-4.59-2.12-6.51-3.76l-.5-.43,1.25-3.96-4.08.82-.37-.55c-1.42-2.07-2.44-4.38-3.04-6.87l-.16-.64,3.33-2.47-3.77-1.72.02-.66c.07-2.57.6-5.04,1.55-7.35l.25-.61,4.16-.04-2.03-3.61.41-.52c1.55-2,3.43-3.69,5.59-5.03l.56-.35,3.37,2.4.48-4.13.64-.19c1.93-.56,3.9-.85,5.87-.85.54,0,1.07.04,1.61.08l.66.05,1.32,3.93,2.81-3.05.62.22c2.4.86,4.59,2.12,6.51,3.76l.5.43-1.25,3.96,4.08-.82.37.55c1.42,2.07,2.44,4.38,3.04,6.87l.16.64-3.33,2.47,3.77,1.72-.02.66c-.07,2.57-.59,5.04-1.55,7.35l-.25.61-4.16.04,2.03,3.61-.41.52c-1.55,2-3.43,3.69-5.59,5.03l-.56.35-3.37-2.4-.48,4.13-.64.19c-1.93.56-3.9.85-5.87.85Zm0-27.83c-3.83,0-6.95,3.12-6.95,6.95s3.12,6.95,6.95,6.95,6.95-3.12,6.95-6.95-3.12-6.95-6.95-6.95Z"/>
+      <path class="u" d="m342.13,48.07c.52,0,1.02.04,1.53.08l1.64,4.91,3.5-3.81c2.29.82,4.39,2.03,6.2,3.58l-1.56,4.94,5.09-1.03c1.34,1.96,2.32,4.17,2.89,6.54l-4.16,3.08,4.7,2.15c-.07,2.47-.58,4.83-1.47,7l-5.19.05,2.54,4.51c-1.47,1.9-3.27,3.52-5.32,4.79l-4.21-3-.6,5.15c-1.77.52-3.65.81-5.59.81-.52,0-1.02-.04-1.53-.08l-1.64-4.91-3.5,3.81c-2.29-.82-4.39-2.03-6.2-3.58l1.56-4.94-5.09,1.03c-1.34-1.96-2.32-4.17-2.89-6.54l4.16-3.08-4.7-2.15c.07-2.47.58-4.83,1.47-7l5.19-.05-2.54-4.51c1.47-1.9,3.27-3.52,5.32-4.79l4.21,3,.6-5.15c1.77-.52,3.65-.81,5.59-.81m0,27.82c4.39,0,7.95-3.56,7.95-7.95s-3.56-7.95-7.95-7.95-7.95,3.56-7.95,7.95,3.56,7.95,7.95,7.95m0-29.82c-2.06,0-4.13.3-6.15.89l-1.27.37-.15,1.32-.21,1.79-1.46-1.04-1.08-.77-1.13.7c-2.26,1.39-4.23,3.17-5.86,5.27l-.81,1.05.65,1.16.88,1.56-1.81.02h-1.32s-.51,1.24-.51,1.24c-1,2.42-1.55,5.02-1.62,7.71l-.04,1.32,1.2.55,1.62.74-1.44,1.07-1.06.79.31,1.29c.63,2.61,1.7,5.03,3.19,7.2l.75,1.09,1.3-.26,1.77-.36-.54,1.71-.4,1.26,1.01.86c2.01,1.71,4.31,3.04,6.82,3.94l1.25.45.9-.98,1.21-1.32.57,1.7.42,1.26,1.32.1c.54.04,1.09.08,1.68.08,2.06,0,4.13-.3,6.15-.89l1.27-.37.15-1.32.21-1.79,1.46,1.04,1.08.77,1.13-.7c2.26-1.39,4.23-3.17,5.86-5.27l.81-1.05-.65-1.16-.88-1.56,1.81-.02h1.33s.51-1.24.51-1.24c1-2.43,1.55-5.02,1.62-7.71l.04-1.32-1.2-.55-1.62-.74,1.44-1.07,1.06-.79-.31-1.29c-.63-2.61-1.7-5.03-3.19-7.2l-.75-1.09-1.3.26-1.77.36.54-1.71.4-1.26-1.01-.86c-2.01-1.71-4.31-3.04-6.82-3.94l-1.25-.45-.9.98-1.21,1.32-.57-1.7-.42-1.26-1.32-.1c-.53-.04-1.09-.08-1.68-.08h0Zm0,27.82c-3.28,0-5.95-2.67-5.95-5.95s2.67-5.95,5.95-5.95,5.95,2.67,5.95,5.95-2.67,5.95-5.95,5.95h0Z"/>
+    </g>
+    <g>
+      <path class="n" d="m283.41,139.82c-.58,0-1.16-.04-1.73-.09l-.66-.05-1.45-4.33-3.09,3.36-.62-.22c-2.59-.93-4.95-2.29-7.02-4.05l-.5-.43,1.37-4.36-4.49.91-.37-.55c-1.53-2.23-2.63-4.72-3.28-7.41l-.15-.64,3.67-2.72-4.15-1.9.02-.66c.08-2.77.64-5.43,1.67-7.93l.25-.61,4.59-.04-2.24-3.98.41-.52c1.67-2.16,3.69-3.98,6.03-5.42l.56-.35,3.72,2.65.53-4.55.64-.19c2.08-.61,4.21-.92,6.33-.92.58,0,1.16.04,1.73.09l.66.05,1.45,4.33,3.09-3.36.62.22c2.59.93,4.95,2.29,7.02,4.05l.5.43-1.37,4.36,4.5-.91.37.55c1.53,2.23,2.63,4.72,3.27,7.41l.16.64-3.67,2.72,4.15,1.9-.02.66c-.08,2.77-.64,5.44-1.67,7.93l-.25.61-4.59.04,2.24,3.98-.41.52c-1.67,2.16-3.7,3.98-6.03,5.42l-.56.35-3.72-2.65-.53,4.55-.64.19c-2.08.61-4.21.92-6.33.92Zm0-30.1c-4.19,0-7.6,3.41-7.6,7.6s3.41,7.6,7.6,7.6,7.6-3.41,7.6-7.6-3.41-7.6-7.6-7.6Z"/>
+      <path class="u" d="m283.41,95.82c.56,0,1.11.04,1.66.08l1.78,5.31,3.79-4.12c2.48.88,4.74,2.2,6.71,3.87l-1.68,5.35,5.51-1.11c1.45,2.12,2.51,4.51,3.13,7.08l-4.5,3.33,5.09,2.33c-.08,2.68-.63,5.23-1.59,7.57l-5.62.05,2.75,4.88c-1.59,2.06-3.54,3.81-5.76,5.18l-4.56-3.25-.64,5.57c-1.92.56-3.94.88-6.04.88-.56,0-1.11-.04-1.66-.08l-1.78-5.31-3.79,4.12c-2.48-.88-4.74-2.2-6.71-3.87l1.68-5.35-5.51,1.11c-1.45-2.12-2.51-4.51-3.13-7.08l4.5-3.33-5.09-2.33c.08-2.68.63-5.23,1.59-7.57l5.62-.05-2.75-4.88c1.59-2.06,3.54-3.81,5.76-5.18l4.56,3.25.64-5.57c1.92-.56,3.94-.88,6.04-.88m0,30.1c4.75,0,8.6-3.85,8.6-8.6s-3.85-8.6-8.6-8.6-8.6,3.85-8.6,8.6,3.85,8.6,8.6,8.6m0-32.1c-2.21,0-4.44.32-6.61.96l-1.27.37-.15,1.32-.26,2.21-1.8-1.28-1.08-.77-1.13.7c-2.43,1.5-4.55,3.4-6.29,5.66l-.81,1.05.65,1.16,1.09,1.93-2.23.02h-1.32s-.51,1.24-.51,1.24c-1.07,2.6-1.66,5.39-1.74,8.28l-.04,1.32,1.2.55,2.01.92-1.78,1.32-1.06.79.31,1.29c.68,2.8,1.83,5.41,3.42,7.74l.75,1.09,1.3-.26,2.19-.44-.67,2.12-.4,1.26,1.01.86c2.16,1.84,4.63,3.26,7.33,4.23l1.25.45.9-.98,1.5-1.63.7,2.1.42,1.26,1.32.1c.58.04,1.17.09,1.81.09,2.21,0,4.44-.32,6.61-.96l1.27-.37.15-1.32.26-2.21,1.8,1.28,1.08.77,1.13-.7c2.43-1.5,4.55-3.4,6.29-5.66l.81-1.05-.65-1.16-1.09-1.93,2.23-.02h1.32s.51-1.24.51-1.24c1.07-2.6,1.66-5.39,1.74-8.28l.04-1.32-1.2-.55-2.01-.92,1.78-1.32,1.06-.79-.31-1.29c-.68-2.8-1.83-5.41-3.42-7.74l-.75-1.09-1.3.26-2.19.44.67-2.12.4-1.26-1.01-.86c-2.16-1.84-4.63-3.26-7.33-4.23l-1.25-.45-.9.98-1.5,1.63-.7-2.1-.42-1.26-1.32-.1c-.58-.04-1.17-.09-1.81-.09h0Zm0,30.1c-3.64,0-6.6-2.96-6.6-6.6s2.96-6.6,6.6-6.6,6.6,2.96,6.6,6.6-2.96,6.6-6.6,6.6h0Z"/>
+    </g>
+    <path class="q" d="m328.45,97.89c4.97,0,9,4.03,9,9s-4.03,9-9,9-9-4.03-9-9,4.03-9,9-9m0-1c-5.51,0-10,4.49-10,10s4.49,10,10,10,10-4.49,10-10-4.49-10-10-10h0Z"/>
+    <path class="o" d="m328.45,101.49c2.98,0,5.4,2.42,5.4,5.4s-2.42,5.4-5.4,5.4-5.4-2.42-5.4-5.4,2.42-5.4,5.4-5.4m0-1c-3.53,0-6.4,2.87-6.4,6.4s2.87,6.4,6.4,6.4,6.4-2.87,6.4-6.4-2.87-6.4-6.4-6.4h0Z"/>
+  </g>
+  <g>
+    <path class="u" d="m203.2,81.1c-12.47,0-21.52-8.96-21.52-21.3s8.99-21.16,21.37-21.16c14.78,0,21.52,11.42,21.52,22.02v1.45h.06l-.21,1.69c-1.29,10.18-10.02,17.3-21.22,17.3Zm-4.05-18.94c.69,1.61,2.09,2.47,4.05,2.47,2.44,0,3.69-1.13,4-1.72l.4-.75h-8.45Zm6.42-7.18c-.64-.45-1.46-.67-2.44-.67s-1.83.23-2.51.67h4.96Z"/>
+    <path class="r" d="m203.05,40.15c14.47,0,20.02,11.3,20.02,20.52h-25.85c.43,3.53,2.74,5.47,5.98,5.47,2.81,0,4.68-1.3,5.33-2.52h14.4c-1.15,9.07-8.79,15.99-19.73,15.99-11.67,0-20.02-8.5-20.02-19.8s7.85-19.66,19.87-19.66m-5.4,16.35h10.73c-.79-2.38-2.67-3.67-5.26-3.67s-4.61,1.37-5.47,3.67m5.4-19.35c-13.04,0-22.87,9.74-22.87,22.66s9.9,22.8,23.02,22.8c11.98,0,21.31-7.65,22.71-18.61l.04-.33h.13v-.99l.26-2.06h-.26c-.02-11.32-7.23-23.47-23.02-23.47h0Z"/>
+  </g>
+  <g>
+    <path class="u" d="m225.89,80.1v-40.44h20.28v40.44h-20.28Zm0-41.55v-15.46h6.32c7.7,0,13.96,6.26,13.96,13.96v1.5h-20.28Z"/>
+    <path class="r" d="m232.21,24.59c6.88,0,12.46,5.58,12.46,12.46h0s-17.28,0-17.28,0v-12.46h4.82m12.46,16.56v37.44h-17.28v-37.44h17.28m-12.46-19.56h-7.82v60h23.28v-44.55c0-8.52-6.93-15.46-15.46-15.46h0Z"/>
+  </g>
+  <g>
+    <path class="u" d="m141.36,138.1v-40.44h20.28v40.44h-20.28Zm0-41.55v-15.46h6.33c7.7,0,13.96,6.26,13.96,13.96v1.5h-20.28Z"/>
+    <path class="r" d="m147.69,82.59c6.88,0,12.46,5.58,12.46,12.46h0s-17.28,0-17.28,0v-12.46h4.83m12.46,16.56v37.44h-17.28v-37.44h17.28m-12.46-19.56h-7.83v60h23.28v-44.55c0-8.52-6.93-15.46-15.46-15.46h0Z"/>
+  </g>
+  <g>
+    <polygon class="s" points="45.95 75.68 45.95 149.22 3.61 149.22 3.61 128.51 20.24 128.51 20.24 122.43 3.61 122.43 3.61 103.79 20.24 103.79 20.24 97.68 3.61 97.68 3.61 25.05 45.95 25.05 45.95 45.78 24.75 45.78 24.75 51.84 45.95 51.84 45.95 69.39 24.75 69.39 24.75 75.68 45.95 75.68"/>
+    <polygon class="x" points="45.95 75.68 45.95 149.22 3.61 149.22 3.61 128.51 20.24 128.51 20.24 122.43 3.61 122.43 3.61 103.79 20.24 103.79 20.24 97.68 3.61 97.68 3.61 25.05 45.95 25.05 45.95 45.78 24.75 45.78 24.75 51.84 45.95 51.84 45.95 69.39 24.75 69.39 24.75 75.68 45.95 75.68"/>
+    <polygon class="y" points="3.61 151.22 1.61 149.22 1.61 128.51 3.61 126.51 18.24 126.51 18.24 124.43 3.61 124.43 1.61 122.43 1.61 103.79 3.61 101.79 18.24 101.79 18.24 99.68 3.61 99.68 1.61 97.68 1.61 25.05 3.61 23.05 45.95 23.05 47.95 25.05 47.95 45.78 45.95 47.78 26.75 47.78 26.75 49.84 45.95 49.84 47.95 51.84 47.95 69.39 45.95 71.39 26.75 71.39 26.75 73.68 45.95 73.68 47.95 75.68 47.95 149.22 45.95 151.22 3.61 151.22"/>
+  </g>
+  <g>
+    <path class="u" d="m270.54,80.1v-21.23c0-2.1-.81-2.1-1.6-2.1-.25,0-.29,0-.45.09v23.24h-20.28v-40.44h20.28v4.14c2.97-3.25,7.06-5.15,11.46-5.15,7.32,0,11.87,5.35,11.87,13.96v27.49h-21.28Z"/>
+    <path class="r" d="m279.95,40.15c6.34,0,10.37,4.54,10.37,12.46v25.99h-18.28v-19.73c0-2.45-1.01-3.6-3.1-3.6-1.01,0-1.09.29-1.95.72v22.61h-17.28v-37.44h17.28v7.56c2.52-5.33,7.49-8.57,12.96-8.57m0-3c-3.65,0-7.09,1.18-9.96,3.28v-2.28h-23.28v43.44h46.61v-28.99c0-9.39-5.25-15.46-13.37-15.46h0Z"/>
+  </g>
+  <g>
+    <path class="w" d="m113.6,134.02c-2.21-.09-4.37-.49-6.44-1.21l-1.04-.36.06-2.2-1.71,1.46-.92-.52c-1.88-1.07-3.6-2.41-5.1-3.98l-.77-.81,1.17-2.06-2.36.55-.57-.88c-1.16-1.8-2.05-3.75-2.64-5.81l-.31-1.07,2.17-1.4-2.54-.65-.09-1.06c-.04-.55-.09-1.15-.09-1.77,0-1.5.16-3.02.47-4.51l.23-1.08,2.78-.25-2.08-1.88.44-.99c.84-1.92,1.96-3.7,3.31-5.3l.7-.83,2.7,1.1-1-2.72.86-.67c1.65-1.29,3.48-2.34,5.42-3.12l1-.4,1.9,2.25.39-2.89,1.08-.19c1.35-.24,2.6-.35,3.82-.35l1.59.07.08,1.43v16.77l-1.63-.04h-.1c-1.98.02-3.58,1.62-3.58,3.58s1.6,3.56,3.57,3.59c.06,0,.12-.01.18-.02l1.55-.05v14.62l-1.47,3.71-1.06-.04Z"/>
+    <path class="u" d="m114.47,91.89c.06,0,.11,0,.17,0v15.23c-.06,0-.11-.02-.17-.02-2.84,0-5.14,2.28-5.14,5.1s2.3,5.1,5.14,5.1c.06,0,.11-.01.17-.02v12.78l-.98,2.46c-2.1-.08-4.11-.47-6-1.13l.13-4.49-3.48,2.98c-1.77-1-3.36-2.25-4.75-3.71l2.3-4.06-4.66,1.08c-1.07-1.65-1.9-3.47-2.46-5.41l4.12-2.65-4.83-1.24c-.04-.55-.08-1.1-.08-1.65,0-1.44.16-2.84.44-4.2l5.09-.47-3.83-3.45c.79-1.8,1.83-3.46,3.08-4.94l4.84,1.98-1.8-4.89c1.53-1.19,3.22-2.18,5.05-2.9l3.38,4,.7-5.15c1.16-.2,2.35-.33,3.57-.33m0-3c-1.31,0-2.64.12-4.08.37l-2.16.38-.08.63-.41-.49-2.01.8c-2.08.83-4.02,1.95-5.79,3.33l-1.72,1.35.2.55-.55-.23-1.41,1.66c-1.45,1.71-2.64,3.62-3.54,5.67l-.87,1.99.34.31-.46.04-.46,2.16c-.34,1.59-.51,3.21-.51,4.82,0,.68.05,1.34.09,1.9l.17,2.13.25.06-.22.14.61,2.14c.63,2.2,1.58,4.29,2.82,6.21l1.14,1.77h.06s-.04.05-.04.05l1.54,1.61c1.6,1.68,3.44,3.11,5.45,4.25l1.77,1h0s.04.02.04.02h.02s0,0,0,0l2.01.7c2.2.77,4.51,1.2,6.87,1.3l2.12.08.78-1.97.98-2.46.21-.53v-16.45l-3.09.1c-.06,0-.13,0-.19.01-1.13-.06-2.02-.98-2.02-2.09s.9-2.03,2.02-2.09c.06,0,.13,0,.19.01l3.1.1v-21.3l-2.98-.02s-.12,0-.19,0h0Z"/>
+    <path class="r" d="m114.47,89.89s.15,0,.18,0c1.07.05,1.98.93,1.98,2v15.23c0,.54-.22,1.06-.6,1.43-.37.36-.88.57-1.4.57-.02,0-.18,0-.25-.02-1.69.05-3.06,1.42-3.06,3.09s1.36,3.05,3.05,3.09c.06,0,.23-.02.26-.02.52,0,1.02.2,1.39.56.39.38.61.9.61,1.44v12.78c0,.25-.05.5-.14.74l-.98,2.46c-.3.76-1.04,1.26-1.86,1.26-.03,0-.05,0-.08,0-2.26-.09-4.47-.5-6.58-1.24-.82-.28-1.36-1.06-1.34-1.92l-.05.04c-.37.32-.83.48-1.3.48-.34,0-.68-.09-.99-.26-1.92-1.09-3.68-2.46-5.21-4.07-.61-.64-.73-1.6-.29-2.37l.06-.1-.23.05c-.15.03-.3.05-.45.05-.67,0-1.31-.34-1.68-.91-1.19-1.84-2.1-3.84-2.7-5.94-.24-.85.1-1.75.84-2.23l.27-.17-.4-.1c-.83-.21-1.43-.93-1.5-1.77-.04-.54-.09-1.17-.09-1.82,0-1.54.16-3.09.49-4.61.18-.86.9-1.5,1.77-1.58l.54-.05-.43-.39c-.64-.58-.84-1.5-.49-2.29.86-1.96,2-3.79,3.39-5.43.39-.46.95-.71,1.53-.71.25,0,.51.05.76.15l.64.26-.23-.63c-.3-.82-.04-1.73.65-2.27,1.69-1.32,3.56-2.4,5.54-3.19.24-.1.49-.14.74-.14.58,0,1.14.25,1.53.71l.47.56.09-.68c.12-.86.78-1.55,1.64-1.7,1.38-.24,2.66-.36,3.91-.36m0-4c-1.49,0-2.99.14-4.6.42-.94.16-1.8.54-2.53,1.08-.17-.01-.34-.02-.51-.02-.76,0-1.51.14-2.22.43-2.34.93-4.54,2.2-6.53,3.75-.75.58-1.32,1.31-1.71,2.12-.84.36-1.6.92-2.21,1.64-1.63,1.93-2.98,4.08-3.99,6.4-.37.85-.54,1.75-.51,2.63-.55.7-.94,1.53-1.14,2.45-.38,1.79-.57,3.62-.57,5.44,0,.79.05,1.52.1,2.14.07.89.34,1.73.76,2.47-.13.84-.08,1.73.16,2.59.71,2.48,1.78,4.84,3.19,7.01.46.71,1.06,1.31,1.74,1.76.28.77.72,1.48,1.31,2.11,1.81,1.9,3.87,3.51,6.14,4.79.7.4,1.48.65,2.28.74.58.53,1.27.94,2.05,1.21,2.48.87,5.09,1.36,7.74,1.46.08,0,.16,0,.23,0,2.47,0,4.66-1.49,5.58-3.79l.98-2.46c.28-.71.42-1.45.42-2.22v-12.78c0-1.62-.67-3.19-1.83-4.32-.3-.29-.63-.55-.97-.76.35-.22.68-.48.99-.78,1.15-1.12,1.81-2.69,1.81-4.3v-15.23c0-3.21-2.55-5.84-5.8-6-.06,0-.3,0-.37,0h0Z"/>
+  </g>
+  <g>
+    <path class="u" d="m223.05,139.25c-1.93,0-3.91-.24-5.89-.72-3.82-.92-7.17-2.65-9.86-5.07v4.64h-21.29v-21.23c0-2.1-.77-2.1-1.59-2.1-.25,0-.3,0-.45.09v23.24h-20.29v-40.45h20.29v4.14c2.97-3.25,7.06-5.14,11.46-5.14,4.89,0,8.67,2.49,10.54,6.8,3.84-4.42,9.31-6.91,15.38-6.91,1.83,0,3.72.23,5.6.68,6.8,1.63,11.79,5.45,14.42,11.04,2.13,4.51,2.62,10.12,1.34,15.4l-.34,1.41h.06s-.6,1.61-.6,1.61c-2.94,7.75-10.13,12.57-18.78,12.57Zm-5.4-20.08c.3,1.73,1.45,2.89,3.36,3.35.54.13,1.06.2,1.57.2,1.4,0,2.35-.5,2.73-.93l.57-.64-8.22-1.98Zm7.93-5.47c-.52-.59-1.26-1-2.22-1.23-.42-.1-.84-.15-1.24-.15-.48,0-.93.08-1.35.23l4.81,1.16Z"/>
+    <path class="r" d="m221.35,98.04c1.69,0,3.44.21,5.24.64,14.07,3.38,16.82,15.67,14.66,24.63l-25.13-6.05c-.4,3.53,1.38,5.96,4.53,6.72.68.16,1.32.24,1.92.24,1.79,0,3.16-.66,3.85-1.44l14,3.37c-2.66,7.02-9.23,11.6-17.38,11.6-1.78,0-3.64-.22-5.54-.68-5.03-1.21-9.04-3.9-11.71-7.47v7h-18.29v-19.73c0-2.45-1-3.6-3.09-3.6-1.01,0-1.09.28-1.95.72v22.61h-17.29v-37.45h17.29v7.56c2.52-5.32,7.48-8.56,12.96-8.56s8.85,3.05,9.99,8.53c3.41-5.3,9.14-8.64,15.94-8.64m6.6,17.78c-.21-2.5-1.73-4.2-4.25-4.81-.55-.13-1.08-.2-1.59-.2-1.9,0-3.5.89-4.59,2.49l10.43,2.52m-6.6-20.78s0,0,0,0c-5.77,0-11.03,2.09-15.02,5.86-2.32-3.68-6.14-5.75-10.9-5.75-3.65,0-7.09,1.18-9.96,3.28v-2.28h-23.29v43.45h46.62v-3.08c2.36,1.58,5.05,2.75,8.01,3.46,2.1.5,4.2.76,6.24.76,9.29,0,17.02-5.19,20.18-13.53l.12-.31.12.03.23-.95.74-1.95-.25-.06c1.34-5.59.81-11.54-1.46-16.35-1.98-4.19-6.26-9.66-15.43-11.86-1.99-.48-3.99-.72-5.95-.72h0Z"/>
+  </g>
+  <g>
+    <path class="u" d="m244.01,138.1v-13.61h17.13c.28,0,.47-.03.61-.06-.12-.02-.3-.05-.55-.05h-2.44c-9.32,0-15.58-5.28-15.58-13.14s6.26-13.14,15.58-13.14h20.4v13.61h-10.31c7.14,1.3,11.86,6.29,11.86,13,0,7.88-6.45,13.39-15.69,13.39h-21.01Z"/>
+    <path class="r" d="m277.66,99.6v10.61h-14.75c-1.33,0-2.11.49-2.11,1.33,0,.79.78,1.33,2.11,1.33h2.11c8.76,0,14.19,5.08,14.19,11.84s-5.43,11.89-14.19,11.89h-19.51v-10.61h15.63c1.77,0,2.33-.84,2.33-1.53,0-.74-.55-1.58-2.27-1.58h-2.44c-8.59,0-14.08-4.74-14.08-11.64s5.49-11.64,14.08-11.64h18.9m3-3h-21.9c-10.22,0-17.08,5.88-17.08,14.64,0,5.08,2.31,9.19,6.24,11.75h-5.41v16.61h22.51c10.12,0,17.19-6.12,17.19-14.89,0-4.84-2.17-8.87-5.82-11.5h4.27v-16.61h0Zm-19.25,29.3h0Z"/>
+  </g>
+  <g>
+    <path class="u" d="m48.45,151.39v-13.99l68.8-.2c.15-.07.52-.7.52-1.59v-48.28h21.56v48.57c0,7.12-3.08,15.61-17.77,15.61l-73.11-.11Z"/>
+    <path class="r" d="m137.83,88.82v47.07c0,9.07-5.26,14.11-16.27,14.11l-71.61-.11v-11l67.3-.2c1.3,0,2.02-1.65,2.02-3.09v-46.78h18.56m3-3h-24.56v49.78s0,.06,0,.09l-66.33.2h-2.99v17h3s71.61.11,71.61.11c12.43,0,19.27-6.08,19.27-17.11v-50.07h0Z"/>
+  </g>
+  <g>
+    <path class="u" d="m70.78,136.77v-21.23c0-2.1-.76-2.1-1.49-2.1-.43,0-.9.08-1.35.22v23.11h-19.67v-40.45h19.67v4.04c2.86-3.19,6.79-5.04,11-5.04,7.1,0,11.5,5.35,11.5,13.95v27.5h-19.67Z"/>
+    <path class="r" d="m78.94,96.82c6.12,0,10,4.53,10,12.45v26h-16.67v-19.73c0-2.45-.97-3.6-2.99-3.6-.96,0-2.01.28-2.85.72v22.61h-16.67v-37.45h16.67v7.56c2.43-5.32,7.23-8.56,12.5-8.56m0-3c-3.47,0-6.75,1.13-9.5,3.16v-2.16h-22.67v43.45h45.18v-29c0-9.39-5.1-15.45-13-15.45h0Z"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/Resources/Textures/Logo/source/EE_logo-dark.svg b/Resources/Textures/Logo/source/EE_logo-dark.svg
new file mode 100644
index 0000000000..b22cf86cb9
--- /dev/null
+++ b/Resources/Textures/Logo/source/EE_logo-dark.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="a" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 119.95 124.86">
+  <defs>
+    <style>
+      .e {
+        fill: url(#c);
+      }
+
+      .e, .f, .g, .h {
+        stroke-width: 0px;
+      }
+
+      .f {
+        fill: url(#b);
+      }
+
+      .g {
+        fill: url(#d);
+      }
+
+      .h {
+        fill: #231f20;
+      }
+    </style>
+    <radialGradient id="b" data-name="Steel Radial" cx="85.14" cy="38.8" fx="85.14" fy="38.8" r="34.81" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#e5e2df"/>
+      <stop offset="0" stop-color="#f1efed"/>
+      <stop offset="0" stop-color="#fff"/>
+      <stop offset=".13" stop-color="#f0f0f0"/>
+      <stop offset=".37" stop-color="#c9cacb"/>
+      <stop offset=".52" stop-color="#adaeb0"/>
+      <stop offset=".6" stop-color="#a3a5a7"/>
+      <stop offset=".74" stop-color="#898d8f"/>
+      <stop offset=".91" stop-color="#5e6669"/>
+      <stop offset="1" stop-color="#465053"/>
+    </radialGradient>
+    <radialGradient id="c" data-name="Steel Radial" cx="34.56" cy="86.09" fx="34.56" fy="86.09" r="34.67" xlink:href="#b"/>
+    <linearGradient id="d" data-name="Blue Steel" x1="34.97" y1="61.43" x2="83.97" y2="61.43" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#7da7d9"/>
+      <stop offset=".07" stop-color="#35517d"/>
+      <stop offset=".5" stop-color="#dee6f5"/>
+      <stop offset=".62" stop-color="#bacdea"/>
+      <stop offset=".67" stop-color="#b6cae8"/>
+      <stop offset=".71" stop-color="#aac3e5"/>
+      <stop offset=".76" stop-color="#96b6df"/>
+      <stop offset=".81" stop-color="#7aa5d8"/>
+      <stop offset=".81" stop-color="#7aa5d8"/>
+      <stop offset="1" stop-color="#174d6b"/>
+    </linearGradient>
+  </defs>
+  <path class="f" d="m119.95,38.76c0-1.34-.09-2.65-.24-3.95l-10.5-3.6,7.05-7.98c-1.93-3.85-4.54-7.29-7.69-10.17l-9.45,3.64.24-9.7c-3.95-1.77-8.28-2.82-12.84-3l-4.46,8.07-5.59-7.02c-4.46,1.14-8.56,3.13-12.14,5.8l1.69,8.64-8.64-1.75c-2.7,3.55-4.72,7.63-5.9,12.07l7.02,5.67-8.17,4.44c.15,4.55,1.15,8.88,2.88,12.83l9.8-.18-3.74,9.51c2.85,3.15,6.26,5.78,10.08,7.73l8.1-7.06,3.55,10.59c1.35.16,2.71.26,4.1.26,2.82,0,5.55-.37,8.18-1.01l1.78-11.33,9.93,6.07c3.35-2.33,6.26-5.24,8.6-8.58l-6-9.95,11.29-1.7c.66-2.68,1.05-5.47,1.05-8.35Zm-34.81,9c-4.95,0-8.96-4.01-8.96-8.96s4.01-8.96,8.96-8.96,8.96,4.01,8.96,8.96-4.01,8.96-8.96,8.96Z"/>
+  <path class="e" d="m68.21,96.07c.38-1.28.67-2.57.9-3.86l-9.03-6.45,9.04-5.63c-.74-4.24-2.27-8.29-4.46-11.94l-10.09.78,3.01-9.22c-3.27-2.83-7.13-5.07-11.45-6.55l-6.58,6.46-3.35-8.32c-4.6-.18-9.1.55-13.29,2.08l-.85,8.76-7.78-4.15c-3.6,2.63-6.71,5.96-9.11,9.88l5.1,7.44-9.1,1.92C0,81.68-.27,86.11.26,90.39l9.44,2.63-6.3,8.05c1.83,3.84,4.34,7.33,7.45,10.29l9.78-4.45.38,11.16c1.24.54,2.52,1.02,3.85,1.42,2.71.81,5.43,1.23,8.13,1.38l4.95-10.34,7.78,8.66c3.87-1.28,7.49-3.23,10.7-5.76l-2.9-11.25,11.3,1.6c1.4-2.38,2.57-4.94,3.39-7.7Zm-35.93-1.33c-4.74-1.42-7.44-6.41-6.02-11.15s6.41-7.44,11.15-6.02,7.44,6.41,6.02,11.15c-1.42,4.74-6.41,7.44-11.15,6.02Z"/>
+  <g>
+    <polygon class="g" points="34.97 121.36 34.97 97.2 55.08 97.2 55.08 96.58 34.97 96.58 34.97 75.37 55.08 75.37 55.08 73.68 34.97 73.68 34.97 1.5 83.97 1.5 83.97 25.68 64.28 25.68 64.28 26.28 83.97 26.28 83.97 47.51 64.28 47.51 64.28 49.2 83.97 49.2 83.97 121.36 34.97 121.36"/>
+    <path class="h" d="m81.47,4v19.17h-19.7v5.61h19.7v16.23h-19.7v6.68h19.7v67.17h-44v-19.16h20.1v-5.62h-20.1v-16.22h20.1v-6.68h-20.1V4h44m5-5h-54v124.86h54V-1h0Z"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/Resources/Textures/Logo/source/EE_logo-light.svg b/Resources/Textures/Logo/source/EE_logo-light.svg
new file mode 100644
index 0000000000..236919fe2f
--- /dev/null
+++ b/Resources/Textures/Logo/source/EE_logo-light.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="a" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 119.95 117.82">
+  <defs>
+    <style>
+      .e {
+        fill: url(#c);
+      }
+
+      .e, .f, .g {
+        stroke-width: 0px;
+      }
+
+      .f {
+        fill: url(#b);
+      }
+
+      .g {
+        fill: url(#d);
+      }
+    </style>
+    <radialGradient id="b" data-name="Steel Radial" cx="103.06" cy="34.8" fx="103.06" fy="34.8" r="27.35" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#e5e2df"/>
+      <stop offset="0" stop-color="#f1efed"/>
+      <stop offset="0" stop-color="#fff"/>
+      <stop offset=".13" stop-color="#f0f0f0"/>
+      <stop offset=".37" stop-color="#c9cacb"/>
+      <stop offset=".52" stop-color="#adaeb0"/>
+      <stop offset=".6" stop-color="#a3a5a7"/>
+      <stop offset=".74" stop-color="#898d8f"/>
+      <stop offset=".91" stop-color="#5e6669"/>
+      <stop offset="1" stop-color="#465053"/>
+    </radialGradient>
+    <radialGradient id="c" data-name="Steel Radial" cx="16.09" cy="83.12" fx="16.09" fy="83.12" r="27.05" xlink:href="#b"/>
+    <linearGradient id="d" data-name="Blue Steel" x1="37.48" y1="58.44" x2="81.48" y2="58.44" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#7da7d9"/>
+      <stop offset=".07" stop-color="#35517d"/>
+      <stop offset=".5" stop-color="#dee6f5"/>
+      <stop offset=".62" stop-color="#bacdea"/>
+      <stop offset=".67" stop-color="#b6cae8"/>
+      <stop offset=".71" stop-color="#aac3e5"/>
+      <stop offset=".76" stop-color="#96b6df"/>
+      <stop offset=".81" stop-color="#7aa5d8"/>
+      <stop offset=".81" stop-color="#7aa5d8"/>
+      <stop offset="1" stop-color="#174d6b"/>
+    </linearGradient>
+  </defs>
+  <path class="f" d="m119.95,34.77c0-1.34-.09-2.66-.24-3.95l-10.5-3.61,7.05-7.98c-1.93-3.85-4.54-7.29-7.69-10.17l-9.45,3.64.25-9.7c-3.95-1.77-8.28-2.82-12.85-3l-.35.63v25.27c4.47.51,7.93,4.3,7.93,8.9s-3.46,8.4-7.93,8.91v25.88c2.45-.08,4.82-.44,7.12-.99l1.78-11.33,9.93,6.08c3.35-2.34,6.26-5.24,8.61-8.58l-6-9.95,11.29-1.7c.66-2.68,1.05-5.47,1.05-8.35Z"/>
+  <path class="e" d="m32.17,74.61v-26.19c-3.2.24-6.31.92-9.28,2.01l-.85,8.75-7.78-4.14c-3.6,2.63-6.71,5.96-9.11,9.88l5.11,7.44-9.1,1.92C0,78.69-.28,83.12.26,87.4l9.44,2.63-6.3,8.04c1.83,3.84,4.34,7.34,7.45,10.29l9.78-4.44.38,11.16c1.24.54,2.52,1.03,3.85,1.42,2.43.73,4.88,1.14,7.31,1.32v-26.11c-4.68-1.46-7.32-6.41-5.92-11.11.89-2.96,3.17-5.13,5.92-5.99Z"/>
+  <polygon class="g" points="81.48 48.71 81.48 115.87 37.48 115.87 37.48 96.71 57.58 96.71 57.58 91.09 37.48 91.09 37.48 74.87 57.58 74.87 57.58 68.19 37.48 68.19 37.48 1.01 81.48 1.01 81.48 20.18 61.78 20.18 61.78 25.79 81.48 25.79 81.48 42.02 61.78 42.02 61.78 48.71 81.48 48.71"/>
+</svg>
\ No newline at end of file
diff --git a/Resources/Textures/Mobs/Animals/buffrat.rsi/eyes.png b/Resources/Textures/Mobs/Animals/buffrat.rsi/eyes.png
new file mode 100644
index 0000000000..27e2720a91
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/buffrat.rsi/eyes.png differ
diff --git a/Resources/Textures/Mobs/Animals/buffrat.rsi/meta.json b/Resources/Textures/Mobs/Animals/buffrat.rsi/meta.json
index 41c6250280..4aac226eb4 100644
--- a/Resources/Textures/Mobs/Animals/buffrat.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/buffrat.rsi/meta.json
@@ -1,21 +1,25 @@
 {
-  "version": 1,
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "license": "CC-BY-NC-SA-4.0",
-  "copyright": "Created by RamZ",
-  "states": [
-    {
-      "name": "dead"
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
     },
-	{
-      "name": "icon"
-    },
-    {
-      "name": "regalrat",
-      "directions": 4
-    }
-  ]
+    "license": "CC-BY-NC-SA-4.0",
+    "copyright": "Created by RamZ + eyes added by jamessimo",
+    "states": [
+        {
+            "name": "dead"
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "regalrat",
+            "directions": 4
+        },
+        {
+            "name": "eyes",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Mobs/Animals/mouse.rsi/meta.json b/Resources/Textures/Mobs/Animals/mouse.rsi/meta.json
index fb49b05c13..8fcbe50997 100644
--- a/Resources/Textures/Mobs/Animals/mouse.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/mouse.rsi/meta.json
@@ -16,9 +16,6 @@
     {
       "name": "icon-2"
     },
-    {
-      "name": "icon-3"
-    },
     {
       "name": "mouse-0",
       "directions": 4
@@ -109,36 +106,6 @@
         ]
       ]
     },
-    {
-      "name": "mouse-3",
-      "directions": 4
-    },
-    {
-      "name": "mouse-moving-3",
-      "directions": 4,
-      "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
-        ]
-      ]
-    },
     {
       "name": "dead-0"
     },
@@ -148,9 +115,6 @@
     {
       "name": "dead-2"
     },
-    {
-      "name": "dead-3"
-    },
     {
       "name": "splat-0"
     },
@@ -160,9 +124,6 @@
     {
       "name": "splat-2"
     },
-    {
-      "name": "splat-3"
-    },
     {
       "name": "0-equipped-HELMET",
       "directions": 4
diff --git a/Resources/Textures/Mobs/Animals/mouse.rsi/mouse-moving-3.png b/Resources/Textures/Mobs/Animals/mouse.rsi/mouse-moving-3.png
deleted file mode 100644
index 4b0694a76b..0000000000
Binary files a/Resources/Textures/Mobs/Animals/mouse.rsi/mouse-moving-3.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Animals/mouse.rsi/dead-3.png b/Resources/Textures/Mobs/Animals/rat.rsi/dead.png
similarity index 100%
rename from Resources/Textures/Mobs/Animals/mouse.rsi/dead-3.png
rename to Resources/Textures/Mobs/Animals/rat.rsi/dead.png
diff --git a/Resources/Textures/Mobs/Animals/rat.rsi/eyes-moving.png b/Resources/Textures/Mobs/Animals/rat.rsi/eyes-moving.png
new file mode 100644
index 0000000000..34020dad68
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/rat.rsi/eyes-moving.png differ
diff --git a/Resources/Textures/Mobs/Animals/rat.rsi/eyes.png b/Resources/Textures/Mobs/Animals/rat.rsi/eyes.png
new file mode 100644
index 0000000000..716195bc43
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/rat.rsi/eyes.png differ
diff --git a/Resources/Textures/Mobs/Animals/mouse.rsi/icon-3.png b/Resources/Textures/Mobs/Animals/rat.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Mobs/Animals/mouse.rsi/icon-3.png
rename to Resources/Textures/Mobs/Animals/rat.rsi/icon.png
diff --git a/Resources/Textures/Mobs/Animals/rat.rsi/meta.json b/Resources/Textures/Mobs/Animals/rat.rsi/meta.json
new file mode 100644
index 0000000000..be50d5e880
--- /dev/null
+++ b/Resources/Textures/Mobs/Animals/rat.rsi/meta.json
@@ -0,0 +1,80 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/commit/e15c63d100db65eaaa5231133b8a2662ff439131#diff-8dd94e19fdb2ff341b57e31bce101298 eyes added by jamessimo",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "rat",
+            "directions": 4
+        },
+        {
+            "name": "eyes",
+            "directions": 4
+        },
+        {
+            "name": "rat-moving",
+            "directions": 4,
+            "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
+                ]
+            ]
+        },
+        {
+            "name": "eyes-moving",
+            "directions": 4,
+            "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
+                ]
+            ]
+        },
+        {
+            "name": "dead"
+        },
+        {
+            "name": "splat"
+        }
+    ]
+}
diff --git a/Resources/Textures/Mobs/Animals/rat.rsi/rat-moving.png b/Resources/Textures/Mobs/Animals/rat.rsi/rat-moving.png
new file mode 100644
index 0000000000..f6c1d6d936
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/rat.rsi/rat-moving.png differ
diff --git a/Resources/Textures/Mobs/Animals/mouse.rsi/mouse-3.png b/Resources/Textures/Mobs/Animals/rat.rsi/rat.png
similarity index 100%
rename from Resources/Textures/Mobs/Animals/mouse.rsi/mouse-3.png
rename to Resources/Textures/Mobs/Animals/rat.rsi/rat.png
diff --git a/Resources/Textures/Mobs/Animals/mouse.rsi/splat-3.png b/Resources/Textures/Mobs/Animals/rat.rsi/splat.png
similarity index 100%
rename from Resources/Textures/Mobs/Animals/mouse.rsi/splat-3.png
rename to Resources/Textures/Mobs/Animals/rat.rsi/splat.png
diff --git a/Resources/Textures/Mobs/Animals/regalrat.rsi/eyes.png b/Resources/Textures/Mobs/Animals/regalrat.rsi/eyes.png
new file mode 100644
index 0000000000..8b841a0499
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/regalrat.rsi/eyes.png differ
diff --git a/Resources/Textures/Mobs/Animals/regalrat.rsi/meta.json b/Resources/Textures/Mobs/Animals/regalrat.rsi/meta.json
index 5c80471313..f3ed84b963 100644
--- a/Resources/Textures/Mobs/Animals/regalrat.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/regalrat.rsi/meta.json
@@ -1,24 +1,28 @@
 {
-  "version": 1,
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b Changed by Alekshhh",
-  "states": [
-    {
-      "name": "critical"
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "dead"
-    },
-	{
-      "name": "icon"
-    },
-    {
-      "name": "regalrat",
-      "directions": 4
-    }
-  ]
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b Changed by Alekshhh + eyes added by jamessimo",
+    "states": [
+        {
+            "name": "critical"
+        },
+        {
+            "name": "dead"
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "regalrat",
+            "directions": 4
+        },
+        {
+            "name": "eyes",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/crewcut2.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/crewcut2.png
new file mode 100644
index 0000000000..2209a9ce83
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/human_hair.rsi/crewcut2.png differ
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/long_bedhead2.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/long_bedhead2.png
new file mode 100644
index 0000000000..12520f077d
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/human_hair.rsi/long_bedhead2.png differ
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
index 5b682389ed..5cb41c258b 100644
--- a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
@@ -235,6 +235,10 @@
         "name": "crewcut",
         "directions": 4
       },
+      {
+        "name": "crewcut2",
+        "directions": 4
+      },
       {
         "name": "curls",
         "directions": 4
@@ -419,6 +423,10 @@
         "name": "long_bedhead",
         "directions": 4
       },
+      {
+        "name": "long_bedhead2",
+        "directions": 4
+      },
       {
         "name": "longemo",
         "directions": 4
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
index 829bcddf0f..89a44c1cfd 100644
--- a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
@@ -84,7 +84,7 @@
       "directions": 4
     },
     {
-        "name": "tail_smooth_wagging",
+        "name": "tail_smooth_wagging_primary",
         "directions": 4,
         "delays": [
             [0.125, 0.1, 0.075, 0.075, 0.075, 0.075, 0.075, 0.1, 0.125, 0.1, 0.075, 0.075, 0.075, 0.075, 0.075, 0.1],
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/atomicpunch.rsi/fill-1.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/atomicpunch.rsi/fill-1.png
new file mode 100644
index 0000000000..626b771591
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/atomicpunch.rsi/fill-1.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/atomicpunch.rsi/fill-2.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/atomicpunch.rsi/fill-2.png
new file mode 100644
index 0000000000..94362120a8
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/atomicpunch.rsi/fill-2.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/atomicpunch.rsi/fill-3.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/atomicpunch.rsi/fill-3.png
new file mode 100644
index 0000000000..2fed2373f7
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/atomicpunch.rsi/fill-3.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/atomicpunch.rsi/fill-4.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/atomicpunch.rsi/fill-4.png
new file mode 100644
index 0000000000..3e1e473156
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/atomicpunch.rsi/fill-4.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/atomicpunch.rsi/icon.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/atomicpunch.rsi/icon.png
index 95e24bc9cf..c3cd7597e6 100644
Binary files a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/atomicpunch.rsi/icon.png and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/atomicpunch.rsi/icon.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/atomicpunch.rsi/icon_empty.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/atomicpunch.rsi/icon_empty.png
new file mode 100644
index 0000000000..dd2bbc94ac
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/atomicpunch.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/atomicpunch.rsi/meta.json b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/atomicpunch.rsi/meta.json
index 3e33d3ec6a..17d033b167 100644
--- a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/atomicpunch.rsi/meta.json
+++ b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/atomicpunch.rsi/meta.json
@@ -9,6 +9,21 @@
     "states": [
         {
             "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
         }
     ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/brainbomb.rsi/fill-1.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/brainbomb.rsi/fill-1.png
new file mode 100644
index 0000000000..cc56fe58e7
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/brainbomb.rsi/fill-1.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/brainbomb.rsi/fill-2.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/brainbomb.rsi/fill-2.png
new file mode 100644
index 0000000000..728c1477ce
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/brainbomb.rsi/fill-2.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/brainbomb.rsi/fill-3.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/brainbomb.rsi/fill-3.png
new file mode 100644
index 0000000000..ee6e21f744
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/brainbomb.rsi/fill-3.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/brainbomb.rsi/fill-4.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/brainbomb.rsi/fill-4.png
new file mode 100644
index 0000000000..df040cd99e
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/brainbomb.rsi/fill-4.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/brainbomb.rsi/icon.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/brainbomb.rsi/icon.png
index a969efc103..1f9dac256f 100644
Binary files a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/brainbomb.rsi/icon.png and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/brainbomb.rsi/icon.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/brainbomb.rsi/icon_empty.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/brainbomb.rsi/icon_empty.png
new file mode 100644
index 0000000000..2b6776848b
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/brainbomb.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/brainbomb.rsi/meta.json b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/brainbomb.rsi/meta.json
index 3e33d3ec6a..17d033b167 100644
--- a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/brainbomb.rsi/meta.json
+++ b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/brainbomb.rsi/meta.json
@@ -9,6 +9,21 @@
     "states": [
         {
             "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
         }
     ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/bubbletea.rsi/fill-1.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/bubbletea.rsi/fill-1.png
new file mode 100644
index 0000000000..bc4977dfd3
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/bubbletea.rsi/fill-1.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/bubbletea.rsi/fill-2.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/bubbletea.rsi/fill-2.png
new file mode 100644
index 0000000000..16ca3cbdc5
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/bubbletea.rsi/fill-2.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/bubbletea.rsi/fill-3.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/bubbletea.rsi/fill-3.png
new file mode 100644
index 0000000000..11a86987cc
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/bubbletea.rsi/fill-3.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/bubbletea.rsi/fill-4.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/bubbletea.rsi/fill-4.png
new file mode 100644
index 0000000000..9673504e30
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/bubbletea.rsi/fill-4.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/bubbletea.rsi/fill-5.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/bubbletea.rsi/fill-5.png
new file mode 100644
index 0000000000..d47c0694e2
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/bubbletea.rsi/fill-5.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/bubbletea.rsi/icon.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/bubbletea.rsi/icon.png
index 1494632f2d..293ae99a1c 100644
Binary files a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/bubbletea.rsi/icon.png and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/bubbletea.rsi/icon.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/bubbletea.rsi/icon_empty.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/bubbletea.rsi/icon_empty.png
new file mode 100644
index 0000000000..cba7f74b94
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/bubbletea.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/bubbletea.rsi/meta.json b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/bubbletea.rsi/meta.json
index 3e33d3ec6a..acb41d36dd 100644
--- a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/bubbletea.rsi/meta.json
+++ b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/bubbletea.rsi/meta.json
@@ -9,6 +9,24 @@
     "states": [
         {
             "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
         }
     ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/circusjuice.rsi/fill-1.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/circusjuice.rsi/fill-1.png
new file mode 100644
index 0000000000..db884c3d25
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/circusjuice.rsi/fill-1.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/circusjuice.rsi/fill-2.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/circusjuice.rsi/fill-2.png
new file mode 100644
index 0000000000..ccf14afe99
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/circusjuice.rsi/fill-2.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/circusjuice.rsi/fill-3.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/circusjuice.rsi/fill-3.png
new file mode 100644
index 0000000000..c56db9fe56
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/circusjuice.rsi/fill-3.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/circusjuice.rsi/fill-4.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/circusjuice.rsi/fill-4.png
new file mode 100644
index 0000000000..9cbe1c22f9
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/circusjuice.rsi/fill-4.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/circusjuice.rsi/fill-5.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/circusjuice.rsi/fill-5.png
new file mode 100644
index 0000000000..f06706b6b2
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/circusjuice.rsi/fill-5.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/circusjuice.rsi/icon.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/circusjuice.rsi/icon.png
index 41bd94c3ef..67fb208946 100644
Binary files a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/circusjuice.rsi/icon.png and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/circusjuice.rsi/icon.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/circusjuice.rsi/icon_empty.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/circusjuice.rsi/icon_empty.png
new file mode 100644
index 0000000000..81fda8fb59
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/circusjuice.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/circusjuice.rsi/meta.json b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/circusjuice.rsi/meta.json
index 3e33d3ec6a..acb41d36dd 100644
--- a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/circusjuice.rsi/meta.json
+++ b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/circusjuice.rsi/meta.json
@@ -9,6 +9,24 @@
     "states": [
         {
             "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
         }
     ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/clownblood.rsi/fill-1.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/clownblood.rsi/fill-1.png
new file mode 100644
index 0000000000..73669923d6
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/clownblood.rsi/fill-1.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/clownblood.rsi/fill-2.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/clownblood.rsi/fill-2.png
new file mode 100644
index 0000000000..247b3cfaba
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/clownblood.rsi/fill-2.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/clownblood.rsi/fill-3.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/clownblood.rsi/fill-3.png
new file mode 100644
index 0000000000..6ffeba8e6d
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/clownblood.rsi/fill-3.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/clownblood.rsi/fill-4.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/clownblood.rsi/fill-4.png
new file mode 100644
index 0000000000..210fa67f27
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/clownblood.rsi/fill-4.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/clownblood.rsi/fill-5.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/clownblood.rsi/fill-5.png
new file mode 100644
index 0000000000..00d78b7074
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/clownblood.rsi/fill-5.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/clownblood.rsi/icon.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/clownblood.rsi/icon.png
index 05147c65ad..7d08454a16 100644
Binary files a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/clownblood.rsi/icon.png and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/clownblood.rsi/icon.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/clownblood.rsi/icon_empty.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/clownblood.rsi/icon_empty.png
new file mode 100644
index 0000000000..b8eafb1745
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/clownblood.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/clownblood.rsi/meta.json b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/clownblood.rsi/meta.json
index 3e33d3ec6a..acb41d36dd 100644
--- a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/clownblood.rsi/meta.json
+++ b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/clownblood.rsi/meta.json
@@ -9,6 +9,24 @@
     "states": [
         {
             "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
         }
     ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/graveyard.rsi/fill-1.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/graveyard.rsi/fill-1.png
new file mode 100644
index 0000000000..d93b5da40c
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/graveyard.rsi/fill-1.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/graveyard.rsi/fill-2.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/graveyard.rsi/fill-2.png
new file mode 100644
index 0000000000..24cc104349
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/graveyard.rsi/fill-2.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/graveyard.rsi/fill-3.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/graveyard.rsi/fill-3.png
new file mode 100644
index 0000000000..e89d6ac3c9
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/graveyard.rsi/fill-3.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/graveyard.rsi/fill-4.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/graveyard.rsi/fill-4.png
new file mode 100644
index 0000000000..70a3c62f80
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/graveyard.rsi/fill-4.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/graveyard.rsi/fill-5.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/graveyard.rsi/fill-5.png
new file mode 100644
index 0000000000..9707e28b25
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/graveyard.rsi/fill-5.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/graveyard.rsi/icon.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/graveyard.rsi/icon.png
index dd62bd08da..cf58cd4e06 100644
Binary files a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/graveyard.rsi/icon.png and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/graveyard.rsi/icon.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/graveyard.rsi/icon_empty.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/graveyard.rsi/icon_empty.png
new file mode 100644
index 0000000000..23af54dc7e
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/graveyard.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/graveyard.rsi/meta.json b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/graveyard.rsi/meta.json
index 3e33d3ec6a..acb41d36dd 100644
--- a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/graveyard.rsi/meta.json
+++ b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/graveyard.rsi/meta.json
@@ -9,6 +9,24 @@
     "states": [
         {
             "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
         }
     ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/orangecreamcicle.rsi/fill-1.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/orangecreamcicle.rsi/fill-1.png
new file mode 100644
index 0000000000..7cf061e463
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/orangecreamcicle.rsi/fill-1.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/orangecreamcicle.rsi/fill-2.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/orangecreamcicle.rsi/fill-2.png
new file mode 100644
index 0000000000..2cb749de2f
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/orangecreamcicle.rsi/fill-2.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/orangecreamcicle.rsi/fill-3.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/orangecreamcicle.rsi/fill-3.png
new file mode 100644
index 0000000000..c014db520a
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/orangecreamcicle.rsi/fill-3.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/orangecreamcicle.rsi/fill-4.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/orangecreamcicle.rsi/fill-4.png
new file mode 100644
index 0000000000..cc7b5ab8fe
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/orangecreamcicle.rsi/fill-4.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/orangecreamcicle.rsi/icon.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/orangecreamcicle.rsi/icon.png
index 086a74b53e..ef736ae11b 100644
Binary files a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/orangecreamcicle.rsi/icon.png and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/orangecreamcicle.rsi/icon.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/orangecreamcicle.rsi/icon_empty.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/orangecreamcicle.rsi/icon_empty.png
new file mode 100644
index 0000000000..0bd85f3127
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/orangecreamcicle.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/orangecreamcicle.rsi/meta.json b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/orangecreamcicle.rsi/meta.json
index 3e33d3ec6a..17d033b167 100644
--- a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/orangecreamcicle.rsi/meta.json
+++ b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/orangecreamcicle.rsi/meta.json
@@ -9,6 +9,21 @@
     "states": [
         {
             "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
         }
     ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/pinkdrink.rsi/fill-1.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/pinkdrink.rsi/fill-1.png
new file mode 100644
index 0000000000..535dc20bdf
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/pinkdrink.rsi/fill-1.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/pinkdrink.rsi/fill-2.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/pinkdrink.rsi/fill-2.png
new file mode 100644
index 0000000000..1291224168
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/pinkdrink.rsi/fill-2.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/pinkdrink.rsi/fill-3.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/pinkdrink.rsi/fill-3.png
new file mode 100644
index 0000000000..bb9631211d
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/pinkdrink.rsi/fill-3.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/pinkdrink.rsi/fill-4.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/pinkdrink.rsi/fill-4.png
new file mode 100644
index 0000000000..1f7df6b2f3
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/pinkdrink.rsi/fill-4.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/pinkdrink.rsi/icon.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/pinkdrink.rsi/icon.png
index d06532d6d8..a0afde5f2d 100644
Binary files a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/pinkdrink.rsi/icon.png and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/pinkdrink.rsi/icon.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/pinkdrink.rsi/icon_empty.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/pinkdrink.rsi/icon_empty.png
new file mode 100644
index 0000000000..fd4b33ad35
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/pinkdrink.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/pinkdrink.rsi/meta.json b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/pinkdrink.rsi/meta.json
index 3e33d3ec6a..17d033b167 100644
--- a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/pinkdrink.rsi/meta.json
+++ b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/pinkdrink.rsi/meta.json
@@ -9,6 +9,21 @@
     "states": [
         {
             "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
         }
     ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sakeglass.rsi/fill-1.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sakeglass.rsi/fill-1.png
new file mode 100644
index 0000000000..39a89a7c42
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sakeglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sakeglass.rsi/fill-2.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sakeglass.rsi/fill-2.png
new file mode 100644
index 0000000000..dfa4dd5e06
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sakeglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sakeglass.rsi/fill-3.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sakeglass.rsi/fill-3.png
new file mode 100644
index 0000000000..30fbfc3478
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sakeglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sakeglass.rsi/icon_empty.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sakeglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..f81d140f54
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sakeglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sakeglass.rsi/meta.json b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sakeglass.rsi/meta.json
index 94c898e78c..69ca3b3412 100644
--- a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sakeglass.rsi/meta.json
+++ b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sakeglass.rsi/meta.json
@@ -1,14 +1,26 @@
 {
     "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Hyenh#6078",
     "size": {
         "x": 32,
         "y": 32
     },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by Hyenh#6078",
     "states": [
         {
             "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sapopicante.rsi/fill-1.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sapopicante.rsi/fill-1.png
new file mode 100644
index 0000000000..a1f7784a53
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sapopicante.rsi/fill-1.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sapopicante.rsi/fill-2.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sapopicante.rsi/fill-2.png
new file mode 100644
index 0000000000..f1ed4e3162
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sapopicante.rsi/fill-2.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sapopicante.rsi/fill-3.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sapopicante.rsi/fill-3.png
new file mode 100644
index 0000000000..c7a110b19a
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sapopicante.rsi/fill-3.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sapopicante.rsi/fill-4.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sapopicante.rsi/fill-4.png
new file mode 100644
index 0000000000..8956c55b2e
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sapopicante.rsi/fill-4.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sapopicante.rsi/fill-5.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sapopicante.rsi/fill-5.png
new file mode 100644
index 0000000000..abda666bd6
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sapopicante.rsi/fill-5.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sapopicante.rsi/icon_empty.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sapopicante.rsi/icon_empty.png
new file mode 100644
index 0000000000..14d2fbf21d
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sapopicante.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sapopicante.rsi/meta.json b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sapopicante.rsi/meta.json
index 3e33d3ec6a..acb41d36dd 100644
--- a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sapopicante.rsi/meta.json
+++ b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sapopicante.rsi/meta.json
@@ -9,6 +9,24 @@
     "states": [
         {
             "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
         }
     ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/silverjack.rsi/fill-1.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/silverjack.rsi/fill-1.png
new file mode 100644
index 0000000000..2c639c4c83
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/silverjack.rsi/fill-1.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/silverjack.rsi/fill-2.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/silverjack.rsi/fill-2.png
new file mode 100644
index 0000000000..bc8b044002
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/silverjack.rsi/fill-2.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/silverjack.rsi/fill-3.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/silverjack.rsi/fill-3.png
new file mode 100644
index 0000000000..d0eae40002
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/silverjack.rsi/fill-3.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/silverjack.rsi/fill-4.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/silverjack.rsi/fill-4.png
new file mode 100644
index 0000000000..6de8ef9f60
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/silverjack.rsi/fill-4.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/silverjack.rsi/icon.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/silverjack.rsi/icon.png
index 25dd13a6af..87a1bffde3 100644
Binary files a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/silverjack.rsi/icon.png and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/silverjack.rsi/icon.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/silverjack.rsi/icon_empty.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/silverjack.rsi/icon_empty.png
new file mode 100644
index 0000000000..c2a9328517
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/silverjack.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/silverjack.rsi/meta.json b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/silverjack.rsi/meta.json
index 3e33d3ec6a..17d033b167 100644
--- a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/silverjack.rsi/meta.json
+++ b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/silverjack.rsi/meta.json
@@ -9,6 +9,21 @@
     "states": [
         {
             "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
         }
     ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sojuglass.rsi/fill-1.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sojuglass.rsi/fill-1.png
new file mode 100644
index 0000000000..44cbfbf3b7
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sojuglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sojuglass.rsi/fill-2.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sojuglass.rsi/fill-2.png
new file mode 100644
index 0000000000..364ddd04a2
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sojuglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sojuglass.rsi/fill-3.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sojuglass.rsi/fill-3.png
new file mode 100644
index 0000000000..8d027fe94f
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sojuglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sojuglass.rsi/fill-4.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sojuglass.rsi/fill-4.png
new file mode 100644
index 0000000000..8c2cc7155c
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sojuglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sojuglass.rsi/icon_empty.png b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sojuglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..fe6fd09e9e
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sojuglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sojuglass.rsi/meta.json b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sojuglass.rsi/meta.json
index 94c898e78c..7d54c4e15e 100644
--- a/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sojuglass.rsi/meta.json
+++ b/Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/sojuglass.rsi/meta.json
@@ -1,14 +1,29 @@
 {
     "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Hyenh#6078",
     "size": {
         "x": 32,
         "y": 32
     },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by Hyenh#6078",
     "states": [
         {
             "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/beacon.png b/Resources/Textures/Objects/Devices/communication.rsi/beacon.png
index fa3d280d0b..cd94b9738a 100644
Binary files a/Resources/Textures/Objects/Devices/communication.rsi/beacon.png and b/Resources/Textures/Objects/Devices/communication.rsi/beacon.png differ
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/beacon_dead.png b/Resources/Textures/Objects/Devices/communication.rsi/beacon_dead.png
index 64e7a30d49..7e25d7455d 100644
Binary files a/Resources/Textures/Objects/Devices/communication.rsi/beacon_dead.png and b/Resources/Textures/Objects/Devices/communication.rsi/beacon_dead.png differ
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/meta.json b/Resources/Textures/Objects/Devices/communication.rsi/meta.json
index bfd0e069f3..e9350caad8 100644
--- a/Resources/Textures/Objects/Devices/communication.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/communication.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris and modified by Swept at https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6",
+  "copyright": "Taken from cev-eris and modified by Swept at https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6 // Radio, Beacon, Signaler Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
   "size": {
     "x": 32,
     "y": 32
@@ -31,7 +31,28 @@
       "directions": 4
     },
     {
-      "name": "radio"
+      "name": "radio",
+      "delays": [
+        [
+          1.8,
+          0.1,
+          0.1,
+          0.1,
+          1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          1.8,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
     },
     {
       "name": "radio-inhand-right",
@@ -68,17 +89,6 @@
     {
       "name": "off-walkietalkie-inhand-left",
       "directions": 4
-    },
-	{
-      "name": "old-radio"
-    },
-    {
-      "name": "old-radio-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "old-radio-inhand-right",
-      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/old-radio-inhand-left.png b/Resources/Textures/Objects/Devices/communication.rsi/old-radio-inhand-left.png
deleted file mode 100644
index e1cb184a79..0000000000
Binary files a/Resources/Textures/Objects/Devices/communication.rsi/old-radio-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/old-radio-inhand-right.png b/Resources/Textures/Objects/Devices/communication.rsi/old-radio-inhand-right.png
deleted file mode 100644
index ac3ef8ab79..0000000000
Binary files a/Resources/Textures/Objects/Devices/communication.rsi/old-radio-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/old-radio.png b/Resources/Textures/Objects/Devices/communication.rsi/old-radio.png
deleted file mode 100644
index 23315c58a2..0000000000
Binary files a/Resources/Textures/Objects/Devices/communication.rsi/old-radio.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/radio-inhand-left.png b/Resources/Textures/Objects/Devices/communication.rsi/radio-inhand-left.png
index ddd9d320f9..e1cb184a79 100644
Binary files a/Resources/Textures/Objects/Devices/communication.rsi/radio-inhand-left.png and b/Resources/Textures/Objects/Devices/communication.rsi/radio-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/radio-inhand-right.png b/Resources/Textures/Objects/Devices/communication.rsi/radio-inhand-right.png
index fc5fdee22a..ac3ef8ab79 100644
Binary files a/Resources/Textures/Objects/Devices/communication.rsi/radio-inhand-right.png and b/Resources/Textures/Objects/Devices/communication.rsi/radio-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/radio.png b/Resources/Textures/Objects/Devices/communication.rsi/radio.png
index eb57264b85..bbc73c505e 100644
Binary files a/Resources/Textures/Objects/Devices/communication.rsi/radio.png and b/Resources/Textures/Objects/Devices/communication.rsi/radio.png differ
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/signaller.png b/Resources/Textures/Objects/Devices/communication.rsi/signaller.png
index 1b14a3a136..d6b68cba77 100644
Binary files a/Resources/Textures/Objects/Devices/communication.rsi/signaller.png and b/Resources/Textures/Objects/Devices/communication.rsi/signaller.png differ
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-off.png b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-off.png
index 70e2b3a2a5..50f3927824 100644
Binary files a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-off.png and b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-off.png differ
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-on.png b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-on.png
index 0bf04a782d..da72f40e03 100644
Binary files a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-on.png and b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-on.png differ
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie.png b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie.png
index 0799b3f9c8..e5ebc2a36c 100644
Binary files a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie.png and b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie.png differ
diff --git a/Resources/Textures/Objects/Devices/jammer.rsi/jammer-on.png b/Resources/Textures/Objects/Devices/jammer.rsi/jammer-on.png
new file mode 100644
index 0000000000..987e571b26
Binary files /dev/null and b/Resources/Textures/Objects/Devices/jammer.rsi/jammer-on.png differ
diff --git a/Resources/Textures/Objects/Devices/jammer.rsi/jammer.png b/Resources/Textures/Objects/Devices/jammer.rsi/jammer.png
index 6de27ba924..99e0246bfb 100644
Binary files a/Resources/Textures/Objects/Devices/jammer.rsi/jammer.png and b/Resources/Textures/Objects/Devices/jammer.rsi/jammer.png differ
diff --git a/Resources/Textures/Objects/Devices/jammer.rsi/meta.json b/Resources/Textures/Objects/Devices/jammer.rsi/meta.json
index 2923d9ac63..c5cc9f56d2 100644
--- a/Resources/Textures/Objects/Devices/jammer.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/jammer.rsi/meta.json
@@ -1,15 +1,23 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/tgstation/tgstation/commit/c65da5a49477413310c81c460ea4b243a9f864dd",
+    "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/93d9c70530c7299ef0af96fe2178096b2a62e036/icons/obj/device.dmi",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
         {
-            "name": "jammer",
-            "directions": 1
+            "name": "jammer"
+        },
+        {
+            "name": "jammer-on",
+            "delays": [
+              [
+                0.8,
+                0.2
+              ]
+            ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Devices/signaller.rsi/meta.json b/Resources/Textures/Objects/Devices/signaller.rsi/meta.json
index cefaeebebf..0f259d9b45 100644
--- a/Resources/Textures/Objects/Devices/signaller.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/signaller.rsi/meta.json
@@ -2,7 +2,7 @@
     "version": 1,
 
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from Goonstation at commit https://github.com/goonstation/goonstation/commit/354d9635460c296dc7dce23ab39481dc4de6dc00, signaller2 created by TheShuEd",
+    "copyright": "Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi, signaller2 created by TheShuEd",
 
     "size": {
         "x": 32,
@@ -18,4 +18,4 @@
             "directions": 1
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Devices/signaller.rsi/signaller.png b/Resources/Textures/Objects/Devices/signaller.rsi/signaller.png
index 37a47342a6..d6b68cba77 100644
Binary files a/Resources/Textures/Objects/Devices/signaller.rsi/signaller.png and b/Resources/Textures/Objects/Devices/signaller.rsi/signaller.png differ
diff --git a/Resources/Textures/Objects/Devices/station_beacon.rsi/blink.png b/Resources/Textures/Objects/Devices/station_beacon.rsi/blink.png
index 53fabd1714..cd94b9738a 100644
Binary files a/Resources/Textures/Objects/Devices/station_beacon.rsi/blink.png and b/Resources/Textures/Objects/Devices/station_beacon.rsi/blink.png differ
diff --git a/Resources/Textures/Objects/Devices/station_beacon.rsi/icon.png b/Resources/Textures/Objects/Devices/station_beacon.rsi/icon.png
index 67f3f53eb5..15c1e94221 100644
Binary files a/Resources/Textures/Objects/Devices/station_beacon.rsi/icon.png and b/Resources/Textures/Objects/Devices/station_beacon.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Devices/station_beacon.rsi/meta.json b/Resources/Textures/Objects/Devices/station_beacon.rsi/meta.json
index 771ce4c261..96aaf12a24 100644
--- a/Resources/Textures/Objects/Devices/station_beacon.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/station_beacon.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC0-1.0",
-    "copyright": "Created by EmoGarbage404 (github) for SS14, based on beacon design from /tg/",
+    "copyright": "Created by EmoGarbage404 (github) for SS14, based on beacon design from /tg/ // Icon/Blink Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/clown-inhand-left.png b/Resources/Textures/Objects/Fun/spraycans.rsi/clown-inhand-left.png
new file mode 100644
index 0000000000..d90d5b21b7
Binary files /dev/null and b/Resources/Textures/Objects/Fun/spraycans.rsi/clown-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/clown-inhand-right.png b/Resources/Textures/Objects/Fun/spraycans.rsi/clown-inhand-right.png
new file mode 100644
index 0000000000..27b68e2cfe
Binary files /dev/null and b/Resources/Textures/Objects/Fun/spraycans.rsi/clown-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json b/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json
index 0f883ee280..f34820cec4 100644
--- a/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json
@@ -58,9 +58,6 @@
     {
       "name": "spray"
     },
-    {
-      "name": "spray_cap"
-    },
     {
       "name": "spray_cap_colors"
     },
@@ -70,6 +67,22 @@
     {
       "name": "equipped-BELT",
       "directions": 4
+    },
+    {
+      "name": "clown-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "clown-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "spray-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "spray-inhand-left",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/spray-inhand-left.png b/Resources/Textures/Objects/Fun/spraycans.rsi/spray-inhand-left.png
new file mode 100644
index 0000000000..ad3ad959de
Binary files /dev/null and b/Resources/Textures/Objects/Fun/spraycans.rsi/spray-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/spray-inhand-right.png b/Resources/Textures/Objects/Fun/spraycans.rsi/spray-inhand-right.png
new file mode 100644
index 0000000000..353e47c56f
Binary files /dev/null and b/Resources/Textures/Objects/Fun/spraycans.rsi/spray-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/spray_cap.png b/Resources/Textures/Objects/Fun/spraycans.rsi/spray_cap.png
deleted file mode 100644
index 01d2d49bc0..0000000000
Binary files a/Resources/Textures/Objects/Fun/spraycans.rsi/spray_cap.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/holoplush.png b/Resources/Textures/Objects/Fun/toys.rsi/holoplush.png
new file mode 100644
index 0000000000..811bf9e649
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/holoplush.png differ
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/magicplush.png b/Resources/Textures/Objects/Fun/toys.rsi/magicplush.png
new file mode 100644
index 0000000000..950de931a0
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/magicplush.png differ
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
index ef50532eba..fc92a47936 100644
--- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
@@ -1,328 +1,355 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161, bee hat and in-hand sprites drawn by Ubaser, plushie_penguin by netwy, plushie_arachnid by PixelTheKermit (github), plushie human by TheShuEd, NanoTrasen Balloon by MACMAN2003",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161, bee hat and in-hand sprites drawn by Ubaser, plushie_penguin by netwy, plushie_arachnid by PixelTheKermit (github), plushie human by TheShuEd, NanoTrasen Balloon by MACMAN2003, holoplush and magicplush modified by deltanedas (github)",
   "size": {
     "x": 32,
     "y": 32
   },
-    "states": [
-        {
-            "name": "plushie_ratvar"
-        },
-        {
-            "name": "plushie_penguin"
-        },
-            {
-            "name": "plushie_moth"
-        },
-        {
-            "name": "plushie_rouny",
-            "directions": 4
-        },
-        {
-            "name": "plushie_spacelizard"
-        },
-        {
-            "name": "carpplush"
-        },
-        {
-            "name": "narplush"
-        },
-        {
-            "name": "plushie_h"
-        },
-        {
-            "name": "bee-equipped-HELMET",
-            "directions": 4
-        },
-        {
-            "name": "bee-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "bee-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "plushie_hampter"
-        },
-        {
-            "name": "plushie_arachnid"
-        },
-        {
-            "name": "plushie_lizard"
-        },
-        {
-            "name": "plushie_lizard_mirrored"
-        },
-        {
-            "name": "plushie_lamp"
-        },
-        {
-            "name": "plushie_nuke"
-        },
-        {
-            "name": "plushie_atmosian"
-        },
-        {
-            "name": "plushie_slime"
-        },
-        {
-            "name": "plushie_snake"
-        },
-        {
-            "name": "plushie_vox"
-        },
-        {
-            "name": "plushie_diona"
-        },
-        {
-            "name": "plushie_human"
-        },
-        {
-            "name": "plushie_diona1"
-        },
-        {
-            "name": "plushie_xeno"
-        },
-        {
-            "name": "carpplush-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "carpplush-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "AI"
-        },
-        {
-            "name": "base"
-        },
-        {
-            "name": "bolt-closed"
-        },
-        {
-            "name": "bolt-open"
-        },
-        {
-            "name": "foamblade"
-        },
-        {
-            "name": "foamcrossbow"
-        },
-        {
-            "name": "foamdart"
-        },
-        {
-            "name": "foambox"
-        },
-        {
-            "name": "ian"
-        },
-        {
-            "name": "nuketoy"
-        },
-        {
-            "name": "snappop"
-        },
-        {
-            "name": "spbox"
-        },
-        {
-            "name": "toy_mouse"
-        },
-        {
-            "name": "mouse-equipped-HELMET",
-            "directions": 4
-        },
-        {
-            "name": "capbullet"
-        },
-        {
-            "name": "foamcrossbow-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "foamcrossbow-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "capgun-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "capgun-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "foamblade-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "foamblade-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "corgib-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "corgib-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "ntb-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "ntb-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "synb-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "synb-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "synb"
-        },
-		{
-			"name": "ntb"
-		},
-        {
-            "name": "corgib"
-        },
-        {
-            "name": "football"
-        },
-        {
-            "name": "footb-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "footb-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "basketball"
-        },
-        {
-            "name": "bask-inhand-right",
-            "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
-                ]
-            ]
-        },
-        {
-            "name": "bask-inhand-left",
-            "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
-                ]
-            ]
-        },
-        {
-            "name": "singularitytoy",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "orb",
-            "delays": [
-                [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "orb-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "orb-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "beachball"
-        },
-        {
-            "name": "beachb-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "beachb-inhand-right",
-            "directions": 4
-        }
-    ]
+  "states": [
+    {
+      "name": "plushie_ratvar"
+    },
+    {
+      "name": "plushie_penguin"
+    },
+    {
+      "name": "plushie_moth"
+    },
+    {
+      "name": "plushie_rouny",
+      "directions": 4
+    },
+    {
+      "name": "plushie_spacelizard"
+    },
+    {
+      "name": "carpplush"
+    },
+    {
+      "name": "holoplush",
+      "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
+        ]
+      ]
+    },
+    {
+      "name": "magicplush"
+    },
+    {
+      "name": "rainbowcarpplush"
+    },
+    {
+      "name": "narplush"
+    },
+    {
+      "name": "plushie_h"
+    },
+    {
+      "name": "bee-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "bee-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "bee-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "plushie_hampter"
+    },
+    {
+      "name": "plushie_arachnid"
+    },
+    {
+      "name": "plushie_lizard"
+    },
+    {
+      "name": "plushie_lizard_mirrored"
+    },
+    {
+      "name": "plushie_lamp"
+    },
+    {
+      "name": "plushie_nuke"
+    },
+    {
+      "name": "plushie_atmosian"
+    },
+    {
+      "name": "plushie_slime"
+    },
+    {
+      "name": "plushie_snake"
+    },
+    {
+      "name": "plushie_vox"
+    },
+    {
+      "name": "plushie_diona"
+    },
+    {
+      "name": "plushie_human"
+    },
+    {
+      "name": "plushie_diona1"
+    },
+    {
+      "name": "plushie_xeno"
+    },
+    {
+      "name": "carpplush-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "carpplush-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "AI"
+    },
+    {
+      "name": "base"
+    },
+    {
+      "name": "bolt-closed"
+    },
+    {
+      "name": "bolt-open"
+    },
+    {
+      "name": "foamblade"
+    },
+    {
+      "name": "foamcrossbow"
+    },
+    {
+      "name": "foamdart"
+    },
+    {
+      "name": "foambox"
+    },
+    {
+      "name": "ian"
+    },
+    {
+      "name": "nuketoy"
+    },
+    {
+      "name": "snappop"
+    },
+    {
+      "name": "spbox"
+    },
+    {
+      "name": "toy_mouse"
+    },
+    {
+      "name": "mouse-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "capbullet"
+    },
+    {
+      "name": "foamcrossbow-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "foamcrossbow-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "capgun-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "capgun-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "foamblade-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "foamblade-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "corgib-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "corgib-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "ntb-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "ntb-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "synb-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "synb-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "synb"
+    },
+    {
+      "name": "ntb"
+    },
+    {
+      "name": "corgib"
+    },
+    {
+      "name": "football"
+    },
+    {
+      "name": "footb-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "footb-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "basketball"
+    },
+    {
+      "name": "bask-inhand-right",
+      "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
+        ]
+      ]
+    },
+    {
+      "name": "bask-inhand-left",
+      "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
+        ]
+      ]
+    },
+    {
+      "name": "singularitytoy",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "orb",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "orb-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "orb-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "beachball"
+    },
+    {
+      "name": "beachb-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "beachb-inhand-right",
+      "directions": 4
+    }
+  ]
 }
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/rainbowcarpplush.png b/Resources/Textures/Objects/Fun/toys.rsi/rainbowcarpplush.png
new file mode 100644
index 0000000000..2897243871
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/rainbowcarpplush.png differ
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-detective.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-detective.png
index 097234f283..284d01c6dd 100644
Binary files a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-detective.png and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-detective.png differ
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/captain.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/Jetpacks/captain.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..aeaa182522
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/Jetpacks/captain.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/captain.rsi/meta.json b/Resources/Textures/Objects/Tanks/Jetpacks/captain.rsi/meta.json
index d57c3cdf00..2adfbbc375 100644
--- a/Resources/Textures/Objects/Tanks/Jetpacks/captain.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/Jetpacks/captain.rsi/meta.json
@@ -54,6 +54,32 @@
           0.2
         ]
       ]
+    },
+    {
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-SUITSTORAGE",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2
+        ],
+        [
+          0.2,
+          0.2
+        ]
+      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/captain.rsi/on-equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/Jetpacks/captain.rsi/on-equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..351623cf28
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/Jetpacks/captain.rsi/on-equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/mini.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/Jetpacks/mini.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..d775e61dc7
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/Jetpacks/mini.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/mini.rsi/meta.json b/Resources/Textures/Objects/Tanks/Jetpacks/mini.rsi/meta.json
index d9ea7ada5f..4f37eed72c 100644
--- a/Resources/Textures/Objects/Tanks/Jetpacks/mini.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/Jetpacks/mini.rsi/meta.json
@@ -59,6 +59,36 @@
           0.1
         ]
       ]
+    },
+    {
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-SUITSTORAGE",
+      "directions": 4,
+      "delays": [
+        [
+          0.5,
+          0.2,
+          0.1
+        ],
+        [
+          0.5,
+          0.2,
+          0.1
+        ],
+        [
+          0.5,
+          0.2,
+          0.1
+        ],
+        [
+          0.5,
+          0.2,
+          0.1
+        ]
+      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/mini.rsi/on-equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/Jetpacks/mini.rsi/on-equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..4348c5463c
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/Jetpacks/mini.rsi/on-equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..4b7e877c75
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/meta.json b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/meta.json
index 2fcae77e7b..41bdc98958 100644
--- a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/meta.json
@@ -36,6 +36,14 @@
     {
       "name": "on-equipped-BACKPACK",
       "directions": 4
+    },
+    {
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-SUITSTORAGE",
+      "directions": 4
     }
   ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/on-equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/on-equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..c1cbd4967b
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/on-equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..57675fec22
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/anesthetic.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Tanks/anesthetic.rsi/icon.png b/Resources/Textures/Objects/Tanks/anesthetic.rsi/icon.png
index 027abc289f..3ef540f37f 100644
Binary files a/Resources/Textures/Objects/Tanks/anesthetic.rsi/icon.png and b/Resources/Textures/Objects/Tanks/anesthetic.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tanks/anesthetic.rsi/meta.json b/Resources/Textures/Objects/Tanks/anesthetic.rsi/meta.json
index 26106db4a3..1450c5a2d2 100644
--- a/Resources/Textures/Objects/Tanks/anesthetic.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/anesthetic.rsi/meta.json
@@ -14,6 +14,10 @@
       "name": "equipped-BACKPACK",
       "directions": 4
     },
+    {
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
+    },
     {
       "name": "equipped-SUITSTORAGE-dog",
       "directions": 4,
diff --git a/Resources/Textures/Objects/Tanks/emergency.rsi/icon.png b/Resources/Textures/Objects/Tanks/emergency.rsi/icon.png
index a1f124628b..1b7042332d 100644
Binary files a/Resources/Textures/Objects/Tanks/emergency.rsi/icon.png and b/Resources/Textures/Objects/Tanks/emergency.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tanks/emergency_double.rsi/icon.png b/Resources/Textures/Objects/Tanks/emergency_double.rsi/icon.png
index 78f1677a2b..7a604ad671 100644
Binary files a/Resources/Textures/Objects/Tanks/emergency_double.rsi/icon.png and b/Resources/Textures/Objects/Tanks/emergency_double.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tanks/emergency_double_red.rsi/icon.png b/Resources/Textures/Objects/Tanks/emergency_double_red.rsi/icon.png
index 584a122e5b..7f1735f36f 100644
Binary files a/Resources/Textures/Objects/Tanks/emergency_double_red.rsi/icon.png and b/Resources/Textures/Objects/Tanks/emergency_double_red.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tanks/emergency_extended.rsi/icon.png b/Resources/Textures/Objects/Tanks/emergency_extended.rsi/icon.png
index ab8bebedb6..2b73dad0b5 100644
Binary files a/Resources/Textures/Objects/Tanks/emergency_extended.rsi/icon.png and b/Resources/Textures/Objects/Tanks/emergency_extended.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tanks/emergency_extended_red.rsi/icon.png b/Resources/Textures/Objects/Tanks/emergency_extended_red.rsi/icon.png
index 8ea77e5c6c..67d4bb4eb6 100644
Binary files a/Resources/Textures/Objects/Tanks/emergency_extended_red.rsi/icon.png and b/Resources/Textures/Objects/Tanks/emergency_extended_red.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tanks/emergency_red.rsi/icon.png b/Resources/Textures/Objects/Tanks/emergency_red.rsi/icon.png
index 4fd5f559ac..cf68a7c1c7 100644
Binary files a/Resources/Textures/Objects/Tanks/emergency_red.rsi/icon.png and b/Resources/Textures/Objects/Tanks/emergency_red.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/icon.png b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/icon.png
index ab8bebedb6..9fb5c277bf 100644
Binary files a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/icon.png and b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..332f1d08f3
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/generic.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Tanks/generic.rsi/icon.png b/Resources/Textures/Objects/Tanks/generic.rsi/icon.png
index 0202db50aa..1074a9dffa 100644
Binary files a/Resources/Textures/Objects/Tanks/generic.rsi/icon.png and b/Resources/Textures/Objects/Tanks/generic.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tanks/generic.rsi/meta.json b/Resources/Textures/Objects/Tanks/generic.rsi/meta.json
index 897d32989a..98b81aaf25 100644
--- a/Resources/Textures/Objects/Tanks/generic.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/generic.rsi/meta.json
@@ -14,6 +14,10 @@
       "name": "equipped-BACKPACK",
       "directions": 4
     },
+    {
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
+    },
     {
       "name": "equipped-SUITSTORAGE-dog",
       "directions": 4,
diff --git a/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..d890d08c1a
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/oxygen.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Tanks/oxygen.rsi/icon.png b/Resources/Textures/Objects/Tanks/oxygen.rsi/icon.png
index 95c148e604..7964690190 100644
Binary files a/Resources/Textures/Objects/Tanks/oxygen.rsi/icon.png and b/Resources/Textures/Objects/Tanks/oxygen.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tanks/oxygen.rsi/meta.json b/Resources/Textures/Objects/Tanks/oxygen.rsi/meta.json
index 26106db4a3..1450c5a2d2 100644
--- a/Resources/Textures/Objects/Tanks/oxygen.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/oxygen.rsi/meta.json
@@ -14,6 +14,10 @@
       "name": "equipped-BACKPACK",
       "directions": 4
     },
+    {
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
+    },
     {
       "name": "equipped-SUITSTORAGE-dog",
       "directions": 4,
diff --git a/Resources/Textures/Objects/Tanks/plasma.rsi/icon.png b/Resources/Textures/Objects/Tanks/plasma.rsi/icon.png
index a7fdcf8f67..2eb105e1cc 100644
Binary files a/Resources/Textures/Objects/Tanks/plasma.rsi/icon.png and b/Resources/Textures/Objects/Tanks/plasma.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..6c36a11d4d
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Tanks/red.rsi/icon.png b/Resources/Textures/Objects/Tanks/red.rsi/icon.png
index eb8ed16dce..ec40cb3872 100644
Binary files a/Resources/Textures/Objects/Tanks/red.rsi/icon.png and b/Resources/Textures/Objects/Tanks/red.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tanks/red.rsi/meta.json b/Resources/Textures/Objects/Tanks/red.rsi/meta.json
index 26106db4a3..1450c5a2d2 100644
--- a/Resources/Textures/Objects/Tanks/red.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/red.rsi/meta.json
@@ -14,6 +14,10 @@
       "name": "equipped-BACKPACK",
       "directions": 4
     },
+    {
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
+    },
     {
       "name": "equipped-SUITSTORAGE-dog",
       "directions": 4,
diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/icon.png b/Resources/Textures/Objects/Tools/crowbar.rsi/icon.png
index a8c6cb3f8d..436a75975b 100644
Binary files a/Resources/Textures/Objects/Tools/crowbar.rsi/icon.png and b/Resources/Textures/Objects/Tools/crowbar.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json b/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
index d4cab89f8e..6cfbd90fac 100644
--- a/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/eea0599511b088fdab9d43e562210cdbd51c6a98, storage and red-storage by Flareguy",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/eea0599511b088fdab9d43e562210cdbd51c6a98, storage and red-storage by Flareguy // Icon Tkan from https://github.com/ParadiseSS13/Paradise",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png b/Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png
index ac25643123..5b2364d32f 100644
Binary files a/Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png and b/Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png differ
diff --git a/Resources/Textures/Objects/Tools/drill.rsi/drill_bolt.png b/Resources/Textures/Objects/Tools/drill.rsi/drill_bolt.png
index 6fb3b4ab8e..d7e908fa9c 100644
Binary files a/Resources/Textures/Objects/Tools/drill.rsi/drill_bolt.png and b/Resources/Textures/Objects/Tools/drill.rsi/drill_bolt.png differ
diff --git a/Resources/Textures/Objects/Tools/drill.rsi/drill_screw.png b/Resources/Textures/Objects/Tools/drill.rsi/drill_screw.png
index c51ae6332b..0951ee8d9b 100644
Binary files a/Resources/Textures/Objects/Tools/drill.rsi/drill_screw.png and b/Resources/Textures/Objects/Tools/drill.rsi/drill_screw.png differ
diff --git a/Resources/Textures/Objects/Tools/drill.rsi/meta.json b/Resources/Textures/Objects/Tools/drill.rsi/meta.json
index 90af7840e1..0a315f41fa 100644
--- a/Resources/Textures/Objects/Tools/drill.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/drill.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "modified from https://github.com/tgstation/tgstation at commit ea59fb4b810decbb5996b36d8876614b57c3d189 by KingFroozy (Github)",
+  "copyright": "modified from https://github.com/tgstation/tgstation at commit ea59fb4b810decbb5996b36d8876614b57c3d189 by KingFroozy (Github) // Icon taken from https://github.com/ParadiseSS13/Paradise",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_base.png b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_base.png
index ccb97cbe60..61a4a9b787 100644
Binary files a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_base.png and b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_base.png differ
diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_ext.png b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_ext.png
index fc41e60ff8..c4112f6525 100644
Binary files a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_ext.png and b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_ext.png differ
diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_high.png b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_high.png
index 15edc91e52..7b160b48d7 100644
Binary files a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_high.png and b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_high.png differ
diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_idle.png b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_idle.png
index 6c83622e34..704d654a6f 100644
Binary files a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_idle.png and b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_idle.png differ
diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_low.png b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_low.png
index 015059c730..e2694136cb 100644
Binary files a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_low.png and b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_low.png differ
diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_med.png b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_med.png
index c88de643eb..1fd176e822 100644
Binary files a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_med.png and b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_med.png differ
diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/meta.json b/Resources/Textures/Objects/Tools/geiger.rsi/meta.json
index 10968b4776..11fbd43681 100644
--- a/Resources/Textures/Objects/Tools/geiger.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/geiger.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/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8",
+  "copyright": "Taken from Paradise https://github.com/ParadiseSS13/Paradise",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tools/hand_labeler.rsi/hand_labeler.png b/Resources/Textures/Objects/Tools/hand_labeler.rsi/hand_labeler.png
index 9938103840..77fbcef30d 100644
Binary files a/Resources/Textures/Objects/Tools/hand_labeler.rsi/hand_labeler.png and b/Resources/Textures/Objects/Tools/hand_labeler.rsi/hand_labeler.png differ
diff --git a/Resources/Textures/Objects/Tools/hand_labeler.rsi/meta.json b/Resources/Textures/Objects/Tools/hand_labeler.rsi/meta.json
index 216140cec3..3c793a9732 100644
--- a/Resources/Textures/Objects/Tools/hand_labeler.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/hand_labeler.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/tgstation/tgstation at commit 44636483b7b2868b3e42c92205539f11f6d7968f. Inhand sprites by Macoron.",
+    "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/. Inhand sprites by Macoron.",
     "size": {
         "x": 32,
         "y": 32
diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/green-unlit.png b/Resources/Textures/Objects/Tools/multitool.rsi/green-unlit.png
index fccc17e919..d0bac8b61e 100644
Binary files a/Resources/Textures/Objects/Tools/multitool.rsi/green-unlit.png and b/Resources/Textures/Objects/Tools/multitool.rsi/green-unlit.png differ
diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/icon.png b/Resources/Textures/Objects/Tools/multitool.rsi/icon.png
index 6e16a3f7eb..1dcb102e80 100644
Binary files a/Resources/Textures/Objects/Tools/multitool.rsi/icon.png and b/Resources/Textures/Objects/Tools/multitool.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/meta.json b/Resources/Textures/Objects/Tools/multitool.rsi/meta.json
index bf4315734b..c5c4ed87cb 100644
--- a/Resources/Textures/Objects/Tools/multitool.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/multitool.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/94f27c7b25bbde39c1412e24fb32bf6470fcc394",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/94f27c7b25bbde39c1412e24fb32bf6470fcc394 // Icon Taken from https://github.com/ParadiseSS13/Paradise",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/red-unlit.png b/Resources/Textures/Objects/Tools/multitool.rsi/red-unlit.png
index a141fec4bf..71a6ee8f67 100644
Binary files a/Resources/Textures/Objects/Tools/multitool.rsi/red-unlit.png and b/Resources/Textures/Objects/Tools/multitool.rsi/red-unlit.png differ
diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/yellow-unlit.png b/Resources/Textures/Objects/Tools/multitool.rsi/yellow-unlit.png
index f890dbd413..911fad3088 100644
Binary files a/Resources/Textures/Objects/Tools/multitool.rsi/yellow-unlit.png and b/Resources/Textures/Objects/Tools/multitool.rsi/yellow-unlit.png differ
diff --git a/Resources/Textures/Objects/Tools/rcd.rsi/icon.png b/Resources/Textures/Objects/Tools/rcd.rsi/icon.png
index cb62979010..3913af2518 100644
Binary files a/Resources/Textures/Objects/Tools/rcd.rsi/icon.png and b/Resources/Textures/Objects/Tools/rcd.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json b/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json
index 17ec25991a..47fc7c177e 100644
--- a/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-map.png b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-map.png
index 2bede8bc3b..86ac05b87e 100644
Binary files a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-map.png and b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-map.png differ
diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-screwybits.png b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-screwybits.png
index 565ebc24f6..f018f39ffd 100644
Binary files a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-screwybits.png and b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver-screwybits.png differ
diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver.png b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver.png
index 9d0d820dda..9e13699734 100644
Binary files a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver.png and b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver.png differ
diff --git a/Resources/Textures/Objects/Tools/seclite.rsi/meta.json b/Resources/Textures/Objects/Tools/seclite.rsi/meta.json
index 86f25b0b7a..d466ad62d5 100644
--- a/Resources/Textures/Objects/Tools/seclite.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/seclite.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/52cbeaf94322209d4c6596818dda9fb3654729d3 and modified by Swept",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/blob/master/icons/obj/lighting.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tools/seclite.rsi/seclite-on.png b/Resources/Textures/Objects/Tools/seclite.rsi/seclite-on.png
index 317e638c18..e02d6ee077 100644
Binary files a/Resources/Textures/Objects/Tools/seclite.rsi/seclite-on.png and b/Resources/Textures/Objects/Tools/seclite.rsi/seclite-on.png differ
diff --git a/Resources/Textures/Objects/Tools/seclite.rsi/seclite-overlay.png b/Resources/Textures/Objects/Tools/seclite.rsi/seclite-overlay.png
index a5e9f773ed..7ea22fa4c6 100644
Binary files a/Resources/Textures/Objects/Tools/seclite.rsi/seclite-overlay.png and b/Resources/Textures/Objects/Tools/seclite.rsi/seclite-overlay.png differ
diff --git a/Resources/Textures/Objects/Tools/seclite.rsi/seclite.png b/Resources/Textures/Objects/Tools/seclite.rsi/seclite.png
index d8ace36de9..1064101c28 100644
Binary files a/Resources/Textures/Objects/Tools/seclite.rsi/seclite.png and b/Resources/Textures/Objects/Tools/seclite.rsi/seclite.png differ
diff --git a/Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json b/Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json
index 056ba0a856..a7ed668444 100644
--- a/Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json
@@ -1,5 +1,5 @@
 {
-   "copyright" : "Taken from https://github.com/tgstation/tgstation at commit a21274e56ae84b2c96e8b6beeca805df3d5402e8.",
+   "copyright" : "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/8e92e96d56f231f79dc16f95918d59b2803085aa/icons/obj/painting.dmi",
    "license" : "CC-BY-SA-3.0",
    "size" : {
       "x" : 32,
diff --git a/Resources/Textures/Objects/Tools/spray_painter.rsi/spray_painter.png b/Resources/Textures/Objects/Tools/spray_painter.rsi/spray_painter.png
index 462e22932c..0c7ebdadcc 100644
Binary files a/Resources/Textures/Objects/Tools/spray_painter.rsi/spray_painter.png and b/Resources/Textures/Objects/Tools/spray_painter.rsi/spray_painter.png differ
diff --git a/Resources/Textures/Objects/Tools/welder.rsi/icon.png b/Resources/Textures/Objects/Tools/welder.rsi/icon.png
index a023a035ad..c6917c8ba5 100644
Binary files a/Resources/Textures/Objects/Tools/welder.rsi/icon.png and b/Resources/Textures/Objects/Tools/welder.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/welder.rsi/meta.json b/Resources/Textures/Objects/Tools/welder.rsi/meta.json
index 5f876da9ae..407f85d4cf 100644
--- a/Resources/Textures/Objects/Tools/welder.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/welder.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/199fffd989d6f7fd6ea9c5188c875137df4f34b8",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8 // Icon Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/3c5cb36e811725e1479c4c025b04220027230632/icons/obj/tools.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tools/welder.rsi/welder_flame.png b/Resources/Textures/Objects/Tools/welder.rsi/welder_flame.png
index 20aa48abf6..6c8ef525cc 100644
Binary files a/Resources/Textures/Objects/Tools/welder.rsi/welder_flame.png and b/Resources/Textures/Objects/Tools/welder.rsi/welder_flame.png differ
diff --git a/Resources/Textures/Objects/Tools/welder_experimental.rsi/icon.png b/Resources/Textures/Objects/Tools/welder_experimental.rsi/icon.png
index 446d4b21bf..d33656a0be 100644
Binary files a/Resources/Textures/Objects/Tools/welder_experimental.rsi/icon.png and b/Resources/Textures/Objects/Tools/welder_experimental.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json b/Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json
index 75650c1928..1e4258956e 100644
--- a/Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/welder_experimental.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/199fffd989d6f7fd6ea9c5188c875137df4f34b8",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8 // Icon Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/3c5cb36e811725e1479c4c025b04220027230632/icons/obj/tools.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tools/welder_experimental.rsi/welder_flame.png b/Resources/Textures/Objects/Tools/welder_experimental.rsi/welder_flame.png
index 1efc7aaa60..c4cac4606a 100644
Binary files a/Resources/Textures/Objects/Tools/welder_experimental.rsi/welder_flame.png and b/Resources/Textures/Objects/Tools/welder_experimental.rsi/welder_flame.png differ
diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/icon.png b/Resources/Textures/Objects/Tools/welder_industrial.rsi/icon.png
index 5c6c99c5d9..c697fae1fa 100644
Binary files a/Resources/Textures/Objects/Tools/welder_industrial.rsi/icon.png and b/Resources/Textures/Objects/Tools/welder_industrial.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/meta.json b/Resources/Textures/Objects/Tools/welder_industrial.rsi/meta.json
index ab4744aaa6..1a92064078 100644
--- a/Resources/Textures/Objects/Tools/welder_industrial.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/welder_industrial.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/782006a07ef7f16f70128489b3e78b210ee4bbbe",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/782006a07ef7f16f70128489b3e78b210ee4bbbe // Icon Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/3c5cb36e811725e1479c4c025b04220027230632/icons/obj/tools.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/welder_flame.png b/Resources/Textures/Objects/Tools/welder_industrial.rsi/welder_flame.png
index 7814b74851..c4cac4606a 100644
Binary files a/Resources/Textures/Objects/Tools/welder_industrial.rsi/welder_flame.png and b/Resources/Textures/Objects/Tools/welder_industrial.rsi/welder_flame.png differ
diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/icon.png b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/icon.png
index c187486f2b..425cf3c4b3 100644
Binary files a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/icon.png and b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/meta.json b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/meta.json
index ab4744aaa6..87568bcddb 100644
--- a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/welder_industrialadv.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/782006a07ef7f16f70128489b3e78b210ee4bbbe",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/782006a07ef7f16f70128489b3e78b210ee4bbbe // Icon Icon Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/3c5cb36e811725e1479c4c025b04220027230632/icons/obj/tools.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/welder_flame.png b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/welder_flame.png
index d8ba3f28bd..809abc51ee 100644
Binary files a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/welder_flame.png and b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/welder_flame.png differ
diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-cutty-thingy.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-cutty-thingy.png
index f331df4390..09cfe9a497 100644
Binary files a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-cutty-thingy.png and b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-cutty-thingy.png differ
diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-map.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-map.png
index a68f4c1257..4ad153c106 100644
Binary files a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-map.png and b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-map.png differ
diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters.png
index 3f79cb157c..68c8a3ed71 100644
Binary files a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters.png and b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters.png differ
diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json b/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json
index cd29490826..826b1c44ca 100644
--- a/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/wirecutters.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/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d",
+  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d // Icon Taken from Paradise at https://github.com/ParadiseSS13/Paradise",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tools/wrench.rsi/icon.png b/Resources/Textures/Objects/Tools/wrench.rsi/icon.png
index 4d24ac7fae..1b8a2697e2 100644
Binary files a/Resources/Textures/Objects/Tools/wrench.rsi/icon.png and b/Resources/Textures/Objects/Tools/wrench.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/wrench.rsi/meta.json b/Resources/Textures/Objects/Tools/wrench.rsi/meta.json
index a2c8f06819..ecd76812cd 100644
--- a/Resources/Textures/Objects/Tools/wrench.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/wrench.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/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d, storage by EmoGarbage404 (github)",
+  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d, storage by EmoGarbage404 (github) // Icon Taken from Paradise at https://github.com/ParadiseSS13/Paradise",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/equipped-BELT.png
new file mode 100644
index 0000000000..af09cd7fa6
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/icon.png b/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/icon.png
new file mode 100644
index 0000000000..736e979dbb
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/meta.json b/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/meta.json
new file mode 100644
index 0000000000..28d3e6969a
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b13d244d761a07e200a9a41730bd446e776020d5",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "primed",
+      "delays": [
+        [
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/primed.png b/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/primed.png
new file mode 100644
index 0000000000..a687c07632
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Grenades/janitor.rsi/primed.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..2be82246c2
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/meta.json
index c40db27806..3aac7e3788 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/meta.json
@@ -38,6 +38,10 @@
         {
             "name": "equipped-BELT",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..a4d64471de
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/meta.json
index a9431c65cc..907ff1d8ea 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/meta.json
@@ -39,6 +39,10 @@
 		{
 			"name": "equipped-BELT",
 			"directions": 4
+		},
+		{
+			"name": "equipped-SUITSTORAGE",
+			"directions": 4
 		}
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..a4d64471de
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json
index e63711d47d..04e2ac9309 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json
@@ -71,6 +71,10 @@
 		{
 			"name": "equipped-BELT",
 			"directions": 4
+		},
+		{
+			"name": "equipped-SUITSTORAGE",
+			"directions": 4
 		}
 	]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..9686a1911d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler.rsi/meta.json
index 970a230bf8..3b1547beb7 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler.rsi/meta.json
@@ -72,6 +72,10 @@
 		{
 			"name": "equipped-BELT",
 			"directions": 4
+		},
+		{
+			"name": "equipped-SUITSTORAGE",
+			"directions": 4
 		}
     ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..c58b7e3c45
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/meta.json
index d002675273..6657216b76 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/meta.json
@@ -68,6 +68,10 @@
     {
       "name": "equipped-BACKPACK",
       "directions": 4
+    },
+	{
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
 	]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..e511f1379e
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json
index 4c6f32507b..7ec48da4fe 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json
@@ -36,6 +36,10 @@
     {
       "name": "equipped-BACKPACK",
       "directions": 4
+    },
+	{
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..2e4445adfa
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/meta.json
index 897d4233af..dabe44dce0 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/meta.json
@@ -36,6 +36,10 @@
     {
       "name": "equipped-BACKPACK",
       "directions": 4
+    },
+	{
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     },
 	{
 	  "name": "equipped-BELT",
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..eead59f2cb
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/meta.json
index 3617fdd66b..dc1ee0684f 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/meta.json
@@ -64,6 +64,10 @@
 		{
 			"name": "equipped-BELT",
 			"directions": 4
+		},
+		{
+			"name": "equipped-SUITSTORAGE",
+			"directions": 4
 		}
     ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..5ac3c6c8c4
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/meta.json
index 159cf411e0..3b48bfc87c 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/meta.json
@@ -36,6 +36,10 @@
     {
       "name": "equipped-BACKPACK",
       "directions": 4
+    },
+	{
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..e13760d4eb
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/meta.json
index fd779f5a3a..1a906ef965 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/meta.json
@@ -36,6 +36,10 @@
     {
       "name": "equipped-BACKPACK",
       "directions": 4
+    },
+	{
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/taser.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Battery/taser.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..ed96666e88
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/taser.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/taser.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/taser.rsi/meta.json
index f0d5f9dfc9..08eb87f871 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/taser.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/taser.rsi/meta.json
@@ -77,6 +77,10 @@
     {
       "name": "equipped-BELT",
       "directions": 4
+    },
+	{
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..6ae9d358cd
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/meta.json
index a0c1ca8b1d..990ba51185 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/meta.json
@@ -45,6 +45,10 @@
     {
       "name": "equipped-BACKPACK",
       "directions": 4
+    },
+	{
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..63c4bdf3d6
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/meta.json
index 9a5cf766c7..a5e32a3b39 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/meta.json
@@ -24,6 +24,10 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..ab0d0a822f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/meta.json
index 9ca4968722..748eb1de0e 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/meta.json
@@ -30,6 +30,10 @@
         {
             "name": "equipped-BELT",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..07f1f9fa26
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/meta.json
index 946d9a1814..f0a41ab20d 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/meta.json
@@ -27,6 +27,10 @@
         {
             "name": "equipped-BELT",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..785f4037d7
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/meta.json
index 707c54c0bb..4e40f6e842 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/meta.json
@@ -30,6 +30,10 @@
         {
             "name": "equipped-BELT",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..07f1f9fa26
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/meta.json
index b611235f4d..6ac14bfc8f 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/meta.json
@@ -33,6 +33,10 @@
         {
             "name": "equipped-BELT",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/chimp.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/chimp.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..5a38166c22
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/chimp.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/chimp.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Revolvers/chimp.rsi/meta.json
index e5f6d6c61f..02697b6d5e 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Revolvers/chimp.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/chimp.rsi/meta.json
@@ -27,6 +27,10 @@
 	{
 	  "name": "equipped-BELT",
 	  "directions": 4
+	},
+	{
+	  "name": "equipped-SUITSTORAGE",
+	  "directions": 4
 	}
   ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/deckard.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/deckard.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..65f3aacd30
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/deckard.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/deckard.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Revolvers/deckard.rsi/meta.json
index 61f086e93d..fb84e5e63c 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Revolvers/deckard.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/deckard.rsi/meta.json
@@ -33,6 +33,10 @@
 	{
 	  "name": "equipped-BELT",
 	  "directions": 4
+	},
+	{
+	  "name": "equipped-SUITSTORAGE",
+	  "directions": 4
 	}
   ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..65f3aacd30
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json
index f24ef91bcf..1faecd06b3 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json
@@ -24,6 +24,10 @@
         {
             "name": "equipped-BELT",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..65f3aacd30
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json
index f24ef91bcf..1faecd06b3 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json
@@ -24,6 +24,10 @@
         {
             "name": "equipped-BELT",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..65f3aacd30
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/meta.json
index 504a793820..3cdd175e71 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/meta.json
@@ -24,6 +24,10 @@
         {
             "name": "equipped-BELT",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..d20bca74f5
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json
index 12a95021c6..919d0f87ac 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json
@@ -30,6 +30,10 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+		},
+		{
+			"name": "equipped-SUITSTORAGE",
+			"directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..8e2f1548b1
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json
index eae8c0dd9a..cac6899c48 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json
@@ -30,6 +30,10 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..7e73d94ffa
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json
index 955dc6e8bf..2f30ef18a8 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json
@@ -30,6 +30,10 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..17384b5857
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/meta.json
index 4ed311cb4a..df17b6ce6a 100644
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/meta.json
@@ -33,6 +33,10 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..caac143bc4
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json
index ef54ce952a..8b1af3c504 100644
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json
@@ -48,6 +48,10 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..38a2686dfb
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json
index cbdbfefd14..25feebd92c 100644
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json
@@ -33,6 +33,10 @@
     {
       "name": "equipped-BACKPACK",
       "directions": 4
+    },
+	{
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..061f8bdae9
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/meta.json
index 66274aa8a6..02ba281891 100644
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/meta.json
@@ -30,6 +30,10 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..ee46b3bcf7
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/meta.json
index 8de70644d1..66f9e56c3b 100644
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/meta.json
@@ -147,6 +147,10 @@
     {
       "name": "equipped-BACKPACK",
       "directions": 4
+    },
+	{
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..c325b84c7e
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/meta.json
index 607db55835..5ef981dec9 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/meta.json
@@ -30,6 +30,10 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..79fe8aa7cd
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json
index 7408c3f4ac..27d7ebd665 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json
@@ -16,6 +16,10 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..c5e9fb4324
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json
index 67bfc37e93..f3a7f48582 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json
@@ -16,6 +16,10 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..c17f5ce777
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/meta.json
index 6358c26299..fc96d8d519 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/meta.json
@@ -24,6 +24,10 @@
         {
             "name": "equipped-BELT",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/hm_pistol.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hm_pistol.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..785f4037d7
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hm_pistol.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/hm_pistol.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hm_pistol.rsi/meta.json
index 4e592b59a4..9fd38ac1fe 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/hm_pistol.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hm_pistol.rsi/meta.json
@@ -25,6 +25,10 @@
         {
             "name": "equipped-BELT",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..0d1800fa5c
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/meta.json
index 92bc382a42..211d71bf1f 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/meta.json
@@ -14,6 +14,10 @@
       "name": "equipped-BACKPACK",
       "directions": 4
     },
+    {
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
+    },
     {
       "name": "ishotgunstep1"
     },
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..302e6d14b5
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json
index 7408c3f4ac..27d7ebd665 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json
@@ -16,6 +16,10 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..d4e3306e6b
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/meta.json
index bb01559033..55becacf83 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/meta.json
@@ -16,6 +16,10 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..a9ad62c9be
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json
index c223e6b194..4f7fc5d6f5 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json
@@ -24,6 +24,10 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..a349de44b0
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/meta.json
index 33ee152a4e..da8881c7c5 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/meta.json
@@ -24,6 +24,10 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Structures/Doors/secret_door.rsi/assembly.png b/Resources/Textures/Structures/Doors/secret_door.rsi/assembly.png
index 6518b7245c..1a84e526a4 100644
Binary files a/Resources/Textures/Structures/Doors/secret_door.rsi/assembly.png and b/Resources/Textures/Structures/Doors/secret_door.rsi/assembly.png differ
diff --git a/Resources/Textures/Structures/Doors/secret_door.rsi/closed.png b/Resources/Textures/Structures/Doors/secret_door.rsi/closed.png
index b68b06f10d..0f60f5243c 100644
Binary files a/Resources/Textures/Structures/Doors/secret_door.rsi/closed.png and b/Resources/Textures/Structures/Doors/secret_door.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Doors/secret_door.rsi/closing.png b/Resources/Textures/Structures/Doors/secret_door.rsi/closing.png
index 0bb895b050..9dd42badab 100644
Binary files a/Resources/Textures/Structures/Doors/secret_door.rsi/closing.png and b/Resources/Textures/Structures/Doors/secret_door.rsi/closing.png differ
diff --git a/Resources/Textures/Structures/Doors/secret_door.rsi/meta.json b/Resources/Textures/Structures/Doors/secret_door.rsi/meta.json
index 7e8135f216..c1f0d5e09e 100644
--- a/Resources/Textures/Structures/Doors/secret_door.rsi/meta.json
+++ b/Resources/Textures/Structures/Doors/secret_door.rsi/meta.json
@@ -24,12 +24,12 @@
             "directions": 1,
             "delays": [
                 [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
                 ]
             ]
         },
@@ -47,12 +47,12 @@
             "directions": 1,
             "delays": [
                 [
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2,
-                    0.2
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
                 ]
             ]
         }
diff --git a/Resources/Textures/Structures/Doors/secret_door.rsi/open.png b/Resources/Textures/Structures/Doors/secret_door.rsi/open.png
index 81862e1ead..5f78166d8c 100644
Binary files a/Resources/Textures/Structures/Doors/secret_door.rsi/open.png and b/Resources/Textures/Structures/Doors/secret_door.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Doors/secret_door.rsi/opening.png b/Resources/Textures/Structures/Doors/secret_door.rsi/opening.png
index 9d14324686..127a10b53d 100644
Binary files a/Resources/Textures/Structures/Doors/secret_door.rsi/opening.png and b/Resources/Textures/Structures/Doors/secret_door.rsi/opening.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_5.png b/Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_5.png
index c9163d9407..a5fd30733b 100644
Binary files a/Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_5.png and b/Resources/Textures/Structures/Furniture/Carpets/black_carpet.rsi/carpet_5.png differ
diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json b/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
index c94ef97909..cbfc417444 100644
--- a/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
+++ b/Resources/Textures/Structures/Furniture/chairs.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/11402f6ae62facc2e8bcfa1f8ef5353b26663278, meat.png is CC0-1.0 by EmoGarbage404 (github) for Space Station 14. chair.png and its derrivatives taken from shiptest at commit https://github.com/shiptest-ss13/Shiptest/commit/f761c784812e827960a66cd10aac17ebc6edfac3, palette for chair.png, steel-bench.png and chair-greyscale.png taken from paradise equivalent chairs at commit https://github.com/ParadiseSS13/Paradise/commit/5ce5a66c814c4a60118d24885389357fd0240002, steel by SonicHDC, brass chair.png taken from tgstation at https://github.com/tgstation/tgstation/blob/b7e7779c19b76449c290aaf2150fb93545b1a79a/icons/obj/chairs.dmi",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/11402f6ae62facc2e8bcfa1f8ef5353b26663278, meat.png is CC0-1.0 by EmoGarbage404 (github) for Space Station 14. chair.png and its derrivatives taken from shiptest at commit https://github.com/shiptest-ss13/Shiptest/commit/f761c784812e827960a66cd10aac17ebc6edfac3, palette for chair.png, steel-bench.png and chair-greyscale.png taken from paradise equivalent chairs at commit https://github.com/ParadiseSS13/Paradise/commit/5ce5a66c814c4a60118d24885389357fd0240002, steel by SonicHDC, brass chair.png taken from tgstation at https://github.com/tgstation/tgstation/blob/b7e7779c19b76449c290aaf2150fb93545b1a79a/icons/obj/chairs.dmi, wooden bench by Ko4erga (discord)",
   "size": {
     "x": 32,
     "y": 32
@@ -71,6 +71,10 @@
       "name": "wooden",
       "directions": 4
     },
+    {
+      "name": "wooden-bench",
+      "directions": 4
+    },
     {
       "name": "wooden-wings",
       "directions": 4
diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/wooden-bench.png b/Resources/Textures/Structures/Furniture/chairs.rsi/wooden-bench.png
new file mode 100644
index 0000000000..00192a1447
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/chairs.rsi/wooden-bench.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/meta.json
index 191aa398a9..6528705be2 100644
--- a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/meta.json
+++ b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/meta.json
@@ -5,30 +5,25 @@
       "y":32
    },
    "license":"CC-BY-SA-3.0",
-   "copyright":"Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da",
+   "copyright":"Taken from https://github.com/ParadiseSS13/Paradise/",
    "states":[
       {
-         "name":"scrub_off",
-         "directions": 4
+         "name":"scrub_off"
       },
       {
-         "name":"scrub_welded",
-         "directions": 4
+         "name":"scrub_welded"
       },
       {
          "name":"scrub_on",
-         "directions": 4,
-         "delays": [[0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08], [0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08], [0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08], [0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08]]
+         "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]]
       },
       {
          "name": "scrub_purge",
-         "directions": 4,
-         "delays": [[0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04], [0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04], [0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04], [0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04]]
+         "delays": [[0.1, 0.1, 0.1, 0.1, 0.1]]
       },
       {
          "name": "scrub_wide",
-         "directions": 4,
-         "delays": [[0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04], [0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04], [0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04], [0.2, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04, 0.04]]
+         "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]
       }
    ]
 }
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_off.png b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_off.png
index efc173d893..9752342e2d 100644
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_off.png and b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_off.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_on.png b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_on.png
index 9bc5d8c0bf..5fcf53f314 100644
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_on.png and b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_on.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_purge.png b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_purge.png
index 75ba6d6de0..e0e3e44556 100644
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_purge.png and b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_purge.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_welded.png b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_welded.png
index 96ab7b0825..b3a5445f74 100644
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_welded.png and b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_welded.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_wide.png b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_wide.png
index 087777a888..a93f3259b8 100644
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_wide.png and b/Resources/Textures/Structures/Piping/Atmospherics/scrubber.rsi/scrub_wide.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/meta.json
index 0d11425210..16ab91ee5c 100644
--- a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/meta.json
+++ b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/meta.json
@@ -5,25 +5,21 @@
       "y":32
    },
    "license":"CC-BY-SA-3.0",
-   "copyright":"Taken from https://github.com/BeeStation/BeeStation-Hornet at commit 4ccd79de285e79e504308bcd6fa5908d6b7685f7",
+   "copyright":"Taken from https://github.com/ParadiseSS13/Paradise/",
    "states":[
       {
-         "name":"vent_off",
-         "directions" : 4
+         "name":"vent_off"
       },
       {
-         "name":"vent_welded",
-         "directions" : 4
+         "name":"vent_welded"
       },
       {
          "name":"vent_out",
-         "directions" : 4,
-         "delays":[ [ 0.08, 0.08, 0.08, 0.08 ], [ 0.08, 0.08, 0.08, 0.08 ], [ 0.08, 0.08, 0.08, 0.08 ], [ 0.08, 0.08, 0.08, 0.08 ] ]
+         "delays":[ [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] ]
       },
       {
          "name":"vent_in",
-         "directions" : 4,
-         "delays":[ [ 0.08, 0.08, 0.08, 0.08 ], [ 0.08, 0.08, 0.08, 0.08 ], [ 0.08, 0.08, 0.08, 0.08 ], [ 0.08, 0.08, 0.08, 0.08 ] ]
+         "delays":[ [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] ]
       }
    ]
 }
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_in.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_in.png
index cf1b050c02..2a7787aa4b 100644
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_in.png and b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_in.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_off.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_off.png
index 6208c59db7..e7634ef5a2 100644
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_off.png and b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_off.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_out.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_out.png
index e038706b0e..396d8fb0f9 100644
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_out.png and b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_out.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_welded.png b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_welded.png
index b45ae1cb5f..b00be657b6 100644
Binary files a/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_welded.png and b/Resources/Textures/Structures/Piping/Atmospherics/vent.rsi/vent_welded.png differ
diff --git a/Resources/Textures/Structures/Specific/church-bell.rsi/church-bell.png b/Resources/Textures/Structures/Specific/church-bell.rsi/church-bell.png
new file mode 100644
index 0000000000..dc95f2cdac
Binary files /dev/null and b/Resources/Textures/Structures/Specific/church-bell.rsi/church-bell.png differ
diff --git a/Resources/Textures/Structures/Specific/church-bell.rsi/meta.json b/Resources/Textures/Structures/Specific/church-bell.rsi/meta.json
new file mode 100644
index 0000000000..e6161e60e4
--- /dev/null
+++ b/Resources/Textures/Structures/Specific/church-bell.rsi/meta.json
@@ -0,0 +1,15 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Kezu for ss14",
+  "states": [
+    {
+      "name": "church-bell",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/black-1.png b/Resources/Textures/Structures/Storage/canister.rsi/black-1.png
index 791f22c958..2f7fc54a31 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/black-1.png and b/Resources/Textures/Structures/Storage/canister.rsi/black-1.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/black.png b/Resources/Textures/Structures/Storage/canister.rsi/black.png
index c7c4d4732e..2b07b2b087 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/black.png and b/Resources/Textures/Structures/Storage/canister.rsi/black.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/blue-1.png b/Resources/Textures/Structures/Storage/canister.rsi/blue-1.png
index f07bedd7ea..1cb0f83ebf 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/blue-1.png and b/Resources/Textures/Structures/Storage/canister.rsi/blue-1.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/blue.png b/Resources/Textures/Structures/Storage/canister.rsi/blue.png
index 412994d96c..c39f1ff26e 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/blue.png and b/Resources/Textures/Structures/Storage/canister.rsi/blue.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-connector.png b/Resources/Textures/Structures/Storage/canister.rsi/can-connector.png
index 7996e1b26d..9360a41c58 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/can-connector.png and b/Resources/Textures/Structures/Storage/canister.rsi/can-connector.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-o0.png b/Resources/Textures/Structures/Storage/canister.rsi/can-o0.png
index 5f13bbacae..89f617973f 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/can-o0.png and b/Resources/Textures/Structures/Storage/canister.rsi/can-o0.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-o1.png b/Resources/Textures/Structures/Storage/canister.rsi/can-o1.png
index 2e548fcaca..6f9566ee13 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/can-o1.png and b/Resources/Textures/Structures/Storage/canister.rsi/can-o1.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-o2.png b/Resources/Textures/Structures/Storage/canister.rsi/can-o2.png
index 094ee1e3c6..1a0a402363 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/can-o2.png and b/Resources/Textures/Structures/Storage/canister.rsi/can-o2.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-o3.png b/Resources/Textures/Structures/Storage/canister.rsi/can-o3.png
index 014ed7833d..87a68af474 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/can-o3.png and b/Resources/Textures/Structures/Storage/canister.rsi/can-o3.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-oa1.png b/Resources/Textures/Structures/Storage/canister.rsi/can-oa1.png
index 8153aa5ae7..8489866f74 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/can-oa1.png and b/Resources/Textures/Structures/Storage/canister.rsi/can-oa1.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-open.png b/Resources/Textures/Structures/Storage/canister.rsi/can-open.png
index 67f9117ebd..61d286efb5 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/can-open.png and b/Resources/Textures/Structures/Storage/canister.rsi/can-open.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/darkblue-1.png b/Resources/Textures/Structures/Storage/canister.rsi/darkblue-1.png
index c8bea6c38a..1cb0f83ebf 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/darkblue-1.png and b/Resources/Textures/Structures/Storage/canister.rsi/darkblue-1.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/darkblue.png b/Resources/Textures/Structures/Storage/canister.rsi/darkblue.png
index 06a097b0bd..f664d0f3bf 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/darkblue.png and b/Resources/Textures/Structures/Storage/canister.rsi/darkblue.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/frezon-1.png b/Resources/Textures/Structures/Storage/canister.rsi/frezon-1.png
index 7c02c3993e..1cb0f83ebf 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/frezon-1.png and b/Resources/Textures/Structures/Storage/canister.rsi/frezon-1.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/frezon.png b/Resources/Textures/Structures/Storage/canister.rsi/frezon.png
index 37b05e7c83..c39f1ff26e 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/frezon.png and b/Resources/Textures/Structures/Storage/canister.rsi/frezon.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/grey-1.png b/Resources/Textures/Structures/Storage/canister.rsi/grey-1.png
index 1782cc29e8..d7bef4b366 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/grey-1.png and b/Resources/Textures/Structures/Storage/canister.rsi/grey-1.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/grey.png b/Resources/Textures/Structures/Storage/canister.rsi/grey.png
index f7ef5a60f9..6668cd6789 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/grey.png and b/Resources/Textures/Structures/Storage/canister.rsi/grey.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/meta.json b/Resources/Textures/Structures/Storage/canister.rsi/meta.json
index 95d67cc8ae..7c2915a3a7 100644
--- a/Resources/Textures/Structures/Storage/canister.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/canister.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Frezon canister modified from tgstation, the rest are taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8581a636acfc1517611a680b7711a74fc7ef335",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/orange-1.png b/Resources/Textures/Structures/Storage/canister.rsi/orange-1.png
index 4d0714e545..136b36ca3c 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/orange-1.png and b/Resources/Textures/Structures/Storage/canister.rsi/orange-1.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/orange.png b/Resources/Textures/Structures/Storage/canister.rsi/orange.png
index 2c8b6b429f..7681cc2f06 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/orange.png and b/Resources/Textures/Structures/Storage/canister.rsi/orange.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/red-1.png b/Resources/Textures/Structures/Storage/canister.rsi/red-1.png
index 0f43f9d142..84ccd606c9 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/red-1.png and b/Resources/Textures/Structures/Storage/canister.rsi/red-1.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/red.png b/Resources/Textures/Structures/Storage/canister.rsi/red.png
index 4e1a047b38..3ee22dae49 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/red.png and b/Resources/Textures/Structures/Storage/canister.rsi/red.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/redws-1.png b/Resources/Textures/Structures/Storage/canister.rsi/redws-1.png
index d5c412875d..5f924fffce 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/redws-1.png and b/Resources/Textures/Structures/Storage/canister.rsi/redws-1.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/redws.png b/Resources/Textures/Structures/Storage/canister.rsi/redws.png
index 8390cb6539..6306517770 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/redws.png and b/Resources/Textures/Structures/Storage/canister.rsi/redws.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/water_vapor-1.png b/Resources/Textures/Structures/Storage/canister.rsi/water_vapor-1.png
index ec8c065097..2f7fc54a31 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/water_vapor-1.png and b/Resources/Textures/Structures/Storage/canister.rsi/water_vapor-1.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/water_vapor.png b/Resources/Textures/Structures/Storage/canister.rsi/water_vapor.png
index ee8b7979ce..993c5ac4ff 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/water_vapor.png and b/Resources/Textures/Structures/Storage/canister.rsi/water_vapor.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/yellow-1.png b/Resources/Textures/Structures/Storage/canister.rsi/yellow-1.png
index 3937104ebe..c12694850d 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/yellow-1.png and b/Resources/Textures/Structures/Storage/canister.rsi/yellow-1.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/yellow.png b/Resources/Textures/Structures/Storage/canister.rsi/yellow.png
index 595ceb298b..fc98a45682 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/yellow.png and b/Resources/Textures/Structures/Storage/canister.rsi/yellow.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/Structures/Storage/closet.rsi/meta.json
index 98bbe8085a..cf0c204447 100644
--- a/Resources/Textures/Structures/Storage/closet.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/closet.rsi/meta.json
@@ -461,6 +461,9 @@
     {
       "name": "secure_door"
     },
+    {
+      "name": "secure_icon"
+    },
     {
       "name": "secure_open"
     },
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/secure_icon.png b/Resources/Textures/Structures/Storage/closet.rsi/secure_icon.png
new file mode 100644
index 0000000000..03b98c64db
Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet.rsi/secure_icon.png differ
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/generic_icon.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/generic_icon.png
new file mode 100644
index 0000000000..63e9dcb0fa
Binary files /dev/null and b/Resources/Textures/Structures/Storage/wall_locker.rsi/generic_icon.png differ
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/meta.json b/Resources/Textures/Structures/Storage/wall_locker.rsi/meta.json
index 3408841645..b6ed63c7a3 100644
--- a/Resources/Textures/Structures/Storage/wall_locker.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/wall_locker.rsi/meta.json
@@ -18,6 +18,7 @@
     { "name": "fire_open" },
     { "name": "generic" },
     { "name": "generic_door" },
+    { "name": "generic_icon" },
     { "name": "generic_open" },
     { "name": "gray_door" },
     { "name": "green_door" },
diff --git a/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/meta.json b/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/meta.json
index 351d5688e4..8bbfa474bf 100644
--- a/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/meta.json
+++ b/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Sprited by SonicHDC (Github) for Space Station 14",
+    "copyright": "Sprited by erhardsteinhauer (discord) for Space Station 14 New Frontier server",
     "states": [
         {
             "name": "state0"
diff --git a/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/state0.png b/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/state0.png
index 10fb9cd49d..d437ad8b73 100644
Binary files a/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/state0.png and b/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/state0.png differ
diff --git a/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/state1.png b/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/state1.png
index 814483e1a6..a0ce5d516e 100644
Binary files a/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/state1.png and b/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/state1.png differ
diff --git a/Resources/Textures/Structures/Walls/shuttle.rsi/meta.json b/Resources/Textures/Structures/Walls/shuttle.rsi/meta.json
index 97ca2aa3b0..9aff20a66c 100644
--- a/Resources/Textures/Structures/Walls/shuttle.rsi/meta.json
+++ b/Resources/Textures/Structures/Walls/shuttle.rsi/meta.json
@@ -41,6 +41,24 @@
         {
             "name": "state7",
             "directions": 4
+        },
+        {
+            "name": "shuttle_construct-0"
+        },
+        {
+            "name": "shuttle_construct-1"
+        },
+        {
+            "name": "shuttle_construct-2"
+        },
+        {
+            "name": "shuttle_construct-3"
+        },
+        {
+            "name": "shuttle_construct-4"
+        },
+        {
+            "name": "shuttle_construct-5"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-0.png b/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-0.png
new file mode 100644
index 0000000000..dde7f67085
Binary files /dev/null and b/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-0.png differ
diff --git a/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-1.png b/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-1.png
new file mode 100644
index 0000000000..c68cfbac68
Binary files /dev/null and b/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-1.png differ
diff --git a/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-2.png b/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-2.png
new file mode 100644
index 0000000000..d2f5bc0c3b
Binary files /dev/null and b/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-2.png differ
diff --git a/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-3.png b/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-3.png
new file mode 100644
index 0000000000..7098ec309a
Binary files /dev/null and b/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-3.png differ
diff --git a/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-4.png b/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-4.png
new file mode 100644
index 0000000000..120b1638c4
Binary files /dev/null and b/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-4.png differ
diff --git a/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-5.png b/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-5.png
new file mode 100644
index 0000000000..c29bdb3197
Binary files /dev/null and b/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-5.png differ
diff --git a/Resources/Textures/Structures/Walls/solid.rsi/full.png b/Resources/Textures/Structures/Walls/solid.rsi/full.png
index 02ae3ff3cc..b4e991e345 100644
Binary files a/Resources/Textures/Structures/Walls/solid.rsi/full.png and b/Resources/Textures/Structures/Walls/solid.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Walls/solid.rsi/meta.json b/Resources/Textures/Structures/Walls/solid.rsi/meta.json
index 85b809570d..246ebe31b9 100644
--- a/Resources/Textures/Structures/Walls/solid.rsi/meta.json
+++ b/Resources/Textures/Structures/Walls/solid.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/c34c1b30abf18aa552e19294523924c39e5ea127/icons/turf/wall_masks.dmi and modified.",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png
index 828730d9f3..1e2da3352b 100644
Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png differ
diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png
index 93e381adf2..501e4b2ab4 100644
Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png differ
diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png
index cf8936fdce..23367ae824 100644
Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png differ
diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png
index ee44f0d400..2b48ffb696 100644
Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png differ
diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png
index bf9dad0013..515b40760d 100644
Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png differ
diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png
index be5832d69d..bbff6b6584 100644
Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png differ
diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
index 8141637bd6..f6b33bcb18 100644
Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png differ
diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png
index 6f2bcb665a..a7800d9dcc 100644
Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png differ
diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png
index 8141637bd6..f6b33bcb18 100644
Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png differ
diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png
index 6f2bcb665a..a7800d9dcc 100644
Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png differ
diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png
index 3fe7b22905..9e8e9dd40a 100644
Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png differ
diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png
index 0bd4de7c17..3c0b42ddbf 100644
Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png differ
diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png
index 3fe7b22905..9e8e9dd40a 100644
Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png differ
diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over7.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over7.png
index c8bc3191d3..b4bc95f4f0 100644
Binary files a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over7.png and b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over7.png differ
diff --git a/Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png b/Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png
index 665f36c54e..1e2da3352b 100644
Binary files a/Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png and b/Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png differ
diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid0.png b/Resources/Textures/Structures/Walls/solid.rsi/solid0.png
index fe570c054f..3849504b6f 100644
Binary files a/Resources/Textures/Structures/Walls/solid.rsi/solid0.png and b/Resources/Textures/Structures/Walls/solid.rsi/solid0.png differ
diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid1.png b/Resources/Textures/Structures/Walls/solid.rsi/solid1.png
index 4374ed1e10..9ac2271692 100644
Binary files a/Resources/Textures/Structures/Walls/solid.rsi/solid1.png and b/Resources/Textures/Structures/Walls/solid.rsi/solid1.png differ
diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid2.png b/Resources/Textures/Structures/Walls/solid.rsi/solid2.png
index fe570c054f..3849504b6f 100644
Binary files a/Resources/Textures/Structures/Walls/solid.rsi/solid2.png and b/Resources/Textures/Structures/Walls/solid.rsi/solid2.png differ
diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid3.png b/Resources/Textures/Structures/Walls/solid.rsi/solid3.png
index 4374ed1e10..9ac2271692 100644
Binary files a/Resources/Textures/Structures/Walls/solid.rsi/solid3.png and b/Resources/Textures/Structures/Walls/solid.rsi/solid3.png differ
diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid4.png b/Resources/Textures/Structures/Walls/solid.rsi/solid4.png
index 95e4089479..a5a6dd2856 100644
Binary files a/Resources/Textures/Structures/Walls/solid.rsi/solid4.png and b/Resources/Textures/Structures/Walls/solid.rsi/solid4.png differ
diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid5.png b/Resources/Textures/Structures/Walls/solid.rsi/solid5.png
index d4f50d419f..3c0b42ddbf 100644
Binary files a/Resources/Textures/Structures/Walls/solid.rsi/solid5.png and b/Resources/Textures/Structures/Walls/solid.rsi/solid5.png differ
diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid6.png b/Resources/Textures/Structures/Walls/solid.rsi/solid6.png
index 95e4089479..a5a6dd2856 100644
Binary files a/Resources/Textures/Structures/Walls/solid.rsi/solid6.png and b/Resources/Textures/Structures/Walls/solid.rsi/solid6.png differ
diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid7.png b/Resources/Textures/Structures/Walls/solid.rsi/solid7.png
index a880e87e0e..b4bc95f4f0 100644
Binary files a/Resources/Textures/Structures/Walls/solid.rsi/solid7.png and b/Resources/Textures/Structures/Walls/solid.rsi/solid7.png differ
diff --git a/Resources/Textures/Structures/Walls/solid_diagonal.rsi/state0.png b/Resources/Textures/Structures/Walls/solid_diagonal.rsi/state0.png
index fe95c81ed3..5976a6c5c8 100644
Binary files a/Resources/Textures/Structures/Walls/solid_diagonal.rsi/state0.png and b/Resources/Textures/Structures/Walls/solid_diagonal.rsi/state0.png differ
diff --git a/Resources/Textures/Structures/Walls/solid_diagonal.rsi/state1.png b/Resources/Textures/Structures/Walls/solid_diagonal.rsi/state1.png
index 1eb30cb070..81e51b9ac6 100644
Binary files a/Resources/Textures/Structures/Walls/solid_diagonal.rsi/state1.png and b/Resources/Textures/Structures/Walls/solid_diagonal.rsi/state1.png differ
diff --git a/Resources/Textures/Structures/Walls/wooden_fence.rsi/corner.png b/Resources/Textures/Structures/Walls/wooden_fence.rsi/corner.png
new file mode 100644
index 0000000000..a7fe858c4b
Binary files /dev/null and b/Resources/Textures/Structures/Walls/wooden_fence.rsi/corner.png differ
diff --git a/Resources/Textures/Structures/Walls/wooden_fence.rsi/corner_small.png b/Resources/Textures/Structures/Walls/wooden_fence.rsi/corner_small.png
new file mode 100644
index 0000000000..4e80b4d19e
Binary files /dev/null and b/Resources/Textures/Structures/Walls/wooden_fence.rsi/corner_small.png differ
diff --git a/Resources/Textures/Structures/Walls/wooden_fence.rsi/door_closed.png b/Resources/Textures/Structures/Walls/wooden_fence.rsi/door_closed.png
new file mode 100644
index 0000000000..2f02a6f743
Binary files /dev/null and b/Resources/Textures/Structures/Walls/wooden_fence.rsi/door_closed.png differ
diff --git a/Resources/Textures/Structures/Walls/wooden_fence.rsi/door_closed_small.png b/Resources/Textures/Structures/Walls/wooden_fence.rsi/door_closed_small.png
new file mode 100644
index 0000000000..2b3693e9dc
Binary files /dev/null and b/Resources/Textures/Structures/Walls/wooden_fence.rsi/door_closed_small.png differ
diff --git a/Resources/Textures/Structures/Walls/wooden_fence.rsi/door_opened.png b/Resources/Textures/Structures/Walls/wooden_fence.rsi/door_opened.png
new file mode 100644
index 0000000000..99dc852d35
Binary files /dev/null and b/Resources/Textures/Structures/Walls/wooden_fence.rsi/door_opened.png differ
diff --git a/Resources/Textures/Structures/Walls/wooden_fence.rsi/door_opened_small.png b/Resources/Textures/Structures/Walls/wooden_fence.rsi/door_opened_small.png
new file mode 100644
index 0000000000..4464eac3be
Binary files /dev/null and b/Resources/Textures/Structures/Walls/wooden_fence.rsi/door_opened_small.png differ
diff --git a/Resources/Textures/Structures/Walls/wooden_fence.rsi/end.png b/Resources/Textures/Structures/Walls/wooden_fence.rsi/end.png
new file mode 100644
index 0000000000..8e4a035214
Binary files /dev/null and b/Resources/Textures/Structures/Walls/wooden_fence.rsi/end.png differ
diff --git a/Resources/Textures/Structures/Walls/wooden_fence.rsi/end_small.png b/Resources/Textures/Structures/Walls/wooden_fence.rsi/end_small.png
new file mode 100644
index 0000000000..aefaef6ed3
Binary files /dev/null and b/Resources/Textures/Structures/Walls/wooden_fence.rsi/end_small.png differ
diff --git a/Resources/Textures/Structures/Walls/wooden_fence.rsi/meta.json b/Resources/Textures/Structures/Walls/wooden_fence.rsi/meta.json
new file mode 100644
index 0000000000..9253b538d9
--- /dev/null
+++ b/Resources/Textures/Structures/Walls/wooden_fence.rsi/meta.json
@@ -0,0 +1,59 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "by Ko4erga (discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "straight",
+      "directions": 4
+    },
+    {
+      "name": "end",
+      "directions": 4
+    },
+    {
+      "name": "corner",
+      "directions": 4
+    },
+    {
+      "name": "door_closed",
+      "directions": 4
+    },
+    {
+      "name": "door_opened",
+      "directions": 4
+    },
+    {
+      "name": "tjunction",
+      "directions": 4
+    },
+    {
+      "name": "straight_small",
+      "directions": 4
+    },
+    {
+      "name": "end_small",
+      "directions": 4
+    },
+    {
+      "name": "corner_small",
+      "directions": 4
+    },
+    {
+      "name": "door_closed_small",
+      "directions": 4
+    },
+    {
+      "name": "door_opened_small",
+      "directions": 4
+    },
+    {
+      "name": "tjunction_small",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Walls/wooden_fence.rsi/straight.png b/Resources/Textures/Structures/Walls/wooden_fence.rsi/straight.png
new file mode 100644
index 0000000000..4eb510ff69
Binary files /dev/null and b/Resources/Textures/Structures/Walls/wooden_fence.rsi/straight.png differ
diff --git a/Resources/Textures/Structures/Walls/wooden_fence.rsi/straight_small.png b/Resources/Textures/Structures/Walls/wooden_fence.rsi/straight_small.png
new file mode 100644
index 0000000000..b148fc8431
Binary files /dev/null and b/Resources/Textures/Structures/Walls/wooden_fence.rsi/straight_small.png differ
diff --git a/Resources/Textures/Structures/Walls/wooden_fence.rsi/tjunction.png b/Resources/Textures/Structures/Walls/wooden_fence.rsi/tjunction.png
new file mode 100644
index 0000000000..85cd3d431a
Binary files /dev/null and b/Resources/Textures/Structures/Walls/wooden_fence.rsi/tjunction.png differ
diff --git a/Resources/Textures/Structures/Walls/wooden_fence.rsi/tjunction_small.png b/Resources/Textures/Structures/Walls/wooden_fence.rsi/tjunction_small.png
new file mode 100644
index 0000000000..8dc3ee32f6
Binary files /dev/null and b/Resources/Textures/Structures/Walls/wooden_fence.rsi/tjunction_small.png differ
diff --git a/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state0.png
index 60d1c0421b..84f71e4833 100644
Binary files a/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state0.png and b/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state0.png differ
diff --git a/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state1.png
index 1ae08dba88..3655b4b9d1 100644
Binary files a/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state1.png and b/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state1.png differ
diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/full.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/full.png
index b20d5ebd5e..41d24e9d2c 100644
Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/full.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json b/Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json
index 4a03341090..888b3527fb 100644
--- a/Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/plasma_window.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/9c7d509354ee030300f63c701da63c17928c3b3b and modified by Swept",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png
index fe379e2fef..a4adc74bb5 100644
Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png differ
diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png
index d75684f5d0..b0289b7d65 100644
Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png differ
diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png
index fe379e2fef..a4adc74bb5 100644
Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png differ
diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png
index d75684f5d0..b0289b7d65 100644
Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png differ
diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png
index 051ddb5681..06f4275583 100644
Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png differ
diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png
index af6c01d906..b6847b9237 100644
Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png differ
diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png
index 051ddb5681..06f4275583 100644
Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png differ
diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png
index dba4e93a8a..897abc2b8e 100644
Binary files a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png and b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state0.png
index 8ad1f325b3..3e5ebf5036 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state0.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state0.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state1.png
index e724d3b9f7..7bd92db59f 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state1.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state1.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/full.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/full.png
index 4cfc4c45da..a1c5c2115f 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/full.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/meta.json b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/meta.json
index f66453a57d..e716cdf4ed 100644
--- a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/reinforced_plasma_window.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/9c7d509354ee030300f63c701da63c17928c3b3b",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow0.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow0.png
index faeb000b4a..8944626009 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow0.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow0.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow1.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow1.png
index 46547d6b99..b4ba2ac007 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow1.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow1.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow2.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow2.png
index faeb000b4a..8944626009 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow2.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow2.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow3.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow3.png
index 46547d6b99..7f987f7a8e 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow3.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow3.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow4.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow4.png
index 66dddef140..c9bd9b8699 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow4.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow4.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow5.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow5.png
index 8ebeed21a9..f16d149ec4 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow5.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow5.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow6.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow6.png
index 66dddef140..c9bd9b8699 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow6.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow6.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow7.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow7.png
index 4d0ff4bf73..4ad14d62d1 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow7.png and b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow7.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state0.png
index facbfda3ad..fa6f83797c 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state0.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state0.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state1.png
index 3799df51bf..c40b161092 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state1.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state1.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/full.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/full.png
index 10342c5705..a1c44f239f 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/full.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/meta.json b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/meta.json
index 739d63b247..84639dad70 100644
--- a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/meta.json
@@ -1,46 +1,46 @@
 {
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "resprited by AsikKEsel | Original source: from vgstation at commit https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept ",
-    "size": {
-      "x": 32,
-      "y": 32
-    },
-    "states": [
-      {
-        "name": "full"
-      },
-      {
-        "name": "ruwindow0",
-        "directions": 4
-      },
-      {
-        "name": "ruwindow1",
-        "directions": 4
-      },
-      {
-        "name": "ruwindow2",
-        "directions": 4
-      },
-      {
-        "name": "ruwindow3",
-        "directions": 4
-      },
-      {
-        "name": "ruwindow4",
-        "directions": 4
-      },
-      {
-        "name": "ruwindow5",
-        "directions": 4
-      },
-      {
-        "name": "ruwindow6",
-        "directions": 4
-      },
-      {
-        "name": "ruwindow7",
-        "directions": 4
-      }
-    ]
-  }
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "full"
+    },
+    {
+      "name": "ruwindow0",
+      "directions": 4
+    },
+    {
+      "name": "ruwindow1",
+      "directions": 4
+    },
+    {
+      "name": "ruwindow2",
+      "directions": 4
+    },
+    {
+      "name": "ruwindow3",
+      "directions": 4
+    },
+    {
+      "name": "ruwindow4",
+      "directions": 4
+    },
+    {
+      "name": "ruwindow5",
+      "directions": 4
+    },
+    {
+      "name": "ruwindow6",
+      "directions": 4
+    },
+    {
+      "name": "ruwindow7",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow0.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow0.png
index dfe885bf85..ee38893001 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow0.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow0.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow1.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow1.png
index e1ca7ea363..cb46c4deda 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow1.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow1.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow2.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow2.png
index 773a2b3fff..ee38893001 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow2.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow2.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow3.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow3.png
index e10cff828e..7977b29f0c 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow3.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow3.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow4.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow4.png
index 2dff7e5127..a50fafe0ed 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow4.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow4.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow5.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow5.png
index 0a54faafb0..3fe3f626e7 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow5.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow5.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow6.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow6.png
index 1f9ba05446..a50fafe0ed 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow6.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow6.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow7.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow7.png
index 5fb5fb0c7f..6edfddd38d 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow7.png and b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow7.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png
index 34c51d7c3d..73b05e9b2a 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json b/Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json
index 456d8a2890..90c736a41c 100644
--- a/Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/reinforced_window.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/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png
index 8beafa06db..f339bedb11 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png
index ba95fde9e5..defff91bc0 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png
index 8beafa06db..f339bedb11 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png
index ba95fde9e5..defff91bc0 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png
index 754af67ca3..0324c05f17 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png
index 6f16899ede..6770b1a235 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png
index 754af67ca3..0324c05f17 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png
index f7fe3b6365..0e02c2e8de 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png and b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state0.png
index eb9489ddb4..cd8aca5579 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state0.png and b/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state0.png differ
diff --git a/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state1.png
index 6525420716..4130608cea 100644
Binary files a/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state1.png and b/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state1.png differ
diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/full.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/full.png
index 6baa538dad..371b38edb2 100644
Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/full.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json b/Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json
index 30517fd0ac..cdbfb466b4 100644
--- a/Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/tinted_window.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/           f141c349e063f7318d8c8a2417d840f0b2d06600, modified",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow0.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow0.png
index 414ffd9f3e..5539fa6154 100644
Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow0.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow0.png differ
diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow1.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow1.png
index 90131a48bf..a7a0cad53a 100644
Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow1.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow1.png differ
diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow2.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow2.png
index ae12f39860..5539fa6154 100644
Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow2.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow2.png differ
diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow3.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow3.png
index bbfee9bce7..a7a0cad53a 100644
Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow3.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow3.png differ
diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow4.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow4.png
index b79db5f789..ea4706b191 100644
Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow4.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow4.png differ
diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow5.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow5.png
index 83797163f2..b26c7be0b2 100644
Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow5.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow5.png differ
diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow6.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow6.png
index 2cae7c43a4..ea4706b191 100644
Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow6.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow6.png differ
diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow7.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow7.png
index 17304ce104..a422e8c152 100644
Binary files a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow7.png and b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow7.png differ
diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/full.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/full.png
index f7b6e10f86..5695bc0c26 100644
Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/full.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/meta.json b/Resources/Textures/Structures/Windows/uranium_window.rsi/meta.json
index 099201b418..e4e4f5004e 100644
--- a/Resources/Textures/Structures/Windows/uranium_window.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/uranium_window.rsi/meta.json
@@ -1,46 +1,46 @@
 {
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "resprited by AsikKEsel | Original source: from vgstation at commit https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept",
-    "size": {
-      "x": 32,
-      "y": 32
-    },
-    "states": [
-      {
-        "name": "full"
-      },
-      {
-        "name": "uwindow0",
-        "directions": 4
-      },
-      {
-        "name": "uwindow1",
-        "directions": 4
-      },
-      {
-        "name": "uwindow2",
-        "directions": 4
-      },
-      {
-        "name": "uwindow3",
-        "directions": 4
-      },
-      {
-        "name": "uwindow4",
-        "directions": 4
-      },
-      {
-        "name": "uwindow5",
-        "directions": 4
-      },
-      {
-        "name": "uwindow6",
-        "directions": 4
-      },
-      {
-        "name": "uwindow7",
-        "directions": 4
-      }
-    ]
-  }
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "full"
+    },
+    {
+      "name": "uwindow0",
+      "directions": 4
+    },
+    {
+      "name": "uwindow1",
+      "directions": 4
+    },
+    {
+      "name": "uwindow2",
+      "directions": 4
+    },
+    {
+      "name": "uwindow3",
+      "directions": 4
+    },
+    {
+      "name": "uwindow4",
+      "directions": 4
+    },
+    {
+      "name": "uwindow5",
+      "directions": 4
+    },
+    {
+      "name": "uwindow6",
+      "directions": 4
+    },
+    {
+      "name": "uwindow7",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow0.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow0.png
index 7be507678d..31bfc29cf0 100644
Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow0.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow0.png differ
diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow1.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow1.png
index 9979f28e94..e395832e8e 100644
Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow1.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow1.png differ
diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow2.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow2.png
index 7be507678d..31bfc29cf0 100644
Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow2.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow2.png differ
diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow3.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow3.png
index 9979f28e94..e395832e8e 100644
Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow3.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow3.png differ
diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow4.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow4.png
index 9fa452a61b..4097d024fc 100644
Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow4.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow4.png differ
diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow5.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow5.png
index bd46092739..5245aa4de5 100644
Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow5.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow5.png differ
diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow6.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow6.png
index eabc47c84b..4097d024fc 100644
Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow6.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow6.png differ
diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow7.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow7.png
index f75790a418..f2aec98846 100644
Binary files a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow7.png and b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow7.png differ
diff --git a/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state0.png
index 45b3c99189..dc5081de2e 100644
Binary files a/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state0.png and b/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state0.png differ
diff --git a/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state1.png
index 5286b1e17e..772c39f641 100644
Binary files a/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state1.png and b/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state1.png differ
diff --git a/Resources/Textures/Structures/Windows/window.rsi/full.png b/Resources/Textures/Structures/Windows/window.rsi/full.png
index 5ed08bac42..897534dd8f 100644
Binary files a/Resources/Textures/Structures/Windows/window.rsi/full.png and b/Resources/Textures/Structures/Windows/window.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Windows/window.rsi/meta.json b/Resources/Textures/Structures/Windows/window.rsi/meta.json
index 41b8be18b4..9f6536937a 100644
--- a/Resources/Textures/Structures/Windows/window.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/window.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/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept",
+  "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Windows/window.rsi/window0.png b/Resources/Textures/Structures/Windows/window.rsi/window0.png
index 37bade4a4a..95094714d3 100644
Binary files a/Resources/Textures/Structures/Windows/window.rsi/window0.png and b/Resources/Textures/Structures/Windows/window.rsi/window0.png differ
diff --git a/Resources/Textures/Structures/Windows/window.rsi/window1.png b/Resources/Textures/Structures/Windows/window.rsi/window1.png
index 4495aca459..98f6b07bcb 100644
Binary files a/Resources/Textures/Structures/Windows/window.rsi/window1.png and b/Resources/Textures/Structures/Windows/window.rsi/window1.png differ
diff --git a/Resources/Textures/Structures/Windows/window.rsi/window2.png b/Resources/Textures/Structures/Windows/window.rsi/window2.png
index 37bade4a4a..95094714d3 100644
Binary files a/Resources/Textures/Structures/Windows/window.rsi/window2.png and b/Resources/Textures/Structures/Windows/window.rsi/window2.png differ
diff --git a/Resources/Textures/Structures/Windows/window.rsi/window3.png b/Resources/Textures/Structures/Windows/window.rsi/window3.png
index 4495aca459..98f6b07bcb 100644
Binary files a/Resources/Textures/Structures/Windows/window.rsi/window3.png and b/Resources/Textures/Structures/Windows/window.rsi/window3.png differ
diff --git a/Resources/Textures/Structures/Windows/window.rsi/window4.png b/Resources/Textures/Structures/Windows/window.rsi/window4.png
index 13aaa2107e..30629fcac2 100644
Binary files a/Resources/Textures/Structures/Windows/window.rsi/window4.png and b/Resources/Textures/Structures/Windows/window.rsi/window4.png differ
diff --git a/Resources/Textures/Structures/Windows/window.rsi/window5.png b/Resources/Textures/Structures/Windows/window.rsi/window5.png
index df8dd36cf5..df4ef65088 100644
Binary files a/Resources/Textures/Structures/Windows/window.rsi/window5.png and b/Resources/Textures/Structures/Windows/window.rsi/window5.png differ
diff --git a/Resources/Textures/Structures/Windows/window.rsi/window6.png b/Resources/Textures/Structures/Windows/window.rsi/window6.png
index 13aaa2107e..30629fcac2 100644
Binary files a/Resources/Textures/Structures/Windows/window.rsi/window6.png and b/Resources/Textures/Structures/Windows/window.rsi/window6.png differ
diff --git a/Resources/Textures/Structures/Windows/window.rsi/window7.png b/Resources/Textures/Structures/Windows/window.rsi/window7.png
index 1a2e65fad7..0e02c2e8de 100644
Binary files a/Resources/Textures/Structures/Windows/window.rsi/window7.png and b/Resources/Textures/Structures/Windows/window.rsi/window7.png differ
diff --git a/Resources/Textures/Structures/Windows/window_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/window_diagonal.rsi/state0.png
index df5805957d..39ffd5be1f 100644
Binary files a/Resources/Textures/Structures/Windows/window_diagonal.rsi/state0.png and b/Resources/Textures/Structures/Windows/window_diagonal.rsi/state0.png differ
diff --git a/Resources/Textures/Structures/Windows/window_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/window_diagonal.rsi/state1.png
index 83737b8cef..bb5136c8b0 100644
Binary files a/Resources/Textures/Structures/Windows/window_diagonal.rsi/state1.png and b/Resources/Textures/Structures/Windows/window_diagonal.rsi/state1.png differ
diff --git a/Resources/Textures/Structures/stairs.rsi/meta.json b/Resources/Textures/Structures/stairs.rsi/meta.json
index d9f5a22fbe..586e1cd2e4 100644
--- a/Resources/Textures/Structures/stairs.rsi/meta.json
+++ b/Resources/Textures/Structures/stairs.rsi/meta.json
@@ -27,6 +27,13 @@
         },
         {
             "name": "stairs_stage_dark"
+        },
+        {
+            "name": "stairs_wood",
+            "directions": 4
+        },
+        {
+            "name": "stairs_stage_wood"
         }
     ]
 }
diff --git a/Resources/Textures/Structures/stairs.rsi/stairs_stage_wood.png b/Resources/Textures/Structures/stairs.rsi/stairs_stage_wood.png
new file mode 100644
index 0000000000..615933e917
Binary files /dev/null and b/Resources/Textures/Structures/stairs.rsi/stairs_stage_wood.png differ
diff --git a/Resources/Textures/Structures/stairs.rsi/stairs_wood.png b/Resources/Textures/Structures/stairs.rsi/stairs_wood.png
new file mode 100644
index 0000000000..7c5d17a6c8
Binary files /dev/null and b/Resources/Textures/Structures/stairs.rsi/stairs_wood.png differ
diff --git a/Resources/Textures/Tiles/Planet/Chasms/basalt_chasm.rsi/chasm.png b/Resources/Textures/Tiles/Planet/Chasms/basalt_chasm.rsi/chasm.png
index b73869b5f9..4c36e19f12 100644
Binary files a/Resources/Textures/Tiles/Planet/Chasms/basalt_chasm.rsi/chasm.png and b/Resources/Textures/Tiles/Planet/Chasms/basalt_chasm.rsi/chasm.png differ
diff --git a/Resources/Textures/Tiles/Planet/Chasms/basalt_chasm.rsi/chasm1.png b/Resources/Textures/Tiles/Planet/Chasms/basalt_chasm.rsi/chasm1.png
index bc916d5198..a35b91928e 100644
Binary files a/Resources/Textures/Tiles/Planet/Chasms/basalt_chasm.rsi/chasm1.png and b/Resources/Textures/Tiles/Planet/Chasms/basalt_chasm.rsi/chasm1.png differ
diff --git a/Resources/Textures/Tiles/Planet/Chasms/basalt_chasm.rsi/chasm3.png b/Resources/Textures/Tiles/Planet/Chasms/basalt_chasm.rsi/chasm3.png
index bc916d5198..baddc70c3b 100644
Binary files a/Resources/Textures/Tiles/Planet/Chasms/basalt_chasm.rsi/chasm3.png and b/Resources/Textures/Tiles/Planet/Chasms/basalt_chasm.rsi/chasm3.png differ
diff --git a/Resources/Textures/Tiles/Planet/Chasms/basalt_chasm.rsi/chasm4.png b/Resources/Textures/Tiles/Planet/Chasms/basalt_chasm.rsi/chasm4.png
index e1c77dc40c..4fbde8cc96 100644
Binary files a/Resources/Textures/Tiles/Planet/Chasms/basalt_chasm.rsi/chasm4.png and b/Resources/Textures/Tiles/Planet/Chasms/basalt_chasm.rsi/chasm4.png differ
diff --git a/Resources/Textures/Tiles/Planet/Chasms/basalt_chasm.rsi/chasm6.png b/Resources/Textures/Tiles/Planet/Chasms/basalt_chasm.rsi/chasm6.png
index e1c77dc40c..dc9a83010a 100644
Binary files a/Resources/Textures/Tiles/Planet/Chasms/basalt_chasm.rsi/chasm6.png and b/Resources/Textures/Tiles/Planet/Chasms/basalt_chasm.rsi/chasm6.png differ
diff --git a/Resources/Textures/Tiles/Planet/Chasms/chromite_chasm.rsi/chasm.png b/Resources/Textures/Tiles/Planet/Chasms/chromite_chasm.rsi/chasm.png
index 81355cd0cb..a687eead0e 100644
Binary files a/Resources/Textures/Tiles/Planet/Chasms/chromite_chasm.rsi/chasm.png and b/Resources/Textures/Tiles/Planet/Chasms/chromite_chasm.rsi/chasm.png differ
diff --git a/Resources/Textures/Tiles/Planet/Chasms/chromite_chasm.rsi/chasm1.png b/Resources/Textures/Tiles/Planet/Chasms/chromite_chasm.rsi/chasm1.png
index 32976f4816..4b109916e9 100644
Binary files a/Resources/Textures/Tiles/Planet/Chasms/chromite_chasm.rsi/chasm1.png and b/Resources/Textures/Tiles/Planet/Chasms/chromite_chasm.rsi/chasm1.png differ
diff --git a/Resources/Textures/Tiles/Planet/Chasms/chromite_chasm.rsi/chasm3.png b/Resources/Textures/Tiles/Planet/Chasms/chromite_chasm.rsi/chasm3.png
index 32976f4816..c3f4392b54 100644
Binary files a/Resources/Textures/Tiles/Planet/Chasms/chromite_chasm.rsi/chasm3.png and b/Resources/Textures/Tiles/Planet/Chasms/chromite_chasm.rsi/chasm3.png differ
diff --git a/Resources/Textures/Tiles/Planet/Chasms/chromite_chasm.rsi/chasm4.png b/Resources/Textures/Tiles/Planet/Chasms/chromite_chasm.rsi/chasm4.png
index cb77ce6147..e1126b2461 100644
Binary files a/Resources/Textures/Tiles/Planet/Chasms/chromite_chasm.rsi/chasm4.png and b/Resources/Textures/Tiles/Planet/Chasms/chromite_chasm.rsi/chasm4.png differ
diff --git a/Resources/Textures/Tiles/Planet/Chasms/chromite_chasm.rsi/chasm6.png b/Resources/Textures/Tiles/Planet/Chasms/chromite_chasm.rsi/chasm6.png
index cb77ce6147..8ea4c1ea88 100644
Binary files a/Resources/Textures/Tiles/Planet/Chasms/chromite_chasm.rsi/chasm6.png and b/Resources/Textures/Tiles/Planet/Chasms/chromite_chasm.rsi/chasm6.png differ
diff --git a/Resources/Textures/Tiles/Planet/Chasms/desert_chasm.rsi/chasm.png b/Resources/Textures/Tiles/Planet/Chasms/desert_chasm.rsi/chasm.png
index e09eb93e42..e415208209 100644
Binary files a/Resources/Textures/Tiles/Planet/Chasms/desert_chasm.rsi/chasm.png and b/Resources/Textures/Tiles/Planet/Chasms/desert_chasm.rsi/chasm.png differ
diff --git a/Resources/Textures/Tiles/Planet/Chasms/desert_chasm.rsi/chasm1.png b/Resources/Textures/Tiles/Planet/Chasms/desert_chasm.rsi/chasm1.png
index dce7efd9a6..e15a7ef40e 100644
Binary files a/Resources/Textures/Tiles/Planet/Chasms/desert_chasm.rsi/chasm1.png and b/Resources/Textures/Tiles/Planet/Chasms/desert_chasm.rsi/chasm1.png differ
diff --git a/Resources/Textures/Tiles/Planet/Chasms/desert_chasm.rsi/chasm3.png b/Resources/Textures/Tiles/Planet/Chasms/desert_chasm.rsi/chasm3.png
index dce7efd9a6..0679e66072 100644
Binary files a/Resources/Textures/Tiles/Planet/Chasms/desert_chasm.rsi/chasm3.png and b/Resources/Textures/Tiles/Planet/Chasms/desert_chasm.rsi/chasm3.png differ
diff --git a/Resources/Textures/Tiles/Planet/Chasms/desert_chasm.rsi/chasm4.png b/Resources/Textures/Tiles/Planet/Chasms/desert_chasm.rsi/chasm4.png
index 5cc155f825..71fc787d74 100644
Binary files a/Resources/Textures/Tiles/Planet/Chasms/desert_chasm.rsi/chasm4.png and b/Resources/Textures/Tiles/Planet/Chasms/desert_chasm.rsi/chasm4.png differ
diff --git a/Resources/Textures/Tiles/Planet/Chasms/desert_chasm.rsi/chasm6.png b/Resources/Textures/Tiles/Planet/Chasms/desert_chasm.rsi/chasm6.png
index 5cc155f825..7f480da875 100644
Binary files a/Resources/Textures/Tiles/Planet/Chasms/desert_chasm.rsi/chasm6.png and b/Resources/Textures/Tiles/Planet/Chasms/desert_chasm.rsi/chasm6.png differ
diff --git a/Resources/Textures/Tiles/Planet/Chasms/snow_chasm.rsi/chasm.png b/Resources/Textures/Tiles/Planet/Chasms/snow_chasm.rsi/chasm.png
index 1124e0518c..5023880dd4 100644
Binary files a/Resources/Textures/Tiles/Planet/Chasms/snow_chasm.rsi/chasm.png and b/Resources/Textures/Tiles/Planet/Chasms/snow_chasm.rsi/chasm.png differ
diff --git a/Resources/Textures/Tiles/Planet/Chasms/snow_chasm.rsi/chasm1.png b/Resources/Textures/Tiles/Planet/Chasms/snow_chasm.rsi/chasm1.png
index 502b9e3d71..211d50ed7c 100644
Binary files a/Resources/Textures/Tiles/Planet/Chasms/snow_chasm.rsi/chasm1.png and b/Resources/Textures/Tiles/Planet/Chasms/snow_chasm.rsi/chasm1.png differ
diff --git a/Resources/Textures/Tiles/Planet/Chasms/snow_chasm.rsi/chasm3.png b/Resources/Textures/Tiles/Planet/Chasms/snow_chasm.rsi/chasm3.png
index 502b9e3d71..8245542f11 100644
Binary files a/Resources/Textures/Tiles/Planet/Chasms/snow_chasm.rsi/chasm3.png and b/Resources/Textures/Tiles/Planet/Chasms/snow_chasm.rsi/chasm3.png differ
diff --git a/Resources/Textures/Tiles/Planet/Chasms/snow_chasm.rsi/chasm4.png b/Resources/Textures/Tiles/Planet/Chasms/snow_chasm.rsi/chasm4.png
index f0fd989115..5725d84bc9 100644
Binary files a/Resources/Textures/Tiles/Planet/Chasms/snow_chasm.rsi/chasm4.png and b/Resources/Textures/Tiles/Planet/Chasms/snow_chasm.rsi/chasm4.png differ
diff --git a/Resources/Textures/Tiles/Planet/Chasms/snow_chasm.rsi/chasm6.png b/Resources/Textures/Tiles/Planet/Chasms/snow_chasm.rsi/chasm6.png
index f0fd989115..55e2c14dbc 100644
Binary files a/Resources/Textures/Tiles/Planet/Chasms/snow_chasm.rsi/chasm6.png and b/Resources/Textures/Tiles/Planet/Chasms/snow_chasm.rsi/chasm6.png differ
diff --git a/Resources/engineCommandPerms.yml b/Resources/engineCommandPerms.yml
index 15200531e3..51743c6e82 100644
--- a/Resources/engineCommandPerms.yml
+++ b/Resources/engineCommandPerms.yml
@@ -67,6 +67,7 @@
   - scene
   - replay_recording_stats
   - print_pvs_ack
+  - pvs_override_info
   - merge_grids
 
 
diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml
index b8cfc40c1c..346156159a 100644
--- a/Resources/keybinds.yml
+++ b/Resources/keybinds.yml
@@ -167,6 +167,7 @@ binds:
   type: State
   key: MouseLeft
   canFocus: true
+  priority: 10
 - function: RotateStoredItem
   type: State
   key: MouseRight
diff --git a/Resources/mapping_actions.yml b/Resources/mapping_actions.yml
index 0dda6b38a5..9498c3062a 100644
--- a/Resources/mapping_actions.yml
+++ b/Resources/mapping_actions.yml
@@ -3,6 +3,7 @@
       entity: ReinforcedWindow
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -17,6 +18,7 @@
       entity: WallSolid
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -31,6 +33,7 @@
       entity: WallReinforced
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -45,6 +48,7 @@
       entity: Window
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -59,6 +63,7 @@
       entity: Firelock
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -73,6 +78,7 @@
       entity: Grille
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -86,6 +92,7 @@
     icon: Interface/VerbIcons/delete.svg.192dpi.png
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -104,6 +111,7 @@
       entity: GasPipeStraight
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -118,6 +126,7 @@
       entity: GasPipeBend
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -132,6 +141,7 @@
       entity: GasPipeTJunction
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -146,6 +156,7 @@
       entity: GasPipeFourway
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -160,6 +171,7 @@
       entity: GasVentScrubber
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -174,6 +186,7 @@
       entity: GasVentPump
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -188,6 +201,7 @@
       entity: AirAlarm
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -202,6 +216,7 @@
       entity: FireAlarm
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -216,6 +231,7 @@
       entity: APCBasic
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -230,6 +246,7 @@
       entity: CableApcExtension
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -244,6 +261,7 @@
       entity: CableMV
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -258,6 +276,7 @@
       entity: CableHV
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -272,6 +291,7 @@
       entity: SubstationBasic
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -286,6 +306,7 @@
       entity: Poweredlight
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -300,6 +321,7 @@
       entity: EmergencyLight
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -314,6 +336,7 @@
       entity: SMESBasic
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -328,6 +351,7 @@
       entity: TableWood
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -342,6 +366,7 @@
       entity: Table
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -356,6 +381,7 @@
       entity: ChairWood
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -370,6 +396,7 @@
       entity: Chair
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -384,6 +411,7 @@
       entity: ChairOfficeLight
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -398,6 +426,7 @@
       entity: StoolBar
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -412,6 +441,7 @@
       entity: Stool
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -426,6 +456,7 @@
       entity: Rack
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -440,6 +471,7 @@
       entity: ChairOfficeDark
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -454,6 +486,7 @@
       entity: LampGold
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -468,6 +501,7 @@
       entity: DisposalPipe
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -482,6 +516,7 @@
       entity: DisposalBend
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -496,6 +531,7 @@
       entity: DisposalJunction
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -510,6 +546,7 @@
       entity: DisposalJunctionFlipped
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -524,6 +561,7 @@
       entity: DisposalRouter
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -538,6 +576,7 @@
       entity: DisposalRouterFlipped
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -552,6 +591,7 @@
       entity: DisposalUnit
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -566,6 +606,7 @@
       entity: DisposalTrunk
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -580,6 +621,7 @@
       entity: SignDisposalSpace
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -594,6 +636,7 @@
       entity: Windoor
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -608,6 +651,7 @@
       entity: WindowDirectional
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -622,6 +666,7 @@
       entity: WindowReinforcedDirectional
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -636,6 +681,7 @@
       entity: PlasmaWindowDirectional
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -650,6 +696,7 @@
       entity: Railing
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -664,6 +711,7 @@
       entity: RailingCorner
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -678,6 +726,7 @@
       entity: RailingCornerSmall
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -693,6 +742,7 @@
     name: RailingRound
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -706,6 +756,7 @@
       entity: AirlockMaintLocked
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -720,6 +771,7 @@
       entity: AirlockGlass
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -734,6 +786,7 @@
       entity: AirlockServiceLocked
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -748,6 +801,7 @@
       entity: AirlockSecurityLocked
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -762,6 +816,7 @@
       entity: AirlockCommand
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -776,6 +831,7 @@
       entity: AirlockScience
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -790,6 +846,7 @@
       entity: AirlockMedical
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -804,6 +861,7 @@
       entity: AirlockEngineering
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -818,6 +876,7 @@
       entity: AirlockCargo
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -837,6 +896,7 @@
       state: bot_left
     iconColor: '#EFB34196'
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -857,6 +917,7 @@
       state: delivery
     iconColor: '#EFB34196'
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -877,6 +938,7 @@
       state: warn_full
     iconColor: '#EFB34196'
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -897,6 +959,7 @@
       state: halftile_overlay
     iconColor: '#EFB34196'
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -917,6 +980,7 @@
       state: halftile_overlay
     iconColor: '#334E6DC8'
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -937,6 +1001,7 @@
       state: halftile_overlay
     iconColor: '#52B4E996'
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -957,6 +1022,7 @@
       state: halftile_overlay
     iconColor: '#9FED5896'
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -977,6 +1043,7 @@
       state: halftile_overlay
     iconColor: '#DE3A3A96'
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -997,6 +1064,7 @@
       state: halftile_overlay
     iconColor: '#D381C996'
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -1017,6 +1085,7 @@
       state: halftile_overlay
     iconColor: '#A4610696'
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -1031,6 +1100,7 @@
     icon: /Textures/Tiles/steel.png
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -1044,6 +1114,7 @@
     icon: /Textures/Tiles/plating.png
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
@@ -1059,6 +1130,7 @@
     icon: /Textures/Tiles/cropped_parallax.png
     keywords: []
     checkCanInteract: False
+    checkConsciousness: False
     clientExclusive: True
     autoPopulate: False
     temporary: True
diff --git a/RobustToolbox b/RobustToolbox
index d8b7bb528d..25bbb21dc8 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit d8b7bb528d3b0a8b85cd46c01cb509fed8252ec4
+Subproject commit 25bbb21dc868b4e0b43b6d28e899710891b35868
diff --git a/Scripts/bat/!README.txt b/Scripts/bat/!README.txt
index 53d5c214f5..a8ba0d77ae 100644
--- a/Scripts/bat/!README.txt
+++ b/Scripts/bat/!README.txt
@@ -2,10 +2,12 @@ buildAllDebug
     Builds all projects with debug configuration
 buildAllRelease
     Builds all projects with release configuration
+buildAllTools
+    Builds all projects with tools configuration
 
 The debug vs release build is simply what people develop in vs the actual server.
 The release build contains various optimizations, while the debug build contains debugging tools.
-If you're mapping, use the release build as it will run smoother with less crashes.
+If you're mapping, use the release or tools build as it will run smoother with less crashes.
 
 
 runQuickAll
@@ -15,6 +17,8 @@ runQuickClient
 runQuickServer
     Runs the server without building
 
+runTests
+    Runs the unit tests, makes sure various C# systems work as intended
 runTestsIntegration
     Runs the integration tests, makes sure various C# systems work as intended
 runTestsYAML
diff --git a/Scripts/bat/buildAllDebug.bat b/Scripts/bat/buildAllDebug.bat
old mode 100644
new mode 100755
diff --git a/Scripts/bat/buildAllRelease.bat b/Scripts/bat/buildAllRelease.bat
old mode 100644
new mode 100755
diff --git a/Scripts/bat/buildAllTools.bat b/Scripts/bat/buildAllTools.bat
new file mode 100755
index 0000000000..7c878cbabb
--- /dev/null
+++ b/Scripts/bat/buildAllTools.bat
@@ -0,0 +1,8 @@
+@echo off
+cd ../../
+
+call python RUN_THIS.py
+call git submodule update --init --recursive
+call dotnet build -c Tools
+
+pause
diff --git a/Scripts/bat/runQuickAll.bat b/Scripts/bat/runQuickAll.bat
old mode 100644
new mode 100755
diff --git a/Scripts/bat/runQuickClient.bat b/Scripts/bat/runQuickClient.bat
old mode 100644
new mode 100755
diff --git a/Scripts/bat/runQuickServer.bat b/Scripts/bat/runQuickServer.bat
old mode 100644
new mode 100755
diff --git a/Scripts/bat/runTests.bat b/Scripts/bat/runTests.bat
old mode 100644
new mode 100755
diff --git a/Scripts/bat/runTestsIntegration.bat b/Scripts/bat/runTestsIntegration.bat
old mode 100644
new mode 100755
diff --git a/Scripts/bat/runTestsYAML.bat b/Scripts/bat/runTestsYAML.bat
old mode 100644
new mode 100755
diff --git a/Scripts/sh/!README.txt b/Scripts/sh/!README.txt
old mode 100644
new mode 100755
index 53d5c214f5..a8ba0d77ae
--- a/Scripts/sh/!README.txt
+++ b/Scripts/sh/!README.txt
@@ -2,10 +2,12 @@ buildAllDebug
     Builds all projects with debug configuration
 buildAllRelease
     Builds all projects with release configuration
+buildAllTools
+    Builds all projects with tools configuration
 
 The debug vs release build is simply what people develop in vs the actual server.
 The release build contains various optimizations, while the debug build contains debugging tools.
-If you're mapping, use the release build as it will run smoother with less crashes.
+If you're mapping, use the release or tools build as it will run smoother with less crashes.
 
 
 runQuickAll
@@ -15,6 +17,8 @@ runQuickClient
 runQuickServer
     Runs the server without building
 
+runTests
+    Runs the unit tests, makes sure various C# systems work as intended
 runTestsIntegration
     Runs the integration tests, makes sure various C# systems work as intended
 runTestsYAML
diff --git a/Scripts/sh/buildAllDebug.sh b/Scripts/sh/buildAllDebug.sh
old mode 100644
new mode 100755
diff --git a/Scripts/sh/buildAllRelease.sh b/Scripts/sh/buildAllRelease.sh
old mode 100644
new mode 100755
diff --git a/Scripts/sh/buildAllTools.sh b/Scripts/sh/buildAllTools.sh
new file mode 100755
index 0000000000..14a68487af
--- /dev/null
+++ b/Scripts/sh/buildAllTools.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env sh
+
+# make sure to start from script dir
+if [ "$(dirname $0)" != "." ]; then
+    cd "$(dirname $0)"
+fi
+
+cd ../../
+
+python RUN_THIS.py
+git submodule update --init --recursive
+dotnet build -c Tools
diff --git a/Scripts/sh/runQuickAll.sh b/Scripts/sh/runQuickAll.sh
old mode 100644
new mode 100755
diff --git a/Scripts/sh/runQuickClient.sh b/Scripts/sh/runQuickClient.sh
old mode 100644
new mode 100755
diff --git a/Scripts/sh/runQuickServer.sh b/Scripts/sh/runQuickServer.sh
old mode 100644
new mode 100755
diff --git a/Scripts/sh/runTests.sh b/Scripts/sh/runTests.sh
old mode 100644
new mode 100755
diff --git a/Scripts/sh/runTestsIntegration.sh b/Scripts/sh/runTestsIntegration.sh
old mode 100644
new mode 100755
diff --git a/Scripts/sh/runTestsYAML.sh b/Scripts/sh/runTestsYAML.sh
old mode 100644
new mode 100755
diff --git a/global.json b/global.json
index 391ba3c2a3..c8526b0a8b 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
     "version": "8.0.100",
-    "rollForward": "latestFeature"
+    "rollForward": "patch"
   }
 }
diff --git a/runclient.bat b/runclient.bat
deleted file mode 100644
index f580d41e9d..0000000000
--- a/runclient.bat
+++ /dev/null
@@ -1,6 +0,0 @@
-@echo off
-set PDIR=%~dp0
-cd %PDIR%Bin\Content.Client
-start Content.Client.exe %*
-cd %PDIR%
-set PDIR=
diff --git a/runserver.bat b/runserver.bat
deleted file mode 100644
index 573de0a15d..0000000000
--- a/runserver.bat
+++ /dev/null
@@ -1,7 +0,0 @@
-@echo off
-set PDIR=%~dp0
-cd %PDIR%Bin\Content.Server
-call Content.Server.exe %*
-cd %PDIR%
-set PDIR=
-pause
diff --git a/shell.nix b/shell.nix
index da363feda9..9a1b0ca429 100644
--- a/shell.nix
+++ b/shell.nix
@@ -12,7 +12,6 @@ let
     SDL2
     libGL
     openal
-    glibc
     freetype
     fluidsynth
     soundfont-fluid