diff --git a/.github/labeler.yml b/.github/labeler.yml
index ca5aeed1f3ca..08c61e61d404 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -24,3 +24,7 @@
 - changed-files:
   # Equiv to any-glob-to-all as long as this has one matcher. If ALL changed files are not C# files, then apply label.
   - all-globs-to-all-files: "!**/*.cs"
+
+"Changes: C#":
+- changed-files:
+  - any-glob-to-any-file: '**/*.cs'
\ No newline at end of file
diff --git a/.github/workflows/auto-assign.yml b/.github/workflows/auto-assign.yml
index b784d027bd7d..aa8e01a72df4 100644
--- a/.github/workflows/auto-assign.yml
+++ b/.github/workflows/auto-assign.yml
@@ -19,9 +19,10 @@ jobs:
               "Changes: Sprites": ["BORTBORTBORTBORTBORT"],
               "Changes: Map": ["PubliclyExecutedPig"],
               "Changes: UI": ["ss14-Starlight"],
-              "Changes: Shaders": ["ss14-Starlight"],
-              "Changes: Audio": ["ss14-Starlight"],
-              "Changes: No C#": ["ss14-Starlight"],
+              "Changes: Shaders": ["ss14-Starlight, Happyrobot33, FoxxoTrystan"],
+              "Changes: Audio": ["ss14-Starlight, Happyrobot33, FoxxoTrystan"],
+              "Changes: No C#": ["ss14-Starlight, Happyrobot33, FoxxoTrystan"],
+              "Changes: C#": ["ss14-Starlight, Happyrobot33, FoxxoTrystan"],
             };
 
             const labels = context.payload.pull_request.labels.map(label => label.name);
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 0c6e10a2be34..ffee660a589b 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -51,7 +51,7 @@ jobs:
 
   update-changelog:
     name: Publish Changelogs
-    needs: build
+#    needs: build
     runs-on: ubuntu-latest
     environment: prod
     steps:
diff --git a/.github/workflows/target-branch-validation.yml b/.github/workflows/target-branch-validation.yml
new file mode 100644
index 000000000000..e022c2a82993
--- /dev/null
+++ b/.github/workflows/target-branch-validation.yml
@@ -0,0 +1,32 @@
+name: Check PR Target Branch
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, edited]
+
+jobs:
+  check-target-branch:
+    runs-on: ubuntu-latest
+    
+    steps:
+      - name: Check if PR targets starlight-dev
+        run: |
+          SOURCE_BRANCH="${{ github.event.pull_request.head.ref }}"
+          TARGET_BRANCH="${{ github.event.pull_request.base.ref }}"
+          echo "PR from: $SOURCE_BRANCH -> $TARGET_BRANCH"
+          
+          # Allow starlight-dev to starlight PRs in both directions
+          if [[ ("$SOURCE_BRANCH" == "starlight-dev" && "$TARGET_BRANCH" == "starlight") || 
+                ("$SOURCE_BRANCH" == "starlight" && "$TARGET_BRANCH" == "starlight-dev") ]]; then
+            echo "Allowed: PR between starlight-dev and starlight branches"
+            exit 0
+          fi
+          
+          # For all other PRs, require starlight-dev as target
+          if [ "$TARGET_BRANCH" != "starlight-dev" ]; then
+            echo "Error: PR must target 'starlight-dev' branch, but targets '$TARGET_BRANCH'"
+            echo "Please change the target branch to 'starlight-dev'"
+            exit 1
+          else
+            echo "Success: PR correctly targets 'starlight-dev' branch"
+          fi
diff --git a/Content.Client/Actions/ActionsSystem.cs b/Content.Client/Actions/ActionsSystem.cs
index 3bfacb5bc6e8..8efe0b2367f8 100644
--- a/Content.Client/Actions/ActionsSystem.cs
+++ b/Content.Client/Actions/ActionsSystem.cs
@@ -334,7 +334,12 @@ private void OnWorldTargetAttempt(Entity<WorldTargetActionComponent> ent, ref Ac
 
         private void OnEntityTargetAttempt(Entity<EntityTargetActionComponent> ent, ref ActionTargetAttemptEvent args)
         {
-            if (args.Handled || args.Input.EntityUid is not { Valid: true } entity)
+            if (args.Handled)
+                return;
+
+            args.Handled = true;
+
+            if (args.Input.EntityUid is not { Valid: true } entity)
                 return;
 
             // let world target component handle it
@@ -345,8 +350,6 @@ private void OnEntityTargetAttempt(Entity<EntityTargetActionComponent> ent, ref
                 return;
             }
 
-            args.Handled = true;
-
             var action = args.Action;
             var user = args.User;
 
diff --git a/Content.Client/Administration/UI/AdminCamera/AdminCameraControl.xaml b/Content.Client/Administration/UI/AdminCamera/AdminCameraControl.xaml
new file mode 100644
index 000000000000..1413eff00c57
--- /dev/null
+++ b/Content.Client/Administration/UI/AdminCamera/AdminCameraControl.xaml
@@ -0,0 +1,20 @@
+<Control
+    xmlns="https://spacestation14.io"
+    xmlns:viewport="clr-namespace:Content.Client.Viewport"
+    MouseFilter="Stop">
+    <PanelContainer StyleClasses="BackgroundDark" Name="AdminCameraWindowRoot" Access="Public">
+        <BoxContainer Orientation="Vertical" Access="Public">
+            <!-- Camera -->
+            <Control VerticalExpand="True" Name="CameraViewBox">
+                <viewport:ScalingViewport Name="CameraView"
+                                          MinSize="100 100"
+                                          MouseFilter="Ignore" />
+            </Control>
+            <!-- Controller buttons -->
+            <BoxContainer Orientation="Horizontal" Margin="5 5 5 5">
+                <Button StyleClasses="OpenRight" Name="FollowButton" HorizontalExpand="True" Access="Public" Text="{Loc 'admin-camera-window-follow'}" />
+                <Button StyleClasses="OpenLeft" Name="PopControl" HorizontalExpand="True" Access="Public" Text="{Loc 'admin-camera-window-pop-out'}" />
+            </BoxContainer>
+        </BoxContainer>
+    </PanelContainer>
+</Control>
diff --git a/Content.Client/Administration/UI/AdminCamera/AdminCameraControl.xaml.cs b/Content.Client/Administration/UI/AdminCamera/AdminCameraControl.xaml.cs
new file mode 100644
index 000000000000..beb8344ce352
--- /dev/null
+++ b/Content.Client/Administration/UI/AdminCamera/AdminCameraControl.xaml.cs
@@ -0,0 +1,101 @@
+using System.Numerics;
+using Content.Client.Eye;
+using Content.Shared.Administration;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
+using Robust.Client.Timing;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Timing;
+
+namespace Content.Client.Administration.UI.AdminCamera;
+
+[GenerateTypedNameReferences]
+public sealed partial class AdminCameraControl : Control
+{
+    [Dependency] private readonly IEntityManager _entManager = default!;
+    [Dependency] private readonly IClientGameTiming _timing = default!;
+
+    public event Action? OnFollow;
+    public event Action? OnPopoutControl;
+
+    private readonly EyeLerpingSystem _eyeLerpingSystem;
+    private readonly FixedEye _defaultEye = new();
+    private AdminCameraEuiState? _nextState;
+
+    private const float MinimumZoom = 0.1f;
+    private const float MaximumZoom = 2.0f;
+
+    public EntityUid? CurrentCamera;
+    public float Zoom = 1.0f;
+
+    public bool IsPoppedOut;
+
+    public AdminCameraControl()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        _eyeLerpingSystem = _entManager.System<EyeLerpingSystem>();
+
+        CameraView.Eye = _defaultEye;
+
+        FollowButton.OnPressed += _ => OnFollow?.Invoke();
+        PopControl.OnPressed += _ => OnPopoutControl?.Invoke();
+        CameraView.OnResized += OnResized;
+    }
+
+    private new void OnResized()
+    {
+        var width = Math.Max(CameraView.PixelWidth, (int)Math.Floor(CameraView.MinWidth));
+        var height = Math.Max(CameraView.PixelHeight, (int)Math.Floor(CameraView.MinHeight));
+
+        CameraView.ViewportSize = new Vector2i(width, height);
+    }
+
+    protected override void MouseWheel(GUIMouseWheelEventArgs args)
+    {
+        base.MouseWheel(args);
+
+        if (CameraView.Eye == null)
+            return;
+
+        Zoom = Math.Clamp(Zoom - args.Delta.Y * 0.15f * Zoom, MinimumZoom, MaximumZoom);
+        CameraView.Eye.Zoom = new Vector2(Zoom, Zoom);
+        args.Handle();
+    }
+
+    public void SetState(AdminCameraEuiState state)
+    {
+        _nextState = state;
+    }
+
+    // I know that this is awful, but I copied this from the solution editor anyways.
+    // This is needed because EUIs update before the gamestate is applied, which means it will fail to get the uid from the net entity.
+    // The suggestion from the comment in the solution editor saying to use a BUI is not ideal either:
+    // - We would need to bind the UI to an entity, but with how BUIs currently work we cannot open it in the same tick as we spawn that entity on the server.
+    // - We want the UI opened by the user session, not by their currently attached entity. Otherwise it would close in cases where admins move from one entity to another, for example when ghosting.
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        if (_nextState == null || _timing.LastRealTick < _nextState.Tick) // make sure the last gamestate has been applied
+            return;
+
+        if (!_entManager.TryGetEntity(_nextState.Camera, out var cameraUid))
+            return;
+
+        if (CurrentCamera == null)
+        {
+            _eyeLerpingSystem.AddEye(cameraUid.Value);
+            CurrentCamera = cameraUid;
+        }
+        else if (CurrentCamera != cameraUid)
+        {
+            _eyeLerpingSystem.RemoveEye(CurrentCamera.Value);
+            _eyeLerpingSystem.AddEye(cameraUid.Value);
+            CurrentCamera = cameraUid;
+        }
+
+        if (_entManager.TryGetComponent<EyeComponent>(CurrentCamera, out var eye))
+            CameraView.Eye = eye.Eye ?? _defaultEye;
+    }
+}
diff --git a/Content.Client/Administration/UI/AdminCamera/AdminCameraEui.cs b/Content.Client/Administration/UI/AdminCamera/AdminCameraEui.cs
new file mode 100644
index 000000000000..908fb2740ca0
--- /dev/null
+++ b/Content.Client/Administration/UI/AdminCamera/AdminCameraEui.cs
@@ -0,0 +1,117 @@
+using System.Numerics;
+using Content.Client.Eui;
+using Content.Shared.Administration;
+using Content.Shared.Eui;
+using JetBrains.Annotations;
+using Robust.Client.UserInterface.Controls;
+
+namespace Content.Client.Administration.UI.AdminCamera;
+
+/// <summary>
+/// Admin Eui for opening a viewport window to observe entities.
+/// Use the "Open Camera" admin verb or the "camera" command to open.
+/// </summary>
+[UsedImplicitly]
+public sealed partial class AdminCameraEui : BaseEui
+{
+    private readonly AdminCameraWindow _window;
+    private readonly AdminCameraControl _control;
+
+    // If not null the camera is in "popped out" mode and is in an external window.
+    private OSWindow? _OSWindow;
+
+    // The last location the window was located at in game.
+    // Is used for getting knowing where to "pop in" external windows.
+    private Vector2 _lastLocation;
+
+    public AdminCameraEui()
+    {
+        _window = new AdminCameraWindow();
+        _control = new AdminCameraControl();
+
+        _window.Contents.AddChild(_control);
+
+        _control.OnFollow += () => SendMessage(new AdminCameraFollowMessage());
+        _window.OnClose += () =>
+        {
+            if (!_control.IsPoppedOut)
+                SendMessage(new CloseEuiMessage());
+        };
+
+        _control.OnPopoutControl += () =>
+        {
+            if (_control.IsPoppedOut)
+                PopIn();
+            else
+                PopOut();
+        };
+    }
+
+    // Pop the window out into an external OS window
+    private void PopOut()
+    {
+        _lastLocation = _window.Position;
+
+        // TODO: When there is a way to have a minimum window size, enforce something!
+        _OSWindow = new OSWindow
+        {
+            SetSize = _window.Size,
+            Title = _window.Title ?? Loc.GetString("admin-camera-window-title-placeholder"),
+        };
+
+        _OSWindow.Show();
+
+        if (_OSWindow.Root == null)
+            return;
+
+        _control.Orphan();
+        _OSWindow.Root.AddChild(_control);
+
+        _OSWindow.Closed += () =>
+        {
+            if (_control.IsPoppedOut)
+                SendMessage(new CloseEuiMessage());
+        };
+
+        _control.IsPoppedOut = true;
+        _control.PopControl.Text = Loc.GetString("admin-camera-window-pop-in");
+
+        _window.Close();
+    }
+
+    // Pop the window back into the in game window.
+    private void PopIn()
+    {
+        _control.Orphan();
+        _window.Contents.AddChild(_control);
+
+        _window.Open(_lastLocation);
+
+        _control.IsPoppedOut = false;
+        _control.PopControl.Text = Loc.GetString("admin-camera-window-pop-out");
+
+        _OSWindow?.Close();
+        _OSWindow = null;
+    }
+
+    public override void Opened()
+    {
+        base.Opened();
+        _window.OpenCentered();
+    }
+
+    public override void Closed()
+    {
+        base.Closed();
+        _window.Close();
+    }
+
+    public override void HandleState(EuiStateBase baseState)
+    {
+        if (baseState is not AdminCameraEuiState state)
+            return;
+
+        _window.SetState(state);
+        _control.SetState(state);
+    }
+}
diff --git a/Content.Client/Administration/UI/AdminCamera/AdminCameraWindow.xaml b/Content.Client/Administration/UI/AdminCamera/AdminCameraWindow.xaml
new file mode 100644
index 000000000000..87583cef974d
--- /dev/null
+++ b/Content.Client/Administration/UI/AdminCamera/AdminCameraWindow.xaml
@@ -0,0 +1,6 @@
+<DefaultWindow xmlns="https://spacestation14.io"
+    Title="{Loc admin-camera-window-title-placeholder}"
+    SetSize="425 550"
+    MinSize="200 225"
+    Name="Window">
+</DefaultWindow>
diff --git a/Content.Client/Administration/UI/AdminCamera/AdminCameraWindow.xaml.cs b/Content.Client/Administration/UI/AdminCamera/AdminCameraWindow.xaml.cs
new file mode 100644
index 000000000000..07a6e2156eba
--- /dev/null
+++ b/Content.Client/Administration/UI/AdminCamera/AdminCameraWindow.xaml.cs
@@ -0,0 +1,23 @@
+using Content.Shared.Administration;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Administration.UI.AdminCamera;
+
+[GenerateTypedNameReferences]
+public sealed partial class AdminCameraWindow : DefaultWindow
+{
+    public AdminCameraWindow()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        ContentsContainer.Margin = new Thickness(5, 0, 5, 0);
+    }
+
+    public void SetState(AdminCameraEuiState state)
+    {
+        Title = Loc.GetString("admin-camera-window-title", ("name", state.Name));
+    }
+}
diff --git a/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml b/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml
index 4791dcf6aaef..9c54049da36f 100644
--- a/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml
+++ b/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml
@@ -31,6 +31,7 @@
             <Button Name="FreezeAndMuteToggleButton" Text="{Loc player-panel-freeze-and-mute}" Disabled="True"/>
             <Button Name="BanButton" Text="{Loc player-panel-ban}" Disabled="True"/>
             <controls:ConfirmButton Name="RejuvenateButton" Text="{Loc player-panel-rejuvenate}" Disabled="True"/>
+            <Button Name="CameraButton" Text="{Loc player-panel-camera}" Disabled="True"/>
            </GridContainer>
        </BoxContainer>
     </BoxContainer>
diff --git a/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml.cs b/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml.cs
index 14311851b450..62cb64050eac 100644
--- a/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml.cs
+++ b/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml.cs
@@ -18,6 +18,7 @@ public sealed partial class PlayerPanel : FancyWindow
     public event Action<NetUserId?>? OnOpenBans;
     public event Action<NetUserId?>? OnAhelp;
     public event Action<string?>? OnKick;
+    public event Action<string?>? OnCamera;
     public event Action<NetUserId?>? OnOpenBanPanel;
     public event Action<NetUserId?, bool>? OnWhitelistToggle;
     public event Action? OnFollow;
@@ -33,26 +34,27 @@ public sealed partial class PlayerPanel : FancyWindow
 
     public PlayerPanel(IClientAdminManager adminManager)
     {
-            RobustXamlLoader.Load(this);
-            _adminManager = adminManager;
-
-            UsernameCopyButton.OnPressed += _ => OnUsernameCopy?.Invoke(TargetUsername ?? "");
-            BanButton.OnPressed += _ => OnOpenBanPanel?.Invoke(TargetPlayer);
-            KickButton.OnPressed += _ => OnKick?.Invoke(TargetUsername);
-            NotesButton.OnPressed += _ => OnOpenNotes?.Invoke(TargetPlayer);
-            ShowBansButton.OnPressed += _ => OnOpenBans?.Invoke(TargetPlayer);
-            AhelpButton.OnPressed += _ => OnAhelp?.Invoke(TargetPlayer);
-            WhitelistToggle.OnPressed += _ =>
-            {
-                OnWhitelistToggle?.Invoke(TargetPlayer, _isWhitelisted);
-                SetWhitelisted(!_isWhitelisted);
-            };
-            FollowButton.OnPressed += _ => OnFollow?.Invoke();
-            FreezeButton.OnPressed += _ => OnFreeze?.Invoke();
-            FreezeAndMuteToggleButton.OnPressed += _ => OnFreezeAndMuteToggle?.Invoke();
-            LogsButton.OnPressed += _ => OnLogs?.Invoke();
-            DeleteButton.OnPressed += _ => OnDelete?.Invoke();
-            RejuvenateButton.OnPressed += _ => OnRejuvenate?.Invoke();
+        RobustXamlLoader.Load(this);
+        _adminManager = adminManager;
+
+        UsernameCopyButton.OnPressed += _ => OnUsernameCopy?.Invoke(TargetUsername ?? "");
+        BanButton.OnPressed += _ => OnOpenBanPanel?.Invoke(TargetPlayer);
+        KickButton.OnPressed += _ => OnKick?.Invoke(TargetUsername);
+        CameraButton.OnPressed += _ => OnCamera?.Invoke(TargetUsername);
+        NotesButton.OnPressed += _ => OnOpenNotes?.Invoke(TargetPlayer);
+        ShowBansButton.OnPressed += _ => OnOpenBans?.Invoke(TargetPlayer);
+        AhelpButton.OnPressed += _ => OnAhelp?.Invoke(TargetPlayer);
+        WhitelistToggle.OnPressed += _ =>
+        {
+            OnWhitelistToggle?.Invoke(TargetPlayer, _isWhitelisted);
+            SetWhitelisted(!_isWhitelisted);
+        };
+        FollowButton.OnPressed += _ => OnFollow?.Invoke();
+        FreezeButton.OnPressed += _ => OnFreeze?.Invoke();
+        FreezeAndMuteToggleButton.OnPressed += _ => OnFreezeAndMuteToggle?.Invoke();
+        LogsButton.OnPressed += _ => OnLogs?.Invoke();
+        DeleteButton.OnPressed += _ => OnDelete?.Invoke();
+        RejuvenateButton.OnPressed += _ => OnRejuvenate?.Invoke();
     }
 
     public void SetUsername(string player)
@@ -122,6 +124,7 @@ public void SetButtons()
     {
         BanButton.Disabled = !_adminManager.CanCommand("banpanel");
         KickButton.Disabled = !_adminManager.CanCommand("kick");
+        CameraButton.Disabled = !_adminManager.CanCommand("camera");
         NotesButton.Disabled = !_adminManager.CanCommand("adminnotes");
         ShowBansButton.Disabled = !_adminManager.CanCommand("banlist");
         WhitelistToggle.Disabled =
diff --git a/Content.Client/Administration/UI/PlayerPanel/PlayerPanelEui.cs b/Content.Client/Administration/UI/PlayerPanel/PlayerPanelEui.cs
index 2129fa5b0c19..8c8183ef22ab 100644
--- a/Content.Client/Administration/UI/PlayerPanel/PlayerPanelEui.cs
+++ b/Content.Client/Administration/UI/PlayerPanel/PlayerPanelEui.cs
@@ -15,7 +15,7 @@ public sealed class PlayerPanelEui : BaseEui
     [Dependency] private readonly IClientAdminManager _admin = default!;
     [Dependency] private readonly IClipboardManager _clipboard = default!;
 
-    private PlayerPanel PlayerPanel { get;  }
+    private PlayerPanel PlayerPanel { get; }
 
     public PlayerPanelEui()
     {
@@ -25,6 +25,7 @@ public PlayerPanelEui()
         PlayerPanel.OnOpenNotes += id => _console.ExecuteCommand($"adminnotes \"{id}\"");
         // Kick command does not support GUIDs
         PlayerPanel.OnKick += username => _console.ExecuteCommand($"kick \"{username}\"");
+        PlayerPanel.OnCamera += username => _console.ExecuteCommand($"camera \"{username}\"");
         PlayerPanel.OnOpenBanPanel += id => _console.ExecuteCommand($"banpanel \"{id}\"");
         PlayerPanel.OnOpenBans += id => _console.ExecuteCommand($"banlist \"{id}\"");
         PlayerPanel.OnAhelp += id => _console.ExecuteCommand($"openahelp \"{id}\"");
@@ -37,7 +38,7 @@ public PlayerPanelEui()
         PlayerPanel.OnFreeze += () => SendMessage(new PlayerPanelFreezeMessage());
         PlayerPanel.OnLogs += () => SendMessage(new PlayerPanelLogsMessage());
         PlayerPanel.OnRejuvenate += () => SendMessage(new PlayerPanelRejuvenationMessage());
-        PlayerPanel.OnDelete+= () => SendMessage(new PlayerPanelDeleteMessage());
+        PlayerPanel.OnDelete += () => SendMessage(new PlayerPanelDeleteMessage());
         PlayerPanel.OnFollow += () => SendMessage(new PlayerPanelFollowMessage());
 
         PlayerPanel.OnClose += () => SendMessage(new CloseEuiMessage());
diff --git a/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleNavMapControl.cs b/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleNavMapControl.cs
index 20902722ff1b..94bfb4b4f370 100644
--- a/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleNavMapControl.cs
+++ b/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleNavMapControl.cs
@@ -162,10 +162,10 @@ private List<AtmosMonitoringConsoleLine> GetDecodedAtmosPipeChunks(Dictionary<Ve
         {
             var list = new List<AtmosMonitoringConsoleLine>();
 
-            foreach (var ((netId, layer, hexColor), atmosPipeData) in chunk.AtmosPipeData)
+            foreach (var ((netId, layer, pipeColor), atmosPipeData) in chunk.AtmosPipeData)
             {
                 // Determine the correct coloration for the pipe
-                var color = Color.FromHex(hexColor) * _basePipeNetColor;
+                var color = pipeColor * _basePipeNetColor;
 
                 if (FocusNetId != null && FocusNetId != netId)
                     color *= _unfocusedPipeNetColor;
diff --git a/Content.Client/Atmos/EntitySystems/PipeColorVisualizerSystem.cs b/Content.Client/Atmos/EntitySystems/PipeColorVisualizerSystem.cs
index 5595f441f768..b23a44e403d0 100644
--- a/Content.Client/Atmos/EntitySystems/PipeColorVisualizerSystem.cs
+++ b/Content.Client/Atmos/EntitySystems/PipeColorVisualizerSystem.cs
@@ -1,11 +1,46 @@
 using Content.Client.Atmos.Components;
 using Robust.Client.GameObjects;
+using Content.Client.UserInterface.Systems.Storage.Controls;
 using Content.Shared.Atmos.Piping;
+using Content.Shared.Hands;
+using Content.Shared.Atmos.Components;
+using Content.Shared.Item;
 
 namespace Content.Client.Atmos.EntitySystems;
 
 public sealed class PipeColorVisualizerSystem : VisualizerSystem<PipeColorVisualsComponent>
 {
+    [Dependency] private readonly SharedItemSystem _itemSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<PipeColorVisualsComponent, GetInhandVisualsEvent>(OnGetVisuals);
+        SubscribeLocalEvent<PipeColorVisualsComponent, BeforeRenderInGridEvent>(OnDrawInGrid);
+    }
+
+    /// <summary>
+    ///     This method is used to display the color changes of the pipe on the screen..
+    /// </summary>
+    private void OnGetVisuals(Entity<PipeColorVisualsComponent> item, ref GetInhandVisualsEvent args)
+    {
+        foreach (var (_, layerData) in args.Layers)
+        {
+            if (TryComp(item.Owner, out AtmosPipeColorComponent? pipeColor))
+                layerData.Color = pipeColor.Color;
+        }
+    }
+
+    /// <summary>
+    ///     This method is used to change the pipe's color in a container grid.
+    /// </summary>
+    private void OnDrawInGrid(Entity<PipeColorVisualsComponent> item, ref BeforeRenderInGridEvent args)
+    {
+        if (TryComp(item.Owner, out AtmosPipeColorComponent? pipeColor))
+            args.Color = pipeColor.Color;
+    }
+
     protected override void OnAppearanceChange(EntityUid uid, PipeColorVisualsComponent component, ref AppearanceChangeEvent args)
     {
         if (TryComp<SpriteComponent>(uid, out var sprite)
@@ -15,6 +50,8 @@ protected override void OnAppearanceChange(EntityUid uid, PipeColorVisualsCompon
             var layer = sprite[PipeVisualLayers.Pipe];
             layer.Color = color.WithAlpha(layer.Color.A);
         }
+
+        _itemSystem.VisualsChanged(uid);
     }
 }
 
diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml
index 697a027aa21d..f0dc29facfe9 100644
--- a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml
+++ b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml
@@ -2,7 +2,7 @@
             xmlns:x="http://schemas.microsoft.com/winfx/2007/xaml"
             xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
             xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-            MinSize="500 500" Resizable="True" Title="Air Alarm">
+            MinSize="500 500" Resizable="True" Title="{Loc air-alarm-ui-title}">
     <BoxContainer Orientation="Vertical" Margin="5 5 5 5">
         <!-- Status (pressure, temperature, alarm state, device total, address, etc) -->
         <BoxContainer Orientation="Horizontal" Margin="0 0 0 2">
diff --git a/Content.Client/Clothing/ClientClothingSystem.cs b/Content.Client/Clothing/ClientClothingSystem.cs
index 065179c714c9..8d53e90e3453 100644
--- a/Content.Client/Clothing/ClientClothingSystem.cs
+++ b/Content.Client/Clothing/ClientClothingSystem.cs
@@ -59,7 +59,7 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<ClothingComponent, GetEquipmentVisualsEvent>(OnGetVisuals);
-        SubscribeLocalEvent<ClothingComponent, InventoryTemplateUpdated>(OnInventoryTemplateUpdated);
+        SubscribeLocalEvent<InventoryComponent, InventoryTemplateUpdated>(OnInventoryTemplateUpdated);
 
         SubscribeLocalEvent<InventoryComponent, VisualsChangedEvent>(OnVisualsChanged);
         SubscribeLocalEvent<SpriteComponent, DidUnequipEvent>(OnDidUnequip);
@@ -82,20 +82,19 @@ private void OnAppearanceUpdate(EntityUid uid, InventoryComponent component, ref
         }
     }
 
-    private void OnInventoryTemplateUpdated(Entity<ClothingComponent> ent, ref InventoryTemplateUpdated args)
+    private void OnInventoryTemplateUpdated(Entity<InventoryComponent> ent, ref InventoryTemplateUpdated args)
     {
-        UpdateAllSlots(ent.Owner, clothing: ent.Comp);
+        UpdateAllSlots(ent.Owner, ent.Comp);
     }
 
     private void UpdateAllSlots(
         EntityUid uid,
-        InventoryComponent? inventoryComponent = null,
-        ClothingComponent? clothing = null)
+        InventoryComponent? inventoryComponent = null)
     {
         var enumerator = _inventorySystem.GetSlotEnumerator((uid, inventoryComponent));
         while (enumerator.NextItem(out var item, out var slot))
         {
-            RenderEquipment(uid, item, slot.Name, inventoryComponent, clothingComponent: clothing);
+            RenderEquipment(uid, item, slot.Name, inventoryComponent);
         }
     }
 
diff --git a/Content.Client/Commands/DebugCommands.cs b/Content.Client/Commands/DebugCommands.cs
index ce3e219c02ac..65a976bb20a5 100644
--- a/Content.Client/Commands/DebugCommands.cs
+++ b/Content.Client/Commands/DebugCommands.cs
@@ -1,53 +1,42 @@
 using Content.Client.Markers;
 using Content.Client.Popups;
 using Content.Client.SubFloor;
-using Content.Shared.SubFloor;
-using Robust.Client.GameObjects;
 using Robust.Shared.Console;
-using DrawDepth = Content.Shared.DrawDepth.DrawDepth;
 
 namespace Content.Client.Commands;
 
-internal sealed class ShowMarkersCommand : LocalizedCommands
+internal sealed class ShowMarkersCommand : LocalizedEntityCommands
 {
-    [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
+    [Dependency] private readonly MarkerSystem _markerSystem = default!;
 
     public override string Command => "showmarkers";
 
-    public override string Help => LocalizationManager.GetString($"cmd-{Command}-help", ("command", Command));
-
     public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        _entitySystemManager.GetEntitySystem<MarkerSystem>().MarkersVisible ^= true;
+        _markerSystem.MarkersVisible ^= true;
     }
 }
 
-internal sealed class ShowSubFloor : LocalizedCommands
+internal sealed class ShowSubFloor : LocalizedEntityCommands
 {
-    [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
+    [Dependency] private readonly SubFloorHideSystem _subfloorSystem = default!;
 
     public override string Command => "showsubfloor";
 
-    public override string Help => LocalizationManager.GetString($"cmd-{Command}-help", ("command", Command));
-
     public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        _entitySystemManager.GetEntitySystem<SubFloorHideSystem>().ShowAll ^= true;
+        _subfloorSystem.ShowAll ^= true;
     }
 }
 
-internal sealed class NotifyCommand : LocalizedCommands
+internal sealed class NotifyCommand : LocalizedEntityCommands
 {
-    [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
+    [Dependency] private readonly PopupSystem _popupSystem = default!;
 
     public override string Command => "notify";
 
-    public override string Help => LocalizationManager.GetString($"cmd-{Command}-help", ("command", Command));
-
     public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        var message = args[0];
-
-        _entitySystemManager.GetEntitySystem<PopupSystem>().PopupCursor(message);
+        _popupSystem.PopupCursor(args[0]);
     }
 }
\ No newline at end of file
diff --git a/Content.Client/Commands/MappingClientSideSetupCommand.cs b/Content.Client/Commands/MappingClientSideSetupCommand.cs
index 43f6e29a6b41..29c8cdb94f88 100644
--- a/Content.Client/Commands/MappingClientSideSetupCommand.cs
+++ b/Content.Client/Commands/MappingClientSideSetupCommand.cs
@@ -1,31 +1,28 @@
 using Content.Client.Actions;
-using Content.Client.Mapping;
 using Content.Client.Markers;
-using JetBrains.Annotations;
+using Content.Client.SubFloor;
 using Robust.Client.Graphics;
-using Robust.Client.State;
 using Robust.Shared.Console;
 
 namespace Content.Client.Commands;
 
-[UsedImplicitly]
-internal sealed class MappingClientSideSetupCommand : LocalizedCommands
+internal sealed class MappingClientSideSetupCommand : LocalizedEntityCommands
 {
-    [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
     [Dependency] private readonly ILightManager _lightManager = default!;
+    [Dependency] private readonly ActionsSystem _actionSystem = default!;
+    [Dependency] private readonly MarkerSystem _markerSystem = default!;
+    [Dependency] private readonly SubFloorHideSystem _subfloorSystem = default!;
 
     public override string Command => "mappingclientsidesetup";
 
-    public override string Help => LocalizationManager.GetString($"cmd-{Command}-help", ("command", Command));
-
     public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
-        if (!_lightManager.LockConsoleAccess)
-        {
-            _entitySystemManager.GetEntitySystem<MarkerSystem>().MarkersVisible = true;
-            _lightManager.Enabled = false;
-            shell.ExecuteCommand("showsubfloor");
-            _entitySystemManager.GetEntitySystem<ActionsSystem>().LoadActionAssignments("/mapping_actions.yml", false);
-        }
+        if (_lightManager.LockConsoleAccess)
+            return;
+
+        _markerSystem.MarkersVisible = true;
+        _lightManager.Enabled = false;
+        _subfloorSystem.ShowAll = true;
+        _actionSystem.LoadActionAssignments("/mapping_actions.yml", false);
     }
 }
diff --git a/Content.Client/Cooldown/CooldownGraphic.cs b/Content.Client/Cooldown/CooldownGraphic.cs
index 6779e4027a7e..c973b9572bd2 100644
--- a/Content.Client/Cooldown/CooldownGraphic.cs
+++ b/Content.Client/Cooldown/CooldownGraphic.cs
@@ -1,4 +1,5 @@
-using Robust.Client.Graphics;
+using System.Numerics;
+using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
@@ -36,7 +37,7 @@ protected override void Draw(DrawingHandleScreen handle)
             if (Progress >= 0f)
             {
                 var hue = (5f / 18f) * lerp;
-                color = Color.FromHsv((hue, 0.75f, 0.75f, 0.50f));
+                color = Color.FromHsv(new Vector4(hue, 0.75f, 0.75f, 0.50f));
             }
             else
             {
diff --git a/Content.Client/Damage/Systems/StaminaSystem.cs b/Content.Client/Damage/Systems/StaminaSystem.cs
index 046c72a8fa2e..67abb7767407 100644
--- a/Content.Client/Damage/Systems/StaminaSystem.cs
+++ b/Content.Client/Damage/Systems/StaminaSystem.cs
@@ -4,6 +4,7 @@
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Systems;
 using Robust.Client.GameObjects;
+using Robust.Shared.Utility;
 
 namespace Content.Client.Damage.Systems;
 
@@ -104,6 +105,8 @@ private void OnAnimationCompleted(Entity<StaminaComponent> entity, ref Animation
 
     private void PlayAnimation(Entity<StaminaComponent, SpriteComponent> entity)
     {
+        DebugTools.Assert(entity.Comp1.CritThreshold > entity.Comp1.AnimationThreshold, $"Animation threshold on {ToPrettyString(entity)} was not less than the crit threshold. This will cause errors, animation has been cancelled.");
+
         var step = Math.Clamp((entity.Comp1.StaminaDamage - entity.Comp1.AnimationThreshold) /
                               (entity.Comp1.CritThreshold - entity.Comp1.AnimationThreshold),
             0f,
diff --git a/Content.Client/Disposal/PressureBar.cs b/Content.Client/Disposal/PressureBar.cs
index 7b2ebacaf7c7..de785de8c6ba 100644
--- a/Content.Client/Disposal/PressureBar.cs
+++ b/Content.Client/Disposal/PressureBar.cs
@@ -1,4 +1,5 @@
-using Content.Shared.Disposal;
+using System.Numerics;
+using Content.Shared.Disposal;
 using Content.Shared.Disposal.Unit;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.Client/Holopad/HolopadSystem.cs b/Content.Client/Holopad/HolopadSystem.cs
index 9fc08155169f..51491de98fd1 100644
--- a/Content.Client/Holopad/HolopadSystem.cs
+++ b/Content.Client/Holopad/HolopadSystem.cs
@@ -5,6 +5,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using System.Linq;
+using System.Numerics;
 using DrawDepth = Content.Shared.DrawDepth.DrawDepth;
 
 namespace Content.Client.Holopad;
diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs
index 638acae43e10..17028135e71f 100644
--- a/Content.Client/Input/ContentContexts.cs
+++ b/Content.Client/Input/ContentContexts.cs
@@ -56,8 +56,8 @@ public static void SetupContexts(IInputContextContainer contexts)
             human.AddFunction(EngineKeyFunctions.MoveLeft);
             human.AddFunction(EngineKeyFunctions.MoveRight);
             human.AddFunction(EngineKeyFunctions.Walk);
-            human.AddFunction(ContentKeyFunctions.ToggleKnockdown); // 🌟Starlight🌟 
             human.AddFunction(ContentKeyFunctions.Jump); // 🌟Starlight🌟 
+            human.AddFunction(ContentKeyFunctions.ToggleKnockdown);
             human.AddFunction(ContentKeyFunctions.SwapHands);
             human.AddFunction(ContentKeyFunctions.SwapHandsReverse);
             human.AddFunction(ContentKeyFunctions.Drop);
diff --git a/Content.Client/Inventory/ClientInventorySystem.cs b/Content.Client/Inventory/ClientInventorySystem.cs
index de58077e4417..1f926b42a116 100644
--- a/Content.Client/Inventory/ClientInventorySystem.cs
+++ b/Content.Client/Inventory/ClientInventorySystem.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Client.Clothing;
 using Content.Client.Examine;
 using Content.Client.Verbs.UI;
@@ -11,6 +12,7 @@
 using Robust.Shared.Containers;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Player;
+using Robust.Shared.Timing;
 
 namespace Content.Client.Inventory
 {
@@ -19,7 +21,7 @@ public sealed class ClientInventorySystem : InventorySystem
     {
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IUserInterfaceManager _ui = default!;
-
+        [Dependency] private readonly IGameTiming _timing = default!;
         [Dependency] private readonly ClientClothingSystem _clothingVisualsSystem = default!;
         [Dependency] private readonly ExamineSystem _examine = default!;
 
@@ -91,6 +93,14 @@ private void OnDidEquip(InventorySlotsComponent component, DidEquipEvent args)
 
         private void OnShutdown(EntityUid uid, InventoryComponent component, ComponentShutdown args)
         {
+            if (TryComp(uid, out InventorySlotsComponent? inventorySlots))
+            {
+                foreach (var slot in component.Slots)
+                {
+                    TryRemoveSlotData((uid, inventorySlots), (SlotData)slot);
+                }
+            }
+
             if (uid == _playerManager.LocalEntity)
                 OnUnlinkInventory?.Invoke();
         }
@@ -102,23 +112,6 @@ private void OnPlayerDetached(EntityUid uid, InventorySlotsComponent component,
 
         private void OnPlayerAttached(EntityUid uid, InventorySlotsComponent component, LocalPlayerAttachedEvent args)
         {
-            if (TryGetSlots(uid, out var definitions))
-            {
-                foreach (var definition in definitions)
-                {
-                    if (!TryGetSlotContainer(uid, definition.Name, out var container, out _))
-                        continue;
-
-                    if (!component.SlotData.TryGetValue(definition.Name, out var data))
-                    {
-                        data = new SlotData(definition);
-                        component.SlotData[definition.Name] = data;
-                    }
-
-                    data.Container = container;
-                }
-            }
-
             OnLinkInventorySlots?.Invoke(uid, component);
         }
 
@@ -128,20 +121,6 @@ public override void Shutdown()
             base.Shutdown();
         }
 
-        protected override void OnInit(EntityUid uid, InventoryComponent component, ComponentInit args)
-        {
-            base.OnInit(uid, component, args);
-            _clothingVisualsSystem.InitClothing(uid, component);
-
-            if (!TryComp(uid, out InventorySlotsComponent? inventorySlots))
-                return;
-
-            foreach (var slot in component.Slots)
-            {
-                TryAddSlotDef(uid, inventorySlots, slot);
-            }
-        }
-
         public void ReloadInventory(InventorySlotsComponent? component = null)
         {
             var player = _playerManager.LocalEntity;
@@ -165,7 +144,10 @@ public void SetSlotHighlight(EntityUid owner, InventorySlotsComponent component,
         public void UpdateSlot(EntityUid owner, InventorySlotsComponent component, string slotName,
             bool? blocked = null, bool? highlight = null)
         {
-            var oldData = component.SlotData[slotName];
+            // The slot might have been removed when changing templates, which can cause items to be dropped.
+            if (!component.SlotData.TryGetValue(slotName, out var oldData))
+                return;
+
             var newHighlight = oldData.Highlighted;
             var newBlocked = oldData.Blocked;
 
@@ -181,14 +163,28 @@ public void UpdateSlot(EntityUid owner, InventorySlotsComponent component, strin
                 EntitySlotUpdate?.Invoke(newData);
         }
 
-        public bool TryAddSlotDef(EntityUid owner, InventorySlotsComponent component, SlotDefinition newSlotDef)
+        public bool TryAddSlotData(Entity<InventorySlotsComponent> ent, SlotData newSlotData)
         {
-            SlotData newSlotData = newSlotDef; //convert to slotData
-            if (!component.SlotData.TryAdd(newSlotDef.Name, newSlotData))
+            if (!ent.Comp.SlotData.TryAdd(newSlotData.SlotName, newSlotData))
                 return false;
 
-            if (owner == _playerManager.LocalEntity)
+            if (TryGetSlotContainer(ent.Owner, newSlotData.SlotName, out var newContainer, out _))
+                ent.Comp.SlotData[newSlotData.SlotName].Container = newContainer;
+
+            if (ent.Owner == _playerManager.LocalEntity)
                 OnSlotAdded?.Invoke(newSlotData);
+
+            return true;
+        }
+
+        public bool TryRemoveSlotData(Entity<InventorySlotsComponent> ent, SlotData removedSlotData)
+        {
+            if (!ent.Comp.SlotData.Remove(removedSlotData.SlotName))
+                return false;
+
+            if (ent.Owner == _playerManager.LocalEntity)
+                OnSlotRemoved?.Invoke(removedSlotData);
+
             return true;
         }
 
@@ -239,33 +235,52 @@ protected override void UpdateInventoryTemplate(Entity<InventoryComponent> ent)
         {
             base.UpdateInventoryTemplate(ent);
 
-            if (TryComp(ent, out InventorySlotsComponent? inventorySlots))
+            if (!TryComp<InventorySlotsComponent>(ent, out var inventorySlots))
+                return;
+
+            List<SlotData> slotDataToRemove = new(); // don't modify dict while iterating
+
+            foreach (var slotData in inventorySlots.SlotData.Values)
             {
-                foreach (var slot in ent.Comp.Slots)
-                {
-                    if (inventorySlots.SlotData.TryGetValue(slot.Name, out var slotData))
-                        slotData.SlotDef = slot;
-                }
+                if (!ent.Comp.Slots.Any(s => s.Name == slotData.SlotName))
+                    slotDataToRemove.Add(slotData);
             }
+
+            // remove slots that are no longer in the new template
+            foreach (var slotData in slotDataToRemove)
+            {
+                TryRemoveSlotData((ent.Owner, inventorySlots), slotData);
+            }
+
+            // update existing slots or add them if they don't exist yet
+            foreach (var slot in ent.Comp.Slots)
+            {
+                if (inventorySlots.SlotData.TryGetValue(slot.Name, out var slotData))
+                    slotData.SlotDef = slot;
+                else
+                    TryAddSlotData((ent.Owner, inventorySlots), (SlotData)slot);
+            }
+
+            _clothingVisualsSystem.InitClothing(ent, ent.Comp);
+            if (ent.Owner == _playerManager.LocalEntity)
+                ReloadInventory(inventorySlots);
         }
 
         public sealed class SlotData
         {
-            public SlotDefinition SlotDef;
-            public EntityUid? HeldEntity => Container?.ContainedEntity;
-            public bool Blocked;
-            public bool Highlighted;
-
-            [ViewVariables]
-            public ContainerSlot? Container;
-            public bool HasSlotGroup => SlotDef.SlotGroup != "Default";
-            public Vector2i ButtonOffset => SlotDef.UIWindowPosition;
-            public string SlotName => SlotDef.Name;
-            public bool ShowInWindow => SlotDef.ShowInWindow;
-            public string SlotGroup => SlotDef.SlotGroup;
-            public string SlotDisplayName => SlotDef.DisplayName;
-            public string TextureName => "Slots/" + SlotDef.TextureName;
-            public string FullTextureName => SlotDef.FullTextureName;
+            [ViewVariables] public SlotDefinition SlotDef;
+            [ViewVariables] public EntityUid? HeldEntity => Container?.ContainedEntity;
+            [ViewVariables] public bool Blocked;
+            [ViewVariables] public bool Highlighted;
+            [ViewVariables] public ContainerSlot? Container;
+            [ViewVariables] public bool HasSlotGroup => SlotDef.SlotGroup != "Default";
+            [ViewVariables] public Vector2i ButtonOffset => SlotDef.UIWindowPosition;
+            [ViewVariables] public string SlotName => SlotDef.Name;
+            [ViewVariables] public bool ShowInWindow => SlotDef.ShowInWindow;
+            [ViewVariables] public string SlotGroup => SlotDef.SlotGroup;
+            [ViewVariables] public string SlotDisplayName => SlotDef.DisplayName;
+            [ViewVariables] public string TextureName => "Slots/" + SlotDef.TextureName;
+            [ViewVariables] public string FullTextureName => SlotDef.FullTextureName;
 
             public SlotData(SlotDefinition slotDef, ContainerSlot? container = null, bool highlighted = false,
                 bool blocked = false)
diff --git a/Content.Client/Launcher/LauncherConnectingGui.xaml b/Content.Client/Launcher/LauncherConnectingGui.xaml
index 34b32f84fea3..d4dba89ffa29 100644
--- a/Content.Client/Launcher/LauncherConnectingGui.xaml
+++ b/Content.Client/Launcher/LauncherConnectingGui.xaml
@@ -28,6 +28,14 @@
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Bottom"
                                     StyleClasses="OpenRight"/>
+                          <!-- NullLink start-->
+                          <Button Name="LinkDiscordButton"
+                                  Text="{Loc 'link-discord'}"
+                                  HorizontalAlignment="Center"
+                                  VerticalAlignment="Bottom"
+                                  Visible="False" 
+                                  StyleClasses="OpenBoth"/>
+                          <!-- NullLink end-->
                             <Button Name="CopyButton"
                                     Text="{Loc 'connecting-copy'}"
                                     HorizontalAlignment="Center"
diff --git a/Content.Client/Launcher/LauncherConnectingGui.xaml.cs b/Content.Client/Launcher/LauncherConnectingGui.xaml.cs
index cf89f98095e6..029bac5dff58 100644
--- a/Content.Client/Launcher/LauncherConnectingGui.xaml.cs
+++ b/Content.Client/Launcher/LauncherConnectingGui.xaml.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Linq;
 using Content.Client.Stylesheets;
 using Content.Shared.CCVar;
@@ -8,10 +9,10 @@
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Configuration;
 using Robust.Shared.IoC;
-using Robust.Shared.Timing;
 using Robust.Shared.Network;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
+using Robust.Shared.Timing;
 
 namespace Content.Client.Launcher
 {
@@ -21,6 +22,7 @@ public sealed partial class LauncherConnectingGui : Control
         private const float RedialWaitTimeSeconds = 15f;
         private readonly LauncherConnecting _state;
         private float _waitTime;
+        private string? _discord; //NullLink
 
         // Pressing reconnect will redial instead of simply reconnecting.
         private bool _redial;
@@ -123,6 +125,14 @@ private void HandleDisconnectReason(INetStructuredReason? reason)
             else
             {
                 _redial = reason.RedialFlag;
+                //NullLink start
+                if (reason.Message.StringOf("discord") is { } link)
+                {
+                    _discord = link;
+                    LinkDiscordButton.Visible = true;
+                    LinkDiscordButton.OnPressed += _ => IoCManager.Resolve<IUriOpener>().OpenUri(link);
+                }
+                //NullLink end
 
                 if (reason.Message.Int32Of("delay") is { } delay)
                 {
diff --git a/Content.Client/Light/RgbLightControllerSystem.cs b/Content.Client/Light/RgbLightControllerSystem.cs
index 9977a3511859..292820ec27bd 100644
--- a/Content.Client/Light/RgbLightControllerSystem.cs
+++ b/Content.Client/Light/RgbLightControllerSystem.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using System.Numerics;
 using Content.Client.Items.Systems;
 using Content.Shared.Clothing;
 using Content.Shared.Hands;
diff --git a/Content.Client/Lock/Visualizers/LockVisualizerSystem.cs b/Content.Client/Lock/Visualizers/LockVisualizerSystem.cs
index b69a7cb37976..db0f617adeb1 100644
--- a/Content.Client/Lock/Visualizers/LockVisualizerSystem.cs
+++ b/Content.Client/Lock/Visualizers/LockVisualizerSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Storage;
 using Content.Shared.Lock;
+using Content.Shared.Power; // Starlight-edit
 using Robust.Client.GameObjects;
 
 namespace Content.Client.Lock.Visualizers;
@@ -15,12 +16,16 @@ protected override void OnAppearanceChange(EntityUid uid, LockVisualsComponent c
         // Lock state for the entity.
         if (!AppearanceSystem.TryGetData<bool>(uid, LockVisuals.Locked, out var locked, args.Component))
             locked = true;
+        
+        if (!AppearanceSystem.TryGetData<bool>(uid, PowerDeviceVisuals.Powered, out var powered, args.Component)) // Starlight-edit
+            powered = true;
 
         var unlockedStateExist = args.Sprite.BaseRSI?.TryGetState(comp.StateUnlocked, out _);
-
+            
         if (AppearanceSystem.TryGetData<bool>(uid, StorageVisuals.Open, out var open, args.Component))
         {
-            SpriteSystem.LayerSetVisible((uid, args.Sprite), LockVisualLayers.Lock, !open);
+            var visible = open == true ? !open : powered; // Starlight-edit
+            SpriteSystem.LayerSetVisible((uid, args.Sprite), LockVisualLayers.Lock, visible); // Starlight-edit
         }
         else if (!(bool)unlockedStateExist!)
             SpriteSystem.LayerSetVisible((uid, args.Sprite), LockVisualLayers.Lock, locked);
diff --git a/Content.Client/MouseRotator/MouseRotatorSystem.cs b/Content.Client/MouseRotator/MouseRotatorSystem.cs
index 18d60d9a7b9d..2ee6e43368fb 100644
--- a/Content.Client/MouseRotator/MouseRotatorSystem.cs
+++ b/Content.Client/MouseRotator/MouseRotatorSystem.cs
@@ -57,7 +57,8 @@ public override void Update(float frameTime)
                 rotation += 2 * Math.PI;
             RaisePredictiveEvent(new RequestMouseRotatorRotationEvent
             {
-                Rotation = rotation
+                Rotation = rotation,
+                User = GetNetEntity(player)
             });
 
             return;
@@ -77,7 +78,8 @@ public override void Update(float frameTime)
 
         RaisePredictiveEvent(new RequestMouseRotatorRotationEvent
         {
-            Rotation = angle
+            Rotation = angle,
+            User = GetNetEntity(player)
         });
     }
 }
diff --git a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml
index 0de3096b59fa..fcda72d94bd6 100644
--- a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml
+++ b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml
@@ -28,6 +28,7 @@
                 <CheckBox Name="IntegerScalingCheckBox"
                           Text="{Loc 'ui-options-vp-integer-scaling'}"
                           ToolTip="{Loc 'ui-options-vp-integer-scaling-tooltip'}" />
+                <ui:OptionDropDown Name="DropDownFilterMode" Title="{Loc 'ui-options-filter-label'}" />
                 <CheckBox Name="ViewportVerticalFitCheckBox"
                           Text="{Loc 'ui-options-vp-vertical-fit'}"
                           ToolTip="{Loc 'ui-options-vp-vertical-fit-tooltip'}" />
diff --git a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs
index 3c961c3446c2..36d58c6c9f3d 100644
--- a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs
@@ -40,6 +40,14 @@ public GraphicsTab()
                 new OptionDropDownCVar<float>.ValueOption(2.00f, Loc.GetString("ui-options-scale-200")),
             ]);
 
+        Control.AddOptionDropDown(
+            CCVars.ViewportScalingFilterMode,
+            DropDownFilterMode,
+            [
+                new OptionDropDownCVar<string>.ValueOption("nearest", Loc.GetString("ui-options-filter-nearest")),
+                new OptionDropDownCVar<string>.ValueOption("bilinear", Loc.GetString("ui-options-filter-bilinear")),
+            ]);
+
         var vpStretch = Control.AddOptionCheckBox(CCVars.ViewportStretch, ViewportStretchCheckBox);
         var vpVertFit = Control.AddOptionCheckBox(CCVars.ViewportVerticalFit, ViewportVerticalFitCheckBox);
         Control.AddOptionSlider(
@@ -51,6 +59,7 @@ public GraphicsTab()
 
         vpStretch.ImmediateValueChanged += _ => UpdateViewportSettingsVisibility();
         vpVertFit.ImmediateValueChanged += _ => UpdateViewportSettingsVisibility();
+        IntegerScalingCheckBox.OnToggled += _ => UpdateViewportSettingsVisibility();
 
         Control.AddOptionSlider(
             CCVars.ViewportWidth,
@@ -79,6 +88,7 @@ private void UpdateViewportSettingsVisibility()
         IntegerScalingCheckBox.Visible = ViewportStretchCheckBox.Pressed;
         ViewportVerticalFitCheckBox.Visible = ViewportStretchCheckBox.Pressed;
         ViewportWidthSlider.Visible = !ViewportStretchCheckBox.Pressed || !ViewportVerticalFitCheckBox.Pressed;
+        DropDownFilterMode.Visible = !IntegerScalingCheckBox.Pressed && ViewportStretchCheckBox.Pressed;
     }
 
     private void UpdateViewportWidthRange()
diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
index e6613c5290cf..35cd55e29c7d 100644
--- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
@@ -161,9 +161,9 @@ void AddCheckBox(string checkBoxName, bool currentState, Action<BaseButton.Butto
             AddButton(EngineKeyFunctions.MoveRight);
             AddButton(EngineKeyFunctions.Walk);
             AddButton(ContentKeyFunctions.Jump); //🌟Starlight🌟
-            AddButton(ContentKeyFunctions.ToggleKnockdown); //🌟Starlight🌟
             AddCheckBox("ui-options-hotkey-toggle-walk", _cfg.GetCVar(CCVars.ToggleWalk), HandleToggleWalk);
             InitToggleWalk();
+            AddButton(ContentKeyFunctions.ToggleKnockdown);
 
             AddHeader("ui-options-header-camera");
             AddButton(EngineKeyFunctions.CameraRotateLeft);
diff --git a/Content.Client/Power/APC/UI/ApcMenu.xaml.cs b/Content.Client/Power/APC/UI/ApcMenu.xaml.cs
index 25e885b3c7a1..65464abd540c 100644
--- a/Content.Client/Power/APC/UI/ApcMenu.xaml.cs
+++ b/Content.Client/Power/APC/UI/ApcMenu.xaml.cs
@@ -3,6 +3,7 @@
 using Robust.Client.GameObjects;
 using Robust.Shared.IoC;
 using System;
+using System.Numerics;
 using Content.Client.Stylesheets;
 using Content.Shared.APC;
 using Robust.Client.Graphics;
diff --git a/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs b/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs
index d3671e265ac3..e2b27c1b622f 100644
--- a/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs
+++ b/Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs
@@ -6,7 +6,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Numerics;
-using Vector4 = Robust.Shared.Maths.Vector4;
 
 namespace Content.Client.Power;
 
diff --git a/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs b/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
index 8bb49bdb2b32..c2d978e609c8 100644
--- a/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
+++ b/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
@@ -10,7 +10,6 @@
 using Robust.Shared.Threading;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
-using Vector2 = System.Numerics.Vector2;
 
 namespace Content.Client.Shuttles.UI;
 
diff --git a/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs b/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs
index 1a0e3aae81fc..2dcec6b44ad9 100644
--- a/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs
+++ b/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs
@@ -220,9 +220,9 @@ protected override void Draw(DrawingHandleScreen handle)
 
                 var gridCentre = Vector2.Transform(gridBody.LocalCenter, curGridToView);
 
-                var distance = gridCentre.Length();
+                var gridDistance = (gridBody.LocalCenter - xform.LocalPosition).Length();
                 var labelText = Loc.GetString("shuttle-console-iff-label", ("name", labelName),
-                    ("distance", $"{distance:0.0}"));
+                    ("distance", $"{gridDistance:0.0}"));
 
                 var mapCoords = _transform.GetWorldPosition(gUid);
                 var coordsText = $"({mapCoords.X:0.0}, {mapCoords.Y:0.0})";
diff --git a/Content.Client/SmartFridge/SmartFridgeBoundUserInterface.cs b/Content.Client/SmartFridge/SmartFridgeBoundUserInterface.cs
new file mode 100644
index 000000000000..60d8ea413a55
--- /dev/null
+++ b/Content.Client/SmartFridge/SmartFridgeBoundUserInterface.cs
@@ -0,0 +1,43 @@
+using Content.Client.UserInterface.Controls;
+using Content.Shared.SmartFridge;
+using Robust.Client.UserInterface;
+using Robust.Shared.Input;
+
+namespace Content.Client.SmartFridge;
+
+public sealed class SmartFridgeBoundUserInterface : BoundUserInterface
+{
+    private SmartFridgeMenu? _menu;
+
+    public SmartFridgeBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+    {
+    }
+
+    protected override void Open()
+    {
+        base.Open();
+
+        _menu = this.CreateWindow<SmartFridgeMenu>();
+        _menu.OnItemSelected += OnItemSelected;
+        Refresh();
+    }
+
+    public void Refresh()
+    {
+        if (_menu is not {} menu || !EntMan.TryGetComponent(Owner, out SmartFridgeComponent? fridge))
+            return;
+
+        menu.SetFlavorText(Loc.GetString(fridge.FlavorText));
+        menu.Populate((Owner, fridge));
+    }
+
+    private void OnItemSelected(GUIBoundKeyEventArgs args, ListData data)
+    {
+        if (args.Function != EngineKeyFunctions.UIClick)
+            return;
+
+        if (data is not SmartFridgeListData entry)
+            return;
+        SendPredictedMessage(new SmartFridgeDispenseItemMessage(entry.Entry));
+    }
+}
diff --git a/Content.Client/SmartFridge/SmartFridgeItem.xaml b/Content.Client/SmartFridge/SmartFridgeItem.xaml
new file mode 100644
index 000000000000..3960d7ce4200
--- /dev/null
+++ b/Content.Client/SmartFridge/SmartFridgeItem.xaml
@@ -0,0 +1,16 @@
+<BoxContainer xmlns="https://spacestation14.io"
+            Orientation="Horizontal"
+            HorizontalExpand="True"
+            SeparationOverride="4">
+    <SpriteView
+            Name="EntityView"
+            Margin="4 0 0 0"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            MinSize="32 32"
+            />
+    <Label Name="NameLabel"
+            SizeFlagsStretchRatio="3"
+            HorizontalExpand="True"
+            ClipText="True"/>
+</BoxContainer>
diff --git a/Content.Client/SmartFridge/SmartFridgeItem.xaml.cs b/Content.Client/SmartFridge/SmartFridgeItem.xaml.cs
new file mode 100644
index 000000000000..c69d2e7de237
--- /dev/null
+++ b/Content.Client/SmartFridge/SmartFridgeItem.xaml.cs
@@ -0,0 +1,18 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.SmartFridge;
+
+[GenerateTypedNameReferences]
+public sealed partial class SmartFridgeItem : BoxContainer
+{
+    public SmartFridgeItem(EntityUid uid, string text)
+    {
+        RobustXamlLoader.Load(this);
+
+        EntityView.SetEntity(uid);
+        NameLabel.Text = text;
+    }
+}
diff --git a/Content.Client/SmartFridge/SmartFridgeMenu.xaml b/Content.Client/SmartFridge/SmartFridgeMenu.xaml
new file mode 100644
index 000000000000..73cb0f3925bb
--- /dev/null
+++ b/Content.Client/SmartFridge/SmartFridgeMenu.xaml
@@ -0,0 +1,24 @@
+<controls:FancyWindow
+    xmlns="https://spacestation14.io"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+    xmlns:co="clr-namespace:Content.Client.UserInterface.Controls"
+    MinHeight="450"
+    MinWidth="350"
+    Title="{Loc 'smart-fridge-component-title'}">
+    <BoxContainer Name="MainContainer" Orientation="Vertical">
+        <LineEdit Name="SearchBar" PlaceHolder="{Loc 'smart-fridge-component-search-filter'}" HorizontalExpand="True"  Margin ="4 4"/>
+        <co:SearchListContainer Name="VendingContents" VerticalExpand="True" Margin="4 4"/>
+         <!-- Footer -->
+        <BoxContainer Orientation="Vertical">
+            <PanelContainer StyleClasses="LowDivider" />
+            <BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
+                <Label Name="LeftFlavorLabel" StyleClasses="WindowFooterText" />
+                <Label Text="{Loc 'vending-machine-flavor-right'}" StyleClasses="WindowFooterText"
+                        HorizontalAlignment="Right" HorizontalExpand="True"  Margin="0 0 5 0" />
+                <TextureRect StyleClasses="NTLogoDark" Stretch="KeepAspectCentered"
+                        VerticalAlignment="Center" HorizontalAlignment="Right" SetSize="19 19"/>
+            </BoxContainer>
+        </BoxContainer>
+    </BoxContainer>
+</controls:FancyWindow>
diff --git a/Content.Client/SmartFridge/SmartFridgeMenu.xaml.cs b/Content.Client/SmartFridge/SmartFridgeMenu.xaml.cs
new file mode 100644
index 000000000000..c896e7fada11
--- /dev/null
+++ b/Content.Client/SmartFridge/SmartFridgeMenu.xaml.cs
@@ -0,0 +1,81 @@
+using System.Linq;
+using System.Numerics;
+using Content.Client.UserInterface.Controls;
+using Content.Shared.SmartFridge;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface.XAML;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.SmartFridge;
+
+public record SmartFridgeListData(EntityUid Representative, SmartFridgeEntry Entry, int Amount) : ListData;
+
+[GenerateTypedNameReferences]
+public sealed partial class SmartFridgeMenu : FancyWindow
+{
+    [Dependency] private readonly IEntityManager _entityManager = default!;
+
+    public event Action<GUIBoundKeyEventArgs, ListData>? OnItemSelected;
+
+    private readonly StyleBoxFlat _styleBox = new() { BackgroundColor = new Color(70, 73, 102) };
+
+    public SmartFridgeMenu()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        VendingContents.SearchBar = SearchBar;
+        VendingContents.DataFilterCondition += DataFilterCondition;
+        VendingContents.GenerateItem += GenerateButton;
+        VendingContents.ItemKeyBindDown += (args, data) => OnItemSelected?.Invoke(args, data);
+    }
+
+    private bool DataFilterCondition(string filter, ListData data)
+    {
+        if (data is not SmartFridgeListData entry)
+            return false;
+
+        if (string.IsNullOrEmpty(filter))
+            return true;
+
+        return entry.Entry.Name.Contains(filter, StringComparison.CurrentCultureIgnoreCase);
+    }
+
+    private void GenerateButton(ListData data, ListContainerButton button)
+    {
+        if (data is not SmartFridgeListData entry)
+            return;
+
+        var label = Loc.GetString("smart-fridge-list-item", ("item", entry.Entry.Name), ("amount", entry.Amount));
+        button.AddChild(new SmartFridgeItem(entry.Representative, label));
+
+        button.ToolTip = label;
+        button.StyleBoxOverride = _styleBox;
+    }
+
+    public void Populate(Entity<SmartFridgeComponent> ent)
+    {
+        var listData = new List<ListData>();
+
+        foreach (var item in ent.Comp.Entries)
+        {
+            if (!ent.Comp.ContainedEntries.TryGetValue(item, out var items) || items.Count == 0)
+            {
+                listData.Add(new SmartFridgeListData(EntityUid.Invalid, item, 0));
+            }
+            else
+            {
+                var representative = _entityManager.GetEntity(items.First());
+                listData.Add(new SmartFridgeListData(representative, item, items.Count));
+            }
+        }
+
+        VendingContents.PopulateList(listData);
+    }
+
+    public void SetFlavorText(string flavor)
+    {
+        LeftFlavorLabel.Text = flavor;
+    }
+}
diff --git a/Content.Client/SmartFridge/SmartFridgeUISystem.cs b/Content.Client/SmartFridge/SmartFridgeUISystem.cs
new file mode 100644
index 000000000000..4068c27e057c
--- /dev/null
+++ b/Content.Client/SmartFridge/SmartFridgeUISystem.cs
@@ -0,0 +1,24 @@
+using Content.Shared.SmartFridge;
+using Robust.Shared.Analyzers;
+
+namespace Content.Client.SmartFridge;
+
+public sealed class SmartFridgeUISystem : EntitySystem
+{
+    [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<SmartFridgeComponent, AfterAutoHandleStateEvent>(OnSmartFridgeAfterState);
+    }
+
+    private void OnSmartFridgeAfterState(Entity<SmartFridgeComponent> ent, ref AfterAutoHandleStateEvent args)
+    {
+        if (!_uiSystem.TryGetOpenUi<SmartFridgeBoundUserInterface>(ent.Owner, SmartFridgeUiKey.Key, out var bui))
+            return;
+
+        bui.Refresh();
+    }
+}
diff --git a/Content.Client/Storage/Visualizers/EntityStorageVisualizerSystem.cs b/Content.Client/Storage/Visualizers/EntityStorageVisualizerSystem.cs
index c10a24ac3230..351f81e3ae2b 100644
--- a/Content.Client/Storage/Visualizers/EntityStorageVisualizerSystem.cs
+++ b/Content.Client/Storage/Visualizers/EntityStorageVisualizerSystem.cs
@@ -1,5 +1,7 @@
+using Content.Client.Wires.Visualizers; // Starlight-edit
 using Content.Shared.SprayPainter.Prototypes;
 using Content.Shared.Storage;
+using Content.Shared.Wires; // Starlight-edit
 using Robust.Client.GameObjects;
 using Robust.Shared.Prototypes;
 
@@ -81,6 +83,9 @@ protected override void OnAppearanceChange(EntityUid uid,
                     SpriteSystem.LayerSetRsiState((uid, args.Sprite), StorageVisualLayers.Base, comp.StateBaseOpen);
                 else if (forceRedrawBase && comp.StateBaseClosed != null)
                     SpriteSystem.LayerSetRsiState((uid, args.Sprite), StorageVisualLayers.Base, comp.StateBaseClosed);
+
+                if (SpriteSystem.LayerMapTryGet((uid, args.Sprite), WiresVisualLayers.MaintenancePanel, out _, false))
+                    SpriteSystem.LayerSetVisible((uid, args.Sprite), WiresVisualLayers.MaintenancePanel, false); // Starlight-edit
             }
             else
             {
@@ -99,6 +104,10 @@ protected override void OnAppearanceChange(EntityUid uid,
                     SpriteSystem.LayerSetRsiState((uid, args.Sprite), StorageVisualLayers.Base, comp.StateBaseClosed);
                 else if (forceRedrawBase && comp.StateBaseOpen != null)
                     SpriteSystem.LayerSetRsiState((uid, args.Sprite), StorageVisualLayers.Base, comp.StateBaseOpen);
+
+                if (SpriteSystem.LayerMapTryGet((uid, args.Sprite), WiresVisualLayers.MaintenancePanel, out _, false)
+                    && args.AppearanceData.TryGetValue(WiresVisuals.MaintenancePanelState, out var panelStateObject) && panelStateObject is bool panelState)
+                    SpriteSystem.LayerSetVisible((uid, args.Sprite), WiresVisualLayers.MaintenancePanel, panelState); // Starlight-edit
             }
         }
     }
diff --git a/Content.Client/Stunnable/StunSystem.cs b/Content.Client/Stunnable/StunSystem.cs
index c30d54a4330d..dec2bf407854 100644
--- a/Content.Client/Stunnable/StunSystem.cs
+++ b/Content.Client/Stunnable/StunSystem.cs
@@ -1,5 +1,4 @@
 using System.Numerics;
-using Content.Shared.Mobs;
 using Content.Shared.CombatMode;
 using Content.Shared.Interaction;
 using Content.Shared.Rotation;
@@ -7,22 +6,20 @@
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Animations;
-using Robust.Shared.Random;
-using Robust.Shared.Timing;
-using Robust.Shared.Utility;
-using Robust.Client.GameObjects;
-using Robust.Client.Graphics;
 using Robust.Shared.Input;
 using Robust.Shared.Input.Binding;
+using Robust.Shared.Random;
 using Robust.Shared.Timing;
+using Robust.Client.Graphics;
+
 
 namespace Content.Client.Stunnable;
 
 public sealed class StunSystem : SharedStunSystem
 {
+    [Dependency] private readonly SharedCombatModeSystem _combat = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     #region Starlight
-    [Dependency] private readonly SharedCombatModeSystem _combat = default!;
     [Dependency] private readonly InputSystem _input = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly AnimationPlayerSystem _animation = default!;
@@ -38,14 +35,23 @@ public override void Initialize()
 
         SubscribeLocalEvent<StunVisualsComponent, ComponentInit>(OnComponentInit);
         SubscribeLocalEvent<StunVisualsComponent, AppearanceChangeEvent>(OnAppearanceChanged);
-
-        #region Starlight
-        SubscribeLocalEvent<KnockedDownComponent, MoveEvent>(OnMovementInput);
+        SubscribeLocalEvent<KnockedDownComponent, MoveEvent>(OnMovementInput);//Starlight
 
         CommandBinds.Builder
             .BindAfter(EngineKeyFunctions.UseSecondary, new PointerInputCmdHandler(OnUseSecondary, true, true), typeof(SharedInteractionSystem))
             .Register<StunSystem>();
-        #endregion
+    }
+
+    private bool OnUseSecondary(in PointerInputCmdHandler.PointerInputCmdArgs args)
+    {
+        if (args.Session?.AttachedEntity is not {Valid: true} uid)
+            return false;
+
+        if (args.EntityUid != uid || !HasComp<KnockedDownComponent>(uid) || !_combat.IsInCombatMode(uid))
+            return false;
+
+        RaisePredictiveEvent(new ForceStandUpEvent());
+        return true;
     }
 
     /// <summary>
@@ -180,20 +186,6 @@ public Animation GetFatigueAnimation(SpriteComponent sprite,
         };
     }
     #region Starlight
-    private bool OnUseSecondary(in PointerInputCmdHandler.PointerInputCmdArgs args)
-    {
-        if (args.Session?.AttachedEntity is not { Valid: true } uid)
-            return false;
-
-        if (_input.Predicted)
-            return false;
-
-        if (args.EntityUid != uid || !HasComp<KnockedDownComponent>(uid) || !_combat.IsInCombatMode(uid))
-            return false;
-
-        RaisePredictiveEvent(new ForceStandUpEvent());
-        return true;
-    }
 
     private void OnMovementInput(EntityUid uid, KnockedDownComponent component, MoveEvent args)
     {
diff --git a/Content.Client/UserInterface/Controls/MainViewport.cs b/Content.Client/UserInterface/Controls/MainViewport.cs
index 721d75011525..0e947da7cf8b 100644
--- a/Content.Client/UserInterface/Controls/MainViewport.cs
+++ b/Content.Client/UserInterface/Controls/MainViewport.cs
@@ -30,6 +30,8 @@ public MainViewport()
             };
 
             AddChild(Viewport);
+
+            _cfg.OnValueChanged(CCVars.ViewportScalingFilterMode, _ => UpdateCfg(), true);
         }
 
         protected override void EnteredTree()
@@ -52,6 +54,7 @@ public void UpdateCfg()
             var renderScaleUp = _cfg.GetCVar(CCVars.ViewportScaleRender);
             var fixedFactor = _cfg.GetCVar(CCVars.ViewportFixedScaleFactor);
             var verticalFit = _cfg.GetCVar(CCVars.ViewportVerticalFit);
+            var filterMode = _cfg.GetCVar(CCVars.ViewportScalingFilterMode);
 
             if (stretch)
             {
@@ -60,7 +63,11 @@ public void UpdateCfg()
                 {
                     // Did not find a snap, enable stretching.
                     Viewport.FixedStretchSize = null;
-                    Viewport.StretchMode = ScalingViewportStretchMode.Bilinear;
+                    Viewport.StretchMode = filterMode switch
+                    {
+                        "nearest" => ScalingViewportStretchMode.Nearest,
+                        "bilinear" => ScalingViewportStretchMode.Bilinear
+                    };
                     Viewport.IgnoreDimension = verticalFit ? ScalingViewportIgnoreDimension.Horizontal : ScalingViewportIgnoreDimension.None;
 
                     if (renderScaleUp)
diff --git a/Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs b/Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs
index 3eef88f19bb1..1b9e4e2c4ab8 100644
--- a/Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs
+++ b/Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Shared.Mobs;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
diff --git a/Content.Client/UserInterface/Systems/ProgressColorSystem.cs b/Content.Client/UserInterface/Systems/ProgressColorSystem.cs
index e5579801eceb..3d5f8d956115 100644
--- a/Content.Client/UserInterface/Systems/ProgressColorSystem.cs
+++ b/Content.Client/UserInterface/Systems/ProgressColorSystem.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Shared.CCVar;
 using Robust.Shared.Configuration;
 
@@ -43,7 +44,7 @@ public Color GetProgressColor(float progress)
 
             // lerp
             var hue = 5f / 18f * progress;
-            return Color.FromHsv((hue, 1f, 0.75f, 1f));
+            return Color.FromHsv(new Vector4(hue, 1f, 0.75f, 1f));
         }
 
         return InterpolateColorGaussian(Plasma, progress);
diff --git a/Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs b/Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
index d07db112c8ab..60c74939f6f7 100644
--- a/Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
+++ b/Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
@@ -185,7 +185,12 @@ protected override void Draw(DrawingHandleScreen handle)
 
             handle.SetTransform(pos, iconRotation);
             var box = new UIBox2(root, root + sprite.Size * scale);
-            handle.DrawTextureRect(sprite, box);
+
+            var ev = new BeforeRenderInGridEvent(new Color(255, 255, 255));
+            _entityManager.EventBus.RaiseLocalEvent(Entity, ev);
+
+            handle.DrawTextureRect(sprite, box, ev.Color);
+
             handle.SetTransform(GlobalPixelPosition, Angle.Zero);
         }
         else
@@ -298,6 +303,19 @@ public static Vector2 GetCenterOffset(Entity<ItemComponent?> entity, ItemStorage
     public EntityUid? UiEntity => Entity;
 }
 
+/// <summary>
+///     This event gets raised before a sprite gets drawn in a grid and lets to change the sprite color for several gameobjects that have special sprites to render in containers.
+/// </summary>
+public sealed class BeforeRenderInGridEvent : EntityEventArgs
+{
+    public Color Color { get; set; }
+
+    public BeforeRenderInGridEvent(Color color)
+    {
+        Color = color;
+    }
+}
+
 public enum ItemGridPieceMarks
 {
     First,
diff --git a/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs b/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs
index 8b66ed8892a1..392532c7b70f 100644
--- a/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs
+++ b/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs
@@ -621,7 +621,7 @@ protected override void FrameUpdate(FrameEventArgs args)
                         {
                             marked.Add(cell);
                             cell.ModulateSelfOverride = spotFree
-                                ? Color.FromHsv((0.18f, 1 / spot, 0.5f / spot + 0.5f, 1f))
+                                ? Color.FromHsv(new Vector4(0.18f, 1 / spot, 0.5f / spot + 0.5f, 1f))
                                 : Color.FromHex("#2222CC");
                         }
                     }
diff --git a/Content.Client/VendingMachines/UI/VendingMachineItem.xaml b/Content.Client/VendingMachines/UI/VendingMachineItem.xaml
index a61edfb79b96..0cab410d3e62 100644
--- a/Content.Client/VendingMachines/UI/VendingMachineItem.xaml
+++ b/Content.Client/VendingMachines/UI/VendingMachineItem.xaml
@@ -9,8 +9,23 @@
             VerticalAlignment="Center"
             MinSize="32 32"
             />
+    <!-- Starlight-edit -->
     <Label Name="NameLabel"
-            SizeFlagsStretchRatio="3"
+            SizeFlagsStretchRatio="1"
             HorizontalExpand="True"
             ClipText="True"/>
+    <!-- 🌟Starlight🌟 Amount in brackets -->
+        <Label Name="AmountLabel"
+                        HorizontalAlignment="Right"
+                        HorizontalExpand="False"
+                        MinSize="40 0"
+                        Margin="6 0 0 0"
+                        ClipText="True"/>
+    <!-- 🌟Starlight🌟 Price with currency -->
+        <Label Name="PriceLabel"
+                        HorizontalAlignment="Right"
+                        HorizontalExpand="False"
+                        MinSize="60 0"
+                        Margin="6 0 6 0"
+                        ClipText="True"/>
 </BoxContainer>
diff --git a/Content.Client/VendingMachines/UI/VendingMachineItem.xaml.cs b/Content.Client/VendingMachines/UI/VendingMachineItem.xaml.cs
index 0f0564c5960e..8ff9a92e0bed 100644
--- a/Content.Client/VendingMachines/UI/VendingMachineItem.xaml.cs
+++ b/Content.Client/VendingMachines/UI/VendingMachineItem.xaml.cs
@@ -2,23 +2,47 @@
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
+using Content.Client.Stylesheets; // 🌟Starlight🌟
 
 namespace Content.Client.VendingMachines.UI;
 
 [GenerateTypedNameReferences]
 public sealed partial class VendingMachineItem : BoxContainer
 {
-    public VendingMachineItem(EntProtoId entProto, string text)
+    public VendingMachineItem(EntProtoId entProto, string name, uint amount = 0, int price = 0, bool showPrice = false) // 🌟Starlight🌟 
     {
         RobustXamlLoader.Load(this);
 
         ItemPrototype.SetPrototype(entProto);
 
-        NameLabel.Text = text;
+        // 🌟Starlight🌟
+        SetName(name);
+        SetAmount(amount);
+        SetPrice(price, showPrice);
+    }
+    // 🌟Starlight🌟 start 
+    public void SetName(string name)
+    {
+        NameLabel.Text = name;
+    }
+
+    public void SetAmount(uint amount) 
+    {
+        AmountLabel.Text = $"[{amount}]";
+        AmountLabel.FontColorOverride = StyleNano.GoodGreenFore;
     }
 
-    public void SetText(string text)
+    public void SetPrice(int price, bool show)
     {
-        NameLabel.Text = text;
+        if (!show || price <= 0)
+        {
+            PriceLabel.Visible = false;
+            return;
+        }
+
+        PriceLabel.Visible = true;
+        PriceLabel.Text = $" {price} \u20a1";
+        PriceLabel.FontColorOverride = StyleNano.NanoGold; 
+        // 🌟Starlight🌟 end
     }
 }
diff --git a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml
index 44b1ff95e7fe..0190ccd78595 100644
--- a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml
+++ b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml
@@ -5,6 +5,10 @@
     xmlns:co="clr-namespace:Content.Client.UserInterface.Controls"
     MinHeight="210">
     <BoxContainer Name="MainContainer" Orientation="Vertical">
+        <!-- 🌟Starlight🌟 Balance display -->
+        <BoxContainer Name="BalanceContainer" Orientation="Horizontal" Margin="4 4 4 0" HorizontalExpand="True">
+            <Label Name="BalanceLabel" Text="Balance: 0₡" StyleClasses="WindowFooterText" HorizontalAlignment="Left" />
+        </BoxContainer>
         <LineEdit Name="SearchBar" PlaceHolder="{Loc 'vending-machine-component-search-filter'}" HorizontalExpand="True"  Margin ="4 4"/>
         <co:SearchListContainer Name="VendingContents" VerticalExpand="True" Margin="4 4"/>
          <!-- Footer -->
diff --git a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
index 41d29e8080a5..65a68c33ee46 100644
--- a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
+++ b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
@@ -21,16 +21,34 @@ public sealed partial class VendingMachineMenu : FancyWindow
         [Dependency] private readonly IEntityManager _entityManager = default!;
 
         private readonly Dictionary<EntProtoId, EntityUid> _dummies = [];
+         // 🌟Starlight start🌟
         private readonly Dictionary<EntProtoId, (ListContainerButton Button, VendingMachineItem Item)> _listItems = new();
-        private readonly Dictionary<EntProtoId, uint> _amounts = new();
+        private readonly Dictionary<EntProtoId, uint> _amounts = new(); 
+        private readonly Dictionary<EntProtoId, int> _prices = new(); 
+         // 🌟Starlight end🌟
 
         /// <summary>
         /// Whether the vending machine is able to be interacted with or not.
         /// </summary>
-        private bool _enabled;
+        private bool _enabled; // 🌟Starlight🌟
+        private bool _showPrices; // 🌟Starlight🌟
 
         public event Action<GUIBoundKeyEventArgs, ListData>? OnItemSelected;
 
+        // 🌟Starlight🌟 start
+
+        /// <summary>
+        /// Updates the balance display
+        /// </summary>
+        /// <param name="balance">Current player balance</param>
+        public void UpdateBalance(int balance) => BalanceLabel.Text = $"Balance: {balance}₡";
+        
+        /// <summary>
+        /// Toggles the balance display
+        /// </summary>
+         public void ToggleBalance(bool? enable = null) => BalanceContainer.Visible = enable ?? !BalanceContainer.Visible;
+        // 🌟Starlight🌟 end
+
         public VendingMachineMenu()
         {
             MinSize = SetSize = new Vector2(250, 150);
@@ -72,24 +90,38 @@ private bool DataFilterCondition(string filter, ListData data)
 
         private void GenerateButton(ListData data, ListContainerButton button)
         {
-            if (data is not VendorItemsListData { ItemProtoID: var protoID, ItemText: var text })
+            if (data is not VendorItemsListData { ItemProtoID: var protoID, ItemText: var text } vendorListData)
                 return;
 
-            var item = new VendingMachineItem(protoID, text);
+            // 🌟Starlight🌟 start
+            _dummies.TryGetValue(protoID, out var dummy);
+            var itemName = dummy != default ? Identity.Name(dummy, _entityManager) : text;
+            var amount = vendorListData.Amount;
+            var price = vendorListData.Price;
+
+            var item = new VendingMachineItem(protoID, itemName, amount, price, _showPrices);
+            // 🌟Starlight🌟 end
+            
             _listItems[protoID] = (button, item);
+
             button.AddChild(item);
             button.AddStyleClass("ButtonSquare");
-            button.Disabled = !_enabled || _amounts[protoID] == 0;
+
+            button.Disabled = !_enabled || amount == 0; // 🌟Starlight🌟
         }
 
         /// <summary>
         /// Populates the list of available items on the vending machine interface
         /// and sets icons based on their prototypes
         /// </summary>
-        public void Populate(List<VendingMachineInventoryEntry> inventory, bool enabled)
+        public void Populate(List<VendingMachineInventoryEntry> inventory, bool enabled, bool showPrices = true) // 🌟Starlight🌟
         {
             _enabled = enabled;
+            // 🌟Starlight🌟 start
+            _showPrices = showPrices; 
             _listItems.Clear();
+             _prices.Clear(); 
+            // 🌟Starlight🌟 end
             _amounts.Clear();
 
             if (inventory.Count == 0 && VendingContents.Visible)
@@ -133,8 +165,13 @@ public void Populate(List<VendingMachineInventoryEntry> inventory, bool enabled)
                 }
 
                 var itemName = Identity.Name(dummy, _entityManager);
-                var itemText = $"{itemName} [{entry.Amount}]";
+                //🌟Starlight🌟 start
+                var itemText = showPrices && entry.Price > 0 ? 
+                    $"{itemName} [{entry.Amount}] - {entry.Price} ₡" : 
+                    $"{itemName} [{entry.Amount}]";
+                //🌟Starlight🌟 end
                 _amounts[entry.ID] = entry.Amount;
+                _prices[entry.ID] = entry.Price; // 🌟Stgarlight🌟
 
                 if (itemText.Length > longestEntry.Length)
                     longestEntry = itemText;
@@ -142,6 +179,8 @@ public void Populate(List<VendingMachineInventoryEntry> inventory, bool enabled)
                 listData.Add(new VendorItemsListData(prototype.ID, i)
                 {
                     ItemText = itemText,
+                    Amount = entry.Amount,
+                    Price = entry.Price, // 🌟Starlight🌟
                 });
             }
 
@@ -153,9 +192,10 @@ public void Populate(List<VendingMachineInventoryEntry> inventory, bool enabled)
         /// <summary>
         /// Updates text entries for vending data in place without modifying the list controls.
         /// </summary>
-        public void UpdateAmounts(List<VendingMachineInventoryEntry> cachedInventory, bool enabled)
+        public void UpdateAmounts(List<VendingMachineInventoryEntry> cachedInventory, bool enabled, bool showPrices = true) // 🌟Starlight🌟
         {
             _enabled = enabled;
+            _showPrices = showPrices; // 🌟Starlight🌟
 
             foreach (var proto in _dummies.Keys)
             {
@@ -166,18 +206,23 @@ public void UpdateAmounts(List<VendingMachineInventoryEntry> cachedInventory, bo
                 if (!cachedInventory.TryFirstOrDefault(o => o.ID == proto, out var entry))
                     continue;
                 var amount = entry.Amount;
-                // Could be better? Problem is all inventory entries get squashed.
-                var text = GetItemText(dummy, amount);
+                // 🌟Starlight🌟 start
+                _amounts[proto] = amount;
+                _prices[proto] = entry.Price;
 
-                button.Item.SetText(text);
+                button.Item.SetAmount(amount);
+                button.Item.SetPrice(entry.Price, showPrices);
+                // 🌟Starlight🌟 end
                 button.Button.Disabled = !enabled || amount == 0;
             }
         }
 
-        private string GetItemText(EntityUid dummy, uint amount)
+        private string GetItemText(EntityUid dummy, uint amount, int price, bool showPrices = true) // 🌟Starlight🌟 
         {
-            var itemName = Identity.Name(dummy, _entityManager);
-            return $"{itemName} [{amount}]";
+            var itemName = Identity.Name(dummy, _entityManager); // 🌟Starlight🌟
+            return showPrices && price > 0 ? 
+                $"{itemName} [{amount}] - {price} ₡" : 
+                $"{itemName} [{amount}]"; 
         }
 
         private void SetSizeAfterUpdate(int longestEntryLength, int contentCount)
@@ -190,5 +235,7 @@ private void SetSizeAfterUpdate(int longestEntryLength, int contentCount)
     public record VendorItemsListData(EntProtoId ItemProtoID, int ItemIndex) : ListData
     {
         public string ItemText = string.Empty;
+        public uint Amount; // 🌟Starlight🌟
+        public int Price; // 🌟Starlight🌟
     }
 }
diff --git a/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs b/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs
index 874808158d83..bf3339c840f8 100644
--- a/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs
+++ b/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs
@@ -14,6 +14,7 @@ public sealed class VendingMachineBoundUserInterface : BoundUserInterface
 
         [ViewVariables]
         private List<VendingMachineInventoryEntry> _cachedInventory = new();
+        private bool _showPrices = true;  // 🌟Starlight🌟 Track if prices should be shown
 
         public VendingMachineBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
         {
@@ -26,26 +27,81 @@ protected override void Open()
             _menu = this.CreateWindowCenteredLeft<VendingMachineMenu>();
             _menu.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;
             _menu.OnItemSelected += OnItemSelected;
-            Refresh();
+            
+            Refresh(); // 🌟Starlight🌟
+            
+            // 🌟Starlight🌟 
+            if (_showPrices)
+            {
+                RequestBalance(); // Client ask too, server also pushes on open now
+            }
+        }
+
+        protected override void ReceiveMessage(BoundUserInterfaceMessage message)
+        {
+            if (message is VendingMachineBalanceUpdateMessage balanceMessage)
+            {
+                _menu?.UpdateBalance(balanceMessage.Balance);
+            }
+        }
+
+        /// <summary>
+        /// Requests current balance from server
+        /// </summary>
+        private void RequestBalance()         // 🌟Starlight🌟
+        {
+            SendMessage(new VendingMachineRequestBalanceMessage());
         }
 
         public void Refresh()
         {
             var enabled = EntMan.TryGetComponent(Owner, out VendingMachineComponent? bendy) && !bendy.Ejecting;
+            _showPrices = bendy?.ShowPrices ?? true;
 
             var system = EntMan.System<VendingMachineSystem>();
             _cachedInventory = system.GetAllInventory(Owner);
 
-            _menu?.Populate(_cachedInventory, enabled);
+            _menu?.Populate(_cachedInventory, enabled, _showPrices);
+
+            // 🌟Starlight start🌟 
+            if (_menu != null)
+            {
+                if (_showPrices)
+                {
+                    _menu.ToggleBalance(true);
+                    RequestBalance();
+                }
+                else
+                {
+                    _menu.ToggleBalance();
+                }
+            }
+            //  // 🌟Starlight end🌟
         }
 
         public void UpdateAmounts()
         {
             var enabled = EntMan.TryGetComponent(Owner, out VendingMachineComponent? bendy) && !bendy.Ejecting;
+            _showPrices = bendy?.ShowPrices ?? true; // 🌟Starlight🌟
 
             var system = EntMan.System<VendingMachineSystem>();
             _cachedInventory = system.GetAllInventory(Owner);
-            _menu?.UpdateAmounts(_cachedInventory, enabled);
+            _menu?.UpdateAmounts(_cachedInventory, enabled, _showPrices); // 🌟Starlight🌟
+
+            // 🌟Starlight start🌟 
+            if (_menu != null)
+            {
+                if (_showPrices)
+                {
+                    _menu.ToggleBalance(true);
+                    RequestBalance();
+                }
+                else
+                {
+                    _menu.ToggleBalance();
+                }
+            }
+             // 🌟Starlight end🌟 
         }
 
         private void OnItemSelected(GUIBoundKeyEventArgs args, ListData data)
@@ -64,7 +120,8 @@ private void OnItemSelected(GUIBoundKeyEventArgs args, ListData data)
             if (selectedItem == null)
                 return;
 
-            SendPredictedMessage(new VendingMachineEjectMessage(selectedItem.Type, selectedItem.ID));
+            // 🌟Starlight🌟 Use non-predicted message so that the server processes the vend
+            SendMessage(new VendingMachineEjectMessage(selectedItem.Type, selectedItem.ID));
         }
 
         protected override void Dispose(bool disposing)
diff --git a/Content.Client/VendingMachines/VendingMachineSystem.cs b/Content.Client/VendingMachines/VendingMachineSystem.cs
index 74919128554a..1519ed4314a0 100644
--- a/Content.Client/VendingMachines/VendingMachineSystem.cs
+++ b/Content.Client/VendingMachines/VendingMachineSystem.cs
@@ -30,6 +30,7 @@ private void OnVendingHandleState(Entity<VendingMachineComponent> entity, ref Co
         var component = entity.Comp;
 
         component.Contraband = state.Contraband;
+        component.ShowPrices = state.ShowPrices; // 🌟Starlight🌟 
         component.EjectEnd = state.EjectEnd;
         component.DenyEnd = state.DenyEnd;
         component.DispenseOnHitEnd = state.DispenseOnHitEnd;
diff --git a/Content.Client/_Starlight/Economy/Atm/ATMBui.cs b/Content.Client/_Starlight/Economy/Atm/ATMBui.cs
index 7de5199a56b2..ca88cf14cbc2 100644
--- a/Content.Client/_Starlight/Economy/Atm/ATMBui.cs
+++ b/Content.Client/_Starlight/Economy/Atm/ATMBui.cs
@@ -12,11 +12,12 @@ namespace Content.Client._Starlight.Economy.Atm;
 [UsedImplicitly]
 public sealed class ATMBui : BoundUserInterface
 {
-    [Dependency] private readonly IEntityManager _entities = default!;
-
     [ViewVariables]
     private ATMWindow? _window;
     private int _amount;
+    private int _transferAmount;
+    private string _transferRecipient = string.Empty;
+    private int _currentBalance;
     public ATMBui(EntityUid owner, Enum uiKey) : base(owner, uiKey)
     {
 
@@ -24,7 +25,10 @@ public ATMBui(EntityUid owner, Enum uiKey) : base(owner, uiKey)
     protected override void Open()
     {
         base.Open();
+        TryInitWindow();
+        View(ViewType.Withdraw);
         UpdateState(State);
+        _window?.OpenCentered();
     }
 
     protected override void UpdateState(BoundUserInterfaceState? state)
@@ -35,14 +39,7 @@ protected override void UpdateState(BoundUserInterfaceState? state)
 
     private void Update(ATMBuiState state)
     {
-        TryInitWindow();
-
-        View(ViewType.Withdraw);
-
-        RefreshUI();
-
-        if (!_window!.IsOpen)
-            _window.OpenCentered();
+        RefreshUI(state);
     }
 
     private void TryInitWindow()
@@ -50,34 +47,98 @@ private void TryInitWindow()
         if (_window != null) return;
         _window = new ATMWindow();
         _window.OnClose += Close;
-        _window.Title = "automated teller machine";
+        _window.Title = "Automated Teller Machine";
 
-        _window.WithdrawTabButton.OnPressed += _ => View(ViewType.Withdraw);
+        _window.WithdrawTabButton.OnPressed += _ =>
+        {
+            View(ViewType.Withdraw);
+            _transferRecipient = string.Empty;
+            _transferAmount = 0;
+            _window.TransferTargetInput.Text = string.Empty;
+            _window.TransferAmountInput.Text = string.Empty;
+            _window.TransferButton.Disabled = true;
+        };
 
-        _window.TransferTabButton.OnPressed += _ => View(ViewType.Transfer);
+        _window.TransferTabButton.OnPressed += _ =>
+        {
+            View(ViewType.Transfer);
+            _window.TransferButton.Disabled = string.IsNullOrWhiteSpace(_transferRecipient)
+                || _transferAmount <= 0 || _transferAmount > _currentBalance;
+        };
+
+        _window.WithdrawInput.OnTextChanged += _ =>
+            _window.WithdrawButton.Disabled = !int.TryParse(_window.WithdrawInput.Text, out _amount)
+                || _amount <= 0 || _amount > _currentBalance;
+        
+        _window.WithdrawButton.OnPressed += _ =>
+        {
+            SendMessage(new ATMWithdrawBuiMsg { Amount = _amount });
+            _window.WithdrawButton.Disabled = true;
+        };
+
+        _window.TransferAmountInput.OnTextChanged += _ =>
+        {
+            if (!int.TryParse(_window.TransferAmountInput.Text, out _transferAmount))
+                _transferAmount = 0;
+            _window.TransferButton.Disabled = string.IsNullOrWhiteSpace(_transferRecipient)
+                || _transferAmount <= 0 || _transferAmount > _currentBalance;
+        };
+
+        _window.TransferTargetInput.OnTextChanged += _ =>
+            _window.TransferButton.Disabled = string.IsNullOrWhiteSpace(_transferRecipient = _window.TransferTargetInput.Text ?? string.Empty)
+                || _transferAmount <= 0 || _transferAmount > _currentBalance;
+
+        _window.TransferButton.OnPressed += _ =>
+        {
+            if (!string.IsNullOrWhiteSpace(_transferRecipient) && _transferAmount > 0)
+            {
+                SendMessage(new ATMTransferBuiMsg
+                {
+                    Recipient = _transferRecipient.Trim(),
+                    Amount = _transferAmount
+                });
+            }
+            _transferRecipient = string.Empty;
+            _transferAmount = 0;
+            _window.TransferTargetInput.Text = string.Empty;
+            _window.TransferAmountInput.Text = string.Empty;
+            _window.TransferButton.Disabled = true;
+        };
     }
 
-    private void RefreshUI()
+    private void RefreshUI(ATMBuiState state)
     {
-        if (_window == null || State is not ATMBuiState state)
+        if (_window == null)
             return;
 
+        _currentBalance = state.Balance;
         _window.BalanceLabel.Children.Clear();
 
         var balanceMsg = new FormattedMessage();
         balanceMsg.AddMarkupOrThrow(Loc.GetString("economy-atm-ui-balance", ("balance", state.Balance)));
         _window.BalanceLabel.SetMessage(balanceMsg);
 
-        _window.WithdrawInput.OnTextChanged += _ =>
-        {
-            _window.WithdrawButton.Disabled = !int.TryParse(_window.WithdrawInput.Text, out var amount) || amount <= 0 || amount > state.Balance;
-            _amount = amount;
-        };
-        _window.WithdrawButton.OnPressed += _ =>
+        _window.TransferHelpLabel.Children.Clear();
+
+        var transferHelp = new FormattedMessage();
+        transferHelp.AddText(Loc.GetString("economy-atm-ui-transfer-help"));
+        _window.TransferHelpLabel.SetMessage(transferHelp);
+
+        if (!string.IsNullOrWhiteSpace(state.Message))
         {
-            SendMessage(new ATMWithdrawBuiMsg() { Amount = _amount });
-            Close();
-        };
+            var msg = new FormattedMessage();
+            var color = state.IsError ? "red" : "green";
+            msg.AddMarkupOrThrow($"[color={color}]");
+            msg.AddText(state.Message!);
+            msg.AddMarkupOrThrow("[/color]");
+            _window.TransferHelpLabel.SetMessage(msg);
+        }
+
+        _window.WithdrawButton.Disabled = !int.TryParse(_window.WithdrawInput.Text, out _amount)
+            || _amount <= 0 || _amount > _currentBalance;
+
+        _window.TransferButton.Disabled = string.IsNullOrWhiteSpace(_transferRecipient)
+            || _transferAmount <= 0 || _transferAmount > _currentBalance;
     }
 
     private void View(ViewType type)
@@ -103,7 +164,14 @@ protected override void Dispose(bool disposing)
     {
         base.Dispose(disposing);
 
-        if (disposing)
-            _window?.Dispose();
+        if (!disposing)
+            return;
+
+        if (_window == null)
+            return;
+
+        _window.OnClose -= Close;
+        _window.Orphan();
+        _window = null;
     }
 }
diff --git a/Content.Client/_Starlight/Economy/Atm/ATMWindow.xaml b/Content.Client/_Starlight/Economy/Atm/ATMWindow.xaml
index e26048c7e532..3c2ad6fa7134 100644
--- a/Content.Client/_Starlight/Economy/Atm/ATMWindow.xaml
+++ b/Content.Client/_Starlight/Economy/Atm/ATMWindow.xaml
@@ -17,6 +17,12 @@
                 <RichTextLabel Name="DepositLabel" Text="{Loc 'economy-atm-ui-deposit'}" HorizontalExpand="false" VerticalExpand="True"/>
             </BoxContainer>
             <BoxContainer Name="TransferTab" Access="Public" Orientation="Vertical" Visible="False">
+                <BoxContainer Orientation="Vertical">
+                    <RichTextLabel Name="TransferHelpLabel" Access="Public"/>
+                        <LineEdit Name="TransferTargetInput" Access="Public" PlaceHolder="{Loc 'economy-atm-ui-transfer-target-ph'}" MinSize="70 0" />
+                        <LineEdit Name="TransferAmountInput" Access="Public" PlaceHolder="{Loc 'economy-atm-ui-transfer-amount-ph'}" MinSize="70 0" />
+                    <Button Name="TransferButton" Access="Public" Text="Transfer" HorizontalExpand="True" StyleClasses="OpenBoth" />
+                </BoxContainer>
             </BoxContainer>
         </ScrollContainer>
     </BoxContainer>
diff --git a/Content.Client/_Starlight/MHelp/IMHelpUIHandler.cs b/Content.Client/_Starlight/MHelp/IMHelpUIHandler.cs
index c5d6182140fc..3f48a6b6e9c5 100644
--- a/Content.Client/_Starlight/MHelp/IMHelpUIHandler.cs
+++ b/Content.Client/_Starlight/MHelp/IMHelpUIHandler.cs
@@ -19,4 +19,5 @@ public interface IMHelpUIHandler : IDisposable
     public event Action<Guid?, string, bool> OnMessageSend;
     public event Action<Guid?, string> OnInputTextChanged;
     public event Action<Guid> OnTicketClosed;
+    public event Action<Guid> OnTptoPressed;
 }
diff --git a/Content.Client/_Starlight/MHelp/MHelpUIController.cs b/Content.Client/_Starlight/MHelp/MHelpUIController.cs
index 0082f2154766..e8093e90009c 100644
--- a/Content.Client/_Starlight/MHelp/MHelpUIController.cs
+++ b/Content.Client/_Starlight/MHelp/MHelpUIController.cs
@@ -131,7 +131,7 @@ private void ReceivedMentoring(object? sender, SharedMentorSystem.MHelpTextMessa
         var localPlayer = _playerManager.LocalSession;
         if (localPlayer == null)
             return;
-        if (message.PlaySound && localPlayer.UserId != message.Sender)
+        if (message.PlaySound && localPlayer.UserId != message.Sender && _config.GetCVar(StarlightCCVars.MHelpPing))
         {
             if (_mHelpSound != null)
                 _audio.PlayGlobal(_mHelpSound, Filter.Local(), false);
@@ -169,6 +169,7 @@ public void EnsureUIHelper()
         UIHelper.OnMessageSend += (ticket, textMessage, playSound) => _mentorSystem?.Send(ticket,  textMessage, playSound);
         UIHelper.OnInputTextChanged += (ticket, text) => _mentorSystem?.SendInputTextUpdated(ticket,  text.Length > 0);
         UIHelper.OnTicketClosed += ticket => _mentorSystem?.SendCloseTicket(ticket);
+        UIHelper.OnTptoPressed += ticket => _mentorSystem?.SentTpto(ticket);
         UIHelper.OnClose += () => SetMHelpPressed(false);
         UIHelper.OnOpen += () => SetMHelpPressed(true);
         SetMHelpPressed(UIHelper.IsOpen);
diff --git a/Content.Client/_Starlight/MHelp/MentorMHelpUIHandler.cs b/Content.Client/_Starlight/MHelp/MentorMHelpUIHandler.cs
index bde3310c4d64..86e498f3b867 100644
--- a/Content.Client/_Starlight/MHelp/MentorMHelpUIHandler.cs
+++ b/Content.Client/_Starlight/MHelp/MentorMHelpUIHandler.cs
@@ -25,10 +25,11 @@ public sealed class MentorMHelpUIHandler(NetUserId owner) : IMHelpUIHandler
     public event Action<Guid?, string> OnInputTextChanged = delegate { };
     public event Action<Guid?, string, bool> OnMessageSend = delegate { };
     public event Action<Guid> OnTicketClosed = delegate { };
+    public event Action<Guid> OnTptoPressed = delegate { };
 
     public void Receive(SharedMentorSystem.MHelpTextMessage message)
     {
-        if(message.Ticket is null)
+        if (message.Ticket is null)
             return;
         var panel = EnsurePanel(message.Ticket.Value);
         panel.ReceiveLine(message);
@@ -140,6 +141,8 @@ public MhelpPanel EnsurePanel(Guid ticketId, bool closed = false)
         existingPanel.OnMessageSend += text => OnMessageSend?.Invoke(ticketId, text, Window?.MHelpControl.PlaySound.Pressed ?? true);
         existingPanel.OnInputTextChanged += text => OnInputTextChanged?.Invoke(ticketId, text);
         existingPanel.OnTicketClosed += () => OnTicketClosed.Invoke(ticketId);
+        existingPanel.OnTptoPressed += () => OnTptoPressed.Invoke(ticketId);
+        existingPanel.ShowTpto = IsMentor;
         existingPanel.Visible = false;
         if (!Control!.MhelpArea.Children.Contains(existingPanel))
             Control.MhelpArea.AddChild(existingPanel);
diff --git a/Content.Client/_Starlight/MHelp/MentorSystem.cs b/Content.Client/_Starlight/MHelp/MentorSystem.cs
index 32df3b99ca3a..3958a001cf4b 100644
--- a/Content.Client/_Starlight/MHelp/MentorSystem.cs
+++ b/Content.Client/_Starlight/MHelp/MentorSystem.cs
@@ -51,4 +51,10 @@ internal void SendCloseTicket(Guid ticket)
         {
             Ticket = ticket,
         });
+
+    internal void SentTpto(Guid ticket)
+        => RaiseNetworkEvent(new MhelpTptoTicket
+        {
+            Ticket = ticket,
+        });
 }
diff --git a/Content.Client/_Starlight/MHelp/UI/MhelpControl.xaml b/Content.Client/_Starlight/MHelp/UI/MhelpControl.xaml
index 37f199f35322..420a28716125 100644
--- a/Content.Client/_Starlight/MHelp/UI/MhelpControl.xaml
+++ b/Content.Client/_Starlight/MHelp/UI/MhelpControl.xaml
@@ -8,6 +8,7 @@
                 <BoxContainer Access="Public" Name="MhelpArea" VerticalExpand="True" />
                 <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
                     <CheckBox Visible="True" Name="PlaySound" Access="Public" Text="{Loc 'mentor-play-sound'}" Pressed="True" />
+                    <CheckBox Visible="True" Name="PingSound" Access="Public" Text="{Loc 'mentor-send-ping'}" Pressed="False" />
                     <Control HorizontalExpand="True" MinWidth="5" />
                 </BoxContainer>
             </BoxContainer>
diff --git a/Content.Client/_Starlight/MHelp/UI/MhelpControl.xaml.cs b/Content.Client/_Starlight/MHelp/UI/MhelpControl.xaml.cs
index 0c1aa64f8ddb..bda73e3e0c6b 100644
--- a/Content.Client/_Starlight/MHelp/UI/MhelpControl.xaml.cs
+++ b/Content.Client/_Starlight/MHelp/UI/MhelpControl.xaml.cs
@@ -1,8 +1,10 @@
 using Content.Client.Administration.Managers;
 using Content.Client.UserInterface.Systems.Bwoink;
+using Content.Shared.Starlight.CCVar;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Configuration;
 
 namespace Content.Client._Starlight.MHelp.UI;
 
@@ -11,6 +13,7 @@ public sealed partial class MhelpControl : Control
 {
     [Dependency] private readonly IClientAdminManager _adminManager = default!;
     [Dependency] private readonly IUserInterfaceManager _ui = default!;
+    [Dependency] private readonly IConfigurationManager _config = default!;
     public MentorMHelpUIHandler MHelpHelper = default!;
 
     private Guid? _currentTicket;
@@ -60,6 +63,13 @@ public MhelpControl()
             // Finally, sort by the most recent message.
             return bch.LastMessage.CompareTo(ach.LastMessage);
         };
+
+        PingSound.Pressed = _config.GetCVar(StarlightCCVars.MHelpPing);
+        PingSound.OnPressed += sound =>
+        {
+            _config.SetCVar(StarlightCCVars.MHelpPing, sound.Button.Pressed);
+        };
+        _config.OnValueChanged(StarlightCCVars.MHelpPing, v => PingSound.Pressed = v);
     }
 
     public void SelectTicket(Guid ticketId)
diff --git a/Content.Client/_Starlight/MHelp/UI/MhelpPanel.xaml b/Content.Client/_Starlight/MHelp/UI/MhelpPanel.xaml
index 8121c41d0396..cc60fcdecfb5 100644
--- a/Content.Client/_Starlight/MHelp/UI/MhelpPanel.xaml
+++ b/Content.Client/_Starlight/MHelp/UI/MhelpPanel.xaml
@@ -6,6 +6,7 @@
     <OutputPanel Name="TextOutput" VerticalExpand="true" />
     <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
         <Button Visible="False" Name="CloseTicket" Access="Public" Text="{Loc 'mentor-close-ticket'}" StyleClasses="OpenBoth" HorizontalAlignment="Left" />
+        <Button Visible="False" Name="TptoTicket" Access="Public" Text="{Loc 'mentor-tpto'}" StyleClasses="OpenBoth" HorizontalAlignment="Right" />
         <RichTextLabel Name="TypingIndicator" Access="Public" />
     </BoxContainer>
     <HistoryLineEdit Name="SenderLineEdit" />
diff --git a/Content.Client/_Starlight/MHelp/UI/MhelpPanel.xaml.cs b/Content.Client/_Starlight/MHelp/UI/MhelpPanel.xaml.cs
index e7177578392d..1e78e0a14cf8 100644
--- a/Content.Client/_Starlight/MHelp/UI/MhelpPanel.xaml.cs
+++ b/Content.Client/_Starlight/MHelp/UI/MhelpPanel.xaml.cs
@@ -15,9 +15,11 @@ public sealed partial class MhelpPanel : BoxContainer
     public int Unread { get; private set; } = 0;
     public DateTime LastMessage { get; private set; } = DateTime.MinValue;
     private List<string> PeopleTyping { get; set; } = [];
+    public bool ShowTpto = false;
     public event Action<string> OnInputTextChanged = delegate { };
     public event Action<string> OnMessageSend = delegate { };
     public event Action OnTicketClosed = delegate { };
+    public event Action OnTptoPressed = delegate { };
 
     public MhelpPanel()
     {
@@ -31,6 +33,7 @@ public MhelpPanel()
         SenderLineEdit.OnTextEntered += Input_OnTextEntered;
         SenderLineEdit.OnTextChanged += Input_OnTextChanged;
         CloseTicket.OnPressed += _ => OnTicketClosed.Invoke();
+        TptoTicket.OnPressed += _ => OnTptoPressed.Invoke();
         UpdateTypingIndicator();
     }
 
@@ -53,6 +56,7 @@ public void ReceiveLine(SharedMentorSystem.MHelpTextMessage message)
         if (!Visible)
             Unread++;
         CloseTicket.Visible = message.Ticket is not null && !message.TicketClosed;
+        TptoTicket.Visible = CloseTicket.Visible && ShowTpto;
         var formatted = new FormattedMessage(1);
         formatted.AddMarkupOrThrow(message.Text);
         LastMessage = message.CreateAt;
diff --git a/Content.Client/_Starlight/MHelp/UserMHelpUIHandler.cs b/Content.Client/_Starlight/MHelp/UserMHelpUIHandler.cs
index af899454bb4c..d18bdf9d1450 100644
--- a/Content.Client/_Starlight/MHelp/UserMHelpUIHandler.cs
+++ b/Content.Client/_Starlight/MHelp/UserMHelpUIHandler.cs
@@ -44,6 +44,7 @@ public void PeopleTypingUpdated(MHelpTypingUpdated args)
     public event Action<Guid?, string, bool> OnMessageSend = delegate { };
     public event Action<Guid?, string> OnInputTextChanged = delegate { };
     public event Action<Guid> OnTicketClosed = delegate { };
+    public event Action<Guid> OnTptoPressed = delegate { };
 
     public void Open(NetUserId channelId)
     {
@@ -63,6 +64,13 @@ private void EnsureInit()
             if (_currentTicket.HasValue)
                 OnTicketClosed.Invoke(_currentTicket.Value);
         };
+        //In-theory it shouldn't be possible to call this
+        //But debugging.
+        _chatPanel.OnTptoPressed += () =>
+        {
+            if (_currentTicket.HasValue)
+                OnTptoPressed.Invoke(_currentTicket.Value);
+        };
         _window = new DefaultWindow()
         {
             TitleClass = "windowTitleAlert",
@@ -73,6 +81,7 @@ private void EnsureInit()
         _window.OnClose += () => OnClose?.Invoke();
         _window.OnOpen += () => OnOpen?.Invoke();
         _window.Contents.AddChild(_chatPanel);
+        _chatPanel.ShowTpto = IsMentor;
     }
 
     public void Dispose()
diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs
index d78d58f80c5d..1222096e0193 100644
--- a/Content.IntegrationTests/Tests/EntityTest.cs
+++ b/Content.IntegrationTests/Tests/EntityTest.cs
@@ -56,7 +56,7 @@ await server.WaitPost(() =>
                 }
             });
 
-            await server.WaitRunTicks(15);
+            await server.WaitRunTicks(450); // 15 seconds, enough to trigger most update loops
 
             await server.WaitPost(() =>
             {
@@ -112,7 +112,7 @@ await server.WaitPost(() =>
                     entityMan.SpawnEntity(protoId, map.GridCoords);
                 }
             });
-            await server.WaitRunTicks(15);
+            await server.WaitRunTicks(450); // 15 seconds, enough to trigger most update loops
             await server.WaitPost(() =>
             {
                 static IEnumerable<(EntityUid, TComp)> Query<TComp>(IEntityManager entityMan)
@@ -270,7 +270,7 @@ await server.WaitPost(() =>
             await pair.RunTicksSync(3);
 
             // We consider only non-audio entities, as some entities will just play sounds when they spawn.
-            int Count(IEntityManager ent) =>  ent.EntityCount - ent.Count<AudioComponent>();
+            int Count(IEntityManager ent) => ent.EntityCount - ent.Count<AudioComponent>();
             IEnumerable<EntityUid> Entities(IEntityManager entMan) => entMan.GetEntities().Where(entMan.HasComponent<AudioComponent>);
 
             await Assert.MultipleAsync(async () =>
diff --git a/Content.IntegrationTests/Tests/InventoryHelpersTest.cs b/Content.IntegrationTests/Tests/InventoryHelpersTest.cs
index 4a07177f77ae..39761ad0898b 100644
--- a/Content.IntegrationTests/Tests/InventoryHelpersTest.cs
+++ b/Content.IntegrationTests/Tests/InventoryHelpersTest.cs
@@ -1,4 +1,4 @@
-using Content.Server.Stunnable;
+using Content.Server.Stunnable;
 using Content.Shared.Inventory;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -17,9 +17,7 @@ public sealed class InventoryHelpersTest
   components:
   - type: Inventory
   - type: ContainerContainer
-  - type: StatusEffects
-    allowed:
-    - Stun
+  - type: MobState
 
 - type: entity
   name: InventoryJumpsuitJanitorDummy
@@ -70,7 +68,7 @@ await server.WaitAssertion(() =>
                 });
 #pragma warning restore NUnit2045
 
-                systemMan.GetEntitySystem<StunSystem>().TryStun(human, TimeSpan.FromSeconds(1f), true);
+                systemMan.GetEntitySystem<StunSystem>().TryUpdateStunDuration(human, TimeSpan.FromSeconds(1f));
 
 #pragma warning disable NUnit2045
                 // Since the mob is stunned, they can't equip this.
diff --git a/Content.IntegrationTests/Tests/Minds/MindTests.cs b/Content.IntegrationTests/Tests/Minds/MindTests.cs
index 60e98b69fe25..48e11e464807 100644
--- a/Content.IntegrationTests/Tests/Minds/MindTests.cs
+++ b/Content.IntegrationTests/Tests/Minds/MindTests.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using Content.Server.Ghost.Roles;
 using Content.Server.Ghost.Roles.Components;
-using Content.Server.Mind.Commands;
+using Content.Server.Mind;
 using Content.Server.Roles;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
@@ -339,7 +339,7 @@ public async Task TestPlayerCanGhost()
         var entMan = server.ResolveDependency<IServerEntityManager>();
         var playerMan = server.ResolveDependency<IPlayerManager>();
 
-        var mindSystem = entMan.EntitySysManager.GetEntitySystem<SharedMindSystem>();
+        var mindSystem = entMan.EntitySysManager.GetEntitySystem<MindSystem>();
 
         EntityUid entity = default!;
         EntityUid mindId = default!;
@@ -379,7 +379,7 @@ await server.WaitAssertion(() =>
 
             mob = entMan.SpawnEntity(null, new MapCoordinates());
 
-            MakeSentientCommand.MakeSentient(mob, entMan);
+            mindSystem.MakeSentient(mob);
             mobMindId = mindSystem.CreateMind(player.UserId, "Mindy McThinker the Second");
             mobMind = entMan.GetComponent<MindComponent>(mobMindId);
 
diff --git a/Content.IntegrationTests/Tests/RoundEndTest.cs b/Content.IntegrationTests/Tests/RoundEndTest.cs
index 697808564067..5de6de381de3 100644
--- a/Content.IntegrationTests/Tests/RoundEndTest.cs
+++ b/Content.IntegrationTests/Tests/RoundEndTest.cs
@@ -1,4 +1,3 @@
-using System.Threading;
 using Content.Server.GameTicking;
 using Content.Server.RoundEnd;
 using Content.Shared.CCVar;
@@ -22,7 +21,7 @@ public override void Initialize()
 
             private void OnRoundEnd(RoundEndSystemChangedEvent ev)
             {
-                Interlocked.Increment(ref RoundCount);
+                RoundCount += 1;
             }
         }
 
@@ -127,13 +126,17 @@ Task CheckRunLevel(GameRunLevel level)
 
             async Task WaitForEvent()
             {
-                var timeout = Task.Delay(TimeSpan.FromSeconds(10));
-                var currentCount = Thread.VolatileRead(ref sys.RoundCount);
-                while (currentCount == Thread.VolatileRead(ref sys.RoundCount) && !timeout.IsCompleted)
+                const int maxTicks = 60;
+                var currentCount = sys.RoundCount;
+                for (var i = 0; i < maxTicks; i++)
                 {
-                    await pair.RunTicksSync(5);
+                    if (currentCount != sys.RoundCount)
+                        return;
+
+                    await pair.RunTicksSync(1);
                 }
-                if (timeout.IsCompleted) throw new TimeoutException("Event took too long to trigger");
+
+                throw new TimeoutException("Event took too long to trigger");
             }
 
             // Need to clean self up
diff --git a/Content.IntegrationTests/Tests/SmartFridge/SmartFridgeInteractionTest.cs b/Content.IntegrationTests/Tests/SmartFridge/SmartFridgeInteractionTest.cs
new file mode 100644
index 000000000000..aa2ebef606bd
--- /dev/null
+++ b/Content.IntegrationTests/Tests/SmartFridge/SmartFridgeInteractionTest.cs
@@ -0,0 +1,111 @@
+using Content.IntegrationTests.Tests.Interaction;
+using Content.Shared.SmartFridge;
+
+namespace Content.IntegrationTests.Tests.SmartFridge;
+
+public sealed class SmartFridgeInteractionTest : InteractionTest
+{
+    private const string SmartFridgeProtoId = "SmartFridge";
+    private const string SampleItemProtoId = "FoodAmbrosiaVulgaris";
+    private const string SampleDumpableAndInsertableId = "PillCanisterSomething";
+    private const int SampleDumpableCount = 5;
+    private const string SampleDumpableId = "ChemBagSomething";
+
+    [TestPrototypes]
+    private const string TestPrototypes = $@"
+- type: entity
+  parent: PillCanister
+  id: {SampleDumpableAndInsertableId}
+  components:
+  - type: StorageFill
+    contents:
+    - id: PillCopper
+      amount: 5
+
+- type: entity
+  parent: ChemBag
+  id: {SampleDumpableId}
+  components:
+  - type: StorageFill
+    contents:
+    - id: PillCopper
+      amount: 5
+";
+
+    [Test]
+    public async Task InsertAndDispenseItemTest()
+    {
+        await PlaceInHands(SampleItemProtoId);
+
+        await SpawnTarget(SmartFridgeProtoId);
+        var fridge = SEntMan.GetEntity(Target.Value);
+        var component = SEntMan.GetComponent<SmartFridgeComponent>(fridge);
+
+        await SpawnEntity("APCBasic", SEntMan.GetCoordinates(TargetCoords));
+        await RunTicks(1);
+
+        // smartfridge spawns with nothing
+        Assert.That(component.Entries, Is.Empty);
+        await InteractUsing(SampleItemProtoId);
+
+        // smartfridge now has items
+        Assert.That(component.Entries, Is.Not.Empty);
+        Assert.That(component.ContainedEntries[component.Entries[0]], Is.Not.Empty);
+
+        // open the UI
+        await Activate();
+        Assert.That(IsUiOpen(SmartFridgeUiKey.Key));
+
+        // dispense an item
+        await SendBui(SmartFridgeUiKey.Key, new SmartFridgeDispenseItemMessage(component.Entries[0]));
+
+        // assert that the listing is still there
+        Assert.That(component.Entries, Is.Not.Empty);
+        // but empty
+        Assert.That(component.ContainedEntries[component.Entries[0]], Is.Empty);
+
+        // and that the thing we dispensed is actually around
+        await AssertEntityLookup(
+            ("APCBasic", 1),
+            (SampleItemProtoId, 1)
+        );
+    }
+
+    [Test]
+    public async Task InsertDumpableInsertableItemTest()
+    {
+        await PlaceInHands(SampleItemProtoId);
+
+        await SpawnTarget(SmartFridgeProtoId);
+        var fridge = SEntMan.GetEntity(Target.Value);
+        var component = SEntMan.GetComponent<SmartFridgeComponent>(fridge);
+
+        await SpawnEntity("APCBasic", SEntMan.GetCoordinates(TargetCoords));
+        await RunTicks(1);
+
+        await InteractUsing(SampleDumpableAndInsertableId);
+
+        // smartfridge now has one item only
+        Assert.That(component.Entries, Is.Not.Empty);
+        Assert.That(component.ContainedEntries[component.Entries[0]].Count, Is.EqualTo(1));
+    }
+
+    [Test]
+    public async Task InsertDumpableItemTest()
+    {
+        await PlaceInHands(SampleItemProtoId);
+
+        await SpawnTarget(SmartFridgeProtoId);
+        var fridge = SEntMan.GetEntity(Target.Value);
+        var component = SEntMan.GetComponent<SmartFridgeComponent>(fridge);
+
+        await SpawnEntity("APCBasic", SEntMan.GetCoordinates(TargetCoords));
+        await RunTicks(1);
+
+        await InteractUsing(SampleDumpableId);
+
+        // smartfridge now has N items
+        Assert.That(component.Entries, Is.Not.Empty);
+        Assert.That(component.ContainedEntries[component.Entries[0]].Count, Is.EqualTo(SampleDumpableCount));
+    }
+}
diff --git a/Content.Server/Abilities/Mime/MimePowersComponent.cs b/Content.Server/Abilities/Mime/MimePowersComponent.cs
deleted file mode 100644
index 24ffe5d02341..000000000000
--- a/Content.Server/Abilities/Mime/MimePowersComponent.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using Content.Shared.Alert;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Server.Abilities.Mime
-{
-    /// <summary>
-    /// Lets its owner entity use mime powers, like placing invisible walls.
-    /// </summary>
-    [RegisterComponent]
-    public sealed partial class MimePowersComponent : Component
-    {
-        /// <summary>
-        /// Whether this component is active or not.
-        /// </summarY>
-        [DataField("enabled")]
-        public bool Enabled = true;
-
-        /// <summary>
-        /// The wall prototype to use.
-        /// </summary>
-        [DataField("wallPrototype", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-        public string WallPrototype = "WallInvisible";
-
-        [DataField("invisibleWallAction", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-        public string? InvisibleWallAction = "ActionMimeInvisibleWall";
-
-        [DataField("invisibleWallActionEntity")] public EntityUid? InvisibleWallActionEntity;
-
-        // The vow zone lies below
-        public bool VowBroken = false;
-
-        /// <summary>
-        /// Whether this mime is ready to take the vow again.
-        /// Note that if they already have the vow, this is also false.
-        /// </summary>
-        public bool ReadyToRepent = false;
-
-        /// <summary>
-        /// Time when the mime can repent their vow
-        /// </summary>
-        [DataField("vowRepentTime", customTypeSerializer: typeof(TimeOffsetSerializer))]
-        public TimeSpan VowRepentTime = TimeSpan.Zero;
-
-        /// <summary>
-        /// How long it takes the mime to get their powers back
-        /// </summary>
-        [DataField("vowCooldown")]
-        public TimeSpan VowCooldown = TimeSpan.FromMinutes(5);
-
-        [DataField]
-        public ProtoId<AlertPrototype> VowAlert = "VowOfSilence";
-
-        [DataField]
-        public ProtoId<AlertPrototype> VowBrokenAlert = "VowBroken";
-
-        /// <summary>
-        /// Does this component prevent the mime from writing on paper while their vow is active?
-        /// </summary>
-        [DataField]
-        public bool PreventWriting = false;
-
-        /// <summary>
-        /// What message is displayed when the mime fails to write?
-        /// </summary>
-        [DataField]
-        public LocId FailWriteMessage = "paper-component-illiterate-mime";
-    }
-}
diff --git a/Content.Server/Abilities/Mime/MimePowersSystem.cs b/Content.Server/Abilities/Mime/MimePowersSystem.cs
deleted file mode 100644
index 29c7b1710c25..000000000000
--- a/Content.Server/Abilities/Mime/MimePowersSystem.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-using Content.Server.Popups;
-using Content.Shared.Abilities.Mime;
-using Content.Shared.Actions;
-using Content.Shared.Actions.Events;
-using Content.Shared.Alert;
-using Content.Shared.Coordinates.Helpers;
-using Content.Shared.Maps;
-using Content.Shared.Paper;
-using Content.Shared.Physics;
-using Robust.Shared.Containers;
-using Robust.Shared.Map;
-using Robust.Shared.Timing;
-using Content.Shared.Speech.Muting;
-
-namespace Content.Server.Abilities.Mime
-{
-    public sealed class MimePowersSystem : EntitySystem
-    {
-        [Dependency] private readonly PopupSystem _popupSystem = default!;
-        [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
-        [Dependency] private readonly AlertsSystem _alertsSystem = default!;
-        [Dependency] private readonly TurfSystem _turf = default!;
-        [Dependency] private readonly IMapManager _mapMan = default!;
-        [Dependency] private readonly SharedContainerSystem _container = default!;
-        [Dependency] private readonly IGameTiming _timing = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<MimePowersComponent, ComponentInit>(OnComponentInit);
-            SubscribeLocalEvent<MimePowersComponent, InvisibleWallActionEvent>(OnInvisibleWall);
-
-            SubscribeLocalEvent<MimePowersComponent, BreakVowAlertEvent>(OnBreakVowAlert);
-            SubscribeLocalEvent<MimePowersComponent, RetakeVowAlertEvent>(OnRetakeVowAlert);
-        }
-
-        public override void Update(float frameTime)
-        {
-            base.Update(frameTime);
-            // Queue to track whether mimes can retake vows yet
-
-            var query = EntityQueryEnumerator<MimePowersComponent>();
-            while (query.MoveNext(out var uid, out var mime))
-            {
-                if (!mime.VowBroken || mime.ReadyToRepent)
-                    continue;
-
-                if (_timing.CurTime < mime.VowRepentTime)
-                    continue;
-
-                mime.ReadyToRepent = true;
-                _popupSystem.PopupEntity(Loc.GetString("mime-ready-to-repent"), uid, uid);
-            }
-        }
-
-        private void OnComponentInit(EntityUid uid, MimePowersComponent component, ComponentInit args)
-        {
-            EnsureComp<MutedComponent>(uid);
-            if (component.PreventWriting)
-            {
-                EnsureComp<BlockWritingComponent>(uid, out var illiterateComponent);
-                illiterateComponent.FailWriteMessage = component.FailWriteMessage;
-                Dirty(uid, illiterateComponent);
-            }
-
-            _alertsSystem.ShowAlert(uid, component.VowAlert);
-            _actionsSystem.AddAction(uid, ref component.InvisibleWallActionEntity, component.InvisibleWallAction, uid);
-        }
-
-        /// <summary>
-        /// Creates an invisible wall in a free space after some checks.
-        /// </summary>
-        private void OnInvisibleWall(EntityUid uid, MimePowersComponent component, InvisibleWallActionEvent args)
-        {
-            if (!component.Enabled)
-                return;
-
-            if (_container.IsEntityOrParentInContainer(uid))
-                return;
-
-            var xform = Transform(uid);
-            // Get the tile in front of the mime
-            var offsetValue = xform.LocalRotation.ToWorldVec();
-            var coords = xform.Coordinates.Offset(offsetValue).SnapToGrid(EntityManager, _mapMan);
-            var tile = _turf.GetTileRef(coords);
-            if (tile == null)
-                return;
-
-            // Check if the tile is blocked by a wall or mob, and don't create the wall if so
-            if (_turf.IsTileBlocked(tile.Value, CollisionGroup.Impassable | CollisionGroup.Opaque))
-            {
-                _popupSystem.PopupEntity(Loc.GetString("mime-invisible-wall-failed"), uid, uid);
-                return;
-            }
-
-            _popupSystem.PopupEntity(Loc.GetString("mime-invisible-wall-popup", ("mime", uid)), uid);
-            // Make sure we set the invisible wall to despawn properly
-            Spawn(component.WallPrototype, _turf.GetTileCenter(tile.Value));
-            // Handle args so cooldown works
-            args.Handled = true;
-        }
-
-        private void OnBreakVowAlert(Entity<MimePowersComponent> ent, ref BreakVowAlertEvent args)
-        {
-            if (args.Handled)
-                return;
-            BreakVow(ent, ent);
-            args.Handled = true;
-        }
-
-        private void OnRetakeVowAlert(Entity<MimePowersComponent> ent, ref RetakeVowAlertEvent args)
-        {
-            if (args.Handled)
-                return;
-            RetakeVow(ent, ent);
-            args.Handled = true;
-        }
-
-        /// <summary>
-        /// Break this mime's vow to not speak.
-        /// </summary>
-        public void BreakVow(EntityUid uid, MimePowersComponent? mimePowers = null)
-        {
-            if (!Resolve(uid, ref mimePowers))
-                return;
-
-            if (mimePowers.VowBroken)
-                return;
-
-            mimePowers.Enabled = false;
-            mimePowers.VowBroken = true;
-            mimePowers.VowRepentTime = _timing.CurTime + mimePowers.VowCooldown;
-            RemComp<MutedComponent>(uid);
-            if (mimePowers.PreventWriting)
-                RemComp<BlockWritingComponent>(uid);
-            _alertsSystem.ClearAlert(uid, mimePowers.VowAlert);
-            _alertsSystem.ShowAlert(uid, mimePowers.VowBrokenAlert);
-            _actionsSystem.RemoveAction(uid, mimePowers.InvisibleWallActionEntity);
-        }
-
-        /// <summary>
-        /// Retake this mime's vow to not speak.
-        /// </summary>
-        public void RetakeVow(EntityUid uid, MimePowersComponent? mimePowers = null)
-        {
-            if (!Resolve(uid, ref mimePowers))
-                return;
-
-            if (!mimePowers.ReadyToRepent)
-            {
-                _popupSystem.PopupEntity(Loc.GetString("mime-not-ready-repent"), uid, uid);
-                return;
-            }
-
-            mimePowers.Enabled = true;
-            mimePowers.ReadyToRepent = false;
-            mimePowers.VowBroken = false;
-            AddComp<MutedComponent>(uid);
-            if (mimePowers.PreventWriting)
-            {
-                EnsureComp<BlockWritingComponent>(uid, out var illiterateComponent);
-                illiterateComponent.FailWriteMessage = mimePowers.FailWriteMessage;
-                Dirty(uid, illiterateComponent);
-            }
-
-            _alertsSystem.ClearAlert(uid, mimePowers.VowBrokenAlert);
-            _alertsSystem.ShowAlert(uid, mimePowers.VowAlert);
-            _actionsSystem.AddAction(uid, ref mimePowers.InvisibleWallActionEntity, mimePowers.InvisibleWallAction, uid);
-        }
-    }
-}
diff --git a/Content.Server/Access/AccessWireAction.cs b/Content.Server/Access/AccessWireAction.cs
index 2682fff286d5..3b84bbcc0114 100644
--- a/Content.Server/Access/AccessWireAction.cs
+++ b/Content.Server/Access/AccessWireAction.cs
@@ -3,6 +3,8 @@
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
 using Content.Shared.Wires;
+using Content.Server.Electrocution; // Starlight-edit
+using Content.Shared.Electrocution; // Starlight-edit
 
 namespace Content.Server.Access;
 
@@ -13,7 +15,12 @@ public sealed partial class AccessWireAction : ComponentWireAction<AccessReaderC
 
     [DataField("pulseTimeout")]
     private int _pulseTimeout = 30;
-
+    
+    [DataField("electrify")]
+    private bool _electrify = false; // Starlight-edit
+    
+    private ElectrocutionSystem _electrocution = default!; // Starlight-edit
+    
     public override StatusLightState? GetLightState(Wire wire, AccessReaderComponent comp)
     {
         return comp.Enabled ? StatusLightState.On : StatusLightState.Off;
@@ -23,6 +30,9 @@ public sealed partial class AccessWireAction : ComponentWireAction<AccessReaderC
 
     public override bool Cut(EntityUid user, Wire wire, AccessReaderComponent comp)
     {
+        if (!TrySetElectrocution(user, wire)) // Starlight-edit
+            return false;
+        
         WiresSystem.TryCancelWireAction(wire.Owner, PulseTimeoutKey.Key);
         EntityManager.System<AccessReaderSystem>().SetActive((wire.Owner, comp), false);
 
@@ -31,6 +41,9 @@ public override bool Cut(EntityUid user, Wire wire, AccessReaderComponent comp)
 
     public override bool Mend(EntityUid user, Wire wire, AccessReaderComponent comp)
     {
+        if (!TrySetElectrocution(user, wire)) // Starlight-edit
+            return false;
+        
         EntityManager.System<AccessReaderSystem>().SetActive((wire.Owner, comp), true);
 
         return true;
@@ -38,6 +51,7 @@ public override bool Mend(EntityUid user, Wire wire, AccessReaderComponent comp)
 
     public override void Pulse(EntityUid user, Wire wire, AccessReaderComponent comp)
     {
+        var electrified = TrySetElectrocution(user, wire, true); // Starlight-edit
         EntityManager.System<AccessReaderSystem>().SetActive((wire.Owner, comp), false);
         WiresSystem.StartWireAction(wire.Owner, _pulseTimeout, PulseTimeoutKey.Key, new TimedWireEvent(AwaitPulseCancel, wire));
     }
@@ -49,6 +63,28 @@ public override void Update(Wire wire)
             WiresSystem.TryCancelWireAction(wire.Owner, PulseTimeoutKey.Key);
         }
     }
+    
+    // Starlight-start: access wire electrify
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _electrocution = EntityManager.System<ElectrocutionSystem>();
+    }
+    
+    /// <returns>false if failed, true otherwise, or if the entity cannot be electrified</returns>
+    private bool TrySetElectrocution(EntityUid user, Wire wire, bool timed = false)
+    {
+        if (!EntityManager.TryGetComponent<ElectrifiedComponent>(wire.Owner, out var electrified) || !_electrify)
+            return true;
+
+        var electrifiedAttempt = _electrocution.TryDoElectrifiedAct(wire.Owner, user);
+
+        // if we were electrified, then return false
+        return !electrifiedAttempt;
+
+    }
+    // Starlight-end
 
     private void AwaitPulseCancel(Wire wire)
     {
diff --git a/Content.Server/Administration/Commands/CameraCommand.cs b/Content.Server/Administration/Commands/CameraCommand.cs
new file mode 100644
index 000000000000..25837ac7093b
--- /dev/null
+++ b/Content.Server/Administration/Commands/CameraCommand.cs
@@ -0,0 +1,58 @@
+using Content.Server.Administration.UI;
+using Content.Server.EUI;
+using Content.Shared.Administration;
+using Robust.Server.Player;
+using Robust.Shared.Console;
+
+namespace Content.Server.Administration.Commands;
+
+[AdminCommand(AdminFlags.Admin)]
+public sealed class CameraCommand : LocalizedCommands
+{
+    [Dependency] private readonly EuiManager _eui = default!;
+    [Dependency] private readonly IEntityManager _entManager = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+
+    public override string Command => "camera";
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        if (shell.Player is not { } user)
+        {
+            shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server"));
+            return;
+        }
+
+        if (args.Length != 1)
+        {
+            shell.WriteError(Loc.GetString("shell-wrong-arguments-number"));
+            return;
+        }
+
+        if (!NetEntity.TryParse(args[0], out var targetNetId) || !_entManager.TryGetEntity(targetNetId, out var targetUid))
+        {
+            if (!_playerManager.TryGetSessionByUsername(args[0], out var player)
+                || player.AttachedEntity == null)
+            {
+                shell.WriteError(Loc.GetString("cmd-camera-wrong-argument"));
+                return;
+            }
+            targetUid = player.AttachedEntity.Value;
+        }
+
+        var ui = new AdminCameraEui(targetUid.Value);
+        _eui.OpenEui(ui, user);
+    }
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    {
+        if (args.Length == 1)
+        {
+            return CompletionResult.FromHintOptions(
+                CompletionHelper.SessionNames(players: _playerManager),
+                Loc.GetString("cmd-camera-hint"));
+        }
+
+        return CompletionResult.Empty;
+    }
+}
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
index 94ffb20a52dc..b1721c9d807f 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
@@ -577,7 +577,8 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
 
                 Act = () =>
                 {
-                    EnsureComp<CluwneComponent>(args.Target);
+                    var cluwne = EnsureComp<CluwneComponent>(args.Target); //Starlight
+                    cluwne.Unremovable = true; //Starlight
                 },
                 Impact = LogImpact.Extreme,
                 Message = string.Join(": ", cluwneName, Loc.GetString("admin-smite-cluwne-description"))
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.cs b/Content.Server/Administration/Systems/AdminVerbSystem.cs
index 439bda451b4c..592c10ba2564 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.cs
@@ -6,7 +6,6 @@
 using Content.Server.EUI;
 using Content.Server.Ghost.Roles;
 using Content.Server.Mind;
-using Content.Server.Mind.Commands;
 using Content.Server.Prayer;
 using Content.Server.Preferences.Managers;
 using Content.Server.Silicons.Laws;
@@ -400,6 +399,22 @@ private void AddAdminVerbs(GetVerbsEvent<Verb> args)
                         Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/Interface/Actions/actions_borg.rsi"), "state-laws"),
                     });
                 }
+
+                // open camera
+                args.Verbs.Add(new Verb()
+                {
+                    Priority = 10,
+                    Text = Loc.GetString("admin-verbs-camera"),
+                    Message = Loc.GetString("admin-verbs-camera-description"),
+                    Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/vv.svg.192dpi.png")),
+                    Category = VerbCategory.Admin,
+                    Act = () =>
+                    {
+                        var ui = new AdminCameraEui(args.Target);
+                        _euiManager.OpenEui(ui, player);
+                    },
+                    Impact = LogImpact.Low
+                });
             }
         }
 
@@ -467,8 +482,8 @@ private void AddDebugVerbs(GetVerbsEvent<Verb> args)
                 {
                     Text = Loc.GetString("make-sentient-verb-get-data-text"),
                     Category = VerbCategory.Debug,
-                    Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/sentient.svg.192dpi.png")),
-                    Act = () => MakeSentientCommand.MakeSentient(args.Target, EntityManager),
+                    Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/sentient.svg.192dpi.png")),
+                    Act = () => _mindSystem.MakeSentient(args.Target),
                     Impact = LogImpact.Medium
                 };
                 args.Verbs.Add(verb);
diff --git a/Content.Server/Administration/UI/AdminCameraEui.cs b/Content.Server/Administration/UI/AdminCameraEui.cs
new file mode 100644
index 000000000000..5230933c829c
--- /dev/null
+++ b/Content.Server/Administration/UI/AdminCameraEui.cs
@@ -0,0 +1,97 @@
+using Content.Server.Administration.Managers;
+using Content.Server.EUI;
+using Content.Shared.Administration;
+using Content.Shared.Eui;
+using Content.Shared.Follower;
+using Content.Shared.Coordinates;
+using Robust.Server.GameStates;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+using JetBrains.Annotations;
+
+namespace Content.Server.Administration.UI;
+
+/// <summary>
+/// Admin Eui for opening a viewport window to observe entities.
+/// Use the "Open Camera" admin verb or the "camera" command to open.
+/// </summary>
+[UsedImplicitly]
+public sealed partial class AdminCameraEui : BaseEui
+{
+    [Dependency] private readonly IAdminManager _admin = default!;
+    [Dependency] private readonly IEntityManager _entityManager = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    private readonly FollowerSystem _follower = default!;
+    private readonly PvsOverrideSystem _pvs = default!;
+    private readonly SharedViewSubscriberSystem _viewSubscriber = default!;
+
+    private static readonly EntProtoId CameraProtoId = "AdminCamera";
+
+    private readonly EntityUid _target;
+    private EntityUid? _camera;
+
+
+    public AdminCameraEui(EntityUid target)
+    {
+        IoCManager.InjectDependencies(this);
+        _follower = _entityManager.System<FollowerSystem>();
+        _pvs = _entityManager.System<PvsOverrideSystem>();
+        _viewSubscriber = _entityManager.System<SharedViewSubscriberSystem>();
+
+        _target = target;
+    }
+
+    public override void Opened()
+    {
+        base.Opened();
+
+        _camera = CreateCamera(_target, Player);
+        StateDirty();
+    }
+
+    public override void Closed()
+    {
+        base.Closed();
+
+        _entityManager.DeleteEntity(_camera);
+    }
+
+    public override void HandleMessage(EuiMessageBase msg)
+    {
+        base.HandleMessage(msg);
+
+        switch (msg)
+        {
+            case AdminCameraFollowMessage:
+                if (!_admin.HasAdminFlag(Player, AdminFlags.Admin) || Player.AttachedEntity == null)
+                    return;
+                _follower.StartFollowingEntity(Player.AttachedEntity.Value, _target);
+                break;
+            default:
+                break;
+        }
+    }
+
+    public override EuiStateBase GetNewState()
+    {
+        var name = _entityManager.GetComponent<MetaDataComponent>(_target).EntityName;
+        var netEnt = _entityManager.GetNetEntity(_camera);
+        return new AdminCameraEuiState(netEnt, name, _timing.CurTick);
+    }
+
+    private EntityUid CreateCamera(EntityUid target, ICommonSession observer)
+    {
+        // Spawn a camera entity attached to the target.
+        var coords = target.ToCoordinates();
+        var camera = _entityManager.SpawnAttachedTo(CameraProtoId, coords);
+
+        // Allow the user to see the entities near the camera.
+        // This also force sends the camera entity to the user, overriding the visibility flags.
+        // (The camera entity has its visibility flags set to VisibilityFlags.Admin so that cheat clients can't see it)
+        _viewSubscriber.AddViewSubscriber(camera, observer);
+
+        return camera;
+    }
+}
diff --git a/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs b/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs
index ff644ad3e00a..bed249929865 100644
--- a/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs
@@ -96,7 +96,7 @@ private void AddAnomalyToBody(Entity<InnerBodyAnomalyComponent> ent)
 
         EntityManager.AddComponents(ent, injectedAnom.Components);
 
-        _stun.TryParalyze(ent, TimeSpan.FromSeconds(ent.Comp.StunDuration), true);
+        _stun.TryUpdateParalyzeDuration(ent, TimeSpan.FromSeconds(ent.Comp.StunDuration));
         _jitter.DoJitter(ent, TimeSpan.FromSeconds(ent.Comp.StunDuration), true);
 
         if (ent.Comp.StartSound is not null)
@@ -125,7 +125,7 @@ private void AddAnomalyToBody(Entity<InnerBodyAnomalyComponent> ent)
 
     private void OnAnomalyPulse(Entity<InnerBodyAnomalyComponent> ent, ref AnomalyPulseEvent args)
     {
-        _stun.TryParalyze(ent, TimeSpan.FromSeconds(ent.Comp.StunDuration / 2 * args.Severity), true);
+        _stun.TryUpdateParalyzeDuration(ent, TimeSpan.FromSeconds(ent.Comp.StunDuration / 2 * args.Severity));
         _jitter.DoJitter(ent, TimeSpan.FromSeconds(ent.Comp.StunDuration / 2 * args.Severity), true);
     }
 
@@ -213,7 +213,7 @@ private void RemoveAnomalyFromBody(Entity<InnerBodyAnomalyComponent> ent)
         if (_proto.TryIndex(ent.Comp.InjectionProto, out var injectedAnom))
             EntityManager.RemoveComponents(ent, injectedAnom.Components);
 
-        _stun.TryParalyze(ent, TimeSpan.FromSeconds(ent.Comp.StunDuration), true);
+        _stun.TryUpdateParalyzeDuration(ent, TimeSpan.FromSeconds(ent.Comp.StunDuration));
 
         if (ent.Comp.EndMessage is not null &&
             _mind.TryGetMind(ent, out _, out var mindComponent) &&
diff --git a/Content.Server/Atmos/Consoles/AtmosMonitoringConsoleSystem.cs b/Content.Server/Atmos/Consoles/AtmosMonitoringConsoleSystem.cs
index 3cce1c956edb..ebe79c6b5d41 100644
--- a/Content.Server/Atmos/Consoles/AtmosMonitoringConsoleSystem.cs
+++ b/Content.Server/Atmos/Consoles/AtmosMonitoringConsoleSystem.cs
@@ -17,6 +17,7 @@
 using Robust.Shared.Timing;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using Content.Server.Atmos.EntitySystems;
 using Content.Shared.DeviceNetwork.Components;
 using Content.Shared.NodeContainer;
 
@@ -53,6 +54,7 @@ public override void Initialize()
 
         // Grid events
         SubscribeLocalEvent<GridSplitEvent>(OnGridSplit);
+        SubscribeLocalEvent<PipeNodeGroupRemovedEvent>(OnPipeNodeGroupRemoved);
     }
 
     #region Event handling
@@ -295,6 +297,25 @@ private bool TryGetAtmosDeviceNavMapData
 
     #region Pipe net functions
 
+    private void OnPipeNodeGroupRemoved(ref PipeNodeGroupRemovedEvent args)
+    {
+        // When a pipe node group is removed, we need to iterate over all of
+        // our pipe chunks and remove any entries with a matching net id.
+        // (We only need to check the chunks for the affected grid, though.)
+
+        if (!_gridAtmosPipeChunks.TryGetValue(args.Grid, out var chunkData))
+            return;
+
+        foreach (var chunk in chunkData.Values)
+        {
+            foreach (var key in chunk.AtmosPipeData.Keys)
+            {
+                if (key.NetId == args.NetId)
+                    chunk.AtmosPipeData.Remove(key);
+            }
+        }
+    }
+
     private void RebuildAtmosPipeGrid(EntityUid gridUid, MapGridComponent grid)
     {
         var allChunks = new Dictionary<Vector2i, AtmosPipeChunk>();
@@ -411,7 +432,7 @@ private void UpdateAtmosPipeChunk
                 continue;
 
             var netId = GetPipeNodeNetId(pipeNode);
-            var subnet = new AtmosMonitoringConsoleSubnet(netId, pipeNode.CurrentPipeLayer, pipeColor.Color.ToHex());
+            var subnet = new AtmosMonitoringConsoleSubnet(netId, pipeNode.CurrentPipeLayer, pipeColor.Color);
             var pipeDirection = pipeNode.CurrentPipeDirection;
 
             chunk.AtmosPipeData.TryGetValue(subnet, out var atmosPipeData);
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs
index df31db6ba07f..67f3a207794a 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs
@@ -279,6 +279,14 @@ public bool AddPipeNet(Entity<GridAtmosphereComponent?> grid, PipeNet pipeNet)
 
     public bool RemovePipeNet(Entity<GridAtmosphereComponent?> grid, PipeNet pipeNet)
     {
+        // Technically this event can be fired even on grids that don't
+        // actually have grid atmospheres.
+        if (pipeNet.Grid is not null)
+        {
+            var ev = new PipeNodeGroupRemovedEvent(grid, pipeNet.NetId);
+            RaiseLocalEvent(ref ev);
+        }
+
         return _atmosQuery.Resolve(grid, ref grid.Comp, false) && grid.Comp.PipeNets.Remove(pipeNet);
     }
 
@@ -329,3 +337,12 @@ [ByRefEvent] private record struct HotspotExtinguishMethodEvent
     [ByRefEvent] private record struct IsHotspotActiveMethodEvent
         (EntityUid Grid, Vector2i Tile, bool Result = false, bool Handled = false);
 }
+
+
+/// <summary>
+/// Raised broadcasted when a pipe node group within a grid has been removed.
+/// </summary>
+/// <param name="Grid">The grid with the removed node group.</param>
+/// <param name="NetId">The net id of the removed node group.</param>
+[ByRefEvent]
+public record struct PipeNodeGroupRemovedEvent(EntityUid Grid, int NetId);
diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
index 13b3e480c918..424f52ed581a 100644
--- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
@@ -394,7 +394,7 @@ public void Resist(EntityUid uid,
             flammable.Resisting = true;
 
             _popup.PopupEntity(Loc.GetString("flammable-component-resist-message"), uid, uid);
-            _stunSystem.TryParalyze(uid, TimeSpan.FromSeconds(2f), true);
+            _stunSystem.TryUpdateParalyzeDuration(uid, TimeSpan.FromSeconds(2f));
 
             // TODO FLAMMABLE: Make this not use TimerComponent...
             uid.SpawnTimer(2000, () =>
diff --git a/Content.Server/Atmos/Monitor/Components/AtmosAlarmableComponent.cs b/Content.Server/Atmos/Monitor/Components/AtmosAlarmableComponent.cs
index e291334ad0f9..cc53df2ecdee 100644
--- a/Content.Server/Atmos/Monitor/Components/AtmosAlarmableComponent.cs
+++ b/Content.Server/Atmos/Monitor/Components/AtmosAlarmableComponent.cs
@@ -48,7 +48,7 @@ public sealed partial class AtmosAlarmableComponent : Component
     public HashSet<string> SyncWithTags { get; private set; } = new();
 
     [DataField("monitorAlertTypes")]
-    public HashSet<AtmosMonitorThresholdType>? MonitorAlertTypes { get; private set; }
+    public AtmosMonitorThresholdTypeFlags MonitorAlertTypes { get; private set; }
 
     /// <summary>
     ///     If this device should receive only. If it can only
diff --git a/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs b/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs
index 830479561dea..ffb1fe0d2777 100644
--- a/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs
+++ b/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs
@@ -59,7 +59,7 @@ public sealed partial class AtmosMonitorComponent : Component
     public AtmosAlarmType LastAlarmState = AtmosAlarmType.Normal;
 
     [DataField("trippedThresholds")]
-    public HashSet<AtmosMonitorThresholdType> TrippedThresholds = new();
+    public AtmosMonitorThresholdTypeFlags TrippedThresholds;
 
     /// <summary>
     ///     Registered devices in this atmos monitor. Alerts will be sent directly
diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs
index b6bc4bd30338..2dcba3f464f2 100644
--- a/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs
@@ -108,9 +108,9 @@ private void OnPacketRecv(EntityUid uid, AtmosAlarmableComponent component, Devi
                     break;
                 }
 
-                if (args.Data.TryGetValue(AlertTypes, out HashSet<AtmosMonitorThresholdType>? types) && component.MonitorAlertTypes != null)
+                if (args.Data.TryGetValue(AlertTypes, out AtmosMonitorThresholdTypeFlags types) && component.MonitorAlertTypes != AtmosMonitorThresholdTypeFlags.None)
                 {
-                    isValid = types.Any(type => component.MonitorAlertTypes.Contains(type));
+                    isValid = (types & component.MonitorAlertTypes) != 0;
                 }
 
                 if (!component.NetworkAlarmStates.ContainsKey(args.SenderAddress))
diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
index 520afe0c5862..452b30033145 100644
--- a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
@@ -207,7 +207,7 @@ private void OnFireEvent(EntityUid uid, AtmosMonitorComponent component, ref Til
         if (component.MonitorFire
             && component.LastAlarmState != AtmosAlarmType.Danger)
         {
-            component.TrippedThresholds.Add(AtmosMonitorThresholdType.Temperature);
+            component.TrippedThresholds |= AtmosMonitorThresholdTypeFlags.Temperature;
             Alert(uid, AtmosAlarmType.Danger, null, component); // technically???
         }
 
@@ -218,7 +218,7 @@ private void OnFireEvent(EntityUid uid, AtmosMonitorComponent component, ref Til
             && component.TemperatureThreshold.CheckThreshold(args.Temperature, out var temperatureState)
             && temperatureState > component.LastAlarmState)
         {
-            component.TrippedThresholds.Add(AtmosMonitorThresholdType.Temperature);
+            component.TrippedThresholds |= AtmosMonitorThresholdTypeFlags.Temperature;
             Alert(uid, AtmosAlarmType.Danger, null, component);
         }
     }
@@ -259,7 +259,7 @@ private void UpdateState(EntityUid uid, GasMixture? air, AtmosMonitorComponent?
         if (!Resolve(uid, ref monitor)) return;
 
         var state = AtmosAlarmType.Normal;
-        HashSet<AtmosMonitorThresholdType> alarmTypes = new(monitor.TrippedThresholds);
+        var alarmTypes = monitor.TrippedThresholds;
 
         if (monitor.TemperatureThreshold != null
             && monitor.TemperatureThreshold.CheckThreshold(air.Temperature, out var temperatureState))
@@ -267,11 +267,11 @@ private void UpdateState(EntityUid uid, GasMixture? air, AtmosMonitorComponent?
             if (temperatureState > state)
             {
                 state = temperatureState;
-                alarmTypes.Add(AtmosMonitorThresholdType.Temperature);
+                alarmTypes |= AtmosMonitorThresholdTypeFlags.Temperature;
             }
             else if (temperatureState == AtmosAlarmType.Normal)
             {
-                alarmTypes.Remove(AtmosMonitorThresholdType.Temperature);
+                alarmTypes &= ~AtmosMonitorThresholdTypeFlags.Temperature;
             }
         }
 
@@ -282,11 +282,11 @@ private void UpdateState(EntityUid uid, GasMixture? air, AtmosMonitorComponent?
             if (pressureState > state)
             {
                 state = pressureState;
-                alarmTypes.Add(AtmosMonitorThresholdType.Pressure);
+                alarmTypes |= AtmosMonitorThresholdTypeFlags.Pressure;
             }
             else if (pressureState == AtmosAlarmType.Normal)
             {
-                alarmTypes.Remove(AtmosMonitorThresholdType.Pressure);
+                alarmTypes &= ~AtmosMonitorThresholdTypeFlags.Pressure;
             }
         }
 
@@ -306,17 +306,17 @@ private void UpdateState(EntityUid uid, GasMixture? air, AtmosMonitorComponent?
 
             if (tripped)
             {
-                alarmTypes.Add(AtmosMonitorThresholdType.Gas);
+                alarmTypes |= AtmosMonitorThresholdTypeFlags.Gas;
             }
             else
             {
-                alarmTypes.Remove(AtmosMonitorThresholdType.Gas);
+                alarmTypes &= ~AtmosMonitorThresholdTypeFlags.Gas;
             }
         }
 
         // if the state of the current air doesn't match the last alarm state,
         // we update the state
-        if (state != monitor.LastAlarmState || !alarmTypes.SetEquals(monitor.TrippedThresholds))
+        if (state != monitor.LastAlarmState || alarmTypes != monitor.TrippedThresholds)
         {
             Alert(uid, state, alarmTypes, monitor);
         }
@@ -327,7 +327,7 @@ private void UpdateState(EntityUid uid, GasMixture? air, AtmosMonitorComponent?
     /// </summary>
     /// <param name="state">The alarm state to set this monitor to.</param>
     /// <param name="alarms">The alarms that caused this alarm state.</param>
-    public void Alert(EntityUid uid, AtmosAlarmType state, HashSet<AtmosMonitorThresholdType>? alarms = null, AtmosMonitorComponent? monitor = null)
+    public void Alert(EntityUid uid, AtmosAlarmType state, AtmosMonitorThresholdTypeFlags? alarms = null, AtmosMonitorComponent? monitor = null)
     {
         if (!Resolve(uid, ref monitor))
             return;
diff --git a/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeColorSystem.cs b/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeColorSystem.cs
deleted file mode 100644
index 91f70467b423..000000000000
--- a/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeColorSystem.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using Content.Server.Atmos.Piping.Components;
-using Content.Shared.Atmos.Piping;
-using Robust.Server.GameObjects;
-
-namespace Content.Server.Atmos.Piping.EntitySystems
-{
-    public sealed class AtmosPipeColorSystem : EntitySystem
-    {
-        [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            SubscribeLocalEvent<AtmosPipeColorComponent, ComponentStartup>(OnStartup);
-            SubscribeLocalEvent<AtmosPipeColorComponent, ComponentShutdown>(OnShutdown);
-        }
-
-        private void OnStartup(EntityUid uid, AtmosPipeColorComponent component, ComponentStartup args)
-        {
-            if (!TryComp(uid, out AppearanceComponent? appearance))
-                return;
-
-            _appearance.SetData(uid, PipeColorVisuals.Color, component.Color, appearance);
-        }
-
-        private void OnShutdown(EntityUid uid, AtmosPipeColorComponent component, ComponentShutdown args)
-        {
-            if (!TryComp(uid, out AppearanceComponent? appearance))
-                return;
-
-            _appearance.SetData(uid, PipeColorVisuals.Color, Color.White, appearance);
-        }
-
-        public void SetColor(EntityUid uid, AtmosPipeColorComponent component, Color color)
-        {
-            component.Color = color;
-
-            if (!TryComp(uid, out AppearanceComponent? appearance))
-                return;
-
-            _appearance.SetData(uid, PipeColorVisuals.Color, color, appearance);
-
-            var ev = new AtmosPipeColorChangedEvent(color);
-            RaiseLocalEvent(uid, ref ev);
-        }
-    }
-}
diff --git a/Content.Server/Bible/BibleSystem.cs b/Content.Server/Bible/BibleSystem.cs
index b0c0b08bfdad..207790366aec 100644
--- a/Content.Server/Bible/BibleSystem.cs
+++ b/Content.Server/Bible/BibleSystem.cs
@@ -1,18 +1,25 @@
 using Content.Server.Bible.Components;
+using Content.Server.Chat; //Starlight
 using Content.Server.Ghost.Roles.Events;
+using Content.Server.Hands.Systems; //Starlight
 using Content.Server.Popups;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Actions;
 using Content.Shared.Bible;
+using Content.Shared.Clumsy; //Starlight
+using Content.Shared.Cluwne; //Starlight
 using Content.Shared.Damage;
 using Content.Shared.Ghost.Roles.Components;
+using Content.Shared.Hands.Components; //Starlight
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
+using Content.Shared.Interaction.Components;
 using Content.Shared.Inventory;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Popups;
 using Content.Shared.Stunnable;
+using Content.Shared.Tag;
 using Content.Shared.Timing;
 using Content.Shared.Vampire.Components;
 using Content.Shared.Verbs;
@@ -38,6 +45,8 @@ public sealed class BibleSystem : EntitySystem
         [Dependency] private readonly UseDelaySystem _delay = default!;
         [Dependency] private readonly SharedTransformSystem _transform = default!;
         [Dependency] private readonly SharedStunSystem _stun = default!;
+        [Dependency] private readonly HandsSystem _hands = default!; //Starlight
+        [Dependency] private readonly TagSystem _tags = default!; //Starlight
 
         public override void Initialize()
         {
@@ -59,7 +68,7 @@ private void OnInsertedContainer(EntityUid uid, BibleComponent component, EntGot
             {
                 Timer.Spawn(500, () =>
                 {
-                    _stun.TryParalyze(args.Container.Owner, TimeSpan.FromSeconds(10), true);
+                    _stun.TryUpdateParalyzeDuration(args.Container.Owner, TimeSpan.FromSeconds(10));
                     _damageableSystem.TryChangeDamage(args.Container.Owner, component.DamageOnUnholyUse);
                     _audio.PlayPvs(component.SizzleSoundPath, args.Container.Owner);
                 });
@@ -145,7 +154,7 @@ private void OnAfterInteract(EntityUid uid, BibleComponent component, AfterInter
 
                 var selfMessage = Loc.GetString(component.LocPrefix + "-damage-unholy-self", ("target", Identity.Entity(args.Target.Value, EntityManager)), ("bible", uid));
                 _popupSystem.PopupEntity(selfMessage, args.User, args.User, PopupType.LargeCaution);
-                
+
                 _delay.TryResetDelay((uid, useDelay));
 
                 return;
@@ -169,6 +178,41 @@ private void OnAfterInteract(EntityUid uid, BibleComponent component, AfterInter
                 }
             }
 
+            //#region Starlight
+            if (TryComp<CluwneComponent>(args.Target, out var cluwne))
+            {
+                if ((!cluwne.Unremovable) && _random.Prob(component.CluwneCureChance))
+                {
+                    var target = args.Target.Value;
+                    RemComp<CluwneComponent>(target);
+                    RemComp<ClumsyComponent>(uid);
+                    RemComp<AutoEmoteComponent>(uid);
+                    if (TryComp<InventoryComponent>(target, out var inv))
+                    {
+                        var slots = _invSystem.GetSlotEnumerator((target, inv));
+                        while (slots.NextItem(out var itemeuid, out var slot))
+                        {
+                            if (TryComp<UnremoveableComponent>(itemeuid, out _) && !_tags.HasTag(itemeuid, component.RemovableAnywaysTag))
+                                continue;
+                            _invSystem.TryUnequip(target, target, slot.Name, true, true, inventory: inv);
+                        }
+
+                    }
+                    if (EntityManager.TryGetComponent<HandsComponent>(target, out var hands))
+                    {
+                        foreach (var hand in _hands.EnumerateHands((target, hands)))
+                        {
+                            _hands.TryDrop(target,
+                                hand,
+                                checkActionBlocker: false,
+                                doDropInteraction: false
+                            );
+                        }
+                    }
+                }
+            }
+            //#endregion
+
             var damage = _damageableSystem.TryChangeDamage(args.Target.Value, component.Damage, true, origin: uid);
 
             if (damage == null || damage.Empty)
diff --git a/Content.Server/Bible/Components/BibleComponent.cs b/Content.Server/Bible/Components/BibleComponent.cs
index ee4b2b37f83b..2445a319cb16 100644
--- a/Content.Server/Bible/Components/BibleComponent.cs
+++ b/Content.Server/Bible/Components/BibleComponent.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Damage;
+using Content.Shared.Tag;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 
@@ -57,9 +58,24 @@ public sealed partial class BibleComponent : Component
         [DataField("sizzleSound")]
         public SoundSpecifier SizzleSoundPath = new SoundPathSpecifier("/Audio/Effects/lightburn.ogg");
         [DataField("healSound")]
-        public SoundSpecifier HealSoundPath = new  SoundPathSpecifier("/Audio/Effects/holy.ogg");
+        public SoundSpecifier HealSoundPath = new SoundPathSpecifier("/Audio/Effects/holy.ogg");
 
         [DataField("locPrefix")]
         public string LocPrefix = "bible";
+
+        //#region Starlight
+
+        /// <summary>
+        /// what is the chance a successfull bible thwack removes the cluwning.
+        /// </summary>
+        [DataField]
+        public float CluwneCureChance = 0.03f;
+
+        /// <summary>
+        /// if a item has this tag. the unremovable comp is ignored when dropping the item.
+        /// </summary>
+        [DataField]
+        public ProtoId<TagPrototype> RemovableAnywaysTag = "BibleThwackRemovable";
+        //#endregion Starlight
     }
 }
diff --git a/Content.Server/Changeling/ChangelingSystem.Abilities.cs b/Content.Server/Changeling/ChangelingSystem.Abilities.cs
index d1c4f8d7e9ed..f8ef19052012 100644
--- a/Content.Server/Changeling/ChangelingSystem.Abilities.cs
+++ b/Content.Server/Changeling/ChangelingSystem.Abilities.cs
@@ -22,11 +22,14 @@
 using Content.Shared.Flash.Components;
 using Content.Shared.Mindshield.Components;
 using Content.Shared.Mindshield.FakeMindShield;
+using Content.Shared.StatusEffect;
 
 namespace Content.Server.Changeling;
 
 public sealed partial class ChangelingSystem : EntitySystem
 {
+    [Dependency] private readonly StatusEffectsSystem _statusEffect = default!;
+
     public void SubscribeAbilities()
     {
         SubscribeLocalEvent<ChangelingComponent, OpenEvolutionMenuEvent>(OnOpenEvolutionMenu);
diff --git a/Content.Server/Changeling/ChangelingSystem.cs b/Content.Server/Changeling/ChangelingSystem.cs
index ae3f7344efb0..5e04f72394a0 100644
--- a/Content.Server/Changeling/ChangelingSystem.cs
+++ b/Content.Server/Changeling/ChangelingSystem.cs
@@ -96,13 +96,13 @@ public sealed partial class ChangelingSystem : EntitySystem
     [Dependency] private readonly SharedStaminaSystem _stamina = default!;
     [Dependency] private readonly GravitySystem _gravity = default!;
     [Dependency] private readonly BlindableSystem _blindable = default!;
-    [Dependency] private readonly StatusEffectsSystem _statusEffect = default!;
     [Dependency] private readonly PullingSystem _pull = default!;
     [Dependency] private readonly SharedCuffableSystem _cuffs = default!;
     [Dependency] private readonly SharedPuddleSystem _puddle = default!;
     [Dependency] private readonly StunSystem _stun = default!;
     [Dependency] private readonly SharedJitteringSystem _jitter = default!;
     [Dependency] private readonly NpcFactionSystem _factionSystem = default!;
+    [Dependency] private readonly MovementModStatusSystem _movementMod = default!;
 
     public EntProtoId ArmbladePrototype = "ArmBladeChangeling";
     public EntProtoId FakeArmbladePrototype = "FakeArmBladeChangeling";
@@ -116,6 +116,7 @@ public sealed partial class ChangelingSystem : EntitySystem
     public EntProtoId SpacesuitPrototype = "ChangelingClothingOuterHardsuit";
     public EntProtoId SpacesuitHelmetPrototype = "ChangelingClothingHeadHelmetHardsuit";
 
+    public EntProtoId SlowdownPrototype = "StatusEffectStaminaLow";
     public override void Initialize()
     {
         base.Initialize();
@@ -190,8 +191,7 @@ private void UpdateBiomass(EntityUid uid, ChangelingComponent comp, float? amoun
             // vomit blood
             if (random)
             {
-                if (TryComp<StatusEffectsComponent>(uid, out var status))
-                    _stun.TrySlowdown(uid, TimeSpan.FromSeconds(1.5f), true, 0.5f, 0.5f, status);
+                _movementMod.TryAddMovementSpeedModDuration(uid, SlowdownPrototype, TimeSpan.FromSeconds(1.5f), 0.5f);
 
                 var solution = new Solution();
 
diff --git a/Content.Server/Chat/Managers/ChatSanitizationManager.cs b/Content.Server/Chat/Managers/ChatSanitizationManager.cs
index 0c78e45f86ed..106e5313e6ed 100644
--- a/Content.Server/Chat/Managers/ChatSanitizationManager.cs
+++ b/Content.Server/Chat/Managers/ChatSanitizationManager.cs
@@ -12,86 +12,86 @@ namespace Content.Server.Chat.Managers;
 /// </summary>
 public sealed class ChatSanitizationManager : IChatSanitizationManager
 {
-    private static readonly Dictionary<string, string> ShorthandToEmote = new()
-    {
-        { ":)", "chatsan-smiles" },
-        { ":]", "chatsan-smiles" },
-        { "=)", "chatsan-smiles" },
-        { "=]", "chatsan-smiles" },
-        { "(:", "chatsan-smiles" },
-        { "[:", "chatsan-smiles" },
-        { "(=", "chatsan-smiles" },
-        { "[=", "chatsan-smiles" },
-        { "^^", "chatsan-smiles" },
-        { "^-^", "chatsan-smiles" },
-        { ":(", "chatsan-frowns" },
-        { ":[", "chatsan-frowns" },
-        { "=(", "chatsan-frowns" },
-        { "=[", "chatsan-frowns" },
-        { "):", "chatsan-frowns" },
-        { ")=", "chatsan-frowns" },
-        { "]:", "chatsan-frowns" },
-        { "]=", "chatsan-frowns" },
-        { ":D", "chatsan-smiles-widely" },
-        { "D:", "chatsan-frowns-deeply" },
-        { ":O", "chatsan-surprised" },
-        { ":3", "chatsan-smiles" },
-        { ":S", "chatsan-uncertain" },
-        { ":>", "chatsan-grins" },
-        { ":<", "chatsan-pouts" },
-        { "xD", "chatsan-laughs" },
-        { ":'(", "chatsan-cries" },
-        { ":'[", "chatsan-cries" },
-        { "='(", "chatsan-cries" },
-        { "='[", "chatsan-cries" },
-        { ")':", "chatsan-cries" },
-        { "]':", "chatsan-cries" },
-        { ")'=", "chatsan-cries" },
-        { "]'=", "chatsan-cries" },
-        { ";-;", "chatsan-cries" },
-        { ";_;", "chatsan-cries" },
-        { "qwq", "chatsan-cries" },
-        { ":u", "chatsan-smiles-smugly" },
-        { ":v", "chatsan-smiles-smugly" },
-        { ">:i", "chatsan-annoyed" },
-        { ":i", "chatsan-sighs" },
-        { ":|", "chatsan-sighs" },
-        { ":p", "chatsan-stick-out-tongue" },
-        { ";p", "chatsan-stick-out-tongue" },
-        { ":b", "chatsan-stick-out-tongue" },
-        { "0-0", "chatsan-wide-eyed" },
-        { "o-o", "chatsan-wide-eyed" },
-        { "o.o", "chatsan-wide-eyed" },
-        { "._.", "chatsan-surprised" },
-        { ".-.", "chatsan-confused" },
-        { "-_-", "chatsan-unimpressed" },
-        { "smh", "chatsan-unimpressed" },
-        { "o/", "chatsan-waves" },
-        { "^^/", "chatsan-waves" },
-        { ":/", "chatsan-uncertain" },
-        { ":\\", "chatsan-uncertain" },
-        { "lmao", "chatsan-laughs" },
-        { "lmfao", "chatsan-laughs" },
-        { "lol", "chatsan-laughs" },
-        { "lel", "chatsan-laughs" },
-        { "kek", "chatsan-laughs" },
-        { "rofl", "chatsan-laughs" },
-        { "o7", "chatsan-salutes" },
-        { ";_;7", "chatsan-tearfully-salutes" },
-        { "idk", "chatsan-shrugs" },
-        { ";)", "chatsan-winks" },
-        { ";]", "chatsan-winks" },
-        { "(;", "chatsan-winks" },
-        { "[;", "chatsan-winks" },
-        { ":')", "chatsan-tearfully-smiles" },
-        { ":']", "chatsan-tearfully-smiles" },
-        { "=')", "chatsan-tearfully-smiles" },
-        { "=']", "chatsan-tearfully-smiles" },
-        { "(':", "chatsan-tearfully-smiles" },
-        { "[':", "chatsan-tearfully-smiles" },
-        { "('=", "chatsan-tearfully-smiles" },
-        { "['=", "chatsan-tearfully-smiles" }
-    };
+    private static readonly (Regex regex, string emoteKey)[] ShorthandToEmote =
+    [
+        Entry(":)", "chatsan-smiles"),
+        Entry(":]", "chatsan-smiles"),
+        Entry("=)", "chatsan-smiles"),
+        Entry("=]", "chatsan-smiles"),
+        Entry("(:", "chatsan-smiles"),
+        Entry("[:", "chatsan-smiles"),
+        Entry("(=", "chatsan-smiles"),
+        Entry("[=", "chatsan-smiles"),
+        Entry("^^", "chatsan-smiles"),
+        Entry("^-^", "chatsan-smiles"),
+        Entry(":(", "chatsan-frowns"),
+        Entry(":[", "chatsan-frowns"),
+        Entry("=(", "chatsan-frowns"),
+        Entry("=[", "chatsan-frowns"),
+        Entry("):", "chatsan-frowns"),
+        Entry(")=", "chatsan-frowns"),
+        Entry("]:", "chatsan-frowns"),
+        Entry("]=", "chatsan-frowns"),
+        Entry(":D", "chatsan-smiles-widely"),
+        Entry("D:", "chatsan-frowns-deeply"),
+        Entry(":O", "chatsan-surprised"),
+        Entry(":3", "chatsan-smiles"),
+        Entry(":S", "chatsan-uncertain"),
+        Entry(":>", "chatsan-grins"),
+        Entry(":<", "chatsan-pouts"),
+        Entry("xD", "chatsan-laughs"),
+        Entry(":'(", "chatsan-cries"),
+        Entry(":'[", "chatsan-cries"),
+        Entry("='(", "chatsan-cries"),
+        Entry("='[", "chatsan-cries"),
+        Entry(")':", "chatsan-cries"),
+        Entry("]':", "chatsan-cries"),
+        Entry(")'=", "chatsan-cries"),
+        Entry("]'=", "chatsan-cries"),
+        Entry(";-;", "chatsan-cries"),
+        Entry(";_;", "chatsan-cries"),
+        Entry("qwq", "chatsan-cries"),
+        Entry(":u", "chatsan-smiles-smugly"),
+        Entry(":v", "chatsan-smiles-smugly"),
+        Entry(">:i", "chatsan-annoyed"),
+        Entry(":i", "chatsan-sighs"),
+        Entry(":|", "chatsan-sighs"),
+        Entry(":p", "chatsan-stick-out-tongue"),
+        Entry(";p", "chatsan-stick-out-tongue"),
+        Entry(":b", "chatsan-stick-out-tongue"),
+        Entry("0-0", "chatsan-wide-eyed"),
+        Entry("o-o", "chatsan-wide-eyed"),
+        Entry("o.o", "chatsan-wide-eyed"),
+        Entry("._.", "chatsan-surprised"),
+        Entry(".-.", "chatsan-confused"),
+        Entry("-_-", "chatsan-unimpressed"),
+        Entry("smh", "chatsan-unimpressed"),
+        Entry("o/", "chatsan-waves"),
+        Entry("^^/", "chatsan-waves"),
+        Entry(":/", "chatsan-uncertain"),
+        Entry(":\\", "chatsan-uncertain"),
+        Entry("lmao", "chatsan-laughs"),
+        Entry("lmfao", "chatsan-laughs"),
+        Entry("lol", "chatsan-laughs"),
+        Entry("lel", "chatsan-laughs"),
+        Entry("kek", "chatsan-laughs"),
+        Entry("rofl", "chatsan-laughs"),
+        Entry("o7", "chatsan-salutes"),
+        Entry(";_;7", "chatsan-tearfully-salutes"),
+        Entry("idk", "chatsan-shrugs"),
+        Entry(";)", "chatsan-winks"),
+        Entry(";]", "chatsan-winks"),
+        Entry("(;", "chatsan-winks"),
+        Entry("[;", "chatsan-winks"),
+        Entry(":')", "chatsan-tearfully-smiles"),
+        Entry(":']", "chatsan-tearfully-smiles"),
+        Entry("=')", "chatsan-tearfully-smiles"),
+        Entry("=']", "chatsan-tearfully-smiles"),
+        Entry("(':", "chatsan-tearfully-smiles"),
+        Entry("[':", "chatsan-tearfully-smiles"),
+        Entry("('=", "chatsan-tearfully-smiles"),
+        Entry("['=", "chatsan-tearfully-smiles"),
+    ];
 
     [Dependency] private readonly IConfigurationManager _configurationManager = default!;
     [Dependency] private readonly ILocalizationManager _loc = default!;
@@ -125,21 +125,8 @@ public bool TrySanitizeEmoteShorthands(string message,
         // -1 is just a canary for nothing found yet
         var lastEmoteIndex = -1;
 
-        foreach (var (shorthand, emoteKey) in ShorthandToEmote)
+        foreach (var (r, emoteKey) in ShorthandToEmote)
         {
-            // We have to escape it because shorthands like ":)" or "-_-" would break the regex otherwise.
-            var escaped = Regex.Escape(shorthand);
-
-            // So there are 2 cases:
-            // - If there is whitespace before it and after it is either punctuation, whitespace, or the end of the line
-            //   Delete the word and the whitespace before
-            // - If it is at the start of the string and is followed by punctuation, whitespace, or the end of the line
-            //   Delete the word and the punctuation if it exists.
-            var pattern =
-                $@"\s{escaped}(?=\p{{P}}|\s|$)|^{escaped}(?:\p{{P}}|(?=\s|$))";
-
-            var r = new Regex(pattern, RegexOptions.RightToLeft | RegexOptions.IgnoreCase);
-
             // We're using sanitized as the original message until the end so that we can make sure the indices of
             // the emotes are accurate.
             var lastMatch = r.Match(sanitized);
@@ -159,4 +146,21 @@ public bool TrySanitizeEmoteShorthands(string message,
         sanitized = message.Trim();
         return emote is not null;
     }
+
+    private static (Regex regex, string emoteKey) Entry(string shorthand, string emoteKey)
+    {
+        // We have to escape it because shorthands like ":)" or "-_-" would break the regex otherwise.
+        var escaped = Regex.Escape(shorthand);
+
+        // So there are 2 cases:
+        // - If there is whitespace before it and after it is either punctuation, whitespace, or the end of the line
+        //   Delete the word and the whitespace before
+        // - If it is at the start of the string and is followed by punctuation, whitespace, or the end of the line
+        //   Delete the word and the punctuation if it exists.
+        var pattern = new Regex(
+            $@"\s{escaped}(?=\p{{P}}|\s|$)|^{escaped}(?:\p{{P}}|(?=\s|$))",
+            RegexOptions.RightToLeft | RegexOptions.IgnoreCase | RegexOptions.Compiled);
+
+        return (pattern, emoteKey);
+    }
 }
diff --git a/Content.Server/Cluwne/CluwneSystem.cs b/Content.Server/Cluwne/CluwneSystem.cs
index ae770f32ba5b..e20ed35196cc 100644
--- a/Content.Server/Cluwne/CluwneSystem.cs
+++ b/Content.Server/Cluwne/CluwneSystem.cs
@@ -119,7 +119,7 @@ private void OnEmote(EntityUid uid, CluwneComponent component, ref EmoteEvent ar
         else if (_random.Prob(component.KnockChance))
         {
             _audio.PlayPvs(component.KnockSound, uid);
-            _stunSystem.TryParalyze(uid, TimeSpan.FromSeconds(component.ParalyzeTime), true);
+            _stunSystem.TryUpdateParalyzeDuration(uid, TimeSpan.FromSeconds(component.ParalyzeTime));
             _chat.TrySendInGameICMessage(uid, "spasms", InGameICChatType.Emote, ChatTransmitRange.Normal);
         }
     }
diff --git a/Content.Server/Communications/CommunicationsConsoleSystem.cs b/Content.Server/Communications/CommunicationsConsoleSystem.cs
index 2687d30875dd..6dc26ac129f0 100644
--- a/Content.Server/Communications/CommunicationsConsoleSystem.cs
+++ b/Content.Server/Communications/CommunicationsConsoleSystem.cs
@@ -43,7 +43,6 @@ public override void Initialize()
         {
             // All events that refresh the BUI
             SubscribeLocalEvent<AlertLevelChangedEvent>(OnAlertLevelChanged);
-            SubscribeLocalEvent<CommunicationsConsoleComponent, ComponentInit>((uid, comp, _) => UpdateCommsConsoleInterface(uid, comp));
             SubscribeLocalEvent<RoundEndSystemChangedEvent>(_ => OnGenericBroadcastEvent());
             SubscribeLocalEvent<AlertLevelDelayFinishedEvent>(_ => OnGenericBroadcastEvent());
 
@@ -86,6 +85,7 @@ public override void Update(float frameTime)
         public void OnCommunicationsConsoleMapInit(EntityUid uid, CommunicationsConsoleComponent comp, MapInitEvent args)
         {
             comp.AnnouncementCooldownRemaining = comp.InitialDelay;
+            UpdateCommsConsoleInterface(uid, comp);
         }
 
         /// <summary>
diff --git a/Content.Server/Connection/ConnectionManager.Whitelist.cs b/Content.Server/Connection/ConnectionManager.Whitelist.cs
index ec639f74631a..fef95631f436 100644
--- a/Content.Server/Connection/ConnectionManager.Whitelist.cs
+++ b/Content.Server/Connection/ConnectionManager.Whitelist.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using System.Threading.Tasks;
+using Content.Server._NullLink;
 using Content.Server.Connection.Whitelist;
 using Content.Server.Connection.Whitelist.Conditions;
 using Content.Server.Database;
@@ -86,6 +87,12 @@ private bool IsValid(PlayerConnectionWhitelistPrototype whitelist, int playerCou
                     matched = CheckConditionNotesPlaytimeRange(conditionNotesPlaytimeRange, cacheRemarks, cachePlaytime);
                     denyMessage = Loc.GetString("whitelist-notes");
                     break;
+                // NullLink Whitelist start
+                case NullLinkRolesCondition nullLinkRolesCondition:
+                    matched = await CheckNullLinkRolesCondition(nullLinkRolesCondition, data.UserId);
+                    denyMessage = Loc.GetString("whitelist-roles");
+                    break;
+                // NullLink Whitelist end
                 default:
                     throw new NotImplementedException($"Whitelist condition {condition.GetType().Name} not implemented");
             }
@@ -158,6 +165,12 @@ private bool CheckConditionPlaytime(ConditionPlaytime conditionPlaytime, List<Pl
         return tracker.TimeSpent.TotalMinutes >= conditionPlaytime.MinimumPlaytime;
     }
 
+    // NullLink Whitelist start
+    private async Task<bool> CheckNullLinkRolesCondition(NullLinkRolesCondition condition, NetUserId userId) 
+        => _actors.TryGetServerGrain(out var server) 
+            && await server.HasPlayerAnyRole(userId, [.. condition.Roles]);
+    // NullLink Whitelist end
+
     private bool CheckConditionNotesPlaytimeRange(
         ConditionNotesPlaytimeRange conditionNotesPlaytimeRange,
         List<IAdminRemarksRecord> remarks,
diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs
index 7114d521db1a..d0f0e880ae2e 100644
--- a/Content.Server/Connection/ConnectionManager.cs
+++ b/Content.Server/Connection/ConnectionManager.cs
@@ -8,6 +8,7 @@
 using Content.Server.Chat.Managers;
 using Content.Server.Connection.IPIntel;
 using Content.Server.Database;
+using Content.Server.Discord.DiscordLink;
 using Content.Server.GameTicking;
 using Content.Server.Preferences.Managers;
 using Content.Shared._NullLink;
@@ -56,6 +57,7 @@ public interface IConnectionManager
     public sealed partial class ConnectionManager : IConnectionManager
     {
         [Dependency] private readonly IActorRouter _actors = default!; // NullLink
+        [Dependency] private readonly INullLinkPlayerManager _nullLinkPlayerManager = default!; // NullLink
         [Dependency] private readonly IPlayerManager _plyMgr = default!;
         [Dependency] private readonly IPlayerRolesManager _plyRoles = default!;
         [Dependency] private readonly IServerNetManager _netMgr = default!;
@@ -164,6 +166,9 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
                 if (reason == ConnectionDenyReason.Full)
                     properties["delay"] = _cfg.GetCVar(CCVars.GameServerFullReconnectDelay);
 
+                //NullLink discord link
+                properties["discord"] = _nullLinkPlayerManager.GetDiscordAuthUrl(e.UserId.ToString());
+
                 e.Deny(new NetDenyReason(msg, properties));
             }
             else
diff --git a/Content.Server/Delivery/DeliverySystem.cs b/Content.Server/Delivery/DeliverySystem.cs
index 5fc9b53316a6..0cbe6d3ccc57 100644
--- a/Content.Server/Delivery/DeliverySystem.cs
+++ b/Content.Server/Delivery/DeliverySystem.cs
@@ -52,7 +52,7 @@ private void OnMapInit(Entity<DeliveryComponent> ent, ref MapInitEvent args)
         if (_station.GetStationInMap(Transform(ent).MapID) is not { } stationId)
             return;
 
-        if (!_records.TryGetRandomRecord<GeneralStationRecord>(stationId, out var entry))
+        if (!_records.TryGetRandomRecord<GeneralStationRecord>(stationId, out var entry) || ent.Comp.SystemDeliverySpawn) // Starlight-edit
             return;
 
         ent.Comp.RecipientName = entry.Name;
diff --git a/Content.Server/Drowsiness/DrowsinessSystem.cs b/Content.Server/Drowsiness/DrowsinessSystem.cs
index 13fdc42e109f..2ea048259029 100644
--- a/Content.Server/Drowsiness/DrowsinessSystem.cs
+++ b/Content.Server/Drowsiness/DrowsinessSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Bed.Sleep;
+using Content.Shared.Bed.Sleep;
 using Content.Shared.Drowsiness;
 using Content.Shared.StatusEffectNew;
 using Content.Shared.StatusEffectNew.Components;
diff --git a/Content.Server/Electrocution/ElectrocutionSystem.cs b/Content.Server/Electrocution/ElectrocutionSystem.cs
index 18a4d52ac29c..bb9e71cfc333 100644
--- a/Content.Server/Electrocution/ElectrocutionSystem.cs
+++ b/Content.Server/Electrocution/ElectrocutionSystem.cs
@@ -397,7 +397,12 @@ private bool DoCommonElectrocution(EntityUid uid, EntityUid? sourceUid,
         var shouldStun = siemensCoefficient > 0.5f;
 
         if (shouldStun)
-            _stun.TryParalyze(uid, time * ParalyzeTimeMultiplier, refresh, statusEffects);
+        {
+            _ = refresh
+                ? _stun.TryUpdateParalyzeDuration(uid, time * ParalyzeTimeMultiplier)
+                : _stun.TryAddParalyzeDuration(uid, time * ParalyzeTimeMultiplier);
+        }
+            
 
         // TODO: Sparks here.
 
diff --git a/Content.Server/Ensnaring/Components/EnsnaringComponent.cs b/Content.Server/Ensnaring/Components/EnsnaringComponent.cs
deleted file mode 100644
index da9ad56c5e31..000000000000
--- a/Content.Server/Ensnaring/Components/EnsnaringComponent.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-using System.Threading;
-using Content.Shared.Ensnaring.Components;
-
-
-
diff --git a/Content.Server/EntityEffects/EntityEffectSystem.cs b/Content.Server/EntityEffects/EntityEffectSystem.cs
index 54270ca53d5f..1277c8df594d 100644
--- a/Content.Server/EntityEffects/EntityEffectSystem.cs
+++ b/Content.Server/EntityEffects/EntityEffectSystem.cs
@@ -133,7 +133,7 @@ private void OnCheckTemperature(ref CheckEntityEffectConditionEvent<TemperatureC
         args.Result = false;
         if (TryComp(args.Args.TargetEntity, out TemperatureComponent? temp))
         {
-            if (temp.CurrentTemperature > args.Condition.Min && temp.CurrentTemperature < args.Condition.Max)
+            if (temp.CurrentTemperature >= args.Condition.Min && temp.CurrentTemperature <= args.Condition.Max)
                 args.Result = true;
         }
     }
diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
index d33d38bf5054..63ee75618c8a 100644
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
@@ -411,8 +411,9 @@ private void UpdateSlip(Entity<PuddleComponent> entity, Solution solution)
         // A puddle with 10 units of lube vs a puddle with 10 of lube and 20 catchup should stun and launch forward the same amount.
         if (slipperyUnits > 0)
         {
-            slipComp.SlipData.LaunchForwardsMultiplier = (float)(launchMult / slipperyUnits);
-            slipComp.SlipData.StunTime = stunTimer / (float)slipperyUnits;
+            slipComp.SlipData.LaunchForwardsMultiplier = (float)(launchMult/slipperyUnits);
+            slipComp.SlipData.StunTime = (stunTimer/(float)slipperyUnits);
+            slipComp.SlipData.KnockdownTime = (knockdownTimer/(float)slipperyUnits);
         }
 
         // Only make it super slippery if there is enough super slippery units for its own puddle
diff --git a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs b/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
index dd454395b2dc..da9bcb341374 100644
--- a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
@@ -614,7 +614,7 @@ private bool CheckRevsLose()
                 _audioSystem.PlayGlobal("/Audio/_Starlight/Misc/rev_end.ogg", Filter.Entities(uid), false, AudioParams.Default.WithVolume(0f));
                 
                 _npcFaction.RemoveFaction(uid, RevolutionaryNpcFaction);
-                _stun.TryParalyze(uid, stunTime, true);
+                _stun.TryUpdateParalyzeDuration(uid, stunTime);
                 RemCompDeferred<RevolutionaryComponent>(uid);
                 _popup.PopupEntity(Loc.GetString("rev-break-control", ("name", Identity.Name(uid, EntityManager))), uid); //STARLIGHT
                 _adminLogManager.Add(LogType.Mind, LogImpact.Medium, $"{ToPrettyString(uid)} was deconverted due to all Head Revolutionaries dying.");
diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
index 2d96cae861fa..0a2882aa3c24 100644
--- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
@@ -125,8 +125,8 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component)
         if (traitorRole is not null)
         {
             Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Add traitor briefing components");
-            AddComp<RoleBriefingComponent>(traitorRole.Value.Owner);
-            Comp<RoleBriefingComponent>(traitorRole.Value.Owner).Briefing = briefing;
+            EnsureComp<RoleBriefingComponent>(traitorRole.Value.Owner, out var briefingComp);
+            briefingComp.Briefing = briefing;
         }
         else
         {
diff --git a/Content.Server/Ghost/Roles/GhostRoleSystem.cs b/Content.Server/Ghost/Roles/GhostRoleSystem.cs
index cd0330ded8b5..ec69ebe3c136 100644
--- a/Content.Server/Ghost/Roles/GhostRoleSystem.cs
+++ b/Content.Server/Ghost/Roles/GhostRoleSystem.cs
@@ -5,7 +5,6 @@
 using Content.Server.Ghost.Roles.Events;
 using Content.Shared.Ghost.Roles.Raffles;
 using Content.Server.Ghost.Roles.UI;
-using Content.Server.Mind.Commands;
 using Content.Shared.Administration;
 using Content.Shared.CCVar;
 using Content.Shared.Database;
@@ -698,7 +697,7 @@ private void OnSpawnerTakeRole(EntityUid uid, GhostRoleMobSpawnerComponent compo
         RaiseLocalEvent(mob, spawnedEvent);
 
         if (ghostRole.MakeSentient)
-            MakeSentientCommand.MakeSentient(mob, EntityManager, ghostRole.AllowMovement, ghostRole.AllowSpeech);
+            _mindSystem.MakeSentient(mob, ghostRole.AllowMovement, ghostRole.AllowSpeech);
 
         EnsureComp<MindContainerComponent>(mob);
 
@@ -745,7 +744,7 @@ private void OnTakeoverTakeRole(EntityUid uid, GhostTakeoverAvailableComponent c
         }
 
         if (ghostRole.MakeSentient)
-            MakeSentientCommand.MakeSentient(uid, EntityManager, ghostRole.AllowMovement, ghostRole.AllowSpeech);
+            _mindSystem.MakeSentient(uid, ghostRole.AllowMovement, ghostRole.AllowSpeech);
 
         GhostRoleInternalCreateMindAndTransfer(args.Player, uid, uid, ghostRole);
         UnregisterGhostRole((uid, ghostRole));
diff --git a/Content.Server/Instruments/InstrumentSystem.cs b/Content.Server/Instruments/InstrumentSystem.cs
index f6a216227155..56b64576cadc 100644
--- a/Content.Server/Instruments/InstrumentSystem.cs
+++ b/Content.Server/Instruments/InstrumentSystem.cs
@@ -461,7 +461,7 @@ public override void Update(float frameTime)
             {
                 if (instrument.InstrumentPlayer is {Valid: true} mob)
                 {
-                    _stuns.TryParalyze(mob, TimeSpan.FromSeconds(1), true);
+                    _stuns.TryUpdateParalyzeDuration(mob, TimeSpan.FromSeconds(1));
 
                     _popup.PopupEntity(Loc.GetString("instrument-component-finger-cramps-max-message"),
                         uid, mob, PopupType.LargeCaution);
diff --git a/Content.Server/IoC/ServerContentIoC.cs b/Content.Server/IoC/ServerContentIoC.cs
index 895ae7b0dc98..7ce93dfb90d9 100644
--- a/Content.Server/IoC/ServerContentIoC.cs
+++ b/Content.Server/IoC/ServerContentIoC.cs
@@ -38,6 +38,7 @@
 using Content.Shared.Players.PlayTimeTracking;
 using Content.Shared.Players.RateLimiting;
 using Content.Shared.Starlight;
+using Content.Server.Economy; // Starlight-edit
 
 namespace Content.Server.IoC
 {
@@ -96,6 +97,7 @@ public static void Register()
             IoCManager.Register<ISharedPlayersRoleManager, PlayerRolesManager>(); 
             IoCManager.Register<IPlayerRolesManager, PlayerRolesManager>();     
             IoCManager.Register<ITTSManager, TTSManager>();
+            IoCManager.Register<ItemPriceManager, ItemPriceManager>();
             // nulllink
             IoCManager.Register<IActorRouter, ActorRouter>(); 
             IoCManager.Register<INullLinkPlayerManager, NullLinkPlayerManager>();
diff --git a/Content.Server/Magic/MagicSystem.cs b/Content.Server/Magic/MagicSystem.cs
index 09f6fd143e4d..bb1da8985bd3 100644
--- a/Content.Server/Magic/MagicSystem.cs
+++ b/Content.Server/Magic/MagicSystem.cs
@@ -6,6 +6,7 @@
 using Content.Shared.Mind;
 using Content.Shared.Tag;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
 
 namespace Content.Server.Magic;
 
@@ -15,7 +16,7 @@ public sealed class MagicSystem : SharedMagicSystem
     [Dependency] private readonly GameTicker _gameTicker = default!;
     [Dependency] private readonly TagSystem _tag = default!;
     [Dependency] private readonly SharedMindSystem _mind = default!;
-
+    [Dependency] private readonly IRobustRandom _random = default!;
     private static readonly ProtoId<TagPrototype> InvalidForSurvivorAntagTag = "InvalidForSurvivorAntag";
 
     public override void Initialize()
@@ -40,7 +41,7 @@ protected override void OnRandomGlobalSpawnSpell(RandomGlobalSpawnSpellEvent ev)
     {
         base.OnRandomGlobalSpawnSpell(ev);
 
-        if (!ev.MakeSurvivorAntagonist)
+        if (!(ev.MakeSurvivorAntagonist && _random.NextFloat() < ev.SurvivorAntagChance)) //Starlight survivor chance.
             return;
 
         if (_mind.TryGetMind(ev.Performer, out var mind, out _) && !_tag.HasTag(mind, InvalidForSurvivorAntagTag))
diff --git a/Content.Server/Medical/Components/HealthAnalyzerComponent.cs b/Content.Server/Medical/Components/HealthAnalyzerComponent.cs
index b391afdeb528..9ce51ecc9ce8 100644
--- a/Content.Server/Medical/Components/HealthAnalyzerComponent.cs
+++ b/Content.Server/Medical/Components/HealthAnalyzerComponent.cs
@@ -66,4 +66,27 @@ public sealed partial class HealthAnalyzerComponent : Component
     
     [DataField("damageContainers", customTypeSerializer: typeof(PrototypeIdListSerializer<DamageContainerPrototype>))]
     public List<string>? DamageContainers;
+    
+    # region Starlight
+    
+    /// <summary>
+    /// Whether to show up the messages in chat
+    /// </summary>
+    [DataField]
+    public bool Talk;
+    
+    [DataField]
+    public string TalkMessage = "health-analyzer-chat-message";
+    
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
+    public TimeSpan NextTalk = TimeSpan.Zero;
+    
+    /// <summary>
+    /// The delay between talk updates
+    /// </summary>
+    [DataField]
+    public TimeSpan TalkInterval = TimeSpan.FromSeconds(5);
+    
+    # endregion Starlight
 }
diff --git a/Content.Server/Medical/HealthAnalyzerSystem.cs b/Content.Server/Medical/HealthAnalyzerSystem.cs
index c2dc7d69a848..7234ebb764e5 100644
--- a/Content.Server/Medical/HealthAnalyzerSystem.cs
+++ b/Content.Server/Medical/HealthAnalyzerSystem.cs
@@ -1,3 +1,4 @@
+using Content.Server.Chat.Systems; // Starlight-edit
 using Content.Server.Medical.Components;
 using Content.Server.PowerCell;
 using Content.Server.Temperature.Components;
@@ -32,6 +33,7 @@ public sealed class HealthAnalyzerSystem : EntitySystem
     [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
     [Dependency] private readonly TransformSystem _transformSystem = default!;
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+    [Dependency] private readonly ChatSystem _chat = default!; // Starlight-edit
 
     public override void Initialize()
     {
@@ -161,7 +163,7 @@ private void OpenUserInterface(EntityUid user, EntityUid analyzer)
     /// </summary>
     /// <param name="healthAnalyzer">The health analyzer that should receive the updates</param>
     /// <param name="target">The entity to start analyzing</param>
-    private void BeginAnalyzingEntity(Entity<HealthAnalyzerComponent> healthAnalyzer, EntityUid target)
+    public void BeginAnalyzingEntity(Entity<HealthAnalyzerComponent> healthAnalyzer, EntityUid target) // Starlight-edit: Make it public, so we can reuse it in other systems
     {
         //Link the health analyzer to the scanned entity
         healthAnalyzer.Comp.ScannedEntity = target;
@@ -176,7 +178,7 @@ private void BeginAnalyzingEntity(Entity<HealthAnalyzerComponent> healthAnalyzer
     /// </summary>
     /// <param name="healthAnalyzer">The health analyzer that's receiving the updates</param>
     /// <param name="target">The entity to analyze</param>
-    private void StopAnalyzingEntity(Entity<HealthAnalyzerComponent> healthAnalyzer, EntityUid target)
+    public void StopAnalyzingEntity(Entity<HealthAnalyzerComponent> healthAnalyzer, EntityUid target) // Starlight-edit: Make it public, so we can reuse it in other systems
     {
         //Unlink the analyzer
         healthAnalyzer.Comp.ScannedEntity = null;
@@ -194,7 +196,7 @@ private void StopAnalyzingEntity(Entity<HealthAnalyzerComponent> healthAnalyzer,
     /// <param name="scanMode">True makes the UI show ACTIVE, False makes the UI show INACTIVE</param>
     public void UpdateScannedUser(EntityUid healthAnalyzer, EntityUid target, bool scanMode)
     {
-        if (!_uiSystem.HasUi(healthAnalyzer, HealthAnalyzerUiKey.Key))
+        if (!_uiSystem.HasUi(healthAnalyzer, HealthAnalyzerUiKey.Key) || !TryComp<HealthAnalyzerComponent>(healthAnalyzer, out var healthComp)) // Starlight-edit
             return;
 
         if (!HasComp<DamageableComponent>(target))
@@ -219,6 +221,16 @@ public void UpdateScannedUser(EntityUid healthAnalyzer, EntityUid target, bool s
 
         if (TryComp<UnrevivableComponent>(target, out var unrevivableComp) && unrevivableComp.Analyzable)
             unrevivable = true;
+        
+        // Starlight-start: Talking health analyzer
+        if (healthComp.Talk && healthComp.NextTalk < _timing.CurTime && TryComp<DamageableComponent>(target, out var damageable))
+        {
+            healthComp.NextTalk = _timing.CurTime + healthComp.TalkInterval;
+            
+            var bloodLevel = !float.IsNaN(bloodAmount) ? $"{bloodAmount * 100:F1} %" : Loc.GetString("health-analyzer-window-entity-unknown-value-text");
+            _chat.TrySendInGameICMessage(healthAnalyzer, Loc.GetString(healthComp.TalkMessage, ("damage", damageable.TotalDamage.ToString()), ("blood", bloodLevel)), InGameICChatType.Speak, hideChat: true);
+        }
+        // Starlight-end
 
         _uiSystem.ServerSendUiMessage(healthAnalyzer, HealthAnalyzerUiKey.Key, new HealthAnalyzerScannedUserMessage(
             GetNetEntity(target),
diff --git a/Content.Server/Medical/VomitSystem.cs b/Content.Server/Medical/VomitSystem.cs
index 7b8be07a15f8..9fee1dfc85ca 100644
--- a/Content.Server/Medical/VomitSystem.cs
+++ b/Content.Server/Medical/VomitSystem.cs
@@ -2,16 +2,15 @@
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Forensics;
 using Content.Server.Popups;
-using Content.Server.Stunnable;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Systems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.IdentityManagement;
+using Content.Shared.Movement.Systems;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.EntitySystems;
-using Content.Shared.StatusEffect;
 using Robust.Server.Audio;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
@@ -27,7 +26,7 @@ public sealed class VomitSystem : EntitySystem
         [Dependency] private readonly PopupSystem _popup = default!;
         [Dependency] private readonly PuddleSystem _puddle = default!;
         [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
-        [Dependency] private readonly StunSystem _stun = default!;
+        [Dependency] private readonly MovementModStatusSystem _movementMod = default!;
         [Dependency] private readonly ThirstSystem _thirst = default!;
         [Dependency] private readonly ForensicsSystem _forensics = default!;
         [Dependency] private readonly BloodstreamSystem _bloodstream = default!;
@@ -57,8 +56,7 @@ public void Vomit(EntityUid uid, float thirstAdded = -40f, float hungerAdded = -
             // It fully empties the stomach, this amount from the chem stream is relatively small
             var solutionSize = (MathF.Abs(thirstAdded) + MathF.Abs(hungerAdded)) / 6;
             // Apply a bit of slowdown
-            if (TryComp<StatusEffectsComponent>(uid, out var status))
-                _stun.TrySlowdown(uid, TimeSpan.FromSeconds(solutionSize), true, 0.5f, 0.5f, status);
+            _movementMod.TryUpdateMovementSpeedModDuration(uid, MovementModStatusSystem.VomitingSlowdown, TimeSpan.FromSeconds(solutionSize),  0.5f);
 
             // TODO: Need decals
             var solution = new Solution();
diff --git a/Content.Server/Mind/Commands/MakeSentientCommand.cs b/Content.Server/Mind/Commands/MakeSentientCommand.cs
index 5e19d135b6fd..dad5126a31ef 100644
--- a/Content.Server/Mind/Commands/MakeSentientCommand.cs
+++ b/Content.Server/Mind/Commands/MakeSentientCommand.cs
@@ -1,63 +1,30 @@
 using Content.Server.Administration;
 using Content.Shared.Administration;
-using Content.Shared.Emoting;
-using Content.Shared.Examine;
-using Content.Shared.Mind.Components;
-using Content.Shared.Movement.Components;
-using Content.Shared.Speech;
 using Robust.Shared.Console;
 
-namespace Content.Server.Mind.Commands
+namespace Content.Server.Mind.Commands;
+
+[AdminCommand(AdminFlags.Admin)]
+public sealed class MakeSentientCommand : LocalizedEntityCommands
 {
-    [AdminCommand(AdminFlags.Admin)]
-    public sealed class MakeSentientCommand : IConsoleCommand
-    {
-        [Dependency] private readonly IEntityManager _entManager = default!;
+    [Dependency] private readonly MindSystem _mindSystem = default!;
 
-        public string Command => "makesentient";
-        public string Description => "Makes an entity sentient (able to be controlled by a player)";
-        public string Help => "makesentient <entity id>";
+    public override string Command => "makesentient";
 
-        public void Execute(IConsoleShell shell, string argStr, string[] args)
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        if (args.Length != 1)
         {
-            if (args.Length != 1)
-            {
-                shell.WriteLine("Wrong number of arguments.");
-                return;
-            }
-
-            if (!NetEntity.TryParse(args[0], out var entNet) || !_entManager.TryGetEntity(entNet, out var entId))
-            {
-                shell.WriteLine("Invalid argument.");
-                return;
-            }
-
-            if (!_entManager.EntityExists(entId))
-            {
-                shell.WriteLine("Invalid entity specified!");
-                return;
-            }
-
-            MakeSentient(entId.Value, _entManager, true, true);
+            shell.WriteLine(Loc.GetString("shell-need-exactly-one-argument"));
+            return;
         }
 
-        public static void MakeSentient(EntityUid uid, IEntityManager entityManager, bool allowMovement = true, bool allowSpeech = true)
+        if (!NetEntity.TryParse(args[0], out var entNet) || !EntityManager.TryGetEntity(entNet, out var entId) || !EntityManager.EntityExists(entId))
         {
-            entityManager.EnsureComponent<MindContainerComponent>(uid);
-            if (allowMovement)
-            {
-                entityManager.EnsureComponent<InputMoverComponent>(uid);
-                entityManager.EnsureComponent<MobMoverComponent>(uid);
-                entityManager.EnsureComponent<MovementSpeedModifierComponent>(uid);
-            }
-
-            if (allowSpeech)
-            {
-                entityManager.EnsureComponent<SpeechComponent>(uid);
-                entityManager.EnsureComponent<EmotingComponent>(uid);
-            }
-
-            entityManager.EnsureComponent<ExaminerComponent>(uid);
+            shell.WriteLine(Loc.GetString("shell-could-not-find-entity-with-uid", ("uid", args[0])));
+            return;
         }
+
+        _mindSystem.MakeSentient(entId.Value);
     }
 }
diff --git a/Content.Server/Mind/MindSystem.cs b/Content.Server/Mind/MindSystem.cs
index 71d38c688be3..a7547e87e4c4 100644
--- a/Content.Server/Mind/MindSystem.cs
+++ b/Content.Server/Mind/MindSystem.cs
@@ -1,7 +1,6 @@
 using Content.Server.Administration.Logs;
 using Content.Server.GameTicking;
 using Content.Server.Ghost;
-using Content.Server.Mind.Commands;
 using Content.Shared.Database;
 using Content.Shared.Ghost;
 using Content.Shared.Mind;
@@ -349,7 +348,7 @@ public override void ControlMob(NetUserId user, EntityUid target)
             return;
         }
 
-        MakeSentientCommand.MakeSentient(target, EntityManager);
+        MakeSentient(target);
         TransferTo(mindId, target, ghostCheckOverride: true, mind: mind);
     }
 }
diff --git a/Content.Server/Mobs/CritMobActionsSystem.cs b/Content.Server/Mobs/CritMobActionsSystem.cs
index c897102dca76..c266037a8ff2 100644
--- a/Content.Server/Mobs/CritMobActionsSystem.cs
+++ b/Content.Server/Mobs/CritMobActionsSystem.cs
@@ -65,6 +65,10 @@ private void OnLastWords(EntityUid uid, MobStateActionsComponent component, Crit
         _quickDialog.OpenDialog(actor.PlayerSession, Loc.GetString("action-name-crit-last-words"), "",
             (string lastWords) =>
             {
+                // if a person is gibbed/deleted, they can't say last words
+                if (Deleted(uid))
+                    return;
+
                 // Intentionally does not check for muteness
                 if (actor.PlayerSession.AttachedEntity != uid
                     || !_mobState.IsCritical(uid))
diff --git a/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs b/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs
index 38346795ed87..fb39e4f32bf8 100644
--- a/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs
+++ b/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs
@@ -220,7 +220,7 @@ private void UpdateRanged(float frameTime)
                 return;
             }
 
-            _gun.AttemptShoot(uid, gunUid, gun, targetCordinates);
+            _gun.AttemptShoot(uid, gunUid, gun, targetCordinates, comp.Target);
         }
     }
 }
diff --git a/Content.Server/NPC/Systems/NPCSteeringSystem.cs b/Content.Server/NPC/Systems/NPCSteeringSystem.cs
index 6a736f3bc997..3585711860b6 100644
--- a/Content.Server/NPC/Systems/NPCSteeringSystem.cs
+++ b/Content.Server/NPC/Systems/NPCSteeringSystem.cs
@@ -30,11 +30,16 @@
 using Robust.Shared.Utility;
 using Content.Shared.Prying.Systems;
 using Microsoft.Extensions.ObjectPool;
+using Prometheus;
 
 namespace Content.Server.NPC.Systems;
 
 public sealed partial class NPCSteeringSystem : SharedNPCSteeringSystem
 {
+    private static readonly Gauge ActiveSteeringGauge = Metrics.CreateGauge(
+        "npc_steering_active_count",
+        "Amount of NPCs trying to actively do steering");
+
     /*
      * We use context steering to determine which way to move.
      * This involves creating an array of possible directions and assigning a value for the desireability of each direction.
@@ -87,6 +92,8 @@ public sealed partial class NPCSteeringSystem : SharedNPCSteeringSystem
 
     private object _obstacles = new();
 
+    private int _activeSteeringCount;
+
     public override void Initialize()
     {
         base.Initialize();
@@ -244,12 +251,15 @@ public override void Update(float frameTime)
         };
         var curTime = _timing.CurTime;
 
+        _activeSteeringCount = 0;
+
         Parallel.For(0, index, options, i =>
         {
             var (uid, steering, mover, xform) = npcs[i];
             Steer(uid, steering, mover, xform, frameTime, curTime);
         });
 
+        ActiveSteeringGauge.Set(_activeSteeringCount);
 
         if (_subscribedSessions.Count > 0)
         {
@@ -324,6 +334,8 @@ private void Steer(
             return;
         }
 
+        Interlocked.Increment(ref _activeSteeringCount);
+
         var agentRadius = steering.Radius;
         var worldPos = _transform.GetWorldPosition(xform);
         var (layer, mask) = _physics.GetHardCollision(uid);
diff --git a/Content.Server/NPC/Systems/NPCSystem.cs b/Content.Server/NPC/Systems/NPCSystem.cs
index c7690cb295b1..27b2a1691d62 100644
--- a/Content.Server/NPC/Systems/NPCSystem.cs
+++ b/Content.Server/NPC/Systems/NPCSystem.cs
@@ -8,6 +8,7 @@
 using Content.Shared.Mobs.Systems;
 using Content.Shared.NPC;
 using Content.Shared.NPC.Systems;
+using Prometheus;
 using Robust.Server.GameObjects;
 using Robust.Shared.Configuration;
 using Robust.Shared.Player;
@@ -19,6 +20,10 @@ namespace Content.Server.NPC.Systems
     /// </summary>
     public sealed partial class NPCSystem : EntitySystem
     {
+        private static readonly Gauge ActiveGauge = Metrics.CreateGauge(
+            "npc_active_count",
+            "Amount of NPCs that are actively processing");
+
         [Dependency] private readonly IConfigurationManager _configurationManager = default!;
         [Dependency] private readonly HTNSystem _htn = default!;
         [Dependency] private readonly MobStateSystem _mobState = default!;
@@ -138,6 +143,8 @@ public override void Update(float frameTime)
 
             // Add your system here.
             _htn.UpdateNPC(ref _count, _maxUpdates, frameTime);
+
+            ActiveGauge.Set(Count<ActiveNPCComponent>());
         }
 
         public void OnMobStateChange(EntityUid uid, HTNComponent component, MobStateChangedEvent args)
diff --git a/Content.Server/NameIdentifier/NameIdentifierSystem.cs b/Content.Server/NameIdentifier/NameIdentifierSystem.cs
index 1e5ed67a63bb..c0b9beaa9aaa 100644
--- a/Content.Server/NameIdentifier/NameIdentifierSystem.cs
+++ b/Content.Server/NameIdentifier/NameIdentifierSystem.cs
@@ -82,8 +82,8 @@ public string GenerateUniqueName(EntityUid uid, NameIdentifierGroupPrototype pro
         randomVal = set[^1];
         set.RemoveAt(set.Count - 1);
 
-        return proto.Prefix is not null
-            ? $"{proto.Prefix}-{randomVal}"
+        return proto.Format is not null
+            ? Loc.GetString(proto.Format, ("number", randomVal))
             : $"{randomVal}";
     }
 
@@ -104,8 +104,8 @@ private void OnMapInit(Entity<NameIdentifierComponent> ent, ref MapInitEvent arg
             ids.Remove(ent.Comp.Identifier))
         {
             id = ent.Comp.Identifier;
-            uniqueName = group.Prefix is not null
-                ? $"{group.Prefix}-{id}"
+            uniqueName = group.Format is not null
+                ? Loc.GetString(group.Format, ("number", id))
                 : $"{id}";
         }
         else
diff --git a/Content.Server/Ninja/Systems/StunProviderSystem.cs b/Content.Server/Ninja/Systems/StunProviderSystem.cs
index 822486cff52f..8697692e5eb2 100644
--- a/Content.Server/Ninja/Systems/StunProviderSystem.cs
+++ b/Content.Server/Ninja/Systems/StunProviderSystem.cs
@@ -63,7 +63,7 @@ private void OnBeforeInteractHand(Entity<StunProviderComponent> ent, ref BeforeI
         _audio.PlayPvs(comp.Sound, target);
 
         _damageable.TryChangeDamage(target, comp.StunDamage, false, true, null, origin: uid);
-        _stun.TryParalyze(target, comp.StunTime, refresh: false);
+        _stun.TryAddParalyzeDuration(target, comp.StunTime);
 
         // short cooldown to prevent instant stunlocking
         _useDelay.SetLength((uid, useDelay), comp.Cooldown, id: comp.DelayId);
diff --git a/Content.Server/Physics/Controllers/MoverController.cs b/Content.Server/Physics/Controllers/MoverController.cs
index f0a723f3c089..5c87de186386 100644
--- a/Content.Server/Physics/Controllers/MoverController.cs
+++ b/Content.Server/Physics/Controllers/MoverController.cs
@@ -7,6 +7,7 @@
 using Content.Shared.Movement.Systems;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Shuttles.Systems;
+using Prometheus;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Player;
 using DroneConsoleComponent = Content.Server.Shuttles.DroneConsoleComponent;
@@ -17,6 +18,10 @@ namespace Content.Server.Physics.Controllers;
 
 public sealed class MoverController : SharedMoverController
 {
+    private static readonly Gauge ActiveMoverGauge = Metrics.CreateGauge(
+        "physics_active_mover_count",
+        "Active amount of InputMovers being processed by MoverController");
+
     [Dependency] private readonly ThrusterSystem _thruster = default!;
     [Dependency] private readonly SharedTransformSystem _xformSystem = default!;
 
@@ -97,6 +102,8 @@ public override void UpdateBeforeSolve(bool prediction, float frameTime)
             HandleMobMovement(mover, frameTime);
         }
 
+        ActiveMoverGauge.Set(_movers.Count);
+
         HandleShuttleMovement(frameTime);
     }
 
diff --git a/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs b/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs
index 3cf25472f0af..09f61632b645 100644
--- a/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs
+++ b/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs
@@ -1,4 +1,3 @@
-using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Storage.EntitySystems;
 using Content.Server.Stunnable;
@@ -7,7 +6,6 @@
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Interaction;
 using Content.Shared.PneumaticCannon;
-using Content.Shared.StatusEffect;
 using Content.Shared.Tools.Systems;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
@@ -80,10 +78,9 @@ private void OnShoot(Entity<PneumaticCannonComponent> cannon, ref GunShotEvent a
         if (gas == null && component.GasUsage > 0f)
             return;
 
-        if (TryComp<StatusEffectsComponent>(args.User, out var status)
-            && component.Power == PneumaticCannonPower.High)
+        if (component.Power == PneumaticCannonPower.High
+            && _stun.TryUpdateParalyzeDuration(args.User, TimeSpan.FromSeconds(component.HighPowerStunTime)))
         {
-            _stun.TryParalyze(args.User, TimeSpan.FromSeconds(component.HighPowerStunTime), true, status);
             Popup.PopupEntity(Loc.GetString("pneumatic-cannon-component-power-stun",
                 ("cannon", uid)), cannon, args.User);
         }
diff --git a/Content.Server/Polymorph/Systems/PolymorphSystem.cs b/Content.Server/Polymorph/Systems/PolymorphSystem.cs
index 7e5465397ec4..9bdcc41219ce 100644
--- a/Content.Server/Polymorph/Systems/PolymorphSystem.cs
+++ b/Content.Server/Polymorph/Systems/PolymorphSystem.cs
@@ -1,7 +1,6 @@
 using Content.Server.Actions;
 using Content.Server.Humanoid;
 using Content.Server.Inventory;
-using Content.Server.Mind.Commands;
 using Content.Server.Polymorph.Components;
 using Content.Shared._Starlight.Polymorph.Components;
 using Content.Shared.Actions;
@@ -211,7 +210,7 @@ private void OnDestruction(Entity<PolymorphedEntityComponent> ent, ref Destructi
                 ("child", Identity.Entity(child, EntityManager))),
                 child);
 
-        MakeSentientCommand.MakeSentient(child, EntityManager);
+        _mindSystem.MakeSentient(child);
 
         var polymorphedComp = Factory.GetComponent<PolymorphedEntityComponent>();
         polymorphedComp.Parent = uid;
diff --git a/Content.Server/Power/EntitySystems/BatteryInterfaceSystem.cs b/Content.Server/Power/EntitySystems/BatteryInterfaceSystem.cs
index 6ce19cfaf6cf..33e3f8ff2c0b 100644
--- a/Content.Server/Power/EntitySystems/BatteryInterfaceSystem.cs
+++ b/Content.Server/Power/EntitySystems/BatteryInterfaceSystem.cs
@@ -1,4 +1,6 @@
-using Content.Server.Power.Components;
+using Content.Server.Administration.Logs;
+using Content.Server.Power.Components;
+using Content.Shared.Database;
 using Content.Shared.Power;
 using Robust.Server.GameObjects;
 
@@ -19,6 +21,7 @@ namespace Content.Server.Power.EntitySystems;
 /// </remarks>
 public sealed class BatteryInterfaceSystem : EntitySystem
 {
+    [Dependency] private readonly IAdminLogManager _adminLog = default!;
     [Dependency] private readonly UserInterfaceSystem _uiSystem = null!;
 
     public override void Initialize()
@@ -43,12 +46,16 @@ private void HandleSetInputBreaker(Entity<BatteryInterfaceComponent> ent, ref Ba
     {
         var netBattery = Comp<PowerNetworkBatteryComponent>(ent);
         netBattery.CanCharge = args.On;
+
+        _adminLog.Add(LogType.Action,$"{ToPrettyString(args.Actor):actor} set input breaker to {args.On} on {ToPrettyString(ent):target}");
     }
 
     private void HandleSetOutputBreaker(Entity<BatteryInterfaceComponent> ent, ref BatterySetOutputBreakerMessage args)
     {
         var netBattery = Comp<PowerNetworkBatteryComponent>(ent);
         netBattery.CanDischarge = args.On;
+
+        _adminLog.Add(LogType.Action,$"{ToPrettyString(args.Actor):actor} set output breaker to {args.On} on {ToPrettyString(ent):target}");
     }
 
     private void HandleSetChargeRate(Entity<BatteryInterfaceComponent> ent, ref BatterySetChargeRateMessage args)
diff --git a/Content.Server/Power/PowerWireAction.cs b/Content.Server/Power/PowerWireAction.cs
index 82736155469a..d235c5eeace0 100644
--- a/Content.Server/Power/PowerWireAction.cs
+++ b/Content.Server/Power/PowerWireAction.cs
@@ -5,6 +5,8 @@
 using Content.Server.Wires;
 using Content.Shared.Power;
 using Content.Shared.Wires;
+using Content.Shared._Starlight.Power.Components; // Starlight-edit
+using Content.Shared._Starlight.Power.EntitySystems; // Starlight-edit
 
 namespace Content.Server.Power;
 
@@ -26,18 +28,16 @@ public sealed partial class PowerWireAction : BaseWireAction
     {
         if (WiresSystem.TryGetData<int>(wire.Owner, PowerWireActionKey.MainWire, out var main)
             && main != wire.Id)
-        {
             return null;
-        }
-
-        if (!AllWiresMended(wire.Owner)
+        
+        if (AllWiresCut(wire.Owner)) // Starlight-edit
+            return StatusLightState.Off; // Starlight-edit
+        else if (!AllWiresMended(wire.Owner) // Starlight-edit
                 || WiresSystem.TryGetData<bool>(wire.Owner, PowerWireActionKey.Pulsed, out var pulsed)
                 && pulsed)
-        {
             return StatusLightState.BlinkingSlow;
-        }
 
-        return AllWiresCut(wire.Owner) ? StatusLightState.Off : StatusLightState.On;
+        return StatusLightState.On; // Starlight-edit
     }
 
     private bool AllWiresCut(EntityUid owner)
@@ -57,33 +57,50 @@ private bool AllWiresMended(EntityUid owner)
     // Getting it from a dictionary is significantly more expensive.
     private void SetPower(EntityUid owner, bool pulsed)
     {
-        if (!EntityManager.TryGetComponent(owner, out ApcPowerReceiverComponent? power))
+        if (EntityManager.TryGetComponent(owner, out ApcPowerReceiverComponent? power)) // Starlight-edit: Powered Locker, All wizdens code in this if.
         {
-            return;
-        }
+            var receiverSys = EntityManager.System<PowerReceiverSystem>();
 
-        var receiverSys = EntityManager.System<PowerReceiverSystem>();
+            if (pulsed)
+            {
+                receiverSys.SetPowerDisabled(owner, true, power);
+                return;
+            }
 
-        if (pulsed)
-        {
-            receiverSys.SetPowerDisabled(owner, true, power);
-            return;
-        }
+            if (AllWiresCut(owner))
+                receiverSys.SetPowerDisabled(owner, true, power);
+            else
+            {
+                if (WiresSystem.TryGetData<bool>(owner, PowerWireActionKey.Pulsed, out var isPulsed)
+                    && isPulsed)
+                    return;
 
-        if (AllWiresCut(owner))
-        {
-            receiverSys.SetPowerDisabled(owner, true, power);
+                receiverSys.SetPowerDisabled(owner, false, power);
+            }
         }
-        else
+        // Starlight-start: Powered Locker
+        else if (EntityManager.TryGetComponent(owner, out PoweredLockerComponent? poweredLocker))
         {
-            if (WiresSystem.TryGetData<bool>(owner, PowerWireActionKey.Pulsed, out var isPulsed)
-                && isPulsed)
+            var lockerSys = EntityManager.System<PoweredLockerSystem>();
+            
+            if (pulsed)
             {
+                lockerSys.TogglePower(owner, poweredLocker, false);
                 return;
             }
+            
+            if (AllWiresCut(owner))
+                lockerSys.TogglePower(owner, poweredLocker, false);
+            else
+            {
+                if (WiresSystem.TryGetData<bool>(owner, PowerWireActionKey.Pulsed, out var isPulsed)
+                    && isPulsed)
+                    return;
 
-            receiverSys.SetPowerDisabled(owner, false, power);
+                lockerSys.TogglePower(owner, poweredLocker, true);
+            }
         }
+        // Starlight-end: Powered Locker
     }
 
     private void SetWireCuts(EntityUid owner, bool isCut)
diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
index 2d38aee6ea6f..b89f10934d98 100644
--- a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
+++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs
@@ -177,7 +177,7 @@ private bool TryUseAbility(EntityUid uid, RevenantComponent component, FixedPoin
         ChangeEssenceAmount(uid, -abilityCost, component, false);
 
         _statusEffects.TryAddStatusEffect<CorporealComponent>(uid, "Corporeal", TimeSpan.FromSeconds(debuffs.Y), false);
-        _stun.TryStun(uid, TimeSpan.FromSeconds(debuffs.X), false);
+        _stun.TryAddStunDuration(uid, TimeSpan.FromSeconds(debuffs.X));
 
         return true;
     }
diff --git a/Content.Server/Sandbox/Commands/ColorNetworkCommand.cs b/Content.Server/Sandbox/Commands/ColorNetworkCommand.cs
index 8237ccb2eb74..89c1182eaef7 100644
--- a/Content.Server/Sandbox/Commands/ColorNetworkCommand.cs
+++ b/Content.Server/Sandbox/Commands/ColorNetworkCommand.cs
@@ -1,6 +1,6 @@
 using Content.Server.Administration.Managers;
-using Content.Server.Atmos.Piping.Components;
-using Content.Server.Atmos.Piping.EntitySystems;
+using Content.Shared.Atmos.Components;
+using Content.Shared.Atmos.EntitySystems;
 using Content.Shared.Administration;
 using Content.Shared.NodeContainer;
 using Content.Shared.NodeContainer.NodeGroups;
@@ -78,7 +78,7 @@ private void PaintNodes(NodeContainerComponent nodeContainerComponent, NodeGroup
                 if (!EntityManager.TryGetComponent(x.Owner, out AtmosPipeColorComponent? atmosPipeColorComponent))
                     continue;
 
-                _pipeColorSystem.SetColor(x.Owner, atmosPipeColorComponent, color);
+                _pipeColorSystem.SetColor((x.Owner, atmosPipeColorComponent), color);
             }
         }
     }
diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
index d1eee5eb15f4..212f7c8b59ae 100644
--- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
+++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
@@ -225,7 +225,10 @@ private void UpdateEmergencyConsole(float frameTime)
             ShuttlesLeft = true;
             _chatSystem.DispatchGlobalAnnouncement(Loc.GetString("emergency-shuttle-left", ("transitTime", $"{TransitTime:0}")));
 
-            Timer.Spawn((int)(TransitTime * 1000) + _bufferTime.Milliseconds, () => _roundEnd.EndRound(), _roundEndCancelToken?.Token ?? default);
+            // STARLIGHT: End round immediately when shuttle launches, but add transit time to restart countdown
+            var restartTime = TimeSpan.FromSeconds(_configManager.GetCVar(CCVars.RoundRestartTime)) + TimeSpan.FromSeconds(TransitTime) + _bufferTime;
+            _roundEnd.EndRound(restartTime);
+            // STARLIGHT END
         }
 
         // All the others.
diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
index a3cb5cd81cf8..f7e6b8fa22fa 100644
--- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
+++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
@@ -260,18 +260,22 @@ private void OnEmergencyFTL(EntityUid uid, EmergencyShuttleComponent component,
     /// </summary>
     private void OnEmergencyFTLComplete(EntityUid uid, EmergencyShuttleComponent component, ref FTLCompletedEvent args)
     {
-        var countdownTime = TimeSpan.FromSeconds(_configManager.GetCVar(CCVars.RoundRestartTime));
+        // STARLOGHT: Round is already ended when shuttle launched, so just update the shuttle timers
         var shuttle = args.Entity;
         if (TryComp<DeviceNetworkComponent>(shuttle, out var net))
         {
+            // Get the remaining restart time from the round end system
+            var remainingTime = _roundEnd.ShuttleTimeLeft ?? TimeSpan.FromSeconds(_configManager.GetCVar(CCVars.RoundRestartTime));
+            
             var payload = new NetworkPayload
             {
                 [ShuttleTimerMasks.ShuttleMap] = shuttle,
                 [ShuttleTimerMasks.SourceMap] = _roundEnd.GetCentcomm(),
                 [ShuttleTimerMasks.DestMap] = _roundEnd.GetStation(),
-                [ShuttleTimerMasks.ShuttleTime] = countdownTime,
-                [ShuttleTimerMasks.SourceTime] = countdownTime,
-                [ShuttleTimerMasks.DestTime] = countdownTime,
+                [ShuttleTimerMasks.ShuttleTime] = remainingTime,
+                [ShuttleTimerMasks.SourceTime] = remainingTime,
+                [ShuttleTimerMasks.DestTime] = remainingTime,
+                // STARLIGHT END
             };
 
             // by popular request
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
index d3cc13f60f4f..31c8ed96a807 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
@@ -624,10 +624,7 @@ private void DoTheDinosaur(TransformComponent xform)
         {
             foreach (var child in toKnock)
             {
-                if (!_statusQuery.TryGetComponent(child, out var status))
-                    continue;
-
-                _stuns.TryParalyze(child, _hyperspaceKnockdownTime, true, status);
+                _stuns.TryUpdateParalyzeDuration(child, _hyperspaceKnockdownTime);
 
                 // If the guy we knocked down is on a spaced tile, throw them too
                 if (grid != null)
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs
index ba913b5581c1..ad4d7a224af6 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs
@@ -250,7 +250,7 @@ private void ThrowEntitiesOnGrid(EntityUid gridUid, TransformComponent xform, Ve
 
             if (direction.LengthSquared() > minsq)
             {
-                _stuns.TryKnockdown(uid, knockdownTime, true);
+                _stuns.TryUpdateKnockdownDuration(uid, knockdownTime);
                 _throwing.TryThrow(uid, direction, physics, Transform(uid), _projQuery, direction.Length(), playSound: false);
             }
             else
diff --git a/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs b/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs
index 5b215e9bea8a..c285063d2d91 100644
--- a/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs
@@ -19,9 +19,21 @@ public sealed class ReplacementAccentSystem : EntitySystem
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly ILocalizationManager _loc = default!;
 
+        private readonly Dictionary<ProtoId<ReplacementAccentPrototype>, (Regex regex, string replacement)[]>
+            _cachedReplacements = new();
+
         public override void Initialize()
         {
             SubscribeLocalEvent<ReplacementAccentComponent, AccentGetEvent>(OnAccent);
+
+            _proto.PrototypesReloaded += OnPrototypesReloaded;
+        }
+
+        public override void Shutdown()
+        {
+            base.Shutdown();
+
+            _proto.PrototypesReloaded -= OnPrototypesReloaded;
         }
 
         private void OnAccent(EntityUid uid, ReplacementAccentComponent component, AccentGetEvent args)
@@ -48,27 +60,22 @@ public string ApplyReplacements(string message, string accent)
                 return prototype.FullReplacements.Length != 0 ? Loc.GetString(_random.Pick(prototype.FullReplacements)) : "";
             }
 
-            if (prototype.WordReplacements == null)
-                return message;
-
             // Prohibition of repeated word replacements.
             // All replaced words placed in the final message are placed here as dashes (___) with the same length.
             // The regex search goes through this buffer message, from which the already replaced words are crossed out,
             // ensuring that the replaced words cannot be replaced again.
             var maskMessage = message;
 
-            foreach (var (first, replace) in prototype.WordReplacements)
+            foreach (var (regex, replace) in GetCachedReplacements(prototype))
             {
-                var f = _loc.GetString(first);
-                var r = _loc.GetString(replace);
                 // this is kind of slow but its not that bad
                 // essentially: go over all matches, try to match capitalization where possible, then replace
                 // rather than using regex.replace
-                for (int i = Regex.Count(maskMessage, $@"(?<!\w){f}(?!\w)", RegexOptions.IgnoreCase); i > 0; i--)
+                for (int i = regex.Count(maskMessage); i > 0; i--)
                 {
                     // fetch the match again as the character indices may have changed
-                    Match match = Regex.Match(maskMessage, $@"(?<!\w){f}(?!\w)", RegexOptions.IgnoreCase);
-                    var replacement = r;
+                    Match match = regex.Match(maskMessage);
+                    var replacement = replace;
 
                     // Intelligently replace capitalization
                     // two cases where we will do so:
@@ -98,5 +105,40 @@ public string ApplyReplacements(string message, string accent)
 
             return message;
         }
+
+        private (Regex regex, string replacement)[] GetCachedReplacements(ReplacementAccentPrototype prototype)
+        {
+            if (!_cachedReplacements.TryGetValue(prototype.ID, out var replacements))
+            {
+                replacements = GenerateCachedReplacements(prototype);
+                _cachedReplacements.Add(prototype.ID, replacements);
+            }
+
+            return replacements;
+        }
+
+        private (Regex regex, string replacement)[] GenerateCachedReplacements(ReplacementAccentPrototype prototype)
+        {
+            if (prototype.WordReplacements is not { } replacements)
+                return [];
+
+            return replacements.Select(kv =>
+                {
+                    var (first, replace) = kv;
+                    var firstLoc = _loc.GetString(first);
+                    var replaceLoc = _loc.GetString(replace);
+
+                    var regex = new Regex($@"(?<!\w){firstLoc}(?!\w)", RegexOptions.IgnoreCase);
+
+                    return (regex, replaceLoc);
+
+                })
+                .ToArray();
+        }
+
+        private void OnPrototypesReloaded(PrototypesReloadedEventArgs obj)
+        {
+            _cachedReplacements.Clear();
+        }
     }
 }
diff --git a/Content.Server/Speech/Muting/MutingSystem.cs b/Content.Server/Speech/Muting/MutingSystem.cs
index edf82bbfb286..f588e2238d6f 100644
--- a/Content.Server/Speech/Muting/MutingSystem.cs
+++ b/Content.Server/Speech/Muting/MutingSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Abilities.Mime;
+using Content.Shared.Abilities.Mime;
 using Content.Server.Chat.Systems;
 using Content.Server.Popups;
 using Content.Server.Speech.Components;
diff --git a/Content.Server/SprayPainter/SprayPainterSystem.cs b/Content.Server/SprayPainter/SprayPainterSystem.cs
index 24ab5e0ea290..a5e08a91a6fd 100644
--- a/Content.Server/SprayPainter/SprayPainterSystem.cs
+++ b/Content.Server/SprayPainter/SprayPainterSystem.cs
@@ -1,5 +1,5 @@
-using Content.Server.Atmos.Piping.Components;
-using Content.Server.Atmos.Piping.EntitySystems;
+using Content.Shared.Atmos.Components;
+using Content.Shared.Atmos.EntitySystems;
 using Content.Server.Charges;
 using Content.Server.Decals;
 using Content.Server.Destructible;
@@ -147,7 +147,7 @@ private void OnPipeDoAfter(Entity<SprayPainterComponent> ent, ref SprayPainterPi
             return;
 
         Audio.PlayPvs(ent.Comp.SpraySound, ent);
-        _pipeColor.SetColor(target, color, args.Color);
+        _pipeColor.SetColor((target, color), args.Color);
 
         args.Handled = true;
     }
diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs
index 79798abedc6c..b77b9f942786 100644
--- a/Content.Server/Station/Systems/StationSpawningSystem.cs
+++ b/Content.Server/Station/Systems/StationSpawningSystem.cs
@@ -5,7 +5,7 @@
 using Content.Server.GameTicking;
 using Content.Server.Humanoid;
 using Content.Server.IdentityManagement;
-using Content.Server.Mind.Commands;
+using Content.Server.Mind;
 using Content.Server.PDA;
 using Content.Server.Station.Components;
 using Content.Shared.Access.Components;
@@ -49,6 +49,7 @@ public sealed class StationSpawningSystem : SharedStationSpawningSystem
     [Dependency] private readonly MetaDataSystem _metaSystem = default!;
     [Dependency] private readonly PdaSystem _pdaSystem = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly MindSystem _mindSystem = default!;
     [Dependency] private readonly LimbSystem _limbSystem = default!;
     [Dependency] private readonly BodySystem _bodySystem = default!;
 
@@ -140,7 +141,7 @@ public EntityUid SpawnPlayerMob(
         {
             DebugTools.Assert(entity is null);
             var jobEntity = Spawn(prototype.JobEntity, coordinates);
-            MakeSentientCommand.MakeSentient(jobEntity, EntityManager);
+            _mindSystem.MakeSentient(jobEntity);
 
             // Make sure custom names get handled, what is gameticker control flow whoopy.
             if (loadout != null)
diff --git a/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs b/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs
index af167c214e9a..18c386d4ac05 100644
--- a/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs
+++ b/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs
@@ -1,8 +1,6 @@
 using Content.Server.Stunnable.Components;
-using Content.Shared.Standing;
-using Content.Shared.StatusEffect;
+using Content.Shared.Movement.Systems;
 using JetBrains.Annotations;
-using Robust.Shared.Physics.Dynamics;
 using Content.Shared.Throwing;
 using Robust.Shared.Physics.Events;
 
@@ -12,6 +10,7 @@ namespace Content.Server.Stunnable
     internal sealed class StunOnCollideSystem : EntitySystem
     {
         [Dependency] private readonly StunSystem _stunSystem = default!;
+        [Dependency] private readonly MovementModStatusSystem _movementMod = default!;
 
         public override void Initialize()
         {
@@ -22,24 +21,17 @@ public override void Initialize()
 
         private void TryDoCollideStun(EntityUid uid, StunOnCollideComponent component, EntityUid target)
         {
+            _stunSystem.TryUpdateStunDuration(target, component.StunAmount);
 
-            if (TryComp<StatusEffectsComponent>(target, out var status))
-            {
-                _stunSystem.TryStun(target, component.StunAmount, component.Refresh, status);
-
-                _stunSystem.TryKnockdown(target,
-                    component.KnockdownAmount,
-                    component.Refresh,
-                    component.AutoStand,
-                    status);
-
-                _stunSystem.TrySlowdown(target,
-                    component.SlowdownAmount,
-                    component.Refresh,
-                    component.WalkSpeedModifier,
-                    component.SprintSpeedModifier,
-                    status);
-            }
+            _stunSystem.TryKnockdown(target, component.KnockdownAmount, component.Refresh, component.AutoStand, force: true);
+
+            _movementMod.TryUpdateMovementSpeedModDuration(
+                target,
+                MovementModStatusSystem.TaserSlowdown,
+                component.SlowdownAmount,
+                component.WalkSpeedModifier,
+                component.SprintSpeedModifier
+            );
         }
 
         private void HandleCollide(EntityUid uid, StunOnCollideComponent component, ref StartCollideEvent args)
diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
index 624f414d7826..2a288d90175d 100644
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs
@@ -1,6 +1,8 @@
+using Content.Server.Administration.Logs;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.Emp;
 using Content.Shared.ActionBlocker;
+using Content.Shared.Database;
 using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Events;
 using Content.Shared.Power;
@@ -21,6 +23,8 @@ public sealed class SurveillanceCameraSystem : EntitySystem
     [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!;
     [Dependency] private readonly UserInterfaceSystem _userInterface = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+
 
     // Pings a surveillance camera subnet. All cameras will always respond
     // with a data message if they are on the same subnet.
@@ -170,6 +174,7 @@ private void OnSetName(EntityUid uid, SurveillanceCameraComponent component, Sur
         component.CameraId = args.Name;
         component.NameSet = true;
         UpdateSetupInterface(uid, component);
+        _adminLogger.Add(LogType.Chat, LogImpact.Low, $"{ToPrettyString(args.Actor)} set the name of {ToPrettyString(uid)} to \"{args.Name}.\"");
     }
 
     private void OnSetNetwork(EntityUid uid, SurveillanceCameraComponent component,
diff --git a/Content.Server/Tips/TipsSystem.cs b/Content.Server/Tips/TipsSystem.cs
index 4e4440e33446..8e057fae63c2 100644
--- a/Content.Server/Tips/TipsSystem.cs
+++ b/Content.Server/Tips/TipsSystem.cs
@@ -78,9 +78,13 @@ private CompletionResult SendTippyHelper(IConsoleShell shell, string[] args)
     {
         return args.Length switch
         {
-            1 => CompletionResult.FromHintOptions(CompletionHelper.SessionNames(), Loc.GetString("cmd-tippy-auto-1")),
+            1 => CompletionResult.FromHintOptions(
+                CompletionHelper.SessionNames(players: _playerManager),
+                Loc.GetString("cmd-tippy-auto-1")),
             2 => CompletionResult.FromHint(Loc.GetString("cmd-tippy-auto-2")),
-            3 => CompletionResult.FromHintOptions(CompletionHelper.PrototypeIDs<EntityPrototype>(), Loc.GetString("cmd-tippy-auto-3")),
+            3 => CompletionResult.FromHintOptions(
+                CompletionHelper.PrototypeIdsLimited<EntityPrototype>(args[2], _prototype),
+                Loc.GetString("cmd-tippy-auto-3")),
             4 => CompletionResult.FromHint(Loc.GetString("cmd-tippy-auto-4")),
             5 => CompletionResult.FromHint(Loc.GetString("cmd-tippy-auto-5")),
             6 => CompletionResult.FromHint(Loc.GetString("cmd-tippy-auto-6")),
diff --git a/Content.Server/Tools/ToolSystem.cs b/Content.Server/Tools/ToolSystem.cs
index a88dbd3653ff..c8defb5ef9e9 100644
--- a/Content.Server/Tools/ToolSystem.cs
+++ b/Content.Server/Tools/ToolSystem.cs
@@ -1,47 +1,5 @@
-using Content.Shared.Chemistry.Components.SolutionManager;
-using Content.Shared.FixedPoint;
-using Content.Shared.Tools.Components;
-
-using SharedToolSystem = Content.Shared.Tools.Systems.SharedToolSystem;
+using Content.Shared.Tools.Systems;
 
 namespace Content.Server.Tools;
 
-public sealed class ToolSystem : SharedToolSystem
-{
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
-
-        UpdateWelders(frameTime);
-    }
-
-    //todo move to shared once you can remove reagents from shared without it freaking out.
-    private void UpdateWelders(float frameTime)
-    {
-        var query = EntityQueryEnumerator<WelderComponent, SolutionContainerManagerComponent>();
-        while (query.MoveNext(out var uid, out var welder, out var solutionContainer))
-        {
-            if (!welder.Enabled)
-                continue;
-
-            welder.WelderTimer += frameTime;
-
-            if (welder.WelderTimer < welder.WelderUpdateTimer)
-                continue;
-
-            if (!SolutionContainerSystem.TryGetSolution((uid, solutionContainer), welder.FuelSolutionName, out var solutionComp, out var solution))
-                continue;
-
-            SolutionContainerSystem.RemoveReagent(solutionComp.Value, welder.FuelReagent, welder.FuelConsumption * welder.WelderTimer);
-
-            if (solution.GetTotalPrototypeQuantity(welder.FuelReagent) <= FixedPoint2.Zero)
-            {
-                ItemToggle.Toggle(uid, predicted: false);
-            }
-
-            Dirty(uid, welder);
-            welder.WelderTimer -= welder.WelderUpdateTimer;
-        }
-    }
-}
-
+public sealed class ToolSystem : SharedToolSystem;
diff --git a/Content.Server/Vampire/VampireSystem.Abilities.cs b/Content.Server/Vampire/VampireSystem.Abilities.cs
index 8eadcbe0dbd0..33b7a75eac5a 100644
--- a/Content.Server/Vampire/VampireSystem.Abilities.cs
+++ b/Content.Server/Vampire/VampireSystem.Abilities.cs
@@ -341,9 +341,9 @@ private void Screech(Entity<VampireComponent> vampire, TimeSpan? duration, Damag
             if (HasComp<VampireComponent>(entity))
                 continue;
 
-            if (HasComp<HumanoidAppearanceComponent>(entity))
+            if (TryComp<KnockedDownComponent>(entity, out var knockedDownComponent))
             {
-                _stun.TryParalyze(entity, duration ?? TimeSpan.FromSeconds(3), false);
+                _stun.UpdateKnockdownTime((entity, knockedDownComponent), duration ?? TimeSpan.FromSeconds(3), false);
                 _chat.TryEmoteWithoutChat(entity, _prototypeManager.Index<EmotePrototype>(VampireComponent.ScreamEmoteProto), true);
             }
 
@@ -364,14 +364,18 @@ private void Glare(Entity<VampireComponent> vampire, EntityUid? target, TimeSpan
 
         if (HasComp<BibleUserComponent>(target))
         {
-            _stun.TryParalyze(vampire, duration ?? TimeSpan.FromSeconds(3), true);
+            if (TryComp<KnockedDownComponent>(vampire, out var knockdown))
+                _stun.UpdateKnockdownTime((vampire, knockdown), duration ?? TimeSpan.FromSeconds(3), true);
             _chat.TryEmoteWithoutChat(vampire.Owner, _prototypeManager.Index<EmotePrototype>(VampireComponent.ScreamEmoteProto), true);
             if (damage != null)
                 _damageableSystem.TryChangeDamage(vampire.Owner, damage);
             return;
         }
 
-        _stun.TryParalyze(target.Value, duration ?? TimeSpan.FromSeconds(3), true);
+        if (!TryComp<KnockedDownComponent>(target, out var tgtKnockdown))
+            return;
+
+        _stun.UpdateKnockdownTime((target.Value,tgtKnockdown), duration ?? TimeSpan.FromSeconds(3), true);
     }
     private void PolymorphSelf(Entity<VampireComponent> vampire, string? polymorphTarget)
     {
diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs
index 23a744ddd68d..a73e0673fbd3 100644
--- a/Content.Server/VendingMachines/VendingMachineSystem.cs
+++ b/Content.Server/VendingMachines/VendingMachineSystem.cs
@@ -22,6 +22,13 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
+// 🌟Starlight🌟 
+using Content.Server.Economy;
+using Content.Shared.Economy;
+using Content.Shared.Emag.Components;
+using Content.Shared.Tag; 
+using Content.Shared.Cargo.Components; 
+using Content.Server.Administration.Managers; 
 
 namespace Content.Server.VendingMachines
 {
@@ -31,6 +38,14 @@ public sealed class VendingMachineSystem : SharedVendingMachineSystem
         [Dependency] private readonly PricingSystem _pricing = default!;
         [Dependency] private readonly ThrowingSystem _throwingSystem = default!;
         [Dependency] private readonly IGameTiming _timing = default!;
+        // 🌟Starlight🌟 start 
+        [Dependency] private readonly ItemPriceManager _itemPriceManager = default!; 
+        [Dependency] private readonly IComponentFactory _componentFactory = default!; 
+        [Dependency] private readonly IPlayerRolesManager _playerRolesManager = default!; 
+        [Dependency] private readonly TagSystem _tag = default!; 
+        [Dependency] private readonly CargoSystem _cargoSystem = default!;
+        [Dependency] private readonly Content.Server.Station.Systems.StationSystem _stationSystem = default!;
+        // 🌟Starlight🌟 end 
 
         private const float WallVendEjectDistanceFromWall = 1f;
 
@@ -52,8 +67,11 @@ public override void Initialize()
             SubscribeLocalEvent<VendingMachineComponent, RestockDoAfterEvent>(OnDoAfter);
 
             SubscribeLocalEvent<VendingMachineRestockComponent, PriceCalculationEvent>(OnPriceCalculation);
-        }
 
+            // 🌟Starlight🌟 Push balance immediately when the UI opens so the client doesn't have to wait for a request/refresh
+            // Because im gonna loose this shit with calling from client
+            SubscribeLocalEvent<VendingMachineComponent, BoundUIOpenedEvent>(OnUiOpened);
+        }
         private void OnVendingPrice(EntityUid uid, VendingMachineComponent component, ref PriceCalculationEvent args)
         {
             var price = 0.0;
@@ -80,6 +98,9 @@ protected override void OnMapInit(EntityUid uid, VendingMachineComponent compone
             {
                 TryUpdateVisualState((uid, component));
             }
+
+            //🌟Starlight🌟 Persist prices so UI shows them on first open
+            PersistInventoryPrices(uid, component);
         }
 
         private void OnActivatableUIOpenAttempt(EntityUid uid, VendingMachineComponent component, ActivatableUIOpenAttemptEvent args)
@@ -302,6 +323,23 @@ private void OnPriceCalculation(EntityUid uid, VendingMachineRestockComponent co
             args.Price += priceSets.Max();
         }
 
+        // 🌟Starlight🌟 Send balance to the opening player right away so it shows before any purchase
+        private void OnUiOpened(EntityUid uid, VendingMachineComponent component, BoundUIOpenedEvent args)
+        {
+            if (!Equals(args.UiKey, VendingMachineUiKey.Key))
+                return;
+
+            if (!component.ShowPrices)
+                return;
+
+            var actor = args.Actor;
+            var playerData = _playerRolesManager.GetPlayerData(actor);
+            if (playerData != null)
+            {
+                SendBalanceUpdate(uid, actor, playerData.Balance);
+            }
+        }
+
         private void OnEmpPulse(EntityUid uid, VendingMachineComponent component, ref EmpPulseEvent args)
         {
             if (!component.Broken && this.IsPowered(uid, EntityManager))
@@ -316,5 +354,282 @@ private void OnTryVocalize(Entity<VendingMachineComponent> ent, ref TryVocalizeE
         {
             args.Cancelled |= ent.Comp.Broken;
         }
+
+        #region 🌟Starlight🌟 
+        /// <summary>
+        /// Persist prices into the live component so clients have prices on first open
+        /// </summary>
+        private void PersistInventoryPrices(EntityUid uid, VendingMachineComponent component)
+        {
+        var isEmagged = HasComp<EmaggedComponent>(uid);
+            void PriceDict(Dictionary<string, VendingMachineInventoryEntry> dict)
+            {
+                foreach (var entry in dict.Values)
+                {
+            if (!component.ShowPrices || isEmagged)
+                    {
+                        entry.Price = 0;
+                        continue;
+                    }
+
+                    if (PrototypeManager.TryIndex<EntityPrototype>(entry.ID, out var proto) &&
+                        proto.TryGetComponent<ItemPriceComponent>(out var priceComponent, _componentFactory))
+                    {
+                        var categoryPrice = _itemPriceManager.GetPriceForPrototype(entry.ID, priceComponent.PriceCategory);
+                        entry.Price = categoryPrice ?? priceComponent.FallbackPrice;
+                    }
+                    else
+                    {
+                        if (PrototypeManager.TryIndex<EntityPrototype>(entry.ID, out var p2))
+                        {
+                            var guessed = GuessCategory(p2);
+                            if (guessed != null)
+                            {
+                                var catPrice = _itemPriceManager.GetPriceForPrototype(entry.ID, guessed);
+                                if (catPrice.HasValue)
+                                {
+                                    entry.Price = catPrice.Value;
+                                    continue;
+                                }
+                            }
+
+                            var est = _pricing.GetEstimatedPrice(p2);
+                            entry.Price = Math.Max(1, (int) Math.Round(est));
+                        }
+                        else
+                        {
+                            entry.Price = 1;
+                        }
+                    }
+                }
+            }
+
+            PriceDict(component.Inventory);
+            PriceDict(component.EmaggedInventory);
+            PriceDict(component.ContrabandInventory);
+
+            Dirty(uid, component);
+        }
+
+        /// <summary>
+        /// Override to calculate prices for vending machine inventory entries using ItemPriceManager
+        /// </summary>
+        protected override void CalculateInventoryPrices(Dictionary<string, VendingMachineInventoryEntry> inventory, bool showPrices)
+        {
+            foreach (var entry in inventory.Values)
+            {
+                if (!showPrices)
+                {
+                    entry.Price = 0; // Free items for machines
+                    continue;
+                }
+
+                if (!PrototypeManager.TryIndex<EntityPrototype>(entry.ID, out var proto))
+                {
+                    entry.Price = 1;
+                    continue;
+                }
+
+                // Try to get price from ItemPriceManager using prototype
+                if (proto.Components.TryGetComponent("ItemPrice", out var comp) && comp is ItemPriceComponent priceComponent)
+                {
+                    // Use the new GetPriceForPrototype method to ensure consistent pricing
+                    var categoryPrice = _itemPriceManager.GetPriceForPrototype(entry.ID, priceComponent.PriceCategory);
+                    entry.Price = categoryPrice ?? priceComponent.FallbackPrice;
+                }
+                else
+                {
+                    // Ensure a sensible fallback even if no ItemPriceComponent is present
+                    var guessed = GuessCategory(proto);
+                    if (guessed != null)
+                    {
+                        var catPrice = _itemPriceManager.GetPriceForPrototype(entry.ID, guessed);
+                        if (catPrice.HasValue)
+                        {
+                            entry.Price = catPrice.Value;
+                            continue;
+                        }
+                    }
+
+                    var est = _pricing.GetEstimatedPrice(proto);
+                    entry.Price = Math.Max(1, (int) Math.Round(est));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Override to handle balance requests from client
+        /// </summary>
+        protected override void OnRequestBalanceMessage(Entity<VendingMachineComponent> entity, ref VendingMachineRequestBalanceMessage args)
+        {
+            if (args.Actor is not { Valid: true } actor)
+            {
+                return;
+            }
+
+            var playerData = _playerRolesManager.GetPlayerData(actor);
+            if (playerData != null)
+            {
+                SendBalanceUpdate(entity.Owner, actor, playerData.Balance);
+            }
+        }
+
+        /// <summary>
+        /// Sends balance update to client
+        /// </summary>
+        private void SendBalanceUpdate(EntityUid uid, EntityUid player, int balance)
+        {
+            if (TryComp<VendingMachineComponent>(uid, out var component))
+            {
+                UISystem.ServerSendUiMessage(uid, VendingMachineUiKey.Key,
+                    new VendingMachineBalanceUpdateMessage(balance), player);
+            }
+        }
+
+        public override void AuthorizedVend(EntityUid uid, EntityUid sender, InventoryType type, string itemId, VendingMachineComponent component)
+        {
+            // Guard rails before any payment to avoid overcharging on spaming
+            if (!this.IsPowered(uid, EntityManager))
+                return;
+
+            if (!IsAuthorized(uid, sender, component))
+                return;
+
+            // If an ejection is already in progress or machine is broken, ignore
+            if (component.Ejecting || component.Broken)
+                return;
+
+            if (!TryComp<ActorComponent>(sender, out var actor))
+                return;
+
+            // Get player data for payment
+            var playerData = _playerRolesManager.GetPlayerData(sender);
+            if (playerData == null)
+            {
+                return;
+            }
+
+            // Get inventory entry for the correct inventory bucket
+            var entry = GetEntry(uid, itemId, type, component);
+            if (entry == null)
+                return;
+
+            if (entry.Amount <= 0)
+                return;
+
+            var isEmagged = HasComp<EmaggedComponent>(uid);
+
+            // If prices should be shown but this entry still has a 0 price, (likely because UI pricing
+            // operated on a copied dictionary and did not persist back to the component inventory)
+            // compute and persist the price now so payment logic can run
+            if (!isEmagged && component.ShowPrices && entry.Price <= 0)
+            {
+                if (PrototypeManager.TryIndex<EntityPrototype>(itemId, out var proto) &&
+                    proto.TryGetComponent<ItemPriceComponent>(out var priceComponent, _componentFactory))
+                {
+                    var categoryPrice = _itemPriceManager.GetPriceForPrototype(itemId, priceComponent.PriceCategory);
+                    entry.Price = categoryPrice ?? priceComponent.FallbackPrice;
+                }
+                else
+                {
+                    if (PrototypeManager.TryIndex<EntityPrototype>(itemId, out var p2))
+                    {
+                        var guessed = GuessCategory(p2);
+                        if (guessed != null)
+                        {
+                            var catPrice = _itemPriceManager.GetPriceForPrototype(itemId, guessed);
+                            if (catPrice.HasValue)
+                            {
+                                entry.Price = catPrice.Value;
+                            }
+                            else
+                            {
+                                var est = _pricing.GetEstimatedPrice(p2);
+                                entry.Price = Math.Max(1, (int) Math.Round(est));
+                            }
+                        }
+                        else
+                        {
+                            var est = _pricing.GetEstimatedPrice(p2);
+                            entry.Price = Math.Max(1, (int) Math.Round(est));
+                        }
+                    }
+                    else
+                    {
+                        entry.Price = 1;
+                    }
+                }
+            }
+
+            // If payment is required, pre-check funds but DO NOT! deduct yet
+            if (!isEmagged && component.ShowPrices && entry.Price > 0)
+            {
+                if (playerData.Balance < entry.Price)
+                {
+                    Popup.PopupEntity($"Insufficient funds. Required: {entry.Price}\u20a1", uid, sender);
+                    return;
+                }
+            }
+
+            // Try to start ejection, only one call will succeed while others will early-out due to Ejecting flag
+            var wasEjecting = component.Ejecting;
+            TryEjectVendorItem(uid, type, itemId, component.CanShoot, sender, component);
+            var started = !wasEjecting && component.Ejecting && component.NextItemToEject == itemId;
+
+            // If our call didnt actually start the ejection, exit without charging
+            if (!started)
+                return;
+
+            // Proceed with payment now that we are the one vend starting
+            if (!isEmagged && component.ShowPrices && entry.Price > 0)
+            {
+                playerData.Balance -= entry.Price;
+                Popup.PopupEntity($"Debited {entry.Price}\u20a1. Balance: {playerData.Balance}\u20a1", uid, sender);
+                SendBalanceUpdate(uid, sender, playerData.Balance);
+
+                var stationUid = _stationSystem.GetOwningStation(uid);
+                if (stationUid != null && TryComp<StationBankAccountComponent>(stationUid, out var bank))
+                {
+                    var creditLong = (long) entry.Price * 10L; // idk really, it just works
+                    var toCredit = creditLong > int.MaxValue ? int.MaxValue: creditLong < int.MinValue ? int.MinValue : (int) creditLong;
+
+                    if (toCredit > 0)
+                        _cargoSystem.UpdateBankAccount((stationUid.Value, bank), toCredit, bank.PrimaryAccount);
+                }
+            }
+        }
+
+    private static readonly ProtoId<TagPrototype> _foodSnackTag = "FoodSnack";
+    private static readonly ProtoId<TagPrototype> _cigaretteTag = "Cigarette";
+    private static readonly ProtoId<TagPrototype> _cigarTag = "Cigar";
+
+        private string? GuessCategory(EntityPrototype proto)
+        {
+            // Prefer tags if present on the prototype
+            if (proto.TryGetComponent<TagComponent>(out var tagComp, _componentFactory))
+            {
+                if (_tag.HasTag(tagComp, _foodSnackTag))
+                    return "food_cheap";
+                if (_tag.HasTag(tagComp, _cigaretteTag) || _tag.HasTag(tagComp, _cigarTag))
+                    return "cigaretes";
+            }
+
+            // Heuristic on prototype ID
+            var id = proto.ID.ToLowerInvariant();
+            if (id.Contains("cig"))
+                return "cigaretes";
+            if (id.Contains("cola") || id.Contains("drink") || id.Contains("soda") || id.Contains("beer") || id.Contains("juice"))
+                return "drink";
+            if (id.Contains("snack") || id.Contains("chips") || id.Contains("donk") || id.Contains("candy") || id.Contains("bar"))
+                return "food_cheap";
+
+            if (proto.TryGetComponent<Content.Shared.Clothing.Components.ClothingComponent>(out _, _componentFactory))
+                return "clothing";
+            if (id.StartsWith("clothing") || id.Contains("uniform") || id.Contains("shoes") || id.Contains("gloves") || id.Contains("belt") || id.Contains("backpack") || id.Contains("hat") || id.Contains("mask") || id.Contains("coat") || id.Contains("jacket"))
+                return "clothing";
+
+            return null;
+        }
+    #endregion
     }
 }
diff --git a/Content.Server/Voting/VoteCommands.cs b/Content.Server/Voting/VoteCommands.cs
index e526829d272a..8688c665a3b5 100644
--- a/Content.Server/Voting/VoteCommands.cs
+++ b/Content.Server/Voting/VoteCommands.cs
@@ -114,12 +114,12 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
                 {
                     var ties = string.Join(", ", eventArgs.Winners.Select(c => args[(int) c]));
                     _adminLogger.Add(LogType.Vote, LogImpact.Medium, $"Custom vote {options.Title} finished as tie: {ties}");
-                    _chatManager.DispatchServerAnnouncement(Loc.GetString("cmd-customvote-on-finished-tie", ("ties", ties)));
+                    _chatManager.DispatchServerAnnouncement(Loc.GetString("cmd-customvote-on-finished-tie", ("title", options.Title), ("ties", ties)));
                 }
                 else
                 {
                     _adminLogger.Add(LogType.Vote, LogImpact.Medium, $"Custom vote {options.Title} finished: {args[(int) eventArgs.Winner]}");
-                    _chatManager.DispatchServerAnnouncement(Loc.GetString("cmd-customvote-on-finished-win", ("winner", args[(int) eventArgs.Winner])));
+                    _chatManager.DispatchServerAnnouncement(Loc.GetString("cmd-customvote-on-finished-win", ("title", options.Title), ("winner", args[(int) eventArgs.Winner])));
                 }
 
                 _voteWebhooks.UpdateWebhookIfConfigured(webhookState, eventArgs);
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
index 5d73edd8ec99..75762bd30c3d 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
@@ -1,22 +1,39 @@
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
-using Content.Server.Atmos.EntitySystems;
 using Content.Server.Atmos.Components;
+using Content.Server.Atmos.EntitySystems;
+using Content.Server.Body.Components;
 using Content.Server.Cargo.Systems;
+using Content.Server.Decals;
+using Content.Server.Emp;
+using Content.Server.IgnitionSource;
 using Content.Server.Interaction;
 using Content.Server.Mech.Equipment.Components;
 using Content.Server.Power.EntitySystems;
-using Content.Server.Weapons.Ranged.Components;
+using Content.Server.PowerCell;
 using Content.Server.Stunnable;
 using Content.Server.Stunnable.Components;
-using Content.Server.Emp;
+using Content.Server.Weapons.Ranged.Components;
+using Content.Shared._Starlight.Weapon;
+using Content.Shared._Starlight.Weapon.Components;
+using Content.Shared.Body.Components;
+using Content.Shared.Cargo;
+using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Damage;
+using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
+using Content.Shared.Decals;
 using Content.Shared.Effects;
 using Content.Shared.Interaction.Components;
 using Content.Shared.Mech.Equipment.Components;
+using Content.Shared.Movement.Components;
+using Content.Shared.Movement.Systems;
+using Content.Shared.Pinpointer;
 using Content.Shared.Projectiles;
+using Content.Shared.Standing;
 using Content.Shared.StatusEffect;
 using Content.Shared.Weapons.Melee;
 using Content.Shared.Weapons.Ranged;
@@ -24,37 +41,20 @@
 using Content.Shared.Weapons.Ranged.Events;
 using Content.Shared.Weapons.Ranged.Systems;
 using Content.Shared.Weapons.Reflect;
-using Content.Shared.Damage.Components;
+using Microsoft.CodeAnalysis.Elfie.Diagnostics;
+using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
+using Robust.Shared.Containers;
 using Robust.Shared.Map;
+using Robust.Shared.Maths;
 using Robust.Shared.Physics;
+using Robust.Shared.Physics.Dynamics;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
-using Robust.Shared.Containers;
-using Content.Shared._Starlight.Weapon.Components;
-using Robust.Shared.Physics.Dynamics;
-using Content.Shared.Movement.Components;
 using Robust.Shared.Random;
-using Content.Shared.Decals;
-using Content.Server.Body.Components;
-using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.Timing;
-using Content.Server.Decals;
-using System;
-using Content.Server.IgnitionSource;
-using Content.Server.Atmos.EntitySystems;
-using Microsoft.CodeAnalysis.Elfie.Diagnostics;
-using Content.Server.Atmos.Components;
-using Content.Shared._Starlight.Weapon;
-using Robust.Shared.Maths;
+using Robust.Shared.Utility;
 using static Content.Server.Starlight.TextToSpeech.TTSManager;
-using Content.Shared.Pinpointer;
-using Robust.Server.GameObjects;
-using System.Collections.Generic;
-using Content.Server.PowerCell;
-using Content.Shared.Body.Components;
-using Content.Shared.Cargo;
 
 namespace Content.Server.Weapons.Ranged.Systems;
 
@@ -75,6 +75,7 @@ public sealed partial class GunSystem : SharedGunSystem
     [Dependency] private readonly FlammableSystem _flammableSystem = default!; // 🌟Starlight🌟
     [Dependency] private readonly AtmosphereSystem _atmosphere = default!; // 🌟Starlight🌟
     [Dependency] private readonly StunSystem _stunSystem = default!; // 🌟Starlight🌟
+    [Dependency] private readonly MovementModStatusSystem _movementMod = default!; // 🌟Starlight🌟
     [Dependency] private readonly EmpSystem _emp = default!; // 🌟Starlight🌟
 
     private const float DamagePitchVariation = 0.05f;
@@ -310,13 +311,19 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
                         if (hitscan.StaminaDamage > 0f)
                             _stamina.TakeStaminaDamage(hitEntity, hitscan.StaminaDamage, source: user);
 
-                        if (TryComp<StatusEffectsComponent>(hitEntity, out var status))
+                        if (TryComp<StandingStateComponent>(hitEntity, out var standing))
                         {
-                            _stunSystem.TryStun(hitEntity, TimeSpan.FromSeconds(hitscan.StunAmount), true, status);
+                            _stunSystem.TryAddStunDuration(hitEntity, TimeSpan.FromSeconds(hitscan.StunAmount));
 
-                            _stunSystem.TryKnockdown(hitEntity, TimeSpan.FromSeconds(hitscan.KnockdownAmount), true, status: status);
+                            _stunSystem.TryKnockdown((hitEntity, standing), TimeSpan.FromSeconds(hitscan.KnockdownAmount), true);
 
-                            _stunSystem.TrySlowdown(hitEntity, TimeSpan.FromSeconds(hitscan.SlowdownAmount), true, hitscan.WalkSpeedMultiplier, hitscan.RunSpeedMultiplier, status);
+                            _movementMod.TryUpdateMovementSpeedModDuration(
+                                hitEntity,
+                                MovementModStatusSystem.TaserSlowdown,
+                                TimeSpan.FromSeconds(hitscan.SlowdownAmount),
+                                hitscan.WalkSpeedMultiplier,
+                                hitscan.RunSpeedMultiplier
+                            );
                         }
 
                         if (hitscan.Ignite)
@@ -806,7 +813,6 @@ private void FireEffects(List<List<(EntityCoordinates fromCoordinates, float dis
             }
         }
 
-
         if (pvs.Count > 0)
         {
             var filter = Filter.Empty();
@@ -816,6 +822,5 @@ private void FireEffects(List<List<(EntityCoordinates fromCoordinates, float dis
             RaiseNetworkEvent(hitscanEvent, filter);
         }
     }
-
     #endregion
 }
diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs
index 7a9ff019aca5..ff8f32ec1b5f 100644
--- a/Content.Server/Zombies/ZombieSystem.Transform.cs
+++ b/Content.Server/Zombies/ZombieSystem.Transform.cs
@@ -7,7 +7,6 @@
 using Content.Server.IdentityManagement;
 using Content.Server.Inventory;
 using Content.Server.Mind;
-using Content.Server.Mind.Commands;
 using Content.Server.NPC;
 using Content.Server.NPC.HTN;
 using Content.Server.NPC.Systems;
@@ -218,7 +217,7 @@ public void ZombifyEntity(EntityUid target, MobStateComponent? mobState = null)
         _popup.PopupEntity(Loc.GetString("zombie-transform", ("target", target)), target, PopupType.LargeCaution);
 
         //Make it sentient if it's an animal or something
-        MakeSentientCommand.MakeSentient(target, EntityManager);
+        _mind.MakeSentient(target);
 
         //Make the zombie not die in the cold. Good for space zombies
         if (TryComp<TemperatureComponent>(target, out var tempComp))
diff --git a/Content.Server/_NullLink/ConditionPlayerCount.cs b/Content.Server/_NullLink/ConditionPlayerCount.cs
new file mode 100644
index 000000000000..c134916aca87
--- /dev/null
+++ b/Content.Server/_NullLink/ConditionPlayerCount.cs
@@ -0,0 +1,9 @@
+using Content.Server.Connection.Whitelist;
+
+namespace Content.Server._NullLink;
+
+public sealed partial class NullLinkRolesCondition : WhitelistCondition
+{
+    [DataField]
+    public List<ulong> Roles = [];
+}
\ No newline at end of file
diff --git a/Content.Server/_NullLink/HubSystem.Server.cs b/Content.Server/_NullLink/HubSystem.Server.cs
index c92f7eef3344..e188a310b789 100644
--- a/Content.Server/_NullLink/HubSystem.Server.cs
+++ b/Content.Server/_NullLink/HubSystem.Server.cs
@@ -11,6 +11,7 @@ public sealed partial class HubSystem : EntitySystem
     private string? _hostname;
     private string? _connectionString;
     private string? _description;
+    private bool? _isAdultOnly;
     private ServerType _serverType = ServerType.NRP;
 
     public void InitializeServer()
@@ -20,9 +21,16 @@ public void InitializeServer()
         _cfg.OnValueChanged(NullLinkCCVars.Description, OnGameDescChanged, true);
         _cfg.OnValueChanged(NullLinkCCVars.Type, OnServerTypeChanged, true);
         _cfg.OnValueChanged(NullLinkCCVars.Title, OnGameHostNameChanged, true);
+        _cfg.OnValueChanged(NullLinkCCVars.IsAdultOnly, OnIsAdultOnlyChanged, true);
         _cfg.OnValueChanged(CCVars.HubServerUrl, OnConnectionStringChanged, true);
     }
 
+    private void OnIsAdultOnlyChanged(bool isAdultOnly)
+    {
+        _isAdultOnly = isAdultOnly;
+        TryUpdateServer();
+    }
+
     private void OnServerTypeChanged(Shared.NullLink.CCVar.ServerType type)
     {
         _serverType = (ServerType)type;
@@ -50,7 +58,8 @@ private void TryUpdateServer()
     {
         if (string.IsNullOrEmpty(_hostname)
             || string.IsNullOrEmpty(_connectionString)
-            || !_actors.Enabled)
+            || !_actors.Enabled
+            || _isAdultOnly is null)
             return;
 
         Pipe.RunInBackgroundVT(async () =>
@@ -62,7 +71,7 @@ private void TryUpdateServer()
             {
                 try
                 {
-                    if(!_actors.TryGetServerGrain(out var serverGrain))
+                    if (!_actors.TryGetServerGrain(out var serverGrain))
                     {
                         await Task.Delay(BackoffMs);
                         continue;
@@ -73,15 +82,16 @@ await serverGrain.UpdateServer(new()
                         Title = _hostname,
                         ConnectionString = _connectionString,
                         Description = _description,
+                        IsAdultOnly = _isAdultOnly ?? false,
                         Type = _serverType
                     });
-                    return;                          
+                    return;
                 }
                 catch when (attempt < MaxRetries)
                 {
-                    await Task.Delay(BackoffMs);       
+                    await Task.Delay(BackoffMs);
                 }
             }
-        }, ex=> _sawmill.Log(LogLevel.Warning, ex, "NullLink – failed to update server in the cluster."));
+        }, ex => _sawmill.Log(LogLevel.Warning, ex, "NullLink – failed to update server in the cluster."));
     }
 }
\ No newline at end of file
diff --git a/Content.Server/_NullLink/HubSystem.cs b/Content.Server/_NullLink/HubSystem.cs
index b2af3ba41b77..42ad77969820 100644
--- a/Content.Server/_NullLink/HubSystem.cs
+++ b/Content.Server/_NullLink/HubSystem.cs
@@ -145,6 +145,9 @@ private void OnUnsubscribe(NullLink.Unsubscribe _, EntitySessionEventArgs args)
 
     public Task Updated(string key, NLServer value)
     {
+        if (!value.IsAdultOnly == _isAdultOnly)
+            return Task.CompletedTask;
+
         _serverData.AddOrUpdate(key, Map(value), (k, v) => Map(value));
         _updateEvents.Enqueue(new NullLink.AddOrUpdateServer
         {
diff --git a/Content.Server/_NullLink/PlayerData/INullLinkPlayerManager.cs b/Content.Server/_NullLink/PlayerData/INullLinkPlayerManager.cs
index 76b56b689ceb..2db947899760 100644
--- a/Content.Server/_NullLink/PlayerData/INullLinkPlayerManager.cs
+++ b/Content.Server/_NullLink/PlayerData/INullLinkPlayerManager.cs
@@ -8,6 +8,7 @@ public interface INullLinkPlayerManager
 {
     IEnumerable<ICommonSession> Mentors { get; }
 
+    string GetDiscordAuthUrl(string customState);
     void Initialize();
     void Shutdown();
     ValueTask SyncRoles(PlayerRolesSyncEvent ev);
diff --git a/Content.Server/_NullLink/PlayerData/NullLinkPlayerManager.Linking.cs b/Content.Server/_NullLink/PlayerData/NullLinkPlayerManager.Linking.cs
index 99b3665a3fd2..8bb90f5b5a5b 100644
--- a/Content.Server/_NullLink/PlayerData/NullLinkPlayerManager.Linking.cs
+++ b/Content.Server/_NullLink/PlayerData/NullLinkPlayerManager.Linking.cs
@@ -20,7 +20,7 @@ public void InitializeLinking()
         _discordCallback = _cfg.GetCVar(StarlightCCVars.DiscordCallback);
         _secret = _cfg.GetCVar(StarlightCCVars.Secret);
     }
-    private string GetDiscordAuthUrl(string customState)
+    public string GetDiscordAuthUrl(string customState)
     {
         if (string.IsNullOrEmpty(_discordCallback) || string.IsNullOrEmpty(_discordKey) || string.IsNullOrEmpty(_secret)) 
             return "";
diff --git a/Content.Server/_Starlight/Antags/Abductor/EntitySystems/AbductorSystem.RoundEnd.cs b/Content.Server/_Starlight/Antags/Abductor/EntitySystems/AbductorSystem.RoundEnd.cs
new file mode 100644
index 000000000000..c5fe1708098a
--- /dev/null
+++ b/Content.Server/_Starlight/Antags/Abductor/EntitySystems/AbductorSystem.RoundEnd.cs
@@ -0,0 +1,80 @@
+using System.Collections.Generic;
+using Content.Server.GameTicking;
+using Content.Shared.Mind;
+using Content.Shared.Players;
+using Content.Shared.Starlight.Antags.Abductor;
+using Robust.Shared.Localization;
+using Robust.Server.Player;
+using Robust.Shared.Network;
+
+namespace Content.Server.Starlight.Antags.Abductor;
+
+public sealed partial class AbductorSystem
+{
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    private void InitializeRoundEnd()
+    {
+        SubscribeLocalEvent<RoundEndTextAppendEvent>(OnRoundEndText);
+    }
+
+    private void OnRoundEndText(RoundEndTextAppendEvent ev)
+    {
+        var uniqueVictims = new HashSet<NetEntity>();
+
+        var query = EntityQueryEnumerator<AbductConditionComponent>();
+        while (query.MoveNext(out var _, out var cond))
+        {
+            foreach (var victim in cond.AbductedHashs)
+                uniqueVictims.Add(victim);
+        }
+
+    int total = uniqueVictims.Count;
+
+    var abductors = new List<string>();
+
+    var abductorsSeen = new HashSet<NetUserId>();
+
+        var mindQuery = EntityQueryEnumerator<MindComponent>();
+        while (mindQuery.MoveNext(out var _, out var mind))
+        {
+            if (mind.Objectives.Count == 0)
+                continue;
+
+            var isAbductor = false;
+            foreach (var objective in mind.Objectives)
+            {
+                if (HasComp<AbductConditionComponent>(objective))
+                {
+                    isAbductor = true;
+                    break;
+                }
+            }
+
+            if (!isAbductor)
+                continue;
+
+            var userId = mind.UserId ?? mind.OriginalOwnerUserId;
+            if (userId != null && _playerManager.TryGetPlayerData(userId.Value, out var pdata))
+            {
+                var name = pdata.ContentData()?.Name;
+
+                if (!string.IsNullOrWhiteSpace(name) && abductorsSeen.Add(userId.Value))
+                    abductors.Add(name!);
+            }
+        }
+
+        if (total > 0 || abductors.Count > 0)
+        {
+            ev.AddLine(Loc.GetString("round-end-prepend-abductor-abducted", ("number", total)));
+
+            if (abductors.Count > 0)
+            {
+                ev.AddLine(Loc.GetString("round-end-prepend-abductor-were"));
+                foreach (var name in abductors)
+                {
+                    ev.AddLine(Loc.GetString("round-end-prepend-abductor-name", ("name", name)));
+                }
+            }
+        }
+    }
+}
diff --git a/Content.Server/_Starlight/Antags/Abductor/EntitySystems/AbductorSystem.cs b/Content.Server/_Starlight/Antags/Abductor/EntitySystems/AbductorSystem.cs
index 72b6fbcb1cc8..f79475611508 100644
--- a/Content.Server/_Starlight/Antags/Abductor/EntitySystems/AbductorSystem.cs
+++ b/Content.Server/_Starlight/Antags/Abductor/EntitySystems/AbductorSystem.cs
@@ -49,6 +49,7 @@ public override void Initialize()
         InitializeOrgans();
         InitializeVest();
         InitializeExtractor();
+        InitializeRoundEnd();
         base.Initialize();
     }
 
diff --git a/Content.Server/_Starlight/Economy/Atm/ATMSystem.cs b/Content.Server/_Starlight/Economy/Atm/ATMSystem.cs
index abd4727925b8..a7d4aef25064 100644
--- a/Content.Server/_Starlight/Economy/Atm/ATMSystem.cs
+++ b/Content.Server/_Starlight/Economy/Atm/ATMSystem.cs
@@ -1,5 +1,4 @@
-using Content.Server.Administration.Managers;
-using Content.Server.Hands.Systems;
+using Content.Server.Hands.Systems;
 using Content.Server.Stack;
 using Content.Shared.Interaction;
 using Content.Shared.Stacks;
@@ -7,6 +6,12 @@
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Prototypes;
+using Robust.Server.Player;
+using Robust.Shared.Player;
+using Content.Server.Mind;
+using Content.Shared.Administration.Logs;
+using Content.Shared.Database;
+using Content.Server.Administration.Managers;
 
 namespace Content.Shared.Starlight.Economy.Atm;
 public sealed partial class ATMSystem : SharedATMSystem
@@ -16,13 +21,21 @@ public sealed partial class ATMSystem : SharedATMSystem
     [Dependency] private readonly HandsSystem _hands = default!;
     [Dependency] private readonly StackSystem _stack = default!;
     [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
+    [Dependency] private readonly IPlayerManager _players = default!;
+    [Dependency] private readonly MindSystem _mind = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
 
     private static readonly EntProtoId<StackComponent> _cash = "NTCredit";
+    private readonly object _transferLock = new();
     public override void Initialize()
     {
         SubscribeLocalEvent<ATMComponent, BeforeActivatableUIOpenEvent>(OnBeforeActivatableUIOpen);
         SubscribeLocalEvent<NTCashComponent, AfterInteractEvent>(OnAfterInteract);
-        Subs.BuiEvents<ATMComponent>(ATMUIKey.Key, subs => subs.Event<ATMWithdrawBuiMsg>(OnWithdraw));
+        Subs.BuiEvents<ATMComponent>(ATMUIKey.Key, subs =>
+        {
+            subs.Event<ATMWithdrawBuiMsg>(OnWithdraw);
+            subs.Event<ATMTransferBuiMsg>(OnTransfer);
+        });
         base.Initialize();
     }
 
@@ -55,6 +68,108 @@ private void OnAfterInteract(Entity<NTCashComponent> ent, ref AfterInteractEvent
         }
     }
 
+    private void OnTransfer(EntityUid uid, ATMComponent component, ATMTransferBuiMsg args)
+    {
+        if (_playerRolesManager.GetPlayerData(args.Actor) is not PlayerData sender)
+            return;
+
+        if (string.IsNullOrWhiteSpace(args.Recipient))
+        {
+            _uiSystem.SetUiState(uid, ATMUIKey.Key, new ATMBuiState
+            {
+                Balance = sender.Balance,
+                Message = Loc.GetString("economy-atm-transfer-error-no-recipient"),
+                IsError = true
+            });
+            return;
+        }
+
+        if (!_players.TryGetSessionByEntity(args.Actor, out var senderSession))
+        {
+            _uiSystem.SetUiState(uid, ATMUIKey.Key, new ATMBuiState
+            {
+                Balance = sender.Balance,
+                Message = Loc.GetString("economy-atm-transfer-error-generic"),
+                IsError = true
+            });
+            return;
+        }
+
+        var matches = new List<ICommonSession>();
+        
+        foreach (var reg in _playerRolesManager.Players)
+        {
+            if (_mind.TryGetMind(reg.Session.UserId, out _, out var mind)
+                && !string.IsNullOrWhiteSpace(mind.CharacterName)
+                && string.Equals(mind.CharacterName, args.Recipient, StringComparison.OrdinalIgnoreCase))
+            {
+                matches.Add(reg.Session);
+            }
+        }
+
+        if (matches.Count != 1)
+        {
+            var key = matches.Count == 0
+                ? "economy-atm-transfer-error-no-recipient"
+                : "economy-atm-transfer-error-ambiguous";
+
+            _uiSystem.SetUiState(uid, ATMUIKey.Key, new ATMBuiState
+            {
+                Balance = sender.Balance,
+                Message = Loc.GetString(key),
+                IsError = true
+            });
+            return;
+        }
+
+        var recipientSession = matches[0];
+
+        if (recipientSession.UserId == senderSession.UserId)
+        {
+            _uiSystem.SetUiState(uid, ATMUIKey.Key, new ATMBuiState
+            {
+                Balance = sender.Balance,
+                Message = Loc.GetString("economy-atm-transfer-error-self"),
+                IsError = true
+            });
+            return;
+        }
+
+        lock (_transferLock)
+        {
+            var recipientData = _playerRolesManager.GetPlayerData(recipientSession);
+            if (recipientData == null)
+            {
+                _uiSystem.SetUiState(uid, ATMUIKey.Key, new ATMBuiState
+                {
+                    Balance = sender.Balance,
+                    Message = Loc.GetString("economy-atm-transfer-error-no-recipient"),
+                    IsError = true
+                });
+                return;
+            }
+
+            sender.Balance -= args.Amount;
+            recipientData.Balance += args.Amount;
+
+            var recipientName = _mind.TryGetMind(recipientSession.UserId, out _, out var rMind)
+                ? rMind.CharacterName ?? recipientSession.Name
+                : recipientSession.Name;
+
+            _uiSystem.SetUiState(uid, ATMUIKey.Key, new ATMBuiState
+            {
+                Balance = sender.Balance,
+                Message = Loc.GetString("economy-atm-transfer-success", ("amount", args.Amount), ("recipient", recipientName)),
+                IsError = false
+            });
+
+            _adminLogger.Add(
+                LogType.Action,
+                LogImpact.Medium,
+                $"{ToPrettyString(args.Actor):player} transferred {args.Amount} cr. to {recipientName} via {ToPrettyString(uid):entity}");
+        }
+    }
+
     private void OnBeforeActivatableUIOpen(Entity<ATMComponent> ent, ref BeforeActivatableUIOpenEvent args)
     {
         var playerData = _playerRolesManager.GetPlayerData(args.User);
diff --git a/Content.Server/_Starlight/Economy/ItemPriceManager.cs b/Content.Server/_Starlight/Economy/ItemPriceManager.cs
new file mode 100644
index 000000000000..6b11b975ebf9
--- /dev/null
+++ b/Content.Server/_Starlight/Economy/ItemPriceManager.cs
@@ -0,0 +1,92 @@
+using Content.Shared.Economy;
+using Robust.Shared.Random;
+using Robust.Shared.Prototypes;
+using Robust.Shared.GameObjects;
+using Content.Shared.Destructible.Thresholds;
+
+namespace Content.Server.Economy
+{
+    public sealed class ItemPriceManager : EntitySystem
+    {
+        [Dependency] private readonly IRobustRandom _random = default!;
+        [Dependency] private readonly IPrototypeManager _prototypes = default!;
+        [Dependency] private readonly IComponentFactory _componentFactory = default!;
+        private readonly Dictionary<string, int> _prototypePrices = new();
+
+        private Dictionary<string, MinMax>? _protoPriceCategoriesCache;
+        private IReadOnlyDictionary<string, MinMax> GetPriceCategories()
+        {
+            if (_protoPriceCategoriesCache != null)
+                return _protoPriceCategoriesCache;
+
+            var dict = new Dictionary<string, MinMax>();
+            foreach (var proto in _prototypes.EnumeratePrototypes<PriceCategoryPrototype>())
+            {
+                // Guard against bad data (min>max etc.)
+                var min = proto.Min;
+                var max = proto.Max;
+                if (min <= 0 && max <= 0)
+                    continue;
+                if (min > max)
+                    (min, max) = (max, min);
+                dict[proto.ID] = new MinMax(min, max);
+            }
+
+            // Only use prototype-defined categories; no hardcoded fallback
+            _protoPriceCategoriesCache = dict;
+            return _protoPriceCategoriesCache;
+        }
+
+        /// <summary>
+        /// Clears any cached prices and warms the per-prototype cache by enumerating entity prototypes
+        /// that declare an ItemPriceComponent. This avoids scanning live entities and ensures
+        /// that all items spawned later in the round get a stable, category-based price.
+        /// </summary>
+        public void ResetForNewRound()
+        {
+            _prototypePrices.Clear();
+            // Keep category cache; it comes from prototypes and won't change at runtime typically
+            WarmCacheFromPrototypes();
+        }
+
+        private void WarmCacheFromPrototypes()
+        {
+            var categories = GetPriceCategories();
+            foreach (var proto in _prototypes.EnumeratePrototypes<EntityPrototype>())
+            {
+                if (!proto.TryGetComponent<ItemPriceComponent>(out var priceComp, _componentFactory))
+                    continue;
+
+                if (_prototypePrices.ContainsKey(proto.ID))
+                    continue;
+
+                if (!categories.TryGetValue(priceComp.PriceCategory, out var range))
+                    continue;
+
+                var price = _random.Next(range.Min, range.Max + 1);
+                _prototypePrices[proto.ID] = price;
+            }
+        }
+
+        /// <summary>
+        /// Generate or retrieve a consistent price for a specific item prototype
+        /// </summary>
+        public int? GetPriceForPrototype(string prototypeId, string category)
+        {
+            if (_prototypePrices.TryGetValue(prototypeId, out var price))
+            {
+                return price;
+            }
+
+            var categories = GetPriceCategories();
+            if (!categories.TryGetValue(category, out var minMax))
+            {
+                return null;
+            }
+
+            var newPrice = _random.Next(minMax.Min, minMax.Max + 1);
+            _prototypePrices[prototypeId] = newPrice;
+            return newPrice;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Content.Server/_Starlight/Economy/PriceRandomizationSystem.cs b/Content.Server/_Starlight/Economy/PriceRandomizationSystem.cs
new file mode 100644
index 000000000000..42490dbb862c
--- /dev/null
+++ b/Content.Server/_Starlight/Economy/PriceRandomizationSystem.cs
@@ -0,0 +1,18 @@
+using Content.Shared.GameTicking;
+using Robust.Shared.Configuration;
+
+namespace Content.Server.Economy
+{
+    public sealed class PriceRandomizationSystem : EntitySystem
+    {
+        [Dependency] private readonly ItemPriceManager _priceManager = default!;
+
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestart);
+        }
+
+        private void OnRoundRestart(RoundRestartCleanupEvent args) => _priceManager.ResetForNewRound();
+    }
+}
\ No newline at end of file
diff --git a/Content.Server/_Starlight/Energy/Supermatter/Const.cs b/Content.Server/_Starlight/Energy/Supermatter/Const.cs
index f8daae6290bf..3144ae34ee5f 100644
--- a/Content.Server/_Starlight/Energy/Supermatter/Const.cs
+++ b/Content.Server/_Starlight/Energy/Supermatter/Const.cs
@@ -31,13 +31,13 @@ internal static class Const
     ];
 
     public static float MinPressure = 33f;
-    public static float MaxPressure = 303.9f;
+    public static float MaxPressure = 363.9f;
 
-    public static float MaxTemperature = Atmospherics.T0C + 150;
+    public static float MaxTemperature = Atmospherics.T0C + 200;
 
     public static float EvaporationCompensation = 10;
 
-    public static FixedPoint2 MaxDamagePerSecond = (100f / 120f) + RegenerationPerSecond; // Ensures it takes at least 2 minutes to deplete
+    public static FixedPoint2 MaxDamagePerSecond = (100f / 180f) + RegenerationPerSecond; // Ensures it takes at least 3 minutes to deplete
     public static FixedPoint2 RegenerationPerSecond = 0.3f;
 
     public static string[] AudioCrack = ["/Audio/_Starlight/Effects/supermatter/crystal_crack_1.ogg", "/Audio/_Starlight/Effects/supermatter/crystal_crack_2.ogg"];
diff --git a/Content.Server/_Starlight/Energy/Supermatter/SupermatterCascadeSystem.cs b/Content.Server/_Starlight/Energy/Supermatter/SupermatterCascadeSystem.cs
index cbe6343ceb37..8114632e3a86 100644
--- a/Content.Server/_Starlight/Energy/Supermatter/SupermatterCascadeSystem.cs
+++ b/Content.Server/_Starlight/Energy/Supermatter/SupermatterCascadeSystem.cs
@@ -82,9 +82,6 @@ public override void Update(float frameTime)
         }
         branch.Coordinates = branch.Coordinates.SnapToGrid(gridComp);
 
-        foreach (var entity in _lookup.GetEntitiesIntersecting(branch.Coordinates))
-            QueueDel(entity);
-
         SpawnAttachedTo(_random.Pick(_prototypes), branch.Coordinates);
 
         node = nextNode;
diff --git a/Content.Server/_Starlight/Energy/Supermatter/SupermatterSystem.cs b/Content.Server/_Starlight/Energy/Supermatter/SupermatterSystem.cs
index c9eca38316b7..63118cc88157 100644
--- a/Content.Server/_Starlight/Energy/Supermatter/SupermatterSystem.cs
+++ b/Content.Server/_Starlight/Energy/Supermatter/SupermatterSystem.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Chat.Managers;
+using Content.Server.Explosion.EntitySystems;
 using Content.Server.Lightning;
 using Content.Server.Radio.EntitySystems;
 using Content.Server.Starlight.Energy.Supermatter;
@@ -39,6 +40,7 @@ public sealed class SupermatterSystem : AccUpdateEntitySystem
     [Dependency] private readonly IChatManager _chat = default!;
     [Dependency] private readonly IPrototypeManager _prototypes = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly ExplosionSystem _explosion = default!;
 
     private readonly Dictionary<EntityUid, Entity<SupermatterComponent>> _supermatters = [];
     private DamageGroupPrototype? _brute;
@@ -112,7 +114,7 @@ private void Handle(Entity<SupermatterComponent> supermatter)
     private void Cascad(Entity<SupermatterComponent> supermatter)
     {
         if (supermatter.Comp.Durability > 0.01) return;
-
+        _explosion.QueueExplosion(supermatter, ExplosionSystem.DefaultExplosionPrototypeId, 150, 3, 20);
         _cascade.StartCascade(Transform(supermatter.Owner).Coordinates);
         QueueDel(supermatter.Owner);
     }
@@ -183,7 +185,7 @@ private void HandleGas(Entity<SupermatterComponent> supermatter)
             radiationStability += prop.RadiationStability * percent;
         }
 
-        supermatter.Comp.RadiationStability = MathHelper.Clamp(radiationStability, 1, 10);
+        supermatter.Comp.RadiationStability = MathHelper.Clamp(radiationStability, 1.1, 10);
 
         ProcessHeat(supermatter, gas, heatTransfer, heatModifier);
         TryCompensateDamage(supermatter, gas);
@@ -238,6 +240,6 @@ private void HandleDamage(Entity<SupermatterComponent> supermatter)
         supermatter.Comp.AccBreak = MathHelper.Clamp(supermatter.Comp.AccBreak + (trueDamage * Const.BreakPercent), 0, 9999);
         supermatter.Comp.AccHeat = MathHelper.Clamp(supermatter.Comp.AccHeat + (trueDamage * Const.HeatPercent), 0, 9999);
         supermatter.Comp.AccLighting = MathHelper.Clamp(supermatter.Comp.AccLighting + (trueDamage * Const.LightingPercent), 0, 25);
-        supermatter.Comp.AccRadiation = MathHelper.Clamp(supermatter.Comp.AccRadiation + (trueDamage * Const.RadiationPercent), 0, 100);
+        supermatter.Comp.AccRadiation = MathHelper.Clamp(supermatter.Comp.AccRadiation + (trueDamage * Const.RadiationPercent), 0, 50);
     }
 }
\ No newline at end of file
diff --git a/Content.Server/_Starlight/Ghost/MGhostCommand.cs b/Content.Server/_Starlight/Ghost/MGhostCommand.cs
new file mode 100644
index 000000000000..f9bf093b5243
--- /dev/null
+++ b/Content.Server/_Starlight/Ghost/MGhostCommand.cs
@@ -0,0 +1,92 @@
+using Content.Server.GameTicking;
+using Content.Shared.Administration;
+using Content.Shared.Ghost;
+using Content.Shared.Mind;
+using Content.Shared._NullLink;
+using JetBrains.Annotations;
+using Robust.Server.GameObjects;
+using Robust.Shared.Console;
+
+namespace Content.Server._Starlight.Ghost;
+
+[UsedImplicitly, AnyCommand]
+public sealed class MGhostCommand : LocalizedCommands
+{
+    [Dependency] private readonly IEntityManager _entities = default!;
+    [Dependency] private readonly ISharedNullLinkPlayerRolesReqManager _playerRoles = default!;
+
+    public override string Command => "mghost";
+    public override string Help => "mghost";
+
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args) => CompletionResult.Empty;
+
+    public override void Execute(IConsoleShell shell, string argStr, string[] args)
+    {
+        if (args.Length > 0)
+        {
+            shell.WriteError(LocalizationManager.GetString("shell-wrong-arguments-number"));
+            return;
+        }
+
+        var player = shell.Player;
+        var self = player != null;
+        if (player == null)
+        {
+            shell.WriteError(LocalizationManager.GetString("shell-only-players-can-run-this-command"));
+            return;
+        }
+
+        if (!_playerRoles.IsMentor(player)) // if you are a admin you should be using aghost
+        {
+            shell.WriteError(LocalizationManager.GetString("mghost-mentors-only"));
+            return;
+        }
+
+        var mindSystem = _entities.System<SharedMindSystem>();
+        var metaDataSystem = _entities.System<MetaDataSystem>();
+        var ghostSystem = _entities.System<SharedGhostSystem>();
+        var transformSystem = _entities.System<TransformSystem>();
+        var gameTicker = _entities.System<GameTicker>();
+
+        if (!mindSystem.TryGetMind(player, out var mindId, out var mind))
+        {
+            shell.WriteError(LocalizationManager.GetString("aghost-no-mind-self"));
+            return;
+        }
+
+        if (mind.VisitingEntity != default && _entities.TryGetComponent<GhostComponent>(mind.VisitingEntity, out var oldGhostComponent))
+        {
+            mindSystem.UnVisit(mindId, mind);
+            // If already an admin ghost, then return to body.
+            if (oldGhostComponent.CanGhostInteract)
+                return;
+        }
+
+        var canReturn = mind.CurrentEntity != null
+                        && !_entities.HasComponent<GhostComponent>(mind.CurrentEntity);
+        var coordinates = player!.AttachedEntity != null
+            ? _entities.GetComponent<TransformComponent>(player.AttachedEntity.Value).Coordinates
+            : gameTicker.GetObserverSpawnPoint();
+        var ghost = _entities.SpawnEntity(GameTicker.ObserverPrototypeName, coordinates); //dont spawn a aghost. spawn a normal ghost you can return from.
+        transformSystem.AttachToGridOrMap(ghost, _entities.GetComponent<TransformComponent>(ghost));
+
+        if (canReturn)
+        {
+            // TODO: Remove duplication between all this and "GamePreset.OnGhostAttempt()"...
+            if (!string.IsNullOrWhiteSpace(mind.CharacterName))
+                metaDataSystem.SetEntityName(ghost, mind.CharacterName);
+            else if (!string.IsNullOrWhiteSpace(player.Name))
+                metaDataSystem.SetEntityName(ghost, player.Name);
+
+            mindSystem.Visit(mindId, ghost, mind);
+        }
+        else
+        {
+            metaDataSystem.SetEntityName(ghost, player.Name);
+            mindSystem.TransferTo(mindId, ghost, mind: mind);
+        }
+
+        var comp = _entities.GetComponent<GhostComponent>(ghost);
+        ghostSystem.SetCanReturnToBody((ghost, comp), canReturn);
+    }
+}
diff --git a/Content.Server/_Starlight/Medical/Surgery/BodyScannerSystem.cs b/Content.Server/_Starlight/Medical/Surgery/BodyScannerSystem.cs
new file mode 100644
index 000000000000..0fe11d7935f0
--- /dev/null
+++ b/Content.Server/_Starlight/Medical/Surgery/BodyScannerSystem.cs
@@ -0,0 +1,73 @@
+using Content.Shared.DeviceLinking.Events;
+using Content.Shared.Buckle.Components;
+using Content.Shared.Starlight.Medical.Surgery.Effects.Step;
+using Content.Shared.Starlight.Medical.Surgery;
+using Content.Server.Medical;
+using Content.Server.Medical.Components;
+using System.Linq;
+
+namespace Content.Server.Starlight.Medical.Surgery;
+
+public sealed partial class BodyScannerSystem : SharedBodyScannerSystem
+{
+    [Dependency] private readonly HealthAnalyzerSystem _healthAnalyzer = default!;
+    
+    public override void Initialize()
+    {
+        base.Initialize();
+        
+        SubscribeLocalEvent<OperatingTableComponent, StrappedEvent>(OnStrapped);
+        SubscribeLocalEvent<OperatingTableComponent, UnstrappedEvent>(OnUnstrapped);
+        
+        SubscribeLocalEvent<BodyScannerComponent, NewLinkEvent>(OnNewLink);
+        SubscribeLocalEvent<BodyScannerComponent, PortDisconnectedEvent>(OnPortDisconnected);
+    }
+    
+    private void OnStrapped(Entity<OperatingTableComponent> ent, ref StrappedEvent args)
+    {        
+        if (ent.Comp.Scanner != null && TryComp<HealthAnalyzerComponent>(ent.Comp.Scanner, out var analyzer))
+            _healthAnalyzer.BeginAnalyzingEntity((ent.Comp.Scanner.Value, analyzer), args.Buckle.Owner);
+    }
+    
+    private void OnUnstrapped(Entity<OperatingTableComponent> ent, ref UnstrappedEvent args)
+    {
+        if (ent.Comp.Scanner != null && TryComp<HealthAnalyzerComponent>(ent.Comp.Scanner, out var analyzer))
+            _healthAnalyzer.StopAnalyzingEntity((ent.Comp.Scanner.Value, analyzer), args.Buckle.Owner);
+    }
+    
+    private void OnNewLink(Entity<BodyScannerComponent> ent, ref NewLinkEvent args)
+    {
+        if (!TryComp<OperatingTableComponent>(args.Sink, out var table) || !TryComp<StrapComponent>(args.Sink, out var strap))
+            return;
+
+        ent.Comp.TableEntity = GetNetEntity(args.Sink);
+        
+        // Why one? Because operating table don't have more than one slot, and also Health Analyzer works only with one target.
+        if (TryComp<HealthAnalyzerComponent>(ent.Owner, out var analyzer) && strap.BuckledEntities.Count == 1)
+            _healthAnalyzer.StopAnalyzingEntity((ent.Owner, analyzer), strap.BuckledEntities.First());
+        
+        table.Scanner = ent.Owner;
+        Dirty(args.Sink, table);
+        Dirty(ent);
+    }
+    
+    private void OnPortDisconnected(Entity<BodyScannerComponent> ent, ref PortDisconnectedEvent args)
+    {
+        var tableNetEntity = ent.Comp.TableEntity;
+        if (args.Port != ent.Comp.LinkingPort || tableNetEntity == null)
+            return;
+        
+        var tableEntityUid = GetEntity(tableNetEntity);
+        if (TryComp<OperatingTableComponent>(tableEntityUid, out var table))
+        {
+            table.Scanner = null;
+            Dirty(tableEntityUid.Value, table);
+        }
+        
+        if (TryComp<HealthAnalyzerComponent>(ent.Owner, out var analyzer) && analyzer.ScannedEntity != null)
+            _healthAnalyzer.StopAnalyzingEntity((ent.Owner, analyzer), analyzer.ScannedEntity.Value);
+        
+        ent.Comp.TableEntity = null;
+        Dirty(ent);
+    }
+}
\ No newline at end of file
diff --git a/Content.Server/_Starlight/Medical/Surgery/SurgerySystem.Steps.cs b/Content.Server/_Starlight/Medical/Surgery/SurgerySystem.Steps.cs
index d84849638c37..c976f2063329 100644
--- a/Content.Server/_Starlight/Medical/Surgery/SurgerySystem.Steps.cs
+++ b/Content.Server/_Starlight/Medical/Surgery/SurgerySystem.Steps.cs
@@ -13,6 +13,7 @@
 using Microsoft.CodeAnalysis;
 using Content.Server._Starlight.Medical.Limbs;
 using Content.Server.Administration.Systems;
+using Robust.Shared.Timing;
 
 
 namespace Content.Server.Starlight.Medical.Surgery;
@@ -24,9 +25,11 @@ namespace Content.Server.Starlight.Medical.Surgery;
 //However, I don’t want to touch the official systems, so I need to come up with extensions for them.
 public sealed partial class SurgerySystem : SharedSurgerySystem
 {
+    [Dependency] protected readonly IGameTiming Timing = default!;
     [Dependency] private readonly IComponentFactory _compFactory = default!;
     [Dependency] private readonly LimbSystem _limbSystem = default!;
     [Dependency] private readonly StarlightEntitySystem _entity = default!;
+    [Dependency] private readonly SharedBloodstreamSystem _bloodstreamSystem = default!;
 
     public void InitializeSteps()
     {
@@ -46,6 +49,24 @@ public void InitializeSteps()
         SubscribeLocalEvent<SurgeryRemoveAccentComponent, SurgeryStepEvent>(OnRemoveAccent);
 
     }
+    
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+        
+        var query = EntityQueryEnumerator<IncisionOpenComponent>();
+        while (query.MoveNext(out var uid, out var incision))
+        {
+            if (Timing.CurTime < incision.NextUpdate)
+                continue;
+            
+            incision.NextUpdate = Timing.CurTime + incision.UpdateInterval;
+            
+            var patient = Transform(uid).ParentUid;
+            
+            _bloodstreamSystem.TryModifyBleedAmount(patient, 0.1f);
+        }
+    }
 
     private void OnStepAttachComplete(Entity<SurgeryStepAttachLimbEffectComponent> ent, ref SurgeryStepEvent args)
     {
@@ -59,15 +80,13 @@ private void OnStepAttachComplete(Entity<SurgeryStepAttachLimbEffectComponent> e
     }
 
     private void OnStepBleedComplete(Entity<SurgeryStepBleedEffectComponent> ent, ref SurgeryStepEvent args)
-    {
+    {        
         if (ent.Comp.Damage is not null && TryComp<DamageableComponent>(args.Body, out var comp))
             _damageableSystem.TryChangeDamage(args.Body, ent.Comp.Damage);
-        //todo add wound
     }
 
     private void OnStepClampBleedComplete(Entity<SurgeryClampBleedEffectComponent> ent, ref SurgeryStepEvent args)
     {
-        //todo remove wound
     }
     private void OnStepOrganInsertComplete(Entity<SurgeryStepOrganInsertComponent> ent, ref SurgeryStepEvent args)
     {
diff --git a/Content.Server/_Starlight/MentorSystem.cs b/Content.Server/_Starlight/MentorSystem.cs
index 46b01d6ec175..85716d2c31ff 100644
--- a/Content.Server/_Starlight/MentorSystem.cs
+++ b/Content.Server/_Starlight/MentorSystem.cs
@@ -33,6 +33,10 @@
 using Robust.Shared.Player;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
+using Content.Shared.Ghost;
+using Content.Shared.Administration.Logs;
+using Content.Shared.Database;
+using Content.Server.Administration.Logs;
 using Content.Shared._NullLink;
 using Content.Server._NullLink.PlayerData;
 
@@ -50,6 +54,8 @@ public sealed partial class MentorSystem : SharedMentorSystem
     [Dependency] private readonly IAdminManager _adminManager = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly PlayerRateLimitManager _rateLimit = default!;
+    [Dependency] private readonly SharedTransformSystem _xform = default!;
+    [Dependency] private readonly ISharedAdminLogManager _alog = default!;
 
     private readonly Dictionary<Guid, MentorTicket> _tickets = [];
     private ISawmill _sawmill = default!;
@@ -65,6 +71,7 @@ public override void Initialize()
 
         SubscribeNetworkEvent<MHelpTypingRequest>(OnClientTypingUpdated);
         SubscribeNetworkEvent<MHelpCloseTicket>(OnCloseTicket);
+        SubscribeNetworkEvent<MhelpTptoTicket>(OnTptoTicket);
         SubscribeLocalEvent<RoundRestartCleanupEvent>(_ =>
         {
             _tickets.Clear();
@@ -222,6 +229,32 @@ private void OnCloseTicket(MHelpCloseTicket message, EntitySessionEventArgs even
             RaiseNetworkEvent(msg, channel);
     }
 
+    private void OnTptoTicket(MhelpTptoTicket message, EntitySessionEventArgs eventArgs)
+    {
+        MentorTicket? ticket = null;
+        var senderSession = eventArgs.SenderSession;
+        var adminData = _adminManager.GetAdminData(senderSession);
+
+        var senderIsAdmin = adminData?.HasFlag(AdminFlags.Adminhelp) ?? false;
+        var senderIsMentor = _playerRoles.IsMentor(senderSession);
+        if (!(senderIsAdmin || senderIsMentor)) //only admins/mentors can use mtpto
+            return;
+        if (message.Ticket is not Guid ticketId)
+            return;
+        if (ticket is null && !_tickets.TryGetValue(ticketId, out ticket))
+            return;
+        var mentorEnt = senderSession.AttachedEntity;
+        if (!HasComp<GhostComponent>(mentorEnt))
+            return;
+        
+        var playerSession = _playerManager.GetSessionById(ticket.Creator);
+
+        if (playerSession.AttachedEntity.HasValue)
+            _xform.SetCoordinates(mentorEnt.Value, Transform(playerSession.AttachedEntity.Value).Coordinates);
+
+        _alog.Add(LogType.AdminCommands, LogImpact.Low, $"mentor {senderSession} tpto'd ticket {ticketId} aka {playerSession}");
+    }
+
     private void OnClientTypingUpdated(MHelpTypingRequest msg, EntitySessionEventArgs args)
     {
         if (_typingUpdateTimestamps.TryGetValue(args.SenderSession.UserId, out var tuple) &&
diff --git a/Content.Server/_Starlight/Railroading/RewardSystems/RailroadingDeliveryRewardSystem.cs b/Content.Server/_Starlight/Railroading/RewardSystems/RailroadingDeliveryRewardSystem.cs
new file mode 100644
index 000000000000..a3ad0189b0d3
--- /dev/null
+++ b/Content.Server/_Starlight/Railroading/RewardSystems/RailroadingDeliveryRewardSystem.cs
@@ -0,0 +1,103 @@
+using Content.Server.Chat.Managers;
+using Content.Server.Station.Systems;
+using Content.Server.StationRecords.Systems;
+using Content.Shared.Chat;
+using Content.Shared.Clothing;
+using Content.Shared.Delivery;
+using Content.Shared.FingerprintReader;
+using Content.Shared.Labels.EntitySystems;
+using Content.Shared.Power.EntitySystems;
+using Content.Shared.StationRecords;
+using Content.Shared._Starlight.Railroading.Events;
+using Content.Shared._Starlight.Railroading;
+using Robust.Server.Player;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Random;
+using Robust.Shared.Prototypes;
+using System.Linq;
+
+namespace Content.Server._Starlight.Railroading;
+
+public sealed partial class RailroadingDeliveryRewardSystem : EntitySystem
+{
+    [Dependency] private readonly FingerprintReaderSystem _fingerprintReader = default!;
+    [Dependency] private readonly IChatManager _chat = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly IPrototypeManager _protoMan = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly LabelSystem _label = default!;
+    [Dependency] private readonly LoadoutSystem _loadout = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly SharedPowerReceiverSystem _power = default!;
+    [Dependency] private readonly StationRecordsSystem _records = default!;
+    [Dependency] private readonly StationSystem _station = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<RailroadDeliveryRewardComponent, RailroadingCardCompletedEvent>(OnCompleted);
+    }
+
+    private void OnCompleted(Entity<RailroadDeliveryRewardComponent> ent, ref RailroadingCardCompletedEvent args)
+    {
+        if (_station.GetStationInMap(Transform(args.Subject).MapID) is not { } station)
+            return;
+
+        EntityUid? spawner = null;
+
+        var spawners = EntityQueryEnumerator<DeliverySpawnerComponent>();
+        while (spawners.MoveNext(out var spawnerUid, out var spawnerComp))
+        {
+            var spawnerStation = _station.GetOwningStation(spawnerUid);
+
+            if (spawnerStation != station)
+                continue;
+
+            if (!_power.IsPowered(spawnerUid))
+                continue;
+
+            if (spawnerComp.ContainedDeliveryAmount >= spawnerComp.MaxContainedDeliveryAmount)
+                continue;
+
+            spawner = spawnerUid;
+            break;
+        }
+
+        if (spawner == null)
+            return;
+
+        var delivery = Spawn(ent.Comp.Delivery, Transform(spawner.Value).Coordinates);
+        var profile = _loadout.GetProfile(args.Subject);
+        var recordID = _records.GetRecordByName(station, MetaData(args.Subject).EntityName);
+
+        if (ent.Comp.Dataset != null && _playerManager.TryGetSessionByEntity(args.Subject, out var session))
+        {
+            var dataset = _protoMan.Index(ent.Comp.Dataset);
+            var pick = _random.Pick(dataset.Values);
+            if (ent.Comp.WrappedDataset != null)
+            {
+                var wrappedDataset = _protoMan.Index(ent.Comp.Dataset);
+                _chat.ChatMessageToOne(ChatChannel.Notifications, Loc.GetString(pick), Loc.GetString(wrappedDataset.Values[dataset.Values.IndexOf(pick)]), default, false, session.Channel, Color.FromHex("#57A3F7"));
+            }
+        }
+
+        if (!TryComp<DeliveryComponent>(delivery, out var deliveryComp)
+            || recordID == null
+            || !_records.TryGetRecord<GeneralStationRecord>(_records.Convert((GetNetEntity(station), recordID.Value)), out var entry))
+            return;
+
+
+        deliveryComp.RecipientName = entry.Name;
+        deliveryComp.RecipientJobTitle = entry.JobTitle;
+        deliveryComp.RecipientStation = station;
+
+        _appearance.SetData(delivery, DeliveryVisuals.JobIcon, entry.JobIcon);
+
+        _label.Label(delivery, deliveryComp.RecipientName);
+
+        if (TryComp<FingerprintReaderComponent>(delivery, out var reader) && entry.Fingerprint != null)
+            _fingerprintReader.AddAllowedFingerprint((delivery, reader), entry.Fingerprint);
+
+        Dirty(delivery, deliveryComp);
+    }
+}
diff --git a/Content.Server/_Starlight/Scaling/AntagMonsterScalingSystem.cs b/Content.Server/_Starlight/Scaling/AntagMonsterScalingSystem.cs
new file mode 100644
index 000000000000..d6f887ee0681
--- /dev/null
+++ b/Content.Server/_Starlight/Scaling/AntagMonsterScalingSystem.cs
@@ -0,0 +1,112 @@
+using Content.Shared._Starlight.Scaling.Components;
+using Content.Shared.FixedPoint;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Roles;
+using Content.Shared.Starlight.CCVar;
+using Robust.Shared.Configuration;
+using Robust.Shared.Prototypes;
+using Content.Server.StationRecords.Systems;
+using Content.Shared.StationRecords;
+using Content.Server.Station.Systems;
+using Robust.Shared.Utility;
+using Content.Shared._Starlight.Scaling;
+using Content.Server.Ghost.Roles.Events;
+using Content.Shared.Mobs;
+
+namespace Content.Server._Starlight.Scaling;
+
+public sealed class ScalingSystem : SharedScalingSystem
+{
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly StationRecordsSystem _recordsSystem = default!;
+    [Dependency] private readonly StationSystem _stationSystem = default!;
+
+    private readonly Dictionary<EntityUid, double> _cachedPopulations = new();
+
+    double _universalHealthWeight;
+    int _populationBase;
+    double _securityWeight;
+    double _salvageWeight;
+    double _centcomWeight;
+    
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<AntagMonsterScalingComponent, MapInitEvent>(OnMobStartup);
+
+        _cfg.OnValueChanged(StarlightCCVars.ScalingHealthWeight, UpdateUniversalHealthWeight, true);
+    }
+
+    private void UpdateUniversalHealthWeight(double universalHealthWeight)
+    {
+        _universalHealthWeight = universalHealthWeight;
+    }
+
+    private void OnMobStartup(EntityUid mob, AntagMonsterScalingComponent scalingComp, ref MapInitEvent args)
+    {
+        if (!TryComp(mob, out MobThresholdsComponent? thresholdsComp))
+            return;
+
+        scalingComp.OriginalThresholds = new();
+
+        foreach (var threshold in thresholdsComp.Thresholds)
+        {
+            scalingComp.OriginalThresholds.Add(threshold.Key, threshold.Value);
+        }
+
+        var nullableStation = _stationSystem.GetStationInMap(Transform(mob).MapID);
+        if (nullableStation == null)
+            return;
+
+        EntityUid station = nullableStation.Value;
+
+        UpdatePopulation(station);
+
+        if (scalingComp.IsScaled == false)
+        {
+            ApplyHealthScaling(station, scalingComp, thresholdsComp, _cachedPopulations, _universalHealthWeight);
+
+            scalingComp.IsScaled = true;
+        }
+    }
+
+    private void UpdatePopulation(EntityUid station)
+    {
+        _populationBase = _cfg.GetCVar(StarlightCCVars.ScalingPopulationBase);
+        _securityWeight = _cfg.GetCVar(StarlightCCVars.ScalingSecurityWeight);
+        _salvageWeight = _cfg.GetCVar(StarlightCCVars.ScalingSalvageWeight);
+        _centcomWeight = _cfg.GetCVar(StarlightCCVars.ScalingCentcomWeight);
+
+        double updatedPopulation = 0;
+
+        var crewMembers = _recordsSystem.GetRecordsOfType<GeneralStationRecord>(station);
+
+        foreach (var crewMember in crewMembers)
+        {
+            _prototypeManager.TryIndex(crewMember.Item2.JobPrototype, out JobPrototype? job);
+
+            if (job == null)
+                continue;
+
+            if (job.Supervisors.Contains("hos")
+            || job.Name.Contains("Security"))
+            {
+                updatedPopulation += 1 * _securityWeight;
+            }
+            if (job.Name.Contains("salvage"))
+            {
+                updatedPopulation += 1 * _salvageWeight;
+            }
+            if (job.Supervisors.Contains("centcom")
+                && !job.Name.Contains("Magistrate")
+                && !job.Name.Contains("Representative"))
+            {
+                updatedPopulation += 1 * _centcomWeight;
+            }
+        }
+
+        _cachedPopulations.GetOrNew(station);
+        _cachedPopulations[station] = updatedPopulation - _populationBase;
+    }
+}
\ No newline at end of file
diff --git a/Content.Server/_Starlight/Store/Conditions/ListingPlayerCountCondition.cs b/Content.Server/_Starlight/Store/Conditions/ListingPlayerCountCondition.cs
new file mode 100644
index 000000000000..e6258c1d6042
--- /dev/null
+++ b/Content.Server/_Starlight/Store/Conditions/ListingPlayerCountCondition.cs
@@ -0,0 +1,36 @@
+using Content.Shared.Store;
+using Robust.Shared.Player;
+
+namespace Content.Server.Store.Conditions;
+
+/// <summary>
+/// Only allows a listing to be purchased if population is at a certain number.
+/// </summary>
+/// <remarks>
+/// Basically copied from PlayerCountConidition.
+/// </remarks>
+public sealed partial class ListingPlayerCountCondition : ListingCondition
+{   
+    /// <summary>
+    /// Minimum players needed for this listing to be available.
+    /// </summary>
+    [DataField]
+    public int Minimum = 0;
+
+    /// <summary>
+    /// Maximum players allowed for this listing to be available.
+    /// </summary>
+    [DataField]
+    public int Maximum = 500;
+
+    private static ISharedPlayerManager? _playerManager;
+
+    public override bool Condition(ListingConditionArgs args)
+    {
+        _playerManager ??= IoCManager.Resolve<ISharedPlayerManager>();
+
+        var playerCount = _playerManager.PlayerCount;
+
+        return playerCount >= Minimum && playerCount <= Maximum;
+    }
+}
\ No newline at end of file
diff --git a/Content.Server/Weapons/Ranged/Conditions/AlertLevelCondition.cs b/Content.Server/_Starlight/Weapons/Ranged/Conditions/AlertLevelCondition.cs
similarity index 61%
rename from Content.Server/Weapons/Ranged/Conditions/AlertLevelCondition.cs
rename to Content.Server/_Starlight/Weapons/Ranged/Conditions/AlertLevelCondition.cs
index c1d17bc85a8a..52cf9b0c86fd 100644
--- a/Content.Server/Weapons/Ranged/Conditions/AlertLevelCondition.cs
+++ b/Content.Server/_Starlight/Weapons/Ranged/Conditions/AlertLevelCondition.cs
@@ -1,34 +1,46 @@
 using Content.Server.AlertLevel;
+using Content.Server.Popups;
 using Content.Shared.Station.Components;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Systems;
+using Content.Shared._Starlight.Weapons.Ranged.Components;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
 using Robust.Shared.Serialization;
+using Robust.Shared.Player;
 
-namespace Content.Server.Weapons.Ranged.Conditions;
+namespace Content.Server._Starlight.Weapons.Ranged.Conditions;
 
 public sealed partial class AlertLevelCondition : FireModeCondition
 {
     [DataField(required: true)]
     public List<string> AlertLevels;
 
+    [DataField]
+    public override string PopupMessage { get; set; } = "firemode-alert-level-condition";
+
     public override bool Condition(FireModeConditionConditionArgs args)
     {
         var entityManager = args.EntityManager;
 
         var alertSystem = entityManager.System<AlertLevelSystem>();
 
-        if (!entityManager.TryGetComponent<TransformComponent>(args.Shooter, out var transformComp))
+        var _popupSystem = entityManager.System<PopupSystem>();
+
+        if (!entityManager.TryGetComponent<TransformComponent>(args.Shooter, out var transformComp)
+            || !entityManager.TryGetComponent<ActorComponent>(args.Shooter, out var actor))
             return false;
 
         if (entityManager.TryGetComponent<StationMemberComponent>(transformComp.ParentUid, out var stationMember) &&
             entityManager.TryGetComponent<AlertLevelComponent>(stationMember.Station, out var alertLevelComp))
         {
             var currentAlertLevel = alertSystem.GetLevel(stationMember.Station, alertLevelComp);
+            if (!AlertLevels.Contains(currentAlertLevel))
+                _popupSystem.PopupEntity(Loc.GetString(PopupMessage), args.Shooter, actor.PlayerSession);
             return AlertLevels.Contains(currentAlertLevel);
         }
 
+        _popupSystem.PopupEntity(Loc.GetString(PopupMessage), args.Shooter, actor.PlayerSession);
         return false;
     }
 }
\ No newline at end of file
diff --git a/Content.Server/_Starlight/Weapon/WeaponDismantleOnShootSystem.cs b/Content.Server/_Starlight/Weapons/WeaponDismantleOnShootSystem.cs
similarity index 100%
rename from Content.Server/_Starlight/Weapon/WeaponDismantleOnShootSystem.cs
rename to Content.Server/_Starlight/Weapons/WeaponDismantleOnShootSystem.cs
diff --git a/Content.Shared/Abilities/Goliath/GoliathTentacleSystem.cs b/Content.Shared/Abilities/Goliath/GoliathTentacleSystem.cs
index 37ba6c27e71b..693d02f1123d 100644
--- a/Content.Shared/Abilities/Goliath/GoliathTentacleSystem.cs
+++ b/Content.Shared/Abilities/Goliath/GoliathTentacleSystem.cs
@@ -36,7 +36,7 @@ private void OnSummonAction(GoliathSummonTentacleAction args)
 
         if (!TryComp(args.Performer, out TransformComponent? xform)) return;
         _popup.PopupPredicted(Loc.GetString("tentacle-ability-use-popup", ("entity", args.Performer)), args.Performer, args.Performer, type: PopupType.SmallCaution);
-        _stun.TryStun(args.Performer, TimeSpan.FromSeconds(0.8f), false);
+        _stun.TryAddStunDuration(args.Performer, TimeSpan.FromSeconds(0.8f));
 
         Queue<EntityCoordinates> spawnPos = new();
         var direction = Vector2.Normalize(args.Target.Position - xform.Coordinates.Position);
diff --git a/Content.Shared/Abilities/Mime/MimePowersComponent.cs b/Content.Shared/Abilities/Mime/MimePowersComponent.cs
new file mode 100644
index 000000000000..8414dd7a0dce
--- /dev/null
+++ b/Content.Shared/Abilities/Mime/MimePowersComponent.cs
@@ -0,0 +1,76 @@
+using Content.Shared.Alert;
+using Robust.Shared.Prototypes;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.Abilities.Mime;
+
+/// <summary>
+/// Lets its owner entity use mime powers, like placing invisible walls.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[AutoGenerateComponentPause]
+public sealed partial class MimePowersComponent : Component
+{
+    /// <summary>
+    /// Whether this component is active or not.
+    /// </summarY>
+    [DataField, AutoNetworkedField]
+    public bool Enabled = true;
+
+    /// <summary>
+    /// The wall prototype to use.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntProtoId WallPrototype = "WallInvisible";
+
+    [DataField]
+    public EntProtoId? InvisibleWallAction = "ActionMimeInvisibleWall";
+
+    [DataField, AutoNetworkedField]
+    public EntityUid? InvisibleWallActionEntity;
+
+    // The vow zone lies below
+    [DataField, AutoNetworkedField]
+    public bool VowBroken = false;
+
+    /// <summary>
+    /// Whether this mime is ready to take the vow again.
+    /// Note that if they already have the vow, this is also false.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool ReadyToRepent = false;
+
+    /// <summary>
+    /// Time when the mime can repent their vow
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan VowRepentTime = TimeSpan.Zero;
+
+    /// <summary>
+    /// How long it takes the mime to get their powers back
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan VowCooldown = TimeSpan.FromMinutes(5);
+
+    [DataField]
+    public ProtoId<AlertPrototype> VowAlert = "VowOfSilence";
+
+    [DataField]
+    public ProtoId<AlertPrototype> VowBrokenAlert = "VowBroken";
+
+    /// <summary>
+    /// Does this component prevent the mime from writing on paper while their vow is active?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool PreventWriting = false;
+
+    /// <summary>
+    /// What message is displayed when the mime fails to write?
+    /// </summary>
+    [DataField]
+    public LocId FailWriteMessage = "paper-component-illiterate-mime";
+
+    public override bool SendOnlyToOwner => true;
+}
diff --git a/Content.Shared/Abilities/Mime/MimePowersSystem.cs b/Content.Shared/Abilities/Mime/MimePowersSystem.cs
new file mode 100644
index 000000000000..22ba7a359105
--- /dev/null
+++ b/Content.Shared/Abilities/Mime/MimePowersSystem.cs
@@ -0,0 +1,187 @@
+using Content.Shared.Popups;
+using Content.Shared.Actions;
+using Content.Shared.Actions.Events;
+using Content.Shared.Alert;
+using Content.Shared.Coordinates.Helpers;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Maps;
+using Content.Shared.Paper;
+using Content.Shared.Physics;
+using Content.Shared.Speech.Muting;
+using Robust.Shared.Containers;
+using Robust.Shared.Map;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Abilities.Mime;
+
+public sealed class MimePowersSystem : EntitySystem
+{
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+    [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
+    [Dependency] private readonly AlertsSystem _alertsSystem = default!;
+    [Dependency] private readonly TurfSystem _turf = default!;
+    [Dependency] private readonly IMapManager _mapMan = default!;
+    [Dependency] private readonly SharedContainerSystem _container = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<MimePowersComponent, ComponentInit>(OnComponentInit);
+        SubscribeLocalEvent<MimePowersComponent, ComponentShutdown>(OnComponentShutdown);
+        SubscribeLocalEvent<MimePowersComponent, InvisibleWallActionEvent>(OnInvisibleWall);
+
+        SubscribeLocalEvent<MimePowersComponent, BreakVowAlertEvent>(OnBreakVowAlert);
+        SubscribeLocalEvent<MimePowersComponent, RetakeVowAlertEvent>(OnRetakeVowAlert);
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+        // Queue to track whether mimes can retake vows yet
+
+        var query = EntityQueryEnumerator<MimePowersComponent>();
+        while (query.MoveNext(out var uid, out var mime))
+        {
+            if (!mime.VowBroken || mime.ReadyToRepent)
+                continue;
+
+            if (_timing.CurTime < mime.VowRepentTime)
+                continue;
+
+            mime.ReadyToRepent = true;
+            Dirty(uid, mime);
+            _popupSystem.PopupClient(Loc.GetString("mime-ready-to-repent"), uid, uid);
+        }
+    }
+
+    private void OnComponentInit(Entity<MimePowersComponent> ent, ref ComponentInit args)
+    {
+        EnsureComp<MutedComponent>(ent);
+
+        if (ent.Comp.PreventWriting)
+        {
+            EnsureComp<BlockWritingComponent>(ent, out var illiterateComponent);
+            illiterateComponent.FailWriteMessage = ent.Comp.FailWriteMessage;
+            Dirty(ent, illiterateComponent);
+        }
+
+        _alertsSystem.ShowAlert(ent, ent.Comp.VowAlert);
+        _actionsSystem.AddAction(ent, ref ent.Comp.InvisibleWallActionEntity, ent.Comp.InvisibleWallAction);
+    }
+
+    private void OnComponentShutdown(Entity<MimePowersComponent> ent, ref ComponentShutdown args)
+    {
+        _actionsSystem.RemoveAction(ent.Owner, ent.Comp.InvisibleWallActionEntity);
+    }
+
+    /// <summary>
+    /// Creates an invisible wall in a free space after some checks.
+    /// </summary>
+    private void OnInvisibleWall(Entity<MimePowersComponent> ent, ref InvisibleWallActionEvent args)
+    {
+        if (!ent.Comp.Enabled)
+            return;
+
+        if (_container.IsEntityOrParentInContainer(ent))
+            return;
+
+        var xform = Transform(ent);
+        // Get the tile in front of the mime
+        var offsetValue = xform.LocalRotation.ToWorldVec();
+        var coords = xform.Coordinates.Offset(offsetValue).SnapToGrid(EntityManager, _mapMan);
+        var tile = _turf.GetTileRef(coords);
+        if (tile == null)
+            return;
+
+        // Check if the tile is blocked by a wall or mob, and don't create the wall if so
+        if (_turf.IsTileBlocked(tile.Value, CollisionGroup.Impassable | CollisionGroup.Opaque))
+        {
+            _popupSystem.PopupClient(Loc.GetString("mime-invisible-wall-failed"), ent, ent);
+            return;
+        }
+
+        var messageSelf = Loc.GetString("mime-invisible-wall-popup-self", ("mime", Identity.Entity(ent.Owner, EntityManager)));
+        var messageOthers = Loc.GetString("mime-invisible-wall-popup-others", ("mime", Identity.Entity(ent.Owner, EntityManager)));
+        _popupSystem.PopupPredicted(messageSelf, messageOthers, ent, ent);
+
+        // Make sure we set the invisible wall to despawn properly
+        PredictedSpawnAtPosition(ent.Comp.WallPrototype, _turf.GetTileCenter(tile.Value));
+        // Handle args so cooldown works
+        args.Handled = true;
+    }
+
+    private void OnBreakVowAlert(Entity<MimePowersComponent> ent, ref BreakVowAlertEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        BreakVow(ent, ent);
+        args.Handled = true;
+    }
+
+    private void OnRetakeVowAlert(Entity<MimePowersComponent> ent, ref RetakeVowAlertEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        RetakeVow(ent, ent);
+        args.Handled = true;
+    }
+
+    /// <summary>
+    /// Break this mime's vow to not speak.
+    /// </summary>
+    public void BreakVow(EntityUid uid, MimePowersComponent? mimePowers = null)
+    {
+        if (!Resolve(uid, ref mimePowers))
+            return;
+
+        if (mimePowers.VowBroken)
+            return;
+
+        mimePowers.Enabled = false;
+        mimePowers.VowBroken = true;
+        mimePowers.VowRepentTime = _timing.CurTime + mimePowers.VowCooldown;
+        Dirty(uid, mimePowers);
+        RemComp<MutedComponent>(uid);
+        if (mimePowers.PreventWriting)
+            RemComp<BlockWritingComponent>(uid);
+
+        _alertsSystem.ClearAlert(uid, mimePowers.VowAlert);
+        _alertsSystem.ShowAlert(uid, mimePowers.VowBrokenAlert);
+        _actionsSystem.RemoveAction(uid, mimePowers.InvisibleWallActionEntity);
+    }
+
+    /// <summary>
+    /// Retake this mime's vow to not speak.
+    /// </summary>
+    public void RetakeVow(EntityUid uid, MimePowersComponent? mimePowers = null)
+    {
+        if (!Resolve(uid, ref mimePowers))
+            return;
+
+        if (!mimePowers.ReadyToRepent)
+        {
+            _popupSystem.PopupClient(Loc.GetString("mime-not-ready-repent"), uid, uid);
+            return;
+        }
+
+        mimePowers.Enabled = true;
+        mimePowers.ReadyToRepent = false;
+        mimePowers.VowBroken = false;
+        Dirty(uid, mimePowers);
+        AddComp<MutedComponent>(uid);
+        if (mimePowers.PreventWriting)
+        {
+            EnsureComp<BlockWritingComponent>(uid, out var illiterateComponent);
+            illiterateComponent.FailWriteMessage = mimePowers.FailWriteMessage;
+            Dirty(uid, illiterateComponent);
+        }
+
+        _alertsSystem.ClearAlert(uid, mimePowers.VowBrokenAlert);
+        _alertsSystem.ShowAlert(uid, mimePowers.VowAlert);
+        _actionsSystem.AddAction(uid, ref mimePowers.InvisibleWallActionEntity, mimePowers.InvisibleWallAction, uid);
+    }
+}
diff --git a/Content.Shared/Actions/Components/TargetActionComponent.cs b/Content.Shared/Actions/Components/TargetActionComponent.cs
index 0cb9de49468a..8d3e7640324d 100644
--- a/Content.Shared/Actions/Components/TargetActionComponent.cs
+++ b/Content.Shared/Actions/Components/TargetActionComponent.cs
@@ -1,6 +1,6 @@
-using Content.Shared.Actions;
-using Content.Shared.Interaction;
-using Robust.Shared.GameStates;
+using Content.Shared.Interaction;
+using Content.Shared.Physics;
+using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Actions.Components;
@@ -37,6 +37,16 @@ public sealed partial class TargetActionComponent : Component
     [DataField]
     public bool CheckCanAccess = true;
 
+    /// <summary>
+    ///     The collision group to use to check for accessibility if <see cref="CheckCanAccess" /> is true.
+    /// </summary>
+    [DataField]
+    public CollisionGroup AccessMask = SharedInteractionSystem.InRangeUnobstructedMask;
+
+    /// <summary>
+    ///     The allowed range for a target to be. If zero or negative, the range check is skipped,
+    ///     unless <see cref="CheckCanAccess"/> is true.
+    /// </summary>
     [DataField]
     public float Range = SharedInteractionSystem.InteractionRange;
 
diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs
index 366b5eeb7666..b6217aa18d66 100644
--- a/Content.Shared/Actions/SharedActionsSystem.cs
+++ b/Content.Shared/Actions/SharedActionsSystem.cs
@@ -445,13 +445,18 @@ public bool ValidateEntityTarget(EntityUid user, EntityUid target, Entity<Entity
             return comp.CanTargetSelf;
 
         var targetAction = Comp<TargetActionComponent>(uid);
+
         // not using the ValidateBaseTarget logic since its raycast fails if the target is e.g. a wall
         if (targetAction.CheckCanAccess)
-            return _interaction.InRangeAndAccessible(user, target, range: targetAction.Range);
+            return _interaction.InRangeAndAccessible(user, target, targetAction.Range, targetAction.AccessMask);
+
+        // Just check normal in range, allowing <= 0 range to mean infinite range.
+        if (targetAction.Range > 0
+            && !_transform.InRange(user, target, targetAction.Range))
+            return false;
 
-        // if not just checking pure range, let stored entities be targeted by actions
-        // if it's out of range it probably isn't stored anyway...
-        return _interaction.CanAccessViaStorage(user, target);
+        // If checkCanAccess isn't set, we allow targeting things in containers
+        return _interaction.IsAccessible(user, target);
     }
 
     public bool ValidateWorldTarget(EntityUid user, EntityCoordinates target, Entity<WorldTargetActionComponent> ent)
diff --git a/Content.Shared/Administration/AdminCameraEuiState.cs b/Content.Shared/Administration/AdminCameraEuiState.cs
new file mode 100644
index 000000000000..ae41f3aeb083
--- /dev/null
+++ b/Content.Shared/Administration/AdminCameraEuiState.cs
@@ -0,0 +1,27 @@
+using Content.Shared.Eui;
+using Robust.Shared.Serialization;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Administration;
+
+[Serializable, NetSerializable]
+public sealed partial class AdminCameraEuiState(NetEntity? camera, string name, GameTick tick) : EuiStateBase
+{
+    /// <summary>
+    /// The camera entity we will use for the window.
+    /// </summary>
+    public readonly NetEntity? Camera = camera;
+
+    /// <summary>
+    /// The name of the observed entity.
+    /// </summary>
+    public readonly string Name = name;
+
+    /// <summary>
+    /// The current tick time, needed for cursed reasons.
+    /// </summary>
+    public readonly GameTick Tick = tick;
+}
+
+[Serializable, NetSerializable]
+public sealed partial class AdminCameraFollowMessage : EuiMessageBase;
diff --git a/Content.Shared/Armor/ArmorComponent.cs b/Content.Shared/Armor/ArmorComponent.cs
index 2b0f5a2fafb4..614dddab8cff 100644
--- a/Content.Shared/Armor/ArmorComponent.cs
+++ b/Content.Shared/Armor/ArmorComponent.cs
@@ -20,9 +20,6 @@ public sealed partial class ArmorComponent : Component
     [DataField("staminaModifier")]
     public float StaminaDamageModifier = 1.0f;
     
-    [DataField]
-    public bool IngoreKnockdown = false;
-
     /// <summary>
     /// A multiplier applied to the calculated point value
     /// to determine the monetary value of the armor
diff --git a/Content.Shared/Armor/SharedArmorSystem.cs b/Content.Shared/Armor/SharedArmorSystem.cs
index 8161a3a15f71..589883ab4a72 100644
--- a/Content.Shared/Armor/SharedArmorSystem.cs
+++ b/Content.Shared/Armor/SharedArmorSystem.cs
@@ -24,7 +24,6 @@ public override void Initialize()
         SubscribeLocalEvent<ArmorComponent, InventoryRelayedEvent<CoefficientQueryEvent>>(OnCoefficientQuery);
         SubscribeLocalEvent<ArmorComponent, InventoryRelayedEvent<DamageModifyEvent>>(OnDamageModify);
         SubscribeLocalEvent<ArmorComponent, InventoryRelayedEvent<StaminaModifyEvent>>(OnStaminaDamageModify);
-        SubscribeLocalEvent<ArmorComponent, InventoryRelayedEvent<BeforeKnockdownEvent>>(OnKnockdown);
         SubscribeLocalEvent<ArmorComponent, BorgModuleRelayedEvent<DamageModifyEvent>>(OnBorgDamageModify);
         SubscribeLocalEvent<ArmorComponent, GetVerbsEvent<ExamineVerb>>(OnArmorVerbExamine);
     }
@@ -56,12 +55,6 @@ private void OnStaminaDamageModify(EntityUid uid, ArmorComponent component, Inve
             args.Args.Modifier = component.StaminaDamageModifier;
     }
     
-    private void OnKnockdown(EntityUid uid, ArmorComponent component, InventoryRelayedEvent<BeforeKnockdownEvent> args)
-    {
-        if (component.IngoreKnockdown)
-            args.Args.Cancelled = true;
-    }
-
     private void OnBorgDamageModify(EntityUid uid, ArmorComponent component,
         ref BorgModuleRelayedEvent<DamageModifyEvent> args)
     {
diff --git a/Content.Server/Atmos/Piping/Components/AtmosPipeColorComponent.cs b/Content.Shared/Atmos/Components/AtmosPipeColorComponent.cs
similarity index 63%
rename from Content.Server/Atmos/Piping/Components/AtmosPipeColorComponent.cs
rename to Content.Shared/Atmos/Components/AtmosPipeColorComponent.cs
index a8edb07d3188..ee8e55491f37 100644
--- a/Content.Server/Atmos/Piping/Components/AtmosPipeColorComponent.cs
+++ b/Content.Shared/Atmos/Components/AtmosPipeColorComponent.cs
@@ -1,19 +1,22 @@
-using Content.Server.Atmos.Piping.EntitySystems;
+using Content.Shared.Atmos.EntitySystems;
+using Robust.Shared.GameStates;
 using JetBrains.Annotations;
 
-namespace Content.Server.Atmos.Piping.Components;
+namespace Content.Shared.Atmos.Components;
 
-[RegisterComponent]
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState]
 public sealed partial class AtmosPipeColorComponent : Component
 {
     [DataField]
+    [AutoNetworkedField]
     public Color Color { get; set; } = Color.White;
 
     [ViewVariables(VVAccess.ReadWrite), UsedImplicitly]
     public Color ColorVV
     {
         get => Color;
-        set => IoCManager.Resolve<IEntityManager>().System<AtmosPipeColorSystem>().SetColor(Owner, this, value);
+        set => IoCManager.Resolve<IEntityManager>().System<AtmosPipeColorSystem>().SetColor((Owner, this), value);
     }
 }
 
diff --git a/Content.Shared/Atmos/Consoles/Components/AtmosMonitoringConsoleComponent.cs b/Content.Shared/Atmos/Consoles/Components/AtmosMonitoringConsoleComponent.cs
index d01fb4e8bc4b..022a787ebd6a 100644
--- a/Content.Shared/Atmos/Consoles/Components/AtmosMonitoringConsoleComponent.cs
+++ b/Content.Shared/Atmos/Consoles/Components/AtmosMonitoringConsoleComponent.cs
@@ -234,9 +234,9 @@ public AtmosMonitoringConsoleEntry
 /// </summary>
 /// <param name="NetId">The associated network ID.</param>
 /// <param name="PipeLayer">The associated pipe layer.</param>
-/// <param name="HexCode">The color of the pipe.</param>
+/// <param name="Color">The color of the pipe.</param>
 [Serializable, NetSerializable]
-public record AtmosMonitoringConsoleSubnet(int NetId, AtmosPipeLayer PipeLayer, string HexCode);
+public record AtmosMonitoringConsoleSubnet(int NetId, AtmosPipeLayer PipeLayer, Color Color);
 
 public enum AtmosPipeChunkDataFacing : byte
 {
diff --git a/Content.Shared/Atmos/EntitySystems/AtmosPipeColorSystem.cs b/Content.Shared/Atmos/EntitySystems/AtmosPipeColorSystem.cs
new file mode 100644
index 000000000000..548136fbfa8d
--- /dev/null
+++ b/Content.Shared/Atmos/EntitySystems/AtmosPipeColorSystem.cs
@@ -0,0 +1,36 @@
+using Content.Shared.Atmos.Components;
+using Content.Shared.Atmos.Piping;
+
+namespace Content.Shared.Atmos.EntitySystems;
+
+public sealed class AtmosPipeColorSystem : EntitySystem
+{
+
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<AtmosPipeColorComponent, ComponentStartup>(OnStartup);
+        SubscribeLocalEvent<AtmosPipeColorComponent, ComponentShutdown>(OnShutdown);
+    }
+
+    private void OnStartup(Entity<AtmosPipeColorComponent> item, ref ComponentStartup args)
+    {
+        _appearance.SetData(item.Owner, PipeColorVisuals.Color, item.Comp.Color);
+    }
+
+    private void OnShutdown(Entity<AtmosPipeColorComponent> item, ref ComponentShutdown args)
+    {
+        _appearance.SetData(item.Owner, PipeColorVisuals.Color, Color.White);
+    }
+
+    public void SetColor(Entity<AtmosPipeColorComponent> item, Color color)
+    {
+        item.Comp.Color = color;
+        _appearance.SetData(item.Owner, PipeColorVisuals.Color, color);
+        Dirty(item);
+    }
+}
+
diff --git a/Content.Shared/Atmos/Monitor/AtmosAlarmThreshold.cs b/Content.Shared/Atmos/Monitor/AtmosAlarmThreshold.cs
index 89d0bf239292..becc5378f266 100644
--- a/Content.Shared/Atmos/Monitor/AtmosAlarmThreshold.cs
+++ b/Content.Shared/Atmos/Monitor/AtmosAlarmThreshold.cs
@@ -388,9 +388,21 @@ public enum AtmosMonitorLimitType //<todo.eoin Very similar to the above...
 // fields you can find this prototype in
 public enum AtmosMonitorThresholdType
 {
-    Temperature,
-    Pressure,
-    Gas
+    Temperature = 0,
+    Pressure = 1,
+    Gas = 2
+}
+
+/// <summary>
+/// Bitflags version of <see cref="AtmosMonitorThresholdType"/>
+/// </summary>
+[Flags]
+public enum AtmosMonitorThresholdTypeFlags
+{
+    None = 0,
+    Temperature = 1 << 0,
+    Pressure = 1 << 1,
+    Gas = 1 << 2,
 }
 
 [Serializable, NetSerializable]
diff --git a/Content.Shared/Bed/Sleep/SleepingSystem.cs b/Content.Shared/Bed/Sleep/SleepingSystem.cs
index 79735450a2bd..b0c4e98a27a9 100644
--- a/Content.Shared/Bed/Sleep/SleepingSystem.cs
+++ b/Content.Shared/Bed/Sleep/SleepingSystem.cs
@@ -18,7 +18,6 @@
 using Content.Shared.Sound;
 using Content.Shared.Sound.Components;
 using Content.Shared.Speech;
-using Content.Shared.StatusEffect;
 using Content.Shared.StatusEffectNew;
 using Content.Shared.Stunnable;
 using Content.Shared.Traits.Assorted;
@@ -39,8 +38,8 @@ public sealed partial class SleepingSystem : EntitySystem
     [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedEmitSoundSystem _emitSound = default!;
-    [Dependency] private readonly StatusEffect.StatusEffectsSystem _statusEffectOld = default!;
-    [Dependency] private readonly StatusEffectNew.StatusEffectsSystem _statusEffectNew = default!;
+    [Dependency] private readonly StatusEffectsSystem _statusEffect = default!;
+    [Dependency] private readonly SharedStunSystem _stun = default!;
 
     public static readonly EntProtoId SleepActionId = "ActionSleep";
     public static readonly EntProtoId WakeActionId = "ActionWake";
@@ -68,6 +67,8 @@ public override void Initialize()
         SubscribeLocalEvent<SleepingComponent, ExaminedEvent>(OnExamined);
         SubscribeLocalEvent<SleepingComponent, GetVerbsEvent<AlternativeVerb>>(AddWakeVerb);
         SubscribeLocalEvent<SleepingComponent, InteractHandEvent>(OnInteractHand);
+        SubscribeLocalEvent<SleepingComponent, StunEndAttemptEvent>(OnStunEndAttempt);
+        SubscribeLocalEvent<SleepingComponent, StandUpAttemptEvent>(OnStandUpAttempt);
 
         SubscribeLocalEvent<ForcedSleepingStatusEffectComponent, StatusEffectAppliedEvent>(OnStatusEffectApplied);
         SubscribeLocalEvent<SleepingComponent, UnbuckleAttemptEvent>(OnUnbuckleAttempt);
@@ -107,10 +108,7 @@ private void OnSleepStateChanged(Entity<MobStateComponent> ent, ref SleepStateCh
     {
         if (args.FellAsleep)
         {
-            // Expiring status effects would remove the components needed for sleeping
-            _statusEffectOld.TryRemoveStatusEffect(ent.Owner, "Stun");
-            _statusEffectOld.TryRemoveStatusEffect(ent.Owner, "KnockedDown");
-
+            // Just in case we're not using the sleeping status
             EnsureComp<StunnedComponent>(ent);
             EnsureComp<KnockedDownComponent>(ent);
 
@@ -130,8 +128,9 @@ private void OnSleepStateChanged(Entity<MobStateComponent> ent, ref SleepStateCh
             return;
         }
 
-        RemComp<StunnedComponent>(ent);
-        RemComp<KnockedDownComponent>(ent);
+        _stun.TryUnstun(ent.Owner);
+        _stun.TryStanding(ent.Owner);
+
         RemComp<SpamEmitSoundComponent>(ent);
     }
 
@@ -176,6 +175,17 @@ private void OnConsciousAttempt(Entity<SleepingComponent> ent, ref ConsciousAtte
         args.Cancelled = true;
     }
 
+    private void OnStunEndAttempt(Entity<SleepingComponent> ent, ref StunEndAttemptEvent args)
+    {
+        args.Cancelled = true;
+    }
+
+    private void OnStandUpAttempt(Entity<SleepingComponent> ent, ref StandUpAttemptEvent args)
+    {
+        // Shh the Urist McHands is sleeping...
+        args.Cancelled = true;
+    }
+
     private void OnExamined(Entity<SleepingComponent> ent, ref ExaminedEvent args)
     {
         if (args.IsInDetailsRange)
@@ -189,7 +199,6 @@ private void AddWakeVerb(Entity<SleepingComponent> ent, ref GetVerbsEvent<Altern
         if (!args.CanInteract || !args.CanAccess)
             return;
 
-        var target = args.Target;
         var user = args.User;
         AlternativeVerb verb = new()
         {
@@ -255,7 +264,10 @@ private void OnMobStateChanged(Entity<SleepingComponent> ent, ref MobStateChange
 
     private void OnStatusEffectApplied(Entity<ForcedSleepingStatusEffectComponent> ent, ref StatusEffectAppliedEvent args)
     {
-        TrySleeping(args.Target);
+        // Applying state check needed so we don't add SleepingComp during
+        // entity reset due to the status effect getting inserted
+        if (!_gameTiming.ApplyingState)
+            TrySleeping(args.Target);
     }
 
     private void Wake(Entity<SleepingComponent> ent)
@@ -312,7 +324,7 @@ public bool TryWaking(Entity<SleepingComponent?> ent, bool force = false, Entity
         if (!Resolve(ent, ref ent.Comp, false))
             return false;
 
-        if (!force && _statusEffectNew.HasEffectComp<ForcedSleepingStatusEffectComponent>(ent))
+        if (!force && _statusEffect.HasEffectComp<ForcedSleepingStatusEffectComponent>(ent))
         {
             if (user != null)
             {
diff --git a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
index 24560cad3831..1202ab54dbdc 100644
--- a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
+++ b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
@@ -448,9 +448,9 @@ public void Unbuckle(Entity<BuckleComponent?> buckle, EntityUid? user)
     private void Unbuckle(Entity<BuckleComponent> buckle, Entity<StrapComponent> strap, EntityUid? user)
     {
         if (user == buckle.Owner)
-            _adminLogger.Add(LogType.Action, LogImpact.Low, $"{user} unbuckled themselves from {strap}");
+            _adminLogger.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(user):user} unbuckled themselves from {ToPrettyString(strap):strap}");
         else if (user != null)
-            _adminLogger.Add(LogType.Action, LogImpact.Low, $"{user} unbuckled {buckle} from {strap}");
+            _adminLogger.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(user):user} unbuckled {ToPrettyString(buckle):target} from {ToPrettyString(strap):strap}");
 
         _audio.PlayPredicted(strap.Comp.UnbuckleSound, strap, user);
 
diff --git a/Content.Shared/CCVar/CCVars.Viewport.cs b/Content.Shared/CCVar/CCVars.Viewport.cs
index d94394d2a754..74d462f3ced9 100644
--- a/Content.Shared/CCVar/CCVars.Viewport.cs
+++ b/Content.Shared/CCVar/CCVars.Viewport.cs
@@ -30,4 +30,7 @@ public sealed partial class CCVars
 
     public static readonly CVarDef<bool> ViewportVerticalFit =
         CVarDef.Create("viewport.vertical_fit", true, CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    public static readonly CVarDef<string> ViewportScalingFilterMode =
+        CVarDef.Create("viewport.scaling_filter", "nearest", CVar.CLIENTONLY | CVar.ARCHIVE);
 }
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index d68ab1687436..87b2da129aaf 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -36,5 +36,5 @@ public sealed partial class CCVars : CVars
     /// Set to true to disable parallel processing in the pow3r solver.
     /// </summary>
     public static readonly CVarDef<bool> DebugPow3rDisableParallel =
-        CVarDef.Create("debug.pow3r_disable_parallel", true, CVar.SERVERONLY);
+        CVarDef.Create("debug.pow3r_disable_parallel", false, CVar.SERVERONLY);
 }
diff --git a/Content.Shared/Chat/Prototypes/EmoteSoundsPrototype.cs b/Content.Shared/Chat/Prototypes/EmoteSoundsPrototype.cs
index 4364e13d8434..0138009ef9c8 100644
--- a/Content.Shared/Chat/Prototypes/EmoteSoundsPrototype.cs
+++ b/Content.Shared/Chat/Prototypes/EmoteSoundsPrototype.cs
@@ -1,7 +1,6 @@
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array;
 
 namespace Content.Shared.Chat.Prototypes;
 
@@ -10,11 +9,20 @@ namespace Content.Shared.Chat.Prototypes;
 ///     Different entities may use different sounds collections.
 /// </summary>
 [Prototype]
-public sealed partial class EmoteSoundsPrototype : IPrototype
+public sealed partial class EmoteSoundsPrototype : IPrototype, IInheritingPrototype
 {
     [IdDataField]
     public string ID { get; private set; } = default!;
 
+    /// <inheritdoc/>
+    [ParentDataField(typeof(AbstractPrototypeIdArraySerializer<EmoteSoundsPrototype>))]
+    public string[]? Parents { get; private set; }
+
+    /// <inheritdoc/>
+    [AbstractDataField]
+    [NeverPushInheritance]
+    public bool Abstract { get; }
+
     /// <summary>
     ///     Optional fallback sound that will play if collection
     ///     doesn't have specific sound for this emote id.
@@ -32,6 +40,7 @@ public sealed partial class EmoteSoundsPrototype : IPrototype
     /// <summary>
     ///     Collection of emote prototypes and their sounds.
     /// </summary>
-    [DataField("sounds", customTypeSerializer: typeof(PrototypeIdDictionarySerializer<SoundSpecifier, EmotePrototype>))]
-    public Dictionary<string, SoundSpecifier> Sounds = new();
+    [DataField]
+    [AlwaysPushInheritance]
+    public Dictionary<ProtoId<EmotePrototype>, SoundSpecifier> Sounds = new();
 }
diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
index 83de0970ec4a..5cc12a9b695e 100644
--- a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
@@ -510,20 +510,20 @@ public bool TryAddReagent(Entity<SolutionComponent> soln, ReagentId reagentId, F
     ///     Removes reagent from a container.
     /// </summary>
     /// <param name="targetUid"></param>
-    /// <param name="container">Solution container from which we are removing reagent</param>
+    /// <param name="container">Solution container from which we are removing reagent.</param>
     /// <param name="reagentQuantity">The reagent to remove.</param>
-    /// <returns>If the reagent to remove was found in the container.</returns>
-    public bool RemoveReagent(Entity<SolutionComponent> soln, ReagentQuantity reagentQuantity)
+    /// <returns>The amount of reagent that was removed.</returns>
+    public FixedPoint2 RemoveReagent(Entity<SolutionComponent> soln, ReagentQuantity reagentQuantity)
     {
         var (uid, comp) = soln;
         var solution = comp.Solution;
 
         var quant = solution.RemoveReagent(reagentQuantity);
         if (quant <= FixedPoint2.Zero)
-            return false;
+            return FixedPoint2.Zero;
 
         UpdateChemicals(soln);
-        return true;
+        return quant;
     }
 
     /// <summary>
@@ -533,8 +533,8 @@ public bool RemoveReagent(Entity<SolutionComponent> soln, ReagentQuantity reagen
     /// <param name="container">Solution container from which we are removing reagent</param>
     /// <param name="prototype">The Id of the reagent to remove.</param>
     /// <param name="quantity">The amount of reagent to remove.</param>
-    /// <returns>If the reagent to remove was found in the container.</returns>
-    public bool RemoveReagent(Entity<SolutionComponent> soln, string prototype, FixedPoint2 quantity, List<ReagentData>? data = null)
+    /// <returns>The amount of reagent that was removed.</returns>
+    public FixedPoint2 RemoveReagent(Entity<SolutionComponent> soln, string prototype, FixedPoint2 quantity, List<ReagentData>? data = null)
     {
         return RemoveReagent(soln, new ReagentQuantity(prototype, quantity, data));
     }
@@ -546,8 +546,8 @@ public bool RemoveReagent(Entity<SolutionComponent> soln, string prototype, Fixe
     /// <param name="container">Solution container from which we are removing reagent</param>
     /// <param name="reagentId">The reagent to remove.</param>
     /// <param name="quantity">The amount of reagent to remove.</param>
-    /// <returns>If the reagent to remove was found in the container.</returns>
-    public bool RemoveReagent(Entity<SolutionComponent> soln, ReagentId reagentId, FixedPoint2 quantity)
+    /// <returns>The amount of reagent that was removed.</returns>
+    public FixedPoint2 RemoveReagent(Entity<SolutionComponent> soln, ReagentId reagentId, FixedPoint2 quantity)
     {
         return RemoveReagent(soln, new ReagentQuantity(reagentId, quantity));
     }
diff --git a/Content.Shared/Climbing/Systems/ClimbSystem.cs b/Content.Shared/Climbing/Systems/ClimbSystem.cs
index 0067eb87b2dc..45055ebbccac 100644
--- a/Content.Shared/Climbing/Systems/ClimbSystem.cs
+++ b/Content.Shared/Climbing/Systems/ClimbSystem.cs
@@ -571,7 +571,7 @@ private void OnGlassClimbed(EntityUid uid, GlassTableComponent component, ref Cl
 
         _damageableSystem.TryChangeDamage(args.Climber, component.ClimberDamage, origin: args.Climber);
         _damageableSystem.TryChangeDamage(uid, component.TableDamage, origin: args.Climber);
-        _stunSystem.TryParalyze(args.Climber, TimeSpan.FromSeconds(component.StunTime), true);
+        _stunSystem.TryUpdateParalyzeDuration(args.Climber, TimeSpan.FromSeconds(component.StunTime));
 
         // Not shown to the user, since they already get a 'you climb on the glass table' popup
         _popupSystem.PopupEntity(
diff --git a/Content.Shared/Clothing/Components/FoldableClothingComponent.cs b/Content.Shared/Clothing/Components/FoldableClothingComponent.cs
index 7b03adcc8d6b..2068162e4928 100644
--- a/Content.Shared/Clothing/Components/FoldableClothingComponent.cs
+++ b/Content.Shared/Clothing/Components/FoldableClothingComponent.cs
@@ -35,11 +35,11 @@ public sealed partial class FoldableClothingComponent : Component
     /// Which layers does this hide when Unfolded? See <see cref="HumanoidVisualLayers"/> and <see cref="HideLayerClothingComponent"/>
     /// </summary>
     [DataField]
-    public HashSet<HumanoidVisualLayers>? UnfoldedHideLayers = new();
+    public HashSet<HumanoidVisualLayers> UnfoldedHideLayers = new();
 
     /// <summary>
     /// Which layers does this hide when folded? See <see cref="HumanoidVisualLayers"/> and <see cref="HideLayerClothingComponent"/>
     /// </summary>
     [DataField]
-    public HashSet<HumanoidVisualLayers>? FoldedHideLayers = new();
+    public HashSet<HumanoidVisualLayers> FoldedHideLayers = new();
 }
diff --git a/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs
index a60caa454b1e..7c6810140cc3 100644
--- a/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs
@@ -37,7 +37,7 @@ private void OnFoldAttempt(Entity<FoldableClothingComponent> ent, ref FoldAttemp
         }
 
         // Setting hidden layers while equipped is not currently supported.
-        if (ent.Comp.FoldedHideLayers != null || ent.Comp.UnfoldedHideLayers != null)
+        if (ent.Comp.FoldedHideLayers.Count != 0|| ent.Comp.UnfoldedHideLayers.Count != 0)
             args.Cancelled = true;
     }
 
@@ -65,7 +65,7 @@ private void OnFolded(Entity<FoldableClothingComponent> ent, ref FoldedEvent arg
             // This should instead work via an event or something that gets raised to optionally modify the currently hidden layers.
             // Or at the very least it should stash the old layers and restore them when unfolded.
             // TODO CLOTHING fix this.
-            if (ent.Comp.FoldedHideLayers != null && TryComp<HideLayerClothingComponent>(ent.Owner, out var hideLayerComp))
+            if (ent.Comp.FoldedHideLayers.Count != 0 && TryComp<HideLayerClothingComponent>(ent.Owner, out var hideLayerComp))
                 hideLayerComp.Slots = ent.Comp.FoldedHideLayers;
 
         }
@@ -81,7 +81,7 @@ private void OnFolded(Entity<FoldableClothingComponent> ent, ref FoldedEvent arg
                 _itemSystem.SetHeldPrefix(ent.Owner, null, false, itemComp);
 
             // TODO CLOTHING fix this.
-            if (ent.Comp.UnfoldedHideLayers != null && TryComp<HideLayerClothingComponent>(ent.Owner, out var hideLayerComp))
+            if (ent.Comp.UnfoldedHideLayers.Count != 0 && TryComp<HideLayerClothingComponent>(ent.Owner, out var hideLayerComp))
                 hideLayerComp.Slots = ent.Comp.UnfoldedHideLayers;
 
         }
diff --git a/Content.Shared/Clumsy/ClumsySystem.cs b/Content.Shared/Clumsy/ClumsySystem.cs
index a1b64879b8da..b7b1bb48b790 100644
--- a/Content.Shared/Clumsy/ClumsySystem.cs
+++ b/Content.Shared/Clumsy/ClumsySystem.cs
@@ -130,7 +130,7 @@ private void BeforeGunShotEvent(Entity<ClumsyComponent> ent, ref SelfBeforeGunSh
         if (ent.Comp.GunShootFailDamage != null)
             _damageable.TryChangeDamage(ent, ent.Comp.GunShootFailDamage, origin: ent);
 
-        _stun.TryParalyze(ent, ent.Comp.GunShootFailStunTime, true);
+        _stun.TryUpdateParalyzeDuration(ent, ent.Comp.GunShootFailStunTime);
 
         // Apply salt to the wound ("Honk!") (No idea what this comment means)
         _audio.PlayPvs(ent.Comp.GunShootFailSound, ent);
@@ -203,7 +203,7 @@ public void HitHeadClumsy(Entity<ClumsyComponent> target, EntityUid table)
                 _damageable.TryChangeDamage(target, bonkComp.BonkDamage, true);
         }
 
-        _stun.TryParalyze(target, stunTime, true);
+        _stun.TryUpdateParalyzeDuration(target, stunTime);
     }
     #endregion
 }
diff --git a/Content.Shared/Cluwne/CluwneComponent.cs b/Content.Shared/Cluwne/CluwneComponent.cs
index db2766e9ef9b..a6c65f53e1b5 100644
--- a/Content.Shared/Cluwne/CluwneComponent.cs
+++ b/Content.Shared/Cluwne/CluwneComponent.cs
@@ -66,4 +66,15 @@ public sealed partial class CluwneComponent : Component
     /// </summary>
     [DataField]
     public SoundSpecifier ArrivalSound = new SoundPathSpecifier("/Audio/Effects/teleport_arrival.ogg");
+
+    //#region Starlight
+
+    /// <summary>
+    /// whether this cluwne is permanent and should be unremovable by bible thwacks
+    /// </summary>
+    [DataField]
+    public bool Unremovable = false;
+
+    //#endregion Starlight
+
 }
diff --git a/Content.Shared/Damage/Systems/DamageOnHighSpeedImpactSystem.cs b/Content.Shared/Damage/Systems/DamageOnHighSpeedImpactSystem.cs
index 6ef41e872196..33d7c65a45bd 100644
--- a/Content.Shared/Damage/Systems/DamageOnHighSpeedImpactSystem.cs
+++ b/Content.Shared/Damage/Systems/DamageOnHighSpeedImpactSystem.cs
@@ -46,7 +46,7 @@ private void HandleCollide(EntityUid uid, DamageOnHighSpeedImpactComponent compo
         component.LastHit = _gameTiming.CurTime;
 
         if (_robustRandom.Prob(component.StunChance))
-            _stun.TryStun(uid, TimeSpan.FromSeconds(component.StunSeconds), true);
+            _stun.TryUpdateStunDuration(uid, TimeSpan.FromSeconds(component.StunSeconds));
 
         var damageScale = component.SpeedDamageFactor * speed / component.MinimumSpeed;
 
diff --git a/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs b/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs
index 0f43e93abf3a..bd3b6979f700 100644
--- a/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs
+++ b/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs
@@ -92,7 +92,7 @@ private void OnHandInteract(Entity<DamageOnInteractComponent> entity, ref Intera
 
             // Attempt to paralyze the user after they have taken damage
             if (_random.Prob(entity.Comp.StunChance))
-                _stun.TryParalyze(args.User, TimeSpan.FromSeconds(entity.Comp.StunSeconds), true);
+                _stun.TryUpdateParalyzeDuration(args.User, TimeSpan.FromSeconds(entity.Comp.StunSeconds));
         }
         // Check if the entity's Throw bool is false, or if the entity has the PullableComponent, then if the entity is currently being pulled.
         // BeingPulled must be checked because the entity will be spastically thrown around without this.
diff --git a/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs b/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs
index d10600ab5631..feb5dd4140b8 100644
--- a/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs
+++ b/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs
@@ -1,14 +1,19 @@
 using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Events;
 using Content.Shared.Destructible;
+using Content.Shared.Prototypes;
 using Content.Shared.Rejuvenate;
 using Content.Shared.Slippery;
+using Content.Shared.StatusEffect;
 using Content.Shared.StatusEffectNew;
+using Content.Shared.StatusEffectNew.Components;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Damage.Systems;
 
 public abstract class SharedGodmodeSystem : EntitySystem
 {
+    [Dependency] private readonly IPrototypeManager _protoMan = default!;
     [Dependency] private readonly DamageableSystem _damageable = default!;
 
     public override void Initialize()
@@ -17,6 +22,7 @@ public override void Initialize()
 
         SubscribeLocalEvent<GodmodeComponent, BeforeDamageChangedEvent>(OnBeforeDamageChanged);
         SubscribeLocalEvent<GodmodeComponent, BeforeStatusEffectAddedEvent>(OnBeforeStatusEffect);
+        SubscribeLocalEvent<GodmodeComponent, BeforeOldStatusEffectAddedEvent>(OnBeforeOldStatusEffect);
         SubscribeLocalEvent<GodmodeComponent, BeforeStaminaDamageEvent>(OnBeforeStaminaDamage);
         SubscribeLocalEvent<GodmodeComponent, SlipAttemptEvent>(OnSlipAttempt);
         SubscribeLocalEvent<GodmodeComponent, DestructionAttemptEvent>(OnDestruction);
@@ -34,6 +40,13 @@ private void OnBeforeDamageChanged(EntityUid uid, GodmodeComponent component, re
 
     private void OnBeforeStatusEffect(EntityUid uid, GodmodeComponent component, ref BeforeStatusEffectAddedEvent args)
     {
+        if (_protoMan.Index(args.Effect).HasComponent<RejuvenateRemovedStatusEffectComponent>(Factory))
+            args.Cancelled = true;
+    }
+
+    private void OnBeforeOldStatusEffect(Entity<GodmodeComponent> ent, ref BeforeOldStatusEffectAddedEvent args)
+    {
+        // Old status effect system doesn't distinguish between good and bad status effects
         args.Cancelled = true;
     }
 
diff --git a/Content.Shared/Damage/Systems/SharedStaminaSystem.cs b/Content.Shared/Damage/Systems/SharedStaminaSystem.cs
index 5506e8f88e83..a6e4ba9f012b 100644
--- a/Content.Shared/Damage/Systems/SharedStaminaSystem.cs
+++ b/Content.Shared/Damage/Systems/SharedStaminaSystem.cs
@@ -8,12 +8,13 @@
 using Content.Shared.Database;
 using Content.Shared.Effects;
 using Content.Shared.FixedPoint;
+using Content.Shared.Movement.Components;
+using Content.Shared.Movement.Systems;
 using Content.Shared.Inventory;
-using Content.Shared.IdentityManagement;
-using Content.Shared.Popups;
 using Content.Shared.Projectiles;
 using Content.Shared.Rejuvenate;
 using Content.Shared.Rounding;
+using Content.Shared.StatusEffectNew;
 using Content.Shared.Stunnable;
 using Content.Shared.Throwing;
 using Content.Shared.Weapons.Melee.Events;
@@ -23,6 +24,7 @@
 using Robust.Shared.Configuration;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Timing;
 
@@ -30,15 +32,19 @@ namespace Content.Shared.Damage.Systems;
 
 public abstract partial class SharedStaminaSystem : EntitySystem
 {
+    public static readonly EntProtoId StaminaLow = "StatusEffectStaminaLow";
+
+    [Dependency] private readonly IConfigurationManager _config = default!;
     [Dependency] protected readonly IGameTiming Timing = default!;
     [Dependency] private readonly INetManager _net = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
     [Dependency] private readonly AlertsSystem _alerts = default!;
     [Dependency] private readonly MetaDataSystem _metadata = default!;
+    [Dependency] private readonly MovementModStatusSystem _movementMod = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
+    [Dependency] private readonly StatusEffectsSystem _status = default!;
     [Dependency] protected readonly SharedStunSystem StunSystem = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly IConfigurationManager _config = default!;
 
     /// <summary>
     /// How much of a buffer is there between the stun duration and when stuns can be re-applied.
@@ -116,8 +122,9 @@ private void OnRejuvenate(Entity<StaminaComponent> entity, ref RejuvenateEvent a
         }
 
         entity.Comp.StaminaDamage = 0;
-        AdjustSlowdown(entity.Owner);
+        AdjustStatus(entity.Owner);
         RemComp<ActiveStaminaComponent>(entity);
+        _status.TryRemoveStatusEffect(entity, StaminaLow);
         UpdateStaminaVisuals(entity);
         Dirty(entity);
     }
@@ -290,7 +297,7 @@ public void TakeStaminaDamage(EntityUid uid, float value, StaminaComponent? comp
                 component.NextUpdate = nextUpdate;
         }
 
-        AdjustSlowdown(uid);
+        AdjustStatus(uid);
 
         UpdateStaminaVisuals((uid, component));
 
@@ -298,6 +305,7 @@ public void TakeStaminaDamage(EntityUid uid, float value, StaminaComponent? comp
         if (component.AfterCritical && oldDamage > component.StaminaDamage && component.StaminaDamage <= 0f)
         {
             component.AfterCritical = false; // Since the recovery from the crit has been completed, we are no longer 'after crit'
+            _status.TryRemoveStatusEffect(uid, StaminaLow);
         }
 
         if (!component.Critical)
@@ -390,7 +398,7 @@ private void EnterStamCrit(EntityUid uid, StaminaComponent? component = null)
         component.Critical = true;
         component.StaminaDamage = component.CritThreshold;
 
-        if (StunSystem.TryParalyze(uid, component.StunTime, true))
+        if (StunSystem.TryUpdateParalyzeDuration(uid, component.StunTime))
             StunSystem.TrySeeingStars(uid);
 
         // Give them buffer before being able to be re-stunned
@@ -418,18 +426,19 @@ private void ExitStamCrit(EntityUid uid, StaminaComponent? component = null)
     }
 
     /// <summary>
-    /// Adjusts the movement speed of an entity based on its current <see cref="StaminaComponent.StaminaDamage"/> value.
-    /// If the entity has a <see cref="SlowOnDamageComponent"/>, its custom damage-to-speed thresholds are used,
-    /// otherwise, a default set of thresholds is applied.
-    /// The method determines the closest applicable damage threshold below the crit limit and applies the corresponding
-    /// speed modifier using the stun system. If no threshold is met then the entity's speed is restored to normal.
+    /// Adjusts the modifiers of the <see cref="StaminaLow"/> status effect entity and applies relevant statuses.
+    /// System iterates through the <see cref="StaminaComponent.StunModifierThresholds"/> to find correct movement modifer.
+    /// This modifier is saved to the Stamina Low Status Effect entity's <see cref="MovementModStatusEffectComponent"/>.
     /// </summary>
     /// <param name="ent">Entity to update</param>
-    private void AdjustSlowdown(Entity<StaminaComponent?> ent)
+    private void AdjustStatus(Entity<StaminaComponent?> ent)
     {
         if (!Resolve(ent, ref ent.Comp))
             return;
 
+        if (!_status.TrySetStatusEffectDuration(ent, StaminaLow, out var status))
+            return;
+
         var closest = FixedPoint2.Zero;
 
         // Iterate through the dictionary in the similar way as in Damage.SlowOnDamageSystem.OnRefreshMovespeed
@@ -441,7 +450,7 @@ private void AdjustSlowdown(Entity<StaminaComponent?> ent)
                 closest = thres.Key;
         }
 
-        StunSystem.UpdateStunModifiers(ent, ent.Comp.StunModifierThresholds[closest]);
+        _movementMod.TryUpdateMovementStatus(ent.Owner, status.Value, ent.Comp.StunModifierThresholds[closest]);
     }
 
     [Serializable, NetSerializable]
diff --git a/Content.Shared/Dataset/LocalizedDatasetPrototype.cs b/Content.Shared/Dataset/LocalizedDatasetPrototype.cs
index 2e0aa60c684a..ce9a1ba3048f 100644
--- a/Content.Shared/Dataset/LocalizedDatasetPrototype.cs
+++ b/Content.Shared/Dataset/LocalizedDatasetPrototype.cs
@@ -52,6 +52,18 @@ public string this[int index]
             return Prefix + (index + 1);
         }
     }
+    
+    // Starlight-start
+    public int IndexOf(string value)
+    {
+        for (int i = 0; i < Count; i++)
+        {
+            if (this[i] == value)
+                return i;
+        }
+        return -1;
+    }
+    // Starlight-end
 
     public IEnumerator<string> GetEnumerator()
     {
diff --git a/Content.Shared/Delivery/DeliveryComponent.cs b/Content.Shared/Delivery/DeliveryComponent.cs
index 3eabb5165ccd..08d40b06f08e 100644
--- a/Content.Shared/Delivery/DeliveryComponent.cs
+++ b/Content.Shared/Delivery/DeliveryComponent.cs
@@ -86,4 +86,10 @@ public sealed partial class DeliveryComponent : Component
     /// </summary>
     [DataField]
     public string Container = "delivery";
+    
+    /// <summary>
+    /// Starlight-edit: indicates whether delivery via systems is possible.
+    /// </summary>
+    [DataField]
+    public bool SystemDeliverySpawn = false; // Starlight-edit
 }
diff --git a/Content.Shared/Delivery/DeliverySpawnerComponent.cs b/Content.Shared/Delivery/DeliverySpawnerComponent.cs
index 81e8c97cf527..0677377f19ed 100644
--- a/Content.Shared/Delivery/DeliverySpawnerComponent.cs
+++ b/Content.Shared/Delivery/DeliverySpawnerComponent.cs
@@ -40,4 +40,13 @@ public sealed partial class DeliverySpawnerComponent : Component
     /// </summary>
     [DataField]
     public SoundSpecifier? OpenSound = new SoundCollectionSpecifier("storageRustle");
+
+    #region Starlight
+
+    /// <summary>
+    /// the table to switch to when this device is emagged. if it is null cant be emagged.
+    /// </summary>
+    [DataField]
+    public EntityTableSelector? EmagTable;
+    #endregion
 }
diff --git a/Content.Shared/Delivery/SharedDeliverySystem.cs b/Content.Shared/Delivery/SharedDeliverySystem.cs
index d7fc40dcc66f..1edfa81f201d 100644
--- a/Content.Shared/Delivery/SharedDeliverySystem.cs
+++ b/Content.Shared/Delivery/SharedDeliverySystem.cs
@@ -14,6 +14,7 @@
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Prototypes;
+using Content.Shared.Emag.Systems; //Starlight
 
 namespace Content.Shared.Delivery;
 
@@ -31,7 +32,7 @@ public abstract class SharedDeliverySystem : EntitySystem
     [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly SharedHandsSystem _hands = default!;
     [Dependency] private readonly NameModifierSystem _nameModifier = default!;
-
+    [Dependency] private readonly EmagSystem _emag = default!; //Starlight
     private static readonly ProtoId<TagPrototype> TrashTag = "Trash";
     private static readonly ProtoId<TagPrototype> RecyclableTag = "Recyclable";
 
@@ -47,6 +48,8 @@ public override void Initialize()
 
         SubscribeLocalEvent<DeliverySpawnerComponent, ExaminedEvent>(OnSpawnerExamine);
         SubscribeLocalEvent<DeliverySpawnerComponent, GetVerbsEvent<AlternativeVerb>>(OnGetSpawnerVerbs);
+
+        SubscribeLocalEvent<DeliverySpawnerComponent, GotEmaggedEvent>(OnGotEmagged); //Starlight
     }
 
     private void OnDeliveryExamine(Entity<DeliveryComponent> ent, ref ExaminedEvent args)
@@ -289,6 +292,18 @@ protected float GetDeliveryMultiplier(Entity<DeliveryComponent> ent)
         return totalMultiplier;
     }
 
+    #region Starlight
+    protected void OnGotEmagged(Entity<DeliverySpawnerComponent> deliverySpawner, ref GotEmaggedEvent args)
+    {
+        if (!_emag.CompareFlag(args.Type, EmagType.Interaction))
+            return;
+        var emagTable = deliverySpawner.Comp.EmagTable;
+        if (emagTable != null)
+            deliverySpawner.Comp.Table = emagTable;
+        args.Handled = true;
+    }
+    #endregion
+
     protected virtual void GrantSpesoReward(Entity<DeliveryComponent?> ent) { }
 
     protected virtual void HandlePenalty(Entity<DeliveryComponent> ent, string? reason = null) { }
diff --git a/Content.Shared/DisplacementMap/DisplacementData.cs b/Content.Shared/DisplacementMap/DisplacementData.cs
index 6564f720a8e3..79f89a1d2534 100644
--- a/Content.Shared/DisplacementMap/DisplacementData.cs
+++ b/Content.Shared/DisplacementMap/DisplacementData.cs
@@ -1,6 +1,8 @@
+using Robust.Shared.Serialization;
+
 namespace Content.Shared.DisplacementMap;
 
-[DataDefinition]
+[DataDefinition, Serializable, NetSerializable]
 public sealed partial class DisplacementData
 {
     /// <summary>
diff --git a/Content.Shared/Disposal/Unit/SharedDisposalUnitSystem.cs b/Content.Shared/Disposal/Unit/SharedDisposalUnitSystem.cs
index e92552ef6d48..bdf8b5ba07e5 100644
--- a/Content.Shared/Disposal/Unit/SharedDisposalUnitSystem.cs
+++ b/Content.Shared/Disposal/Unit/SharedDisposalUnitSystem.cs
@@ -19,6 +19,7 @@
 using Content.Shared.Popups;
 using Content.Shared.Power;
 using Content.Shared.Power.EntitySystems;
+using Content.Shared.Storage.Components;
 using Content.Shared.Throwing;
 using Content.Shared.Verbs;
 using Content.Shared.Whitelist;
@@ -90,6 +91,9 @@ public override void Initialize()
         SubscribeLocalEvent<DisposalUnitComponent, AfterInteractUsingEvent>(OnAfterInteractUsing);
         SubscribeLocalEvent<DisposalUnitComponent, DragDropTargetEvent>(OnDragDropOn);
         SubscribeLocalEvent<DisposalUnitComponent, ContainerRelayMovementEntityEvent>(OnMovement);
+
+        SubscribeLocalEvent<DisposalUnitComponent, GetDumpableVerbEvent>(OnGetDumpableVerb);
+        SubscribeLocalEvent<DisposalUnitComponent, DumpEvent>(OnDump);
     }
 
     private void AddDisposalAltVerbs(Entity<DisposalUnitComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
@@ -785,4 +789,23 @@ private void AddClimbInsideVerb(EntityUid uid, DisposalUnitComponent component,
         // See also, medical scanner. Also maybe add verbs for entering lockers/body bags?
         args.Verbs.Add(verb);
     }
+
+    private void OnGetDumpableVerb(Entity<DisposalUnitComponent> ent, ref GetDumpableVerbEvent args)
+    {
+        args.Verb = Loc.GetString("dump-disposal-verb-name", ("unit", ent));
+    }
+
+    private void OnDump(Entity<DisposalUnitComponent> ent, ref DumpEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        args.Handled = true;
+        args.PlaySound = true;
+
+        foreach (var entity in args.DumpQueue)
+        {
+            DoInsertDisposalUnit(ent, entity, args.User);
+        }
+    }
 }
diff --git a/Content.Shared/Doors/Systems/SharedDoorSystem.cs b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
index 7238bc718dd6..b15148eace2a 100644
--- a/Content.Shared/Doors/Systems/SharedDoorSystem.cs
+++ b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
@@ -534,7 +534,7 @@ public void Crush(EntityUid uid, DoorComponent? door = null, PhysicsComponent? p
             if (door.CrushDamage != null)
                 _damageableSystem.TryChangeDamage(entity, door.CrushDamage, origin: uid);
 
-            _stunSystem.TryParalyze(entity, stunTime, true);
+            _stunSystem.TryUpdateParalyzeDuration(entity, stunTime);
         }
 
         if (door.CurrentlyCrushing.Count == 0)
diff --git a/Content.Shared/EntityEffects/EffectConditions/SolutionTemperature.cs b/Content.Shared/EntityEffects/EffectConditions/SolutionTemperature.cs
index a9629401a057..e2febd8f4838 100644
--- a/Content.Shared/EntityEffects/EffectConditions/SolutionTemperature.cs
+++ b/Content.Shared/EntityEffects/EffectConditions/SolutionTemperature.cs
@@ -13,17 +13,14 @@ public sealed partial class SolutionTemperature : EntityEffectCondition
 
     [DataField]
     public float Max = float.PositiveInfinity;
+
     public override bool Condition(EntityEffectBaseArgs args)
     {
         if (args is EntityEffectReagentArgs reagentArgs)
         {
-            if (reagentArgs.Source == null)
-                return false;
-            if (reagentArgs.Source.Temperature < Min)
-                return false;
-            if (reagentArgs.Source.Temperature > Max)
-                return false;
-            return true;
+            return reagentArgs?.Source != null &&
+                   reagentArgs.Source.Temperature >= Min &&
+                   reagentArgs.Source.Temperature <= Max;
         }
 
         // TODO: Someone needs to figure out how to do this for non-reagent effects.
diff --git a/Content.Shared/EntityEffects/EffectConditions/TotalDamage.cs b/Content.Shared/EntityEffects/EffectConditions/TotalDamage.cs
index 62b3e037e1c9..a4baeb634a1e 100644
--- a/Content.Shared/EntityEffects/EffectConditions/TotalDamage.cs
+++ b/Content.Shared/EntityEffects/EffectConditions/TotalDamage.cs
@@ -18,8 +18,7 @@ public override bool Condition(EntityEffectBaseArgs args)
         if (args.EntityManager.TryGetComponent(args.TargetEntity, out DamageableComponent? damage))
         {
             var total = damage.TotalDamage;
-            if (total > Min && total < Max)
-                return true;
+            return total >= Min && total <= Max;
         }
 
         return false;
diff --git a/Content.Shared/EntityEffects/EffectConditions/TotalHunger.cs b/Content.Shared/EntityEffects/EffectConditions/TotalHunger.cs
index b4f1a1af8985..cbeb334c4738 100644
--- a/Content.Shared/EntityEffects/EffectConditions/TotalHunger.cs
+++ b/Content.Shared/EntityEffects/EffectConditions/TotalHunger.cs
@@ -18,8 +18,7 @@ public override bool Condition(EntityEffectBaseArgs args)
         if (args.EntityManager.TryGetComponent(args.TargetEntity, out HungerComponent? hunger))
         {
             var total = args.EntityManager.System<HungerSystem>().GetHunger(hunger);
-            if (total > Min && total < Max)
-                return true;
+            return total >= Min && total <= Max;
         }
 
         return false;
diff --git a/Content.Shared/EntityEffects/Effects/Paralyze.cs b/Content.Shared/EntityEffects/Effects/Paralyze.cs
index 2da6a6a0794c..2a2270016b70 100644
--- a/Content.Shared/EntityEffects/Effects/Paralyze.cs
+++ b/Content.Shared/EntityEffects/Effects/Paralyze.cs
@@ -1,4 +1,3 @@
-using Content.Shared.EntityEffects;
 using Content.Shared.Stunnable;
 using Robust.Shared.Prototypes;
 
@@ -14,9 +13,11 @@ public sealed partial class Paralyze : EntityEffect
     [DataField] public bool Refresh = true;
 
     protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
-        => Loc.GetString("reagent-effect-guidebook-paralyze",
+        => Loc.GetString(
+            "reagent-effect-guidebook-paralyze",
             ("chance", Probability),
-            ("time", ParalyzeTime));
+            ("time", ParalyzeTime)
+        );
 
     public override void Effect(EntityEffectBaseArgs args)
     {
@@ -27,7 +28,10 @@ public override void Effect(EntityEffectBaseArgs args)
             paralyzeTime *= (double)reagentArgs.Scale;
         }
 
-        args.EntityManager.System<SharedStunSystem>().TryParalyze(args.TargetEntity, TimeSpan.FromSeconds(paralyzeTime), Refresh);
+        var stunSystem = args.EntityManager.System<SharedStunSystem>();
+        _ = Refresh
+            ? stunSystem.TryUpdateParalyzeDuration(args.TargetEntity, TimeSpan.FromSeconds(paralyzeTime))
+            : stunSystem.TryAddParalyzeDuration(args.TargetEntity, TimeSpan.FromSeconds(paralyzeTime));
     }
 }
 
diff --git a/Content.Shared/Eye/VisibilityFlags.cs b/Content.Shared/Eye/VisibilityFlags.cs
index 99611dfd1cd3..9c5a4541a76d 100644
--- a/Content.Shared/Eye/VisibilityFlags.cs
+++ b/Content.Shared/Eye/VisibilityFlags.cs
@@ -8,9 +8,10 @@ public enum VisibilityFlags : int
     {
         None = 0,
         Normal = 1 << 0,
-        Ghost = 1 << 1,
-        Abductor = 1 << 2,
-        Subfloor = 1 << 3,
-        NullSpace = 1 << 4, // Starlight
+        Ghost = 1 << 1, // Observers and revenants.
+        Subfloor = 1 << 2, // Pipes, disposal chutes, cables etc. while hidden under tiles. Can be revealed with a t-ray.
+        Admin = 1 << 3, // Reserved for admins in stealth mode and admin tools.
+        Abductor = 1 << 4, // Abductor Eye... why cant this just be on like ghost layer or something? who cares if abductors can see ghost?
+        NullSpace = 1 << 5, // Starlight
     }
 }
diff --git a/Content.Shared/Flash/SharedFlashSystem.cs b/Content.Shared/Flash/SharedFlashSystem.cs
index 50652f940888..dd6c9c91c10e 100644
--- a/Content.Shared/Flash/SharedFlashSystem.cs
+++ b/Content.Shared/Flash/SharedFlashSystem.cs
@@ -20,6 +20,7 @@
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using System.Linq;
+using Content.Shared.Movement.Systems;
 
 namespace Content.Shared.Flash;
 
@@ -33,6 +34,7 @@ public abstract class SharedFlashSystem : EntitySystem
     [Dependency] private readonly ExamineSystemShared _examine = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedStunSystem _stun = default!;
+    [Dependency] private readonly MovementModStatusSystem _movementMod = default!;
     [Dependency] private readonly TagSystem _tag = default!;
     [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
@@ -163,9 +165,9 @@ public void Flash(
             return;
 
         if (stunDuration != null)
-            _stun.TryParalyze(target, stunDuration.Value, true);
+            _stun.TryUpdateParalyzeDuration(target, stunDuration.Value);
         else
-            _stun.TrySlowdown(target, flashDuration, true, slowTo, slowTo);
+            _movementMod.TryUpdateMovementSpeedModDuration(target, MovementModStatusSystem.FlashSlowdown, flashDuration, slowTo);
 
         if (displayPopup && user != null && target != user && Exists(user.Value))
         {
diff --git a/Content.Shared/Follower/FollowerSystem.cs b/Content.Shared/Follower/FollowerSystem.cs
index b72b17f41eac..a60a9ba891dc 100644
--- a/Content.Shared/Follower/FollowerSystem.cs
+++ b/Content.Shared/Follower/FollowerSystem.cs
@@ -190,6 +190,9 @@ private void OnFollowedStationAiRemoteEntityReplaced(Entity<FollowedComponent> e
     /// <param name="entity">The entity to be followed</param>
     public void StartFollowingEntity(EntityUid follower, EntityUid entity)
     {
+        if (follower == entity || TerminatingOrDeleted(entity))
+            return;
+
         // No recursion for you
         var targetXform = Transform(entity);
         while (targetXform.ParentUid.IsValid())
diff --git a/Content.Shared/Glue/GlueComponent.cs b/Content.Shared/Glue/GlueComponent.cs
index 4cbbc497379b..6f68b3fbca9c 100644
--- a/Content.Shared/Glue/GlueComponent.cs
+++ b/Content.Shared/Glue/GlueComponent.cs
@@ -2,41 +2,44 @@
 using Content.Shared.FixedPoint;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Glue;
 
-[RegisterComponent, NetworkedComponent]
-[Access(typeof(SharedGlueSystem))]
+/// <summary>
+/// This component indicates that an item is glue and can be used as such.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(GlueSystem))]
 public sealed partial class GlueComponent : Component
 {
     /// <summary>
     /// Noise made when glue applied.
     /// </summary>
-    [DataField("squeeze")]
+    [DataField, AutoNetworkedField]
     public SoundSpecifier Squeeze = new SoundPathSpecifier("/Audio/Items/squeezebottle.ogg");
 
     /// <summary>
     /// Solution on the entity that contains the glue.
     /// </summary>
-    [DataField("solution")]
+    [DataField, AutoNetworkedField]
     public string Solution = "drink";
 
     /// <summary>
     /// Reagent that will be used as glue.
     /// </summary>
-    [DataField("reagent", customTypeSerializer: typeof(PrototypeIdSerializer<ReagentPrototype>))]
-    public string Reagent = "SpaceGlue";
+    [DataField, AutoNetworkedField]
+    public ProtoId<ReagentPrototype> Reagent = "SpaceGlue";
 
     /// <summary>
     /// Reagent consumption per use.
     /// </summary>
-    [DataField("consumptionUnit"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField, AutoNetworkedField]
     public FixedPoint2 ConsumptionUnit = FixedPoint2.New(5);
 
     /// <summary>
     /// Duration per unit
     /// </summary>
-    [DataField("durationPerUnit"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField, AutoNetworkedField]
     public TimeSpan DurationPerUnit = TimeSpan.FromSeconds(6);
 }
diff --git a/Content.Server/Glue/GlueSystem.cs b/Content.Shared/Glue/GlueSystem.cs
similarity index 76%
rename from Content.Server/Glue/GlueSystem.cs
rename to Content.Shared/Glue/GlueSystem.cs
index d8f8e687d27f..9782b48b2da9 100644
--- a/Content.Server/Glue/GlueSystem.cs
+++ b/Content.Shared/Glue/GlueSystem.cs
@@ -1,7 +1,6 @@
-using Content.Server.Administration.Logs;
+using Content.Shared.Administration.Logs;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Database;
-using Content.Shared.Glue;
 using Content.Shared.Hands;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Components;
@@ -13,17 +12,17 @@
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Timing;
 
-namespace Content.Server.Glue;
+namespace Content.Shared.Glue;
 
-public sealed class GlueSystem : SharedGlueSystem
+public sealed class GlueSystem : EntitySystem
 {
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly NameModifierSystem _nameMod = default!;
+    [Dependency] private readonly OpenableSystem _openable = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly OpenableSystem _openable = default!;
-    [Dependency] private readonly NameModifierSystem _nameMod = default!;
 
     public override void Initialize()
     {
@@ -62,7 +61,7 @@ private void OnUtilityVerb(Entity<GlueComponent> entity, ref GetVerbsEvent<Utili
             Act = () => TryGlue(entity, target, user),
             IconEntity = GetNetEntity(entity),
             Text = Loc.GetString("glue-verb-text"),
-            Message = Loc.GetString("glue-verb-message")
+            Message = Loc.GetString("glue-verb-message"),
         };
 
         args.Verbs.Add(verb);
@@ -72,26 +71,29 @@ private bool TryGlue(Entity<GlueComponent> entity, EntityUid target, EntityUid a
     {
         // if item is glued then don't apply glue again so it can be removed for reasonable time
         // If glue is applied to an unremoveable item, the component will disappear after the duration.
-        // This effecitvely means any unremoveable item could be removed with a bottle of glue.
+        // This effectively means any unremoveable item could be removed with a bottle of glue.
         if (HasComp<GluedComponent>(target) || !HasComp<ItemComponent>(target) || HasComp<UnremoveableComponent>(target))
         {
-            _popup.PopupEntity(Loc.GetString("glue-failure", ("target", target)), actor, actor, PopupType.Medium);
+            _popup.PopupClient(Loc.GetString("glue-failure", ("target", target)), actor, actor, PopupType.Medium);
             return false;
         }
 
-        if (HasComp<ItemComponent>(target) && _solutionContainer.TryGetSolution(entity.Owner, entity.Comp.Solution, out _, out var solution))
+        if (HasComp<ItemComponent>(target) && _solutionContainer.TryGetSolution(entity.Owner, entity.Comp.Solution, out var solutionEntity, out _))
         {
-            var quantity = solution.RemoveReagent(entity.Comp.Reagent, entity.Comp.ConsumptionUnit);
+            var quantity = _solutionContainer.RemoveReagent(solutionEntity.Value, entity.Comp.Reagent, entity.Comp.ConsumptionUnit);
             if (quantity > 0)
             {
-                EnsureComp<GluedComponent>(target).Duration = quantity.Double() * entity.Comp.DurationPerUnit;
+                _audio.PlayPredicted(entity.Comp.Squeeze, entity.Owner, actor);
+                _popup.PopupClient(Loc.GetString("glue-success", ("target", target)), actor, actor, PopupType.Medium);
                 _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(actor):actor} glued {ToPrettyString(target):subject} with {ToPrettyString(entity.Owner):tool}");
-                _audio.PlayPvs(entity.Comp.Squeeze, entity.Owner);
-                _popup.PopupEntity(Loc.GetString("glue-success", ("target", target)), actor, actor, PopupType.Medium);
+                var gluedComp = EnsureComp<GluedComponent>(target);
+                gluedComp.Duration = quantity.Double() * entity.Comp.DurationPerUnit;
+                Dirty(target, gluedComp);
                 return true;
             }
         }
-        _popup.PopupEntity(Loc.GetString("glue-failure", ("target", target)), actor, actor, PopupType.Medium);
+
+        _popup.PopupClient(Loc.GetString("glue-failure", ("target", target)), actor, actor, PopupType.Medium);
         return false;
     }
 
@@ -119,9 +121,16 @@ private void OnGluedInit(Entity<GluedComponent> entity, ref ComponentInit args)
 
     private void OnHandPickUp(Entity<GluedComponent> entity, ref GotEquippedHandEvent args)
     {
+        // When predicting dropping a glued item prediction will reinsert the item into the hand when rerolling the state to a previous one.
+        // So dropping the item would add UnRemoveableComponent on the client without this guard statement.
+        if (_timing.ApplyingState)
+            return;
+
         var comp = EnsureComp<UnremoveableComponent>(entity);
         comp.DeleteOnDrop = false;
         entity.Comp.Until = _timing.CurTime + entity.Comp.Duration;
+        Dirty(entity.Owner, comp);
+        Dirty(entity);
     }
 
     private void OnRefreshNameModifiers(Entity<GluedComponent> entity, ref RefreshNameModifiersEvent args)
diff --git a/Content.Shared/Glue/GluedComponent.cs b/Content.Shared/Glue/GluedComponent.cs
index 4b46f0aa5b0e..1ef77c81937b 100644
--- a/Content.Shared/Glue/GluedComponent.cs
+++ b/Content.Shared/Glue/GluedComponent.cs
@@ -1,15 +1,26 @@
+using Robust.Shared.GameStates;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Glue;
 
-[RegisterComponent]
-[Access(typeof(SharedGlueSystem))]
+/// <summary>
+/// This component gets attached to an item that has been glued.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
+[Access(typeof(GlueSystem))]
 public sealed partial class GluedComponent : Component
 {
-
-    [DataField("until", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
+    /// <summary>
+    /// The TimeSpan this effect expires at.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
     public TimeSpan Until;
 
-    [DataField("duration", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
+    /// <summary>
+    /// The duration this effect will last. Determined by the quantity of the reagent that is applied.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField]
     public TimeSpan Duration;
 }
diff --git a/Content.Shared/Glue/SharedGlueSystem.cs b/Content.Shared/Glue/SharedGlueSystem.cs
deleted file mode 100644
index d8b413a1e179..000000000000
--- a/Content.Shared/Glue/SharedGlueSystem.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace Content.Shared.Glue;
-
-public abstract class SharedGlueSystem : EntitySystem
-{
-}
diff --git a/Content.Shared/Hands/Components/HandsComponent.cs b/Content.Shared/Hands/Components/HandsComponent.cs
index dc94c549818c..eb83ad1dad18 100644
--- a/Content.Shared/Hands/Components/HandsComponent.cs
+++ b/Content.Shared/Hands/Components/HandsComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Alert; // Starlight
 using Content.Shared.DisplacementMap;
 using Content.Shared.Hands.EntitySystems;
 using Robust.Shared.GameStates;
@@ -99,8 +100,24 @@ public sealed partial class HandsComponent : Component
     /// </summary>
     [DataField]
     public bool CanBeStripped = true;
+
+    // Starlight - OfferSystem - Start
+    [DataField, ViewVariables(VVAccess.ReadOnly)]
+    public bool Offering;
+
+    [DataField, ViewVariables(VVAccess.ReadOnly)]
+    public bool ReceivingOffer;
+
+    [DataField, ViewVariables(VVAccess.ReadOnly)]
+    public EntityUid? OfferItem;
+
+    [DataField, ViewVariables(VVAccess.ReadOnly)]
+    public EntityUid? OfferTarget;
+    // Starlight - OfferSystem - End
 }
 
+public sealed partial class OfferItemAlertEvent : BaseAlertEvent; // Starlight
+
 [DataDefinition]
 [Serializable, NetSerializable]
 public partial record struct Hand
diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.EventListeners.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.EventListeners.cs
index 4c67d52d24f3..4499babb360b 100644
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.EventListeners.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.EventListeners.cs
@@ -1,4 +1,3 @@
-using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Hands.Components;
 using Content.Shared.Stunnable;
 
@@ -7,55 +6,26 @@ namespace Content.Shared.Hands.EntitySystems;
 /// <summary>
 /// This is for events that don't affect normal hand functions but do care about hands.
 /// </summary>
-public abstract partial class SharedHandsSystem : EntitySystem
+public abstract partial class SharedHandsSystem
 {
     private void InitializeEventListeners()
     {
-        SubscribeLocalEvent<HandsComponent, StandUpArgsEvent>(OnStandupArgs);
-        SubscribeLocalEvent<HandsComponent, KnockedDownRefreshEvent>(OnKnockDownRefresh);
+        SubscribeLocalEvent<HandsComponent, GetStandUpTimeEvent>(OnStandupArgs);
     }
 
     /// <summary>
     /// Reduces the time it takes to stand up based on the number of hands we have available.
     /// </summary>
-    private void OnStandupArgs(Entity<HandsComponent> ent, ref StandUpArgsEvent args)
+    private void OnStandupArgs(Entity<HandsComponent> ent, ref GetStandUpTimeEvent time)
     {
-        if (!HasComp<KnockedDownComponent>(ent) || !TryCountEmptyHands(ent.Owner, out var hands))
+        if (!HasComp<KnockedDownComponent>(ent))
             return;
 
-        args.DoAfterTime *= (float)ent.Comp.Count / (hands.Value + ent.Comp.Count);
-    }
+        var hands = GetEmptyHandCount(ent.Owner);
 
-    private void OnKnockDownRefresh(Entity<HandsComponent> ent,
-        ref KnockedDownRefreshEvent args)
-    {
-        if (!HasComp<KnockedDownComponent>(ent) || !TryCountEmptyHands(ent.Owner, out var hands) && !hands.HasValue)
+        if (hands == 0)
             return;
 
-        // TODO: Instead of this being based on hands, it should be based on the bulk of the items we're holding
-        args.SpeedModifier *= (float)(hands.Value + 1)/(ent.Comp.Count + 1); // TODO: Unhardcode this calculation a little bit
-    }
-
-    #region Starlight
-    /// <summary>
-    ///     Does this entity have any empty hands, and how many?
-    /// </summary>
-    public bool TryCountEmptyHands(Entity<HandsComponent?> entity, [NotNullWhen(true)] out int? hands)
-    {
-        hands = 0;
-        var emptyHand = false;
-        if (!Resolve(entity, ref entity.Comp, false) || entity.Comp.Count == 0)
-            return false;
-
-        foreach (var hand in EnumerateHands(entity))
-        {
-            if (!HandIsEmpty(entity, hand))
-                continue;
-            hands++;
-            emptyHand = true;
-        }
-
-        return emptyHand;
+        time.DoAfterTime *= (float)ent.Comp.Count / (hands + ent.Comp.Count);
     }
-    #endregion
 }
diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs
index f8111ab44fad..5d3436ca49ee 100644
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs
@@ -36,7 +36,10 @@ public override void Initialize()
         InitializeDrop();
         InitializePickup();
         InitializeRelay();
-        InitializeEventListeners(); //Starlight
+        InitializeEventListeners();
+
+        InitializeOffer(); // Starlight
+
 
         SubscribeLocalEvent<HandsComponent, ComponentInit>(OnInit);
         SubscribeLocalEvent<HandsComponent, MapInitEvent>(OnMapInit);
@@ -167,6 +170,26 @@ public bool TryGetEmptyHand(Entity<HandsComponent?> ent, [NotNullWhen(true)] out
         return false;
     }
 
+    /// <summary>
+    ///     Does this entity have any empty hands, and how many?
+    /// </summary>
+    public int GetEmptyHandCount(Entity<HandsComponent?> entity)
+    {
+        if (!Resolve(entity, ref entity.Comp, false) || entity.Comp.Count == 0)
+            return 0;
+
+        var hands = 0;
+
+        foreach (var hand in EnumerateHands(entity))
+        {
+            if (!HandIsEmpty(entity, hand))
+                continue;
+            hands++;
+        }
+
+        return hands;
+    }
+
     /// <summary>
     /// Attempts to retrieve the item held in the entity's active hand.
     /// </summary>
diff --git a/Content.Shared/Humanoid/SkinColor.cs b/Content.Shared/Humanoid/SkinColor.cs
index db192c25202f..2c133535d683 100644
--- a/Content.Shared/Humanoid/SkinColor.cs
+++ b/Content.Shared/Humanoid/SkinColor.cs
@@ -1,3 +1,4 @@
+using System.Numerics;
 using System.Security.Cryptography;
 using Microsoft.VisualBasic.CompilerServices;
 
diff --git a/Content.Shared/Input/ContentKeyFunctions.cs b/Content.Shared/Input/ContentKeyFunctions.cs
index 1ee00f1fadf6..e76b08fefdd7 100644
--- a/Content.Shared/Input/ContentKeyFunctions.cs
+++ b/Content.Shared/Input/ContentKeyFunctions.cs
@@ -5,6 +5,7 @@ namespace Content.Shared.Input
     [KeyFunctions]
     public static class ContentKeyFunctions
     {
+        public static readonly BoundKeyFunction ToggleKnockdown = "ToggleKnockdown";
         public static readonly BoundKeyFunction UseItemInHand = "ActivateItemInHand";
         public static readonly BoundKeyFunction AltUseItemInHand = "AltActivateItemInHand";
         public static readonly BoundKeyFunction ActivateItemInWorld = "ActivateItemInWorld";
@@ -134,6 +135,5 @@ public static BoundKeyFunction[] GetHotbarBoundKeys() =>
 
         // 🌟Starlight🌟
         public static readonly BoundKeyFunction Jump = "Jump";
-        public static readonly BoundKeyFunction ToggleKnockdown = "ToggleKnockdown";
     }
 }
diff --git a/Content.Shared/Interaction/Components/UnremoveableComponent.cs b/Content.Shared/Interaction/Components/UnremoveableComponent.cs
index cd1069486580..a3606f3d2ca1 100644
--- a/Content.Shared/Interaction/Components/UnremoveableComponent.cs
+++ b/Content.Shared/Interaction/Components/UnremoveableComponent.cs
@@ -1,17 +1,14 @@
-using Content.Shared.Whitelist;
 using Robust.Shared.GameStates;
 
-namespace Content.Shared.Interaction.Components
+namespace Content.Shared.Interaction.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class UnremoveableComponent : Component
 {
-    [RegisterComponent]
-    [NetworkedComponent]
-    public sealed partial class UnremoveableComponent : Component
-    {
-        /// <summary>
-        /// If this is true then unremovable items that are removed from inventory are deleted (typically from corpse gibbing).
-        /// Items within unremovable containers are not deleted when removed.
-        /// </summary>
-        [DataField("deleteOnDrop")]
-        public bool DeleteOnDrop = true;
-    }
+    /// <summary>
+    /// If this is true then unremovable items that are removed from inventory are deleted (typically from corpse gibbing).
+    /// Items within unremovable containers are not deleted when removed.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool DeleteOnDrop = true;
 }
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index 4cbb55b6ce1a..b2072ca0fb4f 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -86,7 +86,11 @@ public abstract partial class SharedInteractionSystem : EntitySystem
         private EntityQuery<UseDelayComponent> _delayQuery;
         private EntityQuery<ActivatableUIComponent> _uiQuery;
 
-        private const CollisionGroup InRangeUnobstructedMask = CollisionGroup.Impassable | CollisionGroup.InteractImpassable;
+        /// <summary>
+        /// The collision mask used by default for
+        /// <see cref="InRangeUnobstructed(MapCoordinates,MapCoordinates,float,CollisionGroup,Ignored?,bool)" />
+        /// </summary>
+        public const CollisionGroup InRangeUnobstructedMask = CollisionGroup.Impassable | CollisionGroup.InteractImpassable;
 
         public const float InteractionRange = 1.5f;
         public const float InteractionRangeSquared = InteractionRange * InteractionRange;
diff --git a/Content.Shared/Inventory/InventoryComponent.cs b/Content.Shared/Inventory/InventoryComponent.cs
index 61e0114ff24b..664fdd6d565c 100644
--- a/Content.Shared/Inventory/InventoryComponent.cs
+++ b/Content.Shared/Inventory/InventoryComponent.cs
@@ -1,7 +1,7 @@
 using Content.Shared.DisplacementMap;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Inventory;
 
@@ -10,28 +10,46 @@ namespace Content.Shared.Inventory;
 [AutoGenerateComponentState(true)]
 public sealed partial class InventoryComponent : Component
 {
-    [DataField("templateId", customTypeSerializer: typeof(PrototypeIdSerializer<InventoryTemplatePrototype>))]
-    [AutoNetworkedField]
-    public string TemplateId { get; set; } = "human";
+    /// <summary>
+    /// The template defining how the inventory layout will look like.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    [ViewVariables] // use the API method
+    public ProtoId<InventoryTemplatePrototype> TemplateId = "human";
 
-    [DataField("speciesId")] public string? SpeciesId { get; set; }
+    /// <summary>
+    /// For setting the TemplateId.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    public ProtoId<InventoryTemplatePrototype> TemplateIdVV
+    {
+        get => TemplateId;
+        set => IoCManager.Resolve<IEntityManager>().System<InventorySystem>().SetTemplateId((Owner, this), value);
+    }
 
+    [DataField, AutoNetworkedField]
+    public string? SpeciesId;
+
+
+    [ViewVariables]
     public SlotDefinition[] Slots = Array.Empty<SlotDefinition>();
+
+    [ViewVariables]
     public ContainerSlot[] Containers = Array.Empty<ContainerSlot>();
 
-    [DataField]
+    [DataField, AutoNetworkedField]
     public Dictionary<string, DisplacementData> Displacements = new();
 
     /// <summary>
     /// Alternate displacement maps, which if available, will be selected for the player of the appropriate gender.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public Dictionary<string, DisplacementData> FemaleDisplacements = new();
 
     /// <summary>
     /// Alternate displacement maps, which if available, will be selected for the player of the appropriate gender.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public Dictionary<string, DisplacementData> MaleDisplacements = new();
 }
 
diff --git a/Content.Shared/Inventory/InventorySystem.Relay.cs b/Content.Shared/Inventory/InventorySystem.Relay.cs
index 8050ffca780d..930b559b4b07 100644
--- a/Content.Shared/Inventory/InventorySystem.Relay.cs
+++ b/Content.Shared/Inventory/InventorySystem.Relay.cs
@@ -42,7 +42,6 @@ public void InitializeRelay()
         SubscribeLocalEvent<InventoryComponent, HitScanPierceAttemptEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, DamageModifyEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, StaminaModifyEvent>(RelayInventoryEvent);
-        SubscribeLocalEvent<InventoryComponent, BeforeKnockdownEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, ElectrocutionAttemptEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, SlipAttemptEvent>(RelayInventoryEvent);
         SubscribeLocalEvent<InventoryComponent, RefreshMovementSpeedModifiersEvent>(RelayInventoryEvent);
diff --git a/Content.Shared/Inventory/InventorySystem.Slots.cs b/Content.Shared/Inventory/InventorySystem.Slots.cs
index 04d58c1cd52d..e9fb62f2adc8 100644
--- a/Content.Shared/Inventory/InventorySystem.Slots.cs
+++ b/Content.Shared/Inventory/InventorySystem.Slots.cs
@@ -43,7 +43,7 @@ public bool TryGetInventoryEntity<T>(Entity<InventoryComponent?> entity, out Ent
                 if (!TryComp<T>(item, out var required))
                     continue;
 
-                if ((((IClothingSlots) required).Slots & slot.SlotFlags) == 0x0)
+                if ((((IClothingSlots)required).Slots & slot.SlotFlags) == 0x0)
                     continue;
 
                 target = (item, required);
@@ -55,20 +55,9 @@ public bool TryGetInventoryEntity<T>(Entity<InventoryComponent?> entity, out Ent
         return false;
     }
 
-    protected virtual void OnInit(EntityUid uid, InventoryComponent component, ComponentInit args)
+    private void OnInit(Entity<InventoryComponent> ent, ref ComponentInit args)
     {
-        if (!_prototypeManager.TryIndex(component.TemplateId, out InventoryTemplatePrototype? invTemplate))
-            return;
-
-        component.Slots = invTemplate.Slots;
-        component.Containers = new ContainerSlot[component.Slots.Length];
-        for (var i = 0; i < component.Containers.Length; i++)
-        {
-            var slot = component.Slots[i];
-            var container = _containerSystem.EnsureContainer<ContainerSlot>(uid, slot.Name);
-            container.OccludesLight = false;
-            component.Containers[i] = container;
-        }
+        UpdateInventoryTemplate(ent);
     }
 
     private void AfterAutoState(Entity<InventoryComponent> ent, ref AfterAutoHandleStateEvent args)
@@ -78,18 +67,31 @@ private void AfterAutoState(Entity<InventoryComponent> ent, ref AfterAutoHandleS
 
     protected virtual void UpdateInventoryTemplate(Entity<InventoryComponent> ent)
     {
-        if (ent.Comp.LifeStage < ComponentLifeStage.Initialized)
+        if (!_prototypeManager.Resolve(ent.Comp.TemplateId, out var invTemplate))
             return;
 
-        if (!_prototypeManager.TryIndex(ent.Comp.TemplateId, out InventoryTemplatePrototype? invTemplate))
-            return;
+        // Remove any containers that aren't in the new template.
+        foreach (var container in ent.Comp.Containers)
+        {
+            if (invTemplate.Slots.Any(s => s.Name == container.ID))
+                continue;
 
-        DebugTools.Assert(ent.Comp.Slots.Length == invTemplate.Slots.Length);
+            // Empty container before deletion so the contents don't get deleted.
+            // For cases when we update the template while items are already worn.
+            _containerSystem.EmptyContainer(container);
+            _containerSystem.ShutdownContainer(container);
+        }
 
+        // Ensure the containers from the template.
         ent.Comp.Slots = invTemplate.Slots;
-
-        var ev = new InventoryTemplateUpdated();
-        RaiseLocalEvent(ent, ref ev);
+        ent.Comp.Containers = new ContainerSlot[ent.Comp.Slots.Length];
+        for (var i = 0; i < ent.Comp.Containers.Length; i++)
+        {
+            var slot = ent.Comp.Slots[i];
+            var container = _containerSystem.EnsureContainer<ContainerSlot>(ent.Owner, slot.Name);
+            container.OccludesLight = false;
+            ent.Comp.Containers[i] = container;
+        }
     }
 
     private void OnOpenSlotStorage(OpenSlotStorageNetworkMessage ev, EntitySessionEventArgs args)
@@ -195,27 +197,21 @@ private IEnumerable<string> ListViewVariablesSlots(EntityUid uid, InventoryCompo
     }
 
     /// <summary>
-    /// Change the inventory template ID an entity is using. The new template must be compatible.
+    /// Change the inventory template ID an entity is using
+    /// and drop any item that does not have a slot according to the new template.
+    /// This will update the client-side UI accordingly.
     /// </summary>
     /// <remarks>
-    /// <para>
-    /// For an inventory template to be compatible with another, it must have exactly the same slot names.
-    /// All other changes are rejected.
-    /// </para>
     /// </remarks>
     /// <param name="ent">The entity to update.</param>
     /// <param name="newTemplate">The ID of the new inventory template prototype.</param>
-    /// <exception cref="ArgumentException">
-    /// Thrown if the new template is not compatible with the existing one.
-    /// </exception>
     public void SetTemplateId(Entity<InventoryComponent> ent, ProtoId<InventoryTemplatePrototype> newTemplate)
     {
-        var newPrototype = _prototypeManager.Index(newTemplate);
-
-        if (!newPrototype.Slots.Select(x => x.Name).SequenceEqual(ent.Comp.Slots.Select(x => x.Name)))
-            throw new ArgumentException("Incompatible inventory template!");
+        if (ent.Comp.TemplateId == newTemplate)
+            return;
 
         ent.Comp.TemplateId = newTemplate;
+        UpdateInventoryTemplate(ent);
         Dirty(ent);
     }
 
@@ -231,12 +227,12 @@ public struct InventorySlotEnumerator
         private int _nextIdx = 0;
         public static InventorySlotEnumerator Empty = new(Array.Empty<SlotDefinition>(), Array.Empty<ContainerSlot>());
 
-        public InventorySlotEnumerator(InventoryComponent inventory,  SlotFlags flags = SlotFlags.All)
+        public InventorySlotEnumerator(InventoryComponent inventory, SlotFlags flags = SlotFlags.All)
             : this(inventory.Slots, inventory.Containers, flags)
         {
         }
 
-        public InventorySlotEnumerator(SlotDefinition[] slots, ContainerSlot[] containers,  SlotFlags flags = SlotFlags.All)
+        public InventorySlotEnumerator(SlotDefinition[] slots, ContainerSlot[] containers, SlotFlags flags = SlotFlags.All)
         {
             DebugTools.Assert(flags != SlotFlags.NONE);
             DebugTools.AssertEqual(slots.Length, containers.Length);
diff --git a/Content.Shared/Lock/LockComponent.cs b/Content.Shared/Lock/LockComponent.cs
index fc692aaf9c1f..3b3dcb7ab6e2 100644
--- a/Content.Shared/Lock/LockComponent.cs
+++ b/Content.Shared/Lock/LockComponent.cs
@@ -88,6 +88,12 @@ public sealed partial class LockComponent : Component
     [DataField]
     [AutoNetworkedField]
     public TimeSpan UnlockTime;
+    
+    [DataField]
+    public bool PopupMessage = true; // Starlight-edit
+    
+    [DataField]
+    public bool PowerNeeded = false; // Starlight-edit
 }
 
 /// <summary>
diff --git a/Content.Shared/Lock/LockSystem.cs b/Content.Shared/Lock/LockSystem.cs
index b1afbbd9b069..1252980a2390 100644
--- a/Content.Shared/Lock/LockSystem.cs
+++ b/Content.Shared/Lock/LockSystem.cs
@@ -18,6 +18,7 @@
 using JetBrains.Annotations;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Utility;
+using Content.Shared._Starlight.Power.Components; // Starlight-edit
 
 namespace Content.Shared.Lock;
 
@@ -74,11 +75,13 @@ private void OnActivated(EntityUid uid, LockComponent lockComp, ActivateInWorldE
         // Only attempt an unlock by default on Activate
         if (lockComp.Locked && lockComp.UnlockOnClick)
         {
-            args.Handled = TryUnlock(uid, args.User, lockComp);
+            args.Handled = true;
+            TryUnlock(uid, args.User, lockComp);
         }
         else if (!lockComp.Locked && lockComp.LockOnClick)
         {
-            args.Handled = TryLock(uid, args.User, lockComp);
+            args.Handled = true;
+            TryLock(uid, args.User, lockComp);
         }
     }
 
@@ -87,7 +90,7 @@ private void OnStorageOpenAttempt(EntityUid uid, LockComponent component, ref St
         if (!component.Locked)
             return;
 
-        if (!args.Silent)
+        if (!args.Silent && component.PopupMessage) // Starlight-edit
             _sharedPopupSystem.PopupClient(Loc.GetString("entity-storage-component-locked-message"), uid, args.User);
 
         args.Cancelled = true;
@@ -150,7 +153,7 @@ public void Lock(EntityUid uid, EntityUid? user, LockComponent? lockComp = null)
         if (!Resolve(uid, ref lockComp))
             return;
 
-        if (lockComp.Locked)
+        if (lockComp.Locked || (lockComp.PowerNeeded && TryComp<PoweredLockerComponent>(uid, out var power) && !power.Powered)) // Starlight-edit: Powered Locker
             return;
 
         if (user is { Valid: true })
@@ -183,7 +186,7 @@ public void Unlock(EntityUid uid, EntityUid? user, LockComponent? lockComp = nul
         if (!Resolve(uid, ref lockComp))
             return;
 
-        if (!lockComp.Locked)
+        if (!lockComp.Locked || (lockComp.PowerNeeded && TryComp<PoweredLockerComponent>(uid, out var power) && !power.Powered)) // Starlight-edit: Powered Locker
             return;
 
         if (user is { Valid: true })
@@ -323,7 +326,7 @@ private void OnEmagged(EntityUid uid, LockComponent component, ref GotEmaggedEve
         if (!_emag.CompareFlag(args.Type, EmagType.Access))
             return;
 
-        if (!component.Locked || !component.BreakOnAccessBreaker)
+        if (!component.Locked || !component.BreakOnAccessBreaker || (component.PowerNeeded && TryComp<PoweredLockerComponent>(uid, out var power) && !power.Powered)) // Starlight-edit: Powered Locker
             return;
 
         _audio.PlayPredicted(component.UnlockSound, uid, args.UserUid);
@@ -417,7 +420,7 @@ private void OnUIOpenAttempt(EntityUid uid, ActivatableUIRequiresLockComponent c
         if (TryComp<LockComponent>(uid, out var lockComp) && lockComp.Locked != component.RequireLocked)
         {
             args.Cancel();
-            if (lockComp.Locked)
+            if (lockComp.Locked && lockComp.PopupMessage) // Starlight-edit
             {
                 _sharedPopupSystem.PopupClient(Loc.GetString("entity-storage-component-locked-message"), uid, args.User);
             }
diff --git a/Content.Shared/Magic/Events/RandomGlobalSpawnSpellEvent.cs b/Content.Shared/Magic/Events/RandomGlobalSpawnSpellEvent.cs
index dedf53869645..b61415060644 100644
--- a/Content.Shared/Magic/Events/RandomGlobalSpawnSpellEvent.cs
+++ b/Content.Shared/Magic/Events/RandomGlobalSpawnSpellEvent.cs
@@ -24,4 +24,12 @@ public sealed partial class RandomGlobalSpawnSpellEvent : InstantActionEvent
     /// </summary>
     [DataField]
     public bool MakeSurvivorAntagonist = false;
+
+    #region Starlight
+    /// <summary>
+    /// Assumint MakeSurvivorAntagonist is true. what is the chance of any person becoming a survivor
+    /// </summary>
+    [DataField]
+    public float SurvivorAntagChance = 0.1f;
+    #endregion
 }
diff --git a/Content.Shared/Magic/SharedMagicSystem.cs b/Content.Shared/Magic/SharedMagicSystem.cs
index 2552478377c4..b75206997ea9 100644
--- a/Content.Shared/Magic/SharedMagicSystem.cs
+++ b/Content.Shared/Magic/SharedMagicSystem.cs
@@ -1,4 +1,5 @@
 using System.Numerics;
+using Content.Shared._Starlight.Magic.Events;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Systems;
 using Content.Shared.Coordinates.Helpers;
@@ -14,6 +15,7 @@
 using Content.Shared.Magic.Events;
 using Content.Shared.Maps;
 using Content.Shared.Mind;
+using Content.Shared.Ninja.Systems;
 using Content.Shared.Physics;
 using Content.Shared.Popups;
 using Content.Shared.Speech.Muting;
@@ -85,6 +87,9 @@ public override void Initialize()
         SubscribeLocalEvent<RandomGlobalSpawnSpellEvent>(OnRandomGlobalSpawnSpell);
         SubscribeLocalEvent<MindSwapSpellEvent>(OnMindSwapSpell);
         SubscribeLocalEvent<VoidApplauseSpellEvent>(OnVoidApplause);
+        #region Starlight
+        SubscribeLocalEvent<SpawnItemInHandEvent>(OnSpawnItemInHand);
+        #endregion
     }
 
     private void OnBeforeCastSpell(Entity<MagicComponent> ent, ref BeforeCastSpellEvent args)
@@ -146,7 +151,7 @@ private void OnInstantSpawn(InstantSpawnSpellEvent args)
         args.Handled = true;
     }
 
-        /// <summary>
+    /// <summary>
     ///     Gets spawn positions listed on <see cref="InstantSpawnSpellEvent"/>
     /// </summary>
     /// <exception cref="ArgumentOutOfRangeException"></exception>
@@ -155,65 +160,65 @@ private List<EntityCoordinates> GetInstantSpawnPositions(TransformComponent cast
         switch (data)
         {
             case TargetCasterPos:
-                return new List<EntityCoordinates>(1) {casterXform.Coordinates};
+                return new List<EntityCoordinates>(1) { casterXform.Coordinates };
             case TargetInFrontSingle:
-            {
-                var directionPos = casterXform.Coordinates.Offset(casterXform.LocalRotation.ToWorldVec().Normalized());
+                {
+                    var directionPos = casterXform.Coordinates.Offset(casterXform.LocalRotation.ToWorldVec().Normalized());
 
-                if (!TryComp<MapGridComponent>(casterXform.GridUid, out var mapGrid))
-                    return new List<EntityCoordinates>();
-                if (!_turf.TryGetTileRef(directionPos, out var tileReference))
-                    return new List<EntityCoordinates>();
+                    if (!TryComp<MapGridComponent>(casterXform.GridUid, out var mapGrid))
+                        return new List<EntityCoordinates>();
+                    if (!_turf.TryGetTileRef(directionPos, out var tileReference))
+                        return new List<EntityCoordinates>();
 
-                var tileIndex = tileReference.Value.GridIndices;
-                return new List<EntityCoordinates>(1) { _mapSystem.GridTileToLocal(casterXform.GridUid.Value, mapGrid, tileIndex) };
-            }
+                    var tileIndex = tileReference.Value.GridIndices;
+                    return new List<EntityCoordinates>(1) { _mapSystem.GridTileToLocal(casterXform.GridUid.Value, mapGrid, tileIndex) };
+                }
             case TargetInFront:
-            {
-                var directionPos = casterXform.Coordinates.Offset(casterXform.LocalRotation.ToWorldVec().Normalized());
+                {
+                    var directionPos = casterXform.Coordinates.Offset(casterXform.LocalRotation.ToWorldVec().Normalized());
 
-                if (!TryComp<MapGridComponent>(casterXform.GridUid, out var mapGrid))
-                    return new List<EntityCoordinates>();
+                    if (!TryComp<MapGridComponent>(casterXform.GridUid, out var mapGrid))
+                        return new List<EntityCoordinates>();
 
-                if (!_turf.TryGetTileRef(directionPos, out var tileReference))
-                    return new List<EntityCoordinates>();
+                    if (!_turf.TryGetTileRef(directionPos, out var tileReference))
+                        return new List<EntityCoordinates>();
 
-                var tileIndex = tileReference.Value.GridIndices;
-                var coords = _mapSystem.GridTileToLocal(casterXform.GridUid.Value, mapGrid, tileIndex);
-                EntityCoordinates coordsPlus;
-                EntityCoordinates coordsMinus;
+                    var tileIndex = tileReference.Value.GridIndices;
+                    var coords = _mapSystem.GridTileToLocal(casterXform.GridUid.Value, mapGrid, tileIndex);
+                    EntityCoordinates coordsPlus;
+                    EntityCoordinates coordsMinus;
 
-                var dir = casterXform.LocalRotation.GetCardinalDir();
-                switch (dir)
-                {
-                    case Direction.North:
-                    case Direction.South:
+                    var dir = casterXform.LocalRotation.GetCardinalDir();
+                    switch (dir)
                     {
-                        coordsPlus = _mapSystem.GridTileToLocal(casterXform.GridUid.Value, mapGrid, tileIndex + (1, 0));
-                        coordsMinus = _mapSystem.GridTileToLocal(casterXform.GridUid.Value, mapGrid, tileIndex + (-1, 0));
-                        return new List<EntityCoordinates>(3)
+                        case Direction.North:
+                        case Direction.South:
+                            {
+                                coordsPlus = _mapSystem.GridTileToLocal(casterXform.GridUid.Value, mapGrid, tileIndex + (1, 0));
+                                coordsMinus = _mapSystem.GridTileToLocal(casterXform.GridUid.Value, mapGrid, tileIndex + (-1, 0));
+                                return new List<EntityCoordinates>(3)
                         {
                             coords,
                             coordsPlus,
                             coordsMinus,
                         };
-                    }
-                    case Direction.East:
-                    case Direction.West:
-                    {
-                        coordsPlus = _mapSystem.GridTileToLocal(casterXform.GridUid.Value, mapGrid, tileIndex + (0, 1));
-                        coordsMinus = _mapSystem.GridTileToLocal(casterXform.GridUid.Value, mapGrid, tileIndex + (0, -1));
-                        return new List<EntityCoordinates>(3)
+                            }
+                        case Direction.East:
+                        case Direction.West:
+                            {
+                                coordsPlus = _mapSystem.GridTileToLocal(casterXform.GridUid.Value, mapGrid, tileIndex + (0, 1));
+                                coordsMinus = _mapSystem.GridTileToLocal(casterXform.GridUid.Value, mapGrid, tileIndex + (0, -1));
+                                return new List<EntityCoordinates>(3)
                         {
                             coords,
                             coordsPlus,
                             coordsMinus,
                         };
+                            }
                     }
-                }
 
-                return new List<EntityCoordinates>();
-            }
+                    return new List<EntityCoordinates>();
+                }
             default:
                 throw new ArgumentOutOfRangeException();
         }
@@ -308,7 +313,7 @@ private void OnChangeComponentsSpell(ChangeComponentsSpellEvent ev)
     /// <param name="args"></param>
     private void OnTeleportSpell(TeleportSpellEvent args)
     {
-        if ( args.Handled || !PassesSpellPrerequisites(args.Action, args.Performer))
+        if (args.Handled || !PassesSpellPrerequisites(args.Action, args.Performer))
             return;
 
         var transform = Transform(args.Performer);
@@ -518,10 +523,27 @@ private void OnMindSwapSpell(MindSwapSpellEvent ev)
             _mind.TransferTo(tarMind, ev.Performer);
         }
 
-        _stun.TryParalyze(ev.Target, ev.TargetStunDuration, true);
-        _stun.TryParalyze(ev.Performer, ev.PerformerStunDuration, true);
+        _stun.TryUpdateParalyzeDuration(ev.Target, ev.TargetStunDuration);
+        _stun.TryUpdateParalyzeDuration(ev.Performer, ev.PerformerStunDuration);
     }
 
+    #region Starlight
+    private void OnSpawnItemInHand(SpawnItemInHandEvent ev)
+    {
+        if (ev.Handled || !PassesSpellPrerequisites(ev.Action, ev.Performer))
+            return;
+        var user = ev.Performer;
+
+        // try to put item in hand, otherwise it goes on the ground
+        var star = Spawn(ev.Spawned, Transform(user).Coordinates);
+        if (IsClientSide(star))
+            Del(star);//event has a tendency to produce client-sided cheese... this cleans those up...
+        else
+            _hands.TryPickupAnyHand(user, star);
+        ev.Handled = true;
+    }
+    #endregion
+
     #endregion
     // End Spells
     #endregion
diff --git a/Content.Shared/Mind/SharedMindSystem.cs b/Content.Shared/Mind/SharedMindSystem.cs
index de8d4f0567f2..271639725fb6 100644
--- a/Content.Shared/Mind/SharedMindSystem.cs
+++ b/Content.Shared/Mind/SharedMindSystem.cs
@@ -2,15 +2,19 @@
 using System.Linq;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
+using Content.Shared.Emoting;
 using Content.Shared.Examine;
 using Content.Shared.GameTicking;
 using Content.Shared.Humanoid;
 using Content.Shared.Interaction.Events;
+using Content.Shared.Movement.Components;
 using Content.Shared.Mind.Components;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Objectives.Systems;
 using Content.Shared.Players;
+using Content.Shared.Speech;
+
 using Content.Shared.Whitelist;
 using Robust.Shared.Map;
 using Robust.Shared.Network;
@@ -632,6 +636,31 @@ public HashSet<Entity<MindComponent>> GetAliveHumans(EntityUid? exclude = null)
 
         return allHumans;
     }
+
+    /// <summary>
+    /// Give sentience to a target entity by attaching necessary components.
+    /// </summary>
+    /// <param name="uid">Uid of the target entity.</param>
+    /// <param name="allowMovement">Whether the target entity should be able to move.</param>
+    /// <param name="allowSpeech">Whether the target entity should be able to talk.</param>
+    public void MakeSentient(EntityUid uid, bool allowMovement = true, bool allowSpeech = true)
+    {
+        EnsureComp<MindContainerComponent>(uid);
+        if (allowMovement)
+        {
+            EnsureComp<InputMoverComponent>(uid);
+            EnsureComp<MobMoverComponent>(uid);
+            EnsureComp<MovementSpeedModifierComponent>(uid);
+        }
+
+        if (allowSpeech)
+        {
+            EnsureComp<SpeechComponent>(uid);
+            EnsureComp<EmotingComponent>(uid);
+        }
+
+        EnsureComp<ExaminerComponent>(uid);
+    }
 }
 
 /// <summary>
diff --git a/Content.Shared/Mobs/Components/MobThresholdsComponent.cs b/Content.Shared/Mobs/Components/MobThresholdsComponent.cs
index 0e37cf9b10e8..bba7bc0e473b 100644
--- a/Content.Shared/Mobs/Components/MobThresholdsComponent.cs
+++ b/Content.Shared/Mobs/Components/MobThresholdsComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared._Starlight.Scaling;
 using Content.Shared.Alert;
 using Content.Shared.FixedPoint;
 using Content.Shared.Mobs.Systems;
@@ -8,7 +9,7 @@
 namespace Content.Shared.Mobs.Components;
 
 [RegisterComponent, NetworkedComponent]
-[Access(typeof(MobThresholdSystem))]
+[Access(typeof(MobThresholdSystem), typeof(SharedScalingSystem))] // STARLIGHT
 public sealed partial class MobThresholdsComponent : Component
 {
     [DataField("thresholds", required: true)]
diff --git a/Content.Shared/MouseRotator/MouseRotatorComponent.cs b/Content.Shared/MouseRotator/MouseRotatorComponent.cs
index 2844b3cb8b56..1f399b31f9cb 100644
--- a/Content.Shared/MouseRotator/MouseRotatorComponent.cs
+++ b/Content.Shared/MouseRotator/MouseRotatorComponent.cs
@@ -48,4 +48,5 @@ public sealed partial class MouseRotatorComponent : Component
 public sealed class RequestMouseRotatorRotationEvent : EntityEventArgs
 {
     public Angle Rotation;
+    public NetEntity? User;
 }
diff --git a/Content.Shared/MouseRotator/SharedMouseRotatorSystem.cs b/Content.Shared/MouseRotator/SharedMouseRotatorSystem.cs
index cfafe84a3d9b..70f667615f6b 100644
--- a/Content.Shared/MouseRotator/SharedMouseRotatorSystem.cs
+++ b/Content.Shared/MouseRotator/SharedMouseRotatorSystem.cs
@@ -56,6 +56,11 @@ public override void Update(float frameTime)
 
     private void OnRequestRotation(RequestMouseRotatorRotationEvent msg, EntitySessionEventArgs args)
     {
+        // Ignore the request if the requested entity is not the user's attached entity.
+        // This can happen when a player switches controlled entities while rotating.
+        if (args.SenderSession.AttachedEntity != GetEntity(msg.User))
+            return;
+
         if (args.SenderSession.AttachedEntity is not { } ent
             || !TryComp<MouseRotatorComponent>(ent, out var rotator))
         {
diff --git a/Content.Shared/Movement/Components/FrictionStatusEffectComponent.cs b/Content.Shared/Movement/Components/FrictionStatusEffectComponent.cs
new file mode 100644
index 000000000000..33c5389fd3a2
--- /dev/null
+++ b/Content.Shared/Movement/Components/FrictionStatusEffectComponent.cs
@@ -0,0 +1,23 @@
+using Content.Shared.Movement.Systems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Movement.Components;
+
+/// <summary>
+/// This is used to apply a friction modifier to an entity temporarily
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(MovementModStatusSystem))]
+public sealed partial class FrictionStatusEffectComponent : Component
+{
+    /// <summary>
+    /// Friction modifier applied as a status.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float FrictionModifier = 1f;
+
+    /// <summary>
+    /// Acceleration modifier applied as a status.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float AccelerationModifier = 1f;
+}
diff --git a/Content.Shared/Movement/Components/MovementModStatusEffectComponent.cs b/Content.Shared/Movement/Components/MovementModStatusEffectComponent.cs
new file mode 100644
index 000000000000..22b196d12768
--- /dev/null
+++ b/Content.Shared/Movement/Components/MovementModStatusEffectComponent.cs
@@ -0,0 +1,25 @@
+using Content.Shared.Movement.Systems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Movement.Components;
+
+/// <summary>
+/// This is used to store a movement speed modifier attached to a status effect entity so it can be applied via statuses.
+/// To be used in conjunction with <see cref="MovementModStatusSystem"/>.
+/// See <see cref="MovementModStatusComponent"/> for the component applied to the entity.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(MovementModStatusSystem))]
+public sealed partial class MovementModStatusEffectComponent : Component
+{
+    /// <summary>
+    /// Multiplicative sprint modifier, with bounds of [0, 1)
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float SprintSpeedModifier = 0.5f;
+
+    /// <summary>
+    /// Multiplicative walk modifier, with bounds of [0, 1)
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float WalkSpeedModifier = 0.5f;
+}
diff --git a/Content.Shared/Movement/Systems/MovementModStatusSystem.cs b/Content.Shared/Movement/Systems/MovementModStatusSystem.cs
new file mode 100644
index 000000000000..37039fa6d4bc
--- /dev/null
+++ b/Content.Shared/Movement/Systems/MovementModStatusSystem.cs
@@ -0,0 +1,267 @@
+using Content.Shared.Movement.Components;
+using Content.Shared.Movement.Events;
+using Content.Shared.StatusEffectNew;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Movement.Systems;
+
+/// <summary>
+/// This handles the slowed status effect and other movement status effects.
+/// <see cref="MovementModStatusEffectComponent"/> holds a modifier for a status effect which is relayed to a mob's
+/// All effects of this kinda are multiplicative.
+/// Each 'source' of speed modification usually should have separate effect prototype.
+/// </summary>
+/// <remarks>
+/// Movement modifying status effects should by default be separate effect prototypes, and their effects
+/// should stack with each other (multiply). In case multiplicative effect is undesirable - such effects
+/// could occupy same prototype, but be aware that this will make controlling duration of effect
+/// extra 'challenging', as it will be shared too.
+/// </remarks>
+public sealed class MovementModStatusSystem : EntitySystem
+{
+    public static readonly EntProtoId VomitingSlowdown = "VomitingSlowdownStatusEffect";
+    public static readonly EntProtoId TaserSlowdown = "TaserSlowdownStatusEffect";
+    public static readonly EntProtoId FlashSlowdown = "FlashSlowdownStatusEffect";
+    public static readonly EntProtoId StatusEffectFriction = "StatusEffectFriction";
+
+    [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
+    [Dependency] private readonly StatusEffectsSystem _status = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<MovementModStatusEffectComponent, StatusEffectRemovedEvent>(OnMovementModRemoved);
+        SubscribeLocalEvent<MovementModStatusEffectComponent, StatusEffectRelayedEvent<RefreshMovementSpeedModifiersEvent>>(OnRefreshRelay);
+        SubscribeLocalEvent<FrictionStatusEffectComponent, StatusEffectRemovedEvent>(OnFrictionStatusEffectRemoved);
+        SubscribeLocalEvent<FrictionStatusEffectComponent, StatusEffectRelayedEvent<RefreshFrictionModifiersEvent>>(OnRefreshFrictionStatus);
+        SubscribeLocalEvent<FrictionStatusEffectComponent, StatusEffectRelayedEvent<TileFrictionEvent>>(OnRefreshTileFrictionStatus);
+    }
+
+    private void OnMovementModRemoved(Entity<MovementModStatusEffectComponent> ent, ref StatusEffectRemovedEvent args)
+    {
+        TryUpdateMovementStatus(args.Target, (ent, ent), 1f);
+    }
+
+    private void OnFrictionStatusEffectRemoved(Entity<FrictionStatusEffectComponent> entity, ref StatusEffectRemovedEvent args)
+    {
+        TrySetFrictionStatus(entity!, 1f, args.Target);
+    }
+
+    private void OnRefreshRelay(
+        Entity<MovementModStatusEffectComponent> entity,
+        ref StatusEffectRelayedEvent<RefreshMovementSpeedModifiersEvent> args
+    )
+    {
+        args.Args.ModifySpeed(entity.Comp.WalkSpeedModifier, entity.Comp.WalkSpeedModifier);
+    }
+
+    private void OnRefreshFrictionStatus(Entity<FrictionStatusEffectComponent> ent, ref StatusEffectRelayedEvent<RefreshFrictionModifiersEvent> args)
+    {
+        var ev = args.Args;
+        ev.ModifyFriction(ent.Comp.FrictionModifier);
+        ev.ModifyAcceleration(ent.Comp.AccelerationModifier);
+        args.Args = ev;
+    }
+
+    private void OnRefreshTileFrictionStatus(Entity<FrictionStatusEffectComponent> ent, ref StatusEffectRelayedEvent<TileFrictionEvent> args)
+    {
+        var ev = args.Args;
+        ev.Modifier *= ent.Comp.FrictionModifier;
+        args.Args = ev;
+    }
+
+    /// <summary>
+    /// Apply mob's walking/running speed modifier with provided duration, or increment duration of existing.
+    /// </summary>
+    /// <param name="uid">Target entity, for which speed should be modified.</param>
+    /// <param name="effectProtoId">Slowdown effect to be used.</param>
+    /// <param name="duration">Duration of speed modifying effect.</param>
+    /// <param name="speedModifier">Multiplier by which walking/sprinting speed should be modified.</param>
+    /// <returns>True if entity have slowdown effect applied now or previously and duration was modified.</returns>
+    public bool TryAddMovementSpeedModDuration(
+        EntityUid uid,
+        EntProtoId effectProtoId,
+        TimeSpan duration,
+        float speedModifier
+    )
+    {
+        return TryAddMovementSpeedModDuration(uid, effectProtoId, duration, speedModifier, speedModifier);
+    }
+
+    /// <summary>
+    /// Apply mob's walking/running speed modifier with provided duration, or increment duration of existing.
+    /// </summary>
+    /// <param name="uid">Target entity, for which speed should be modified.</param>
+    /// <param name="effectProtoId">Slowdown effect to be used.</param>
+    /// <param name="duration">Duration of speed modifying effect.</param>
+    /// <param name="walkSpeedModifier">Multiplier by which walking speed should be modified.</param>
+    /// <param name="sprintSpeedModifier">Multiplier by which sprinting speed should be modified.</param>
+    /// <returns>True if entity have slowdown effect applied now or previously and duration was modified.</returns>
+    public bool TryAddMovementSpeedModDuration(
+        EntityUid uid,
+        EntProtoId effectProtoId,
+        TimeSpan duration,
+        float walkSpeedModifier,
+        float sprintSpeedModifier
+    )
+    {
+        return _status.TryAddStatusEffectDuration(uid, effectProtoId, out var status, duration)
+               && TryUpdateMovementStatus(uid, status!.Value, walkSpeedModifier, sprintSpeedModifier);
+    }
+
+    /// <summary>
+    /// Apply mob's walking/running speed modifier with provided duration,
+    /// or update duration of existing if it is lesser than provided duration.
+    /// </summary>
+    /// <param name="uid">Target entity, for which speed should be modified.</param>
+    /// <param name="effectProtoId">Slowdown effect to be used.</param>
+    /// <param name="duration">Duration of speed modifying effect.</param>
+    /// <param name="speedModifier">Multiplier by which walking/sprinting speed should be modified.</param>
+    /// <returns>True if entity have slowdown effect applied now or previously and duration was modified.</returns>
+    public bool TryUpdateMovementSpeedModDuration(
+        EntityUid uid,
+        EntProtoId effectProtoId,
+        TimeSpan duration,
+        float speedModifier
+    )
+    {
+        return TryUpdateMovementSpeedModDuration(uid, effectProtoId, duration, speedModifier, speedModifier);
+    }
+
+    /// <summary>
+    /// Apply mob's walking/running speed modifier with provided duration,
+    /// or update duration of existing if it is lesser than provided duration.
+    /// </summary>
+    /// <param name="uid">Target entity, for which speed should be modified.</param>
+    /// <param name="effectProtoId">Slowdown effect to be used.</param>
+    /// <param name="duration">Duration of speed modifying effect.</param>
+    /// <param name="walkSpeedModifier">Multiplier by which walking speed should be modified.</param>
+    /// <param name="sprintSpeedModifier">Multiplier by which sprinting speed should be modified.</param>
+    /// <returns>True if entity have slowdown effect applied now or previously and duration was modified.</returns>
+    public bool TryUpdateMovementSpeedModDuration(
+        EntityUid uid,
+        EntProtoId effectProtoId,
+        TimeSpan? duration,
+        float walkSpeedModifier,
+        float sprintSpeedModifier
+    )
+    {
+        return _status.TryUpdateStatusEffectDuration(uid, effectProtoId, out var status, duration)
+               && TryUpdateMovementStatus(uid, status!.Value, walkSpeedModifier, sprintSpeedModifier);
+    }
+
+    /// <summary>
+    /// Updates entity's movement speed using <see cref="MovementModStatusEffectComponent"/> to provided values.
+    /// Then refreshes the movement speed of the entity.
+    /// </summary>
+    /// <param name="uid">Entity whose component we're updating</param>
+    /// <param name="status">Status effect entity whose modifiers we are updating</param>
+    /// <param name="walkSpeedModifier">New walkSpeedModifer we're applying</param>
+    /// <param name="sprintSpeedModifier">New sprintSpeedModifier we're applying</param>
+    public bool TryUpdateMovementStatus(
+        EntityUid uid,
+        Entity<MovementModStatusEffectComponent?> status,
+        float walkSpeedModifier,
+        float sprintSpeedModifier
+    )
+    {
+        if (!Resolve(status, ref status.Comp))
+            return false;
+
+        status.Comp.SprintSpeedModifier = sprintSpeedModifier;
+        status.Comp.WalkSpeedModifier = walkSpeedModifier;
+
+        _movementSpeedModifier.RefreshMovementSpeedModifiers(uid);
+
+        return true;
+    }
+
+    /// <summary>
+    /// Updates entity's movement speed using <see cref="MovementModStatusEffectComponent"/> to provided value.
+    /// Then refreshes the movement speed of the entity.
+    /// </summary>
+    /// <param name="uid">Entity whose component we're updating</param>
+    /// <param name="status">Status effect entity whose modifiers we are updating</param>
+    /// <param name="speedModifier">
+    /// Multiplier by which speed should be modified.
+    /// Will be applied to both walking and running speed.
+    /// </param>
+    public bool TryUpdateMovementStatus(
+        EntityUid uid,
+        Entity<MovementModStatusEffectComponent?> status,
+        float speedModifier
+    )
+    {
+        return TryUpdateMovementStatus(uid, status, speedModifier, speedModifier);
+    }
+
+    /// <summary>
+    /// Apply friction modifier with provided duration,
+    /// or incrementing duration of existing.
+    /// </summary>
+    /// <param name="uid">Target entity, for which friction modifier should be applied.</param>
+    /// <param name="duration">Duration of speed modifying effect.</param>
+    /// <param name="friction">Multiplier by which walking speed should be modified.</param>
+    /// <param name="acceleration">Multiplier by which sprinting speed should be modified.</param>
+    /// <returns>True if entity have slowdown effect applied now or previously and duration was modified.</returns>
+    public bool TryAddFrictionModDuration(
+        EntityUid uid,
+        TimeSpan duration,
+        float friction,
+        float acceleration
+    )
+    {
+            return _status.TryAddStatusEffectDuration(uid, StatusEffectFriction, out var status, duration)
+                   && TrySetFrictionStatus(status.Value, friction, acceleration, uid);
+    }
+
+    /// <summary>
+    /// Apply friction modifier with provided duration,
+    /// or update duration of existing if it is lesser than provided duration.
+    /// </summary>
+    /// <param name="uid">Target entity, for which friction modifier should be applied.</param>
+    /// <param name="duration">Duration of speed modifying effect.</param>
+    /// <param name="friction">Multiplier by which walking speed should be modified.</param>
+    /// <param name="acceleration">Multiplier by which sprinting speed should be modified.</param>
+    /// <returns>True if entity have slowdown effect applied now or previously and duration was modified.</returns>
+    public bool TryUpdateFrictionModDuration(
+        EntityUid uid,
+        TimeSpan duration,
+        float friction,
+        float acceleration
+    )
+    {
+        return _status.TryUpdateStatusEffectDuration(uid, StatusEffectFriction, out var status, duration)
+               && TrySetFrictionStatus(status.Value, friction, acceleration, uid);
+    }
+
+    /// <summary>
+    /// Sets the friction status modifiers for a status effect.
+    /// </summary>
+    /// <param name="status">The status effect entity we're modifying.</param>
+    /// <param name="friction">The friction modifier we're applying.</param>
+    /// <param name="entity">The entity the status effect is attached to that we need to refresh.</param>
+    private bool TrySetFrictionStatus(Entity<FrictionStatusEffectComponent?> status, float friction, EntityUid entity)
+    {
+        return TrySetFrictionStatus(status, friction, friction, entity);
+    }
+
+    /// <summary>
+    /// Sets the friction status modifiers for a status effect.
+    /// </summary>
+    /// <param name="status">The status effect entity we're modifying.</param>
+    /// <param name="friction">The friction modifier we're applying.</param>
+    /// <param name="acceleration">The acceleration modifier we're applying</param>
+    /// <param name="entity">The entity the status effect is attached to that we need to refresh.</param>
+    private bool TrySetFrictionStatus(Entity<FrictionStatusEffectComponent?> status, float friction, float acceleration, EntityUid entity)
+    {
+        if (!Resolve(status, ref status.Comp, false))
+            return false;
+
+        status.Comp.FrictionModifier = friction;
+        status.Comp.AccelerationModifier = acceleration;
+        Dirty(status);
+
+        _movementSpeedModifier.RefreshFrictionModifiers(entity);
+        return true;
+    }
+}
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs
index a02b26772e5c..d4c90706f9bf 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.cs
@@ -80,6 +80,8 @@ public abstract partial class SharedMoverController : VirtualController
     /// </summary>
     public Dictionary<EntityUid, bool> UsedMobMovement = new();
 
+    private readonly HashSet<EntityUid> _aroundColliderSet = [];
+
     public override void Initialize()
     {
         UpdatesBefore.Add(typeof(TileFrictionController));
@@ -462,7 +464,9 @@ private bool IsAroundCollider(EntityLookupSystem lookupSystem, Entity<PhysicsCom
         var (uid, collider, mover, transform) = entity;
         var enlargedAABB = _lookup.GetWorldAABB(entity.Owner, transform).Enlarged(mover.GrabRange);
 
-        foreach (var otherEntity in lookupSystem.GetEntitiesIntersecting(transform.MapID, enlargedAABB))
+        _aroundColliderSet.Clear();
+        lookupSystem.GetEntitiesIntersecting(transform.MapID, enlargedAABB, _aroundColliderSet);
+        foreach (var otherEntity in _aroundColliderSet)
         {
             if (otherEntity == uid)
                 continue; // Don't try to push off of yourself!
diff --git a/Content.Shared/Movement/Systems/WormSystem.cs b/Content.Shared/Movement/Systems/WormSystem.cs
index 3acef525b99a..8dc7f86a08ed 100644
--- a/Content.Shared/Movement/Systems/WormSystem.cs
+++ b/Content.Shared/Movement/Systems/WormSystem.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Alert;
 using Content.Shared.Movement.Components;
 using Content.Shared.Popups;
+using Content.Shared.Rejuvenate;
 using Content.Shared.Stunnable;
 
 namespace Content.Shared.Movement.Systems;
@@ -18,6 +19,7 @@ public override void Initialize()
     {
         SubscribeLocalEvent<WormComponent, StandUpAttemptEvent>(OnStandAttempt);
         SubscribeLocalEvent<WormComponent, KnockedDownRefreshEvent>(OnKnockedDownRefresh);
+        SubscribeLocalEvent<WormComponent, RejuvenateEvent>(OnRejuvenate);
         SubscribeLocalEvent<WormComponent, MapInitEvent>(OnMapInit);
     }
 
@@ -25,7 +27,12 @@ private void OnMapInit(Entity<WormComponent> ent, ref MapInitEvent args)
     {
         EnsureComp<KnockedDownComponent>(ent, out var knocked);
         _alerts.ShowAlert(ent, SharedStunSystem.KnockdownAlert);
-        _stun.ToggleAutoStand((ent, knocked));
+        _stun.SetAutoStand((ent, knocked));
+    }
+
+    private void OnRejuvenate(Entity<WormComponent> ent, ref RejuvenateEvent args)
+    {
+        RemComp<WormComponent>(ent);
     }
 
     private void OnStandAttempt(Entity<WormComponent> ent, ref StandUpAttemptEvent args)
@@ -34,8 +41,8 @@ private void OnStandAttempt(Entity<WormComponent> ent, ref StandUpAttemptEvent a
             return;
 
         args.Cancelled = true;
-        _stun.ToggleAutoStand(ent.Owner);
-        _popup.PopupClient(Loc.GetString("worm-component-stand-attempt"), ent, ent, PopupType.SmallCaution);
+        args.Message = (Loc.GetString("worm-component-stand-attempt"), PopupType.SmallCaution);
+        args.Autostand = false;
     }
 
     private void OnKnockedDownRefresh(Entity<WormComponent> ent, ref KnockedDownRefreshEvent args)
diff --git a/Content.Shared/NameIdentifier/NameIdentifierGroupPrototype.cs b/Content.Shared/NameIdentifier/NameIdentifierGroupPrototype.cs
index e3dceca48954..933902e222f5 100644
--- a/Content.Shared/NameIdentifier/NameIdentifierGroupPrototype.cs
+++ b/Content.Shared/NameIdentifier/NameIdentifierGroupPrototype.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.NameIdentifier;
 
@@ -9,17 +9,27 @@ public sealed partial class NameIdentifierGroupPrototype : IPrototype
     public string ID { get; private set; } = default!;
 
     /// <summary>
-    ///     Should the identifier become the full name, or just append?
+    /// Should the identifier become the full name, or just append?
     /// </summary>
-    [DataField("fullName")]
+    [DataField]
     public bool FullName = false;
 
-    [DataField("prefix")]
-    public string? Prefix;
+    /// <summary>
+    /// Optional format identifier. If set, the name will be formatted using it (e.g., "MK-500").
+    /// If not set, only the numeric part will be used (e.g., "500").
+    /// </summary>
+    [DataField]
+    public LocId? Format;
 
-    [DataField("maxValue")]
+    /// <summary>
+    /// The maximal value appearing in an identifier.
+    /// </summary>
+    [DataField]
     public int MaxValue = 1000;
 
-    [DataField("minValue")]
+    /// <summary>
+    /// The minimal value appearing in an identifier.
+    /// </summary>
+    [DataField]
     public int MinValue = 0;
 }
diff --git a/Content.Shared/Nutrition/EntitySystems/FoodSystem.cs b/Content.Shared/Nutrition/EntitySystems/FoodSystem.cs
index 79f983a88eaf..e59a8bce9bcd 100644
--- a/Content.Shared/Nutrition/EntitySystems/FoodSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/FoodSystem.cs
@@ -311,7 +311,7 @@ private void OnDoAfter(Entity<FoodComponent> entity, ref ConsumeDoAfterEvent arg
             _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(args.User):target} ate {ToPrettyString(entity.Owner):food}");
         }
 
-        _audio.PlayPredicted(entity.Comp.UseSound, args.Target.Value, args.User, AudioParams.Default.WithVolume(-1f).WithVariation(0.20f));
+        _audio.PlayPredicted(entity.Comp.UseSound, args.Target.Value, args.User, entity.Comp.UseSound.Params.WithVolume(-1f).WithVariation(0.20f));
 
         // Try to break all used utensils
         foreach (var utensil in utensils)
diff --git a/Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs b/Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs
index fa07aa20c5de..86eec26bfd29 100644
--- a/Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs
@@ -64,7 +64,7 @@ private void OnCreamPiedHitBy(EntityUid uid, CreamPiedComponent creamPied, Throw
 
             CreamedEntity(uid, creamPied, args);
 
-            _stunSystem.TryParalyze(uid, TimeSpan.FromSeconds(creamPie.ParalyzeTime), true);
+            _stunSystem.TryUpdateParalyzeDuration(uid, TimeSpan.FromSeconds(creamPie.ParalyzeTime));
         }
 
         protected virtual void CreamedEntity(EntityUid uid, CreamPiedComponent creamPied, ThrowHitByEvent args) {}
diff --git a/Content.Shared/Placeable/PlaceableSurfaceSystem.cs b/Content.Shared/Placeable/PlaceableSurfaceSystem.cs
index c332064ea38e..251043a60d1d 100644
--- a/Content.Shared/Placeable/PlaceableSurfaceSystem.cs
+++ b/Content.Shared/Placeable/PlaceableSurfaceSystem.cs
@@ -3,11 +3,13 @@
 using Content.Shared.Interaction;
 using Content.Shared.Storage;
 using Content.Shared.Storage.Components;
+using Robust.Shared.Random;
 
 namespace Content.Shared.Placeable;
 
 public sealed class PlaceableSurfaceSystem : EntitySystem
 {
+    [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
     [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
 
@@ -19,6 +21,8 @@ public override void Initialize()
         SubscribeLocalEvent<PlaceableSurfaceComponent, StorageInteractUsingAttemptEvent>(OnStorageInteractUsingAttempt);
         SubscribeLocalEvent<PlaceableSurfaceComponent, StorageAfterOpenEvent>(OnStorageAfterOpen);
         SubscribeLocalEvent<PlaceableSurfaceComponent, StorageAfterCloseEvent>(OnStorageAfterClose);
+        SubscribeLocalEvent<PlaceableSurfaceComponent, GetDumpableVerbEvent>(OnGetDumpableVerb);
+        SubscribeLocalEvent<PlaceableSurfaceComponent, DumpEvent>(OnDump);
     }
 
     public void SetPlaceable(EntityUid uid, bool isPlaceable, PlaceableSurfaceComponent? surface = null)
@@ -87,4 +91,25 @@ private void OnStorageAfterClose(Entity<PlaceableSurfaceComponent> ent, ref Stor
     {
         SetPlaceable(ent.Owner, false, ent.Comp);
     }
+
+    private void OnGetDumpableVerb(Entity<PlaceableSurfaceComponent> ent, ref GetDumpableVerbEvent args)
+    {
+        args.Verb = Loc.GetString("dump-placeable-verb-name", ("surface", ent));
+    }
+
+    private void OnDump(Entity<PlaceableSurfaceComponent> ent, ref DumpEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        args.Handled = true;
+        args.PlaySound = true;
+
+        var (targetPos, targetRot) = _transformSystem.GetWorldPositionRotation(ent);
+
+        foreach (var entity in args.DumpQueue)
+        {
+            _transformSystem.SetWorldPositionRotation(entity, targetPos + _random.NextVector2Box() / 4, targetRot);
+        }
+    }
 }
diff --git a/Content.Shared/Revolutionary/SharedRevolutionarySystem.cs b/Content.Shared/Revolutionary/SharedRevolutionarySystem.cs
index bbf91193cc31..36a31d88a495 100644
--- a/Content.Shared/Revolutionary/SharedRevolutionarySystem.cs
+++ b/Content.Shared/Revolutionary/SharedRevolutionarySystem.cs
@@ -42,7 +42,7 @@ private void MindShieldImplanted(EntityUid uid, MindShieldComponent comp, MapIni
             var stunTime = TimeSpan.FromSeconds(4);
             var name = Identity.Entity(uid, EntityManager);
             RemComp<RevolutionaryComponent>(uid);
-            _sharedStun.TryParalyze(uid, stunTime, true);
+            _sharedStun.TryUpdateParalyzeDuration(uid, stunTime);
             _popupSystem.PopupEntity(Loc.GetString("rev-break-control", ("name", name)), uid);
         }
     }
diff --git a/Content.Shared/SSDIndicator/SSDIndicatorComponent.cs b/Content.Shared/SSDIndicator/SSDIndicatorComponent.cs
index 9547b6ce4ef0..6bfb3fdfd663 100644
--- a/Content.Shared/SSDIndicator/SSDIndicatorComponent.cs
+++ b/Content.Shared/SSDIndicator/SSDIndicatorComponent.cs
@@ -1,29 +1,49 @@
+using Content.Shared.CCVar;
 using Content.Shared.StatusIcon;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.SSDIndicator;
 
 /// <summary>
-///     Shows status icon when player in SSD
+/// Shows status icon when an entity is SSD, based on if a player is attached or not.
 /// </summary>
 [RegisterComponent, NetworkedComponent]
 [AutoGenerateComponentState, AutoGenerateComponentPause]
 public sealed partial class SSDIndicatorComponent : Component
 {
-    [DataField, ViewVariables(VVAccess.ReadOnly)]
+    /// <summary>
+    /// Whether or not the entity is SSD.
+    /// </summary>
     [AutoNetworkedField]
+    [DataField, ViewVariables(VVAccess.ReadOnly)]
     public bool IsSSD = true;
 
+    /// <summary>
+    /// The icon displayed next to the associated entity when it is SSD.
+    /// </summary>
     [DataField]
     public ProtoId<SsdIconPrototype> Icon = "SSDIcon";
 
     /// <summary>
-    ///     When the entity should fall asleep
+    /// The time at which the entity will fall asleep, if <see cref="CCVars.ICSSDSleep"/> is true.
     /// </summary>
-    [DataField]
     [AutoNetworkedField, AutoPausedField]
     [Access(typeof(SSDIndicatorSystem))]
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
     public TimeSpan FallAsleepTime = TimeSpan.Zero;
+
+    /// <summary>
+    /// The next time this component will be updated.
+    /// </summary>
+    [AutoNetworkedField, AutoPausedField]
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    public TimeSpan NextUpdate = TimeSpan.Zero;
+
+    /// <summary>
+    /// The time between updates checking if the entity should be force slept.
+    /// </summary>
+    [DataField]
+    public TimeSpan UpdateInterval = TimeSpan.FromSeconds(1);
 }
diff --git a/Content.Shared/SSDIndicator/SSDIndicatorSystem.cs b/Content.Shared/SSDIndicator/SSDIndicatorSystem.cs
index b9c6659c9cc8..14d71d90d979 100644
--- a/Content.Shared/SSDIndicator/SSDIndicatorSystem.cs
+++ b/Content.Shared/SSDIndicator/SSDIndicatorSystem.cs
@@ -61,12 +61,12 @@ private void OnPlayerDetached(EntityUid uid, SSDIndicatorComponent component, Pl
     // Prevents mapped mobs to go to sleep immediately
     private void OnMapInit(EntityUid uid, SSDIndicatorComponent component, MapInitEvent args)
     {
-        if (_icSsdSleep &&
-            component.IsSSD &&
-            component.FallAsleepTime == TimeSpan.Zero)
-        {
-            component.FallAsleepTime = _timing.CurTime + TimeSpan.FromSeconds(_icSsdSleepTime);
-        }
+        if (!_icSsdSleep || !component.IsSSD)
+            return;
+
+        component.FallAsleepTime = _timing.CurTime + TimeSpan.FromSeconds(_icSsdSleepTime);
+        component.NextUpdate = _timing.CurTime + component.UpdateInterval;
+        Dirty(uid, component);
     }
 
     public override void Update(float frameTime)
@@ -76,17 +76,21 @@ public override void Update(float frameTime)
         if (!_icSsdSleep)
             return;
 
+        var curTime = _timing.CurTime;
         var query = EntityQueryEnumerator<SSDIndicatorComponent>();
 
         while (query.MoveNext(out var uid, out var ssd))
         {
             // Forces the entity to sleep when the time has come
-            if (ssd.IsSSD &&
-                ssd.FallAsleepTime <= _timing.CurTime &&
-                !TerminatingOrDeleted(uid))
-            {
-                _statusEffects.TrySetStatusEffectDuration(uid, StatusEffectSSDSleeping, null);
-            }
+            if (!ssd.IsSSD
+                || ssd.NextUpdate > curTime
+                || ssd.FallAsleepTime > curTime
+                || TerminatingOrDeleted(uid))
+                continue;
+
+            _statusEffects.TryUpdateStatusEffectDuration(uid, StatusEffectSSDSleeping);
+            ssd.NextUpdate += ssd.UpdateInterval;
+            Dirty(uid, ssd);
         }
     }
 }
diff --git a/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs b/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs
index 0aa4a560a5bc..1ac45efd40e9 100644
--- a/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs
+++ b/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Emag.Systems;
+using Content.Shared.Emag.Systems;
 using Content.Shared.Mind;
 using Content.Shared.Popups;
 using Content.Shared.Silicons.Borgs.Components; // Starlight
@@ -76,7 +76,7 @@ private void OnGotEmagged(EntityUid uid, EmagSiliconLawComponent component, ref
         if (_mind.TryGetMind(uid, out var mindId, out _))
             EnsureSubvertedSiliconRole(mindId);
 
-        _stunSystem.TryParalyze(uid, component.StunTime, true);
+        _stunSystem.TryUpdateParalyzeDuration(uid, component.StunTime);
 
         args.Handled = true;
     }
diff --git a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs
index 3a3d8557de23..34b51c25ad97 100644
--- a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs
+++ b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs
@@ -472,6 +472,9 @@ private void AttachEye(Entity<StationAiCoreComponent> ent)
         }
 
         _mover.SetRelay(user, ent.Comp.RemoteEntity.Value);
+
+        var eyeName = Loc.GetString("station-ai-eye-name", ("name", Name(user)));
+        _metadata.SetEntityName(ent.Comp.RemoteEntity.Value, eyeName);
     }
 
     private EntityUid? GetInsertedAI(Entity<StationAiCoreComponent> ent)
diff --git a/Content.Shared/Slippery/SlidingComponent.cs b/Content.Shared/Slippery/SlidingComponent.cs
index 4736198b0c51..200d9570ab7e 100644
--- a/Content.Shared/Slippery/SlidingComponent.cs
+++ b/Content.Shared/Slippery/SlidingComponent.cs
@@ -11,5 +11,12 @@ public sealed partial class SlidingComponent : Component
     /// <summary>
     ///     The friction modifier that will be applied to any friction calculations.
     /// </summary>
-    [DataField, AutoNetworkedField] public float FrictionModifier;
+    [DataField, AutoNetworkedField]
+    public float FrictionModifier;
+
+    /// <summary>
+    /// Hashset of contacting entities.
+    /// </summary>
+    [DataField]
+    public HashSet<EntityUid> Contacting = new();
 }
diff --git a/Content.Shared/Slippery/SlidingSystem.cs b/Content.Shared/Slippery/SlidingSystem.cs
index d4eb5c37cb0e..e0084c11aba0 100644
--- a/Content.Shared/Slippery/SlidingSystem.cs
+++ b/Content.Shared/Slippery/SlidingSystem.cs
@@ -5,20 +5,22 @@
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Physics.Systems;
-using Robust.Shared.Timing;
 
 namespace Content.Shared.Slippery;
 
 public sealed class SlidingSystem : EntitySystem
 {
-    [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] private readonly MovementSpeedModifierSystem _speedModifierSystem = default!;
 
+    private EntityQuery<SlipperyComponent> _slipperyQuery;
+
     public override void Initialize()
     {
         base.Initialize();
 
+        _slipperyQuery = GetEntityQuery<SlipperyComponent>();
+
         SubscribeLocalEvent<SlidingComponent, ComponentInit>(OnComponentInit);
         SubscribeLocalEvent<SlidingComponent, ComponentShutdown>(OnComponentShutdown);
         SubscribeLocalEvent<SlidingComponent, StoodEvent>(OnStand);
@@ -35,10 +37,7 @@ public override void Initialize()
     /// </summary>
     private void OnComponentInit(Entity<SlidingComponent> entity, ref ComponentInit args)
     {
-        if (!_timing.IsFirstTimePredicted || !TryComp<PhysicsComponent>(entity, out var physics))
-            return;
-
-        if (CalculateSlidingModifier((entity.Owner, entity.Comp, physics)))
+        if (CalculateSlidingModifier(entity))
             _speedModifierSystem.RefreshFrictionModifiers(entity);
     }
 
@@ -64,7 +63,7 @@ private void OnStand(EntityUid uid, SlidingComponent component, ref StoodEvent a
     /// </summary>
     private void OnStartCollide(Entity<SlidingComponent> entity, ref StartCollideEvent args)
     {
-        if (!TryComp<SlipperyComponent>(args.OtherEntity, out var slippery) || !slippery.AffectsSliding)
+        if (!_slipperyQuery.TryComp(args.OtherEntity, out var slippery) || !slippery.AffectsSliding)
             return;
 
         CalculateSlidingModifier(entity);
@@ -76,7 +75,7 @@ private void OnStartCollide(Entity<SlidingComponent> entity, ref StartCollideEve
     /// </summary>
     private void OnEndCollide(Entity<SlidingComponent> entity, ref EndCollideEvent args)
     {
-        if (!TryComp<SlipperyComponent>(args.OtherEntity, out var slippery) || !slippery.AffectsSliding)
+        if (!_slipperyQuery.TryComp(args.OtherEntity, out var slippery) || !slippery.AffectsSliding)
             return;
 
         if (!CalculateSlidingModifier(entity, args.OtherEntity))
@@ -93,17 +92,18 @@ private void OnEndCollide(Entity<SlidingComponent> entity, ref EndCollideEvent a
     /// </summary>
     private bool CalculateSlidingModifier(Entity<SlidingComponent, PhysicsComponent?> entity, EntityUid? ignore = null)
     {
-        if (!Resolve(entity, ref entity.Comp2))
+        if (!Resolve(entity, ref entity.Comp2, false))
             return false;
 
         var friction = 0.0f;
         var count = 0;
+        entity.Comp1.Contacting.Clear();
 
-        var colliders = _physics.GetContactingEntities(entity, entity.Comp2);
+        _physics.GetContactingEntities((entity, entity.Comp2), entity.Comp1.Contacting);
 
-        foreach (var ent in colliders)
+        foreach (var ent in entity.Comp1.Contacting)
         {
-            if (ent == ignore || !TryComp<SlipperyComponent>(ent, out var slippery) || !slippery.AffectsSliding)
+            if (ent == ignore || !_slipperyQuery.TryComp(ent, out var slippery) || !slippery.AffectsSliding)
                 continue;
 
             friction += slippery.SlipData.SlipFriction;
@@ -114,13 +114,10 @@ private bool CalculateSlidingModifier(Entity<SlidingComponent, PhysicsComponent?
         if (count > 0)
         {
             entity.Comp1.FrictionModifier = friction / count;
+            Dirty(entity.Owner, entity.Comp1);
             return true;
         }
 
-        // If we didn't collide with anything super slippery, and the ignored collider didn't cause us to slide, then how did we get here?
-        if (!TryComp<SlipperyComponent>(ignore, out var slip) || !slip.AffectsSliding)
-            Log.Error($"Entity by the name of {ToPrettyString(entity)} was given the Sliding Component despite not colliding with anything slippery");
-
         return false;
     }
 
diff --git a/Content.Shared/Slippery/SlipperySystem.cs b/Content.Shared/Slippery/SlipperySystem.cs
index 5d751c9110ad..58a0ec06d504 100644
--- a/Content.Shared/Slippery/SlipperySystem.cs
+++ b/Content.Shared/Slippery/SlipperySystem.cs
@@ -2,11 +2,9 @@
 using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
 using Content.Shared.Inventory;
-using Robust.Shared.Network;
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Systems;
-using Content.Shared.Popups;
-using Content.Shared.StatusEffect;
+using Content.Shared.StatusEffectNew;
 using Content.Shared.StepTrigger.Systems;
 using Content.Shared.Stunnable;
 using Content.Shared.Throwing;
@@ -16,7 +14,6 @@
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Systems;
 using Robust.Shared.Physics.Events;
-using Robust.Shared.Utility;
 
 namespace Content.Shared.Slippery;
 
@@ -24,10 +21,11 @@ namespace Content.Shared.Slippery;
 public sealed class SlipperySystem : EntitySystem
 {
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly MovementModStatusSystem _movementMod = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedStunSystem _stun = default!;
+    [Dependency] private readonly StatusEffectsSystem _status = default!;
     [Dependency] private readonly SharedStaminaSystem _stamina = default!;
-    [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
     [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] private readonly SpeedModifierContactsSystem _speedModifier = default!;
@@ -89,7 +87,7 @@ private void OnEntityExit(EntityUid uid, SlipperyComponent component, ref EndCol
     private bool CanSlip(EntityUid uid, EntityUid toSlip)
     {
         return !_container.IsEntityInContainer(uid)
-                && _statusEffects.CanApplyEffect(toSlip, "Stun"); //Should be KnockedDown instead?
+                && _status.CanAddStatusEffect(toSlip, SharedStunSystem.StunId); //Should be KnockedDown instead?
     }
 
     public void TrySlip(EntityUid uid, SlipperyComponent component, EntityUid other, bool requiresContact = true)
@@ -115,7 +113,7 @@ public void TrySlip(EntityUid uid, SlipperyComponent component, EntityUid other,
 
         if (TryComp(other, out PhysicsComponent? physics) && !HasComp<SlidingComponent>(other))
         {
-            _physics.SetLinearVelocity(other, physics.LinearVelocity * component.SlipData.LaunchForwardsMultiplier);
+            _physics.SetLinearVelocity(other, physics.LinearVelocity * component.SlipData.LaunchForwardsMultiplier, body: physics);
 
             if (component.AffectsSliding && requiresContact)
                 EnsureComp<SlidingComponent>(other);
@@ -124,15 +122,20 @@ public void TrySlip(EntityUid uid, SlipperyComponent component, EntityUid other,
         // Preventing from playing the slip sound and stunning when you are already knocked down.
         if (!HasComp<KnockedDownComponent>(other))
         {
-            _stun.TryStun(other, component.SlipData.StunTime, true);
+            _stun.TryUpdateStunDuration(other, component.SlipData.StunTime);
             _stamina.TakeStaminaDamage(other, component.StaminaDamage); // Note that this can stamCrit
-            _stun.TryFriction(other, component.FrictionStatusTime, true, component.SlipData.SlipFriction, component.SlipData.SlipFriction);
+            _movementMod.TryUpdateFrictionModDuration(
+                other,
+                component.FrictionStatusTime,
+                component.SlipData.SlipFriction,
+                component.SlipData.SlipFriction
+            );
             _audio.PlayPredicted(component.SlipSound, other, other);
         }
-        _stun.TryKnockdown(other, component.SlipData.KnockdownTime, true, true);
 
-        _adminLogger.Add(LogType.Slip, LogImpact.Low,
-            $"{ToPrettyString(other):mob} slipped on collision with {ToPrettyString(uid):entity}");
+        _stun.TryKnockdown(other, component.SlipData.KnockdownTime, true, force: true);
+
+        _adminLogger.Add(LogType.Slip, LogImpact.Low, $"{ToPrettyString(other):mob} slipped on collision with {ToPrettyString(uid):entity}");
     }
 }
 
diff --git a/Content.Shared/SmartFridge/SmartFridgeComponent.cs b/Content.Shared/SmartFridge/SmartFridgeComponent.cs
new file mode 100644
index 000000000000..db132c586dd6
--- /dev/null
+++ b/Content.Shared/SmartFridge/SmartFridgeComponent.cs
@@ -0,0 +1,99 @@
+using Content.Shared.Whitelist;
+using Robust.Shared.Analyzers;
+using Robust.Shared.Audio;
+using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.SmartFridge;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
+[Access(typeof(SmartFridgeSystem))]
+public sealed partial class SmartFridgeComponent : Component
+{
+    /// <summary>
+    /// The container ID that this SmartFridge stores its inventory in
+    /// </summary>
+    [DataField]
+    public string Container = "smart_fridge_inventory";
+
+    /// <summary>
+    /// Whitelist for what entities can be inserted
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Whitelist;
+
+    /// <summary>
+    /// Blacklist for what entities can be inserted
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Blacklist;
+
+    /// <summary>
+    /// The sound played on inserting an item into the fridge
+    /// </summary>
+    [DataField]
+    public SoundSpecifier? InsertSound = new SoundCollectionSpecifier("MachineInsert");
+
+    /// <summary>
+    /// A list of entries to display in the UI
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public List<SmartFridgeEntry> Entries = new();
+
+    /// <summary>
+    /// A mapping of smart fridge entries to the actual contained contents
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    [Access(typeof(SmartFridgeSystem), Other = AccessPermissions.ReadExecute)]
+    public Dictionary<SmartFridgeEntry, HashSet<NetEntity>> ContainedEntries = new();
+
+    /// <summary>
+    /// The flavour text displayed at the bottom of the SmartFridge's UI
+    /// </summary>
+    [DataField]
+    public LocId FlavorText = "smart-fridge-request-generic";
+
+    /// <summary>
+    /// Sound that plays when ejecting an item
+    /// </summary>
+    [DataField]
+    public SoundSpecifier SoundVend = new SoundCollectionSpecifier("VendingDispense")
+    {
+        Params = new AudioParams
+        {
+            Volume = -4f,
+            Variation = 0.15f
+        }
+    };
+
+    /// <summary>
+    /// Sound that plays when an item can't be ejected
+    /// </summary>
+    [DataField]
+    public SoundSpecifier SoundDeny = new SoundCollectionSpecifier("VendingDeny");
+}
+
+[Serializable, NetSerializable, DataRecord]
+public record struct SmartFridgeEntry
+{
+    public string Name;
+
+    public SmartFridgeEntry(string name)
+    {
+        Name = name;
+    }
+}
+
+[Serializable, NetSerializable]
+public enum SmartFridgeUiKey : byte
+{
+    Key,
+}
+
+[Serializable, NetSerializable]
+public sealed class SmartFridgeDispenseItemMessage(SmartFridgeEntry entry) : BoundUserInterfaceMessage
+{
+    public SmartFridgeEntry Entry = entry;
+}
diff --git a/Content.Shared/SmartFridge/SmartFridgeSystem.cs b/Content.Shared/SmartFridge/SmartFridgeSystem.cs
new file mode 100644
index 000000000000..1341f6cd03c8
--- /dev/null
+++ b/Content.Shared/SmartFridge/SmartFridgeSystem.cs
@@ -0,0 +1,157 @@
+using Content.Shared.Access.Components;
+using Content.Shared.Access.Systems;
+using Content.Shared.Hands.EntitySystems;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Interaction;
+using Content.Shared.Popups;
+using Content.Shared.Storage.Components;
+using Content.Shared.Whitelist;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Containers;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.SmartFridge;
+
+public sealed class SmartFridgeSystem : EntitySystem
+{
+    [Dependency] private readonly AccessReaderSystem _accessReader = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedContainerSystem _container = default!;
+    [Dependency] private readonly SharedHandsSystem _hands = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<SmartFridgeComponent, InteractUsingEvent>(OnInteractUsing);
+        SubscribeLocalEvent<SmartFridgeComponent, EntRemovedFromContainerMessage>(OnItemRemoved);
+
+        SubscribeLocalEvent<SmartFridgeComponent, GetDumpableVerbEvent>(OnGetDumpableVerb);
+        SubscribeLocalEvent<SmartFridgeComponent, DumpEvent>(OnDump);
+
+        Subs.BuiEvents<SmartFridgeComponent>(SmartFridgeUiKey.Key,
+            sub =>
+            {
+                sub.Event<SmartFridgeDispenseItemMessage>(OnDispenseItem);
+            });
+    }
+
+    private bool DoInsert(Entity<SmartFridgeComponent> ent, EntityUid user, IEnumerable<EntityUid> usedItems, bool playSound)
+    {
+        if (!_container.TryGetContainer(ent, ent.Comp.Container, out var container))
+            return false;
+
+        if (!Allowed(ent, user))
+            return true;
+
+        bool anyInserted = false;
+        foreach (var used in usedItems)
+        {
+            if (!_whitelist.CheckBoth(used, ent.Comp.Blacklist, ent.Comp.Whitelist))
+                continue;
+            anyInserted = true;
+
+            _container.Insert(used, container);
+            var key = new SmartFridgeEntry(Identity.Name(used, EntityManager));
+            if (!ent.Comp.Entries.Contains(key))
+                ent.Comp.Entries.Add(key);
+
+            ent.Comp.ContainedEntries.TryAdd(key, new());
+            var entries = ent.Comp.ContainedEntries[key];
+            if (!entries.Contains(GetNetEntity(used)))
+                entries.Add(GetNetEntity(used));
+
+            Dirty(ent);
+        }
+
+        if (anyInserted && playSound)
+        {
+            _audio.PlayPredicted(ent.Comp.InsertSound, ent, user);
+        }
+
+        return anyInserted;
+    }
+
+    private void OnInteractUsing(Entity<SmartFridgeComponent> ent, ref InteractUsingEvent args)
+    {
+        if (!_hands.CanDrop(args.User, args.Used))
+            return;
+
+        args.Handled = DoInsert(ent, args.User, [args.Used], true);
+    }
+
+    private void OnItemRemoved(Entity<SmartFridgeComponent> ent, ref EntRemovedFromContainerMessage args)
+    {
+        var key = new SmartFridgeEntry(Identity.Name(args.Entity, EntityManager));
+
+        if (ent.Comp.ContainedEntries.TryGetValue(key, out var contained))
+        {
+            contained.Remove(GetNetEntity(args.Entity));
+        }
+
+        Dirty(ent);
+    }
+
+    private bool Allowed(Entity<SmartFridgeComponent> machine, EntityUid user)
+    {
+        if (_accessReader.IsAllowed(user, machine))
+            return true;
+
+        _popup.PopupPredicted(Loc.GetString("smart-fridge-component-try-eject-access-denied"), machine, user);
+        _audio.PlayPredicted(machine.Comp.SoundDeny, machine, user);
+        return false;
+    }
+
+    private void OnDispenseItem(Entity<SmartFridgeComponent> ent, ref SmartFridgeDispenseItemMessage args)
+    {
+        if (!_timing.IsFirstTimePredicted)
+            return;
+
+        if (!Allowed(ent, args.Actor))
+            return;
+
+        if (!ent.Comp.ContainedEntries.TryGetValue(args.Entry, out var contained))
+        {
+            _audio.PlayPredicted(ent.Comp.SoundDeny, ent, args.Actor);
+            _popup.PopupPredicted(Loc.GetString("smart-fridge-component-try-eject-unknown-entry"), ent, args.Actor);
+            return;
+        }
+
+        foreach (var item in contained)
+        {
+            if (!_container.TryRemoveFromContainer(GetEntity(item)))
+                continue;
+
+            _audio.PlayPredicted(ent.Comp.SoundVend, ent, args.Actor);
+            contained.Remove(item);
+            Dirty(ent);
+            return;
+        }
+
+        _audio.PlayPredicted(ent.Comp.SoundDeny, ent, args.Actor);
+        _popup.PopupPredicted(Loc.GetString("smart-fridge-component-try-eject-out-of-stock"), ent, args.Actor);
+    }
+
+    private void OnGetDumpableVerb(Entity<SmartFridgeComponent> ent, ref GetDumpableVerbEvent args)
+    {
+        if (_accessReader.IsAllowed(args.User, ent))
+        {
+            args.Verb = Loc.GetString("dump-smartfridge-verb-name", ("unit", ent));
+        }
+    }
+
+    private void OnDump(Entity<SmartFridgeComponent> ent, ref DumpEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        args.Handled = true;
+        args.PlaySound = true;
+
+        DoInsert(ent, args.User, args.DumpQueue, false);
+    }
+}
diff --git a/Content.Shared/Sound/Components/BaseEmitSoundComponent.cs b/Content.Shared/Sound/Components/BaseEmitSoundComponent.cs
index 7011f72ef0bf..576374c5868e 100644
--- a/Content.Shared/Sound/Components/BaseEmitSoundComponent.cs
+++ b/Content.Shared/Sound/Components/BaseEmitSoundComponent.cs
@@ -1,6 +1,4 @@
 using Robust.Shared.Audio;
-using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
 
 namespace Content.Shared.Sound.Components;
 
@@ -13,25 +11,13 @@ public abstract partial class BaseEmitSoundComponent : Component
     /// <summary>
     /// The <see cref="SoundSpecifier"/> to play.
     /// </summary>
-    [DataField(required: true)]
+    [DataField(required: true), AutoNetworkedField]
     public SoundSpecifier? Sound;
 
     /// <summary>
     /// Play the sound at the position instead of parented to the source entity.
     /// Useful if the entity is deleted after.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public bool Positional;
 }
-
-/// <summary>
-/// Represents the state of <see cref="BaseEmitSoundComponent"/>.
-/// </summary>
-/// <remarks>This is obviously very cursed, but since the BaseEmitSoundComponent is abstract, we cannot network it.
-/// AutoGenerateComponentState attribute won't work here, and since everything revolves around inheritance for some fucking reason,
-/// there's no better way of doing this.</remarks>
-[Serializable, NetSerializable]
-public struct EmitSoundComponentState(SoundSpecifier? sound) : IComponentState
-{
-    public SoundSpecifier? Sound { get; } = sound;
-}
diff --git a/Content.Shared/Sound/Components/EmitSoundOnActivateComponent.cs b/Content.Shared/Sound/Components/EmitSoundOnActivateComponent.cs
index d6aa42177e82..0cf51a4ee384 100644
--- a/Content.Shared/Sound/Components/EmitSoundOnActivateComponent.cs
+++ b/Content.Shared/Sound/Components/EmitSoundOnActivateComponent.cs
@@ -5,7 +5,7 @@ namespace Content.Shared.Sound.Components;
 /// <summary>
 /// Simple sound emitter that emits sound on ActivateInWorld
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class EmitSoundOnActivateComponent : BaseEmitSoundComponent
 {
     /// <summary>
diff --git a/Content.Shared/Sound/Components/EmitSoundOnCollideComponent.cs b/Content.Shared/Sound/Components/EmitSoundOnCollideComponent.cs
index 4cdea05220c7..ce01ecb87c47 100644
--- a/Content.Shared/Sound/Components/EmitSoundOnCollideComponent.cs
+++ b/Content.Shared/Sound/Components/EmitSoundOnCollideComponent.cs
@@ -3,7 +3,7 @@
 
 namespace Content.Shared.Sound.Components;
 
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentPause]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentPause, AutoGenerateComponentState]
 public sealed partial class EmitSoundOnCollideComponent : BaseEmitSoundComponent
 {
     public static readonly TimeSpan CollideCooldown = TimeSpan.FromSeconds(0.2);
diff --git a/Content.Shared/Sound/Components/EmitSoundOnDropComponent.cs b/Content.Shared/Sound/Components/EmitSoundOnDropComponent.cs
index 64ed5e60dc94..52a352a81699 100644
--- a/Content.Shared/Sound/Components/EmitSoundOnDropComponent.cs
+++ b/Content.Shared/Sound/Components/EmitSoundOnDropComponent.cs
@@ -5,5 +5,5 @@ namespace Content.Shared.Sound.Components;
 /// <summary>
 /// Simple sound emitter that emits sound on entity drop
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class EmitSoundOnDropComponent : BaseEmitSoundComponent;
diff --git a/Content.Shared/Sound/Components/EmitSoundOnInteractUsingComponent.cs b/Content.Shared/Sound/Components/EmitSoundOnInteractUsingComponent.cs
index d0b16fcec801..f196d1ca184e 100644
--- a/Content.Shared/Sound/Components/EmitSoundOnInteractUsingComponent.cs
+++ b/Content.Shared/Sound/Components/EmitSoundOnInteractUsingComponent.cs
@@ -6,7 +6,7 @@ namespace Content.Shared.Sound.Components;
 /// <summary>
 /// Whenever this item is used upon by an entity, with a tag or component within a whitelist, in the hand of a user, play a sound
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class EmitSoundOnInteractUsingComponent : BaseEmitSoundComponent
 {
     /// <summary>
diff --git a/Content.Shared/Sound/Components/EmitSoundOnLandComponent.cs b/Content.Shared/Sound/Components/EmitSoundOnLandComponent.cs
index d3fceb85dd90..2154ec89fccb 100644
--- a/Content.Shared/Sound/Components/EmitSoundOnLandComponent.cs
+++ b/Content.Shared/Sound/Components/EmitSoundOnLandComponent.cs
@@ -5,5 +5,5 @@ namespace Content.Shared.Sound.Components;
 /// <summary>
 /// Simple sound emitter that emits sound on LandEvent
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class EmitSoundOnLandComponent : BaseEmitSoundComponent;
diff --git a/Content.Shared/Sound/Components/EmitSoundOnPickupComponent.cs b/Content.Shared/Sound/Components/EmitSoundOnPickupComponent.cs
index dcf73b7ac260..b9f8708c6f78 100644
--- a/Content.Shared/Sound/Components/EmitSoundOnPickupComponent.cs
+++ b/Content.Shared/Sound/Components/EmitSoundOnPickupComponent.cs
@@ -5,5 +5,5 @@ namespace Content.Shared.Sound.Components;
 /// <summary>
 /// Simple sound emitter that emits sound on entity pickup
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class EmitSoundOnPickupComponent : BaseEmitSoundComponent;
diff --git a/Content.Shared/Sound/Components/EmitSoundOnSpawnComponent.cs b/Content.Shared/Sound/Components/EmitSoundOnSpawnComponent.cs
index 20d39b34600c..b9d66ba2699e 100644
--- a/Content.Shared/Sound/Components/EmitSoundOnSpawnComponent.cs
+++ b/Content.Shared/Sound/Components/EmitSoundOnSpawnComponent.cs
@@ -5,5 +5,5 @@ namespace Content.Shared.Sound.Components;
 /// <summary>
 ///     Simple sound emitter that emits sound on entity spawn.
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class EmitSoundOnSpawnComponent : BaseEmitSoundComponent;
diff --git a/Content.Shared/Sound/Components/EmitSoundOnThrowComponent.cs b/Content.Shared/Sound/Components/EmitSoundOnThrowComponent.cs
index f8c0d1181b6c..76e9f080768e 100644
--- a/Content.Shared/Sound/Components/EmitSoundOnThrowComponent.cs
+++ b/Content.Shared/Sound/Components/EmitSoundOnThrowComponent.cs
@@ -5,5 +5,5 @@ namespace Content.Shared.Sound.Components;
 /// <summary>
 /// Simple sound emitter that emits sound on ThrowEvent
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class EmitSoundOnThrowComponent : BaseEmitSoundComponent;
diff --git a/Content.Shared/Sound/Components/EmitSoundOnUIOpenComponent.cs b/Content.Shared/Sound/Components/EmitSoundOnUIOpenComponent.cs
index 65848cb5e57d..69f3757b2219 100644
--- a/Content.Shared/Sound/Components/EmitSoundOnUIOpenComponent.cs
+++ b/Content.Shared/Sound/Components/EmitSoundOnUIOpenComponent.cs
@@ -6,7 +6,7 @@ namespace Content.Shared.Sound.Components;
 /// <summary>
 /// Simple sound emitter that emits sound on AfterActivatableUIOpenEvent
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class EmitSoundOnUIOpenComponent : BaseEmitSoundComponent
 {
     /// <summary>
diff --git a/Content.Shared/Sound/Components/EmitSoundOnUseComponent.cs b/Content.Shared/Sound/Components/EmitSoundOnUseComponent.cs
index ec7a277e9244..a0a51f323439 100644
--- a/Content.Shared/Sound/Components/EmitSoundOnUseComponent.cs
+++ b/Content.Shared/Sound/Components/EmitSoundOnUseComponent.cs
@@ -5,7 +5,7 @@ namespace Content.Shared.Sound.Components;
 /// <summary>
 /// Simple sound emitter that emits sound on UseInHand
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class EmitSoundOnUseComponent : BaseEmitSoundComponent
 {
     /// <summary>
diff --git a/Content.Shared/Sound/SharedEmitSoundSystem.cs b/Content.Shared/Sound/SharedEmitSoundSystem.cs
index 38af0677fafc..0e758ba0f11f 100644
--- a/Content.Shared/Sound/SharedEmitSoundSystem.cs
+++ b/Content.Shared/Sound/SharedEmitSoundSystem.cs
@@ -55,47 +55,6 @@ public override void Initialize()
         SubscribeLocalEvent<EmitSoundOnCollideComponent, StartCollideEvent>(OnEmitSoundOnCollide);
 
         SubscribeLocalEvent<SoundWhileAliveComponent, MobStateChangedEvent>(OnMobState);
-
-        // We need to handle state manually here
-        // BaseEmitSoundComponent isn't registered so we have to subscribe to each one
-        // TODO: Make it use autonetworking instead of relying on inheritance
-        SubscribeEmitComponent<EmitSoundOnActivateComponent>();
-        SubscribeEmitComponent<EmitSoundOnCollideComponent>();
-        SubscribeEmitComponent<EmitSoundOnDropComponent>();
-        SubscribeEmitComponent<EmitSoundOnInteractUsingComponent>();
-        SubscribeEmitComponent<EmitSoundOnLandComponent>();
-        SubscribeEmitComponent<EmitSoundOnPickupComponent>();
-        SubscribeEmitComponent<EmitSoundOnSpawnComponent>();
-        SubscribeEmitComponent<EmitSoundOnThrowComponent>();
-        SubscribeEmitComponent<EmitSoundOnUIOpenComponent>();
-        SubscribeEmitComponent<EmitSoundOnUseComponent>();
-
-        // Helper method so it's a little less ugly
-        void SubscribeEmitComponent<T>() where T : BaseEmitSoundComponent
-        {
-            SubscribeLocalEvent<T, ComponentGetState>(GetBaseEmitState);
-            SubscribeLocalEvent<T, ComponentHandleState>(HandleBaseEmitState);
-        }
-    }
-
-    private static void GetBaseEmitState<T>(Entity<T> ent, ref ComponentGetState args) where T : BaseEmitSoundComponent
-    {
-        args.State = new EmitSoundComponentState(ent.Comp.Sound);
-    }
-
-    private static void HandleBaseEmitState<T>(Entity<T> ent, ref ComponentHandleState args) where T : BaseEmitSoundComponent
-    {
-        if (args.Current is not EmitSoundComponentState state)
-            return;
-
-        ent.Comp.Sound = state.Sound switch
-        {
-            SoundPathSpecifier pathSpec => new SoundPathSpecifier(pathSpec.Path, pathSpec.Params),
-            SoundCollectionSpecifier collectionSpec => collectionSpec.Collection != null
-                ? new SoundCollectionSpecifier(collectionSpec.Collection, collectionSpec.Params)
-                : null,
-            _ => null,
-        };
     }
 
     private void HandleEmitSoundOnUIOpen(EntityUid uid, EmitSoundOnUIOpenComponent component, AfterActivatableUIOpenEvent args)
diff --git a/Content.Shared/Species/Systems/ReformSystem.cs b/Content.Shared/Species/Systems/ReformSystem.cs
index c3347e83c9c7..285d36840f67 100644
--- a/Content.Shared/Species/Systems/ReformSystem.cs
+++ b/Content.Shared/Species/Systems/ReformSystem.cs
@@ -63,7 +63,7 @@ private void OnReform(EntityUid uid, ReformComponent comp, ReformEvent args)
     {
         // Stun them when they use the action for the amount of reform time.
         if (comp.ShouldStun)
-            _stunSystem.TryStun(uid, TimeSpan.FromSeconds(comp.ReformTime), true);
+            _stunSystem.TryUpdateStunDuration(uid, TimeSpan.FromSeconds(comp.ReformTime));
         _popupSystem.PopupClient(Loc.GetString(comp.PopupText, ("name", uid)), uid, uid);
 
         // Create a doafter & start it
diff --git a/Content.Shared/Standing/StandingStateComponent.cs b/Content.Shared/Standing/StandingStateComponent.cs
index 6aa2fbe5b0db..c6252d969af0 100644
--- a/Content.Shared/Standing/StandingStateComponent.cs
+++ b/Content.Shared/Standing/StandingStateComponent.cs
@@ -18,8 +18,8 @@ public sealed partial class StandingStateComponent : Component
         /// Time it takes us to stand up
         /// </summary>
         [DataField, AutoNetworkedField]
-        public TimeSpan StandTime = TimeSpan.FromSeconds(1);
-        
+        public TimeSpan StandTime = TimeSpan.FromSeconds(2);
+
         /// <summary>
         /// Default Friction modifier for knocked down players.
         /// Makes them accelerate and deccelerate slower.
diff --git a/Content.Shared/StatusEffect/StatusEffectsSystem.cs b/Content.Shared/StatusEffect/StatusEffectsSystem.cs
index b56acd3cc5d5..c0c409d168be 100644
--- a/Content.Shared/StatusEffect/StatusEffectsSystem.cs
+++ b/Content.Shared/StatusEffect/StatusEffectsSystem.cs
@@ -353,7 +353,7 @@ public bool CanApplyEffect(EntityUid uid, string key, StatusEffectsComponent? st
             if (!Resolve(uid, ref status, false))
                 return false;
 
-            var ev = new BeforeStatusEffectAddedEvent(key);
+            var ev = new BeforeOldStatusEffectAddedEvent(key);
             RaiseLocalEvent(uid, ref ev);
             if (ev.Cancelled)
                 return false;
@@ -481,6 +481,13 @@ public bool TryGetTime(EntityUid uid, string key,
         }
     }
 
+    /// <summary>
+    /// Raised on an entity before a status effect is added to determine if adding it should be cancelled.
+    /// Obsolete version of <see cref="BeforeStatusEffectAddedEvent" />
+    /// </summary>
+    [ByRefEvent, Obsolete("Migration to StatusEffectNew.StatusEffectsSystem is required")]
+    public record struct BeforeOldStatusEffectAddedEvent(string EffectKey, bool Cancelled = false);
+
     public readonly struct StatusEffectAddedEvent
     {
         public readonly EntityUid Uid;
diff --git a/Content.Shared/StatusEffectNew/Components/RejuvenateRemovedStatusEffectComponent.cs b/Content.Shared/StatusEffectNew/Components/RejuvenateRemovedStatusEffectComponent.cs
new file mode 100644
index 000000000000..808830f7e24a
--- /dev/null
+++ b/Content.Shared/StatusEffectNew/Components/RejuvenateRemovedStatusEffectComponent.cs
@@ -0,0 +1,14 @@
+using Content.Shared.Damage.Components;
+using Content.Shared.Rejuvenate;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.StatusEffectNew.Components;
+
+/// <summary>
+/// Marker component for a status effect that should be removed on rejuvenation
+/// and should not be applied on targets with <see cref="GodmodeComponent" />.
+/// Only applies to effects using the new <see cref="StatusEffectsSystem" />.
+/// </summary>
+/// <seealso cref="RejuvenateEvent"/>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class RejuvenateRemovedStatusEffectComponent : Component;
diff --git a/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs b/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs
index d508ea8b739b..d30ab79c2b47 100644
--- a/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs
+++ b/Content.Shared/StatusEffectNew/StatusEffectSystem.API.cs
@@ -31,7 +31,7 @@ TimeSpan duration
     }
 
 
-    ///<inheritdoc cref="TryAddStatusEffectDuration(Robust.Shared.GameObjects.EntityUid,Robust.Shared.Prototypes.EntProtoId,out Robust.Shared.GameObjects.EntityUid?,System.TimeSpan)"/>
+    ///<inheritdoc cref="TryAddStatusEffectDuration(EntityUid,EntProtoId,out EntityUid?,TimeSpan)"/>
     public bool TryAddStatusEffectDuration(EntityUid target, EntProtoId effectProto, TimeSpan duration)
     {
         return TryAddStatusEffectDuration(target, effectProto, out _, duration);
@@ -61,7 +61,7 @@ public bool TrySetStatusEffectDuration(
         return true;
     }
 
-    /// <inheritdoc cref="TrySetStatusEffectDuration(Robust.Shared.GameObjects.EntityUid,Robust.Shared.Prototypes.EntProtoId,out Robust.Shared.GameObjects.EntityUid?,System.TimeSpan?)"/>
+    /// <inheritdoc cref="TrySetStatusEffectDuration(EntityUid,EntProtoId,out EntityUid?,TimeSpan?)"/>
     public bool TrySetStatusEffectDuration(EntityUid target, EntProtoId effectProto, TimeSpan? duration = null)
     {
         return TrySetStatusEffectDuration(target, effectProto, out _, duration);
@@ -91,7 +91,7 @@ public bool TryUpdateStatusEffectDuration(
         return true;
     }
 
-    /// <inheritdoc cref="TryUpdateStatusEffectDuration(Robust.Shared.GameObjects.EntityUid,Robust.Shared.Prototypes.EntProtoId,out Robust.Shared.GameObjects.EntityUid?,System.TimeSpan?)"/>
+    /// <inheritdoc cref="TryUpdateStatusEffectDuration(EntityUid,EntProtoId,out EntityUid?,TimeSpan?)"/>
     public bool TryUpdateStatusEffectDuration(EntityUid target, EntProtoId effectProto, TimeSpan? duration = null)
     {
         return TryUpdateStatusEffectDuration(target, effectProto, out _, duration);
diff --git a/Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs b/Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
index 224a3dc4a4db..0c4c5cf1f7f2 100644
--- a/Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
+++ b/Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
@@ -1,4 +1,8 @@
+using Content.Shared.Movement.Events;
+using Content.Shared.Movement.Systems;
+using Content.Shared.Rejuvenate;
 using Content.Shared.StatusEffectNew.Components;
+using Content.Shared.Stunnable;
 using Robust.Shared.Player;
 
 namespace Content.Shared.StatusEffectNew;
@@ -9,6 +13,16 @@ private void InitializeRelay()
     {
         SubscribeLocalEvent<StatusEffectContainerComponent, LocalPlayerAttachedEvent>(RelayStatusEffectEvent);
         SubscribeLocalEvent<StatusEffectContainerComponent, LocalPlayerDetachedEvent>(RelayStatusEffectEvent);
+        SubscribeLocalEvent<StatusEffectContainerComponent, RejuvenateEvent>(RelayStatusEffectEvent);
+
+        SubscribeLocalEvent<StatusEffectContainerComponent, RefreshMovementSpeedModifiersEvent>(RelayStatusEffectEvent);
+        SubscribeLocalEvent<StatusEffectContainerComponent, UpdateCanMoveEvent>(RelayStatusEffectEvent);
+
+        SubscribeLocalEvent<StatusEffectContainerComponent, RefreshFrictionModifiersEvent>(RefRelayStatusEffectEvent);
+        SubscribeLocalEvent<StatusEffectContainerComponent, TileFrictionEvent>(RefRelayStatusEffectEvent);
+
+        SubscribeLocalEvent<StatusEffectContainerComponent, StandUpAttemptEvent>(RefRelayStatusEffectEvent);
+        SubscribeLocalEvent<StatusEffectContainerComponent, StunEndAttemptEvent>(RefRelayStatusEffectEvent);
     }
 
     private void RefRelayStatusEffectEvent<T>(EntityUid uid, StatusEffectContainerComponent component, ref T args) where T : struct
diff --git a/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs b/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs
index 7f39a1f7c543..7f8eef5102f5 100644
--- a/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs
+++ b/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs
@@ -1,4 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Rejuvenate;
 using Content.Shared.StatusEffectNew.Components;
 using Content.Shared.Whitelist;
 using Robust.Shared.Containers;
@@ -32,6 +33,8 @@ public override void Initialize()
         SubscribeLocalEvent<StatusEffectContainerComponent, EntInsertedIntoContainerMessage>(OnEntityInserted);
         SubscribeLocalEvent<StatusEffectContainerComponent, EntRemovedFromContainerMessage>(OnEntityRemoved);
 
+        SubscribeLocalEvent<RejuvenateRemovedStatusEffectComponent, StatusEffectRelayedEvent<RejuvenateEvent>>(OnRejuvenate);
+
         _containerQuery = GetEntityQuery<StatusEffectContainerComponent>();
         _effectQuery = GetEntityQuery<StatusEffectComponent>();
     }
@@ -115,6 +118,12 @@ private void OnEntityRemoved(Entity<StatusEffectContainerComponent> ent, ref Ent
         Dirty(args.Entity, statusComp);
     }
 
+    private void OnRejuvenate(Entity<RejuvenateRemovedStatusEffectComponent> ent,
+        ref StatusEffectRelayedEvent<RejuvenateEvent> args)
+    {
+        PredictedQueueDel(ent.Owner);
+    }
+
     private void SetStatusEffectTime(EntityUid effect, TimeSpan? duration)
     {
         if (!_effectQuery.TryComp(effect, out var effectComp))
@@ -156,7 +165,7 @@ private void UpdateStatusEffectTime(EntityUid effect, TimeSpan? duration)
         Dirty(effect, effectComp);
     }
 
-    private bool CanAddStatusEffect(EntityUid uid, EntProtoId effectProto)
+    public bool CanAddStatusEffect(EntityUid uid, EntProtoId effectProto)
     {
         if (!_proto.TryIndex(effectProto, out var effectProtoData))
             return false;
diff --git a/Content.Shared/Storage/Components/DumpableComponent.cs b/Content.Shared/Storage/Components/DumpableComponent.cs
index ecf5f17ea994..0c751df2a3b7 100644
--- a/Content.Shared/Storage/Components/DumpableComponent.cs
+++ b/Content.Shared/Storage/Components/DumpableComponent.cs
@@ -33,3 +33,15 @@ public sealed partial class DumpableComponent : Component
     [DataField("multiplier"), AutoNetworkedField]
     public float Multiplier = 1.0f;
 }
+
+/// <summary>
+/// Event raised on Dumpable entities to get the verb for dumping
+/// </summary>
+[ByRefEvent]
+public record struct GetDumpableVerbEvent(EntityUid User, string? Verb);
+
+/// <summary>
+/// Event raised on Dumpable entities to complete the dump
+/// </summary>
+[ByRefEvent]
+public record struct DumpEvent(Queue<EntityUid> DumpQueue, EntityUid User, bool PlaySound, bool Handled);
diff --git a/Content.Shared/Storage/EntitySystems/DumpableSystem.cs b/Content.Shared/Storage/EntitySystems/DumpableSystem.cs
index d0ad27eee5a3..6c0cc2d65672 100644
--- a/Content.Shared/Storage/EntitySystems/DumpableSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/DumpableSystem.cs
@@ -1,11 +1,7 @@
 using System.Linq;
-using Content.Shared.Disposal;
-using Content.Shared.Disposal.Components;
-using Content.Shared.Disposal.Unit;
 using Content.Shared.DoAfter;
 using Content.Shared.Interaction;
 using Content.Shared.Item;
-using Content.Shared.Placeable;
 using Content.Shared.Storage.Components;
 using Content.Shared.Verbs;
 using Robust.Shared.Audio.Systems;
@@ -21,7 +17,6 @@ public sealed class DumpableSystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedDisposalUnitSystem _disposalUnitSystem = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
     [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
 
@@ -39,10 +34,12 @@ public override void Initialize()
 
     private void OnAfterInteract(EntityUid uid, DumpableComponent component, AfterInteractEvent args)
     {
-        if (!args.CanReach || args.Handled)
+        if (!args.CanReach || args.Handled || args.Target is not { } target)
             return;
 
-        if (!HasComp<DisposalUnitComponent>(args.Target) && !HasComp<PlaceableSurfaceComponent>(args.Target))
+        var evt = new GetDumpableVerbEvent(args.User, null);
+        RaiseLocalEvent(target, ref evt);
+        if (evt.Verb is null)
             return;
 
         if (!TryComp<StorageComponent>(uid, out var storage))
@@ -51,7 +48,7 @@ private void OnAfterInteract(EntityUid uid, DumpableComponent component, AfterIn
         if (!storage.Container.ContainedEntities.Any())
             return;
 
-        StartDoAfter(uid, args.Target.Value, args.User, component);
+        StartDoAfter(uid, target, args.User, component);
         args.Handled = true;
     }
 
@@ -83,33 +80,22 @@ private void AddUtilityVerbs(EntityUid uid, DumpableComponent dumpable, GetVerbs
         if (!TryComp<StorageComponent>(uid, out var storage) || !storage.Container.ContainedEntities.Any())
             return;
 
-        if (HasComp<DisposalUnitComponent>(args.Target))
-        {
-            UtilityVerb verb = new()
-            {
-                Act = () =>
-                {
-                    StartDoAfter(uid, args.Target, args.User, dumpable);
-                },
-                Text = Loc.GetString("dump-disposal-verb-name", ("unit", args.Target)),
-                IconEntity = GetNetEntity(uid)
-            };
-            args.Verbs.Add(verb);
-        }
+        var evt = new GetDumpableVerbEvent(args.User, null);
+        RaiseLocalEvent(args.Target, ref evt);
 
-        if (HasComp<PlaceableSurfaceComponent>(args.Target))
+        if (evt.Verb is not { } verbText)
+            return;
+
+        UtilityVerb verb = new()
         {
-            UtilityVerb verb = new()
+            Act = () =>
             {
-                Act = () =>
-                {
-                    StartDoAfter(uid, args.Target, args.User, dumpable);
-                },
-                Text = Loc.GetString("dump-placeable-verb-name", ("surface", args.Target)),
-                IconEntity = GetNetEntity(uid)
-            };
-            args.Verbs.Add(verb);
-        }
+                StartDoAfter(uid, args.Target, args.User, dumpable);
+            },
+            Text = verbText,
+            IconEntity = GetNetEntity(uid)
+        };
+        args.Verbs.Add(verb);
     }
 
     private void StartDoAfter(EntityUid storageUid, EntityUid targetUid, EntityUid userUid, DumpableComponent dumpable)
@@ -141,34 +127,15 @@ private void StartDoAfter(EntityUid storageUid, EntityUid targetUid, EntityUid u
 
     private void OnDoAfter(EntityUid uid, DumpableComponent component, DumpableDoAfterEvent args)
     {
-        if (args.Handled || args.Cancelled || !TryComp<StorageComponent>(uid, out var storage) || storage.Container.ContainedEntities.Count == 0)
+        if (args.Handled || args.Cancelled || !TryComp<StorageComponent>(uid, out var storage) || storage.Container.ContainedEntities.Count == 0 || args.Args.Target is not { } target)
             return;
 
         var dumpQueue = new Queue<EntityUid>(storage.Container.ContainedEntities);
 
-        var dumped = false;
+        var evt = new DumpEvent(dumpQueue, args.Args.User, false, false);
+        RaiseLocalEvent(target, ref evt);
 
-        if (HasComp<DisposalUnitComponent>(args.Args.Target))
-        {
-            dumped = true;
-
-            foreach (var entity in dumpQueue)
-            {
-                _disposalUnitSystem.DoInsertDisposalUnit(args.Args.Target.Value, entity, args.Args.User);
-            }
-        }
-        else if (HasComp<PlaceableSurfaceComponent>(args.Args.Target))
-        {
-            dumped = true;
-
-            var (targetPos, targetRot) = _transformSystem.GetWorldPositionRotation(args.Args.Target.Value);
-
-            foreach (var entity in dumpQueue)
-            {
-                _transformSystem.SetWorldPositionRotation(entity, targetPos + _random.NextVector2Box() / 4, targetRot);
-            }
-        }
-        else
+        if (!evt.Handled)
         {
             var targetPos = _transformSystem.GetWorldPosition(uid);
 
@@ -177,9 +144,11 @@ private void OnDoAfter(EntityUid uid, DumpableComponent component, DumpableDoAft
                 var transform = Transform(entity);
                 _transformSystem.SetWorldPositionRotation(entity, targetPos + _random.NextVector2Box() / 4, _random.NextAngle(), transform);
             }
+
+            return;
         }
 
-        if (dumped)
+        if (evt.PlaySound)
         {
             _audio.PlayPredicted(component.DumpSound, uid, args.User);
         }
diff --git a/Content.Shared/Stunnable/KnockdownStatusEffectComponent.cs b/Content.Shared/Stunnable/KnockdownStatusEffectComponent.cs
new file mode 100644
index 000000000000..79b2fb695b93
--- /dev/null
+++ b/Content.Shared/Stunnable/KnockdownStatusEffectComponent.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Stunnable;
+
+/// <summary>
+/// Knockdown as a status effect.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedStunSystem))]
+public sealed partial class KnockdownStatusEffectComponent : Component;
diff --git a/Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs b/Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs
index 61e4fc95ba07..9c7605edf801 100644
--- a/Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs
+++ b/Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Alert;
+using Content.Shared.Alert;
 using Content.Shared.Buckle.Components;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Components;
@@ -29,12 +29,21 @@ namespace Content.Shared.Stunnable;
 /// </summary>
 public abstract partial class SharedStunSystem
 {
+    // TODO: Both of these constants need to be moved to a component somewhere, and need to be tweaked for balance...
+    // We don't always have standing state available when these are called so it can't go there
+    // Maybe I can pass the values to KnockedDownComponent from Standing state on Component init?
+    // Default knockdown timer
+    public static readonly TimeSpan DefaultKnockedDuration = TimeSpan.FromSeconds(0.5f);
+    // Minimum damage taken to refresh our knockdown timer to the default duration
+    public static readonly float KnockdownDamageThreshold = 5f;
+
+    [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
     [Dependency] private readonly SharedGunSystem _gunSystem = default!; // 🌟Starlight🌟
     [Dependency] private readonly SharedHandsSystem _hands = default!;
     [Dependency] private readonly SharedItemSystem _item = default!; // 🌟Starlight🌟
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
-    [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
+    [Dependency] private readonly StandingStateSystem _standingState = default!;
 
     private static readonly ProtoId<ItemSizePrototype> MaxItemSize = "Small";
 
@@ -85,8 +94,7 @@ public override void Update(float frameTime)
             if (!knockedDown.AutoStand || knockedDown.DoAfterId.HasValue || knockedDown.NextUpdate > GameTiming.CurTime)
                 continue;
 
-            TryStanding(uid, out knockedDown.DoAfterId);
-            DirtyField(uid, knockedDown, nameof(KnockedDownComponent.DoAfterId));
+            TryStanding(uid);
         }
     }
 
@@ -102,7 +110,8 @@ private void OnRejuvenate(Entity<KnockedDownComponent> entity, ref RejuvenateEve
 
     private void OnKnockInit(Entity<KnockedDownComponent> entity, ref ComponentInit args)
     {
-        _standingState.Down(entity, true, entity.Comp.AutoStand);
+        // Other systems should handle dropping held items...
+        _standingState.Down(entity, true, false);
         RefreshKnockedMovement(entity);
     }
 
@@ -120,15 +129,25 @@ private void OnKnockShutdown(Entity<KnockedDownComponent> entity, ref ComponentS
 
     #region API
 
-    public void ToggleAutoStand(Entity<KnockedDownComponent?> entity, bool autoStand = false)
+    /// <summary>
+    /// Sets the autostand property of a <see cref="KnockedDownComponent"/> on an entity to true or false and dirties it.
+    /// Defaults to false.
+    /// </summary>
+    /// <param name="entity">Entity we want to edit the data field of.</param>
+    /// <param name="autoStand">What we want to set the data field to.</param>
+    public void SetAutoStand(Entity<KnockedDownComponent?> entity, bool autoStand = false)
     {
         if (!Resolve(entity, ref entity.Comp, false))
             return;
 
         entity.Comp.AutoStand = autoStand;
-        DirtyField(entity, entity.Comp, nameof(entity.Comp.AutoStand));
+        DirtyField(entity, entity.Comp, nameof(KnockedDownComponent.AutoStand));
     }
 
+    /// <summary>
+    /// Cancels the DoAfter of an entity with the <see cref="KnockedDownComponent"/> who is trying to stand.
+    /// </summary>
+    /// <param name="entity">Entity who we are canceling the DoAfter for.</param>
     public void CancelKnockdownDoAfter(Entity<KnockedDownComponent?> entity)
     {
         if (!Resolve(entity, ref entity.Comp, false))
@@ -142,27 +161,49 @@ public void CancelKnockdownDoAfter(Entity<KnockedDownComponent?> entity)
         DirtyField(entity, entity.Comp, nameof(KnockedDownComponent.DoAfterId));
     }
 
-    public void RefreshKnockdownTime(Entity<KnockedDownComponent> entity, TimeSpan time, bool refresh = true)
+    /// <summary>
+    /// Updates the knockdown timer of a knocked down entity with a given inputted time, then dirties the time.
+    /// </summary>
+    /// <param name="entity">Entity who's knockdown time we're updating.</param>
+    /// <param name="time">The time we're updating with.</param>
+    /// <param name="refresh">Whether we're resetting the timer or adding to the current timer.</param>
+    public void UpdateKnockdownTime(Entity<KnockedDownComponent> entity, TimeSpan time, bool refresh = true)
     {
         if (refresh)
-            UpdateKnockdownTime(entity, time);
+            RefreshKnockdownTime(entity, time);
         else
             AddKnockdownTime(entity, time);
     }
 
+    /// <summary>
+    /// Sets the next update datafield of an entity's <see cref="KnockedDownComponent"/> to a specific time.
+    /// </summary>
+    /// <param name="entity">Entity whose timer we're updating</param>
+    /// <param name="time">The exact time we're setting the next update to.</param>
     public void SetKnockdownTime(Entity<KnockedDownComponent> entity, TimeSpan time)
     {
         entity.Comp.NextUpdate = time;
         DirtyField(entity, entity.Comp, nameof(KnockedDownComponent.NextUpdate));
     }
 
-    public void UpdateKnockdownTime(Entity<KnockedDownComponent> entity, TimeSpan time)
+    /// <summary>
+    /// Refreshes the amount of time an entity is knocked down to the inputted time, if it is greater than
+    /// the current time left.
+    /// </summary>
+    /// <param name="entity">Entity whose timer we're updating</param>
+    /// <param name="time">The time we want them to be knocked down for.</param>
+    public void RefreshKnockdownTime(Entity<KnockedDownComponent> entity, TimeSpan time)
     {
         var knockedTime = GameTiming.CurTime + time;
         if (entity.Comp.NextUpdate < knockedTime)
             SetKnockdownTime(entity, knockedTime);
     }
 
+    /// <summary>
+    /// Adds our inputted time to an entity's knocked down timer, or sets it to the given time if their timer has expired.
+    /// </summary>
+    /// <param name="entity">Entity whose timer we're updating</param>
+    /// <param name="time">The time we want to add to their knocked down timer.</param>
     public void AddKnockdownTime(Entity<KnockedDownComponent> entity, TimeSpan time)
     {
         if (entity.Comp.NextUpdate < GameTiming.CurTime)
@@ -175,6 +216,25 @@ public void AddKnockdownTime(Entity<KnockedDownComponent> entity, TimeSpan time)
         DirtyField(entity, entity.Comp, nameof(KnockedDownComponent.NextUpdate));
     }
 
+    /// <summary>
+    /// Checks if an entity is able to stand, returns true if it can, returns false if it cannot.
+    /// </summary>
+    /// <param name="entity">Entity we're checking</param>
+    /// <returns>Returns whether the entity is able to stand</returns>
+    public bool CanStand(Entity<KnockedDownComponent> entity)
+    {
+        if (entity.Comp.NextUpdate > GameTiming.CurTime)
+            return false;
+
+        if (!Blocker.CanMove(entity))
+            return false;
+
+        var ev = new StandUpAttemptEvent();
+        RaiseLocalEvent(entity, ref ev);
+
+        return !ev.Cancelled;
+    }
+
     #endregion
 
     #region Knockdown Logic
@@ -189,36 +249,29 @@ private void HandleToggleKnockdown(ICommonSession? session)
 
         if (!TryComp<KnockedDownComponent>(playerEnt, out var component))
         {
-            TryKnockdown(playerEnt, TimeSpan.FromSeconds(0.5), true, false); // TODO: Unhardcode these numbers
+            TryKnockdown(playerEnt, DefaultKnockedDuration, true, false, false); // TODO: Unhardcode these numbers
             return;
         }
 
         var stand = !component.DoAfterId.HasValue;
+        SetAutoStand(playerEnt, stand);
 
-        if (stand)
-        {
-            TryStanding(playerEnt, out component.DoAfterId);
-            DirtyField(playerEnt, component, nameof(KnockedDownComponent.DoAfterId));
-        }
-        else
+        if (!stand || !TryStanding(playerEnt))
             CancelKnockdownDoAfter((playerEnt, component));
 
-        ToggleAutoStand(playerEnt, stand);
+        SetAutoStand(playerEnt, stand);
     }
 
-    public bool TryStanding(Entity<KnockedDownComponent?, StandingStateComponent?> entity, out ushort? id)
+    public bool TryStanding(Entity<KnockedDownComponent?, StandingStateComponent?> entity)
     {
-        id = null;
         // If we aren't knocked down or can't be knocked down, then we did technically succeed in standing up
         if (!Resolve(entity, ref entity.Comp1, ref entity.Comp2, false))
             return true;
 
-        id = entity.Comp1.DoAfterId;
-
-        if (!CanStand((entity.Owner, entity.Comp1)))
+        if (!TryStand((entity.Owner, entity.Comp1)))
             return false;
 
-        var ev = new StandUpArgsEvent(entity.Comp2.StandTime);
+        var ev = new GetStandUpTimeEvent(entity.Comp2.StandTime);
         RaiseLocalEvent(entity, ref ev);
 
         var doAfterArgs = new DoAfterArgs(EntityManager, entity, ev.DoAfterTime, new TryStandDoAfterEvent(), entity, entity)
@@ -234,36 +287,51 @@ public bool TryStanding(Entity<KnockedDownComponent?, StandingStateComponent?> e
         if (!DoAfter.TryStartDoAfter(doAfterArgs, out var doAfterId))
             return false;
 
-        id = doAfterId.Value.Index;
+        entity.Comp1.DoAfterId = doAfterId.Value.Index;
+        DirtyField(entity, entity.Comp1, nameof(KnockedDownComponent.DoAfterId));
         return true;
     }
 
-    private bool StandingBlocked(Entity<KnockedDownComponent> entity)
+    /// <summary>
+    /// A variant of <see cref="CanStand"/> used when we're actually trying to stand.
+    /// Main difference is this one affects autostand datafields and also displays popups.
+    /// </summary>
+    /// <param name="entity">Entity we're checking</param>
+    /// <returns>Returns whether the entity is able to stand</returns>
+    public bool TryStand(Entity<KnockedDownComponent> entity)
     {
-        if (!CanStand(entity))
-            return true;
+        if (entity.Comp.NextUpdate > GameTiming.CurTime)
+            return false;
 
-        if (!IntersectingStandingColliders(entity.Owner))
+        if (!Blocker.CanMove(entity))
             return false;
 
-        _popup.PopupClient(Loc.GetString("knockdown-component-stand-no-room"), entity, entity, PopupType.SmallCaution);
-        ToggleAutoStand(entity.Owner);
-        return true;
+        var ev = new StandUpAttemptEvent(entity.Comp.AutoStand);
+        RaiseLocalEvent(entity, ref ev);
+
+        if (ev.Autostand != entity.Comp.AutoStand)
+            SetAutoStand((entity.Owner, entity.Comp), ev.Autostand);
+
+        if (ev.Message != null)
+        {
+            _popup.PopupClient(ev.Message.Value.Item1, entity, entity, ev.Message.Value.Item2);
+        }
 
+        return !ev.Cancelled;
     }
 
-    private bool CanStand(Entity<KnockedDownComponent> entity)
+    private bool StandingBlocked(Entity<KnockedDownComponent> entity)
     {
-        if (entity.Comp.NextUpdate > GameTiming.CurTime)
-            return false;
+        if (!TryStand(entity))
+            return true;
 
-        if (!_blocker.CanMove(entity))
+        if (!IntersectingStandingColliders(entity.Owner))
             return false;
 
-        var ev = new StandUpAttemptEvent();
-        RaiseLocalEvent(entity, ref ev);
+        _popup.PopupClient(Loc.GetString("knockdown-component-stand-no-room"), entity, entity, PopupType.SmallCaution);
+        SetAutoStand(entity.Owner);
+        return true;
 
-        return !ev.Cancelled;
     }
 
     private void OnForceStandup(ForceStandUpEvent msg, EntitySessionEventArgs args)
@@ -280,7 +348,7 @@ public void ForceStandUp(Entity<KnockedDownComponent?> entity)
             return;
 
         // That way if we fail to stand, the game will try to stand for us when we are able to
-        ToggleAutoStand(entity, true);
+        SetAutoStand(entity, true);
 
         if (!HasComp<StandingStateComponent>(entity) || StandingBlocked((entity, entity.Comp)))
             return;
@@ -305,8 +373,8 @@ private void OnKnockedDownAlert(Entity<KnockedDownComponent> entity, ref Knocked
             return;
 
         // If we're already trying to stand, or we fail to stand try forcing it
-        if (!TryStanding(entity.Owner, out entity.Comp.DoAfterId))
-            ForceStandUp(entity!);
+        if (!TryStanding(entity.Owner))
+            ForceStandUp((entity.Owner, entity.Comp));
 
         DirtyField(entity, entity.Comp, nameof(KnockedDownComponent.DoAfterId));
         args.Handled = true;
@@ -318,11 +386,10 @@ private bool TryForceStand(Entity<StaminaComponent?> entity)
         if (!Resolve(entity, ref entity.Comp, false))
             return false;
 
-        var staminaDamage = entity.Comp.ForceStandStamina;
-
-        // TODO: Raise an event to modify the stamina damage?
+        var ev = new TryForceStandEvent(entity.Comp.ForceStandStamina);
+        RaiseLocalEvent(entity, ref ev);
 
-        if (!Stamina.TryTakeStamina(entity, staminaDamage, entity.Comp, visual: true))
+        if (!Stamina.TryTakeStamina(entity, ev.Stamina, entity.Comp, visual: true))
         {
             _popup.PopupClient(Loc.GetString("knockdown-component-pushup-failure"), entity, entity, PopupType.MediumCaution);
             return false;
@@ -390,8 +457,8 @@ private void OnDamaged(Entity<KnockedDownComponent> entity, ref DamageChangedEve
         if (!args.InterruptsDoAfters || !args.DamageIncreased || args.DamageDelta == null || GameTiming.ApplyingState)
             return;
 
-        if (args.DamageDelta.GetTotal() >= 5) // TODO: Unhardcode this
-            SetKnockdownTime(entity, GameTiming.CurTime + TimeSpan.FromSeconds(0.5f));
+        if (args.DamageDelta.GetTotal() >= KnockdownDamageThreshold) // TODO: Unhardcode this
+            SetKnockdownTime(entity, GameTiming.CurTime + DefaultKnockedDuration);
     }
 
     #endregion
diff --git a/Content.Shared/Stunnable/SharedStunSystem.Visualizer.cs b/Content.Shared/Stunnable/SharedStunSystem.Visualizer.cs
index ca9d847c30e7..4d49621a8a1a 100644
--- a/Content.Shared/Stunnable/SharedStunSystem.Visualizer.cs
+++ b/Content.Shared/Stunnable/SharedStunSystem.Visualizer.cs
@@ -17,7 +17,7 @@ private bool GetStarsData(Entity<StunVisualsComponent, StunnedComponent?> entity
         if (!Resolve(entity, ref entity.Comp2, false))
             return false;
 
-        return _blocker.CanConsciouslyPerformAction(entity);
+        return Blocker.CanConsciouslyPerformAction(entity);
     }
 
     private void OnStunMobStateChanged(Entity<StunVisualsComponent> entity, ref MobStateChangedEvent args)
@@ -40,7 +40,7 @@ public void TrySeeingStars(Entity<AppearanceComponent?> entity)
         if (!Appearance.TryGetData<bool>(entity, StunVisuals.SeeingStars, out var stars, entity.Comp) && stars)
             return;
 
-        if (!_blocker.CanConsciouslyPerformAction(entity))
+        if (!Blocker.CanConsciouslyPerformAction(entity))
             return;
 
         Appearance.SetData(entity, StunVisuals.SeeingStars, true);
diff --git a/Content.Shared/Stunnable/SharedStunSystem.cs b/Content.Shared/Stunnable/SharedStunSystem.cs
index a4ccd94d30db..199afcabf240 100644
--- a/Content.Shared/Stunnable/SharedStunSystem.cs
+++ b/Content.Shared/Stunnable/SharedStunSystem.cs
@@ -2,10 +2,8 @@
 using Content.Shared.Administration.Logs;
 using Content.Shared.Alert;
 using Content.Shared.Interaction.Events;
-using Content.Shared.Inventory;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Item;
-using Content.Shared.Damage.Components;
 using Content.Shared.Damage.Systems;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
@@ -15,41 +13,35 @@
 using Content.Shared.Movement.Events;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Standing;
-using Content.Shared.StatusEffect;
+using Content.Shared.StatusEffectNew;
 using Content.Shared.Throwing;
 using Content.Shared.Whitelist;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Physics.Events;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
 namespace Content.Shared.Stunnable;
 
 public abstract partial class SharedStunSystem : EntitySystem
 {
+    public static readonly EntProtoId StunId = "StatusEffectStunned";
+    public static readonly EntProtoId KnockdownId = "StatusEffectKnockdown";
+
     [Dependency] protected readonly IGameTiming GameTiming = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly ActionBlockerSystem _blocker = default!;
+    [Dependency] protected readonly ActionBlockerSystem Blocker = default!;
     [Dependency] protected readonly AlertsSystem Alerts = default!;
     [Dependency] private readonly EntityWhitelistSystem _entityWhitelist = default!;
     [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
-    [Dependency] private readonly StandingStateSystem _standingState = default!;
     [Dependency] protected readonly SharedDoAfterSystem DoAfter = default!;
     [Dependency] protected readonly SharedStaminaSystem Stamina = default!;
-    [Dependency] private readonly StatusEffectsSystem _statusEffect = default!;
+    [Dependency] private readonly StatusEffectsSystem _status = default!;
 
     public override void Initialize()
     {
-        SubscribeLocalEvent<SlowedDownComponent, ComponentInit>(OnSlowInit);
-        SubscribeLocalEvent<SlowedDownComponent, ComponentShutdown>(OnSlowRemove);
-        SubscribeLocalEvent<SlowedDownComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovespeed);
-
-        SubscribeLocalEvent<FrictionStatusComponent, ComponentInit>(OnFrictionInit);
-        SubscribeLocalEvent<FrictionStatusComponent, ComponentShutdown>(OnFrictionRemove);
-        SubscribeLocalEvent<FrictionStatusComponent, RefreshFrictionModifiersEvent>(OnRefreshFrictionStatus);
-        SubscribeLocalEvent<FrictionStatusComponent, TileFrictionEvent>(OnRefreshTileFrictionStatus);
-
         SubscribeLocalEvent<StunnedComponent, ComponentStartup>(UpdateCanMove);
         SubscribeLocalEvent<StunnedComponent, ComponentShutdown>(OnStunShutdown);
 
@@ -68,10 +60,16 @@ public override void Initialize()
         SubscribeLocalEvent<StunnedComponent, IsUnequippingAttemptEvent>(OnUnequipAttempt);
         SubscribeLocalEvent<MobStateComponent, MobStateChangedEvent>(OnMobStateChanged);
 
+        // New Status Effect subscriptions
+        SubscribeLocalEvent<StunnedStatusEffectComponent, StatusEffectAppliedEvent>(OnStunEffectApplied);
+        SubscribeLocalEvent<StunnedStatusEffectComponent, StatusEffectRemovedEvent>(OnStunStatusRemoved);
+        SubscribeLocalEvent<StunnedStatusEffectComponent, StatusEffectRelayedEvent<StunEndAttemptEvent>>(OnStunEndAttempt);
+
+        SubscribeLocalEvent<KnockdownStatusEffectComponent, StatusEffectRelayedEvent<StandUpAttemptEvent>>(OnStandUpAttempt);
+
         // Stun Appearance Data
+        InitializeKnockdown();
         InitializeAppearance();
-
-        InitializeKnockdown();// Starlight
     }
 
     private void OnAttemptInteract(Entity<StunnedComponent> ent, ref InteractionAttemptEvent args)
@@ -81,10 +79,6 @@ private void OnAttemptInteract(Entity<StunnedComponent> ent, ref InteractionAtte
 
     private void OnMobStateChanged(EntityUid uid, MobStateComponent component, MobStateChangedEvent args)
     {
-        if (!TryComp<StatusEffectsComponent>(uid, out var status))
-        {
-            return;
-        }
         switch (args.NewMobState)
         {
             case MobState.Alive:
@@ -93,12 +87,12 @@ private void OnMobStateChanged(EntityUid uid, MobStateComponent component, MobSt
                 }
             case MobState.Critical:
                 {
-                    _statusEffect.TryRemoveStatusEffect(uid, "Stun");
+                    _status.TryRemoveStatusEffect(uid, StunId);
                     break;
                 }
             case MobState.Dead:
                 {
-                    _statusEffect.TryRemoveStatusEffect(uid, "Stun");
+                    _status.TryRemoveStatusEffect(uid, StunId);
                     break;
                 }
             case MobState.Invalid:
@@ -117,7 +111,7 @@ private void OnStunShutdown(Entity<StunnedComponent> ent, ref ComponentShutdown
 
     private void UpdateCanMove(EntityUid uid, StunnedComponent component, EntityEventArgs args)
     {
-        _blocker.UpdateCanMove(uid);
+        Blocker.UpdateCanMove(uid);
     }
 
     private void OnStunOnContactCollide(Entity<StunOnContactComponent> ent, ref StartCollideEvent args)
@@ -128,258 +122,182 @@ private void OnStunOnContactCollide(Entity<StunOnContactComponent> ent, ref Star
         if (_entityWhitelist.IsBlacklistPass(ent.Comp.Blacklist, args.OtherEntity))
             return;
 
-        if (!TryComp<StatusEffectsComponent>(args.OtherEntity, out var status))
-            return;
-
-        TryStun(args.OtherEntity, ent.Comp.Duration, true, status);
-        TryKnockdown(args.OtherEntity, ent.Comp.Duration, ent.Comp.Refresh, ent.Comp.AutoStand, status);
+        TryUpdateStunDuration(args.OtherEntity, ent.Comp.Duration);
+        TryKnockdown(args.OtherEntity, ent.Comp.Duration, true, force: true);
     }
 
-    private void OnSlowInit(EntityUid uid, SlowedDownComponent component, ComponentInit args)
+    // TODO STUN: Make events for different things. (Getting modifiers, attempt events, informative events...)
+    public bool TryAddStunDuration(EntityUid uid, TimeSpan duration)
     {
-        _movementSpeedModifier.RefreshMovementSpeedModifiers(uid);
-    }
+        if (!_status.TryAddStatusEffectDuration(uid, StunId, duration))
+            return false;
 
-    private void OnSlowRemove(EntityUid uid, SlowedDownComponent component, ComponentShutdown args)
-    {
-        component.SprintSpeedModifier = 1f;
-        component.WalkSpeedModifier = 1f;
-        _movementSpeedModifier.RefreshMovementSpeedModifiers(uid);
+        OnStunnedSuccessfully(uid, duration);
+        return true;
     }
 
-    private void OnFrictionInit(Entity<FrictionStatusComponent> ent, ref ComponentInit args)
+    public bool TryUpdateStunDuration(EntityUid uid, TimeSpan? duration)
     {
-        _movementSpeedModifier.RefreshFrictionModifiers(ent);
+        if (!_status.TryUpdateStatusEffectDuration(uid, StunId, duration))
+            return false;
+
+        OnStunnedSuccessfully(uid, duration);
+        return true;
     }
 
-    private void OnFrictionRemove(Entity<FrictionStatusComponent> ent, ref ComponentShutdown args)
+    private void OnStunnedSuccessfully(EntityUid uid, TimeSpan? duration)
     {
-        ent.Comp.FrictionModifier = 1f;
-        ent.Comp.AccelerationModifier = 1f;
-        _movementSpeedModifier.RefreshFrictionModifiers(ent);
-    }
+        var ev = new StunnedEvent(); // todo: rename event or change how it is raised - this event is raised each time duration of stun was externally changed
+        RaiseLocalEvent(uid, ref ev);
 
-    // TODO STUN: Make events for different things. (Getting modifiers, attempt events, informative events...)
+        var timeForLogs = duration.HasValue
+            ? duration.Value.Seconds.ToString()
+            : "Infinite";
+        _adminLogger.Add(LogType.Stamina, LogImpact.Medium, $"{ToPrettyString(uid):user} stunned for {timeForLogs} seconds");
+    }
 
-    /// <summary>
-    ///     Stuns the entity, disallowing it from doing many interactions temporarily.
-    /// </summary>
-    public bool TryStun(EntityUid uid, TimeSpan time, bool refresh,
-        StatusEffectsComponent? status = null, bool force = false)
+    public bool TryAddKnockdownDuration(EntityUid uid, TimeSpan duration)
     {
-        if (time <= TimeSpan.Zero)
+        if (!_status.TryAddStatusEffectDuration(uid, KnockdownId, duration))
             return false;
 
-        if (!Resolve(uid, ref status, false))
-            return false;
+        TryKnockdown(uid, duration, true, force: true);
 
-        var beforeStun = new BeforeStunEvent();
-        RaiseLocalEvent(uid, ref beforeStun);
+        return true;
 
-        if (beforeStun.Cancelled && !force)
-            return false;
+    }
 
-        if (!_statusEffect.TryAddStatusEffect<StunnedComponent>(uid, "Stun", time, refresh))
+    public bool TryUpdateKnockdownDuration(EntityUid uid, TimeSpan? duration)
+    {
+        if (!_status.TryUpdateStatusEffectDuration(uid, KnockdownId, duration))
             return false;
 
-        var ev = new StunnedEvent();
-        RaiseLocalEvent(uid, ref ev);
-
-        _adminLogger.Add(LogType.Stamina, LogImpact.Medium, $"{ToPrettyString(uid):user} stunned for {time.Seconds} seconds");
-        return true;
+        return TryKnockdown(uid, duration, true, force: true);
     }
 
     /// <summary>
     ///     Knocks down the entity, making it fall to the ground.
     /// </summary>
-    public bool TryKnockdown(EntityUid uid, TimeSpan time, bool refresh, bool autoStand = true, StatusEffectsComponent? status = null, bool force = false)
+    public bool TryKnockdown(Entity<StandingStateComponent?> entity, TimeSpan? time, bool refresh, bool autoStand = true, bool drop = true, bool force = false)
     {
         if (time <= TimeSpan.Zero)
             return false;
 
-        if (!Resolve(uid, ref status, false))
+        // Can't fall down if you can't actually be downed.
+        if (!Resolve(entity, ref entity.Comp, false))
             return false;
 
-        if (!_statusEffect.CanApplyEffect(uid, "KnockedDown", status))
-            return false;
+        if (!force)
+        {
+            var evAttempt = new KnockDownAttemptEvent(autoStand, drop);
+            RaiseLocalEvent(entity, ref evAttempt);
 
-        var beforeKnockdown = new BeforeKnockdownEvent();
-        RaiseLocalEvent(uid, beforeKnockdown);
+            if (evAttempt.Cancelled)
+                return false;
 
-        if (beforeKnockdown.Cancelled && !force)
-            return false;
+            autoStand = evAttempt.AutoStand;
+            drop = evAttempt.Drop;
+        }
 
-        var evAttempt = new KnockDownAttemptEvent()
-        {
-            AutoStand = autoStand,
-        };
-        RaiseLocalEvent(uid, ref evAttempt);
+        Knockdown(entity!, time, refresh, autoStand, drop);
 
-        if (evAttempt.Cancelled)
-            return false;
+        return true;
+    }
 
+    private void Knockdown(Entity<StandingStateComponent> entity, TimeSpan? time, bool refresh, bool autoStand, bool drop)
+    {
         // Initialize our component with the relevant data we need if we don't have it
-        if (EnsureComp<KnockedDownComponent>(uid, out var component))
+        if (EnsureComp<KnockedDownComponent>(entity, out var component))
         {
-            RefreshKnockedMovement((uid, component));
-            CancelKnockdownDoAfter((uid, component));
+            RefreshKnockedMovement((entity, component));
+            CancelKnockdownDoAfter((entity, component));
         }
         else
         {
+            // Only drop items the first time we want to fall...
+            if (drop)
+            {
+                var ev = new DropHandItemsEvent();
+                RaiseLocalEvent(entity, ref ev);
+            }
+
             // Only update Autostand value if it's our first time being knocked down...
-            ToggleAutoStand((uid, component), evAttempt.AutoStand);
+            SetAutoStand((entity, component), autoStand);
         }
 
         var knockedEv = new KnockedDownEvent(time);
-        RaiseLocalEvent(uid, ref knockedEv);
-
-        RefreshKnockdownTime((uid, component), knockedEv.Time, refresh);
-
-        Alerts.ShowAlert(uid, KnockdownAlert, null, (GameTiming.CurTime, component.NextUpdate));
+        RaiseLocalEvent(entity, ref knockedEv);
 
-        _adminLogger.Add(LogType.Stamina, LogImpact.Medium, $"{ToPrettyString(uid):user} knocked down for {time.Seconds} seconds");
+        if (time != null)
+        {
+            UpdateKnockdownTime((entity, component), time.Value, refresh);
+            _adminLogger.Add(LogType.Stamina, LogImpact.Medium, $"{ToPrettyString(entity):user} knocked down for {time.Value.Seconds} seconds");
+        }
+        else
+            _adminLogger.Add(LogType.Stamina, LogImpact.Medium, $"{ToPrettyString(entity):user} knocked down for an indefinite amount of time");
 
-        return true;
+        Alerts.ShowAlert(entity, KnockdownAlert, null, (GameTiming.CurTime, component.NextUpdate));
     }
 
-    /// <summary>
-    ///     Applies knockdown and stun to the entity temporarily.
-    /// </summary>
-    public bool TryParalyze(EntityUid uid, TimeSpan time, bool refresh,
-        StatusEffectsComponent? status = null, bool force = false)
+    public bool TryAddParalyzeDuration(EntityUid uid, TimeSpan duration)
     {
-        if (!Resolve(uid, ref status, false))
-            return false;
+        var knockdown = TryAddKnockdownDuration(uid, duration);
+        var stunned = TryAddStunDuration(uid, duration);
 
-        return TryKnockdown(uid, time, refresh, true, status, force) && TryStun(uid, time, refresh, status, force);
+        return knockdown || stunned;
     }
 
-    /// <summary>
-    ///     Slows down the mob's walking/running speed temporarily
-    /// </summary>
-    public bool TrySlowdown(EntityUid uid, TimeSpan time, bool refresh,
-        float walkSpeedMod = 1f, float sprintSpeedMod = 1f,
-        StatusEffectsComponent? status = null)
+    public bool TryUpdateParalyzeDuration(EntityUid uid, TimeSpan? duration)
     {
-        if (!Resolve(uid, ref status, false))
-            return false;
-
-        if (time <= TimeSpan.Zero)
-            return false;
-
-        if (_statusEffect.TryAddStatusEffect<SlowedDownComponent>(uid, "SlowedDown", time, refresh, status))
-        {
-            var slowed = Comp<SlowedDownComponent>(uid);
-            // Doesn't make much sense to have the "TrySlowdown" method speed up entities now does it?
-            walkSpeedMod = Math.Clamp(walkSpeedMod, 0f, 1f);
-            sprintSpeedMod = Math.Clamp(sprintSpeedMod, 0f, 1f);
-
-            slowed.WalkSpeedModifier *= walkSpeedMod;
-            slowed.SprintSpeedModifier *= sprintSpeedMod;
-
-            _movementSpeedModifier.RefreshMovementSpeedModifiers(uid);
-            return true;
-        }
+        var knockdown = TryUpdateKnockdownDuration(uid, duration);
+        var stunned = TryUpdateStunDuration(uid, duration);
 
-        return false;
+        return knockdown || stunned;
     }
 
-    public bool TryFriction(EntityUid uid,
-        TimeSpan time,
-        bool refresh,
-        float friction,
-        float acceleration,
-        StatusEffectsComponent? status = null)
+    public bool TryUnstun(Entity<StunnedComponent?> entity)
     {
-        if (!Resolve(uid, ref status, false))
-            return false;
-
-        if (time <= TimeSpan.Zero)
-            return false;
-
-        if (!_statusEffect.TryAddStatusEffect<FrictionStatusComponent>(uid, "Friction", time, refresh, status))
-            return false;
-
-        var frictionStatus = Comp<FrictionStatusComponent>(uid);
-
-        frictionStatus.FrictionModifier *= friction;
-        frictionStatus.AccelerationModifier *= acceleration;
+        if (!Resolve(entity, ref entity.Comp, logMissing: false))
+            return true;
 
-        _movementSpeedModifier.RefreshFrictionModifiers(uid);
+        var ev = new StunEndAttemptEvent();
+        RaiseLocalEvent(entity, ref ev);
 
-        return true;
+        return !ev.Cancelled && RemComp<StunnedComponent>(entity);
     }
 
-    /// <summary>
-    /// Updates the movement speed modifiers of an entity by applying or removing the <see cref="SlowedDownComponent"/>.
-    /// If both walk and run modifiers are approximately 1 (i.e. normal speed) and <see cref="StaminaComponent.StaminaDamage"/> is 0,
-    /// or if the both modifiers are 0, the slowdown component is removed to restore normal movement.
-    /// Otherwise, the slowdown component is created or updated with the provided modifiers,
-    /// and the movement speed is refreshed accordingly.
-    /// </summary>
-    /// <param name="ent">Entity whose movement speed should be updated.</param>
-    /// <param name="walkSpeedModifier">New walk speed modifier. Default is 1f (normal speed).</param>
-    /// <param name="runSpeedModifier">New run (sprint) speed modifier. Default is 1f (normal speed).</param>
-    public void UpdateStunModifiers(Entity<StaminaComponent?> ent,
-        float walkSpeedModifier = 1f,
-        float runSpeedModifier = 1f)
+    private void OnStunEffectApplied(Entity<StunnedStatusEffectComponent> entity, ref StatusEffectAppliedEvent args)
     {
-        if (!Resolve(ent, ref ent.Comp))
+        if (GameTiming.ApplyingState)
             return;
 
-        if (
-            (MathHelper.CloseTo(walkSpeedModifier, 1f) && MathHelper.CloseTo(runSpeedModifier, 1f) && ent.Comp.StaminaDamage == 0f) ||
-            (walkSpeedModifier == 0f && runSpeedModifier == 0f)
-        )
-        {
-            RemComp<SlowedDownComponent>(ent);
-            return;
-        }
-
-        EnsureComp<SlowedDownComponent>(ent, out var comp);
-
-        comp.WalkSpeedModifier = walkSpeedModifier;
-
-        comp.SprintSpeedModifier = runSpeedModifier;
-
-        _movementSpeedModifier.RefreshMovementSpeedModifiers(ent);
-
-        Dirty(ent);
+        EnsureComp<StunnedComponent>(args.Target);
     }
 
-    /// <summary>
-    /// A convenience overload of <see cref="UpdateStunModifiers(EntityUid, float, float, StaminaComponent?)"/> that sets both
-    /// walk and run speed modifiers to the same value.
-    /// </summary>
-    /// <param name="ent">Entity whose movement speed should be updated.</param>
-    /// <param name="speedModifier">New walk and run speed modifier. Default is 1f (normal speed).</param>
-    /// <param name="component">
-    /// Optional <see cref="StaminaComponent"/> of the entity.
-    /// </param>
-    public void UpdateStunModifiers(Entity<StaminaComponent?> ent, float speedModifier = 1f)
+    private void OnStunStatusRemoved(Entity<StunnedStatusEffectComponent> entity, ref StatusEffectRemovedEvent args)
     {
-        UpdateStunModifiers(ent, speedModifier, speedModifier);
+        TryUnstun(args.Target);
     }
 
-    #region friction and movement listeners
-
-    private void OnRefreshMovespeed(EntityUid ent, SlowedDownComponent comp, RefreshMovementSpeedModifiersEvent args)
+    private void OnStunEndAttempt(Entity<StunnedStatusEffectComponent> entity, ref StatusEffectRelayedEvent<StunEndAttemptEvent> args)
     {
-        args.ModifySpeed(comp.WalkSpeedModifier, comp.SprintSpeedModifier);
-    }
+        if (args.Args.Cancelled)
+            return;
 
-    private void OnRefreshFrictionStatus(Entity<FrictionStatusComponent> ent, ref RefreshFrictionModifiersEvent args)
-    {
-        args.ModifyFriction(ent.Comp.FrictionModifier);
-        args.ModifyAcceleration(ent.Comp.AccelerationModifier);
+        var ev = args.Args;
+        ev.Cancelled = true;
+        args.Args = ev;
     }
 
-    private void OnRefreshTileFrictionStatus(Entity<FrictionStatusComponent> ent, ref TileFrictionEvent args)
+    private void OnStandUpAttempt(Entity<KnockdownStatusEffectComponent> entity, ref StatusEffectRelayedEvent<StandUpAttemptEvent> args)
     {
-        args.Modifier *= ent.Comp.FrictionModifier;
-    }
+        if (args.Args.Cancelled)
+            return;
 
-    #endregion
+        var ev = args.Args;
+        ev.Cancelled = true;
+        args.Args = ev;
+    }
 
     #region Attempt Event Handling
 
@@ -412,24 +330,3 @@ private void OnUnequipAttempt(EntityUid uid, StunnedComponent stunned, IsUnequip
 
     #endregion
 }
-
-/// <summary>
-///     Raised before stun is dealt to allow other systems to cancel it.
-/// </summary>
-[ByRefEvent]
-public record struct BeforeStunEvent(bool Cancelled = false);
-
-/// <summary>
-///     Raised before knockdown is dealt to allow other systems to cancel it.
-/// </summary>
-public sealed class BeforeKnockdownEvent: EntityEventArgs, IInventoryRelayEvent
-{
-    public SlotFlags TargetSlots { get; } = ~SlotFlags.POCKET;
-
-    public bool Cancelled;
-
-    public BeforeKnockdownEvent(bool cancelled = false)
-    {
-        Cancelled = cancelled;
-    }
-}
diff --git a/Content.Shared/Stunnable/SlowedDownComponent.cs b/Content.Shared/Stunnable/SlowedDownComponent.cs
deleted file mode 100644
index c4822b1eae1d..000000000000
--- a/Content.Shared/Stunnable/SlowedDownComponent.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Stunnable;
-
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SharedStunSystem))]
-public sealed partial class SlowedDownComponent : Component
-{
-    [ViewVariables, DataField("sprintSpeedModifier"), AutoNetworkedField]
-    public float SprintSpeedModifier = 0.5f;
-
-    [ViewVariables, DataField("walkSpeedModifier"), AutoNetworkedField]
-    public float WalkSpeedModifier = 0.5f;
-}
diff --git a/Content.Shared/Stunnable/StunnableEvents.cs b/Content.Shared/Stunnable/StunnableEvents.cs
index 5b171f0e9c03..f4a0191c92c1 100644
--- a/Content.Shared/Stunnable/StunnableEvents.cs
+++ b/Content.Shared/Stunnable/StunnableEvents.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Alert;
 using Content.Shared.DoAfter;
+using Content.Shared.Popups;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Stunnable;
@@ -15,19 +16,26 @@ namespace Content.Shared.Stunnable;
 public record struct StunnedEvent;
 
 /// <summary>
-///     Raised directed on an entity when it is knocked down.
+///     Raised on a stunned entity when something wants to remove the stunned component.
+/// </summary>
+[ByRefEvent]
+public record struct StunEndAttemptEvent(bool Cancelled);
+
+/// <summary>
+///     Raised directed on an entity before it is knocked down to see if it should be cancelled, and to determine
+///     knocked down arguments.
 /// </summary>
 [ByRefEvent]
-public record struct KnockDownAttemptEvent(bool Cancelled = false)
+public record struct KnockDownAttemptEvent(bool AutoStand, bool Drop)
 {
-    public bool AutoStand;
+    public bool Cancelled;
 }
 
 /// <summary>
 ///     Raised directed on an entity when it is knocked down.
 /// </summary>
 [ByRefEvent]
-public record struct KnockedDownEvent(TimeSpan Time);
+public record struct KnockedDownEvent(TimeSpan? Time);
 
 /// <summary>
 ///     Raised on an entity that needs to refresh its knockdown modifiers
@@ -42,21 +50,46 @@ public record struct KnockedDownRefreshEvent()
 /// <summary>
 ///     Raised directed on an entity when it tries to stand up
 /// </summary>
+/// <param name="Autostand">If the attempt was cancelled, passes a recommended value to change autostand to.</param>
+[ByRefEvent]
+public record struct StandUpAttemptEvent(bool Autostand)
+{
+    public bool Cancelled = false;
+
+    // Popup data to display to the entity if we so desire...
+    public (string, PopupType)? Message = null;
+}
+
+/// <summary>
+/// Raises the default DoAfterTime for a stand-up attempt for other components to modify it.
+/// </summary>
+/// <param name="DoAfterTime"></param>
 [ByRefEvent]
-public record struct StandUpAttemptEvent(bool Cancelled);
+public record struct GetStandUpTimeEvent(TimeSpan DoAfterTime);
 
+/// <summary>
+/// Raised when an entity is forcing itself to stand, allows for the stamina damage it is taking to be modified.
+/// This is raised before the stamina damage is taken so it can still fail if the entity does not have enough stamina.
+/// </summary>
+/// <param name="Stamina">The stamina damage the entity will take when it forces itself to stand.</param>
 [ByRefEvent]
-public record struct StandUpArgsEvent(TimeSpan DoAfterTime);
+public record struct TryForceStandEvent(float Stamina);
 
 /// <summary>
 ///     Raised when you click on the Knocked Down Alert
 /// </summary>
 public sealed partial class KnockedDownAlertEvent : BaseAlertEvent;
 
+/// <summary>
+/// The DoAfterEvent for trying to stand the slow and boring way.
+/// </summary>
 [ByRefEvent]
 [Serializable, NetSerializable]
 public sealed partial class TryStandDoAfterEvent : SimpleDoAfterEvent;
 
+/// <summary>
+/// An event sent by the client to the server to ask it very nicely to perform a forced stand-up.
+/// </summary>
 [Serializable, NetSerializable]
 public sealed class ForceStandUpEvent : EntityEventArgs;
 
diff --git a/Content.Shared/Stunnable/StunnedComponent.cs b/Content.Shared/Stunnable/StunnedComponent.cs
index 037a3cd3ac07..8fb53e1a6842 100644
--- a/Content.Shared/Stunnable/StunnedComponent.cs
+++ b/Content.Shared/Stunnable/StunnedComponent.cs
@@ -2,5 +2,8 @@
 
 namespace Content.Shared.Stunnable;
 
+/// <summary>
+/// This is used to temporarily prevent an entity from moving or acting.
+/// </summary>
 [RegisterComponent, NetworkedComponent, Access(typeof(SharedStunSystem))]
 public sealed partial class StunnedComponent : Component;
diff --git a/Content.Shared/Stunnable/StunnedStatusEffectComponent.cs b/Content.Shared/Stunnable/StunnedStatusEffectComponent.cs
new file mode 100644
index 000000000000..62b34967e5c5
--- /dev/null
+++ b/Content.Shared/Stunnable/StunnedStatusEffectComponent.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Stunnable;
+
+/// <summary>
+/// Stun as a status effect.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedStunSystem))]
+public sealed partial class StunnedStatusEffectComponent : Component;
diff --git a/Content.Shared/Throwing/ThrowingSystem.cs b/Content.Shared/Throwing/ThrowingSystem.cs
index c2afa13e9fcb..ceb9cf8bfb2b 100644
--- a/Content.Shared/Throwing/ThrowingSystem.cs
+++ b/Content.Shared/Throwing/ThrowingSystem.cs
@@ -223,7 +223,7 @@ public void TryThrow(EntityUid uid,
 
         // Give thrower an impulse in the other direction
         if (pushbackRatio == 0.0f ||
-            !(physics.Mass > 0f) ||
+            physics.Mass == 0f ||
             !TryComp(user.Value, out PhysicsComponent? userPhysics))
             return;
         var msg = new ThrowPushbackAttemptEvent();
@@ -236,7 +236,7 @@ public void TryThrow(EntityUid uid,
         RaiseLocalEvent(user.Value, ref pushEv);
         const float massLimit = 5f;
 
-        if (pushEv.Push || _gravity.IsWeightless(user.Value)) // TODO: Make IsWeightless Event Based
+        if (pushEv.Push || _gravity.IsWeightless(user.Value))
             _physics.ApplyLinearImpulse(user.Value, -impulseVector / physics.Mass * pushbackRatio * MathF.Min(massLimit, physics.Mass), body: userPhysics);
     }
 }
diff --git a/Content.Shared/Tiles/ProtectedGridSystem.cs b/Content.Shared/Tiles/ProtectedGridSystem.cs
index 0d6f5b7a6dae..f90b0a52de4f 100644
--- a/Content.Shared/Tiles/ProtectedGridSystem.cs
+++ b/Content.Shared/Tiles/ProtectedGridSystem.cs
@@ -62,7 +62,7 @@ private void OnFloorTileAttempt(Entity<ProtectedGridComponent> ent, ref FloorTil
             return;
         }
 
-        if (SharedMapSystem.FromBitmask(args.GridIndices, data))
+        if (!SharedMapSystem.FromBitmask(args.GridIndices, data))
         {
             args.Cancelled = true;
         }
diff --git a/Content.Shared/Tools/Components/WelderComponent.cs b/Content.Shared/Tools/Components/WelderComponent.cs
index 3c78a03fdeb1..3499682afe41 100644
--- a/Content.Shared/Tools/Components/WelderComponent.cs
+++ b/Content.Shared/Tools/Components/WelderComponent.cs
@@ -1,58 +1,84 @@
-using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
 using Content.Shared.Tools.Systems;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Tools.Components;
 
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true), Access(typeof(SharedToolSystem))]
+/// <summary>
+/// Handles fuel consumption for the tool and allows it to explode welding fuel tanks.
+/// </summary>
+/// <summary>
+/// TODO: De-hardcode welder bombing.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true), AutoGenerateComponentPause]
+[Access(typeof(SharedToolSystem))]
 public sealed partial class WelderComponent : Component
 {
+    /// <summary>
+    /// Is the welder currently enabled?
+    /// </summary>
     [DataField, AutoNetworkedField]
     public bool Enabled;
 
+    /// <summary>
+    /// Timestamp for the next update loop update.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan NextUpdate;
+
+    /// <summary>
+    /// Delay between updates.
+    /// </summary>
     [DataField]
-    public float WelderTimer;
+    public TimeSpan WelderUpdateTimer = TimeSpan.FromSeconds(1);
 
     /// <summary>
-    ///     Name of <see cref="FuelSolution"/>.
+    /// Name of the fuel solution.
     /// </summary>
     [DataField]
     public string FuelSolutionName = "Welder";
 
     /// <summary>
-    ///     Reagent that will be used as fuel for welding.
+    /// Reagent that will be used as fuel for welding.
     /// </summary>
     [DataField]
     public ProtoId<ReagentPrototype> FuelReagent = "WeldingFuel";
 
     /// <summary>
-    ///     Fuel consumption per second while the welder is active.
+    /// Fuel consumption per second while the welder is active.
+    /// In u/s
     /// </summary>
     [DataField, AutoNetworkedField]
     public FixedPoint2 FuelConsumption = FixedPoint2.New(1.0f);
 
     /// <summary>
-    ///     A fuel amount to be consumed when the welder goes from being unlit to being lit.
+    /// A fuel amount to be consumed when the welder goes from being unlit to being lit.
     /// </summary>
     [DataField, AutoNetworkedField]
     public FixedPoint2 FuelLitCost = FixedPoint2.New(0.5f);
 
     /// <summary>
-    ///     Sound played when refilling the welder.
+    /// Sound played when refilling the welder.
     /// </summary>
     [DataField]
     public SoundSpecifier WelderRefill = new SoundPathSpecifier("/Audio/Effects/refill.ogg");
 
     /// <summary>
-    ///     Whether the item is safe to refill while lit without exploding the tank.
+    /// Whether the item is safe to refill while lit without exploding the tank.
     /// </summary>
     [DataField]
     public bool TankSafe;
 
+    /// <summary>
+    /// STARLIGHT
+    /// Field to make the damned welder system stop interfering even when turned off as an omnitool
+    /// This stops all welder systems from activating and preventing tool use.
+    /// </summary>
     [DataField]
-    public float WelderUpdateTimer = 1f;
+    public bool ComponentActive = true;
 }
diff --git a/Content.Shared/Tools/Systems/SharedToolSystem.MultipleTool.cs b/Content.Shared/Tools/Systems/SharedToolSystem.MultipleTool.cs
index 384cdd4460ee..ea02f4ae90b7 100644
--- a/Content.Shared/Tools/Systems/SharedToolSystem.MultipleTool.cs
+++ b/Content.Shared/Tools/Systems/SharedToolSystem.MultipleTool.cs
@@ -2,6 +2,8 @@
 using Content.Shared.Interaction;
 using Content.Shared.Prying.Components;
 using Content.Shared.Tools.Components;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
 
 namespace Content.Shared.Tools.Systems;
 
@@ -77,6 +79,22 @@ public virtual void SetMultipleTool(EntityUid uid,
             pryComp.Enabled = current.Behavior.Contains("Prying");
         }
 
+        /// STARLIGHT Start
+        /// Fix to set welder component state when said state is not in use.
+        /// Prevents ToolSystem.Welder from screwing with other tools
+        if (TryComp<WelderComponent>(uid, out var weldComp))
+        {
+            if (multiple.CurrentQualityName.ToLower().Contains("welding"))
+            {
+                weldComp.ComponentActive = true;
+            }
+            else
+            {
+                weldComp.ComponentActive = false;
+            }
+        }
+        // STARLIGHT End
+
         if (playSound && current.ChangeSound != null)
             _audioSystem.PlayPredicted(current.ChangeSound, uid, user);
 
diff --git a/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs b/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs
index af1dc85137ed..123494bb3721 100644
--- a/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs
+++ b/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs
@@ -17,13 +17,16 @@ public abstract partial class SharedToolSystem
 
     public void InitializeWelder()
     {
+        SubscribeLocalEvent<WelderComponent, MapInitEvent>(OnWelderInit);
         SubscribeLocalEvent<WelderComponent, ExaminedEvent>(OnWelderExamine);
         SubscribeLocalEvent<WelderComponent, AfterInteractEvent>(OnWelderAfterInteract);
 
-        SubscribeLocalEvent<WelderComponent, ToolUseAttemptEvent>((uid, comp, ev) => {
+        SubscribeLocalEvent<WelderComponent, ToolUseAttemptEvent>((uid, comp, ev) =>
+        {
             CanCancelWelderUse((uid, comp), ev.User, ev.Fuel, ev);
         });
-        SubscribeLocalEvent<WelderComponent, DoAfterAttemptEvent<ToolDoAfterEvent>>((uid, comp, ev) => {
+        SubscribeLocalEvent<WelderComponent, DoAfterAttemptEvent<ToolDoAfterEvent>>((uid, comp, ev) =>
+        {
             CanCancelWelderUse((uid, comp), ev.Event.User, ev.Event.Fuel, ev);
         });
         SubscribeLocalEvent<WelderComponent, ToolDoAfterEvent>(OnWelderDoAfter);
@@ -31,6 +34,7 @@ public void InitializeWelder()
         SubscribeLocalEvent<WelderComponent, ItemToggledEvent>(OnToggle);
         SubscribeLocalEvent<WelderComponent, ItemToggleActivateAttemptEvent>(OnActivateAttempt);
         SubscribeLocalEvent<WelderComponent, ItemToggleDeactivateAttemptEvent>(OnDeactivateAttempt);
+        SubscribeLocalEvent<WelderComponent, ItemSwitchedEvent>(ToggleComponent);
     }
 
     public void TurnOn(Entity<WelderComponent> entity, EntityUid? user)
@@ -71,8 +75,16 @@ public void TurnOff(Entity<WelderComponent> entity, EntityUid? user)
         return (fuelSolution.GetTotalPrototypeQuantity(welder.FuelReagent), fuelSolution.MaxVolume);
     }
 
+    private void OnWelderInit(Entity<WelderComponent> ent, ref MapInitEvent args)
+    {
+        ent.Comp.NextUpdate = _timing.CurTime + ent.Comp.WelderUpdateTimer;
+        Dirty(ent);
+    }
+
     private void OnWelderExamine(Entity<WelderComponent> entity, ref ExaminedEvent args)
     {
+        if (ShouldWelderBuggerOff(entity))
+            return;
         using (args.PushGroup(nameof(WelderComponent)))
         {
             if (ItemToggle.IsActivated(entity.Owner))
@@ -99,6 +111,8 @@ private void OnWelderExamine(Entity<WelderComponent> entity, ref ExaminedEvent a
 
     private void OnWelderAfterInteract(Entity<WelderComponent> entity, ref AfterInteractEvent args)
     {
+        if (ShouldWelderBuggerOff(entity)) /// STARLIGHT
+            return;
         if (args.Handled)
             return;
 
@@ -133,6 +147,8 @@ private void OnWelderAfterInteract(Entity<WelderComponent> entity, ref AfterInte
 
     private void CanCancelWelderUse(Entity<WelderComponent> entity, EntityUid user, float requiredFuel, CancellableEntityEventArgs ev)
     {
+        if (ShouldWelderBuggerOff(entity)) /// STARLIGHT
+            return;
         if (!ItemToggle.IsActivated(entity.Owner))
         {
             _popup.PopupClient(Loc.GetString("welder-component-welder-not-lit-message"), entity, user);
@@ -150,6 +166,8 @@ private void CanCancelWelderUse(Entity<WelderComponent> entity, EntityUid user,
 
     private void OnWelderDoAfter(Entity<WelderComponent> ent, ref ToolDoAfterEvent args)
     {
+        if (ShouldWelderBuggerOff(ent)) //STARLIGHT
+            return;
         if (args.Cancelled)
             return;
 
@@ -169,7 +187,10 @@ private void OnToggle(Entity<WelderComponent> entity, ref ItemToggledEvent args)
 
     private void OnActivateAttempt(Entity<WelderComponent> entity, ref ItemToggleActivateAttemptEvent args)
     {
-        if (args.User != null && !_actionBlocker.CanComplexInteract(args.User.Value)) {
+        if (ShouldWelderBuggerOff(entity)) /// Starlight
+            return;
+        if (args.User != null && !_actionBlocker.CanComplexInteract(args.User.Value))
+        {
             args.Cancelled = true;
             return;
         }
@@ -191,9 +212,68 @@ private void OnActivateAttempt(Entity<WelderComponent> entity, ref ItemToggleAct
 
     private void OnDeactivateAttempt(Entity<WelderComponent> entity, ref ItemToggleDeactivateAttemptEvent args)
     {
-        if (args.User != null && !_actionBlocker.CanComplexInteract(args.User.Value)) {
+        if (args.User != null && !_actionBlocker.CanComplexInteract(args.User.Value))
+        {
             args.Cancelled = true;
-            return;
+        }
+    }
+
+    private void UpdateWelders()
+    {
+        var query = EntityQueryEnumerator<WelderComponent, SolutionContainerManagerComponent>();
+        var curTime = _timing.CurTime;
+        while (query.MoveNext(out var uid, out var welder, out var solutionContainer))
+        {
+            if (curTime < welder.NextUpdate)
+                continue;
+
+            welder.NextUpdate += welder.WelderUpdateTimer;
+            Dirty(uid, welder);
+
+            if (!welder.Enabled)
+                continue;
+
+            if (!SolutionContainerSystem.TryGetSolution((uid, solutionContainer), welder.FuelSolutionName, out var solutionComp, out var solution))
+                continue;
+
+            SolutionContainerSystem.RemoveReagent(solutionComp.Value, welder.FuelReagent, welder.FuelConsumption * welder.WelderUpdateTimer.TotalSeconds);
+
+            if (solution.GetTotalPrototypeQuantity(welder.FuelReagent) <= FixedPoint2.Zero)
+                ItemToggle.Toggle(uid);
+        }
+    }
+
+    /// <summary>
+    /// STARLIGHT
+    /// Method to cancel welder methods if the welder is deactivated as part of an omnitool or similar.
+    /// </summary>
+    /// <param name="entity"></param>
+    /// <returns></returns>
+    private bool ShouldWelderBuggerOff(Entity<WelderComponent> entity)
+    {
+        if (entity.Comp.ComponentActive == false)
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// STARLIGHT
+    /// Method to toggle the welder component off, to make ShouldWelderBuggerOff function.
+    /// </summary>
+    /// <param name="entity"></param>
+    /// <param name="args"></param>
+    private void ToggleComponent(Entity<WelderComponent> entity, ref ItemSwitchedEvent args)
+    {
+        if (args.State.ToLower().Contains("welding"))
+        {
+            entity.Comp.ComponentActive = true;
+        }
+        else
+        {
+            entity.Comp.ComponentActive = false;
         }
     }
 }
diff --git a/Content.Shared/Tools/Systems/SharedToolSystem.cs b/Content.Shared/Tools/Systems/SharedToolSystem.cs
index bf98a365e7b7..7051cfea00f1 100644
--- a/Content.Shared/Tools/Systems/SharedToolSystem.cs
+++ b/Content.Shared/Tools/Systems/SharedToolSystem.cs
@@ -12,12 +12,14 @@
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
+using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Tools.Systems;
 
 public abstract partial class SharedToolSystem : EntitySystem
 {
+    [Dependency] private   readonly IGameTiming _timing = default!;
     [Dependency] private   readonly IMapManager _mapManager = default!;
     [Dependency] private   readonly IPrototypeManager _protoMan = default!;
     [Dependency] protected readonly ISharedAdminLogManager AdminLogger = default!;
@@ -263,6 +265,13 @@ private bool CanStartToolUse(EntityUid tool, EntityUid user, EntityUid? target,
         return !beforeAttempt.Cancelled;
     }
 
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        UpdateWelders();
+    }
+
     #region DoAfterEvents
 
     [Serializable, NetSerializable]
diff --git a/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs b/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
index 62c8aabafd60..3fa6c9edfdda 100644
--- a/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
+++ b/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
@@ -28,6 +28,7 @@ public abstract partial class SharedVendingMachineSystem : EntitySystem
     [Dependency] protected readonly SharedAudioSystem Audio = default!;
     [Dependency] private   readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] protected readonly SharedPointLightSystem Light = default!;
+    [Dependency] protected readonly INetManager _net = default!; // 🌟Starlight🌟
     [Dependency] private   readonly SharedPowerReceiverSystem _receiver = default!;
     [Dependency] protected readonly SharedPopupSystem Popup = default!;
     [Dependency] private   readonly SharedSpeakOnUIClosedSystem _speakOn = default!;
@@ -47,6 +48,7 @@ public override void Initialize()
         Subs.BuiEvents<VendingMachineComponent>(VendingMachineUiKey.Key, subs =>
         {
             subs.Event<VendingMachineEjectMessage>(OnInventoryEjectMessage);
+            subs.Event<VendingMachineRequestBalanceMessage>(OnRequestBalanceMessage); // 🌟Starlight🌟
         });
     }
     
@@ -106,17 +108,33 @@ private void OnVendingGetState(Entity<VendingMachineComponent> entity, ref Compo
             contrabandInventory[weh.Key] = new(weh.Value);
         }
 
+    // 🌟Starlight🌟 Allow server-side systems to calculate prices
+    // If emagged for interaction, the machine becomes free
+    var isEmagged = _emag.CheckFlag(entity.Owner, EmagType.Interaction);
+    var showPricesNow = component.ShowPrices && !isEmagged;
+    CalculateInventoryPrices(inventory, showPricesNow);
+    CalculateInventoryPrices(emaggedInventory, showPricesNow);
+    CalculateInventoryPrices(contrabandInventory, showPricesNow);
+
         args.State = new VendingMachineComponentState()
         {
             Inventory = inventory,
             EmaggedInventory = emaggedInventory,
             ContrabandInventory = contrabandInventory,
             Contraband = component.Contraband,
+            ShowPrices = showPricesNow, // 🌟Starlight🌟
             EjectEnd = component.EjectEnd,
             DenyEnd = component.DenyEnd,
             DispenseOnHitEnd = component.DispenseOnHitEnd,
         };
     }
+    // 🌟Starlight🌟 
+    /// <summary>
+    /// Virtual method for calculating inventory prices. Override on server for actual pricing logic
+    /// </summary>
+    protected virtual void CalculateInventoryPrices(Dictionary<string, VendingMachineInventoryEntry> inventory, bool showPrices)
+    {
+    }
 
     public override void Update(float frameTime)
     {
@@ -161,8 +179,8 @@ public override void Update(float frameTime)
         }
     }
 
-    private void OnInventoryEjectMessage(Entity<VendingMachineComponent> entity, ref VendingMachineEjectMessage args)
-    {
+    protected virtual void OnInventoryEjectMessage(Entity<VendingMachineComponent> entity, ref VendingMachineEjectMessage args)
+    { 
         if (!_receiver.IsPowered(entity.Owner) || Deleted(entity))
             return;
 
@@ -172,6 +190,14 @@ private void OnInventoryEjectMessage(Entity<VendingMachineComponent> entity, ref
         AuthorizedVend(entity.Owner, actor, args.Type, args.ID, entity.Comp);
     }
 
+    /// <summary>
+    /// Handles balance request from client. Override on server to provide actual balance data
+    /// </summary>
+    //  Starlight-edit
+    protected virtual void OnRequestBalanceMessage(Entity<VendingMachineComponent> entity, ref VendingMachineRequestBalanceMessage args)
+    {
+    }
+
     protected virtual void OnMapInit(EntityUid uid, VendingMachineComponent component, MapInitEvent args)
     {
         RestockInventoryFromPrototype(uid, component, component.InitialStockQuality);
@@ -250,15 +276,16 @@ public void TryEjectVendorItem(EntityUid uid, InventoryType type, string itemId,
             return;
         }
 
-        // Start Ejecting, and prevent users from ordering while anim playing
+        // Start Ejecting, and prevent users from ordering while animation is playing
         vendComponent.EjectEnd = Timing.CurTime + vendComponent.EjectDelay;
         vendComponent.NextItemToEject = entry.ID;
         vendComponent.ThrowNextItem = throwItem;
+        // 🌟Starlight🌟 Reserve the item immediately to avoid multiple charges mapping to a single ejection on spam clicks
+        entry.Amount--; 
 
         if (TryComp(uid, out SpeakOnUIClosedComponent? speakComponent))
             _speakOn.TrySetFlag((uid, speakComponent));
 
-        entry.Amount--;
         Dirty(uid, vendComponent);
         UpdateUI((uid, vendComponent));
         TryUpdateVisualState((uid, vendComponent));
@@ -325,7 +352,7 @@ public void TryUpdateVisualState(Entity<VendingMachineComponent?> entity)
     /// <param name="type">The type of inventory the item is from</param>
     /// <param name="itemId">The prototype ID of the item</param>
     /// <param name="component"></param>
-    public void AuthorizedVend(EntityUid uid, EntityUid sender, InventoryType type, string itemId, VendingMachineComponent component)
+    public virtual void AuthorizedVend(EntityUid uid, EntityUid sender, InventoryType type, string itemId, VendingMachineComponent component) // Starlight-edit
     {
         if (IsAuthorized(uid, sender, component))
         {
diff --git a/Content.Shared/VendingMachines/VendingMachineComponent.cs b/Content.Shared/VendingMachines/VendingMachineComponent.cs
index d10a26d12472..8a6600c2bf61 100644
--- a/Content.Shared/VendingMachines/VendingMachineComponent.cs
+++ b/Content.Shared/VendingMachines/VendingMachineComponent.cs
@@ -1,7 +1,7 @@
 using Content.Shared.Actions;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes; //Starlight
+using Robust.Shared.Prototypes; // 🌟Starlight🌟 
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
@@ -48,6 +48,12 @@ public sealed partial class VendingMachineComponent : Component
         [DataField]
         public bool Contraband;
 
+        /// <summary>
+        /// If true, items in this vending machine will display prices. If false, items are free 
+        /// </summary>
+        [DataField]
+        public bool ShowPrices = true;
+
         [ViewVariables]
         public bool Ejecting => EjectEnd != null;
 
@@ -211,11 +217,15 @@ public sealed class VendingMachineInventoryEntry
         public string ID;
         [ViewVariables(VVAccess.ReadWrite)]
         public uint Amount;
-        public VendingMachineInventoryEntry(InventoryType type, string id, uint amount)
+        [ViewVariables(VVAccess.ReadWrite)]
+        public int Price; // 🌟Starlight🌟 
+    
+        public VendingMachineInventoryEntry(InventoryType type, string id, uint amount, int price = 0)
         {
             Type = type;
             ID = id;
             Amount = amount;
+            Price = price; // 🌟Starlight🌟 
         }
 
         public VendingMachineInventoryEntry(VendingMachineInventoryEntry entry)
@@ -223,6 +233,7 @@ public VendingMachineInventoryEntry(VendingMachineInventoryEntry entry)
             Type = entry.Type;
             ID = entry.ID;
             Amount = entry.Amount;
+            Price = entry.Price; // 🌟Starlight🌟 
         }
     }
 
@@ -294,6 +305,7 @@ public sealed class VendingMachineComponentState : ComponentState
         public Dictionary<string, VendingMachineInventoryEntry> ContrabandInventory = new();
 
         public bool Contraband;
+        public bool ShowPrices; // 🌟Starlight🌟
 
         public TimeSpan? EjectEnd;
 
diff --git a/Content.Shared/VendingMachines/VendingMachineInterfaceState.cs b/Content.Shared/VendingMachines/VendingMachineInterfaceState.cs
index 27651bb1cb4a..7b4e87075fe1 100644
--- a/Content.Shared/VendingMachines/VendingMachineInterfaceState.cs
+++ b/Content.Shared/VendingMachines/VendingMachineInterfaceState.cs
@@ -13,6 +13,29 @@ public VendingMachineEjectMessage(InventoryType type, string id)
             ID = id;
         }
     }
+    
+    // 🌟Starlight🌟 start
+    /// <summary>
+    /// Request balance information from server
+    /// </summary>
+    [Serializable, NetSerializable]
+    public sealed class VendingMachineRequestBalanceMessage : BoundUserInterfaceMessage
+    {
+    }
+
+    /// <summary>
+    /// Balance update from server to client
+    /// </summary>
+    [Serializable, NetSerializable]
+    public sealed class VendingMachineBalanceUpdateMessage : BoundUserInterfaceMessage
+    {
+        public readonly int Balance;
+        public VendingMachineBalanceUpdateMessage(int balance)
+        {
+            Balance = balance;
+        }
+    }
+    // 🌟Starlight🌟 end
 
     [Serializable, NetSerializable]
     public enum VendingMachineUiKey
diff --git a/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs b/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs
index 3add18365afd..562e006a9240 100644
--- a/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs
+++ b/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs
@@ -48,17 +48,17 @@ public void PlayHitSound(EntityUid targetUid, EntityUid? userUid, string? damage
         {
             if (damageType == null && damageSoundComp.NoDamageSound != null)
             {
-                _audio.PlayPredicted(damageSoundComp.NoDamageSound, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                _audio.PlayPredicted(damageSoundComp.NoDamageSound, coords, userUid, damageSoundComp.NoDamageSound.Params.WithVariation(DamagePitchVariation));
                 playedSound = true;
             }
             else if (damageType != null && damageSoundComp.SoundTypes?.TryGetValue(damageType, out var damageSoundType) == true)
             {
-                _audio.PlayPredicted(damageSoundType, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                _audio.PlayPredicted(damageSoundType, coords, userUid, damageSoundType.Params.WithVariation(DamagePitchVariation));
                 playedSound = true;
             }
             else if (damageType != null && damageSoundComp.SoundGroups?.TryGetValue(damageType, out var damageSoundGroup) == true)
             {
-                _audio.PlayPredicted(damageSoundGroup, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                _audio.PlayPredicted(damageSoundGroup, coords, userUid, damageSoundGroup.Params.WithVariation(DamagePitchVariation));
                 playedSound = true;
             }
         }
@@ -68,17 +68,17 @@ public void PlayHitSound(EntityUid targetUid, EntityUid? userUid, string? damage
         {
             if (hitSoundOverride != null)
             {
-                _audio.PlayPredicted(hitSoundOverride, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                _audio.PlayPredicted(hitSoundOverride, coords, userUid, hitSoundOverride.Params.WithVariation(DamagePitchVariation));
                 playedSound = true;
             }
             else if (hitSound != null)
             {
-                _audio.PlayPredicted(hitSound, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                _audio.PlayPredicted(hitSound, coords, userUid, hitSound.Params.WithVariation(DamagePitchVariation));
                 playedSound = true;
             }
             else
             {
-                _audio.PlayPredicted(noDamageSound, coords, userUid, AudioParams.Default.WithVariation(DamagePitchVariation));
+                _audio.PlayPredicted(noDamageSound, coords, userUid, noDamageSound.Params.WithVariation(DamagePitchVariation));
                 playedSound = true;
             }
         }
diff --git a/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs b/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs
index eaaf336e96bf..f1f9a19a75e8 100644
--- a/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs
+++ b/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs
@@ -97,7 +97,7 @@ private void ThrowOnHitHelper(Entity<MeleeThrowOnHitComponent> ent, EntityUid? u
         RaiseLocalEvent(target, ref startEvent);
 
         if (ent.Comp.StunTime != null)
-            _stun.TryParalyze(target, ent.Comp.StunTime.Value, false);
+            _stun.TryAddParalyzeDuration(target, ent.Comp.StunTime.Value);
 
         if (direction == Vector2.Zero)
             return;
diff --git a/Content.Shared/Weapons/Misc/ForceGunComponent.cs b/Content.Shared/Weapons/Misc/ForceGunComponent.cs
index f3aca0d4d08e..dc2481cb62ea 100644
--- a/Content.Shared/Weapons/Misc/ForceGunComponent.cs
+++ b/Content.Shared/Weapons/Misc/ForceGunComponent.cs
@@ -9,19 +9,13 @@ public sealed partial class ForceGunComponent : BaseForceGunComponent
     /// <summary>
     /// Maximum distance to throw entities.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("throwDistance"), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public float ThrowDistance = 15f;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("throwForce"), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public float ThrowForce = 30f;
 
-    /// <summary>
-    /// The entity currently tethered.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("tethered"), AutoNetworkedField]
-    public override EntityUid? Tethered { get; set; }
-
-    [ViewVariables(VVAccess.ReadWrite), DataField("soundLaunch")]
+    [DataField("soundLaunch")]
     public SoundSpecifier? LaunchSound = new SoundPathSpecifier("/Audio/Weapons/soup.ogg")
     {
         Params = AudioParams.Default.WithVolume(5f),
diff --git a/Content.Shared/Weapons/Misc/TetherGunComponent.cs b/Content.Shared/Weapons/Misc/TetherGunComponent.cs
index fcc549415439..bb9ebd4e435c 100644
--- a/Content.Shared/Weapons/Misc/TetherGunComponent.cs
+++ b/Content.Shared/Weapons/Misc/TetherGunComponent.cs
@@ -5,18 +5,6 @@ namespace Content.Shared.Weapons.Misc;
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
 public sealed partial class TetherGunComponent : BaseForceGunComponent
 {
-    [ViewVariables(VVAccess.ReadWrite), DataField("maxDistance"), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public float MaxDistance = 10f;
-
-    /// <summary>
-    /// The entity the tethered target has a joint to.
-    /// </summary>
-    [DataField("tetherEntity"), AutoNetworkedField]
-    public override EntityUid? TetherEntity { get; set; }
-
-    /// <summary>
-    /// The entity currently tethered.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("tethered"), AutoNetworkedField]
-    public override EntityUid? Tethered { get; set; }
 }
diff --git a/Content.Shared/Weapons/Ranged/Components/BatteryWeaponFireModesComponent.cs b/Content.Shared/Weapons/Ranged/Components/BatteryWeaponFireModesComponent.cs
index a2178a50b536..8aa4b098fc9c 100644
--- a/Content.Shared/Weapons/Ranged/Components/BatteryWeaponFireModesComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/BatteryWeaponFireModesComponent.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Weapons.Ranged.Systems;
+using Content.Shared._Starlight.Weapons.Ranged.Components; // Starlight-edit
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs b/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs
index 1702ba52d565..3171a4c12c9f 100644
--- a/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs
@@ -11,8 +11,10 @@
 using Content.Shared.Verbs;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
+using Content.Shared._Starlight.Weapons.Ranged.Components; // Starlight-edit
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Network; // Starlight-edit
 
 namespace Content.Shared.Weapons.Ranged.Systems;
 
@@ -23,6 +25,7 @@ public sealed class BatteryWeaponFireModesSystem : EntitySystem
     [Dependency] private readonly AccessReaderSystem _accessReaderSystem = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
     [Dependency] private readonly SharedItemSystem _item = default!;
+    [Dependency] private readonly INetManager _net = default!; // Starlight-edit
 
     public override void Initialize()
     {
@@ -31,8 +34,8 @@ public override void Initialize()
         SubscribeLocalEvent<BatteryWeaponFireModesComponent, UseInHandEvent>(OnUseInHandEvent);
         SubscribeLocalEvent<BatteryWeaponFireModesComponent, GetVerbsEvent<Verb>>(OnGetVerb);
         SubscribeLocalEvent<BatteryWeaponFireModesComponent, ExaminedEvent>(OnExamined);
-        SubscribeLocalEvent<BatteryWeaponFireModesComponent, ActivateInWorldEvent>(OnInteractHandEvent);
-        SubscribeLocalEvent<BatteryWeaponFireModesComponent, AttemptShootEvent>(OnShootAttempt);
+        SubscribeLocalEvent<BatteryWeaponFireModesComponent, ActivateInWorldEvent>(OnInteractHandEvent); // Starlight-edit
+        SubscribeLocalEvent<BatteryWeaponFireModesComponent, AttemptShootEvent>(OnShootAttempt); // Starlight-edit
     }
 
     private void OnExamined(EntityUid uid, BatteryWeaponFireModesComponent component, ExaminedEvent args)
@@ -42,6 +45,7 @@ private void OnExamined(EntityUid uid, BatteryWeaponFireModesComponent component
 
         var fireMode = GetMode(component);
 
+        // Starlight-start
         if (TryGetAmmoProvider(uid, out var ammoProvider) && ammoProvider != null)
         {
             if (ammoProvider is ProjectileBatteryAmmoProviderComponent projectileAmmo)
@@ -59,8 +63,10 @@ private void OnExamined(EntityUid uid, BatteryWeaponFireModesComponent component
                 args.PushMarkup(Loc.GetString("gun-set-fire-mode", ("mode", hitscan.Name)));
             }
         }
+        // Starlight-end
     }
 
+    private BatteryWeaponFireMode GetMode(BatteryWeaponFireModesComponent component) => component.FireModes[component.CurrentFireMode]; // Starlight-edit: Lambda
 
     private void OnGetVerb(EntityUid uid, BatteryWeaponFireModesComponent component, GetVerbsEvent<Verb> args)
     {
@@ -76,7 +82,7 @@ private void OnGetVerb(EntityUid uid, BatteryWeaponFireModesComponent component,
         if (!_accessReaderSystem.IsAllowed(args.User, uid))
             return;
 
-        if (!TryGetAmmoProvider(uid, out var ammoProvider) && ammoProvider == null)
+        if (!TryGetAmmoProvider(uid, out var ammoProvider) && ammoProvider == null) // Starlight-edit
             return;
 
         for (var i = 0; i < component.FireModes.Count; i++)
@@ -84,19 +90,7 @@ private void OnGetVerb(EntityUid uid, BatteryWeaponFireModesComponent component,
             var fireMode = component.FireModes[i];
             var index = i;
 
-            if (fireMode.Conditions != null)
-            {
-                var conditionArgs = new FireModeConditionConditionArgs(args.User, args.Target, fireMode, EntityManager);
-                var conditionsMet = fireMode.Conditions.All(condition => condition.Condition(conditionArgs));
-
-                if (!conditionsMet)
-                {
-                    if (component.CurrentFireMode == index)
-                        SetFireMode(uid, component, 0, args.User);
-                    continue;
-                }
-            }
-
+            // Starlight-start
             if (ammoProvider is ProjectileBatteryAmmoProviderComponent projectileAmmo)
             {
                 var entProto = _prototypeManager.Index<EntityPrototype>(fireMode.Prototype);
@@ -137,17 +131,18 @@ private void OnGetVerb(EntityUid uid, BatteryWeaponFireModesComponent component,
 
                 args.Verbs.Add(v);
             }
+            // Starlight-end
         }
     }
 
     private void OnUseInHandEvent(EntityUid uid, BatteryWeaponFireModesComponent component, UseInHandEvent args)
     {
-		//starlight
-        if(args.Handled)
+        //starlight
+        if (args.Handled)
             return;
 
         args.Handled = true;
-		//starlight end
+        //starlight end
         TryCycleFireMode(uid, component, args.User);
     }
 
@@ -175,10 +170,26 @@ public bool TrySetFireMode(EntityUid uid, BatteryWeaponFireModesComponent compon
 
     private void SetFireMode(EntityUid uid, BatteryWeaponFireModesComponent component, int index, EntityUid? user = null)
     {
+        // Starlight-start
+        if (_net.IsClient)
+            return; // Why? Conditions is server side only, we can't fully move this to server, so we just drop client here
+
         var fireMode = component.FireModes[index];
+
+        if (fireMode.Conditions != null && user != null)
+        {
+            var conditionArgs = new FireModeConditionConditionArgs(user.Value, uid, fireMode, EntityManager);
+            var conditionsMet = fireMode.Conditions.All(condition => condition.Condition(conditionArgs));
+
+            if (!conditionsMet)
+                return;
+        }
+        // Starlight-end
+
         component.CurrentFireMode = index;
         Dirty(uid, component);
 
+        // Starlight-start
         if (TryGetAmmoProvider(uid, out var ammoProvider) && ammoProvider != null)
         {
             if (ammoProvider is ProjectileBatteryAmmoProviderComponent projectileAmmo)
@@ -195,8 +206,8 @@ private void SetFireMode(EntityUid uid, BatteryWeaponFireModesComponent componen
                 projectileAmmo.Capacity = (int)Math.Round(projectileAmmo.Capacity / fireCostDiff);
                 Dirty(uid, projectileAmmo);
 
-                if (user != null && TryComp<ActorComponent>(user, out var actor))
-                    _popupSystem.PopupEntity(Loc.GetString("gun-set-fire-mode", ("mode", prototype.Name)), uid, actor.PlayerSession);
+                if (user != null)
+                    _popupSystem.PopupPredicted(Loc.GetString("gun-set-fire-mode", ("mode", prototype.Name)), uid, user);
             }
             else if (ammoProvider is HitscanBatteryAmmoProviderComponent hitscanAmmo)
             {
@@ -212,8 +223,8 @@ private void SetFireMode(EntityUid uid, BatteryWeaponFireModesComponent componen
                 hitscanAmmo.Capacity = (int)Math.Round(hitscanAmmo.Capacity / fireCostDiff);
                 Dirty(uid, hitscanAmmo);
 
-                if (user != null && TryComp<ActorComponent>(user, out var actor))
-                    _popupSystem.PopupEntity(Loc.GetString("gun-set-fire-mode", ("mode", hitscan.Name)), uid, actor.PlayerSession);
+                if (user != null)
+                    _popupSystem.PopupPredicted(Loc.GetString("gun-set-fire-mode", ("mode", hitscan.Name)), uid, user);
             }
 
             var updateClientAmmoEvent = new UpdateClientAmmoEvent();
@@ -222,8 +233,11 @@ private void SetFireMode(EntityUid uid, BatteryWeaponFireModesComponent componen
             if (fireMode.HeldPrefix != null)
                 _item.SetHeldPrefix(uid, fireMode.HeldPrefix);
         }
+        // Starlight-end
     }
 
+    # region Starlight
+
     private bool TryGetAmmoProvider(EntityUid uid, out object? ammoProvider)
     {
         ammoProvider = null;
@@ -242,10 +256,6 @@ private bool TryGetAmmoProvider(EntityUid uid, out object? ammoProvider)
 
         return false;
     }
-    private BatteryWeaponFireMode GetMode(BatteryWeaponFireModesComponent component)
-    {
-        return component.FireModes[component.CurrentFireMode];
-    }
 
     private void OnShootAttempt(EntityUid uid, BatteryWeaponFireModesComponent component, ref AttemptShootEvent args)
     {
@@ -258,9 +268,7 @@ private void OnShootAttempt(EntityUid uid, BatteryWeaponFireModesComponent compo
             var conditionsMet = fireMode.Conditions.All(condition => condition.Condition(conditionArgs));
 
             if (!conditionsMet)
-            {
                 SetFireMode(uid, component, 0, args.User);
-            }
         }
     }
 
@@ -282,19 +290,8 @@ private void CycleFireMode(EntityUid uid, BatteryWeaponFireModesComponent compon
 
         var index = (component.CurrentFireMode + 1) % component.FireModes.Count;
 
-        var fireMode = component.FireModes[index];
-
-        if (fireMode.Conditions != null)
-        {
-            var conditionArgs = new FireModeConditionConditionArgs(user, uid, fireMode, EntityManager);
-            var conditionsMet = fireMode.Conditions.All(condition => condition.Condition(conditionArgs));
-
-            if (!conditionsMet)
-            {
-                return;
-            }
-        }
-
         SetFireMode(uid, component, index, user);
     }
+    
+    # endregion Starlight
 }
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs
index 2fece720f9c5..0d21a8a790fc 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs
@@ -66,7 +66,7 @@ private void SelectFire(EntityUid uid, GunComponent component, SelectiveFire fir
         if (component.SelectedMode == fire)
             return;
 
-        DebugTools.Assert((component.AvailableModes  & fire) != 0x0);
+        DebugTools.Assert((component.AvailableModes & fire) != 0x0);
         component.SelectedMode = fire;
 
         if (!Paused(uid))
@@ -113,7 +113,7 @@ private void OnCycleMode(EntityUid uid, GunComponent component, CycleModeEvent a
     private void OnGunSelected(EntityUid uid, GunComponent component, HandSelectedEvent args)
     {
         if (Timing.ApplyingState)
-             return;
+            return;
 
         if (component.FireRateModified <= 0)
             return;
@@ -138,4 +138,14 @@ private void OnGunSelected(EntityUid uid, GunComponent component, HandSelectedEv
         component.NextFire = minimum;
         Dirty(uid, component);
     }
+
+    #region Starlight
+    public void DelayFire(Entity<GunComponent?> entity, TimeSpan delay)
+    {
+        if (!Resolve(entity, ref entity.Comp, logMissing: false))
+            return;
+
+        entity.Comp.NextFire = Timing.CurTime + delay;
+    }
+    #endregion Starlight
 }
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index 778d1c08d0d9..d3ff6c73ca06 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -11,8 +11,6 @@
 using Content.Shared.Examine;
 using Content.Shared.Gravity;
 using Content.Shared.Hands;
-using Content.Shared.Hands.Components;
-using Content.Shared.Mech.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Popups;
 using Content.Shared.Projectiles;
@@ -25,7 +23,6 @@
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
 using Content.Shared.Whitelist;
-using Content.Shared.Starlight.Utility;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
@@ -134,14 +131,12 @@ private void OnShootRequest(RequestShootEvent msg, EntitySessionEventArgs args)
     {
         var user = args.SenderSession.AttachedEntity;
 
-        if (user == null || !_combatMode.IsInCombatMode(user))
-            return;
-
-        if (TryComp<MechPilotComponent>(user.Value, out var mechPilot))
-            user = mechPilot.Mech;
-
-        if (!TryGetGun(user.Value, out var ent, out var gun))
+        if (user == null ||
+            !_combatMode.IsInCombatMode(user) ||
+            !TryGetGun(user.Value, out var ent, out var gun))
+        {
             return;
+        }
 
         if (ent != GetEntity(msg.Gun))
             return;
@@ -159,18 +154,14 @@ private void OnStopShootRequest(RequestStopShootEvent ev, EntitySessionEventArgs
     {
         var gunUid = GetEntity(ev.Gun);
 
-        var user = args.SenderSession.AttachedEntity;
-
-        if (user == null)
-            return;
-
-        if (TryComp<MechPilotComponent>(user.Value, out var mechPilot))
-            user = mechPilot.Mech;
-
-        if (!TryGetGun(user.Value, out var ent, out var gun))
+        if (args.SenderSession.AttachedEntity == null ||
+            !TryComp<GunComponent>(gunUid, out var gun) ||
+            !TryGetGun(args.SenderSession.AttachedEntity.Value, out _, out var userGun))
+        {
             return;
+        }
 
-        if (ent != gunUid)
+        if (userGun != gun)
             return;
 
         StopShooting(gunUid, gun);
@@ -183,33 +174,12 @@ public bool CanShoot(GunComponent component)
 
         return true;
     }
-    //🌟Starlight🌟
-    public bool IsChamberClosed(EntityUid gunEntity)
-        => Appearance.TryGetData(gunEntity, AmmoVisuals.BoltClosed, out bool boltClosed) && boltClosed;
-
-    // 🌟Starlight🌟
-    public void DelayFire(Entity<GunComponent?> entity, TimeSpan delay)
-    {
-        if (!Resolve(entity, ref entity.Comp, logMissing: false))
-            return;
-
-        entity.Comp.NextFire = Timing.CurTime + delay;
-    }
 
     public bool TryGetGun(EntityUid entity, out EntityUid gunEntity, [NotNullWhen(true)] out GunComponent? gunComp)
     {
         gunEntity = default;
         gunComp = null;
 
-        if (TryComp<MechComponent>(entity, out var mech)
-            && mech.CurrentSelectedEquipment.HasValue
-            && TryComp<GunComponent>(mech.CurrentSelectedEquipment.Value, out var mechGun))
-        {
-            gunEntity = mech.CurrentSelectedEquipment.Value;
-            gunComp = mechGun;
-            return true;
-        }
-
         if (_hands.GetActiveItem(entity) is { } held &&
             TryComp(held, out GunComponent? gun))
         {
@@ -243,11 +213,12 @@ private void StopShooting(EntityUid uid, GunComponent gun)
     /// <summary>
     /// Attempts to shoot at the target coordinates. Resets the shot counter after every shot.
     /// </summary>
-    public void AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun, EntityCoordinates toCoordinates)
+    public void AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun, EntityCoordinates toCoordinates, EntityUid? target = null)
     {
         gun.ShootCoordinates = toCoordinates;
         AttemptShoot(user, gunUid, gun);
         gun.ShotCounter = 0;
+        gun.Target = target;
         DirtyField(gunUid, gun, nameof(GunComponent.ShotCounter));
     }
 
@@ -310,11 +281,8 @@ private void AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun)
         var shots = 0;
         var lastFire = gun.NextFire;
 
-        Log.Debug($"Nextfire={gun.NextFire} curTime={curTime}");
-
         while (gun.NextFire <= curTime)
         {
-            Log.Debug("Shots++");
             gun.NextFire += fireRate;
             shots++;
         }
@@ -344,8 +312,6 @@ private void AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun)
             shots = Math.Min(shots, gun.ShotsPerBurstModified - gun.ShotCounter);
         }
 
-        Log.Debug($"Shots fired: {shots}");
-
         var attemptEv = new AttemptShootEvent(user, null);
         RaiseLocalEvent(gunUid, ref attemptEv);
 
@@ -404,9 +370,6 @@ private void AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun)
             return;
         }
 
-        var NonEmptyGunShotEvent = new OnNonEmptyGunShotEvent(user, ev.Ammo);
-        RaiseLocalEvent(gunUid, ref NonEmptyGunShotEvent);
-
         // Handle burstfire
         if (gun.SelectedMode == SelectiveFire.Burst)
         {
@@ -434,7 +397,7 @@ private void AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun)
         var shooterEv = new ShooterImpulseEvent();
         RaiseLocalEvent(user, ref shooterEv);
 
-        if (shooterEv.Push || _gravity.IsWeightless(user, userPhysics)) // TODO: Make IsWeightless Event Based
+        if (shooterEv.Push || _gravity.IsWeightless(user, userPhysics))
             CauseImpulse(fromCoordinates, toCoordinates.Value, user, userPhysics);
     }
 
@@ -496,15 +459,20 @@ protected void SetCartridgeSpent(EntityUid uid, CartridgeAmmoComponent cartridge
         cartridge.Spent = spent;
         Appearance.SetData(uid, AmmoVisuals.Spent, spent);
     }
-    // 🌟Starlight🌟
+
+    #region Starlight
+    public bool IsChamberClosed(EntityUid gunEntity)
+        => Appearance.TryGetData(gunEntity, AmmoVisuals.BoltClosed, out bool boltClosed) && boltClosed;
+
     protected void SetCartridgeSpent(EntityUid uid, HitScanCartridgeAmmoComponent cartridge, bool spent)
     {
         if (cartridge.Spent != spent)
-            DirtyField(uid, cartridge, nameof(HitScanCartridgeAmmoComponent.Spent));
+            DirtyField(uid, cartridge, nameof(CartridgeAmmoComponent.Spent));
 
         cartridge.Spent = spent;
         Appearance.SetData(uid, AmmoVisuals.Spent, spent);
     }
+    #endregion
 
     /// <summary>
     /// Drops a single cartridge / shell
@@ -539,8 +507,10 @@ protected void EjectCartridge(
 
     protected IShootable EnsureShootable(EntityUid uid)
     {
+        // Starlight start
         if (TryComp<HitScanCartridgeAmmoComponent>(uid, out var hitscanCartridge))
             return hitscanCartridge;
+        // Starlight end
 
         if (TryComp<CartridgeAmmoComponent>(uid, out var cartridge))
             return cartridge;
@@ -659,6 +629,8 @@ public void RefreshModifiers(Entity<GunComponent?> gun)
 
     protected abstract void CreateEffect(EntityUid gunUid, MuzzleFlashEvent message, EntityUid? user = null);
 
+    // Starlight start
+
     /// <summary>
     /// Used for animated effects on the client.
     /// </summary>
@@ -680,6 +652,8 @@ public struct Effect
         public NetEntity? ImpactEnt;
 
     }
+    // Starlight end
+
 }
 
 /// <summary>
@@ -701,9 +675,10 @@ public record struct AttemptShootEvent(EntityUid User, string? Message, bool Can
 [ByRefEvent]
 public record struct GunShotEvent(EntityUid User, List<(EntityUid? Uid, IShootable Shootable)> Ammo);
 
-[ByRefEvent]
-public record struct OnNonEmptyGunShotEvent(EntityUid User, List<(EntityUid? Uid, IShootable Shootable)> Ammo);
-
+/// <summary>
+/// Raised on an entity after firing a gun to see if any components or systems would allow this entity to be pushed
+/// by the gun they're firing. If true, GunSystem will create an impulse on our entity.
+/// </summary>
 [ByRefEvent]
 public record struct ShooterImpulseEvent()
 {
diff --git a/Content.Shared/_NullLink/CCVar/NullLinkCCVars.cs b/Content.Shared/_NullLink/CCVar/NullLinkCCVars.cs
index 4584dc3a9d40..5db9b8c37cbd 100644
--- a/Content.Shared/_NullLink/CCVar/NullLinkCCVars.cs
+++ b/Content.Shared/_NullLink/CCVar/NullLinkCCVars.cs
@@ -24,6 +24,9 @@ public sealed partial class NullLinkCCVars
 
     public static readonly CVarDef<string> Description =
         CVarDef.Create("nulllink.hub.description", "----", CVar.SERVERONLY);
+
+    public static readonly CVarDef<bool> IsAdultOnly =
+        CVarDef.Create("nulllink.is_adult_only", false, CVar.REPLICATED | CVar.SERVER);
 }
 
 public enum ServerType
diff --git a/Content.Shared/_Starlight/CCVar/StarlightCCVars.Scaling.cs b/Content.Shared/_Starlight/CCVar/StarlightCCVars.Scaling.cs
new file mode 100644
index 000000000000..8dc0679e568a
--- /dev/null
+++ b/Content.Shared/_Starlight/CCVar/StarlightCCVars.Scaling.cs
@@ -0,0 +1,46 @@
+using Robust.Shared.Configuration;
+
+namespace Content.Shared.Starlight.CCVar;
+
+public sealed partial class StarlightCCVars
+{
+    /// <summary>
+    /// Decides how many people a security officer counts as for the purpose of the scaling system.
+    /// 0 means they are not counted at all.
+    /// </summary>
+    public static readonly CVarDef<double> ScalingSecurityWeight =
+        CVarDef.Create("scaling.security_weight", 1.0, CVar.SERVERONLY);
+
+    /// <summary>
+    /// Decides how many people jobs like NTCC Officers, Captain, etc., count as for the purpose of the scaling system.
+    /// 0 means they are not counted at all.
+    /// </summary>
+    /// <remarks>
+    /// REMEMBER: This is only factored in if they are recorded as crew on the station.
+    /// As such, NTCC Consortium Officers spawned as part of naval training, etc., do not qualify.
+    /// </remarks>
+    public static readonly CVarDef<double> ScalingCentcomWeight =
+        CVarDef.Create("scaling.centcom_weight", 1.0, CVar.SERVERONLY);
+
+    /// <summary>
+    /// Decides how many people a salvage specialist counts as for the purpose of the scaling system.
+    /// 0 means they are not counted at all.
+    /// </summary>
+    public static readonly CVarDef<double> ScalingSalvageWeight =
+        CVarDef.Create("scaling.salvage_weight", 0.25, CVar.SERVERONLY);
+
+    /// <summary>
+    /// Indicates the "base" population of indicated departments.
+    /// If population is below, targets are scaled DOWN.
+    /// If population is above, targets are scaled UP.
+    /// </summary>
+    public static readonly CVarDef<int> ScalingPopulationBase =
+        CVarDef.Create("scaling.population_base", 10, CVar.SERVERONLY);
+
+    /// <summary>
+    /// Determines how large a portion of the mob's base thresholds are used in the scaling calculations.
+    /// Put simply, this decides how large a percentage of mobs' healthpools get added (or removed) per player outside baseline.
+    /// </summary>
+    public static readonly CVarDef<double> ScalingHealthWeight =
+        CVarDef.Create("scaling.health_weight", 0.05, CVar.SERVERONLY);
+}
\ No newline at end of file
diff --git a/Content.Shared/_Starlight/CCVar/StarlightCCVars.mhelp.cs b/Content.Shared/_Starlight/CCVar/StarlightCCVars.mhelp.cs
index a30f5a513477..6ce27ac0096c 100644
--- a/Content.Shared/_Starlight/CCVar/StarlightCCVars.mhelp.cs
+++ b/Content.Shared/_Starlight/CCVar/StarlightCCVars.mhelp.cs
@@ -1,6 +1,7 @@
 using Robust.Shared.Configuration;
 
 namespace Content.Shared.Starlight.CCVar;
+
 public sealed partial class StarlightCCVars
 {
     public static readonly CVarDef<float> MhelpRateLimitPeriod =
@@ -11,7 +12,10 @@ public sealed partial class StarlightCCVars
 
     public static readonly CVarDef<string> MHelpWebhook =
         CVarDef.Create("discord.mhelp_webhook", "", CVar.SERVERONLY | CVar.CONFIDENTIAL);
-        
+
     public static readonly CVarDef<string> MHelpSound =
         CVarDef.Create("audio.mhelp_sound", "/Audio/_Starlight/Effects/hello_mentor.ogg", CVar.ARCHIVE | CVar.CLIENTONLY);
+
+    public static readonly CVarDef<bool> MHelpPing =
+        CVarDef.Create("mhelp.ping_enabled", true, CVar.ARCHIVE | CVar.CLIENTONLY | CVar.ARCHIVE);
 }
diff --git a/Content.Shared/_Starlight/Economy/Atm/ATMComponent.cs b/Content.Shared/_Starlight/Economy/Atm/ATMComponent.cs
index 0f13376ecd16..ae16dd47d7fd 100644
--- a/Content.Shared/_Starlight/Economy/Atm/ATMComponent.cs
+++ b/Content.Shared/_Starlight/Economy/Atm/ATMComponent.cs
@@ -23,6 +23,8 @@ public enum ATMUIKey
 public sealed class ATMBuiState : BoundUserInterfaceState
 {
     public int Balance { get; init; }
+    public string? Message { get; init; }
+    public bool IsError { get; init; }
 }
 [RegisterComponent, NetworkedComponent]
 public sealed partial class NTCashComponent : Component
@@ -32,5 +34,13 @@ public sealed partial class NTCashComponent : Component
 [Serializable, NetSerializable]
 public sealed class ATMWithdrawBuiMsg : BoundUserInterfaceMessage
 {
+    public int Amount { get; init; }
+}
+
+[Serializable, NetSerializable]
+public sealed class ATMTransferBuiMsg : BoundUserInterfaceMessage
+{
+    public string Recipient { get; init; } = string.Empty;
+
     public int Amount { get; init; }
 }
\ No newline at end of file
diff --git a/Content.Shared/_Starlight/Economy/ItemPriceComponent.cs b/Content.Shared/_Starlight/Economy/ItemPriceComponent.cs
new file mode 100644
index 000000000000..d0d831397320
--- /dev/null
+++ b/Content.Shared/_Starlight/Economy/ItemPriceComponent.cs
@@ -0,0 +1,12 @@
+namespace Content.Shared.Economy
+{
+    [RegisterComponent]
+    public sealed partial class ItemPriceComponent : Component
+    {
+        [DataField] 
+        public string PriceCategory = string.Empty;
+
+        [DataField]
+        public int FallbackPrice = 200;
+    }
+}
\ No newline at end of file
diff --git a/Content.Shared/_Starlight/Economy/PriceCategoryPrototype.cs b/Content.Shared/_Starlight/Economy/PriceCategoryPrototype.cs
new file mode 100644
index 000000000000..d1cde832242e
--- /dev/null
+++ b/Content.Shared/_Starlight/Economy/PriceCategoryPrototype.cs
@@ -0,0 +1,19 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Economy;
+
+/// <summary>
+/// Prototype that defines a price category range for price generation
+/// </summary>
+[Prototype("priceCategory")]
+public sealed partial class PriceCategoryPrototype : IPrototype
+{
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    [DataField]
+    public int Min = 0;
+
+    [DataField]
+    public int Max;
+}
diff --git a/Content.Shared/_Starlight/Hands/SharedHandsSystem.Offer.cs b/Content.Shared/_Starlight/Hands/SharedHandsSystem.Offer.cs
new file mode 100644
index 000000000000..a30d1e39b106
--- /dev/null
+++ b/Content.Shared/_Starlight/Hands/SharedHandsSystem.Offer.cs
@@ -0,0 +1,187 @@
+using Content.Shared.Alert;
+using Content.Shared.Hands.Components;
+using Content.Shared.Interaction.Components;
+using Content.Shared.Interaction.Events;
+using Content.Shared.Inventory.VirtualItem;
+using Content.Shared.Item;
+using Content.Shared.Popups;
+using Content.Shared.Verbs;
+using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Hands.EntitySystems;
+
+public abstract partial class SharedHandsSystem : EntitySystem
+{
+    [Dependency] private readonly AlertsSystem _alertsSystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+    [Dependency] private readonly INetManager _net = default!;
+    private ProtoId<AlertPrototype> OfferAlert = "Offer";
+
+    private void InitializeOffer()
+    {
+        SubscribeLocalEvent<HandsComponent, MoveEvent>(OnMove);
+
+        SubscribeLocalEvent<ItemComponent, GotUnequippedHandEvent>(OnUnequipHand);
+
+        if (_net.IsServer) // Wow! This is bullshit but im not making a script to ServerSide.
+            SubscribeLocalEvent<ItemComponent, DroppedEvent>(OnDropped);
+
+        SubscribeLocalEvent<HandsComponent, OfferItemAlertEvent>(OnOfferItemAlertEvent);
+
+        SubscribeLocalEvent<HandsComponent, GetVerbsEvent<Verb>>(OfferItemVerb);
+    }
+
+    private void OnOfferItemAlertEvent(Entity<HandsComponent> ent, ref OfferItemAlertEvent args)
+    {
+        if (args.Handled || _net.IsClient)
+            return;
+
+        AcceptOffer(ent.Owner, ent.Comp);
+
+        args.Handled = true;
+    }
+
+    private void AcceptOffer(EntityUid uid, HandsComponent? handsComp = null)
+    {
+        if (!Resolve(uid, ref handsComp, false))
+            return;
+
+        if (TryComp<HandsComponent>(handsComp.OfferTarget, out var targetHands))
+            targetHands.ReceivingOffer = true;
+
+        if (handsComp.OfferItem is not null)
+        {
+            if (!TryPickupAnyHand(uid, handsComp.OfferItem.Value))
+            {
+                _popupSystem.PopupEntity(Loc.GetString("hands-full"), uid, uid);
+                return;
+            }
+
+            if (handsComp.OfferTarget is not null)
+            {
+                _popupSystem.PopupEntity(Loc.GetString("offered-target", ("item", handsComp.OfferItem), ("user", handsComp.OfferTarget.Value)), handsComp.OfferTarget.Value, uid);
+                _popupSystem.PopupEntity(Loc.GetString("offered", ("item", handsComp.OfferItem)), handsComp.OfferTarget.Value, handsComp.OfferTarget.Value);
+                EndOffer(handsComp.OfferTarget.Value, targetHands ?? null, false);
+            }
+        }
+
+        EndOffer(uid, handsComp, false);
+    }
+
+    private void OfferItemVerb(EntityUid uid, HandsComponent component, GetVerbsEvent<Verb> args)
+    {
+        if (!args.CanAccess || !args.CanInteract || args.User == args.Target
+            || args.Using is null || HasComp<UnremoveableComponent>(args.Using) || HasComp<VirtualItemComponent>(args.Using)
+            || component.Offering || component.ReceivingOffer
+            || !TryComp<HandsComponent>(args.User, out var targetHands)
+            || targetHands.Offering || targetHands.ReceivingOffer)
+            return;
+
+        args.Verbs.Add(new Verb()
+        {
+            Act = () => OfferItem(args.User, uid, targetHands, component),
+            DoContactInteraction = true,
+            Text = Loc.GetString("offer", ("item", args.Using)),
+            IconEntity = GetNetEntity(args.Using)
+        });
+    }
+
+    /// <summary>
+    /// Offer the ActiveItem to the target (if they have a HandsComponent)
+    /// </summary>
+    /// <param name="uid"></param>
+    /// <param name="target"></param>
+    /// <param name="handsComp"></param>
+    /// <param name="targetHands"></param>
+    public void OfferItem(EntityUid uid, EntityUid target, HandsComponent? handsComp = null, HandsComponent? targetHands = null)
+    {
+        if (!Resolve(uid, ref handsComp, false)
+            || !Resolve(target, ref targetHands, false)
+            || !TryGetActiveItem(uid, out var helditem))
+            return;
+
+        handsComp.OfferItem = helditem;
+        targetHands.OfferItem = helditem;
+
+        handsComp.Offering = true;
+        handsComp.OfferTarget = target;
+
+        targetHands.ReceivingOffer = true;
+        targetHands.OfferTarget = uid;
+
+        _alertsSystem.ShowAlert(target, OfferAlert);
+
+        if (_net.IsServer)
+        {
+            _popupSystem.PopupEntity(Loc.GetString("offering", ("item", helditem), ("target", target)), uid, uid);
+            _popupSystem.PopupEntity(Loc.GetString("offering-target", ("item", helditem), ("user", uid)), uid, target);
+        }
+    }
+
+    /// <summary>
+    /// End the Offer, this can be used to cancel or end the process.
+    /// </summary>
+    /// <param name="uid"></param>
+    /// <param name="handsComp"></param>
+    public void EndOffer(EntityUid uid, HandsComponent? handsComp = null, bool? popups = null)
+    {
+        if (!Resolve(uid, ref handsComp, false))
+            return;
+
+        if (popups ?? true)
+        {
+            if (handsComp.OfferItem is not null)
+            {
+                if (handsComp.ReceivingOffer)
+                {
+                    if (handsComp.OfferTarget is not null)
+                        _popupSystem.PopupEntity(Loc.GetString("unoffer-target", ("item", handsComp.OfferItem), ("user", handsComp.OfferTarget)), handsComp.OfferTarget.Value, uid);
+                }
+                else
+                    _popupSystem.PopupEntity(Loc.GetString("unoffer", ("item", handsComp.OfferItem)), uid, uid);
+            }
+        }
+
+        _alertsSystem.ClearAlert(uid, OfferAlert);
+
+        handsComp.Offering = false;
+        handsComp.ReceivingOffer = false;
+        handsComp.OfferItem = null;
+        handsComp.OfferTarget = null;
+    }
+
+    private void OnMove(EntityUid uid, HandsComponent handsComp, MoveEvent args)
+    {
+        if (handsComp.OfferTarget is null || TransformSystem.InRange(args.NewPosition, Transform(handsComp.OfferTarget.Value).Coordinates, 2f))
+            return;
+
+        EndOffer(handsComp.OfferTarget.Value);
+        EndOffer(uid, handsComp);
+    }
+
+    private void OnDropped(EntityUid uid, ItemComponent item, DroppedEvent args)
+    {
+        if (!TryComp<HandsComponent>(args.User, out var handComp) || !handComp.Offering || handComp.OfferItem != uid)
+            return;
+
+        if (handComp.OfferTarget is not null)
+            EndOffer(handComp.OfferTarget.Value);
+
+        EndOffer(args.User, handComp);
+    }
+
+    private void OnUnequipHand(EntityUid uid, ItemComponent item, GotUnequippedHandEvent args)
+    {
+        if (_net.IsClient || !TryComp<HandsComponent>(args.User, out var handComp) || !handComp.Offering || handComp.OfferItem != uid)
+            return;
+
+        if (handComp.Offering && handComp.ReceivingOffer) // This check is to make sure OnUnequipHand when AcceptOffer, Silly but works!
+            return;
+
+        if (handComp.OfferTarget is not null)
+            EndOffer(handComp.OfferTarget.Value);
+
+        EndOffer(args.User, handComp);
+    }
+}
diff --git a/Content.Shared/_Starlight/Knockback/SharedKnockbackSystem.cs b/Content.Shared/_Starlight/Knockback/SharedKnockbackSystem.cs
index a22c83fd96fe..0d8aefc6df02 100644
--- a/Content.Shared/_Starlight/Knockback/SharedKnockbackSystem.cs
+++ b/Content.Shared/_Starlight/Knockback/SharedKnockbackSystem.cs
@@ -12,6 +12,8 @@
 
 //linq
 using System.Linq;
+using Content.Shared.Weapons.Ranged.Events;
+using Content.Shared.Examine;
 
 namespace Content.Shared.Starlight.Knockback;
 public abstract partial class SharedKnockbackSystem : EntitySystem
@@ -23,15 +25,33 @@ public abstract partial class SharedKnockbackSystem : EntitySystem
     [Dependency] private readonly SharedStaminaSystem _stamina = default!;
     public override void Initialize()
     {
-        SubscribeLocalEvent<KnockbackByUserTagComponent, OnNonEmptyGunShotEvent>(OnGunShot);
+        SubscribeLocalEvent<KnockbackByUserTagComponent, TakeAmmoEvent>(OnGunShot);
+        SubscribeLocalEvent<KnockbackByUserTagComponent, ExaminedEvent>(OnExamined);
     }
 
-    private void OnGunShot(Entity<KnockbackByUserTagComponent> ent, ref OnNonEmptyGunShotEvent args)
+    private void OnExamined(Entity<KnockbackByUserTagComponent> ent, ref ExaminedEvent args)
+    {
+        if (args.IsInDetailsRange)
+        {
+            //check if the examiner has any tags that match the component's tags
+            if (_tagSystem.HasAnyTag(args.Examiner, ent.Comp.DoestContain.Keys))
+            {
+                var data = GetKnockbackData(ent, args.Examiner);
+                var knockback = CalculateKnockback(args.Examiner, data);
+                //figure out the forwards/backwards direction
+                var direction = knockback < 0 ? "forwards" : "backwards";
+                args.PushMarkup(Loc.GetString("knockback-by-user-tag-component-examine-distance", ("knockback", String.Format("{0:0.###}", MathF.Abs(knockback))), ("direction", direction)));
+                args.PushMarkup(Loc.GetString("knockback-by-user-tag-component-examine-stamina", ("stamina", String.Format("{0:0.###}", CalculateStaminaDamage(data, knockback)))));
+            }
+        }
+    }
+
+    private void OnGunShot(Entity<KnockbackByUserTagComponent> ent, ref TakeAmmoEvent args)
     {
         //make sure the ammo is shootable
         foreach (var ammo in args.Ammo)
         {
-            if (TryComp<HitScanCartridgeAmmoComponent>(ammo.Uid, out var hitscanCartridge))
+            if (TryComp<HitScanCartridgeAmmoComponent>(ammo.Entity, out var hitscanCartridge))
             {
                 //check if its spent
                 if (hitscanCartridge.Spent)
@@ -40,7 +60,7 @@ private void OnGunShot(Entity<KnockbackByUserTagComponent> ent, ref OnNonEmptyGu
                 }
             }
 
-            if (TryComp<CartridgeAmmoComponent>(ammo.Uid, out var cartridge))
+            if (TryComp<CartridgeAmmoComponent>(ammo.Entity, out var cartridge))
             {
                 //check if its spent
                 if (cartridge.Spent)
@@ -50,13 +70,14 @@ private void OnGunShot(Entity<KnockbackByUserTagComponent> ent, ref OnNonEmptyGu
             }
         }
 
-        EntityUid user = args.User;
+        if (args.User == null)
+            return;
+        EntityUid user = args.User.Value;
 
         //check for tags
         if (_tagSystem.HasAnyTag(user, ent.Comp.DoestContain.Keys))
         {
-            //get the specific knockback data for this tag
-            KnockbackData data = ent.Comp.DoestContain.FirstOrDefault(x => _tagSystem.HasTag(user, x.Key)).Value;
+            var data = GetKnockbackData(ent, user);
             //get the gun component
             if (TryComp<GunComponent>(ent, out var gunComponent))
             {
@@ -65,12 +86,7 @@ private void OnGunShot(Entity<KnockbackByUserTagComponent> ent, ref OnNonEmptyGu
                 if (toCoordinates == null)
                     return;
 
-                float knockback = data.Knockback;
-                //If we have no slips, cut the knockback in half
-                if (CheckForNoSlips(user))
-                {
-                    knockback *= 0.5f;
-                }
+                var knockback = CalculateKnockback(user, data);
 
                 if (knockback == 0.0f)
                     return;
@@ -95,12 +111,30 @@ private void OnGunShot(Entity<KnockbackByUserTagComponent> ent, ref OnNonEmptyGu
                 //deal stamina damage
                 if (TryComp<StaminaComponent>(user, out var stamina))
                 {
-                    _stamina.TakeStaminaDamage(user, knockback * data.StaminaMultiplier, component: stamina);
+                    _stamina.TakeStaminaDamage(user, CalculateStaminaDamage(data, knockback), component: stamina);
                 }
             }
         }
     }
 
+    private KnockbackData GetKnockbackData(Entity<KnockbackByUserTagComponent> ent, EntityUid user) =>            //get the specific knockback data for this tag
+                ent.Comp.DoestContain.FirstOrDefault(x => _tagSystem.HasTag(user, x.Key)).Value;
+
+    private float CalculateKnockback(EntityUid user, KnockbackData data)
+    {
+        float knockback = data.Knockback;
+        //If we have no slips, cut the knockback in half
+        if (CheckForNoSlips(user))
+        {
+            knockback *= 0.5f;
+        }
+
+        return knockback;
+    }
+
+    private static float CalculateStaminaDamage(KnockbackData data, float knockback) => MathF.Abs(knockback) * data.StaminaMultiplier;
+
+
     private bool CheckForNoSlips(EntityUid uid)
     {
         if (EntityManager.TryGetComponent(uid, out NoSlipComponent? flashImmunityComponent))
diff --git a/Content.Shared/_Starlight/MHelp/SharedMentorSystem.cs b/Content.Shared/_Starlight/MHelp/SharedMentorSystem.cs
index 06232285e443..83d4990abb15 100644
--- a/Content.Shared/_Starlight/MHelp/SharedMentorSystem.cs
+++ b/Content.Shared/_Starlight/MHelp/SharedMentorSystem.cs
@@ -30,7 +30,7 @@ protected void LogMentoring(MHelpTextMessage message)
     public sealed class MHelpTextMessage() : EntityEventArgs
     {
         public NetUserId? Sender { get; init; }
-        public Guid? Ticket { get; init; } 
+        public Guid? Ticket { get; init; }
         public DateTime CreateAt { get; init; } = DateTime.UtcNow;
         public required string Text { get; init; }
         public bool PlaySound { get; init; }
@@ -42,4 +42,10 @@ public sealed class MHelpCloseTicket() : EntityEventArgs
     {
         public Guid? Ticket { get; init; }
     }
+    
+    [Serializable, NetSerializable]
+    public sealed class MhelpTptoTicket() : EntityEventArgs
+    {
+        public Guid? Ticket { get; init; }
+    }
 }
diff --git a/Content.Shared/_Starlight/Magic/Events/SpawnItemInHandEvent.cs b/Content.Shared/_Starlight/Magic/Events/SpawnItemInHandEvent.cs
new file mode 100644
index 000000000000..5044a34a8ae0
--- /dev/null
+++ b/Content.Shared/_Starlight/Magic/Events/SpawnItemInHandEvent.cs
@@ -0,0 +1,13 @@
+using Content.Shared.Actions;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._Starlight.Magic.Events;
+
+public sealed partial class SpawnItemInHandEvent : InstantActionEvent
+{
+    /// <summary>
+    /// Item to create with the action
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId Spawned = string.Empty;
+}
diff --git a/Content.Shared/_Starlight/Medical/Surgery/Components/_Parts.cs b/Content.Shared/_Starlight/Medical/Surgery/Components/_Parts.cs
index 7dad895694e8..a3a59bf8f45a 100644
--- a/Content.Shared/_Starlight/Medical/Surgery/Components/_Parts.cs
+++ b/Content.Shared/_Starlight/Medical/Surgery/Components/_Parts.cs
@@ -1,10 +1,21 @@
 using Content.Shared.Damage;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 // Based on the RMC14.
 // https://github.com/RMC-14/RMC-14
 namespace Content.Shared.Starlight.Medical.Surgery.Steps.Parts;
-[RegisterComponent, NetworkedComponent, Access(typeof(SharedSurgerySystem))] public sealed partial class IncisionOpenComponent : Component;
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedSurgerySystem))]
+[AutoGenerateComponentPause]
+public sealed partial class IncisionOpenComponent : Component
+{   
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
+    public TimeSpan NextUpdate = TimeSpan.Zero;
+    
+    [DataField]
+    public TimeSpan UpdateInterval = TimeSpan.FromSeconds(1);
+}
 [RegisterComponent, NetworkedComponent, Access(typeof(SharedSurgerySystem))] public sealed partial class SkinRetractedComponent : Component;
 [RegisterComponent, NetworkedComponent, Access(typeof(SharedSurgerySystem))] public sealed partial class BleedersClampedComponent : Component;
 [RegisterComponent, NetworkedComponent, Access(typeof(SharedSurgerySystem))]
@@ -22,4 +33,4 @@ public sealed partial class SurgeryStepOrganInsertComponent : Component
 {
     [DataField(required: true)]
     public string Slot;
-}
+}
\ No newline at end of file
diff --git a/Content.Shared/_Starlight/Medical/Surgery/Components/_Tools.cs b/Content.Shared/_Starlight/Medical/Surgery/Components/_Tools.cs
index 81d5b9ec1729..84383433cb31 100644
--- a/Content.Shared/_Starlight/Medical/Surgery/Components/_Tools.cs
+++ b/Content.Shared/_Starlight/Medical/Surgery/Components/_Tools.cs
@@ -1,4 +1,5 @@
-using Robust.Shared.Audio;
+using Content.Shared.DeviceLinking;
+using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 // Based on the RMC14.
@@ -22,8 +23,27 @@ public sealed partial class SurgeryToolComponent : Component
     public SoundSpecifier? EndSound;
 }
 
-[RegisterComponent, NetworkedComponent, Access(typeof(SharedSurgerySystem))]
-public sealed partial class OperatingTableComponent : Component;
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedSurgerySystem), typeof(SharedBodyScannerSystem))]
+[AutoGenerateComponentState]
+public sealed partial class OperatingTableComponent : Component
+{
+    [ViewVariables, AutoNetworkedField]
+    public EntityUid? Scanner;
+}
+
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedBodyScannerSystem))]
+[AutoGenerateComponentState]
+public sealed partial class BodyScannerComponent : Component
+{
+    [DataField, AutoNetworkedField]
+    public NetEntity? TableEntity;
+    
+    /// <summary>
+    /// The machine linking port
+    /// </summary>
+    [DataField]
+    public ProtoId<SourcePortPrototype> LinkingPort = "BodyScannerSender";
+}
 
 [RegisterComponent, NetworkedComponent, Access(typeof(SharedSurgerySystem))]
 public sealed partial class BoneGelComponent : Component, ISurgeryToolComponent
diff --git a/Content.Shared/_Starlight/Medical/Surgery/SharedBodyScannerSystem.cs b/Content.Shared/_Starlight/Medical/Surgery/SharedBodyScannerSystem.cs
new file mode 100644
index 000000000000..88e3948b2bd6
--- /dev/null
+++ b/Content.Shared/_Starlight/Medical/Surgery/SharedBodyScannerSystem.cs
@@ -0,0 +1,12 @@
+using Content.Shared.DeviceLinking.Events;
+using Content.Shared.Starlight.Medical.Surgery.Effects.Step;
+
+namespace Content.Shared.Starlight.Medical.Surgery;
+
+public abstract partial class SharedBodyScannerSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+    }
+}
\ No newline at end of file
diff --git a/Content.Shared/_Starlight/Power/Components/PoweredLockerComponent.cs b/Content.Shared/_Starlight/Power/Components/PoweredLockerComponent.cs
new file mode 100644
index 000000000000..e836d1762a7b
--- /dev/null
+++ b/Content.Shared/_Starlight/Power/Components/PoweredLockerComponent.cs
@@ -0,0 +1,15 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._Starlight.Power.Components;
+
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState]
+public sealed partial class PoweredLockerComponent : Component
+{
+    /// <summary>
+    /// Whether or not the locker is powered.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Powered = true;
+}
\ No newline at end of file
diff --git a/Content.Shared/_Starlight/Power/EntitySystems/PoweredLockerSystem.cs b/Content.Shared/_Starlight/Power/EntitySystems/PoweredLockerSystem.cs
new file mode 100644
index 000000000000..2abb03432200
--- /dev/null
+++ b/Content.Shared/_Starlight/Power/EntitySystems/PoweredLockerSystem.cs
@@ -0,0 +1,24 @@
+using Content.Shared._Starlight.Power.Components;
+using Content.Shared.Power;
+using Robust.Shared.GameObjects;
+
+namespace Content.Shared._Starlight.Power.EntitySystems;
+
+public sealed class PoweredLockerSystem : EntitySystem
+{
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    
+    public void TogglePower(EntityUid uid, PoweredLockerComponent? powerComp = null, bool? powered = null)
+    {
+        if (!Resolve(uid, ref powerComp))
+            return;
+        
+        if (powered == null)
+            powered = !powerComp.Powered;
+        
+        _appearance.SetData(uid, PowerDeviceVisuals.Powered, powered);
+
+        powerComp.Powered = powered.Value;
+        Dirty(uid, powerComp);
+    }
+}
\ No newline at end of file
diff --git a/Content.Shared/_Starlight/Railroading/Components/Reward/RailroadDeliveryRewardComponent.cs b/Content.Shared/_Starlight/Railroading/Components/Reward/RailroadDeliveryRewardComponent.cs
new file mode 100644
index 000000000000..a791325da844
--- /dev/null
+++ b/Content.Shared/_Starlight/Railroading/Components/Reward/RailroadDeliveryRewardComponent.cs
@@ -0,0 +1,20 @@
+using System;
+using Content.Shared.Destructible.Thresholds;
+using Content.Shared.Dataset;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Shared._Starlight.Railroading;
+
+[RegisterComponent]
+public sealed partial class RailroadDeliveryRewardComponent : Component
+{
+    [DataField("delivery", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
+    public string Delivery;
+    
+    [DataField]
+    public ProtoId<LocalizedDatasetPrototype>? Dataset = null;
+    
+    [DataField]
+    public ProtoId<LocalizedDatasetPrototype>? WrappedDataset = null;
+}
diff --git a/Content.Shared/_Starlight/Scaling/AntagMonsterScalingComponent.cs b/Content.Shared/_Starlight/Scaling/AntagMonsterScalingComponent.cs
new file mode 100644
index 000000000000..7381d7b65666
--- /dev/null
+++ b/Content.Shared/_Starlight/Scaling/AntagMonsterScalingComponent.cs
@@ -0,0 +1,20 @@
+using Content.Shared.FixedPoint;
+using Content.Shared.Mobs;
+
+namespace Content.Shared._Starlight.Scaling.Components;
+
+[RegisterComponent]
+public sealed partial class AntagMonsterScalingComponent : Component
+{
+    /// <summary>
+    /// Indicates the highest percentage health increase (or decrease) allowed for this creature.
+    /// </summary>
+    [DataField]
+    public double MaximumHealthScaling = 0.50;
+
+    [DataField]
+    public bool IsScaled = false;
+
+    [DataField]
+    public SortedDictionary<FixedPoint2, MobState>? OriginalThresholds;
+}
\ No newline at end of file
diff --git a/Content.Shared/_Starlight/Scaling/SharedAntagMonsterScalingSystem.cs b/Content.Shared/_Starlight/Scaling/SharedAntagMonsterScalingSystem.cs
new file mode 100644
index 000000000000..98d53ed50e8a
--- /dev/null
+++ b/Content.Shared/_Starlight/Scaling/SharedAntagMonsterScalingSystem.cs
@@ -0,0 +1,43 @@
+using Content.Shared._Starlight.Scaling.Components;
+using Content.Shared.FixedPoint;
+using Content.Shared.Mobs.Components;
+
+namespace Content.Shared._Starlight.Scaling;
+
+public abstract partial class SharedScalingSystem : EntitySystem
+{
+    public void ApplyHealthScaling(
+        EntityUid station,
+        AntagMonsterScalingComponent scalingComp,
+        MobThresholdsComponent thresholdsComp,
+        Dictionary<EntityUid, double> cachedPopulations,
+        double universalHealthWeight)
+    {
+
+        if (scalingComp.OriginalThresholds == null)
+            return;
+
+        foreach (var threshold in scalingComp.OriginalThresholds)
+        {
+            var key = threshold.Key;
+
+            var scalingPercent = cachedPopulations[station] * universalHealthWeight;
+
+            if (scalingPercent > scalingComp.MaximumHealthScaling)
+                scalingPercent = scalingComp.MaximumHealthScaling;
+
+            if (scalingPercent < 0.0 - scalingComp.MaximumHealthScaling)
+                scalingPercent = 0.0 - scalingComp.MaximumHealthScaling;
+
+            FixedPoint2 scalingValue = key.Double() * scalingPercent;
+
+            FixedPoint2 scaledKey = key + scalingValue;
+
+            if (key != scaledKey)
+            {
+                thresholdsComp.Thresholds.Remove(key);
+                thresholdsComp.Thresholds.Add(scaledKey, threshold.Value);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Content.Shared/_Starlight/Weapon/Components/HitScanCartridgeAmmoComponent.cs b/Content.Shared/_Starlight/Weapons/Components/HitScanCartridgeAmmoComponent.cs
similarity index 100%
rename from Content.Shared/_Starlight/Weapon/Components/HitScanCartridgeAmmoComponent.cs
rename to Content.Shared/_Starlight/Weapons/Components/HitScanCartridgeAmmoComponent.cs
diff --git a/Content.Shared/_Starlight/Weapon/Components/WeaponDismantleOnShootComponent.cs b/Content.Shared/_Starlight/Weapons/Components/WeaponDismantleOnShootComponent.cs
similarity index 100%
rename from Content.Shared/_Starlight/Weapon/Components/WeaponDismantleOnShootComponent.cs
rename to Content.Shared/_Starlight/Weapons/Components/WeaponDismantleOnShootComponent.cs
diff --git a/Content.Shared/_Starlight/Weapon/HitScanPierceAttemptEvent.cs b/Content.Shared/_Starlight/Weapons/HitScanPierceAttemptEvent.cs
similarity index 100%
rename from Content.Shared/_Starlight/Weapon/HitScanPierceAttemptEvent.cs
rename to Content.Shared/_Starlight/Weapons/HitScanPierceAttemptEvent.cs
diff --git a/Content.Shared/_Starlight/Weapon/HitScanRicochetAttemptEvent.cs b/Content.Shared/_Starlight/Weapons/HitScanRicochetAttemptEvent.cs
similarity index 100%
rename from Content.Shared/_Starlight/Weapon/HitScanRicochetAttemptEvent.cs
rename to Content.Shared/_Starlight/Weapons/HitScanRicochetAttemptEvent.cs
diff --git a/Content.Shared/Weapons/Ranged/Components/FireModeCondition.cs b/Content.Shared/_Starlight/Weapons/Ranged/Components/FireModeCondition.cs
similarity index 73%
rename from Content.Shared/Weapons/Ranged/Components/FireModeCondition.cs
rename to Content.Shared/_Starlight/Weapons/Ranged/Components/FireModeCondition.cs
index 19fcf518b0f9..41e76c4113cb 100644
--- a/Content.Shared/Weapons/Ranged/Components/FireModeCondition.cs
+++ b/Content.Shared/_Starlight/Weapons/Ranged/Components/FireModeCondition.cs
@@ -1,7 +1,8 @@
 using JetBrains.Annotations;
+using Content.Shared.Weapons.Ranged.Components;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Weapons.Ranged.Components;
+namespace Content.Shared._Starlight.Weapons.Ranged.Components;
 
 /// <summary>
 /// Used to define a complicated condition that requires C#
@@ -15,6 +16,11 @@ public abstract partial class FireModeCondition
     /// </summary>
     /// <returns>Whether or not the firemode can be changed</returns>
     public abstract bool Condition(FireModeConditionConditionArgs args);
+
+    public bool ConditionMet = false;
+
+    [DataField]
+    public virtual string PopupMessage { get; set; } = "fire-mode-condition";
 }
 
 public readonly record struct FireModeConditionConditionArgs(EntityUid Shooter, EntityUid? Weapon, BatteryWeaponFireMode? FireMode, IEntityManager EntityManager);
\ No newline at end of file
diff --git a/Content.Shared/_Starlight/Weapon/SharedWeaponDismantleOnShootSystem.cs b/Content.Shared/_Starlight/Weapons/SharedWeaponDismantleOnShootSystem.cs
similarity index 88%
rename from Content.Shared/_Starlight/Weapon/SharedWeaponDismantleOnShootSystem.cs
rename to Content.Shared/_Starlight/Weapons/SharedWeaponDismantleOnShootSystem.cs
index 325bdb2ca80b..d6cc883ba1dc 100644
--- a/Content.Shared/_Starlight/Weapon/SharedWeaponDismantleOnShootSystem.cs
+++ b/Content.Shared/_Starlight/Weapons/SharedWeaponDismantleOnShootSystem.cs
@@ -27,9 +27,12 @@ public bool DismantleCheck(Entity<WeaponDismantleOnShootComponent> ent, ref Ammo
 
     private void OnExamine(Entity<WeaponDismantleOnShootComponent> ent, ref ExaminedEvent args)
     {
+        if (!args.IsInDetailsRange)
+            return;
+
         if (ent.Comp.DismantleChance <= 0.0f)
             return;
 
-        args.PushMarkup(Loc.GetString("examine-weapon-dismantle-on-shoot", ("chance", MathF.Round(ent.Comp.DismantleChance * 100, 1))));
+        args.PushMarkup(Loc.GetString("examine-weapon-dismantle-on-shoot", ("chance", String.Format("{0:0.#}", ent.Comp.DismantleChance * 100))));
     }
 }
diff --git a/Resources/Audio/MidiCustom/GeneralUser-GS-Bank0.sf2 b/Resources/Audio/MidiCustom/GeneralUser-GS-Bank0.sf2
new file mode 100644
index 000000000000..a7eefb3df556
Binary files /dev/null and b/Resources/Audio/MidiCustom/GeneralUser-GS-Bank0.sf2 differ
diff --git a/Resources/Audio/MidiCustom/LICENSE b/Resources/Audio/MidiCustom/LICENSE
new file mode 100644
index 000000000000..273d5cc6bf61
--- /dev/null
+++ b/Resources/Audio/MidiCustom/LICENSE
@@ -0,0 +1,47 @@
+*** GeneralUser GS v2.0.1 ***
+***      License v2.0     ***
+
+** License of the complete work **
+You may use GeneralUser GS without restriction for your own music creation,
+private or commercial. This SoundFont bank is provided to the community free of
+charge. Please feel free to use it in your software projects, and to modify the
+SoundFont bank or its packaging to suit your needs.
+
+** License of contained samples **
+GeneralUser GS inherits the usage rights of the samples contained within, all of
+which allow full use in music production, including the ability to make profit
+from musical recordings created with GeneralUser GS.
+
+Many of the samples are original, but some were taken from other banks freely
+(and legally) available on the Internet from various SoundFont websites. Because
+GeneralUser GS originated as a personal project with no intention for
+publication, I cannot be 100% sure where all of the samples originated, although
+I do know that none of them came from commercially published SoundFont packages
+or sample CDs. Regardless, many "free" SoundFonts available on the web may
+indeed contain samples of questionable origin. My understanding of the
+copyrights of all samples is only as good as the information provided by the
+original sources. If you become aware of any restricted samples being used in
+GeneralUser GS, please let me know so I can replace them.
+
+This uncertainty may concern you if you intend to use GeneralUser GS in a
+commercial software product. That being said, I have never received any
+complaint regarding sample ownership since I published the original GeneralUser
+GS back in 2000, and as far as I am aware, neither have any of the companies
+creating commercial software products using GeneralUser GS.
+
+** More info **
+If you plan to feature GeneralUser GS on your own website, please do not link
+directly to my download files. Either link to my website, or provide your own
+local copy instead.
+
+I hope you enjoy GeneralUser GS! This SoundFont bank is the product of many
+years of hard work.
+
+You can find updates to GeneralUser GS and more of my virtual instruments at:
+http://www.schristiancollins.com
+
+I can be reached via the contact page on my website here:
+https://www.schristiancollins.com/contact
+
+Thank you!
+-~Chris
diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index a656e42976e3..168a6c2c5226 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -1277,5 +1277,21 @@ Entries:
   id: 155
   time: '2025-07-16T22:35:14.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/38384
+- author: perryprog
+  changes:
+  - message: Rejuvenate will now remove drowsiness, forced sleep, and the seeing rainbows
+      status effect.
+    type: Add
+  id: 156
+  time: '2025-07-24T15:13:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39025
+- author: slarticodefast, beck-thompson
+  changes:
+  - message: Added the "Open Camera" admin verb and the "camera" console command which
+      allow you to observe entities in separate window using a remote camera.
+    type: Add
+  id: 157
+  time: '2025-07-25T16:53:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/36969
 Name: Admin
 Order: 2
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 204359a17f62..19902e3f5b8c 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,308 +1,4 @@
 Entries:
-- author: ScarKy0
-  changes:
-  - message: Salvage borgs now start with a tool module
-    type: Add
-  id: 8269
-  time: '2025-04-19T20:33:54.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/33336
-- author: Seam_Less
-  changes:
-  - message: Standardized the Sprites of most scarfs
-    type: Tweak
-  id: 8270
-  time: '2025-04-20T00:17:38.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35446
-- author: ArtisticRoomba
-  changes:
-  - message: Fixed backpack water tanks (spray nozzle) projectiles not properly cleaning
-      up puddles.
-    type: Fix
-  id: 8271
-  time: '2025-04-20T02:41:24.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35950
-- author: Blackern5000
-  changes:
-  - message: Reptilians can now have shark tails and a back fin.
-    type: Add
-  id: 8272
-  time: '2025-04-20T05:57:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/33219
-- author: chromiumboy
-  changes:
-  - message: The countdown timer for emergency broadcast cooldowns are now consistent
-      across holopad UIs
-    type: Fix
-  id: 8273
-  time: '2025-04-20T05:58:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34115
-- author: ArtisticRoomba
-  changes:
-  - message: Filing cabinet drawers have the same internal storage size as tall filing
-      cabinets.
-    type: Tweak
-  id: 8274
-  time: '2025-04-20T06:01:28.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36757
-- author: CubixThree
-  changes:
-  - message: Added plural pride pin.
-    type: Add
-  id: 8275
-  time: '2025-04-20T07:00:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36744
-- author: Helm
-  changes:
-  - message: You can now add any reagents to soup!
-    type: Fix
-  id: 8276
-  time: '2025-04-20T09:32:02.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34633
-- author: Nox38, BurgerMoth, ArtisticRoomba
-  changes:
-  - message: Added descriptions to all .35 auto cartridges, magazines, and ammo boxes.
-    type: Add
-  id: 8277
-  time: '2025-04-20T11:51:27.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36085
-- author: Pgriha
-  changes:
-  - message: SWAT, ERT, Riot and some other helmets are now hiding head markings.
-    type: Fix
-  id: 8278
-  time: '2025-04-20T11:52:31.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36074
-- author: RedBookcase
-  changes:
-  - message: More items can be processed by the station's Recyclers.
-    type: Add
-  id: 8279
-  time: '2025-04-20T11:53:38.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35800
-- author: Alice4267
-  changes:
-  - message: Changed the amount of glass sheets needed to create beakers to 2 on normal
-      autolathe and 1 on hyperconvectional autolathe.
-    type: Tweak
-  - message: Changed the amount of glass sheets needed to create large beakers to
-      4 on normal autolathe and 2 on hyperconvectional autolathe.
-    type: Tweak
-  id: 8280
-  time: '2025-04-20T12:01:08.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34441
-- author: Pgriha
-  changes:
-  - message: Heterochromia for Moth.
-    type: Add
-  id: 8281
-  time: '2025-04-20T12:03:37.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36061
-- author: BackeTako
-  changes:
-  - message: New Salvage doors
-    type: Add
-  id: 8282
-  time: '2025-04-20T12:03:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36375
-- author: HyperB1
-  changes:
-  - message: Departmental shelves can now contain a wider variety of items.
-    type: Tweak
-  id: 8283
-  time: '2025-04-20T12:19:11.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34292
-- author: ScarKy0
-  changes:
-  - message: Cargo will receive slightly less mail, but will earn more spesos from
-      it. Overall earnings are still on average the same.
-    type: Tweak
-  id: 8284
-  time: '2025-04-20T13:55:23.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36767
-- author: HyperB1
-  changes:
-  - message: ERT engineering hardsuit now features proper fire protection.
-    type: Fix
-  id: 8285
-  time: '2025-04-20T14:06:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34949
-- author: K-Dynamic
-  changes:
-  - message: Nonlethal throwables crate can be ordered from cargo (2500 spesos) and
-      contains 4x bolas, 4x flashbang grenades, 4x tear gas grenades, 4x stinger grenades.
-    type: Add
-  id: 8286
-  time: '2025-04-20T14:08:02.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35808
-- author: RedBookcase
-  changes:
-  - message: Updated Pirate weapons & hardsuits to be more inline with similar items.
-    type: Tweak
-  id: 8287
-  time: '2025-04-20T20:55:42.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35986
-- author: Booblesnoot42
-  changes:
-  - message: The sprites for the main chapel altars have been adjusted.
-    type: Tweak
-  id: 8289
-  time: '2025-04-20T21:09:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35685
-- author: UBlueberry
-  changes:
-  - message: Beanies can now be found in WinterDrobes, don'tchaknow.
-    type: Add
-  id: 8290
-  time: '2025-04-20T21:15:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32946
-- author: Lanedon
-  changes:
-  - message: Santa hats can now be folded to remove the beard.
-    type: Tweak
-  id: 8291
-  time: '2025-04-20T21:17:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36510
-- author: Princess Cheeseballs
-  changes:
-  - message: Items now slip on slippery surfaces
-    type: Add
-  - message: Puddle slipperiness has been tweaked to be more intuitive
-    type: Tweak
-  id: 8292
-  time: '2025-04-20T21:27:12.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35845
-- author: uhbg
-  changes:
-  - message: The Bartender can now make Eggnog by shaking an egg, milk, and rum.
-    type: Add
-  id: 8293
-  time: '2025-04-20T21:27:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34065
-- author: notquitehadouken
-  changes:
-  - message: Kill objectives will now always require you to maroon your target.
-    type: Tweak
-  id: 8294
-  time: '2025-04-20T21:34:19.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35825
-- author: Entvari
-  changes:
-  - message: Added a new Wizard headset.
-    type: Add
-  - message: The Wizard now starts with the Wizard headset.
-    type: Tweak
-  id: 8295
-  time: '2025-04-20T21:38:30.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35732
-- author: aada
-  changes:
-  - message: Filter categories added to the circuit imprinter.
-    type: Add
-  id: 8296
-  time: '2025-04-20T22:27:49.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35713
-- author: ScarKy0
-  changes:
-  - message: Mail spawning has been reworked. The mail teleporter now has to be manually
-      emptied to take all the mail out. (You can do it by alt-clicking it or using
-      a verb)
-    type: Tweak
-  - message: The mail teleporter now has an internal capacity of 20. It will not spawn
-      mail past that until emptied by someone.
-    type: Add
-  id: 8297
-  time: '2025-04-21T09:32:18.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36774
-- author: ScarKy0
-  changes:
-  - message: Default cargo split is now 50% instead of 75%. Lockboxes remain unchanged.
-    type: Tweak
-  id: 8298
-  time: '2025-04-21T10:32:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36800
-- author: Phooooooooooooooooooooooooooooooosphate
-  changes:
-  - message: Add the medical HUDs to medical's loadout.
-    type: Add
-  id: 8299
-  time: '2025-04-21T12:07:33.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32847
-- author: aada
-  changes:
-  - message: Hotplates and kitchen grills can now be anchored on tables.
-    type: Fix
-  - message: Hotplates and kitchen grills now collide with walls.
-    type: Fix
-  id: 8300
-  time: '2025-04-21T15:38:23.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34776
-- author: insoPL
-  changes:
-  - message: being able to drag certain food items onto drain and chemmasters
-    type: Fix
-  id: 8301
-  time: '2025-04-21T15:50:07.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34683
-- author: Hrosts
-  changes:
-  - message: Added rehydratable mop bucket cube, replacing the big and unwieldy yellow
-      bucket in the janitorial supplies crate.
-    type: Add
-  id: 8302
-  time: '2025-04-21T17:16:25.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34586
-- author: K-Dynamic
-  changes:
-  - message: Increased ratio of crew to thieves from 15 to 20.
-    type: Tweak
-  id: 8303
-  time: '2025-04-21T17:24:28.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36531
-- author: centcomofficer24
-  changes:
-  - message: Added a genderfluid pin!
-    type: Add
-  id: 8304
-  time: '2025-04-21T17:46:34.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/35854
-- author: ScarKy0
-  changes:
-  - message: Station AI now has a name identifier appended after their name.
-    type: Tweak
-  id: 8305
-  time: '2025-04-21T17:54:51.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36801
-- author: lzk228
-  changes:
-  - message: Fix identity reveal for creaming and meat spike popups.
-    type: Fix
-  id: 8306
-  time: '2025-04-21T20:15:20.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32003
-- author: ShadowCommander
-  changes:
-  - message: Added firelock lights for pressure and temperature warnings.
-    type: Add
-  id: 8307
-  time: '2025-04-21T22:39:29.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/28339
-- author: lzk228
-  changes:
-  - message: Bots now can examine, use zoom and see their alerts (health & stamina).
-    type: Tweak
-  - message: Added borgs emotes to bots.
-    type: Tweak
-  id: 8308
-  time: '2025-04-21T22:49:43.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/29949
-- author: Ghagliiarghii
-  changes:
-  - message: The monkey version of captain uniforms and the hamster version of captain
-      hats updated to match humanoid versions
-    type: Tweak
-  id: 8309
-  time: '2025-04-22T01:03:36.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/36804
 - author: Doc-Michael
   changes:
   - message: Changed protection values of Security Hardsuits
@@ -3898,3 +3594,316 @@
   id: 8781
   time: '2025-07-17T17:01:37.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/36425
+- author: ScarKy0
+  changes:
+  - message: There have been major tweaks to the contraband and emag vendor tables.
+      Mainly emagged inventories now only contain syndie flavor items(clothing and
+      similiar), while the rest has either been moved to the contraband inventory
+      or removed.
+    type: Tweak
+  id: 8782
+  time: '2025-07-17T21:36:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/36839
+- author: ScarKy0
+  changes:
+  - message: Added the acolyte armor to the chaplain's uplink.
+    type: Add
+  - message: Syndicate bundles are now correctly marked as syndicate contraband.
+    type: Fix
+  id: 8783
+  time: '2025-07-17T22:00:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/36843
+- author: SeaWyrm
+  changes:
+  - message: Four varieties of marble tile can now be produced at Cutter lathes.
+    type: Add
+  id: 8784
+  time: '2025-07-17T23:44:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38007
+- author: august-sun
+  changes:
+  - message: Added Estoc magazines to the syndicate ammo bundle.
+    type: Add
+  id: 8785
+  time: '2025-07-18T10:35:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38413
+- author: Kowlin
+  changes:
+  - message: The access configurator can now set GenPop enter and leave accesses on
+      doors and turnstiles.
+    type: Tweak
+  id: 8786
+  time: '2025-07-18T10:53:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39043
+- author: Quantum-cross
+  changes:
+  - message: The bartender's mailing unit on plasma is properly configured.
+    type: Fix
+  id: 8787
+  time: '2025-07-18T10:54:34.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38098
+- author: Quantum-cross
+  changes:
+  - message: Unwarmed honk pockets no longer contain omnizine
+    type: Fix
+  - message: Honk pockets make you honk
+    type: Fix
+  id: 8788
+  time: '2025-07-18T11:03:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38152
+- author: TeenSarlacc
+  changes:
+  - message: Lowered Double Barrel shotgun spread to 60%.
+    type: Tweak
+  - message: Increased Sawn Off shotgun spread to 140%.
+    type: Tweak
+  id: 8789
+  time: '2025-07-18T11:41:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37731
+- author: notquitehadouken
+  changes:
+  - message: Mass scanner now shows any grid's distance from the current grid/entity
+      in tiles instead of from the top left corner of the UI in pixels
+    type: Fix
+  id: 8790
+  time: '2025-07-18T15:33:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39041
+- author: Pyrovi
+  changes:
+  - message: Changed some outdated info in the guidebook
+    type: Tweak
+  id: 8791
+  time: '2025-07-19T01:41:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38987
+- author: TiniestShark
+  changes:
+  - message: Adds a new slot for the Golden Plunger on the Janitor Trolley.
+    type: Add
+  - message: Holo and Magicarp plushies now show up in the mop bucket properly.
+    type: Tweak
+  id: 8792
+  time: '2025-07-19T15:33:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38494
+- author: Boaz1111
+  changes:
+  - message: More atmos devices can now be constructed on layers from the construction
+      menu.
+    type: Add
+  id: 8793
+  time: '2025-07-19T22:04:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38672
+- author: IgorAnt028
+  changes:
+  - message: The color of the pipe in a hand now matches the real color of the pipe
+    type: Fix
+  id: 8794
+  time: '2025-07-19T22:10:38.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/30645
+- author: Princess-Cheeseballs
+  changes:
+  - message: Added crawling!
+    type: Add
+  id: 8795
+  time: '2025-07-19T23:54:42.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/36881
+- author: Princess-Cheeseballs
+  changes:
+  - message: Turrets and NPCs can now shoot downed targets.
+    type: Tweak
+  id: 8796
+  time: '2025-07-20T21:23:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39085
+- author: sowelipililimute
+  changes:
+  - message: SmartFridges are now implemented. You can store large amounts of chemicals
+      and plants within them for people to take.
+    type: Add
+  id: 8797
+  time: '2025-07-21T03:21:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38648
+- author: ArtisticRoomba
+  changes:
+  - message: China-lake fragmentation grenades now spew fragmentation in all directions
+      upon impact. They now do reduced explosion damage.
+    type: Tweak
+  - message: China-lake blast grenades no longer cause spacing.
+    type: Tweak
+  id: 8798
+  time: '2025-07-22T15:05:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39106
+- author: perryprog
+  changes:
+  - message: Void applause should now function as expected again.
+    type: Fix
+  id: 8799
+  time: '2025-07-22T19:34:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38731
+- author: treytipton
+  changes:
+  - message: Made NukeOps elimination announcement less wordy.
+    type: Tweak
+  id: 8800
+  time: '2025-07-23T02:58:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39158
+- author: lzk228
+  changes:
+  - message: The customvote command results now show the title the command had.
+    type: Tweak
+  id: 8801
+  time: '2025-07-23T14:15:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39137
+- author: FairlySadPanda
+  changes:
+  - message: Almost every instrument has been updated to a new soundfont (GeneralUser-GS),
+      unifying all operating systems and massively improving the sound of certain
+      instruments.
+    type: Add
+  id: 8802
+  time: '2025-07-23T15:51:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39142
+- author: slarticodefast
+  changes:
+  - message: Enabled the "showrot", "showvel" and "showangvel" commands for debug
+      permissions.
+    type: Tweak
+  - message: Fixed the "showplayervelocity" command permissions.
+    type: Tweak
+  id: 8803
+  time: '2025-07-23T18:06:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39167
+- author: Lokachop
+  changes:
+  - message: The engineering & chief engineer's hardsuit now properly glow in the
+      dark
+    type: Fix
+  id: 8804
+  time: '2025-07-24T03:04:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39153
+- author: K-Dynamic
+  changes:
+  - message: Cold slowdowns are now less impactful.
+    type: Tweak
+  id: 8805
+  time: '2025-07-24T09:44:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/36316
+- author: B-Kirill
+  changes:
+  - message: The AI eye now has a postscript with the name of AI itself.
+    type: Add
+  id: 8806
+  time: '2025-07-24T11:24:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39177
+- author: SlamBamActionman
+  changes:
+  - message: Potassium-water explosion damage scaling has been tweaked to be less
+      potent.
+    type: Tweak
+  id: 8807
+  time: '2025-07-25T16:04:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37924
+- author: SlamBamActionman
+  changes:
+  - message: Chemistry foam and smoke reactions now trigger after regular mix reactions.
+    type: Tweak
+  - message: Foam, smoke and explosion reactions no longer transfer the reagents'
+      energies to the container.
+    type: Tweak
+  id: 8808
+  time: '2025-07-25T16:33:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37915
+- author: Quantum-cross
+  changes:
+  - message: Fixed pinpointer arrow not being centered properly.
+    type: Fix
+  id: 8809
+  time: '2025-07-25T19:46:42.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38657
+- author: PJB3005
+  changes:
+  - message: Made most plushie sounds quieter, and made plushies slower to use.
+    type: Tweak
+  id: 8811
+  time: '2025-07-28T07:11:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39250
+- author: EmoGarbage404
+  changes:
+  - message: Fixed being unable to fold certain clothing while worn.
+    type: Fix
+  id: 8812
+  time: '2025-07-28T10:19:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39257
+- author: lzk228
+  changes:
+  - message: Janibelt can hold the golden plunger now.
+    type: Fix
+  id: 8813
+  time: '2025-07-28T12:59:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39213
+- author: SuperGDPWYL
+  changes:
+  - message: The Warden now starts with a network configurator in their locker.
+    type: Add
+  id: 8814
+  time: '2025-07-28T16:09:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39254
+- author: TrixxedHeart
+  changes:
+  - message: Several strange sprite issues with Vox have been fixed, most notably
+      jumpsuits and many neck items overlapping the face, as well as a layering issue
+      where their tank would appear over their hair.
+    type: Fix
+  id: 8815
+  time: '2025-07-28T21:28:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39219
+- author: K-Dynamic
+  changes:
+  - message: Quartermaster job and ID icons are now based on Cargo Technicians.
+    type: Tweak
+  id: 8816
+  time: '2025-07-29T07:34:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39259
+- author: Alkheemist
+  changes:
+  - message: Protected Grids can now again have their hull and tiles repaired (Evac,
+      ATS, etc)
+    type: Fix
+  - message: Protected Grids can no longer be expanded outside of their original size.
+    type: Fix
+  id: 8817
+  time: '2025-07-29T12:01:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39271
+- author: Admiral-Obvious-001
+  changes:
+  - message: Several advanced chemicals now act slower, but with raised OD thresholds
+      and lowered OD damage. The healing per unit remains largely the same.
+    type: Tweak
+  - message: Bicaradine no longer makes razorium when mixed with advanced brute chems.
+      Advanced brute chems still mix and create razorium when combined.
+    type: Tweak
+  id: 8818
+  time: '2025-07-29T18:52:42.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38811
+- author: aada
+  changes:
+  - message: Lipolicide now continues to poison at 0 hunger.
+    type: Fix
+  - message: Tricordrazine now also heals at exactly 50 damage instead of needing
+      to be below 50. Similar thresholds on other reagents tweaked the same.
+    type: Tweak
+  id: 8819
+  time: '2025-07-30T06:44:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/36289
+- author: Disp-Dev
+  changes:
+  - message: A new recipe has been added, moth-edible cotton cakes.
+    type: Add
+  id: 8820
+  time: '2025-07-30T22:51:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39222
+- author: spanky-spanky
+  changes:
+  - message: The wizard now spawns in a den instead of a shuttle.
+    type: Tweak
+  id: 8821
+  time: '2025-07-31T04:08:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37701
diff --git a/Resources/Changelog/ChangelogStarlight.yml b/Resources/Changelog/ChangelogStarlight.yml
index 787a124765b6..91477ae186fc 100644
--- a/Resources/Changelog/ChangelogStarlight.yml
+++ b/Resources/Changelog/ChangelogStarlight.yml
@@ -11604,5 +11604,478 @@ Entries:
   id: 139800
   time: '2025-08-19T19:44:44.000000+00:00'
   url: https://github.com/ss14Starlight/space-station-14/pull/1398
+- author: MaxAlpine
+  changes:
+  - message: removed duplicated service request computer (dumb)
+    type: Fix
+  id: 135300
+  time: '2025-08-15T09:12:10.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1353
+- author: MaxAlpine
+  changes:
+  - message: some missing floor tiles under doors too
+    type: Fix
+  id: 135301
+  time: '2025-08-15T09:12:10.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1353
+- author: Trep_Maul
+  changes:
+  - message: Leth SM/TEG separate round start.
+    type: Tweak
+  id: 135100
+  time: '2025-08-15T09:14:59.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1351
+- author: Trep_Maul
+  changes:
+  - message: (Leth) a lot of small stuff.
+    type: Add
+  id: 135101
+  time: '2025-08-15T09:14:59.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1351
+- author: STARLIGHT TEAM
+  changes:
+  - message: The maximum pressure for the supermatter has been increased by 60.
+    type: Tweak
+  id: 135200
+  time: '2025-08-15T09:18:56.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1352
+- author: STARLIGHT TEAM
+  changes:
+  - message: The maximum temperature has been increased to 200.
+    type: Tweak
+  id: 135201
+  time: '2025-08-15T09:18:56.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1352
+- author: STARLIGHT TEAM
+  changes:
+  - message: Crystal destruction now lasts at least 3 minutes instead of 2.
+    type: Tweak
+  id: 135202
+  time: '2025-08-15T09:18:56.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1352
+- author: STARLIGHT TEAM
+  changes:
+  - message: Maximum radiation is capped at 50 instead of 100.
+    type: Tweak
+  id: 135203
+  time: '2025-08-15T09:18:56.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1352
+- author: STARLIGHT TEAM
+  changes:
+  - message: The supermatter cascade no longer destroys items on the tiles it fills.
+    type: Tweak
+  id: 135204
+  time: '2025-08-15T09:18:56.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1352
+- author: STARLIGHT TEAM
+  changes:
+  - message: But it does explode instead.
+    type: Tweak
+  id: 135205
+  time: '2025-08-15T09:18:56.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1352
+- author: STARLIGHT TEAM
+  changes:
+  - message: Nulllink whitelist
+    type: Add
+  id: 133800
+  time: '2025-08-16T06:03:50.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1338
+- author: Quini98
+  changes:
+  - message: Alternative CBURN Shuttle
+    type: Add
+  id: 133100
+  time: '2025-08-16T06:57:16.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1331
+- author: Quini98
+  changes:
+  - message: Gamerule to call new Shuttle
+    type: Add
+  id: 133101
+  time: '2025-08-16T06:57:16.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1331
+- author: CrazyPhantom
+  changes:
+  - message: Added 2h Bartender Playtime Requirement for PunPun
+    type: Add
+  id: 134000
+  time: '2025-08-16T06:59:46.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1340
+- author: CrazyPhantom
+  changes:
+  - message: Removed Engineering Playtime Requirement for Derelict Cyborg
+    type: Remove
+  id: 134001
+  time: '2025-08-16T06:59:46.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1340
+- author: CrazyPhantom
+  changes:
+  - message: Added Same Playtime Requirement for Derelict Cyborg to Derelict Borgi
+    type: Add
+  id: 134002
+  time: '2025-08-16T06:59:46.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1340
+- author: Conflee
+  changes:
+  - message: Added a 'Doxes-the-Captain' Plushie, found in the Hug Dispenser
+    type: Add
+  id: 127600
+  time: '2025-08-16T07:03:34.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1276
+- author: RoadTrain
+  changes:
+  - message: AI can now use shuttle consoles. You can now truly roleplay being HAL
+      aboard Reach.
+    type: Add
+  id: 127300
+  time: '2025-08-16T07:05:36.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1273
+- author: walksanatora
+  changes:
+  - message: Staff of healing can now be bought by the wizard for 2wc
+    type: Add
+  id: 113400
+  time: '2025-08-16T07:10:32.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1134
+- author: walksanatora
+  changes:
+  - message: free wizard spell. it summons a slice of cheese ever 15 seconds. savor
+      it.
+    type: Add
+  id: 113401
+  time: '2025-08-16T07:10:32.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1134
+- author: walksanatora
+  changes:
+  - message: Event spells only turn 10% of the station into free-agents (not that
+      you can get them)
+    type: Tweak
+  id: 113402
+  time: '2025-08-16T07:10:32.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1134
+- author: Scarlet Lightweaver
+  changes:
+  - message: A new foe has apeared in the ghost theme tab!
+    type: Add
+  id: 130300
+  time: '2025-08-16T07:13:58.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1303
+- author: TheRealSlimRedwoods
+  changes:
+  - message: Head of Security now gets his blue and grey counterpart. You still owe
+      that beer you know? (blue shirt and tie is now in the loadout)
+    type: Add
+  id: 134600
+  time: '2025-08-16T07:15:51.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1346
+- author: neomoth, leg
+  changes:
+  - message: koni plushie
+    type: Add
+  id: 132300
+  time: '2025-08-16T07:25:01.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1323
+- author: walksanatora
+  changes:
+  - message: mentors can now mghost and tpto the subject of tickets to aid in providing
+      support
+    type: Add
+  id: 109700
+  time: '2025-08-16T07:30:53.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1097
+- author: walksanatora
+  changes:
+  - message: mentors can now turn off mentor pings.
+    type: Add
+  id: 109701
+  time: '2025-08-16T07:30:53.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1097
+- author: Trosling
+  changes:
+  - message: Fixed Omnitools and Multitools requiring fuel even when not actually
+      welding
+    type: Fix
+  id: 120200
+  time: '2025-08-16T07:35:03.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1202
+- author: walksanatora
+  changes:
+  - message: chaplains can cure cluwnification with a 1/30 chance on every successful
+      bible thwack.
+    type: Add
+  id: 106500
+  time: '2025-08-16T07:41:25.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1065
+- author: Happyrobot33
+  changes:
+  - message: Added dynamic examine text for knockback component.
+    type: Add
+  id: 128200
+  time: '2025-08-16T07:47:56.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1282
+- author: Trosling
+  changes:
+  - message: Re-added Cluwne at 5 wizcoin, only available when server population is
+      above 80, on trial basis
+    type: Tweak
+  id: 123900
+  time: '2025-08-16T07:49:54.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1239
+- author: Aedler
+  changes:
+  - message: End of Round now triggers on Shuttle Launch instead of CentComm docking.
+      Round restart timer has been extended.
+    type: Tweak
+  id: 105000
+  time: '2025-08-16T07:52:15.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1050
+- author: walksanatora
+  changes:
+  - message: Cargo's Mail teleporter can now be emagged to re-weight it's tables towards
+      more chaotic and evil items
+    type: Add
+  id: 120000
+  time: '2025-08-16T08:03:19.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1200
+- author: PubliclyExecutedPig
+  changes:
+  - message: Added admin only buffed xenos
+    type: Add
+  id: 99500
+  time: '2025-08-16T08:09:16.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/995
+- author: IQlvlZero
+  changes:
+  - message: added the very original Killa Tamale Plush
+    type: Add
+  id: 102200
+  time: '2025-08-16T08:11:37.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1022
+- author: Trosling
+  changes:
+  - message: HP scaling system added based on population
+    type: Tweak
+  id: 122800
+  time: '2025-08-16T08:14:39.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1228
+- author: Rinary
+  changes:
+  - message: Added working operating computer(body scanner).
+    type: Add
+  id: 131400
+  time: '2025-08-16T08:17:55.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1314
+- author: Rinary
+  changes:
+  - message: Now when you open incision, patient starts bleeding.
+    type: Tweak
+  id: 131401
+  time: '2025-08-16T08:17:55.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1314
+- author: Rinary
+  changes:
+  - message: Operation table now don't healing patient.
+    type: Tweak
+  id: 131402
+  time: '2025-08-16T08:17:55.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1314
+- author: Citrea
+  changes:
+  - message: Several items can now be used as *very* inefficient surgery tools to
+      enable full back-alley surgeries.
+    type: Tweak
+  id: 131200
+  time: '2025-08-16T08:20:15.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1312
+- author: RoadTrain
+  changes:
+  - message: Adv. chem module now gets automenders
+    type: Add
+  id: 124200
+  time: '2025-08-16T08:22:07.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1242
+- author: RoadTrain
+  changes:
+  - message: Removed diagnosis module (stethoscope is in the rescue module). It wasn't
+      being used anyway and was literally useless.
+    type: Remove
+  id: 124201
+  time: '2025-08-16T08:22:07.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1242
+- author: RoadTrain
+  changes:
+  - message: Syndie mediborg loses rescue module, gains weapon module.
+    type: Tweak
+  id: 124202
+  time: '2025-08-16T08:22:07.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1242
+- author: CrazyPhantom
+  changes:
+  - message: Added BrigMedic Access to HoP
+    type: Add
+  id: 134100
+  time: '2025-08-16T08:25:48.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1341
+- author: CrazyPhantom
+  changes:
+  - message: Added Lawyer and Brigmed Access to BSO
+    type: Add
+  id: 134101
+  time: '2025-08-16T08:25:48.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1341
+- author: stickycheZ101
+  changes:
+  - message: made the QM's luxury maxim hardsuit not blindingly bright when the helmet
+      is equipped (it's now toggleable)
+    type: Tweak
+  id: 116900
+  time: '2025-08-16T08:57:58.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1169
+- author: FoxxoTrystan
+  changes:
+  - message: You can now offer items in your hands to others.
+    type: Add
+  id: 108600
+  time: '2025-08-16T08:59:45.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1086
+- author: Rinary
+  changes:
+  - message: 'Added new reward type to railroading system: Delivery.'
+    type: Add
+  id: 127500
+  time: '2025-08-18T06:54:02.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1275
+- author: Rinary
+  changes:
+  - message: Now AI can lock/unlock lockers(not cabinets).
+    type: Tweak
+  id: 128900
+  time: '2025-08-18T06:57:17.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1289
+- author: Rinary
+  changes:
+  - message: Now all lockers have maintenance panel with access, AI, power and log
+      wires.
+    type: Tweak
+  id: 128901
+  time: '2025-08-18T06:57:17.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1289
+- author: Rinary
+  changes:
+  - message: Now locker destruction much harder.
+    type: Tweak
+  id: 128902
+  time: '2025-08-18T06:57:17.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1289
+- author: Rinary
+  changes:
+  - message: Fixed bug with double popup, when you trying to open locker without access.
+    type: Fix
+  id: 128903
+  time: '2025-08-18T06:57:17.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1289
+- author: STARLIGHT TEAM, walksanatora
+  changes:
+  - message: another upstream merge.
+    type: Tweak
+  id: 121300
+  time: '2025-08-19T03:57:11.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1213
+- author: STARLIGHT TEAM, walksanatora
+  changes:
+  - message: gave wizard their shuttle back
+    type: Tweak
+  id: 121301
+  time: '2025-08-19T03:57:11.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1213
+- author: STARLIGHT TEAM, walksanatora
+  changes:
+  - message: reverted chem nerf
+    type: Tweak
+  id: 121302
+  time: '2025-08-19T03:57:11.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1213
+- author: STARLIGHT TEAM, walksanatora
+  changes:
+  - message: made upstream's moff cake recipe result in our moff cake
+    type: Tweak
+  id: 121303
+  time: '2025-08-19T03:57:11.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1213
+- author: CringeCursed
+  changes:
+  - message: Pricing for items in vending machines
+    type: Add
+  id: 134300
+  time: '2025-08-19T05:12:44.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1343
+- author: CringeCursed
+  changes:
+  - message: end-round stats for Abductors
+    type: Add
+  id: 137900
+  time: '2025-08-19T06:29:58.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1379
+- author: Rinary
+  changes:
+  - message: Fixed issue, when you trying to set dominator mode and after that it
+      instantly changes back to default.
+    type: Fix
+  id: 137200
+  time: '2025-08-19T06:43:27.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1372
+- author: Rinary
+  changes:
+  - message: Fixed screens updating.
+    type: Fix
+  id: 139200
+  time: '2025-08-19T17:01:12.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1392
+- author: Happyrobot33
+  changes:
+  - message: Rollback reverted
+    type: Add
+  id: 139900
+  time: '2025-08-19T20:09:33.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1399
+- author: STARLIGHT TEAM
+  changes:
+  - message: The experiment failed, we’re bringing back real weapons. If you get hurt
+      again, we’ll swap them out for nerf guns again.
+    type: Tweak
+  id: 140000
+  time: '2025-08-19T20:15:04.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1400
+- author: walksanatora
+  changes:
+  - message: Wizard gamerule now actually spawns the wizard shuttle instead of doing
+      nothing
+    type: Fix
+  id: 140100
+  time: '2025-08-19T21:07:44.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1401
+- author: CringeCursed
+  changes:
+  - message: Transfer tab on ATM now have functionality
+    type: Add
+  id: 138700
+  time: '2025-08-20T17:14:00.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1387
+- author: walksanatora
+  changes:
+  - message: the wizard has stopped halucinating extra cheese from spawning some from
+      the void.
+    type: Fix
+  id: 140300
+  time: '2025-08-20T17:34:48.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1403
+- author: Trosling
+  changes:
+  - message: Added one year anniversary monument
+    type: Add
+  id: 138400
+  time: '2025-08-20T17:38:35.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/1384
 Order: -1
 
diff --git a/Resources/Changelog/Maps.yml b/Resources/Changelog/Maps.yml
index 964818ecd3c3..eedb37e5bd3c 100644
--- a/Resources/Changelog/Maps.yml
+++ b/Resources/Changelog/Maps.yml
@@ -413,4 +413,86 @@ Entries:
   id: 50
   time: '2025-07-10T18:16:06.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/38829
+- author: WarPigeon
+  changes:
+  - message: The salvage airlock on Bagel should no longer space the cargo bay.
+    type: Fix
+  id: 51
+  time: '2025-07-19T19:40:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/38956
+- author: CroilBird
+  changes:
+  - message: Added Polly to Bagel station
+    type: Add
+  id: 52
+  time: '2025-07-23T00:09:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39147
+- author: CroilBird
+  changes:
+  - message: Added Polly to Oasis station
+    type: Add
+  id: 53
+  time: '2025-07-23T00:11:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39146
+- author: CroilBird
+  changes:
+  - message: Added Polly to Exo station
+    type: Add
+  id: 54
+  time: '2025-07-23T00:35:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39145
+- author: CroilBird
+  changes:
+  - message: Added Polly to Fland station
+    type: Add
+  id: 55
+  time: '2025-07-23T00:36:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39144
+- author: CroilBird
+  changes:
+  - message: Added Polly to Packed station
+    type: Add
+  id: 56
+  time: '2025-07-23T00:38:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39143
+- author: CroilBird
+  changes:
+  - message: Added Polly to Marathon station
+    type: Add
+  id: 57
+  time: '2025-07-23T00:41:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39141
+- author: CroilBird
+  changes:
+  - message: Added Polly to Box station
+    type: Add
+  id: 58
+  time: '2025-07-23T00:44:12.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39140
+- author: CroilBird
+  changes:
+  - message: Added Polly to Amber station
+    type: Add
+  id: 59
+  time: '2025-07-23T00:52:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39139
+- author: CroilBird
+  changes:
+  - message: On Plasma, added Polly to the CE's office.
+    type: Add
+  - message: On Plasma, removed a pipe router that to mail routing problems.
+    type: Fix
+  - message: On Plasma, removed a leftover waste pipe from underneath the science
+      circuit imprinter.
+    type: Fix
+  id: 60
+  time: '2025-07-23T00:53:50.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39138
+- author: CroilBird
+  changes:
+  - message: Added Polly to Elkridge station
+    type: Add
+  id: 61
+  time: '2025-07-23T00:55:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/39150
 Order: 1
diff --git a/Resources/ConfigPresets/WizardsDen/vulture.toml b/Resources/ConfigPresets/WizardsDen/vulture.toml
index 0e89f6374113..8eccfa48e19f 100644
--- a/Resources/ConfigPresets/WizardsDen/vulture.toml
+++ b/Resources/ConfigPresets/WizardsDen/vulture.toml
@@ -14,6 +14,3 @@ force_client_hud_version_watermark = true
 
 [chat]
 motd = "\n########################################################\n\n[font size=17]This is a test server. You can play with the newest changes to the game, but these [color=red]changes may not be final or stable[/color], and may be reverted. Please report bugs via our GitHub, forum, or community Discord.[/font]\n\n########################################################\n"
-
-[debug]
-pow3r_disable_parallel = false
diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
index 467de6b2251b..d171df5b5df0 100644
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
@@ -1 +1 @@
-0leshe, 0tito, 0x6273, 12rabbits, 1337dakota, 13spacemen, 154942, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 3nderall, 4310v343k, 4dplanner, 612git, 778b, 96flo, aaron, abadaba695, Ablankmann, abregado, Absolute-Potato, Absotively, achookh, Acruid, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, adm2play, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, AftrLite, AgentSmithRadio, Agoichi, Ahion, aiden, Aidenkrz, Aisu9, ajcm, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alice4267, Alithsko, alliephante, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, Anzarot121, ApolloVector, Appiah, ar4ill, archee1, ArchPigeon, ArchRBX, areitpog, Arendian, areyouconfused, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, AverageNotDoingAnythingEnjoyer, avghdev, Awlod, azzyisnothere, AzzyIsNotHere, B-Kirill, B3CKDOOR, baa14453, BackeTako, Bakke, BananaFlambe, Baptr0b0t, BarryNorfolk, BasedUser, beck-thompson, beesterman, bellwetherlogic, ben, benbryant0, benev0, benjamin-burges, BGare, bhespiritu, bibbly, BigfootBravo, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blitzthesquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Bokser815, bolantej, Booblesnoot42, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, BriBrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, BWTCK, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, Camdot, capnsockless, CaptainMaru, captainsqrbeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, catdotjs, catlord, Catofquestionableethics, CatTheSystem, Centronias, Chaboricks, chairbender, Chaoticaa, Charlese2, charlie, chartman, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, CheesePlated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, ciaran, citrea, civilCornball, claustro305, Clement-O, clyf, Clyybber, CMDR-Piboy314, cnv41, coco, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, Compilatron144, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, cooperwallace, corentt, CormosLemming, CrafterKolyan, crazybrain23, Crazydave91920, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, cryals, CrzyPotato, cubixthree, cutemoongod, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, dan, dangerrevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DeepwaterCreations, Deerstop, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, DieselMohawk, digitalic, Dimastra, DinnerCalzone, DinoWattz, Disp-Dev, DisposableCrewmember42, dissidentbullet, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DR-DOCTOR-EVIL-EVIL, Dragonjspider, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, DuckManZach, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, dylanwhittingham, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, Entvari, eoineoineoin, ephememory, eris, erohrs2, ERORR404V1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, ewokswagger, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, farrellka-dev, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, firenamefn, Firewars763, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FluffiestFloof, FluffMe, FluidRock, flymo5678, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, foxhorn, freeman2651, freeze2222, frobnic8, Froffy025, Fromoriss, froozigiusz, FrostMando, FrostRibbon, Funce, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gamewar360, gansulalan, GaussiArson, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, Gentleman-Bird, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GnarpGnarp, GNF54, godisdeadLOL, goet, GoldenCan, Goldminermac, Golinth, golubgik, GoodWheatley, Gorox221, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GrownSamoyedDog, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, Hardly3D, harikattar, he1acdvv, Hebi, Helix-ctrl, helm4142, Henry, HerCoyote23, HighTechPuddle, Hitlinemoss, hiucko, hivehum, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hoshizora, Hreno, Hrosts, htmlsystem, hubismal, Hugal31, Huxellberger, Hyenh, hyperb1, hyperDelegate, hyphenationc, i-justuser-i, iaada, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imatsoup, IMCB, impubbi, imrenq, imweax, indeano, Injazz, Insineer, insoPL, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jacktastic09, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jarmer123, Jaskanbe, JasperJRoth, jbox144, JCGWE30, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jkwookee, jmcb, JohnGinnane, johnku1, Jophire, joshepvodka, JpegOfAFrog, jproads, JrInventor05, Jrpl, jukereise, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, kaiserbirch, KaiShibaa, kalane15, kalanosh, KamTheSythe, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Killerqu00, Kimpes, KingFroozy, kira-er, kiri-yoshikage, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, Kittygyat, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kosticia, koteq, Kowlin, KrasnoshchekovPavel, Krunklehorn, Kupie, kxvvv, kyupolaris, kzhanik, LaCumbiaDelCoronavirus, lajolico, Lamrr, lanedon, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LeoSantich, lettern, LetterN, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, liltenhead, linkbro1, linkuyx, Litraxx, little-meow-meow, LittleBuilderJane, LittleNorthStar, LittleNyanCat, lizelive, ljm862, lmsnoise, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, Lusatia, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M1tht1c, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, maland1, malchanceux, MaloTV, ManelNavola, manelnavola, Mangohydra, marboww, Markek1, matt, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, memeproof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterImp, MisterMecky, Mith-randalf, Mixelz, mjarduk, MjrLandWhale, mkanke-real, MLGTASTICa, mnva0, moderatelyaware, modern-nm, mokiros, momo, Moneyl, monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, murolem, musicmanvr, MWKane, Myakot, Myctai, N3X15, nabegator, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikitosych, nikthechampiongr, Nimfar11, ninruB, Nirnael, NIXC, nkokic, NkoKirkto, nmajask, noctyrnal, noelkathegod, noirogen, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, NotSoDana, noudoit, noverd, Nox38, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, Nyxilath, och-och, OctoRocket, OldDanceJacket, OliverOtter, onesch, OneZerooo0, OnyxTheBrave, Orange-Winds, OrangeMoronage9622, Orsoniks, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paige404, paigemaeforrest, pali6, Palladinium, Pangogie, panzer-iv1, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, perryprog, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, pheenty, philingham, Phill101, Phooooooooooooooooooooooooooooooosphate, phunnyguy, PicklOH, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, Pissachu, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PotRoastPiggy, Princess-Cheeseballs, ProfanedBane, PROG-MohamedDwidar, Prole0, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, pumkin69, PuroSlavKing, PursuitInAshes, Putnam3145, py01, qrtDaniil, qrwas, Quantum-cross, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, ReeZer2, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, RobbyTheFish, robinthedragon, Rockdtben, Rohesie, rok-povsic, rokudara-sen, rolfero, RomanNovo, rosieposieeee, Roudenn, router, ruddygreat, rumaks, RumiTiger, Ruzihm, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samuka-C, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, SeamLesss, Segonist, semensponge, sephtasm, Serkket, sewerpig, SG6732, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SharkSnake98, shibechef, SignalWalker, siigiil, silicon14wastaken, Simyon264, sirdragooon, Sirionaut, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skybailey-dev, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, slimmslamm, Slyfox333, Smugman, snebl, snicket, sniperchance, Snowni, snowsignal, SolidusSnek, solstar2, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, soupkilove, southbridge-fur, sowelipililimute, Soydium, spacelizard, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, Spangs04, spanky-spanky, Sparlight, spartak, SpartanKadence, spderman3333, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, starbuckss14, Stealthbomber16, stellar-novas, stewie523, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, supergdpwyl, superjj18, Supernorn, SweptWasTaken, SyaoranFox, Sybil, SYNCHRONIC, Szunti, t, Tainakov, takemysoult, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TeenSarlacc, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, Tezzaide, TGODiamond, TGRCdev, tgrkzus, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, TheBlueYowie, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheFlyingSentry, TheIntoxicatedCat, thekilk, themias, theomund, TheProNoob678, TherapyGoth, ThereDrD0, TheShuEd, thetolbean, thevinter, TheWaffleJesus, thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, TiniestShark, Titian3, tk-a369, tkdrg, tmtmtl30, ToastEnjoyer, Toby222, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, tornado-technology, TornadoTechnology, tosatur, TotallyLemon, ToxicSonicFan04, Tr1bute, trixxedbit, TrixxedHeart, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, TytosB, Tyzemol, UbaserB, ubis1, UBlueberry, uhbg, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, unusualcrow, Uriende, UristMcDorf, user424242420, Utmanarn, Vaaankas, valentfingerov, valquaint, Varen, Vasilis, VasilisThePikachu, veliebm, Velken, VelonacepsCalyxEggs, veprolet, VerinSenpai, veritable-calamity, Veritius, Vermidia, vero5123, verslebas, vexerot, viceemargo, VigersRay, violet754, Visne, vitusveit, vlad, vlados1408, VMSolidus, vmzd, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, Vortebo, vulppine, wafehling, walksanatora, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, whatston3, widgetbeck, Will-Oliver-Br, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, Wolfkey-SomeoneElseTookMyUsername, wrexbe, wtcwr68, xeri7, xkreksx, xprospero, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, YoungThugSS14, Yousifb26, youtissoum, yunii, yuriykiss, YuriyKiss, zach-hill, Zadeon, Zalycon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zHonys, zionnBE, ZNixian, Zokkie, ZoldorfTheWizard, zonespace27, Zylofan, Zymem, zzylex
+0leshe, 0tito, 0x6273, 12rabbits, 1337dakota, 13spacemen, 154942, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 3nderall, 4310v343k, 4dplanner, 612git, 778b, 96flo, aaron, abadaba695, Ablankmann, abregado, Absolute-Potato, Absotively, achookh, Acruid, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, adm2play, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aearo-Deepwater, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, AftrLite, AgentSmithRadio, Agoichi, Ahion, aiden, Aidenkrz, Aisu9, ajcm, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alice4267, Alithsko, alliephante, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, Anzarot121, ApolloVector, Appiah, ar4ill, archee1, ArchPigeon, ArchRBX, areitpog, Arendian, areyouconfused, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, AverageNotDoingAnythingEnjoyer, avghdev, Awlod, AzzyIsNotHere, azzyisnothere, B-Kirill, B3CKDOOR, baa14453, BackeTako, Bakke, BananaFlambe, Baptr0b0t, BarryNorfolk, BasedUser, beck-thompson, beesterman, bellwetherlogic, ben, benbryant0, benev0, benjamin-burges, BGare, bhespiritu, bibbly, BigfootBravo, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blitzthesquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Bokser815, bolantej, Booblesnoot42, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, BriBrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, BWTCK, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, Camdot, capnsockless, CaptainMaru, captainsqrbeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, catdotjs, catlord, Catofquestionableethics, CatTheSystem, Centronias, Chaboricks, chairbender, Chaoticaa, Charlese2, charlie, chartman, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, CheesePlated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, ciaran, citrea, civilCornball, claustro305, Clement-O, clyf, Clyybber, CMDR-Piboy314, cnv41, coco, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, Compilatron144, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, cooperwallace, corentt, CormosLemming, CrafterKolyan, crazybrain23, Crazydave91920, creadth, CrigCrag, CroilBird, Crotalus, CrudeWax, cryals, CrzyPotato, cubixthree, cutemoongod, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, dan, dangerrevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DeepwaterCreations, Deerstop, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, devinschubert14, dexlerxd, dffdff2423, DieselMohawk, digitalic, Dimastra, DinnerCalzone, DinoWattz, Disp-Dev, DisposableCrewmember42, dissidentbullet, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DR-DOCTOR-EVIL-EVIL, Dragonjspider, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, DuckManZach, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, dylanwhittingham, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, Entvari, eoineoineoin, ephememory, eris, erohrs2, ERORR404V1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, ewokswagger, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, farrellka-dev, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, firenamefn, Firewars763, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FlipBrooke, FluffiestFloof, FluffMe, FluidRock, flymo5678, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, foxhorn, freeman2651, freeze2222, frobnic8, Froffy025, Fromoriss, froozigiusz, FrostMando, FrostRibbon, Funce, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gamewar360, gansulalan, GaussiArson, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, Gentleman-Bird, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GnarpGnarp, GNF54, godisdeadLOL, goet, GoldenCan, Goldminermac, Golinth, golubgik, GoodWheatley, Gorox221, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GrownSamoyedDog, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, Hardly3D, harikattar, he1acdvv, Hebi, Helix-ctrl, helm4142, Henry, HerCoyote23, HighTechPuddle, Hitlinemoss, hiucko, hivehum, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hoshizora, Hreno, Hrosts, htmlsystem, hubismal, Hugal31, Huxellberger, Hyenh, hyperb1, hyperDelegate, hyphenationc, i-justuser-i, iaada, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imatsoup, IMCB, impubbi, imrenq, imweax, indeano, Injazz, Insineer, insoPL, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jacktastic09, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jarmer123, Jaskanbe, JasperJRoth, jbox144, JCGWE30, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jkwookee, jmcb, JohnGinnane, johnku1, Jophire, joshepvodka, JpegOfAFrog, jproads, JrInventor05, Jrpl, jukereise, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, kaiserbirch, KaiShibaa, kalane15, kalanosh, KamTheSythe, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Killerqu00, Kimpes, KingFroozy, kira-er, kiri-yoshikage, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, Kittygyat, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kosticia, koteq, kotobdev, Kowlin, KrasnoshchekovPavel, Krunklehorn, Kupie, kxvvv, kyupolaris, kzhanik, LaCumbiaDelCoronavirus, lajolico, Lamrr, lanedon, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LeoSantich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, liltenhead, linkbro1, linkuyx, Litraxx, little-meow-meow, LittleBuilderJane, LittleNorthStar, LittleNyanCat, lizelive, ljm862, lmsnoise, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, Lusatia, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M1tht1c, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, maland1, malchanceux, MaloTV, ManelNavola, manelnavola, Mangohydra, marboww, Markek1, matt, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, memeproof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterImp, MisterMecky, Mith-randalf, Mixelz, mjarduk, MjrLandWhale, mkanke-real, MLGTASTICa, mnva0, moderatelyaware, modern-nm, mokiros, momo, Moneyl, monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, murolem, musicmanvr, MWKane, Myakot, Myctai, N3X15, nabegator, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikitosych, nikthechampiongr, Nimfar11, ninruB, Nirnael, NIXC, nkokic, NkoKirkto, nmajask, noctyrnal, noelkathegod, noirogen, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, NotSoDana, noudoit, noverd, Nox38, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, Nyxilath, och-och, OctoRocket, OldDanceJacket, OliverOtter, onesch, OneZerooo0, OnyxTheBrave, Orange-Winds, OrangeMoronage9622, Orsoniks, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paige404, paigemaeforrest, pali6, Palladinium, Pangogie, panzer-iv1, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, perryprog, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, pheenty, philingham, Phill101, Phooooooooooooooooooooooooooooooosphate, phunnyguy, PicklOH, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, Pissachu, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PotRoastPiggy, Princess-Cheeseballs, ProfanedBane, PROG-MohamedDwidar, Prole0, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, pumkin69, PuroSlavKing, PursuitInAshes, Putnam3145, py01, Pyrovi, qrtDaniil, qrwas, Quantum-cross, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, ReeZer2, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, rhsvenson, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, rlebell33, RobbyTheFish, robinthedragon, Rockdtben, Rohesie, rok-povsic, rokudara-sen, rolfero, RomanNovo, rosieposieeee, Roudenn, router, ruddygreat, rumaks, RumiTiger, Ruzihm, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samuka-C, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, SeamLesss, Segonist, semensponge, sephtasm, Serkket, sewerpig, SG6732, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SharkSnake98, shibechef, SignalWalker, siigiil, silicon14wastaken, Simyon264, sirdragooon, Sirionaut, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skybailey-dev, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, slimmslamm, Slyfox333, Smugman, snebl, snicket, sniperchance, Snowni, snowsignal, SolidusSnek, solstar2, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, soupkilove, southbridge-fur, sowelipililimute, Soydium, spacelizard, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, Spangs04, spanky-spanky, Sparlight, spartak, SpartanKadence, spderman3333, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, starbuckss14, Stealthbomber16, stellar-novas, stewie523, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, supergdpwyl, superjj18, Supernorn, SweptWasTaken, SyaoranFox, Sybil, SYNCHRONIC, Szunti, t, Tainakov, takemysoult, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TeenSarlacc, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, Tezzaide, TGODiamond, TGRCdev, tgrkzus, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, TheBlueYowie, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheFlyingSentry, TheIntoxicatedCat, thekilk, themias, theomund, TheProNoob678, TherapyGoth, ThereDrD0, TheShuEd, thetolbean, thevinter, TheWaffleJesus, thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, TiniestShark, Titian3, tk-a369, tkdrg, tmtmtl30, ToastEnjoyer, Toby222, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, tornado-technology, TornadoTechnology, tosatur, TotallyLemon, ToxicSonicFan04, Tr1bute, treytipton, trixxedbit, TrixxedHeart, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, TytosB, Tyzemol, UbaserB, ubis1, UBlueberry, uhbg, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, unusualcrow, Uriende, UristMcDorf, user424242420, Utmanarn, Vaaankas, valentfingerov, valquaint, Varen, Vasilis, VasilisThePikachu, veliebm, Velken, VelonacepsCalyxEggs, veprolet, VerinSenpai, veritable-calamity, Veritius, Vermidia, vero5123, verslebas, vexerot, viceemargo, VigersRay, violet754, Visne, vitusveit, vlad, vlados1408, VMSolidus, vmzd, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, Vortebo, vulppine, wafehling, walksanatora, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, whatston3, widgetbeck, Will-Oliver-Br, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, Wolfkey-SomeoneElseTookMyUsername, wrexbe, WTCWR68, xeri7, xkreksx, xprospero, xRiriq, xsainteer, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, YoungThugSS14, Yousifb26, youtissoum, yunii, yuriykiss, YuriyKiss, zach-hill, Zadeon, Zalycon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zHonys, zionnBE, ZNixian, Zokkie, ZoldorfTheWizard, zonespace27, Zylofan, Zymem, zzylex
diff --git a/Resources/Locale/en-US/_NullLink/connection-messages.ftl b/Resources/Locale/en-US/_NullLink/connection-messages.ftl
new file mode 100644
index 000000000000..2d0aec9cceaa
--- /dev/null
+++ b/Resources/Locale/en-US/_NullLink/connection-messages.ftl
@@ -0,0 +1,2 @@
+whitelist-roles = You need to have any of the whitelist roles in Discord.
+link-discord = Link Discord
diff --git a/Resources/Locale/en-US/_Starlight/Knockback/knockback.ftl b/Resources/Locale/en-US/_Starlight/Knockback/knockback.ftl
new file mode 100644
index 000000000000..7ecbcb8272a6
--- /dev/null
+++ b/Resources/Locale/en-US/_Starlight/Knockback/knockback.ftl
@@ -0,0 +1,2 @@
+knockback-by-user-tag-component-examine-distance = You will be thrown [color=yellow]{$knockback}[/color] meters {$direction} per shot.
+knockback-by-user-tag-component-examine-stamina = [color=yellow]{$stamina}[/color] stamina damage taken per shot.
diff --git a/Resources/Locale/en-US/_Starlight/abductor/preset-abductor.ftl b/Resources/Locale/en-US/_Starlight/abductor/preset-abductor.ftl
new file mode 100644
index 000000000000..d3ab2c772db1
--- /dev/null
+++ b/Resources/Locale/en-US/_Starlight/abductor/preset-abductor.ftl
@@ -0,0 +1,3 @@
+round-end-prepend-abductor-abducted = [color=Purple]Abductors[/color] abducted [color=Pink]{$number}[/color] unique subjects
+round-end-prepend-abductor-were = [color=Purple]Abductors were:[/color]
+round-end-prepend-abductor-name =  • [color=white]{$name}[/color]
diff --git a/Resources/Locale/en-US/_Starlight/economy/atm-ui.ftl b/Resources/Locale/en-US/_Starlight/economy/atm-ui.ftl
index 5a8c2bfd3eb9..581e50663725 100644
--- a/Resources/Locale/en-US/_Starlight/economy/atm-ui.ftl
+++ b/Resources/Locale/en-US/_Starlight/economy/atm-ui.ftl
@@ -8,6 +8,18 @@ economy-atm-ui-deposit = To make a deposit, insert money into the ATM,
                         while cash deposit incurs a 10% fee. Credits
                         can be used as a 1:1 replacement for Spesos.
 
+# ATM transfer UX
+economy-atm-ui-transfer-help = Enter a recipient character name and amount to transfer
+economy-atm-ui-transfer-target-ph = Recipient character name
+economy-atm-ui-transfer-amount-ph = Amount
+
+# ATM transfer messages
+economy-atm-transfer-error-generic = Transfer failed.
+economy-atm-transfer-error-self = You cannot transfer money to yourself.
+economy-atm-transfer-error-no-recipient = Recipient not found.
+economy-atm-transfer-error-ambiguous = Multiple recipients match that name. Be more specific.
+economy-atm-transfer-success = Transferred {$amount} cr. to {$recipient}.
+
 economy-chat-salary-message = Salary credited, {$amount} cr., sender: {$sender}.
 economy-chat-salary-wrapped-message = [bold]Salary credited, [color=green]{$amount}[/color][/bold] cr., sender: [bold][color={$senderColor}]{$sender}[/color][/bold].
 
diff --git a/Resources/Locale/en-US/_Starlight/hands/hand-offer.ftl b/Resources/Locale/en-US/_Starlight/hands/hand-offer.ftl
new file mode 100644
index 000000000000..a7d6459e1a84
--- /dev/null
+++ b/Resources/Locale/en-US/_Starlight/hands/hand-offer.ftl
@@ -0,0 +1,15 @@
+hands-full = Your hands are full!
+
+offering = You offer {THE($item)} to {$target}
+offering-target = {$user} offers you {THE($item)}
+
+offered = You handed {THE($item)}
+offered-target = {$user} handed you {THE($item)}
+
+unoffer = You stop offering {THE($item)}
+unoffer-target = {$user} is no longer offering {THE($item)} to you
+
+offer = Offer {THE($item)}
+
+alerts-offer-name = Offer
+alerts-offer-desc = you are being offered an item
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_Starlight/machine-linking/receiver_ports.ftl b/Resources/Locale/en-US/_Starlight/machine-linking/receiver_ports.ftl
new file mode 100644
index 000000000000..489fee3383b9
--- /dev/null
+++ b/Resources/Locale/en-US/_Starlight/machine-linking/receiver_ports.ftl
@@ -0,0 +1,2 @@
+signal-port-name-body-scanner-receiver = Operating Table
+signal-port-description-body-scanner-receiver = Sending info only to Operating Console about patient.
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_Starlight/machine-linking/transmitter_ports.ftl b/Resources/Locale/en-US/_Starlight/machine-linking/transmitter_ports.ftl
new file mode 100644
index 000000000000..1ebe25791dec
--- /dev/null
+++ b/Resources/Locale/en-US/_Starlight/machine-linking/transmitter_ports.ftl
@@ -0,0 +1,2 @@
+signal-port-name-body-scanner-sender = Operating Console
+signal-port-description-body-scanner-sender = Getting info only from Operating Table about patient.
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_Starlight/medical/components/health-analyzer-component.ftl b/Resources/Locale/en-US/_Starlight/medical/components/health-analyzer-component.ftl
new file mode 100644
index 000000000000..d1c16bd01138
--- /dev/null
+++ b/Resources/Locale/en-US/_Starlight/medical/components/health-analyzer-component.ftl
@@ -0,0 +1 @@
+health-analyzer-chat-message = Patient damage: {$damage}, Blood Level: {$blood}
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_Starlight/mentoring/mentor.ftl b/Resources/Locale/en-US/_Starlight/mentoring/mentor.ftl
index 292847f3aac2..534b3b98cf21 100644
--- a/Resources/Locale/en-US/_Starlight/mentoring/mentor.ftl
+++ b/Resources/Locale/en-US/_Starlight/mentoring/mentor.ftl
@@ -8,7 +8,9 @@ mentor-system-typing-indicator = {$players} {$count ->
 } typing...
 
 mentor-play-sound = sound?
+mentor-send-ping = get pinged for mhelps?
 mentor-close-ticket = close ticket
+mentor-tpto = "Tpto"
 
 mentor-title-none-selected = None selected
 
diff --git a/Resources/Locale/en-US/_Starlight/plushies/killa_plushie.ftl b/Resources/Locale/en-US/_Starlight/plushies/killa_plushie.ftl
new file mode 100644
index 000000000000..3aa2f897f958
--- /dev/null
+++ b/Resources/Locale/en-US/_Starlight/plushies/killa_plushie.ftl
@@ -0,0 +1,5 @@
+plushie-killa-1 = Warcrimes are most effective at 99 phlog per 1 napalm.
+plushie-killa-2 = SOP MANDATES MUZZLED INMATES
+plushie-killa-3 = AM I A KIBBY CAR?!
+plushie-killa-4 = REMEMBER IF THE AI DOESNT FIND YOU I WILL!
+plushie-killa-5 = Meow!!
diff --git a/Resources/Locale/en-US/_Starlight/plushies/rhea_plushie.ftl b/Resources/Locale/en-US/_Starlight/plushies/rhea_plushie.ftl
index 4a7105cfa1c8..6cc9e9e69a44 100644
--- a/Resources/Locale/en-US/_Starlight/plushies/rhea_plushie.ftl
+++ b/Resources/Locale/en-US/_Starlight/plushies/rhea_plushie.ftl
@@ -1,6 +1,6 @@
 plushie-rhea-1 = 'eya, I'm Rhea!
 plushie-rhea-2 = What’s wrong? Never seen an Urlunete before?
-plushie-reha-3 = Ano’zer cloning error? Nope! Just a plushie!
+plushie-rhea-3 = Ano’zer cloning error? Nope! Just a plushie!
 plushie-rhea-4 = Take me wi’z you, I’ll keep you safe!
 plushie-rhea-5 = You look ‘urt, let me treat ‘zose.
 plushie-rhea-6 = I ‘ope ‘ze kids are ok, Birgil would love one of ‘zese.
diff --git a/Resources/Locale/en-US/_Starlight/rail/rail.ftl b/Resources/Locale/en-US/_Starlight/rail/rail.ftl
index 15f03240584e..6bfd9f96be6b 100644
--- a/Resources/Locale/en-US/_Starlight/rail/rail.ftl
+++ b/Resources/Locale/en-US/_Starlight/rail/rail.ftl
@@ -7,6 +7,27 @@ railroading-card-examined = ┌Active card:
     └[color={$Color}]{$Desc}[/color]
 railroading-issued-card = [color={$IconColor}][font="Icon"]{$Icon}[/font][/color] [color={$Color}]{$Title}[/color]
 
+railroading-chat-delivery-message-1 = A mysterious package has arrived just for you!
+railroading-chat-delivery-wrapped-message-1 = [bold]A mysterious package has arrived just for you[/bold]!
+
+railroading-chat-delivery-message-2 = Congratulations! You've just received a surprise delivery.
+railroading-chat-delivery-wrapped-message-2 = [bold]Congratulations! You've just received a surprise delivery[/bold].
+
+railroading-chat-delivery-message-3 = Special delivery! Someone out there likes you.
+railroading-chat-delivery-wrapped-message-3 = [bold]Special delivery! Someone out there likes you[/bold].
+
+railroading-chat-delivery-message-4 = You hear a knock at the door... Your package is here!
+railroading-chat-delivery-wrapped-message-4 = [bold]You hear a knock at the door... Your package is here[/bold]!
+
+railroading-chat-delivery-message-5 = Delivery incoming! It’s your lucky day.
+railroading-chat-delivery-wrapped-message-5 = [bold]Delivery incoming! It’s your lucky day[/bold].
+
+railroading-chat-delivery-message-6 = Surprise! The postman has brought you something special.
+railroading-chat-delivery-wrapped-message-6 = [bold]Surprise! The postman has brought you something special[/bold].
+
+railroading-chat-delivery-message-7 = Lucky you! A parcel just dropped into your hands.
+railroading-chat-delivery-wrapped-message-7 = [bold]Lucky you! A parcel just dropped into your hands[/bold].
+
 rail-consume-task = Eat {INDEFINITE($Target)} {$Target}
 
 rr-apple-pie = Apple pie
@@ -27,7 +48,6 @@ rr-melon-fruit-bowl-desc = At the spaceport, they called this dish Fructose Momm
 rr-stew = Stew
 rr-stew-desc = Space makes a lot of ordinary things feel exotic. Just try not to think about how it was cooked in a microwave.
 
-
 # Metabolize
 
 rail-metabolize-task = Metabolize {INDEFINITE($Target)} {$Target}
diff --git a/Resources/Locale/en-US/_Starlight/store/spellbook-catalog.ftl b/Resources/Locale/en-US/_Starlight/store/spellbook-catalog.ftl
new file mode 100644
index 000000000000..f4d7eb591aa5
--- /dev/null
+++ b/Resources/Locale/en-US/_Starlight/store/spellbook-catalog.ftl
@@ -0,0 +1,5 @@
+spellbook-staff-healing-name = Staff of Healing
+spellbook-staff-healing-description = You don't foresee having to use this in your quest for carnage too often.
+
+spellbook-event-summon-cheese-name = Summon Cheese
+spellbook-event-summon-cheese-description = Reach into the void and pluck out... a single piece of chese!
diff --git a/Resources/Locale/en-US/_Starlight/weapons/mode-conditions.ftl b/Resources/Locale/en-US/_Starlight/weapons/mode-conditions.ftl
new file mode 100644
index 000000000000..fa5fb04adaf7
--- /dev/null
+++ b/Resources/Locale/en-US/_Starlight/weapons/mode-conditions.ftl
@@ -0,0 +1,2 @@
+firemode-alert-level-condition = This fire mode can't be enabled on current alert level!
+fire-mode-condition = Condition not met
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_Starlight/wires/wire-names.ftl b/Resources/Locale/en-US/_Starlight/wires/wire-names.ftl
new file mode 100644
index 000000000000..68c2f57a9261
--- /dev/null
+++ b/Resources/Locale/en-US/_Starlight/wires/wire-names.ftl
@@ -0,0 +1 @@
+wires-board-name-locker = Locker
\ No newline at end of file
diff --git a/Resources/Locale/en-US/abilities/mime.ftl b/Resources/Locale/en-US/abilities/mime.ftl
index 4fd960d89e47..3957283f80f7 100644
--- a/Resources/Locale/en-US/abilities/mime.ftl
+++ b/Resources/Locale/en-US/abilities/mime.ftl
@@ -1,5 +1,6 @@
 mime-cant-speak = Your vow of silence prevents you from speaking.
-mime-invisible-wall-popup = {CAPITALIZE(THE($mime))} brushes up against an invisible wall!
+mime-invisible-wall-popup-self = You brush up against an invisible wall!
+mime-invisible-wall-popup-others = {CAPITALIZE(THE($mime))} brushes up against an invisible wall!
 mime-invisible-wall-failed = You can't create an invisible wall there.
 mime-not-ready-repent = You aren't ready to repent for your broken vow yet.
 mime-ready-to-repent = You feel ready to take your vows again.
diff --git a/Resources/Locale/en-US/accent/accents.ftl b/Resources/Locale/en-US/accent/accents.ftl
index f54cecf71475..75644c8b2ec8 100644
--- a/Resources/Locale/en-US/accent/accents.ftl
+++ b/Resources/Locale/en-US/accent/accents.ftl
@@ -130,4 +130,26 @@ accent-words-tomato-1 = Totato!
 accent-words-tomato-2 = Trotect
 accent-words-tomato-3 = Mastet?
 accent-words-tomato-4 = Reaty!
-accent-words-tomato-5 = Water...
\ No newline at end of file
+accent-words-tomato-5 = Water...
+
+# Scurret
+accent-words-scurret-1 = Wa!
+accent-words-scurret-2 = Wa?
+accent-words-scurret-3 = Wa.
+accent-words-scurret-4 = Wa...
+accent-words-scurret-5 = Wawa!
+accent-words-scurret-6 = Wawa?
+accent-words-scurret-7 = Wawa.
+accent-words-scurret-8 = Wawa...
+accent-words-scurret-9 = Wa wawa!
+accent-words-scurret-10 = Wa wawa?
+accent-words-scurret-11 = Wa wawa.
+accent-words-scurret-12 = Wa wawa...
+accent-words-scurret-13 = Wawa wa!
+accent-words-scurret-14 = Wawa wa?
+accent-words-scurret-15 = Wawa wa.
+accent-words-scurret-16 = Wawa wa...
+accent-words-scurret-17 = Waaaaaa.
+accent-words-scurret-18 = Waaaaaa!
+accent-words-scurret-19 = Waaaaaa?
+accent-words-scurret-20 = Waaaaaa...
diff --git a/Resources/Locale/en-US/administration/admin-verbs.ftl b/Resources/Locale/en-US/administration/admin-verbs.ftl
index a89397bd65d5..13be0a876da2 100644
--- a/Resources/Locale/en-US/administration/admin-verbs.ftl
+++ b/Resources/Locale/en-US/administration/admin-verbs.ftl
@@ -8,6 +8,8 @@ admin-verbs-teleport-here = Teleport Here
 admin-verbs-freeze = Freeze
 admin-verbs-freeze-and-mute = Freeze And Mute
 admin-verbs-unfreeze = Unfreeze
+admin-verbs-camera = Open Camera
+admin-verbs-camera-description = Open a camera window that follows the selected entity.
 admin-verbs-erase = Erase
 admin-verbs-erase-description = Removes the player from the round and crew manifest and deletes their chat messages.
     Their items are dropped on the ground.
diff --git a/Resources/Locale/en-US/administration/commands/camera.ftl b/Resources/Locale/en-US/administration/commands/camera.ftl
new file mode 100644
index 000000000000..98839683e069
--- /dev/null
+++ b/Resources/Locale/en-US/administration/commands/camera.ftl
@@ -0,0 +1,5 @@
+cmd-camera-desc = Opens a remote camera window for an entity.
+cmd-camera-help = Usage: camera <entityUid or player>
+
+cmd-camera-hint = <entityUid or player>
+cmd-camera-wrong-argument = Argument must be a valid netUid or a player name.
diff --git a/Resources/Locale/en-US/administration/ui/admin-camera-window.ftl b/Resources/Locale/en-US/administration/ui/admin-camera-window.ftl
new file mode 100644
index 000000000000..bf9f45a745cc
--- /dev/null
+++ b/Resources/Locale/en-US/administration/ui/admin-camera-window.ftl
@@ -0,0 +1,5 @@
+admin-camera-window-title = Observing { $name }
+admin-camera-window-title-placeholder = Observing
+admin-camera-window-follow = Follow
+admin-camera-window-pop-out = Pop out
+admin-camera-window-pop-in = Pop in
diff --git a/Resources/Locale/en-US/administration/ui/player-panel.ftl b/Resources/Locale/en-US/administration/ui/player-panel.ftl
index f2d89fe2c2ed..7b3571e380e7 100644
--- a/Resources/Locale/en-US/administration/ui/player-panel.ftl
+++ b/Resources/Locale/en-US/administration/ui/player-panel.ftl
@@ -22,3 +22,4 @@ player-panel-rejuvenate = Rejuvenate
 player-panel-false = False
 player-panel-true = True
 player-panel-follow = Follow
+player-panel-camera = Camera
diff --git a/Resources/Locale/en-US/atmos/air-alarm-ui.ftl b/Resources/Locale/en-US/atmos/air-alarm-ui.ftl
index 25669997ed3c..b5bd4aedb809 100644
--- a/Resources/Locale/en-US/atmos/air-alarm-ui.ftl
+++ b/Resources/Locale/en-US/atmos/air-alarm-ui.ftl
@@ -2,6 +2,8 @@
 
 ## Window
 
+air-alarm-ui-title = Air Alarm
+
 air-alarm-ui-access-denied = Insufficient access!
 
 air-alarm-ui-window-pressure-label = Pressure
diff --git a/Resources/Locale/en-US/commands/makesentient-command.ftl b/Resources/Locale/en-US/commands/makesentient-command.ftl
new file mode 100644
index 000000000000..2d972b8e6039
--- /dev/null
+++ b/Resources/Locale/en-US/commands/makesentient-command.ftl
@@ -0,0 +1,2 @@
+cmd-makesentient-desc = Makes an entity sentient (able to be controlled by a player).
+cmd-makesentient-help = Usage: makesentient <entityUid>
diff --git a/Resources/Locale/en-US/commands/mapping-client-side-setup-command.ftl b/Resources/Locale/en-US/commands/mappingclientsidesetup-command.ftl
similarity index 65%
rename from Resources/Locale/en-US/commands/mapping-client-side-setup-command.ftl
rename to Resources/Locale/en-US/commands/mappingclientsidesetup-command.ftl
index 955d077db451..24a7aa3d11c2 100644
--- a/Resources/Locale/en-US/commands/mapping-client-side-setup-command.ftl
+++ b/Resources/Locale/en-US/commands/mappingclientsidesetup-command.ftl
@@ -1,2 +1,2 @@
 cmd-mappingclientsidesetup-desc = Sets up the lighting control and such settings client-side. Sent by 'mapping' to client.
-cmd-mappingclientsidesetup-help = Usage: {$command}
\ No newline at end of file
+cmd-mappingclientsidesetup-help = Usage: mappingclientsidesetup
diff --git a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
index 79028dad32c3..9a1469144f2d 100644
--- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
@@ -92,6 +92,9 @@ ui-options-vp-integer-scaling-tooltip = If this option is enabled, the viewport
                                         at specific resolutions. While this results in crisp textures, it also often
                                         means that black bars appear at the top/bottom of the screen or that part
                                         of the viewport is not visible.
+ui-options-filter-label = Scaling filter:
+ui-options-filter-nearest = Nearest (no smoothing)
+ui-options-filter-bilinear = Bilinear (smoothed)
 ui-options-trace = Display the bullet's trace
 ui-options-trace-tooltip = If you're lagging while shooting, uncheck this box,
                            and the hitscan won't display the texture of the smoke behind the flying bullet.
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 46eab5fee3d8..f3cc65f44e05 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
@@ -11,7 +11,8 @@ thief-role-greeting-animal =
 
 thief-role-greeting-equipment =
     You have a satchel of thieves'
-    tools and chameleon thieves' gloves.
+    tools and possess the innate
+    ability to steal without notice.
     Choose your starting equipment,
     and do your work stealthily.
 
diff --git a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
index fa0a1fb655d5..bbafdd5ad3e7 100644
--- a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
+++ b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
@@ -32,6 +32,7 @@ petting-success-slimes = You pet {THE($target)} on {POSS-ADJ($target)} mucous su
 petting-success-snake = You pet {THE($target)} on {POSS-ADJ($target)} scaly large head.
 petting-success-monkey = You pet {THE($target)} on {POSS-ADJ($target)} mischevious little head.
 petting-success-nymph = You pet {THE($target)} on {POSS-ADJ($target)} wooden little head.
+petting-success-scurret = You pet {THE($target)} on {POSS-ADJ($target)} legally distinct head.
 
 petting-failure-generic = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} aloof towards you.
 
@@ -53,6 +54,7 @@ petting-failure-bear = You reach out to pet {THE($target)}, but {SUBJECT($target
 petting-failure-monkey = You reach out to pet {THE($target)}, but {SUBJECT($target)} almost {CONJUGATE-BASIC($target, "bite", "bites")} your fingers!
 petting-failure-nymph = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BASIC($target, "move", "moves")} {POSS-ADJ($target)} branches away.
 petting-failure-shadow = You try to pet {THE($target)}, but your hand passes through the cold darkness of {POSS-ADJ($target)} body.
+petting-failure-scurret = You reach out to pet {THE($target)}, but {SUBJECT($target)} does a backflip!
 
 ## Petting silicons
 
diff --git a/Resources/Locale/en-US/janitorial/janitorial-slot-component.ftl b/Resources/Locale/en-US/janitorial/janitorial-slot-component.ftl
index bc03943a016e..df4a11a3e2b5 100644
--- a/Resources/Locale/en-US/janitorial/janitorial-slot-component.ftl
+++ b/Resources/Locale/en-US/janitorial/janitorial-slot-component.ftl
@@ -3,6 +3,7 @@ mop-bucket-slot-component-slot-name-item = Item
 mop-bucket-slot-component-eject-verb = Take out
 # janitorial trolley
 janitorial-trolley-slot-component-slot-name-plunger = Plunger
+janitorial-trolley-slot-component-slot-name-goldenplunger = Golden Plunger
 janitorial-trolley-slot-component-slot-name-sign = Sign
 janitorial-trolley-slot-component-slot-name-lightreplacer = Light Replacer
 janitorial-trolley-slot-component-slot-name-spray = Spray
diff --git a/Resources/Locale/en-US/lathe/lathe-categories.ftl b/Resources/Locale/en-US/lathe/lathe-categories.ftl
index 01b4f60f7d39..697b1dbd2043 100644
--- a/Resources/Locale/en-US/lathe/lathe-categories.ftl
+++ b/Resources/Locale/en-US/lathe/lathe-categories.ftl
@@ -30,6 +30,7 @@ lathe-category-maints = Maints
 lathe-category-steel = Steel
 lathe-category-white = White
 lathe-category-wood = Wood
+lathe-category-marble = Marble
 
 # Science
 lathe-category-mechs = Mechs
diff --git a/Resources/Locale/en-US/lock/lock-component.ftl b/Resources/Locale/en-US/lock/lock-component.ftl
index 5e7cefb61c39..27e96465cae8 100644
--- a/Resources/Locale/en-US/lock/lock-component.ftl
+++ b/Resources/Locale/en-US/lock/lock-component.ftl
@@ -2,7 +2,7 @@ lock-comp-on-examined-is-locked = The {$entityName} seems to be locked.
 lock-comp-on-examined-is-unlocked = The {$entityName} seems to be unlocked.
 lock-comp-do-lock-success = You lock the {$entityName}.
 lock-comp-do-unlock-success = You unlock the {$entityName}.
-lock-comp-has-user-access-fail = Access denied
+lock-comp-has-user-access-fail = Access denied.
 lock-comp-generic-fail = {CAPITALIZE(SUBJECT($target))} {CONJUGATE-BE($target)} locked.
 
 ## ToggleLockVerb
diff --git a/Resources/Locale/en-US/name-identifier.ftl b/Resources/Locale/en-US/name-identifier.ftl
new file mode 100644
index 000000000000..9fa72bc9e162
--- /dev/null
+++ b/Resources/Locale/en-US/name-identifier.ftl
@@ -0,0 +1,8 @@
+name-identifier-format-monkey = MK-{$number}
+name-identifier-format-kobold = KB-{$number}
+name-identifier-format-holoparasite = HOLO-{$number}
+name-identifier-format-mmi = MMI-{$number}
+name-identifier-format-positronic-brain = PB-{$number}
+name-identifier-format-silicon = Si-{$number}
+name-identifier-format-station-ai = AI-{$number}
+name-identifier-format-telepad = TELE-{$number}
diff --git a/Resources/Locale/en-US/nukeops/nuke-ops.ftl b/Resources/Locale/en-US/nukeops/nuke-ops.ftl
index b4f2238e0729..f15b9785cea2 100644
--- a/Resources/Locale/en-US/nukeops/nuke-ops.ftl
+++ b/Resources/Locale/en-US/nukeops/nuke-ops.ftl
@@ -1,2 +1,2 @@
-nuke-ops-no-more-threat-announcement-shuttle-call = Based on our scans from our long-range sensors, the nuclear threat is now eliminated. We will call emergency shuttle that will arrive shortly. ETA: {$time} {$units}. You can recall the shuttle to extend the shift.
-nuke-ops-no-more-threat-announcement = Based on our scans from our long-range sensors, the nuclear threat is now eliminated. Shuttle is already called.
\ No newline at end of file
+nuke-ops-no-more-threat-announcement-shuttle-call = Long-range sensors indicate the nuclear threat has been eliminated. The emergency shuttle has been called. ETA: {$time} {$units}. You may recall the shuttle to extend the shift.
+nuke-ops-no-more-threat-announcement = Long-range sensors indicate the nuclear threat has been eliminated. The emergency shuttle is already en route.
diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
index 3ad1d4fbb48f..81f11133e8d3 100644
--- a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
@@ -95,7 +95,7 @@ reagent-name-banana-honk = Banana Honk
 reagent-desc-banana-honk = A drink from Clown Heaven.
 
 reagent-name-barefoot = barefoot
-reagent-desc-barefoot = Barefoot and pregnant.
+reagent-desc-barefoot = A cassis milkshake, made from cream, fruit juice, and vermouth wine.
 
 reagent-name-beepsky-smash = Beepsky smash
 reagent-desc-beepsky-smash = Deny drinking this and prepare for THE LAW.
diff --git a/Resources/Locale/en-US/scurret/role.ftl b/Resources/Locale/en-US/scurret/role.ftl
deleted file mode 100644
index cbc0f8965796..000000000000
--- a/Resources/Locale/en-US/scurret/role.ftl
+++ /dev/null
@@ -1,25 +0,0 @@
-petting-success-scurret = You pet {THE($target)} on {POSS-ADJ($target)} legally distinct head.
-petting-failure-scurret = You reach out to pet {THE($target)}, but {SUBJECT($target)} does a backflip!
-
-accent-words-scurret-1 = Wa!
-accent-words-scurret-2 = Wa?
-accent-words-scurret-3 = Wa.
-accent-words-scurret-4 = Wa...
-accent-words-scurret-5 = Wawa!
-accent-words-scurret-6 = Wawa?
-accent-words-scurret-7 = Wawa.
-accent-words-scurret-8 = Wawa...
-accent-words-scurret-9 = Wa wawa!
-accent-words-scurret-10 = Wa wawa?
-accent-words-scurret-11 = Wa wawa.
-accent-words-scurret-12 = Wa wawa...
-accent-words-scurret-13 = Wawa wa!
-accent-words-scurret-14 = Wawa wa?
-accent-words-scurret-15 = Wawa wa.
-accent-words-scurret-16 = Wawa wa...
-accent-words-scurret-17 = Waaaaaa.
-accent-words-scurret-18 = Waaaaaa!
-accent-words-scurret-19 = Waaaaaa?
-accent-words-scurret-20 = Waaaaaa...
-
-station-event-random-sentience-flavor-scurret = scurret
diff --git a/Resources/Locale/en-US/silicons/station-ai.ftl b/Resources/Locale/en-US/silicons/station-ai.ftl
index abdddbe1e0d2..81fee66ccbc9 100644
--- a/Resources/Locale/en-US/silicons/station-ai.ftl
+++ b/Resources/Locale/en-US/silicons/station-ai.ftl
@@ -3,6 +3,7 @@ ai-wire-snipped = Wire has been cut at {$coords}.
 wire-name-ai-vision-light = AIV
 wire-name-ai-act-light = AIA
 station-ai-takeover = AI takeover
+station-ai-eye-name = AI eye - {$name}
 
 # Radial actions
 ai-open = Open actions
diff --git a/Resources/Locale/en-US/smartfridge/smartfridge.ftl b/Resources/Locale/en-US/smartfridge/smartfridge.ftl
new file mode 100644
index 000000000000..e7960367b93a
--- /dev/null
+++ b/Resources/Locale/en-US/smartfridge/smartfridge.ftl
@@ -0,0 +1,8 @@
+smart-fridge-component-try-eject-unknown-entry = Invalid selection!
+smart-fridge-component-try-eject-out-of-stock = Out of stock!
+smart-fridge-component-try-eject-access-denied = Access denied!
+smart-fridge-component-search-filter = Search...
+smart-fridge-component-title = SmartFridge
+smart-fridge-list-item = {$item} [{$amount}]
+smart-fridge-request-generic = All sales final
+smart-fridge-request-chemistry = Request refills from chemistry
diff --git a/Resources/Locale/en-US/stack/stacks.ftl b/Resources/Locale/en-US/stack/stacks.ftl
index 76ccea195a67..be884a958a0b 100644
--- a/Resources/Locale/en-US/stack/stacks.ftl
+++ b/Resources/Locale/en-US/stack/stacks.ftl
@@ -236,6 +236,10 @@ stack-xeno-steel = xeno steel tile
 stack-xeno-steel-corner = xeno steel corner tile
 stack-xeno-maint = xeno techmaint
 stack-dark-squiggly = dark steel squiggly tile
+stack-white-marble-floor = white marble floor
+stack-dark-marble-floor = dark marble floor
+stack-plasma-marble-floor = plasmarble floor
+stack-uranium-marble-floor = uranium marble floor
 
 
 stack-brutepack = {$amount ->
diff --git a/Resources/Locale/en-US/station-events/events/random-sentience.ftl b/Resources/Locale/en-US/station-events/events/random-sentience.ftl
index f14a020d29e8..5cf07f4f0840 100644
--- a/Resources/Locale/en-US/station-events/events/random-sentience.ftl
+++ b/Resources/Locale/en-US/station-events/events/random-sentience.ftl
@@ -1,4 +1,4 @@
-## Phrases used for where central command got this information.
+## Phrases used for where central command got this information.
 random-sentience-event-data-1 = scans from our long-range sensors
 random-sentience-event-data-2 = our sophisticated probabilistic models
 random-sentience-event-data-3 = our omnipotence
@@ -36,4 +36,5 @@ station-event-random-sentience-flavor-corgi = corgi
 station-event-random-sentience-flavor-primate = primate
 station-event-random-sentience-flavor-kobold = kobold
 station-event-random-sentience-flavor-slime = slime
-station-event-random-sentience-flavor-inanimate = inanimate
\ No newline at end of file
+station-event-random-sentience-flavor-inanimate = inanimate
+station-event-random-sentience-flavor-scurret = scurret
diff --git a/Resources/Locale/en-US/storage/components/dumpable-component.ftl b/Resources/Locale/en-US/storage/components/dumpable-component.ftl
index 732a45a3b653..867b461f1fb0 100644
--- a/Resources/Locale/en-US/storage/components/dumpable-component.ftl
+++ b/Resources/Locale/en-US/storage/components/dumpable-component.ftl
@@ -1,3 +1,4 @@
 dump-verb-name = Dump out on ground
 dump-disposal-verb-name = Dump out into {$unit}
 dump-placeable-verb-name = Dump out onto {$surface}
+dump-smartfridge-verb-name = Restock into {$unit}
diff --git a/Resources/Locale/en-US/storage/components/entity-storage-component.ftl b/Resources/Locale/en-US/storage/components/entity-storage-component.ftl
index 69646ebab07a..78a2d0f69bb4 100644
--- a/Resources/Locale/en-US/storage/components/entity-storage-component.ftl
+++ b/Resources/Locale/en-US/storage/components/entity-storage-component.ftl
@@ -1,8 +1,8 @@
 entity-storage-component-welded-shut-message = It's welded completely shut!
-entity-storage-component-locked-message = It's Locked!
-entity-storage-component-already-contains-user-message = It's too Cramped!
+entity-storage-component-locked-message = It's locked!
+entity-storage-component-already-contains-user-message = It's too cramped!
 entity-storage-component-cannot-open-no-space = There's no room to open it!
 
 ## OpenToggleVerb
 
-open-toggle-verb-welded-shut-message = {$verb} (welded shut)
\ No newline at end of file
+open-toggle-verb-welded-shut-message = {$verb} (welded shut)
diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index f2efb2ac931d..102a22ea3518 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -3,7 +3,7 @@
 uplink-pistol-viper-name = Viper
 uplink-pistol-viper-desc = A small, easily concealable, but somewhat underpowered gun. Retrofitted with a fully automatic receiver. Uses pistol magazines (.35 auto).
 
-uplink-estoc-bundle-name = Estoc DMR
+uplink-estoc-bundle-name = Estoc DMR bundle
 uplink-estoc-bundle-desc = A designated marksman rifle, fitted with a mid-range optic for longer-range combat. Bundled with two rifle magazines (.20 rifle).
 
 uplink-revolver-python-name = Python
@@ -250,7 +250,7 @@ uplink-meds-bundle-name = Interdyne Medical Bundle
 uplink-meds-bundle-desc = An assortment of autoinjectors and premium medical equipment to cover for every possible situation. Contains an elite compact defibrillator that can be used as a weapon.
 
 uplink-ammo-bundle-name = Ammo Bundle
-uplink-ammo-bundle-desc = Reloading! Contains 4 magazines for the C-20r, 4 drums for the Bulldog, and 2 ammo boxes for the L6 SAW.
+uplink-ammo-bundle-desc = Reloading! Contains 4 magazines for the C-20r, 4 drums for the Bulldog, 3 magazines for the Estoc DMR, and 2 ammo boxes for the L6 SAW.
 
 uplink-sniper-bundle-name = Sniper Bundle
 uplink-sniper-bundle-desc = An inconspicuous briefcase that contains a Hristov, 10 spare bullets and a convenient disguise.
@@ -502,3 +502,6 @@ uplink-contraband-lighter-desc = A mystery box guaranteed to contain a syndicate
 
 uplink-smuggler-satchel-name = Smuggler's Satchel
 uplink-smuggler-satchel-desc = A handy, suspicious looking satchel. Just flat enough to fit underneath floor tiles.
+
+uplink-acolyte-armor-name = Acolyte Armor
+uplink-acolyte-armor-desc = The must have of any self respecting cult leader. An evil looking piece of armor, made of bones, and surprisingly resistant to damage.
diff --git a/Resources/Locale/en-US/tiles/tiles.ftl b/Resources/Locale/en-US/tiles/tiles.ftl
index 01a7f021b8b6..5a8d312a00f0 100644
--- a/Resources/Locale/en-US/tiles/tiles.ftl
+++ b/Resources/Locale/en-US/tiles/tiles.ftl
@@ -140,6 +140,10 @@ tiles-xeno-steel = xeno steel tile
 tiles-xeno-steel-corner = xeno steel corner tile
 tiles-xeno-maint = xeno techmaint
 tiles-dark-squiggly = dark steel squiggly tile
+tiles-white-marble = white marble tile
+tiles-dark-marble = dark marble tile
+tiles-plasma-marble = plasmarble tile
+tiles-uranium-marble = uranium marble tile
 
 tiles-abyss-floor = abyss floor
 tiles-abductor-floor = abductor floor
\ No newline at end of file
diff --git a/Resources/Locale/en-US/voting/vote-commands.ftl b/Resources/Locale/en-US/voting/vote-commands.ftl
index 94320294c81a..4ad19e7070a2 100644
--- a/Resources/Locale/en-US/voting/vote-commands.ftl
+++ b/Resources/Locale/en-US/voting/vote-commands.ftl
@@ -12,8 +12,8 @@ cmd-createvote-arg-vote-type = <vote type>
 
 cmd-customvote-desc = Creates a custom vote
 cmd-customvote-help = Usage: customvote <title> <option1> <option2> [option3...]
-cmd-customvote-on-finished-tie = Tie between {$ties}!
-cmd-customvote-on-finished-win = {$winner} wins!
+cmd-customvote-on-finished-tie = The vote '{$title}' has finished: tie between {$ties}!
+cmd-customvote-on-finished-win = The vote '{$title}' has finished: {$winner} wins!
 cmd-customvote-arg-title = <title>
 cmd-customvote-arg-option-n = <option{ $n }>
 
diff --git a/Resources/Maps/Nonstations/wizardsden.yml b/Resources/Maps/Nonstations/wizardsden.yml
new file mode 100644
index 000000000000..b08dac6b68e6
--- /dev/null
+++ b/Resources/Maps/Nonstations/wizardsden.yml
@@ -0,0 +1,3886 @@
+meta:
+  format: 7
+  category: Map
+  engineVersion: 261.1.0
+  forkId: ""
+  forkVersion: ""
+  time: 06/03/2025 05:27:43
+  entityCount: 625
+maps:
+- 411
+grids:
+- 1
+orphans: []
+nullspace: []
+tilemap:
+  3: Space
+  2: FloorBasalt
+  6: FloorDark
+  0: FloorDarkDiagonal
+  5: FloorDarkMono
+  4: FloorDarkPavementVertical
+  17: FloorMiningDark
+  16: FloorMiningLight
+  9: FloorShowroom
+  14: FloorTechMaint
+  13: FloorTechMaint2
+  12: FloorWhite
+  11: FloorWhiteMini
+  15: FloorWhiteMono
+  7: FloorWood
+  8: FloorWoodTile
+  10: Lattice
+  1: Plating
+entities:
+- proto: ""
+  entities:
+  - uid: 1
+    components:
+    - type: MetaData
+      name: Wizard's Den
+    - type: Transform
+      pos: -0.5138889,-0.4756779
+      parent: 411
+    - type: MapGrid
+      chunks:
+        0,0:
+          ind: 0,0
+          tiles: AAAAAAABAAAAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAAAAAAAAQAAAAAAAAIAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAGAAAAAAEABQAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAABQAAAAABAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAYAAAAAAgAFAAAAAAIABgAAAAACAAYAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAHAAAAAAEABwAAAAADAAgAAAAAAgAGAAAAAAAABgAAAAADAAEAAAAAAAAJAAAAAAAAAQAAAAAAAAkAAAAAAAABAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAABwAAAAABAAcAAAAAAAAIAAAAAAEACAAAAAADAAYAAAAAAgABAAAAAAAACQAAAAAAAAEAAAAAAAAJAAAAAAAAAQAAAAAAAAoAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAcAAAAAAQAHAAAAAAAACAAAAAADAAgAAAAAAgAGAAAAAAIAAQAAAAAAAAwAAAAAAgAMAAAAAAAADAAAAAAAAAEAAAAAAAAKAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAHAAAAAAMABwAAAAACAAgAAAAAAgAIAAAAAAAABgAAAAADAAUAAAAAAwAMAAAAAAIADwAAAAACAAEAAAAAAAABAAAAAAAACgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAABwAAAAAAAAcAAAAAAAAIAAAAAAIACAAAAAAAAAYAAAAAAQABAAAAAAAADAAAAAACAAwAAAAAAQABAAAAAAAACgAAAAAAAAoAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAcAAAAAAAAHAAAAAAMACAAAAAACAAgAAAAAAwAGAAAAAAEAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAoAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAHAAAAAAAABwAAAAACAAYAAAAAAwAGAAAAAAAABgAAAAADAAEAAAAAAAAKAAAAAAAACgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAABwAAAAACAAcAAAAAAwAGAAAAAAAABgAAAAADAAEAAAAAAAABAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAcAAAAAAQAHAAAAAAMABgAAAAABAAEAAAAAAAABAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAA==
+          version: 7
+        -1,0:
+          ind: -1,0
+          tiles: AwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAAAAAAABAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAAAAAAAAwADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAAFAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAEABgAAAAACAAUAAAAAAgADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAQAAAAAAAAcAAAAAAAAIAAAAAAEACAAAAAACAAEAAAAAAAAGAAAAAAIABgAAAAABAAgAAAAAAQAHAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAEAAAAAAAAHAAAAAAEACAAAAAADAAgAAAAAAQABAAAAAAAABgAAAAAAAAgAAAAAAgAIAAAAAAMABwAAAAABAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAoAAAAAAAABAAAAAAAABwAAAAABAAcAAAAAAAAHAAAAAAMAAQAAAAAAAAYAAAAAAwAIAAAAAAEACAAAAAABAAcAAAAAAQADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAKAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAIABgAAAAADAAUAAAAAAgAGAAAAAAMACAAAAAACAAgAAAAAAQAHAAAAAAMAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAACgAAAAAAAAoAAAAAAAABAAAAAAAABgAAAAAAAAYAAAAAAQABAAAAAAAABgAAAAABAAgAAAAAAwAIAAAAAAAABwAAAAADAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAKAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAAAIAAAAAAAACAAAAAABAAcAAAAAAQADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAKAAAAAAAACgAAAAAAAAEAAAAAAAAGAAAAAAEABgAAAAADAAYAAAAAAwAHAAAAAAIAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAQAGAAAAAAEABwAAAAACAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAEAAAAAAAABAAAAAAAABgAAAAAAAAcAAAAAAQADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAA==
+          version: 7
+        -1,-1:
+          ind: -1,-1
+          tiles: AwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAEAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAABEAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAQAAAAAAAAEQAAAAAAABEAAAAAAAAQAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAEAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAAFAAAAAAIAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAAAAAAABAA==
+          version: 7
+        0,-1:
+          ind: 0,-1
+          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAEQAAAAAAABEAAAAAAAARAAAAAAAAEQAAAAAAABAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAEQAAAAAAABAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAUAAAAAAwABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAGAAAAAAIABQAAAAACAAIAAAAAAAACAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAgABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAA==
+          version: 7
+        -1,-2:
+          ind: -1,-2
+          tiles: AwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
+          version: 7
+        0,-2:
+          ind: 0,-2
+          tiles: AwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAA==
+          version: 7
+    - type: Broadphase
+    - type: Physics
+      bodyStatus: InAir
+      fixedRotation: False
+      bodyType: Dynamic
+    - type: Fixtures
+      fixtures: {}
+    - type: OccluderTree
+    - type: SpreaderGrid
+    - type: Shuttle
+      dampingModifier: 0.25
+    - type: ImplicitRoof
+    - type: GridPathfinding
+    - type: DecalGrid
+      chunkCollection:
+        version: 2
+        nodes:
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt1
+          decals:
+            163: 2.7885406,-1.7337892
+            187: -4.594368,-12.802722
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt2
+          decals:
+            170: 0.8227043,-6.7750106
+            190: -1.1881177,-12.948657
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt3
+          decals:
+            161: -2.8052096,1.6956758
+            165: -5.7114596,2.0292413
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt4
+          decals:
+            169: -1.5106289,-6.201695
+            193: 3.8869796,-12.234362
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt5
+          decals:
+            162: 2.5072906,0.9451544
+            164: -2.6802096,-0.5558883
+            189: -3.365201,-11.843722
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt6
+          decals:
+            198: -0.038194448,-11.283006
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt7
+          decals:
+            192: 1.6265626,-14.944576
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt8
+          decals:
+            191: 0.8743825,-12.125168
+            199: 2.4097223,-8.812541
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt9
+          decals:
+            188: -2.8131177,-9.644279
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkCornerNe
+          decals:
+            10: 1,1
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkCornerNw
+          decals:
+            9: -1,1
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkCornerSe
+          decals:
+            11: 1,-1
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkCornerSw
+          decals:
+            12: -1,-1
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkLineE
+          decals:
+            15: 1,0
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkLineN
+          decals:
+            16: 0,1
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkLineS
+          decals:
+            13: 0,-1
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkLineW
+          decals:
+            14: -1,0
+        - node:
+            color: '#52B4E996'
+            id: CheckerNWSE
+          decals:
+            107: 6,9
+            108: 7,9
+            109: 8,6
+            110: 8,5
+            111: 6,6
+            112: 6,5
+        - node:
+            color: '#8D03A5FF'
+            id: DiagonalCheckerAOverlay
+          decals:
+            0: -1,1
+            1: -1,0
+            2: -1,-1
+            3: 0,-1
+            4: 1,-1
+            5: 1,0
+            6: 0,0
+            7: 0,1
+            8: 1,1
+        - node:
+            color: '#8D03A566'
+            id: QuarterTileOverlayGreyscale
+          decals:
+            113: -4,5
+            114: -4,6
+            115: -4,7
+            116: -4,8
+            117: -4,9
+            118: -4,10
+            119: -4,11
+            139: -3,4
+            155: -3,11
+            156: -3,12
+        - node:
+            color: '#8D03A566'
+            id: QuarterTileOverlayGreyscale180
+          decals:
+            136: -2,4
+            137: -3,4
+            138: -4,5
+        - node:
+            color: '#8D03A566'
+            id: QuarterTileOverlayGreyscale270
+          decals:
+            131: 4,5
+            132: 3,4
+            133: 2,4
+        - node:
+            color: '#8D03A566'
+            id: QuarterTileOverlayGreyscale90
+          decals:
+            122: 4,5
+            123: 4,6
+            124: 4,7
+            125: 4,8
+            126: 4,9
+            127: 4,10
+            128: 4,11
+            140: 3,4
+            158: 3,11
+            159: 3,12
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: Remains
+          decals:
+            18: -6,1
+            185: 0,-13
+            186: -5,-10
+        - node:
+            color: '#FFFFFFFF'
+            id: Rock06
+          decals:
+            23: 5.231406,1.6660407
+        - node:
+            color: '#FFFFFFFF'
+            id: Rock07
+          decals:
+            21: -2.8668027,-4.2268343
+            24: -5.185261,-1.8468163
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerNe
+          decals:
+            60: -3,5
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerNw
+          decals:
+            59: 3,5
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerSe
+          decals:
+            152: -2,11
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerSw
+          decals:
+            151: 2,11
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinInnerNe
+          decals:
+            61: -3,4
+            66: -4,5
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinInnerNw
+          decals:
+            62: 3,4
+            67: 4,5
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinInnerSe
+          decals:
+            68: -4,11
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinInnerSw
+          decals:
+            65: 4,11
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineE
+          decals:
+            69: -4,10
+            70: -4,9
+            71: -4,8
+            72: -4,7
+            73: -4,6
+            196: -2,12
+            197: -2,13
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineN
+          decals:
+            43: -2,4
+            45: 0,4
+            47: 2,4
+            183: -1,4
+            184: 1,4
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineS
+          decals:
+            79: -7,8
+            80: -6,8
+            149: -3,11
+            150: 3,11
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineW
+          decals:
+            74: 4,6
+            75: 4,7
+            76: 4,8
+            77: 4,9
+            78: 4,10
+            194: 2,12
+            195: 2,13
+    - type: GridAtmosphere
+      version: 2
+      data:
+        tiles:
+          0,0:
+            0: 4095
+          0,-1:
+            0: 65295
+          -1,0:
+            0: 3822
+          0,1:
+            0: 65535
+          -1,1:
+            0: 65534
+          0,2:
+            0: 65535
+          -1,2:
+            0: 65535
+          0,3:
+            0: 127
+          -1,3:
+            0: 206
+          1,1:
+            0: 54608
+          1,2:
+            0: 4573
+            1: 49152
+          1,0:
+            0: 3822
+          1,-1:
+            0: 26112
+          2,0:
+            0: 48
+          2,1:
+            0: 4368
+            1: 17408
+          2,2:
+            1: 612
+          -3,1:
+            1: 16384
+          -3,2:
+            1: 2244
+          -2,0:
+            0: 3327
+          -2,1:
+            0: 30576
+          -2,2:
+            0: 102
+            1: 24576
+          -2,-1:
+            0: 60417
+          -1,-1:
+            0: 60942
+          -2,-3:
+            0: 36044
+          -2,-2:
+            0: 3200
+          -2,-4:
+            0: 32768
+          -1,-4:
+            0: 65472
+          -1,-3:
+            0: 65535
+          -1,-2:
+            0: 65535
+          0,-4:
+            0: 65392
+          0,-3:
+            0: 65535
+          0,-2:
+            0: 65535
+          1,-4:
+            0: 4096
+          1,-3:
+            0: 28945
+          1,-2:
+            0: 311
+        uniqueMixes:
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.824879
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          immutable: True
+          temperature: 248.15
+          moles:
+          - 21.824879
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        chunkSize: 4
+    - type: GasTileOverlay
+    - type: RadiationGridResistance
+    - type: IFF
+      color: '#BF40BFFF'
+    - type: GravityShake
+      shakeTimes: 10
+    - type: NavMap
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+  - uid: 411
+    components:
+    - type: MetaData
+      name: Map Entity
+    - type: Transform
+    - type: Map
+      mapPaused: True
+    - type: GridTree
+    - type: Broadphase
+    - type: OccluderTree
+    - type: Parallax
+      parallax: Wizard
+    - type: MapAtmosphere
+      space: False
+      mixture:
+        volume: 2500
+        immutable: True
+        temperature: 293.2
+        moles:
+        - 21.824879
+        - 82.10312
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+- proto: APCHyperCapacity
+  entities:
+  - uid: 199
+    components:
+    - type: MetaData
+      name: Wizard APC
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,4.5
+      parent: 1
+    - type: BatterySelfRecharger
+      autoRechargeRate: 200000
+      autoRecharge: True
+- proto: BarberScissors
+  entities:
+  - uid: 649
+    components:
+    - type: Transform
+      pos: -6.5,9.5
+      parent: 1
+- proto: BasaltFive
+  entities:
+  - uid: 414
+    components:
+    - type: Transform
+      pos: 3.5,-7.5
+      parent: 1
+  - uid: 416
+    components:
+    - type: Transform
+      pos: 3.5,2.5
+      parent: 1
+  - uid: 418
+    components:
+    - type: Transform
+      pos: -4.5,-11.5
+      parent: 1
+- proto: BasaltFour
+  entities:
+  - uid: 419
+    components:
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 1
+  - uid: 424
+    components:
+    - type: Transform
+      pos: -1.5,-13.5
+      parent: 1
+- proto: BasaltThree
+  entities:
+  - uid: 245
+    components:
+    - type: Transform
+      pos: 2.5,-12.5
+      parent: 1
+  - uid: 415
+    components:
+    - type: Transform
+      pos: -2.5,0.5
+      parent: 1
+- proto: BasaltTwo
+  entities:
+  - uid: 410
+    components:
+    - type: Transform
+      pos: -2.5,-5.5
+      parent: 1
+  - uid: 417
+    components:
+    - type: Transform
+      pos: -1.5,-10.5
+      parent: 1
+- proto: Bed
+  entities:
+  - uid: 503
+    components:
+    - type: Transform
+      pos: -5.5,5.5
+      parent: 1
+- proto: BedsheetWiz
+  entities:
+  - uid: 506
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,5.5
+      parent: 1
+- proto: BookNarsieLegend
+  entities:
+  - uid: 362
+    components:
+    - type: Transform
+      pos: -1.9141665,4.7120576
+      parent: 1
+- proto: BookRandomStory
+  entities:
+  - uid: 466
+    components:
+    - type: Transform
+      pos: 8.5,7.5
+      parent: 1
+- proto: BooksBag
+  entities:
+  - uid: 361
+    components:
+    - type: Transform
+      pos: -1.5,4.5
+      parent: 1
+- proto: Bookshelf
+  entities:
+  - uid: 471
+    components:
+    - type: Transform
+      pos: 4.5,11.5
+      parent: 1
+  - uid: 472
+    components:
+    - type: Transform
+      pos: 4.5,10.5
+      parent: 1
+  - uid: 474
+    components:
+    - type: Transform
+      pos: -3.5,11.5
+      parent: 1
+  - uid: 475
+    components:
+    - type: Transform
+      pos: -3.5,10.5
+      parent: 1
+- proto: BookshelfFilled
+  entities:
+  - uid: 343
+    components:
+    - type: Transform
+      pos: 2.5,7.5
+      parent: 1
+  - uid: 344
+    components:
+    - type: Transform
+      pos: 2.5,8.5
+      parent: 1
+  - uid: 346
+    components:
+    - type: Transform
+      pos: 2.5,9.5
+      parent: 1
+  - uid: 348
+    components:
+    - type: Transform
+      pos: -1.5,9.5
+      parent: 1
+  - uid: 349
+    components:
+    - type: Transform
+      pos: -1.5,8.5
+      parent: 1
+  - uid: 350
+    components:
+    - type: Transform
+      pos: -1.5,7.5
+      parent: 1
+- proto: CableApcExtension
+  entities:
+  - uid: 5
+    components:
+    - type: Transform
+      pos: 6.5,8.5
+      parent: 1
+  - uid: 96
+    components:
+    - type: Transform
+      pos: -0.5,5.5
+      parent: 1
+  - uid: 97
+    components:
+    - type: Transform
+      pos: 5.5,8.5
+      parent: 1
+  - uid: 98
+    components:
+    - type: Transform
+      pos: 1.5,5.5
+      parent: 1
+  - uid: 99
+    components:
+    - type: Transform
+      pos: 4.5,9.5
+      parent: 1
+  - uid: 103
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 1
+  - uid: 104
+    components:
+    - type: Transform
+      pos: 0.5,4.5
+      parent: 1
+  - uid: 105
+    components:
+    - type: Transform
+      pos: 0.5,3.5
+      parent: 1
+  - uid: 106
+    components:
+    - type: Transform
+      pos: -0.5,0.5
+      parent: 1
+  - uid: 107
+    components:
+    - type: Transform
+      pos: 1.5,0.5
+      parent: 1
+  - uid: 108
+    components:
+    - type: Transform
+      pos: -0.5,-0.5
+      parent: 1
+  - uid: 109
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 1
+  - uid: 110
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 1
+  - uid: 111
+    components:
+    - type: Transform
+      pos: 1.5,-1.5
+      parent: 1
+  - uid: 112
+    components:
+    - type: Transform
+      pos: 1.5,2.5
+      parent: 1
+  - uid: 113
+    components:
+    - type: Transform
+      pos: -0.5,2.5
+      parent: 1
+  - uid: 114
+    components:
+    - type: Transform
+      pos: -0.5,1.5
+      parent: 1
+  - uid: 115
+    components:
+    - type: Transform
+      pos: 1.5,1.5
+      parent: 1
+  - uid: 116
+    components:
+    - type: Transform
+      pos: 0.5,2.5
+      parent: 1
+  - uid: 117
+    components:
+    - type: Transform
+      pos: 0.5,5.5
+      parent: 1
+  - uid: 420
+    components:
+    - type: Transform
+      pos: -1.5,5.5
+      parent: 1
+  - uid: 421
+    components:
+    - type: Transform
+      pos: -2.5,5.5
+      parent: 1
+  - uid: 422
+    components:
+    - type: Transform
+      pos: -3.5,5.5
+      parent: 1
+  - uid: 423
+    components:
+    - type: Transform
+      pos: -3.5,4.5
+      parent: 1
+  - uid: 425
+    components:
+    - type: Transform
+      pos: 2.5,5.5
+      parent: 1
+  - uid: 426
+    components:
+    - type: Transform
+      pos: 3.5,5.5
+      parent: 1
+  - uid: 427
+    components:
+    - type: Transform
+      pos: 4.5,5.5
+      parent: 1
+  - uid: 428
+    components:
+    - type: Transform
+      pos: -3.5,6.5
+      parent: 1
+  - uid: 429
+    components:
+    - type: Transform
+      pos: -3.5,7.5
+      parent: 1
+  - uid: 430
+    components:
+    - type: Transform
+      pos: -3.5,8.5
+      parent: 1
+  - uid: 431
+    components:
+    - type: Transform
+      pos: -3.5,9.5
+      parent: 1
+  - uid: 432
+    components:
+    - type: Transform
+      pos: -3.5,10.5
+      parent: 1
+  - uid: 433
+    components:
+    - type: Transform
+      pos: -3.5,11.5
+      parent: 1
+  - uid: 434
+    components:
+    - type: Transform
+      pos: -2.5,11.5
+      parent: 1
+  - uid: 435
+    components:
+    - type: Transform
+      pos: -1.5,11.5
+      parent: 1
+  - uid: 436
+    components:
+    - type: Transform
+      pos: -0.5,11.5
+      parent: 1
+  - uid: 437
+    components:
+    - type: Transform
+      pos: 0.5,11.5
+      parent: 1
+  - uid: 438
+    components:
+    - type: Transform
+      pos: 1.5,11.5
+      parent: 1
+  - uid: 439
+    components:
+    - type: Transform
+      pos: 3.5,11.5
+      parent: 1
+  - uid: 440
+    components:
+    - type: Transform
+      pos: 4.5,11.5
+      parent: 1
+  - uid: 441
+    components:
+    - type: Transform
+      pos: 2.5,11.5
+      parent: 1
+  - uid: 442
+    components:
+    - type: Transform
+      pos: 4.5,10.5
+      parent: 1
+  - uid: 443
+    components:
+    - type: Transform
+      pos: 4.5,8.5
+      parent: 1
+  - uid: 444
+    components:
+    - type: Transform
+      pos: 4.5,7.5
+      parent: 1
+  - uid: 445
+    components:
+    - type: Transform
+      pos: 4.5,6.5
+      parent: 1
+  - uid: 447
+    components:
+    - type: Transform
+      pos: 0.5,6.5
+      parent: 1
+  - uid: 448
+    components:
+    - type: Transform
+      pos: 0.5,7.5
+      parent: 1
+  - uid: 449
+    components:
+    - type: Transform
+      pos: 0.5,9.5
+      parent: 1
+  - uid: 450
+    components:
+    - type: Transform
+      pos: 0.5,10.5
+      parent: 1
+  - uid: 451
+    components:
+    - type: Transform
+      pos: 0.5,12.5
+      parent: 1
+  - uid: 452
+    components:
+    - type: Transform
+      pos: 0.5,13.5
+      parent: 1
+  - uid: 534
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 1
+  - uid: 535
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 1
+  - uid: 566
+    components:
+    - type: Transform
+      pos: -4.5,8.5
+      parent: 1
+  - uid: 567
+    components:
+    - type: Transform
+      pos: -5.5,8.5
+      parent: 1
+  - uid: 568
+    components:
+    - type: Transform
+      pos: -6.5,8.5
+      parent: 1
+  - uid: 569
+    components:
+    - type: Transform
+      pos: -6.5,7.5
+      parent: 1
+  - uid: 570
+    components:
+    - type: Transform
+      pos: -6.5,6.5
+      parent: 1
+  - uid: 571
+    components:
+    - type: Transform
+      pos: -6.5,5.5
+      parent: 1
+  - uid: 572
+    components:
+    - type: Transform
+      pos: -6.5,9.5
+      parent: 1
+  - uid: 655
+    components:
+    - type: Transform
+      pos: 7.5,7.5
+      parent: 1
+  - uid: 679
+    components:
+    - type: Transform
+      pos: 6.5,7.5
+      parent: 1
+  - uid: 680
+    components:
+    - type: Transform
+      pos: 6.5,6.5
+      parent: 1
+  - uid: 681
+    components:
+    - type: Transform
+      pos: 6.5,5.5
+      parent: 1
+  - uid: 682
+    components:
+    - type: Transform
+      pos: 8.5,7.5
+      parent: 1
+  - uid: 683
+    components:
+    - type: Transform
+      pos: 8.5,6.5
+      parent: 1
+  - uid: 684
+    components:
+    - type: Transform
+      pos: 8.5,5.5
+      parent: 1
+- proto: CandleBlackInfinite
+  entities:
+  - uid: 352
+    components:
+    - type: Transform
+      pos: 0.34585947,8.704459
+      parent: 1
+- proto: CandleBlueSmallInfinite
+  entities:
+  - uid: 388
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.9964747,13.631708
+      parent: 1
+- proto: CandleGreenSmallInfinite
+  entities:
+  - uid: 351
+    components:
+    - type: Transform
+      pos: 0.5854428,8.558525
+      parent: 1
+- proto: CandleInfinite
+  entities:
+  - uid: 407
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,4.5
+      parent: 1
+- proto: CandleRedSmallInfinite
+  entities:
+  - uid: 408
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.2612925,4.618674
+      parent: 1
+- proto: CarpetPurple
+  entities:
+  - uid: 342
+    components:
+    - type: Transform
+      pos: -0.5,7.5
+      parent: 1
+  - uid: 354
+    components:
+    - type: Transform
+      pos: -0.5,9.5
+      parent: 1
+  - uid: 375
+    components:
+    - type: Transform
+      pos: 0.5,9.5
+      parent: 1
+  - uid: 455
+    components:
+    - type: Transform
+      pos: -0.5,8.5
+      parent: 1
+  - uid: 456
+    components:
+    - type: Transform
+      pos: 0.5,8.5
+      parent: 1
+  - uid: 457
+    components:
+    - type: Transform
+      pos: 0.5,7.5
+      parent: 1
+  - uid: 458
+    components:
+    - type: Transform
+      pos: 1.5,8.5
+      parent: 1
+  - uid: 459
+    components:
+    - type: Transform
+      pos: 1.5,7.5
+      parent: 1
+  - uid: 460
+    components:
+    - type: Transform
+      pos: 1.5,9.5
+      parent: 1
+  - uid: 514
+    components:
+    - type: Transform
+      pos: -6.5,6.5
+      parent: 1
+  - uid: 515
+    components:
+    - type: Transform
+      pos: -6.5,5.5
+      parent: 1
+  - uid: 516
+    components:
+    - type: Transform
+      pos: -5.5,6.5
+      parent: 1
+  - uid: 517
+    components:
+    - type: Transform
+      pos: -5.5,5.5
+      parent: 1
+  - uid: 526
+    components:
+    - type: Transform
+      pos: -0.5,13.5
+      parent: 1
+  - uid: 527
+    components:
+    - type: Transform
+      pos: -0.5,12.5
+      parent: 1
+  - uid: 528
+    components:
+    - type: Transform
+      pos: 0.5,13.5
+      parent: 1
+  - uid: 529
+    components:
+    - type: Transform
+      pos: 0.5,12.5
+      parent: 1
+  - uid: 530
+    components:
+    - type: Transform
+      pos: 1.5,13.5
+      parent: 1
+  - uid: 531
+    components:
+    - type: Transform
+      pos: 1.5,12.5
+      parent: 1
+- proto: ChairPilotSeat
+  entities:
+  - uid: 467
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,12.5
+      parent: 1
+- proto: ChairWood
+  entities:
+  - uid: 468
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,8.5
+      parent: 1
+  - uid: 469
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,9.5
+      parent: 1
+  - uid: 512
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,6.5
+      parent: 1
+- proto: ClockworkShield
+  entities:
+  - uid: 88
+    components:
+    - type: Transform
+      pos: -1.4069316,1.4175825
+      parent: 1
+- proto: ClothingBeltWand
+  entities:
+  - uid: 93
+    components:
+    - type: Transform
+      pos: 2.5877786,0.864011
+      parent: 1
+- proto: ClothingHeadHatWitch1
+  entities:
+  - uid: 508
+    components:
+    - type: Transform
+      parent: 507
+    - type: Physics
+      canCollide: False
+- proto: ClothingHeadHelmetWizardHelm
+  entities:
+  - uid: 405
+    components:
+    - type: Transform
+      pos: 1.5,13.5
+      parent: 1
+- proto: ClothingMaskGasChameleon
+  entities:
+  - uid: 404
+    components:
+    - type: Transform
+      pos: -0.8681086,13.66298
+      parent: 1
+- proto: ClothingShoesWizard
+  entities:
+  - uid: 95
+    components:
+    - type: Transform
+      pos: 2.508839,1.4894459
+      parent: 1
+- proto: ClothingUniformJumpskirtColorBlack
+  entities:
+  - uid: 510
+    components:
+    - type: Transform
+      parent: 507
+    - type: Physics
+      canCollide: False
+- proto: ClothingUniformJumpsuitColorBlack
+  entities:
+  - uid: 509
+    components:
+    - type: Transform
+      parent: 507
+    - type: Physics
+      canCollide: False
+- proto: ComfyChair
+  entities:
+  - uid: 340
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,5.5
+      parent: 1
+  - uid: 353
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,7.5
+      parent: 1
+  - uid: 465
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,7.5
+      parent: 1
+- proto: CrayonRainbow
+  entities:
+  - uid: 646
+    components:
+    - type: Transform
+      pos: 4.709585,6.241482
+      parent: 1
+- proto: CrystalBlue
+  entities:
+  - uid: 274
+    components:
+    - type: Transform
+      pos: 4.5,-5.5
+      parent: 1
+- proto: CrystalOrange
+  entities:
+  - uid: 524
+    components:
+    - type: Transform
+      pos: -3.5,-13.5
+      parent: 1
+- proto: CrystalPink
+  entities:
+  - uid: 212
+    components:
+    - type: Transform
+      pos: -7.5,1.5
+      parent: 1
+  - uid: 275
+    components:
+    - type: Transform
+      pos: -1.5,-4.5
+      parent: 1
+- proto: CrystalYellow
+  entities:
+  - uid: 525
+    components:
+    - type: Transform
+      pos: 4.5,-12.5
+      parent: 1
+- proto: CurtainsPurpleOpen
+  entities:
+  - uid: 513
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,5.5
+      parent: 1
+- proto: DiceBag
+  entities:
+  - uid: 645
+    components:
+    - type: Transform
+      pos: 0.6952908,8.840469
+      parent: 1
+- proto: DogBed
+  entities:
+  - uid: 501
+    components:
+    - type: Transform
+      pos: -5.5,9.5
+      parent: 1
+- proto: Dresser
+  entities:
+  - uid: 507
+    components:
+    - type: Transform
+      pos: -7.5,5.5
+      parent: 1
+    - type: Storage
+      storedItems:
+        508:
+          position: 0,0
+          _rotation: East
+        509:
+          position: 2,0
+          _rotation: South
+        510:
+          position: 4,0
+          _rotation: South
+    - type: ContainerContainer
+      containers:
+        storagebase: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 508
+          - 509
+          - 510
+- proto: DrinkAleBottleFull
+  entities:
+  - uid: 651
+    components:
+    - type: Transform
+      pos: -6.64086,5.9211173
+      parent: 1
+- proto: DrinkGlass
+  entities:
+  - uid: 652
+    components:
+    - type: Transform
+      pos: -6.4131513,5.5922756
+      parent: 1
+  - uid: 653
+    components:
+    - type: Transform
+      pos: -6.2777348,5.686091
+      parent: 1
+- proto: FaxMachineSyndie
+  entities:
+  - uid: 463
+    components:
+    - type: Transform
+      pos: -3.5,6.5
+      parent: 1
+    - type: FaxMachine
+      name: Wizard's Den
+- proto: FigureSpawner
+  entities:
+  - uid: 470
+    components:
+    - type: Transform
+      pos: 0.5,9.5
+      parent: 1
+- proto: Fireplace
+  entities:
+  - uid: 504
+    components:
+    - type: Transform
+      pos: -7.5,7.5
+      parent: 1
+- proto: FloorDrain
+  entities:
+  - uid: 618
+    components:
+    - type: Transform
+      pos: 8.5,5.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+- proto: FloorLavaEntity
+  entities:
+  - uid: 19
+    components:
+    - type: Transform
+      pos: 5.5,-0.5
+      parent: 1
+  - uid: 20
+    components:
+    - type: Transform
+      pos: -4.5,1.5
+      parent: 1
+  - uid: 26
+    components:
+    - type: Transform
+      pos: 5.5,0.5
+      parent: 1
+  - uid: 30
+    components:
+    - type: Transform
+      pos: 6.5,-0.5
+      parent: 1
+  - uid: 31
+    components:
+    - type: Transform
+      pos: -4.5,-0.5
+      parent: 1
+  - uid: 33
+    components:
+    - type: Transform
+      pos: -4.5,0.5
+      parent: 1
+  - uid: 60
+    components:
+    - type: Transform
+      pos: -5.5,-1.5
+      parent: 1
+  - uid: 61
+    components:
+    - type: Transform
+      pos: -5.5,-0.5
+      parent: 1
+  - uid: 62
+    components:
+    - type: Transform
+      pos: -5.5,0.5
+      parent: 1
+  - uid: 63
+    components:
+    - type: Transform
+      pos: 6.5,1.5
+      parent: 1
+  - uid: 65
+    components:
+    - type: Transform
+      pos: 6.5,0.5
+      parent: 1
+  - uid: 118
+    components:
+    - type: Transform
+      pos: 6.5,-7.5
+      parent: 1
+  - uid: 130
+    components:
+    - type: Transform
+      pos: -4.5,-6.5
+      parent: 1
+  - uid: 160
+    components:
+    - type: Transform
+      pos: -6.5,-0.5
+      parent: 1
+  - uid: 162
+    components:
+    - type: Transform
+      pos: 8.5,1.5
+      parent: 1
+  - uid: 163
+    components:
+    - type: Transform
+      pos: 7.5,1.5
+      parent: 1
+  - uid: 167
+    components:
+    - type: Transform
+      pos: -5.5,-5.5
+      parent: 1
+  - uid: 169
+    components:
+    - type: Transform
+      pos: 6.5,-8.5
+      parent: 1
+  - uid: 171
+    components:
+    - type: Transform
+      pos: 5.5,-7.5
+      parent: 1
+  - uid: 206
+    components:
+    - type: Transform
+      pos: 5.5,-8.5
+      parent: 1
+  - uid: 210
+    components:
+    - type: Transform
+      pos: 5.5,-6.5
+      parent: 1
+  - uid: 211
+    components:
+    - type: Transform
+      pos: -6.5,0.5
+      parent: 1
+  - uid: 213
+    components:
+    - type: Transform
+      pos: 7.5,0.5
+      parent: 1
+  - uid: 248
+    components:
+    - type: Transform
+      pos: -4.5,-5.5
+      parent: 1
+- proto: FloraGreyStalagmite
+  entities:
+  - uid: 189
+    components:
+    - type: Transform
+      pos: 0.7098959,-14.277794
+      parent: 1
+  - uid: 209
+    components:
+    - type: Transform
+      pos: -2.3364596,-1.3592265
+      parent: 1
+- proto: FloraStalagmite
+  entities:
+  - uid: 308
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,-1.5
+      parent: 1
+  - uid: 446
+    components:
+    - type: Transform
+      pos: -5.1672845,-9.665474
+      parent: 1
+- proto: FoodBurgerSpell
+  entities:
+  - uid: 647
+    components:
+    - type: Transform
+      pos: -6.5,9.5
+      parent: 1
+- proto: FoodMeat
+  entities:
+  - uid: 202
+    components:
+    - type: Transform
+      pos: -2.7996593,-10.547044
+      parent: 1
+  - uid: 533
+    components:
+    - type: Transform
+      pos: -0.23715895,-13.278107
+      parent: 1
+- proto: GasPipeStraight
+  entities:
+  - uid: 300
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: GravityGeneratorMini
+  entities:
+  - uid: 359
+    components:
+    - type: Transform
+      pos: 3.5,12.5
+      parent: 1
+- proto: Grille
+  entities:
+  - uid: 27
+    components:
+    - type: Transform
+      pos: 4.5,-0.5
+      parent: 1
+  - uid: 28
+    components:
+    - type: Transform
+      pos: 4.5,0.5
+      parent: 1
+  - uid: 29
+    components:
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 1
+  - uid: 50
+    components:
+    - type: Transform
+      pos: -3.5,-0.5
+      parent: 1
+  - uid: 51
+    components:
+    - type: Transform
+      pos: -3.5,1.5
+      parent: 1
+  - uid: 52
+    components:
+    - type: Transform
+      pos: -3.5,0.5
+      parent: 1
+  - uid: 79
+    components:
+    - type: Transform
+      pos: 1.5,-2.5
+      parent: 1
+  - uid: 84
+    components:
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 1
+  - uid: 389
+    components:
+    - type: Transform
+      pos: -2.5,13.5
+      parent: 1
+  - uid: 390
+    components:
+    - type: Transform
+      pos: -2.5,14.5
+      parent: 1
+  - uid: 391
+    components:
+    - type: Transform
+      pos: -1.5,14.5
+      parent: 1
+  - uid: 392
+    components:
+    - type: Transform
+      pos: -0.5,14.5
+      parent: 1
+  - uid: 393
+    components:
+    - type: Transform
+      pos: 0.5,14.5
+      parent: 1
+  - uid: 394
+    components:
+    - type: Transform
+      pos: 1.5,14.5
+      parent: 1
+  - uid: 395
+    components:
+    - type: Transform
+      pos: 2.5,14.5
+      parent: 1
+  - uid: 396
+    components:
+    - type: Transform
+      pos: 3.5,14.5
+      parent: 1
+  - uid: 397
+    components:
+    - type: Transform
+      pos: 3.5,13.5
+      parent: 1
+- proto: HospitalCurtainsOpen
+  entities:
+  - uid: 619
+    components:
+    - type: Transform
+      pos: 8.5,5.5
+      parent: 1
+- proto: LightPostSmall
+  entities:
+  - uid: 481
+    components:
+    - type: Transform
+      pos: 0.5,-8.5
+      parent: 1
+- proto: LuxuryPen
+  entities:
+  - uid: 478
+    components:
+    - type: Transform
+      pos: 4.5,5.5
+      parent: 1
+- proto: MedkitAdvancedFilled
+  entities:
+  - uid: 89
+    components:
+    - type: Transform
+      pos: -1.6541514,-0.17837936
+      parent: 1
+- proto: MedkitOxygenFilled
+  entities:
+  - uid: 90
+    components:
+    - type: Transform
+      pos: -1.391187,-0.4181292
+      parent: 1
+- proto: Mirror
+  entities:
+  - uid: 625
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,10.5
+      parent: 1
+- proto: MirrorShield
+  entities:
+  - uid: 87
+    components:
+    - type: Transform
+      pos: -1.7423494,1.6781805
+      parent: 1
+- proto: Paper
+  entities:
+  - uid: 479
+    components:
+    - type: Transform
+      pos: 4.548043,5.679018
+      parent: 1
+  - uid: 480
+    components:
+    - type: Transform
+      pos: 4.6209593,5.762409
+      parent: 1
+- proto: PaperBin5
+  entities:
+  - uid: 363
+    components:
+    - type: Transform
+      pos: -2.5,4.5
+      parent: 1
+- proto: PersonalAI
+  entities:
+  - uid: 94
+    components:
+    - type: Transform
+      pos: -1.4747214,0.57214147
+      parent: 1
+- proto: PlasmaDoor
+  entities:
+  - uid: 81
+    components:
+    - type: Transform
+      pos: 0.5,3.5
+      parent: 1
+  - uid: 82
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 1
+  - uid: 355
+    components:
+    - type: Transform
+      pos: 5.5,8.5
+      parent: 1
+  - uid: 356
+    components:
+    - type: Transform
+      pos: -4.5,8.5
+      parent: 1
+- proto: PlasmaWindow
+  entities:
+  - uid: 34
+    components:
+    - type: Transform
+      pos: -3.5,-0.5
+      parent: 1
+  - uid: 35
+    components:
+    - type: Transform
+      pos: -3.5,0.5
+      parent: 1
+  - uid: 36
+    components:
+    - type: Transform
+      pos: -3.5,1.5
+      parent: 1
+  - uid: 47
+    components:
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 1
+  - uid: 48
+    components:
+    - type: Transform
+      pos: 4.5,0.5
+      parent: 1
+  - uid: 49
+    components:
+    - type: Transform
+      pos: 4.5,-0.5
+      parent: 1
+  - uid: 156
+    components:
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 1
+  - uid: 159
+    components:
+    - type: Transform
+      pos: 1.5,-2.5
+      parent: 1
+- proto: PonderingOrbWizard
+  entities:
+  - uid: 92
+    components:
+    - type: Transform
+      pos: 2.3481953,0.30111992
+      parent: 1
+- proto: PottedPlantRandom
+  entities:
+  - uid: 271
+    components:
+    - type: Transform
+      pos: -3.5,9.5
+      parent: 1
+  - uid: 280
+    components:
+    - type: Transform
+      pos: 1.5,4.5
+      parent: 1
+  - uid: 303
+    components:
+    - type: Transform
+      pos: -0.5,4.5
+      parent: 1
+  - uid: 648
+    components:
+    - type: Transform
+      pos: 4.5,9.5
+      parent: 1
+- proto: PowerCellRecharger
+  entities:
+  - uid: 403
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,13.5
+      parent: 1
+- proto: PoweredSmallLight
+  entities:
+  - uid: 347
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,6.5
+      parent: 1
+  - uid: 387
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,6.5
+      parent: 1
+  - uid: 485
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,12.5
+      parent: 1
+  - uid: 486
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,12.5
+      parent: 1
+  - uid: 565
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,7.5
+      parent: 1
+  - uid: 620
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,5.5
+      parent: 1
+- proto: PoweredWarmSmallLight
+  entities:
+  - uid: 4
+    components:
+    - type: Transform
+      pos: 2.5,2.5
+      parent: 1
+  - uid: 25
+    components:
+    - type: Transform
+      pos: -1.5,2.5
+      parent: 1
+  - uid: 505
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,7.5
+      parent: 1
+- proto: Railing
+  entities:
+  - uid: 149
+    components:
+    - type: Transform
+      pos: -2.5,-7.5
+      parent: 1
+  - uid: 266
+    components:
+    - type: Transform
+      pos: -3.5,-7.5
+      parent: 1
+  - uid: 267
+    components:
+    - type: Transform
+      pos: -1.5,-7.5
+      parent: 1
+  - uid: 268
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-8.5
+      parent: 1
+  - uid: 306
+    components:
+    - type: Transform
+      pos: 1.5,-9.5
+      parent: 1
+  - uid: 307
+    components:
+    - type: Transform
+      pos: 0.5,-9.5
+      parent: 1
+  - uid: 310
+    components:
+    - type: Transform
+      pos: 4.5,-9.5
+      parent: 1
+  - uid: 326
+    components:
+    - type: Transform
+      pos: 3.5,-9.5
+      parent: 1
+  - uid: 413
+    components:
+    - type: Transform
+      pos: 2.5,-9.5
+      parent: 1
+- proto: RailingCorner
+  entities:
+  - uid: 309
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-9.5
+      parent: 1
+- proto: RailingCornerSmall
+  entities:
+  - uid: 219
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-7.5
+      parent: 1
+- proto: RandomStalagmiteOrCrystal
+  entities:
+  - uid: 119
+    components:
+    - type: Transform
+      pos: -7.5,-3.5
+      parent: 1
+  - uid: 604
+    components:
+    - type: Transform
+      pos: 9.5,1.5
+      parent: 1
+- proto: ReinforcedPlasmaWindow
+  entities:
+  - uid: 364
+    components:
+    - type: Transform
+      pos: -0.5,14.5
+      parent: 1
+  - uid: 366
+    components:
+    - type: Transform
+      pos: 0.5,14.5
+      parent: 1
+  - uid: 367
+    components:
+    - type: Transform
+      pos: 1.5,14.5
+      parent: 1
+  - uid: 368
+    components:
+    - type: Transform
+      pos: 2.5,14.5
+      parent: 1
+  - uid: 369
+    components:
+    - type: Transform
+      pos: -1.5,14.5
+      parent: 1
+  - uid: 370
+    components:
+    - type: Transform
+      pos: 3.5,14.5
+      parent: 1
+  - uid: 371
+    components:
+    - type: Transform
+      pos: 3.5,13.5
+      parent: 1
+  - uid: 372
+    components:
+    - type: Transform
+      pos: -2.5,14.5
+      parent: 1
+  - uid: 373
+    components:
+    - type: Transform
+      pos: -2.5,13.5
+      parent: 1
+- proto: SinkWide
+  entities:
+  - uid: 624
+    components:
+    - type: Transform
+      pos: 7.5,9.5
+      parent: 1
+- proto: Skub
+  entities:
+  - uid: 623
+    components:
+    - type: Transform
+      pos: 6.5,6.5
+      parent: 1
+- proto: SoapOmega
+  entities:
+  - uid: 622
+    components:
+    - type: Transform
+      pos: 8.5,5.5
+      parent: 1
+- proto: SpawnMobBear
+  entities:
+  - uid: 204
+    components:
+    - type: Transform
+      pos: 1.5,-12.5
+      parent: 1
+  - uid: 409
+    components:
+    - type: Transform
+      pos: -3.5,-9.5
+      parent: 1
+  - uid: 532
+    components:
+    - type: Transform
+      pos: -1.5,-11.5
+      parent: 1
+- proto: SpawnMobLizard
+  entities:
+  - uid: 518
+    components:
+    - type: Transform
+      pos: -5.5,9.5
+      parent: 1
+- proto: SpawnPointWizard
+  entities:
+  - uid: 2
+    components:
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 1
+- proto: StealthBox
+  entities:
+  - uid: 621
+    components:
+    - type: Transform
+      pos: 6.5,9.5
+      parent: 1
+    - type: Stealth
+      enabled: False
+    - type: EntityStorage
+      open: True
+- proto: TableCarpet
+  entities:
+  - uid: 341
+    components:
+    - type: Transform
+      pos: 0.5,8.5
+      parent: 1
+  - uid: 461
+    components:
+    - type: Transform
+      pos: 0.5,9.5
+      parent: 1
+  - uid: 473
+    components:
+    - type: Transform
+      pos: 4.5,6.5
+      parent: 1
+  - uid: 476
+    components:
+    - type: Transform
+      pos: 4.5,5.5
+      parent: 1
+- proto: TableFancyOrange
+  entities:
+  - uid: 345
+    components:
+    - type: Transform
+      pos: -3.5,6.5
+      parent: 1
+- proto: TableFancyPurple
+  entities:
+  - uid: 357
+    components:
+    - type: Transform
+      pos: -1.5,4.5
+      parent: 1
+  - uid: 358
+    components:
+    - type: Transform
+      pos: -2.5,4.5
+      parent: 1
+- proto: TableFancyRed
+  entities:
+  - uid: 360
+    components:
+    - type: Transform
+      pos: 3.5,4.5
+      parent: 1
+- proto: TableReinforced
+  entities:
+  - uid: 398
+    components:
+    - type: Transform
+      pos: 1.5,13.5
+      parent: 1
+  - uid: 399
+    components:
+    - type: Transform
+      pos: 2.5,13.5
+      parent: 1
+  - uid: 400
+    components:
+    - type: Transform
+      pos: -0.5,13.5
+      parent: 1
+  - uid: 401
+    components:
+    - type: Transform
+      pos: -1.5,13.5
+      parent: 1
+- proto: TableStone
+  entities:
+  - uid: 3
+    components:
+    - type: Transform
+      pos: -1.5,-0.5
+      parent: 1
+  - uid: 6
+    components:
+    - type: Transform
+      pos: -1.5,1.5
+      parent: 1
+  - uid: 7
+    components:
+    - type: Transform
+      pos: -1.5,0.5
+      parent: 1
+  - uid: 8
+    components:
+    - type: Transform
+      pos: 2.5,-0.5
+      parent: 1
+  - uid: 9
+    components:
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 1
+  - uid: 10
+    components:
+    - type: Transform
+      pos: 2.5,1.5
+      parent: 1
+- proto: TableWood
+  entities:
+  - uid: 502
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,9.5
+      parent: 1
+  - uid: 511
+    components:
+    - type: Transform
+      pos: -6.5,5.5
+      parent: 1
+- proto: TargetHuman
+  entities:
+  - uid: 305
+    components:
+    - type: Transform
+      pos: -2.5,-12.5
+      parent: 1
+- proto: TargetStrange
+  entities:
+  - uid: 304
+    components:
+    - type: Transform
+      pos: -4.5,-10.5
+      parent: 1
+- proto: ToiletEmpty
+  entities:
+  - uid: 617
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,5.5
+      parent: 1
+- proto: ToyFigurineWizard
+  entities:
+  - uid: 477
+    components:
+    - type: Transform
+      pos: 4.5,6.5
+      parent: 1
+- proto: VendingMachineDiscount
+  entities:
+  - uid: 454
+    components:
+    - type: Transform
+      pos: 2.5,4.5
+      parent: 1
+- proto: VendingMachineGames
+  entities:
+  - uid: 462
+    components:
+    - type: Transform
+      pos: 0.5,7.5
+      parent: 1
+- proto: VendingMachineMagivend
+  entities:
+  - uid: 453
+    components:
+    - type: Transform
+      pos: -2.5,12.5
+      parent: 1
+- proto: WallPlasma
+  entities:
+  - uid: 18
+    components:
+    - type: Transform
+      pos: 2.5,3.5
+      parent: 1
+  - uid: 21
+    components:
+    - type: Transform
+      pos: -3.5,2.5
+      parent: 1
+  - uid: 22
+    components:
+    - type: Transform
+      pos: -3.5,-1.5
+      parent: 1
+  - uid: 23
+    components:
+    - type: Transform
+      pos: -3.5,-2.5
+      parent: 1
+  - uid: 24
+    components:
+    - type: Transform
+      pos: 2.5,-2.5
+      parent: 1
+  - uid: 32
+    components:
+    - type: Transform
+      pos: -3.5,3.5
+      parent: 1
+  - uid: 37
+    components:
+    - type: Transform
+      pos: 4.5,-1.5
+      parent: 1
+  - uid: 38
+    components:
+    - type: Transform
+      pos: 4.5,2.5
+      parent: 1
+  - uid: 39
+    components:
+    - type: Transform
+      pos: 4.5,-2.5
+      parent: 1
+  - uid: 40
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 1
+  - uid: 41
+    components:
+    - type: Transform
+      pos: -2.5,-2.5
+      parent: 1
+  - uid: 42
+    components:
+    - type: Transform
+      pos: -1.5,-2.5
+      parent: 1
+  - uid: 43
+    components:
+    - type: Transform
+      pos: -2.5,3.5
+      parent: 1
+  - uid: 44
+    components:
+    - type: Transform
+      pos: -1.5,3.5
+      parent: 1
+  - uid: 45
+    components:
+    - type: Transform
+      pos: 4.5,3.5
+      parent: 1
+  - uid: 46
+    components:
+    - type: Transform
+      pos: 3.5,3.5
+      parent: 1
+  - uid: 83
+    components:
+    - type: Transform
+      pos: 1.5,3.5
+      parent: 1
+  - uid: 86
+    components:
+    - type: Transform
+      pos: -0.5,3.5
+      parent: 1
+  - uid: 329
+    components:
+    - type: Transform
+      pos: 8.5,4.5
+      parent: 1
+  - uid: 330
+    components:
+    - type: Transform
+      pos: 7.5,4.5
+      parent: 1
+  - uid: 331
+    components:
+    - type: Transform
+      pos: 4.5,4.5
+      parent: 1
+  - uid: 332
+    components:
+    - type: Transform
+      pos: 6.5,4.5
+      parent: 1
+  - uid: 333
+    components:
+    - type: Transform
+      pos: -4.5,5.5
+      parent: 1
+  - uid: 334
+    components:
+    - type: Transform
+      pos: -4.5,4.5
+      parent: 1
+  - uid: 335
+    components:
+    - type: Transform
+      pos: -4.5,6.5
+      parent: 1
+  - uid: 336
+    components:
+    - type: Transform
+      pos: 5.5,4.5
+      parent: 1
+  - uid: 337
+    components:
+    - type: Transform
+      pos: 5.5,5.5
+      parent: 1
+  - uid: 338
+    components:
+    - type: Transform
+      pos: 5.5,6.5
+      parent: 1
+  - uid: 339
+    components:
+    - type: Transform
+      pos: -3.5,4.5
+      parent: 1
+  - uid: 374
+    components:
+    - type: Transform
+      pos: -4.5,7.5
+      parent: 1
+  - uid: 376
+    components:
+    - type: Transform
+      pos: -4.5,10.5
+      parent: 1
+  - uid: 377
+    components:
+    - type: Transform
+      pos: -4.5,11.5
+      parent: 1
+  - uid: 378
+    components:
+    - type: Transform
+      pos: -4.5,12.5
+      parent: 1
+  - uid: 379
+    components:
+    - type: Transform
+      pos: -3.5,12.5
+      parent: 1
+  - uid: 380
+    components:
+    - type: Transform
+      pos: -3.5,13.5
+      parent: 1
+  - uid: 381
+    components:
+    - type: Transform
+      pos: 4.5,13.5
+      parent: 1
+  - uid: 382
+    components:
+    - type: Transform
+      pos: 4.5,12.5
+      parent: 1
+  - uid: 383
+    components:
+    - type: Transform
+      pos: 5.5,12.5
+      parent: 1
+  - uid: 384
+    components:
+    - type: Transform
+      pos: 5.5,11.5
+      parent: 1
+  - uid: 385
+    components:
+    - type: Transform
+      pos: 5.5,10.5
+      parent: 1
+  - uid: 386
+    components:
+    - type: Transform
+      pos: 5.5,9.5
+      parent: 1
+  - uid: 406
+    components:
+    - type: Transform
+      pos: 5.5,7.5
+      parent: 1
+  - uid: 412
+    components:
+    - type: Transform
+      pos: -4.5,9.5
+      parent: 1
+  - uid: 488
+    components:
+    - type: Transform
+      pos: -5.5,10.5
+      parent: 1
+  - uid: 489
+    components:
+    - type: Transform
+      pos: -6.5,10.5
+      parent: 1
+  - uid: 490
+    components:
+    - type: Transform
+      pos: -7.5,10.5
+      parent: 1
+  - uid: 491
+    components:
+    - type: Transform
+      pos: -7.5,9.5
+      parent: 1
+  - uid: 492
+    components:
+    - type: Transform
+      pos: -7.5,8.5
+      parent: 1
+  - uid: 493
+    components:
+    - type: Transform
+      pos: -8.5,8.5
+      parent: 1
+  - uid: 494
+    components:
+    - type: Transform
+      pos: -8.5,7.5
+      parent: 1
+  - uid: 495
+    components:
+    - type: Transform
+      pos: -8.5,6.5
+      parent: 1
+  - uid: 496
+    components:
+    - type: Transform
+      pos: -8.5,5.5
+      parent: 1
+  - uid: 497
+    components:
+    - type: Transform
+      pos: -8.5,4.5
+      parent: 1
+  - uid: 498
+    components:
+    - type: Transform
+      pos: -7.5,4.5
+      parent: 1
+  - uid: 499
+    components:
+    - type: Transform
+      pos: -6.5,4.5
+      parent: 1
+  - uid: 500
+    components:
+    - type: Transform
+      pos: -5.5,4.5
+      parent: 1
+  - uid: 585
+    components:
+    - type: Transform
+      pos: 6.5,10.5
+      parent: 1
+  - uid: 586
+    components:
+    - type: Transform
+      pos: 7.5,10.5
+      parent: 1
+  - uid: 587
+    components:
+    - type: Transform
+      pos: 8.5,10.5
+      parent: 1
+  - uid: 589
+    components:
+    - type: Transform
+      pos: 7.5,6.5
+      parent: 1
+  - uid: 590
+    components:
+    - type: Transform
+      pos: 7.5,5.5
+      parent: 1
+  - uid: 591
+    components:
+    - type: Transform
+      pos: 9.5,5.5
+      parent: 1
+  - uid: 592
+    components:
+    - type: Transform
+      pos: 9.5,6.5
+      parent: 1
+  - uid: 593
+    components:
+    - type: Transform
+      pos: 9.5,7.5
+      parent: 1
+  - uid: 594
+    components:
+    - type: Transform
+      pos: 9.5,8.5
+      parent: 1
+  - uid: 595
+    components:
+    - type: Transform
+      pos: 8.5,9.5
+      parent: 1
+  - uid: 597
+    components:
+    - type: Transform
+      pos: 8.5,8.5
+      parent: 1
+  - uid: 601
+    components:
+    - type: Transform
+      pos: 9.5,4.5
+      parent: 1
+- proto: WallRockBasalt
+  entities:
+  - uid: 11
+    components:
+    - type: Transform
+      pos: -4.5,3.5
+      parent: 1
+  - uid: 12
+    components:
+    - type: Transform
+      pos: 9.5,-12.5
+      parent: 1
+  - uid: 13
+    components:
+    - type: Transform
+      pos: -7.5,-2.5
+      parent: 1
+  - uid: 14
+    components:
+    - type: Transform
+      pos: -5.5,3.5
+      parent: 1
+  - uid: 15
+    components:
+    - type: Transform
+      pos: 5.5,-15.5
+      parent: 1
+  - uid: 16
+    components:
+    - type: Transform
+      pos: -7.5,-1.5
+      parent: 1
+  - uid: 17
+    components:
+    - type: Transform
+      pos: -5.5,-3.5
+      parent: 1
+  - uid: 53
+    components:
+    - type: Transform
+      pos: -6.5,-3.5
+      parent: 1
+  - uid: 54
+    components:
+    - type: Transform
+      pos: -5.5,-2.5
+      parent: 1
+  - uid: 55
+    components:
+    - type: Transform
+      pos: -4.5,-3.5
+      parent: 1
+  - uid: 56
+    components:
+    - type: Transform
+      pos: -4.5,-2.5
+      parent: 1
+  - uid: 57
+    components:
+    - type: Transform
+      pos: 5.5,3.5
+      parent: 1
+  - uid: 58
+    components:
+    - type: Transform
+      pos: 5.5,-2.5
+      parent: 1
+  - uid: 59
+    components:
+    - type: Transform
+      pos: 6.5,-2.5
+      parent: 1
+  - uid: 64
+    components:
+    - type: Transform
+      pos: 6.5,3.5
+      parent: 1
+  - uid: 66
+    components:
+    - type: Transform
+      pos: 7.5,3.5
+      parent: 1
+  - uid: 67
+    components:
+    - type: Transform
+      pos: 4.5,-15.5
+      parent: 1
+  - uid: 68
+    components:
+    - type: Transform
+      pos: 5.5,-14.5
+      parent: 1
+  - uid: 69
+    components:
+    - type: Transform
+      pos: 7.5,-0.5
+      parent: 1
+  - uid: 70
+    components:
+    - type: Transform
+      pos: 7.5,-1.5
+      parent: 1
+  - uid: 71
+    components:
+    - type: Transform
+      pos: 7.5,-2.5
+      parent: 1
+  - uid: 72
+    components:
+    - type: Transform
+      pos: 6.5,-14.5
+      parent: 1
+  - uid: 73
+    components:
+    - type: Transform
+      pos: -6.5,3.5
+      parent: 1
+  - uid: 74
+    components:
+    - type: Transform
+      pos: -6.5,2.5
+      parent: 1
+  - uid: 75
+    components:
+    - type: Transform
+      pos: 7.5,-12.5
+      parent: 1
+  - uid: 76
+    components:
+    - type: Transform
+      pos: 6.5,-13.5
+      parent: 1
+  - uid: 77
+    components:
+    - type: Transform
+      pos: -6.5,-2.5
+      parent: 1
+  - uid: 78
+    components:
+    - type: Transform
+      pos: -6.5,-1.5
+      parent: 1
+  - uid: 80
+    components:
+    - type: Transform
+      pos: -7.5,-0.5
+      parent: 1
+  - uid: 85
+    components:
+    - type: Transform
+      pos: 8.5,-13.5
+      parent: 1
+  - uid: 100
+    components:
+    - type: Transform
+      pos: 7.5,-14.5
+      parent: 1
+  - uid: 101
+    components:
+    - type: Transform
+      pos: 8.5,-12.5
+      parent: 1
+  - uid: 102
+    components:
+    - type: Transform
+      pos: 10.5,-7.5
+      parent: 1
+  - uid: 120
+    components:
+    - type: Transform
+      pos: -7.5,-5.5
+      parent: 1
+  - uid: 121
+    components:
+    - type: Transform
+      pos: -7.5,-4.5
+      parent: 1
+  - uid: 122
+    components:
+    - type: Transform
+      pos: -7.5,-6.5
+      parent: 1
+  - uid: 123
+    components:
+    - type: Transform
+      pos: -6.5,-4.5
+      parent: 1
+  - uid: 124
+    components:
+    - type: Transform
+      pos: -6.5,-5.5
+      parent: 1
+  - uid: 125
+    components:
+    - type: Transform
+      pos: -6.5,-6.5
+      parent: 1
+  - uid: 126
+    components:
+    - type: Transform
+      pos: -10.5,-2.5
+      parent: 1
+  - uid: 127
+    components:
+    - type: Transform
+      pos: -5.5,-6.5
+      parent: 1
+  - uid: 128
+    components:
+    - type: Transform
+      pos: -4.5,-4.5
+      parent: 1
+  - uid: 129
+    components:
+    - type: Transform
+      pos: -6.5,-8.5
+      parent: 1
+  - uid: 131
+    components:
+    - type: Transform
+      pos: -5.5,-4.5
+      parent: 1
+  - uid: 132
+    components:
+    - type: Transform
+      pos: -5.5,-7.5
+      parent: 1
+  - uid: 133
+    components:
+    - type: Transform
+      pos: -4.5,-7.5
+      parent: 1
+  - uid: 134
+    components:
+    - type: Transform
+      pos: -9.5,-3.5
+      parent: 1
+  - uid: 135
+    components:
+    - type: Transform
+      pos: -3.5,-3.5
+      parent: 1
+  - uid: 136
+    components:
+    - type: Transform
+      pos: -6.5,-7.5
+      parent: 1
+  - uid: 137
+    components:
+    - type: Transform
+      pos: 5.5,-3.5
+      parent: 1
+  - uid: 138
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 1
+  - uid: 139
+    components:
+    - type: Transform
+      pos: 5.5,-4.5
+      parent: 1
+  - uid: 140
+    components:
+    - type: Transform
+      pos: 6.5,-3.5
+      parent: 1
+  - uid: 141
+    components:
+    - type: Transform
+      pos: 8.5,0.5
+      parent: 1
+  - uid: 142
+    components:
+    - type: Transform
+      pos: 8.5,-0.5
+      parent: 1
+  - uid: 143
+    components:
+    - type: Transform
+      pos: 8.5,-1.5
+      parent: 1
+  - uid: 144
+    components:
+    - type: Transform
+      pos: 8.5,-4.5
+      parent: 1
+  - uid: 145
+    components:
+    - type: Transform
+      pos: 8.5,-3.5
+      parent: 1
+  - uid: 146
+    components:
+    - type: Transform
+      pos: 8.5,-5.5
+      parent: 1
+  - uid: 147
+    components:
+    - type: Transform
+      pos: 8.5,-2.5
+      parent: 1
+  - uid: 148
+    components:
+    - type: Transform
+      pos: 8.5,-6.5
+      parent: 1
+  - uid: 150
+    components:
+    - type: Transform
+      pos: 7.5,-3.5
+      parent: 1
+  - uid: 151
+    components:
+    - type: Transform
+      pos: 7.5,-4.5
+      parent: 1
+  - uid: 152
+    components:
+    - type: Transform
+      pos: 7.5,-5.5
+      parent: 1
+  - uid: 153
+    components:
+    - type: Transform
+      pos: 6.5,-4.5
+      parent: 1
+  - uid: 154
+    components:
+    - type: Transform
+      pos: 6.5,-6.5
+      parent: 1
+  - uid: 155
+    components:
+    - type: Transform
+      pos: 5.5,-5.5
+      parent: 1
+  - uid: 157
+    components:
+    - type: Transform
+      pos: 6.5,-5.5
+      parent: 1
+  - uid: 158
+    components:
+    - type: Transform
+      pos: 4.5,-4.5
+      parent: 1
+  - uid: 161
+    components:
+    - type: Transform
+      pos: 7.5,-7.5
+      parent: 1
+  - uid: 164
+    components:
+    - type: Transform
+      pos: -9.5,-1.5
+      parent: 1
+  - uid: 165
+    components:
+    - type: Transform
+      pos: -9.5,-2.5
+      parent: 1
+  - uid: 166
+    components:
+    - type: Transform
+      pos: -9.5,-0.5
+      parent: 1
+  - uid: 168
+    components:
+    - type: Transform
+      pos: 7.5,-6.5
+      parent: 1
+  - uid: 170
+    components:
+    - type: Transform
+      pos: 9.5,-7.5
+      parent: 1
+  - uid: 172
+    components:
+    - type: Transform
+      pos: 2.5,-17.5
+      parent: 1
+  - uid: 173
+    components:
+    - type: Transform
+      pos: 1.5,-17.5
+      parent: 1
+  - uid: 174
+    components:
+    - type: Transform
+      pos: 0.5,-17.5
+      parent: 1
+  - uid: 175
+    components:
+    - type: Transform
+      pos: 9.5,-10.5
+      parent: 1
+  - uid: 176
+    components:
+    - type: Transform
+      pos: 3.5,-17.5
+      parent: 1
+  - uid: 177
+    components:
+    - type: Transform
+      pos: 9.5,-6.5
+      parent: 1
+  - uid: 178
+    components:
+    - type: Transform
+      pos: 9.5,-11.5
+      parent: 1
+  - uid: 179
+    components:
+    - type: Transform
+      pos: -0.5,-17.5
+      parent: 1
+  - uid: 180
+    components:
+    - type: Transform
+      pos: 9.5,-9.5
+      parent: 1
+  - uid: 181
+    components:
+    - type: Transform
+      pos: 7.5,-15.5
+      parent: 1
+  - uid: 182
+    components:
+    - type: Transform
+      pos: 6.5,-15.5
+      parent: 1
+  - uid: 183
+    components:
+    - type: Transform
+      pos: 9.5,-8.5
+      parent: 1
+  - uid: 184
+    components:
+    - type: Transform
+      pos: 10.5,-8.5
+      parent: 1
+  - uid: 185
+    components:
+    - type: Transform
+      pos: 8.5,-10.5
+      parent: 1
+  - uid: 186
+    components:
+    - type: Transform
+      pos: 6.5,-16.5
+      parent: 1
+  - uid: 187
+    components:
+    - type: Transform
+      pos: 10.5,-6.5
+      parent: 1
+  - uid: 188
+    components:
+    - type: Transform
+      pos: 1.5,-18.5
+      parent: 1
+  - uid: 190
+    components:
+    - type: Transform
+      pos: -1.5,-18.5
+      parent: 1
+  - uid: 191
+    components:
+    - type: Transform
+      pos: 7.5,-16.5
+      parent: 1
+  - uid: 192
+    components:
+    - type: Transform
+      pos: 6.5,-17.5
+      parent: 1
+  - uid: 193
+    components:
+    - type: Transform
+      pos: -0.5,-18.5
+      parent: 1
+  - uid: 194
+    components:
+    - type: Transform
+      pos: 4.5,-16.5
+      parent: 1
+  - uid: 195
+    components:
+    - type: Transform
+      pos: 3.5,-16.5
+      parent: 1
+  - uid: 196
+    components:
+    - type: Transform
+      pos: 0.5,-18.5
+      parent: 1
+  - uid: 197
+    components:
+    - type: Transform
+      pos: 5.5,-16.5
+      parent: 1
+  - uid: 198
+    components:
+    - type: Transform
+      pos: 8.5,-11.5
+      parent: 1
+  - uid: 200
+    components:
+    - type: Transform
+      pos: 5.5,-17.5
+      parent: 1
+  - uid: 201
+    components:
+    - type: Transform
+      pos: -5.5,-8.5
+      parent: 1
+  - uid: 203
+    components:
+    - type: Transform
+      pos: -2.5,-18.5
+      parent: 1
+  - uid: 205
+    components:
+    - type: Transform
+      pos: 8.5,-14.5
+      parent: 1
+  - uid: 207
+    components:
+    - type: Transform
+      pos: 10.5,-10.5
+      parent: 1
+  - uid: 208
+    components:
+    - type: Transform
+      pos: 5.5,-9.5
+      parent: 1
+  - uid: 214
+    components:
+    - type: Transform
+      pos: 4.5,-17.5
+      parent: 1
+  - uid: 215
+    components:
+    - type: Transform
+      pos: -1.5,-17.5
+      parent: 1
+  - uid: 216
+    components:
+    - type: Transform
+      pos: -2.5,-17.5
+      parent: 1
+  - uid: 217
+    components:
+    - type: Transform
+      pos: -2.5,-14.5
+      parent: 1
+  - uid: 218
+    components:
+    - type: Transform
+      pos: -6.5,-11.5
+      parent: 1
+  - uid: 220
+    components:
+    - type: Transform
+      pos: 3.5,-15.5
+      parent: 1
+  - uid: 221
+    components:
+    - type: Transform
+      pos: 2.5,-16.5
+      parent: 1
+  - uid: 222
+    components:
+    - type: Transform
+      pos: -1.5,-15.5
+      parent: 1
+  - uid: 223
+    components:
+    - type: Transform
+      pos: -0.5,-15.5
+      parent: 1
+  - uid: 224
+    components:
+    - type: Transform
+      pos: 0.5,-15.5
+      parent: 1
+  - uid: 225
+    components:
+    - type: Transform
+      pos: 1.5,-15.5
+      parent: 1
+  - uid: 226
+    components:
+    - type: Transform
+      pos: 1.5,-16.5
+      parent: 1
+  - uid: 227
+    components:
+    - type: Transform
+      pos: 0.5,-16.5
+      parent: 1
+  - uid: 228
+    components:
+    - type: Transform
+      pos: -0.5,-16.5
+      parent: 1
+  - uid: 229
+    components:
+    - type: Transform
+      pos: -1.5,-16.5
+      parent: 1
+  - uid: 230
+    components:
+    - type: Transform
+      pos: -2.5,-16.5
+      parent: 1
+  - uid: 231
+    components:
+    - type: Transform
+      pos: -2.5,-15.5
+      parent: 1
+  - uid: 232
+    components:
+    - type: Transform
+      pos: -3.5,-15.5
+      parent: 1
+  - uid: 233
+    components:
+    - type: Transform
+      pos: -3.5,-14.5
+      parent: 1
+  - uid: 234
+    components:
+    - type: Transform
+      pos: -4.5,-14.5
+      parent: 1
+  - uid: 235
+    components:
+    - type: Transform
+      pos: -5.5,-13.5
+      parent: 1
+  - uid: 236
+    components:
+    - type: Transform
+      pos: -6.5,-12.5
+      parent: 1
+  - uid: 237
+    components:
+    - type: Transform
+      pos: -7.5,-10.5
+      parent: 1
+  - uid: 238
+    components:
+    - type: Transform
+      pos: -7.5,-9.5
+      parent: 1
+  - uid: 239
+    components:
+    - type: Transform
+      pos: -8.5,-8.5
+      parent: 1
+  - uid: 240
+    components:
+    - type: Transform
+      pos: 5.5,-11.5
+      parent: 1
+  - uid: 241
+    components:
+    - type: Transform
+      pos: 5.5,-10.5
+      parent: 1
+  - uid: 242
+    components:
+    - type: Transform
+      pos: -8.5,-7.5
+      parent: 1
+  - uid: 243
+    components:
+    - type: Transform
+      pos: -8.5,-6.5
+      parent: 1
+  - uid: 244
+    components:
+    - type: Transform
+      pos: -8.5,-5.5
+      parent: 1
+  - uid: 246
+    components:
+    - type: Transform
+      pos: -10.5,-1.5
+      parent: 1
+  - uid: 247
+    components:
+    - type: Transform
+      pos: -10.5,-0.5
+      parent: 1
+  - uid: 249
+    components:
+    - type: Transform
+      pos: -10.5,0.5
+      parent: 1
+  - uid: 250
+    components:
+    - type: Transform
+      pos: -10.5,1.5
+      parent: 1
+  - uid: 251
+    components:
+    - type: Transform
+      pos: -10.5,2.5
+      parent: 1
+  - uid: 252
+    components:
+    - type: Transform
+      pos: -10.5,-3.5
+      parent: 1
+  - uid: 253
+    components:
+    - type: Transform
+      pos: 11.5,1.5
+      parent: 1
+  - uid: 254
+    components:
+    - type: Transform
+      pos: -9.5,-4.5
+      parent: 1
+  - uid: 255
+    components:
+    - type: Transform
+      pos: -9.5,-5.5
+      parent: 1
+  - uid: 256
+    components:
+    - type: Transform
+      pos: -9.5,-6.5
+      parent: 1
+  - uid: 257
+    components:
+    - type: Transform
+      pos: 11.5,0.5
+      parent: 1
+  - uid: 258
+    components:
+    - type: Transform
+      pos: 11.5,-1.5
+      parent: 1
+  - uid: 259
+    components:
+    - type: Transform
+      pos: 11.5,-2.5
+      parent: 1
+  - uid: 260
+    components:
+    - type: Transform
+      pos: 11.5,-0.5
+      parent: 1
+  - uid: 261
+    components:
+    - type: Transform
+      pos: 10.5,-2.5
+      parent: 1
+  - uid: 262
+    components:
+    - type: Transform
+      pos: 10.5,-3.5
+      parent: 1
+  - uid: 263
+    components:
+    - type: Transform
+      pos: 10.5,-4.5
+      parent: 1
+  - uid: 264
+    components:
+    - type: Transform
+      pos: 10.5,-5.5
+      parent: 1
+  - uid: 265
+    components:
+    - type: Transform
+      pos: 8.5,-15.5
+      parent: 1
+  - uid: 269
+    components:
+    - type: Transform
+      pos: -4.5,-15.5
+      parent: 1
+  - uid: 270
+    components:
+    - type: Transform
+      pos: -5.5,-14.5
+      parent: 1
+  - uid: 272
+    components:
+    - type: Transform
+      pos: -6.5,-13.5
+      parent: 1
+  - uid: 273
+    components:
+    - type: Transform
+      pos: -7.5,-11.5
+      parent: 1
+  - uid: 276
+    components:
+    - type: Transform
+      pos: -8.5,-10.5
+      parent: 1
+  - uid: 277
+    components:
+    - type: Transform
+      pos: -8.5,-9.5
+      parent: 1
+  - uid: 278
+    components:
+    - type: Transform
+      pos: 7.5,-13.5
+      parent: 1
+  - uid: 279
+    components:
+    - type: Transform
+      pos: -10.5,-4.5
+      parent: 1
+  - uid: 281
+    components:
+    - type: Transform
+      pos: -10.5,-5.5
+      parent: 1
+  - uid: 282
+    components:
+    - type: Transform
+      pos: -10.5,-6.5
+      parent: 1
+  - uid: 283
+    components:
+    - type: Transform
+      pos: -9.5,-7.5
+      parent: 1
+  - uid: 284
+    components:
+    - type: Transform
+      pos: -9.5,-8.5
+      parent: 1
+  - uid: 285
+    components:
+    - type: Transform
+      pos: -9.5,-9.5
+      parent: 1
+  - uid: 286
+    components:
+    - type: Transform
+      pos: -9.5,-10.5
+      parent: 1
+  - uid: 287
+    components:
+    - type: Transform
+      pos: -9.5,-11.5
+      parent: 1
+  - uid: 288
+    components:
+    - type: Transform
+      pos: -8.5,-11.5
+      parent: 1
+  - uid: 289
+    components:
+    - type: Transform
+      pos: -8.5,-13.5
+      parent: 1
+  - uid: 290
+    components:
+    - type: Transform
+      pos: -7.5,-12.5
+      parent: 1
+  - uid: 291
+    components:
+    - type: Transform
+      pos: -8.5,-12.5
+      parent: 1
+  - uid: 292
+    components:
+    - type: Transform
+      pos: -7.5,-13.5
+      parent: 1
+  - uid: 293
+    components:
+    - type: Transform
+      pos: -6.5,-14.5
+      parent: 1
+  - uid: 294
+    components:
+    - type: Transform
+      pos: -6.5,-15.5
+      parent: 1
+  - uid: 295
+    components:
+    - type: Transform
+      pos: -5.5,-15.5
+      parent: 1
+  - uid: 296
+    components:
+    - type: Transform
+      pos: -5.5,-16.5
+      parent: 1
+  - uid: 297
+    components:
+    - type: Transform
+      pos: -4.5,-16.5
+      parent: 1
+  - uid: 298
+    components:
+    - type: Transform
+      pos: -3.5,-16.5
+      parent: 1
+  - uid: 299
+    components:
+    - type: Transform
+      pos: -3.5,-17.5
+      parent: 1
+  - uid: 301
+    components:
+    - type: Transform
+      pos: -7.5,-14.5
+      parent: 1
+  - uid: 302
+    components:
+    - type: Transform
+      pos: -10.5,-7.5
+      parent: 1
+  - uid: 311
+    components:
+    - type: Transform
+      pos: -7.5,3.5
+      parent: 1
+  - uid: 312
+    components:
+    - type: Transform
+      pos: -7.5,2.5
+      parent: 1
+  - uid: 313
+    components:
+    - type: Transform
+      pos: 10.5,-9.5
+      parent: 1
+  - uid: 314
+    components:
+    - type: Transform
+      pos: -8.5,0.5
+      parent: 1
+  - uid: 315
+    components:
+    - type: Transform
+      pos: -8.5,-0.5
+      parent: 1
+  - uid: 316
+    components:
+    - type: Transform
+      pos: -8.5,-1.5
+      parent: 1
+  - uid: 317
+    components:
+    - type: Transform
+      pos: -8.5,-2.5
+      parent: 1
+  - uid: 318
+    components:
+    - type: Transform
+      pos: -8.5,-4.5
+      parent: 1
+  - uid: 319
+    components:
+    - type: Transform
+      pos: -8.5,-3.5
+      parent: 1
+  - uid: 320
+    components:
+    - type: Transform
+      pos: 9.5,-1.5
+      parent: 1
+  - uid: 321
+    components:
+    - type: Transform
+      pos: 9.5,-2.5
+      parent: 1
+  - uid: 322
+    components:
+    - type: Transform
+      pos: 9.5,-3.5
+      parent: 1
+  - uid: 323
+    components:
+    - type: Transform
+      pos: 9.5,-4.5
+      parent: 1
+  - uid: 324
+    components:
+    - type: Transform
+      pos: 9.5,-0.5
+      parent: 1
+  - uid: 325
+    components:
+    - type: Transform
+      pos: 9.5,0.5
+      parent: 1
+  - uid: 327
+    components:
+    - type: Transform
+      pos: 8.5,2.5
+      parent: 1
+  - uid: 328
+    components:
+    - type: Transform
+      pos: 8.5,3.5
+      parent: 1
+  - uid: 464
+    components:
+    - type: Transform
+      pos: -9.5,6.5
+      parent: 1
+  - uid: 482
+    components:
+    - type: Transform
+      pos: 2.5,-18.5
+      parent: 1
+  - uid: 483
+    components:
+    - type: Transform
+      pos: -11.5,-0.5
+      parent: 1
+  - uid: 484
+    components:
+    - type: Transform
+      pos: -11.5,-1.5
+      parent: 1
+  - uid: 487
+    components:
+    - type: Transform
+      pos: -11.5,-2.5
+      parent: 1
+  - uid: 519
+    components:
+    - type: Transform
+      pos: -11.5,-3.5
+      parent: 1
+  - uid: 520
+    components:
+    - type: Transform
+      pos: 11.5,-3.5
+      parent: 1
+  - uid: 521
+    components:
+    - type: Transform
+      pos: 11.5,-4.5
+      parent: 1
+  - uid: 522
+    components:
+    - type: Transform
+      pos: 11.5,-5.5
+      parent: 1
+  - uid: 523
+    components:
+    - type: Transform
+      pos: 11.5,2.5
+      parent: 1
+  - uid: 545
+    components:
+    - type: Transform
+      pos: -9.5,4.5
+      parent: 1
+  - uid: 546
+    components:
+    - type: Transform
+      pos: -9.5,5.5
+      parent: 1
+  - uid: 558
+    components:
+    - type: Transform
+      pos: -9.5,3.5
+      parent: 1
+  - uid: 559
+    components:
+    - type: Transform
+      pos: -9.5,1.5
+      parent: 1
+  - uid: 560
+    components:
+    - type: Transform
+      pos: -9.5,0.5
+      parent: 1
+  - uid: 561
+    components:
+    - type: Transform
+      pos: -9.5,2.5
+      parent: 1
+  - uid: 562
+    components:
+    - type: Transform
+      pos: -8.5,1.5
+      parent: 1
+  - uid: 563
+    components:
+    - type: Transform
+      pos: -8.5,2.5
+      parent: 1
+  - uid: 564
+    components:
+    - type: Transform
+      pos: -8.5,3.5
+      parent: 1
+  - uid: 596
+    components:
+    - type: Transform
+      pos: 10.5,5.5
+      parent: 1
+  - uid: 598
+    components:
+    - type: Transform
+      pos: 10.5,4.5
+      parent: 1
+  - uid: 599
+    components:
+    - type: Transform
+      pos: 10.5,3.5
+      parent: 1
+  - uid: 600
+    components:
+    - type: Transform
+      pos: 10.5,2.5
+      parent: 1
+  - uid: 602
+    components:
+    - type: Transform
+      pos: 9.5,3.5
+      parent: 1
+  - uid: 603
+    components:
+    - type: Transform
+      pos: 9.5,2.5
+      parent: 1
+  - uid: 606
+    components:
+    - type: Transform
+      pos: 6.5,-10.5
+      parent: 1
+  - uid: 607
+    components:
+    - type: Transform
+      pos: 6.5,-9.5
+      parent: 1
+  - uid: 608
+    components:
+    - type: Transform
+      pos: 7.5,-9.5
+      parent: 1
+  - uid: 609
+    components:
+    - type: Transform
+      pos: 7.5,-8.5
+      parent: 1
+  - uid: 610
+    components:
+    - type: Transform
+      pos: 8.5,-7.5
+      parent: 1
+  - uid: 613
+    components:
+    - type: Transform
+      pos: 10.5,1.5
+      parent: 1
+  - uid: 614
+    components:
+    - type: Transform
+      pos: 10.5,0.5
+      parent: 1
+  - uid: 615
+    components:
+    - type: Transform
+      pos: 10.5,-0.5
+      parent: 1
+  - uid: 616
+    components:
+    - type: Transform
+      pos: 10.5,-1.5
+      parent: 1
+  - uid: 656
+    components:
+    - type: Transform
+      pos: 4.5,-13.5
+      parent: 1
+  - uid: 657
+    components:
+    - type: Transform
+      pos: 5.5,-13.5
+      parent: 1
+  - uid: 658
+    components:
+    - type: Transform
+      pos: 5.5,-12.5
+      parent: 1
+  - uid: 659
+    components:
+    - type: Transform
+      pos: 6.5,-11.5
+      parent: 1
+  - uid: 660
+    components:
+    - type: Transform
+      pos: 7.5,-10.5
+      parent: 1
+  - uid: 661
+    components:
+    - type: Transform
+      pos: 8.5,-8.5
+      parent: 1
+  - uid: 663
+    components:
+    - type: Transform
+      pos: -4.5,-13.5
+      parent: 1
+  - uid: 665
+    components:
+    - type: Transform
+      pos: -5.5,-12.5
+      parent: 1
+  - uid: 668
+    components:
+    - type: Transform
+      pos: -6.5,-10.5
+      parent: 1
+  - uid: 669
+    components:
+    - type: Transform
+      pos: -6.5,-9.5
+      parent: 1
+  - uid: 670
+    components:
+    - type: Transform
+      pos: -7.5,-7.5
+      parent: 1
+  - uid: 671
+    components:
+    - type: Transform
+      pos: -7.5,-8.5
+      parent: 1
+  - uid: 672
+    components:
+    - type: Transform
+      pos: 8.5,-9.5
+      parent: 1
+  - uid: 673
+    components:
+    - type: Transform
+      pos: 9.5,-5.5
+      parent: 1
+  - uid: 674
+    components:
+    - type: Transform
+      pos: 7.5,-11.5
+      parent: 1
+  - uid: 675
+    components:
+    - type: Transform
+      pos: 6.5,-12.5
+      parent: 1
+  - uid: 676
+    components:
+    - type: Transform
+      pos: 4.5,-14.5
+      parent: 1
+  - uid: 677
+    components:
+    - type: Transform
+      pos: 3.5,-14.5
+      parent: 1
+  - uid: 678
+    components:
+    - type: Transform
+      pos: 2.5,-15.5
+      parent: 1
+- proto: WeaponCapacitorRecharger
+  entities:
+  - uid: 402
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,13.5
+      parent: 1
+- proto: WindoorPlasma
+  entities:
+  - uid: 588
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,6.5
+      parent: 1
+  - uid: 605
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,6.5
+      parent: 1
+- proto: WizardComputerComms
+  entities:
+  - uid: 365
+    components:
+    - type: Transform
+      pos: 0.5,13.5
+      parent: 1
+- proto: WoodblockInstrument
+  entities:
+  - uid: 91
+    components:
+    - type: Transform
+      pos: 2.5347729,-0.35558593
+      parent: 1
+...
diff --git a/Resources/Maps/_Starlight/Shuttles/CBURN_Q.yml b/Resources/Maps/_Starlight/Shuttles/CBURN_Q.yml
new file mode 100644
index 000000000000..81a7aaf2a2d6
--- /dev/null
+++ b/Resources/Maps/_Starlight/Shuttles/CBURN_Q.yml
@@ -0,0 +1,10139 @@
+meta:
+  format: 7
+  category: Grid
+  engineVersion: 264.0.0
+  forkId: Starlight
+  forkVersion: 1732131340
+  time: 08/13/2025 22:31:30
+  entityCount: 1370
+maps: []
+grids:
+- 1
+orphans:
+- 1
+nullspace: []
+tilemap:
+  1: Space
+  11: FloorBar
+  8: FloorDark
+  2: FloorDarkHerringbone
+  5: FloorDarkMono
+  10: FloorDarkPavementVertical
+  6: FloorRGlass
+  4: FloorReinforced
+  9: FloorShowroom
+  3: FloorSteel
+  7: FloorWood
+  12: FloorWoodTile
+  13: Lattice
+  0: Plating
+entities:
+- proto: ""
+  entities:
+  - uid: 1
+    components:
+    - type: MetaData
+      name: CBURN_Shuttle_Q
+    - type: Transform
+      pos: -0.515625,-0.53125
+      parent: invalid
+    - type: MapGrid
+      chunks:
+        0,0:
+          ind: 0,0
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAA0AAAAAAAANAAAAAAAADQAAAAAAAA0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
+          version: 7
+        -1,0:
+          ind: -1,0
+          tiles: AQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAANAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAADQAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA0AAAAAAAANAAAAAAAADQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAANAAAAAAAADQAAAAAAAA0AAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
+          version: 7
+        0,-1:
+          ind: 0,-1
+          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAABQAAAAAAAAUAAAAAAAAAAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAAAAAAAAAAGAAAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABgAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABgAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAYAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAYAAAAAAAAHAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAAAAAAAAAAHAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAAAAAAAAAABgAAAAAAAAYAAAAAAAAAAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABgAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAABgAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAYAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAAAAYAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAA==
+          version: 7
+        -1,-1:
+          ind: -1,-1
+          tiles: AQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAANAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAADQAAAAAAAAAAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAACAAAAAAAABQAAAAAAAAUAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAANAAAAAAAAAAAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAwAAAAAAAAHAAAAAAAABwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAADQAAAAAAAAAAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA0AAAAAAAANAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAcAAAAAAAAHAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAANAAAAAAAADQAAAAAAAA0AAAAAAAAKAAAAAAAACgAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAADQAAAAAAAAEAAAAAAAANAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA0AAAAAAAABAAAAAAAADQAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAANAAAAAAAAAQAAAAAAAA0AAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAADQAAAAAAAA0AAAAAAAANAAAAAAAACgAAAAAAAAoAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA0AAAAAAAANAAAAAAAACgAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAcAAAAAAAAHAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAANAAAAAAAAAAAAAAAAAAoAAAAAAAAKAAAAAAAACgAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAADQAAAAAAAAAAAAAAAAAKAAAAAAAACgAAAAAAAAoAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAANAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
+          version: 7
+        -1,-2:
+          ind: -1,-2
+          tiles: AQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA0AAAAAAAANAAAAAAAADQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAANAAAAAAAADQAAAAAAAA0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAUAAAAAAAAFAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAANAAAAAAAAAAAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
+          version: 7
+        0,-2:
+          ind: 0,-2
+          tiles: AQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAADQAAAAAAAA0AAAAAAAANAAAAAAAADQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAAAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAwAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAABwAAAAAAAAcAAAAAAAAHAAAAAAAAAAAAAAAAAA==
+          version: 7
+        1,0:
+          ind: 1,0
+          tiles: DQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA0AAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAANAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAADQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA0AAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
+          version: 7
+        1,-1:
+          ind: 1,-1
+          tiles: DQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA0AAAAAAAANAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAGAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAGAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAYAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAADQAAAAAAAA0AAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
+          version: 7
+        1,-2:
+          ind: 1,-2
+          tiles: AQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAADQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA0AAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAANAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAADQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
+          version: 7
+    - type: Broadphase
+    - type: Physics
+      bodyStatus: InAir
+      fixedRotation: False
+      bodyType: Dynamic
+    - type: Fixtures
+      fixtures: {}
+    - type: OccluderTree
+    - type: SpreaderGrid
+    - type: Shuttle
+      dampingModifier: 0.25
+    - type: ImplicitRoof
+    - type: GridPathfinding
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+    - type: DecalGrid
+      chunkCollection:
+        version: 2
+        nodes:
+        - node:
+            color: '#FFFFFFFF'
+            id: Arrows
+          decals:
+            287: 8,-10
+            288: 13,-10
+        - node:
+            angle: -1.5707963267948966 rad
+            color: '#FFFFFF7F'
+            id: ArrowsGreyscale
+          decals:
+            261: 4,-12
+            262: 2,-12
+            263: 4,-4
+            297: 2,-4
+        - node:
+            color: '#FFFFFF7F'
+            id: ArrowsGreyscale
+          decals:
+            269: 8,-12
+            270: 13,-12
+        - node:
+            angle: 1.5707963267948966 rad
+            color: '#FFFFFF7F'
+            id: ArrowsGreyscale
+          decals:
+            258: 4,-3
+            260: 4,-13
+            291: 2,-13
+            298: 2,-3
+        - node:
+            color: '#37789BFF'
+            id: BrickTileWhiteCornerNe
+          decals:
+            168: 11,-3
+        - node:
+            color: '#52B4E9FF'
+            id: BrickTileWhiteCornerNe
+          decals:
+            51: 14,3
+        - node:
+            color: '#791500CC'
+            id: BrickTileWhiteCornerNe
+          decals:
+            167: 8,-15
+        - node:
+            color: '#96DAFFFF'
+            id: BrickTileWhiteCornerNe
+          decals:
+            178: 14,-6
+        - node:
+            color: '#DE3A3AFF'
+            id: BrickTileWhiteCornerNe
+          decals:
+            111: 3,-15
+        - node:
+            color: '#FA7500FF'
+            id: BrickTileWhiteCornerNe
+          decals:
+            110: 5,-6
+        - node:
+            color: '#FF9821FF'
+            id: BrickTileWhiteCornerNe
+          decals:
+            91: 2,2
+            92: 3,1
+        - node:
+            color: '#37789BFF'
+            id: BrickTileWhiteCornerNw
+          decals:
+            169: 8,-3
+        - node:
+            color: '#52B4E9FF'
+            id: BrickTileWhiteCornerNw
+          decals:
+            48: 5,3
+        - node:
+            color: '#791500CC'
+            id: BrickTileWhiteCornerNw
+          decals:
+            166: 5,-15
+        - node:
+            color: '#96DAFFFF'
+            id: BrickTileWhiteCornerNw
+          decals:
+            179: 7,-6
+        - node:
+            color: '#DE3A3AFF'
+            id: BrickTileWhiteCornerNw
+          decals:
+            112: -6,-15
+        - node:
+            color: '#FA7500FF'
+            id: BrickTileWhiteCornerNw
+          decals:
+            109: 2,-6
+        - node:
+            color: '#FF9821FF'
+            id: BrickTileWhiteCornerNw
+          decals:
+            242: -3,2
+        - node:
+            color: '#37789BFF'
+            id: BrickTileWhiteCornerSe
+          decals:
+            170: 11,-5
+        - node:
+            color: '#52B4E9FF'
+            id: BrickTileWhiteCornerSe
+          decals:
+            49: 14,-1
+        - node:
+            color: '#791500CC'
+            id: BrickTileWhiteCornerSe
+          decals:
+            164: 8,-19
+        - node:
+            color: '#96DAFFFF'
+            id: BrickTileWhiteCornerSe
+          decals:
+            180: 14,-10
+        - node:
+            color: '#DE3A3AFF'
+            id: BrickTileWhiteCornerSe
+          decals:
+            113: 3,-18
+        - node:
+            color: '#FA7500FF'
+            id: BrickTileWhiteCornerSe
+          decals:
+            108: 5,-10
+        - node:
+            color: '#FF9821FF'
+            id: BrickTileWhiteCornerSe
+          decals:
+            88: 3,-1
+        - node:
+            color: '#37789BFF'
+            id: BrickTileWhiteCornerSw
+          decals:
+            171: 8,-5
+        - node:
+            color: '#52B4E9FF'
+            id: BrickTileWhiteCornerSw
+          decals:
+            50: 5,-1
+        - node:
+            color: '#791500CC'
+            id: BrickTileWhiteCornerSw
+          decals:
+            165: 5,-19
+        - node:
+            color: '#96DAFFFF'
+            id: BrickTileWhiteCornerSw
+          decals:
+            181: 7,-10
+        - node:
+            color: '#DE3A3AFF'
+            id: BrickTileWhiteCornerSw
+          decals:
+            114: -2,-18
+            133: -6,-17
+        - node:
+            color: '#FA7500FF'
+            id: BrickTileWhiteCornerSw
+          decals:
+            107: 2,-10
+        - node:
+            color: '#FF9821FF'
+            id: BrickTileWhiteCornerSw
+          decals:
+            86: -3,-1
+        - node:
+            color: '#FF9821FF'
+            id: BrickTileWhiteInnerNe
+          decals:
+            93: 2,1
+        - node:
+            color: '#DE3A3AFF'
+            id: BrickTileWhiteInnerSw
+          decals:
+            135: -2,-17
+        - node:
+            color: '#37789BFF'
+            id: BrickTileWhiteLineE
+          decals:
+            172: 11,-4
+        - node:
+            color: '#52B4E9FF'
+            id: BrickTileWhiteLineE
+          decals:
+            52: 14,0
+            53: 14,1
+            54: 14,2
+        - node:
+            color: '#791500CC'
+            id: BrickTileWhiteLineE
+          decals:
+            161: 8,-18
+            162: 8,-17
+            163: 8,-16
+        - node:
+            color: '#96DAFFFF'
+            id: BrickTileWhiteLineE
+          decals:
+            182: 14,-9
+            183: 14,-8
+            184: 14,-7
+        - node:
+            color: '#DE3A3AFF'
+            id: BrickTileWhiteLineE
+          decals:
+            115: 3,-17
+            116: 3,-16
+        - node:
+            color: '#FA7500FF'
+            id: BrickTileWhiteLineE
+          decals:
+            104: 5,-9
+            105: 5,-8
+            106: 5,-7
+        - node:
+            color: '#FF9821FF'
+            id: BrickTileWhiteLineE
+          decals:
+            85: 3,0
+        - node:
+            color: '#37789BFF'
+            id: BrickTileWhiteLineN
+          decals:
+            173: 9,-3
+            174: 10,-3
+        - node:
+            color: '#52B4E9FF'
+            id: BrickTileWhiteLineN
+          decals:
+            55: 13,3
+            56: 12,3
+            57: 11,3
+            58: 10,3
+            59: 9,3
+            60: 8,3
+            61: 7,3
+            62: 6,3
+        - node:
+            color: '#791500CC'
+            id: BrickTileWhiteLineN
+          decals:
+            154: 6,-15
+            155: 7,-15
+        - node:
+            color: '#96DAFFFF'
+            id: BrickTileWhiteLineN
+          decals:
+            185: 8,-6
+            186: 9,-6
+            187: 10,-6
+            188: 11,-6
+            189: 12,-6
+            190: 13,-6
+        - node:
+            color: '#DE3A3AFF'
+            id: BrickTileWhiteLineN
+          decals:
+            117: -5,-15
+            118: -4,-15
+            119: -2,-15
+            120: -3,-15
+            121: -1,-15
+            122: 0,-15
+            123: 1,-15
+            124: 2,-15
+        - node:
+            color: '#FA7500FF'
+            id: BrickTileWhiteLineN
+          decals:
+            99: 3,-6
+            100: 4,-6
+        - node:
+            color: '#FF9821FF'
+            id: BrickTileWhiteLineN
+          decals:
+            80: -1,2
+            81: 0,2
+            82: 1,2
+            240: -2,2
+        - node:
+            color: '#37789BFF'
+            id: BrickTileWhiteLineS
+          decals:
+            175: 9,-5
+            176: 10,-5
+        - node:
+            color: '#52B4E9FF'
+            id: BrickTileWhiteLineS
+          decals:
+            63: 6,-1
+            64: 7,-1
+            65: 8,-1
+            66: 9,-1
+            67: 10,-1
+            68: 11,-1
+            69: 13,-1
+            70: 12,-1
+        - node:
+            color: '#791500CC'
+            id: BrickTileWhiteLineS
+          decals:
+            156: 6,-19
+            157: 7,-19
+        - node:
+            color: '#96DAFFFF'
+            id: BrickTileWhiteLineS
+          decals:
+            193: 10,-10
+            194: 11,-10
+            195: 12,-10
+            280: 9,-10
+            282: 8,-10
+            283: 13,-10
+        - node:
+            color: '#DE3A3AFF'
+            id: BrickTileWhiteLineS
+          decals:
+            125: 1,-18
+            126: 2,-18
+            127: 0,-18
+            128: -1,-18
+            129: -3,-17
+            130: -4,-17
+            131: -5,-17
+        - node:
+            color: '#FA7500FF'
+            id: BrickTileWhiteLineS
+          decals:
+            97: 4,-10
+            98: 3,-10
+        - node:
+            color: '#FF9821FF'
+            id: BrickTileWhiteLineS
+          decals:
+            74: -2,-1
+            75: -1,-1
+            76: 0,-1
+            77: 1,-1
+            78: 2,-1
+        - node:
+            color: '#37789BFF'
+            id: BrickTileWhiteLineW
+          decals:
+            177: 8,-4
+        - node:
+            color: '#52B4E9FF'
+            id: BrickTileWhiteLineW
+          decals:
+            71: 5,0
+            72: 5,1
+            73: 5,2
+        - node:
+            color: '#791500CC'
+            id: BrickTileWhiteLineW
+          decals:
+            158: 5,-18
+            159: 5,-17
+            160: 5,-16
+        - node:
+            color: '#96DAFFFF'
+            id: BrickTileWhiteLineW
+          decals:
+            197: 7,-9
+            198: 7,-8
+            199: 7,-7
+        - node:
+            color: '#DE3A3AFF'
+            id: BrickTileWhiteLineW
+          decals:
+            134: -6,-16
+        - node:
+            color: '#FA7500FF'
+            id: BrickTileWhiteLineW
+          decals:
+            101: 2,-9
+            102: 2,-8
+            103: 2,-7
+        - node:
+            color: '#FF9821FF'
+            id: BrickTileWhiteLineW
+          decals:
+            241: -3,1
+            244: -3,0
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerGreyscaleNE
+          decals:
+            206: 11,-9
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerGreyscaleNW
+          decals:
+            205: 10,-9
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallGreyscaleNE
+          decals:
+            208: 11,-10
+            231: 13,-9
+            286: 8,-10
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallGreyscaleNW
+          decals:
+            209: 10,-10
+            230: 8,-9
+            285: 13,-10
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallGreyscaleSE
+          decals:
+            216: 8,-7
+            232: 13,-7
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallGreyscaleSW
+          decals:
+            221: 13,-7
+            233: 8,-7
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineGreyscaleE
+          decals:
+            213: 8,-9
+            215: 8,-8
+            225: 13,-8
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineGreyscaleN
+          decals:
+            204: 12,-10
+            227: 14,-9
+            228: 7,-9
+            284: 9,-10
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineGreyscaleS
+          decals:
+            217: 9,-7
+            218: 10,-7
+            219: 11,-7
+            220: 12,-7
+            223: 7,-7
+            224: 14,-7
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineGreyscaleW
+          decals:
+            222: 13,-8
+            229: 8,-8
+            234: 13,-9
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerNe
+          decals:
+            28: 14,-15
+            267: 2,-12
+            296: 2,-3
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerNw
+          decals:
+            1: -2,-12
+            21: -2,-3
+            27: 9,-15
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerSe
+          decals:
+            29: 14,-17
+            30: 13,-18
+            31: 12,-19
+            290: 2,-13
+            295: 2,-4
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerSw
+          decals:
+            8: -2,-13
+            19: -2,-4
+            32: 9,-19
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinEndN
+          decals:
+            25: 14,-18
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinEndS
+          decals:
+            24: 14,-19
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinInnerSe
+          decals:
+            33: 13,-17
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineE
+          decals:
+            43: 14,-16
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineN
+          decals:
+            4: 0,-12
+            5: 1,-12
+            16: -1,-3
+            17: 0,-3
+            39: 10,-15
+            40: 11,-15
+            41: 12,-15
+            42: 13,-15
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineS
+          decals:
+            10: -1,-13
+            11: 0,-13
+            12: 1,-13
+            13: -1,-4
+            14: 0,-4
+            15: 1,-4
+            34: 11,-19
+            35: 10,-19
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineW
+          decals:
+            36: 9,-18
+            37: 9,-17
+            38: 9,-16
+    - type: GridAtmosphere
+      version: 2
+      data:
+        tiles:
+          0,0:
+            0: 4095
+          0,-1:
+            0: 62463
+          -1,0:
+            0: 3822
+            1: 4096
+          0,1:
+            1: 15
+          -1,1:
+            1: 14
+          1,0:
+            0: 61166
+          1,-1:
+            0: 58999
+          2,0:
+            0: 65535
+          2,-1:
+            0: 61695
+          3,0:
+            0: 30583
+          3,-1:
+            0: 30446
+          4,0:
+            1: 4369
+          4,1:
+            1: 1
+          -2,0:
+            1: 49681
+            0: 192
+          -2,-1:
+            1: 4369
+            0: 49356
+          -1,-1:
+            0: 57599
+          0,-4:
+            0: 61695
+          0,-5:
+            0: 65280
+            1: 15
+          -1,-4:
+            0: 61695
+          0,-3:
+            0: 56639
+          -1,-3:
+            0: 65535
+          0,-2:
+            0: 15837
+          -1,-2:
+            0: 65535
+          1,-4:
+            0: 62702
+          1,-3:
+            0: 47887
+          1,-2:
+            0: 15291
+          1,-5:
+            0: 61152
+          2,-4:
+            0: 64767
+          2,-3:
+            0: 65311
+          2,-2:
+            0: 65535
+          2,-5:
+            0: 65520
+          3,-4:
+            0: 61815
+          3,-3:
+            0: 30511
+          3,-2:
+            0: 26487
+          3,-5:
+            0: 30576
+          4,-4:
+            1: 17
+            0: 61440
+          4,-3:
+            0: 29683
+          4,-2:
+            0: 62327
+          4,-1:
+            0: 243
+            1: 4096
+          -2,-4:
+            1: 4369
+            0: 49356
+          -2,-5:
+            1: 4800
+            0: 49152
+          -2,-3:
+            1: 22321
+            0: 2252
+          -2,-2:
+            1: 14165
+            0: 51200
+          -1,-5:
+            0: 65024
+            1: 30
+          4,-5:
+            1: 4369
+        uniqueMixes:
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.824879
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          immutable: True
+          moles:
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        chunkSize: 4
+    - type: GasTileOverlay
+    - type: RadiationGridResistance
+- proto: ActionToggleInternals
+  entities:
+  - uid: 4
+    mapInit: true
+    paused: true
+    components:
+    - type: Transform
+      parent: 3
+    - type: Action
+      originalIconColor: '#FFFFFFFF'
+      container: 3
+- proto: AirlockChemistryGlass
+  entities:
+  - uid: 11
+    components:
+    - type: Transform
+      pos: 5.5,-4.5
+      parent: 1
+  - uid: 12
+    components:
+    - type: Transform
+      pos: 4.5,-4.5
+      parent: 1
+- proto: AirlockEngineeringGlass
+  entities:
+  - uid: 13
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-1.5
+      parent: 1
+  - uid: 14
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-1.5
+      parent: 1
+- proto: AirlockGlass
+  entities:
+  - uid: 15
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-13.5
+      parent: 1
+  - uid: 16
+    components:
+    - type: Transform
+      pos: 15.5,-11.5
+      parent: 1
+  - uid: 17
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 15.5,-12.5
+      parent: 1
+  - uid: 18
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,-13.5
+      parent: 1
+  - uid: 19
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,-13.5
+      parent: 1
+  - uid: 20
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,-13.5
+      parent: 1
+- proto: AirlockGlassShuttle
+  entities:
+  - uid: 21
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-2.5
+      parent: 1
+  - uid: 22
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-4.5
+      parent: 1
+  - uid: 23
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-12.5
+      parent: 1
+  - uid: 24
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-10.5
+      parent: 1
+    - type: Door
+      secondsUntilStateChange: -27449.836
+      state: Opening
+    - type: DeviceLinkSource
+      lastSignals:
+        DoorStatus: True
+- proto: AirlockMedicalGlass
+  entities:
+  - uid: 25
+    components:
+    - type: Transform
+      pos: 6.5,-1.5
+      parent: 1
+  - uid: 26
+    components:
+    - type: Transform
+      pos: 5.5,-1.5
+      parent: 1
+  - uid: 27
+    components:
+    - type: Transform
+      pos: 13.5,-4.5
+      parent: 1
+  - uid: 28
+    components:
+    - type: Transform
+      pos: 13.5,-1.5
+      parent: 1
+  - uid: 29
+    components:
+    - type: Transform
+      pos: 14.5,-1.5
+      parent: 1
+  - uid: 30
+    components:
+    - type: Transform
+      pos: 14.5,-4.5
+      parent: 1
+- proto: AmmoTechFab
+  entities:
+  - uid: 31
+    components:
+    - type: Transform
+      pos: -1.5,-14.5
+      parent: 1
+- proto: APCBasic
+  entities:
+  - uid: 32
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-6.5
+      parent: 1
+  - uid: 33
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-15.5
+      parent: 1
+  - uid: 34
+    components:
+    - type: Transform
+      pos: -2.5,-13.5
+      parent: 1
+  - uid: 35
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-0.5
+      parent: 1
+  - uid: 36
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-9.5
+      parent: 1
+  - uid: 37
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-5.5
+      parent: 1
+  - uid: 38
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 18.5,-9.5
+      parent: 1
+  - uid: 39
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-13.5
+      parent: 1
+  - uid: 40
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-1.5
+      parent: 1
+- proto: AtmosDeviceFanDirectional
+  entities:
+  - uid: 41
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-10.5
+      parent: 1
+  - uid: 42
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-12.5
+      parent: 1
+  - uid: 43
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-2.5
+      parent: 1
+  - uid: 44
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-4.5
+      parent: 1
+- proto: AtmosFixNitrogenMarker
+  entities:
+  - uid: 1367
+    components:
+    - type: Transform
+      pos: -5.5,1.5
+      parent: 1
+  - uid: 1368
+    components:
+    - type: Transform
+      pos: -4.5,1.5
+      parent: 1
+- proto: AtmosFixOxygenMarker
+  entities:
+  - uid: 1369
+    components:
+    - type: Transform
+      pos: -5.5,-0.5
+      parent: 1
+  - uid: 1370
+    components:
+    - type: Transform
+      pos: -4.5,-0.5
+      parent: 1
+- proto: BackgammonBoard
+  entities:
+  - uid: 45
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.521284,-16.436264
+      parent: 1
+- proto: BarSign
+  entities:
+  - uid: 46
+    components:
+    - type: Transform
+      pos: 8.5,-13.5
+      parent: 1
+- proto: BedsheetMedical
+  entities:
+  - uid: 47
+    components:
+    - type: Transform
+      pos: 11.5,3.5
+      parent: 1
+  - uid: 48
+    components:
+    - type: Transform
+      pos: 5.5,3.5
+      parent: 1
+  - uid: 49
+    components:
+    - type: Transform
+      pos: 8.5,3.5
+      parent: 1
+  - uid: 50
+    components:
+    - type: Transform
+      pos: 10.5,3.5
+      parent: 1
+  - uid: 51
+    components:
+    - type: Transform
+      pos: 9.5,3.5
+      parent: 1
+  - uid: 52
+    components:
+    - type: Transform
+      pos: 5.5,2.5
+      parent: 1
+  - uid: 53
+    components:
+    - type: Transform
+      pos: 5.5,1.5
+      parent: 1
+- proto: BiomassReclaimer
+  entities:
+  - uid: 54
+    components:
+    - type: Transform
+      pos: 14.5,-7.5
+      parent: 1
+  - uid: 55
+    components:
+    - type: Transform
+      pos: 7.5,-7.5
+      parent: 1
+- proto: BlastDoorOpen
+  entities:
+  - uid: 56
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-12.5
+      parent: 1
+  - uid: 57
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-11.5
+      parent: 1
+  - uid: 58
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-2.5
+      parent: 1
+  - uid: 59
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-3.5
+      parent: 1
+- proto: Bloodpack
+  entities:
+  - uid: 60
+    components:
+    - type: Transform
+      pos: 8.700129,-0.29863083
+      parent: 1
+  - uid: 61
+    components:
+    - type: Transform
+      pos: 8.278254,-0.26738083
+      parent: 1
+  - uid: 62
+    components:
+    - type: Transform
+      pos: 8.606379,-0.51738083
+      parent: 1
+  - uid: 63
+    components:
+    - type: Transform
+      pos: 8.318821,-0.59375
+      parent: 1
+- proto: BookBartendersManual
+  entities:
+  - uid: 64
+    components:
+    - type: Transform
+      pos: 5.659693,-15.206383
+      parent: 1
+- proto: BoozeDispenser
+  entities:
+  - uid: 65
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-16.5
+      parent: 1
+  - uid: 66
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-7.5
+      parent: 1
+- proto: BorgCharger
+  entities:
+  - uid: 67
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-9.5
+      parent: 1
+  - uid: 68
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-5.5
+      parent: 1
+- proto: BoxBeaker
+  entities:
+  - uid: 70
+    components:
+    - type: Transform
+      parent: 69
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 71
+    components:
+    - type: Transform
+      parent: 69
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: BoxBodyBag
+  entities:
+  - uid: 79
+    components:
+    - type: Transform
+      pos: 7.6493506,-5.2510014
+      parent: 1
+  - uid: 80
+    components:
+    - type: Transform
+      pos: 7.2274756,-5.4072514
+      parent: 1
+  - uid: 81
+    components:
+    - type: Transform
+      pos: 7.7013416,-5.20638
+      parent: 1
+  - uid: 82
+    components:
+    - type: Transform
+      pos: 7.3263416,-5.23763
+      parent: 1
+  - uid: 83
+    components:
+    - type: Transform
+      pos: 7.7482166,-5.409505
+      parent: 1
+  - uid: 84
+    components:
+    - type: Transform
+      pos: 7.3732166,-5.128255
+      parent: 1
+  - uid: 85
+    components:
+    - type: Transform
+      pos: 7.6544666,-5.128255
+      parent: 1
+  - uid: 86
+    components:
+    - type: Transform
+      pos: 7.2274756,-5.2822514
+      parent: 1
+- proto: BoxBottle
+  entities:
+  - uid: 72
+    components:
+    - type: Transform
+      parent: 69
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: BoxPillCanister
+  entities:
+  - uid: 73
+    components:
+    - type: Transform
+      parent: 69
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: BoxShotgunIncendiary
+  entities:
+  - uid: 88
+    components:
+    - type: Transform
+      parent: 87
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 89
+    components:
+    - type: Transform
+      parent: 87
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 90
+    components:
+    - type: Transform
+      parent: 87
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 98
+    components:
+    - type: Transform
+      parent: 97
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 99
+    components:
+    - type: Transform
+      parent: 97
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 100
+    components:
+    - type: Transform
+      parent: 97
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: BoxSyringe
+  entities:
+  - uid: 74
+    components:
+    - type: Transform
+      parent: 69
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: BoxVial
+  entities:
+  - uid: 75
+    components:
+    - type: Transform
+      parent: 69
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: Brutepack
+  entities:
+  - uid: 107
+    components:
+    - type: Transform
+      pos: 9.1525,-0.55354595
+      parent: 1
+  - uid: 108
+    components:
+    - type: Transform
+      pos: 9.668125,-0.50667095
+      parent: 1
+  - uid: 109
+    components:
+    - type: Transform
+      pos: 9.574375,-0.35042095
+      parent: 1
+  - uid: 110
+    components:
+    - type: Transform
+      pos: 9.230625,-0.30354595
+      parent: 1
+- proto: ButtonFrameCautionSecurity
+  entities:
+  - uid: 111
+    components:
+    - type: Transform
+      pos: -3.5,-1.5
+      parent: 1
+  - uid: 112
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-13.5
+      parent: 1
+- proto: CableApcExtension
+  entities:
+  - uid: 113
+    components:
+    - type: Transform
+      pos: 16.5,0.5
+      parent: 1
+  - uid: 114
+    components:
+    - type: Transform
+      pos: -4.5,1.5
+      parent: 1
+  - uid: 115
+    components:
+    - type: Transform
+      pos: 0.5,3.5
+      parent: 1
+  - uid: 116
+    components:
+    - type: Transform
+      pos: 16.5,2.5
+      parent: 1
+  - uid: 117
+    components:
+    - type: Transform
+      pos: -3.5,-0.5
+      parent: 1
+  - uid: 118
+    components:
+    - type: Transform
+      pos: -1.5,-0.5
+      parent: 1
+  - uid: 119
+    components:
+    - type: Transform
+      pos: 16.5,3.5
+      parent: 1
+  - uid: 120
+    components:
+    - type: Transform
+      pos: -1.5,-1.5
+      parent: 1
+  - uid: 121
+    components:
+    - type: Transform
+      pos: 16.5,-0.5
+      parent: 1
+  - uid: 122
+    components:
+    - type: Transform
+      pos: 8.5,-0.5
+      parent: 1
+  - uid: 123
+    components:
+    - type: Transform
+      pos: 16.5,4.5
+      parent: 1
+  - uid: 124
+    components:
+    - type: Transform
+      pos: 16.5,1.5
+      parent: 1
+  - uid: 125
+    components:
+    - type: Transform
+      pos: -2.5,-13.5
+      parent: 1
+  - uid: 126
+    components:
+    - type: Transform
+      pos: -2.5,-14.5
+      parent: 1
+  - uid: 127
+    components:
+    - type: Transform
+      pos: -2.5,-15.5
+      parent: 1
+  - uid: 128
+    components:
+    - type: Transform
+      pos: -3.5,-15.5
+      parent: 1
+  - uid: 129
+    components:
+    - type: Transform
+      pos: -4.5,-15.5
+      parent: 1
+  - uid: 130
+    components:
+    - type: Transform
+      pos: -5.5,-15.5
+      parent: 1
+  - uid: 131
+    components:
+    - type: Transform
+      pos: -1.5,-15.5
+      parent: 1
+  - uid: 132
+    components:
+    - type: Transform
+      pos: -0.5,-15.5
+      parent: 1
+  - uid: 133
+    components:
+    - type: Transform
+      pos: 0.5,-15.5
+      parent: 1
+  - uid: 134
+    components:
+    - type: Transform
+      pos: 1.5,-15.5
+      parent: 1
+  - uid: 135
+    components:
+    - type: Transform
+      pos: 2.5,-15.5
+      parent: 1
+  - uid: 136
+    components:
+    - type: Transform
+      pos: 2.5,-16.5
+      parent: 1
+  - uid: 137
+    components:
+    - type: Transform
+      pos: -0.5,-16.5
+      parent: 1
+  - uid: 138
+    components:
+    - type: Transform
+      pos: -0.5,-17.5
+      parent: 1
+  - uid: 139
+    components:
+    - type: Transform
+      pos: 2.5,-17.5
+      parent: 1
+  - uid: 140
+    components:
+    - type: Transform
+      pos: 3.5,-15.5
+      parent: 1
+  - uid: 141
+    components:
+    - type: Transform
+      pos: 14.5,-15.5
+      parent: 1
+  - uid: 142
+    components:
+    - type: Transform
+      pos: 12.5,-15.5
+      parent: 1
+  - uid: 143
+    components:
+    - type: Transform
+      pos: 11.5,-15.5
+      parent: 1
+  - uid: 144
+    components:
+    - type: Transform
+      pos: 10.5,-15.5
+      parent: 1
+  - uid: 145
+    components:
+    - type: Transform
+      pos: 9.5,-15.5
+      parent: 1
+  - uid: 146
+    components:
+    - type: Transform
+      pos: 8.5,-15.5
+      parent: 1
+  - uid: 147
+    components:
+    - type: Transform
+      pos: 7.5,-15.5
+      parent: 1
+  - uid: 148
+    components:
+    - type: Transform
+      pos: 6.5,-15.5
+      parent: 1
+  - uid: 149
+    components:
+    - type: Transform
+      pos: 13.5,-15.5
+      parent: 1
+  - uid: 150
+    components:
+    - type: Transform
+      pos: 6.5,-16.5
+      parent: 1
+  - uid: 151
+    components:
+    - type: Transform
+      pos: 6.5,-17.5
+      parent: 1
+  - uid: 152
+    components:
+    - type: Transform
+      pos: 6.5,-18.5
+      parent: 1
+  - uid: 153
+    components:
+    - type: Transform
+      pos: 13.5,-16.5
+      parent: 1
+  - uid: 154
+    components:
+    - type: Transform
+      pos: 13.5,-17.5
+      parent: 1
+  - uid: 155
+    components:
+    - type: Transform
+      pos: 13.5,-18.5
+      parent: 1
+  - uid: 156
+    components:
+    - type: Transform
+      pos: 6.5,-6.5
+      parent: 1
+  - uid: 157
+    components:
+    - type: Transform
+      pos: 5.5,-6.5
+      parent: 1
+  - uid: 158
+    components:
+    - type: Transform
+      pos: 4.5,-7.5
+      parent: 1
+  - uid: 159
+    components:
+    - type: Transform
+      pos: 4.5,-6.5
+      parent: 1
+  - uid: 160
+    components:
+    - type: Transform
+      pos: 4.5,-8.5
+      parent: 1
+  - uid: 161
+    components:
+    - type: Transform
+      pos: 4.5,-9.5
+      parent: 1
+  - uid: 162
+    components:
+    - type: Transform
+      pos: 3.5,-7.5
+      parent: 1
+  - uid: 163
+    components:
+    - type: Transform
+      pos: 2.5,-7.5
+      parent: 1
+  - uid: 164
+    components:
+    - type: Transform
+      pos: 4.5,-5.5
+      parent: 1
+  - uid: 165
+    components:
+    - type: Transform
+      pos: 3.5,-5.5
+      parent: 1
+  - uid: 166
+    components:
+    - type: Transform
+      pos: 4.5,-4.5
+      parent: 1
+  - uid: 167
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 1
+  - uid: 168
+    components:
+    - type: Transform
+      pos: 5.5,-3.5
+      parent: 1
+  - uid: 169
+    components:
+    - type: Transform
+      pos: 6.5,-3.5
+      parent: 1
+  - uid: 170
+    components:
+    - type: Transform
+      pos: 15.5,-0.5
+      parent: 1
+  - uid: 171
+    components:
+    - type: Transform
+      pos: 14.5,-0.5
+      parent: 1
+  - uid: 172
+    components:
+    - type: Transform
+      pos: 13.5,-0.5
+      parent: 1
+  - uid: 173
+    components:
+    - type: Transform
+      pos: 12.5,-0.5
+      parent: 1
+  - uid: 174
+    components:
+    - type: Transform
+      pos: 11.5,-0.5
+      parent: 1
+  - uid: 175
+    components:
+    - type: Transform
+      pos: 10.5,-0.5
+      parent: 1
+  - uid: 176
+    components:
+    - type: Transform
+      pos: 9.5,-0.5
+      parent: 1
+  - uid: 177
+    components:
+    - type: Transform
+      pos: 13.5,0.5
+      parent: 1
+  - uid: 178
+    components:
+    - type: Transform
+      pos: 13.5,1.5
+      parent: 1
+  - uid: 179
+    components:
+    - type: Transform
+      pos: 13.5,2.5
+      parent: 1
+  - uid: 180
+    components:
+    - type: Transform
+      pos: 13.5,3.5
+      parent: 1
+  - uid: 181
+    components:
+    - type: Transform
+      pos: 10.5,0.5
+      parent: 1
+  - uid: 182
+    components:
+    - type: Transform
+      pos: 10.5,1.5
+      parent: 1
+  - uid: 183
+    components:
+    - type: Transform
+      pos: 10.5,2.5
+      parent: 1
+  - uid: 184
+    components:
+    - type: Transform
+      pos: 10.5,2.5
+      parent: 1
+  - uid: 185
+    components:
+    - type: Transform
+      pos: 10.5,3.5
+      parent: 1
+  - uid: 186
+    components:
+    - type: Transform
+      pos: 7.5,0.5
+      parent: 1
+  - uid: 187
+    components:
+    - type: Transform
+      pos: 7.5,1.5
+      parent: 1
+  - uid: 188
+    components:
+    - type: Transform
+      pos: 7.5,2.5
+      parent: 1
+  - uid: 189
+    components:
+    - type: Transform
+      pos: 7.5,3.5
+      parent: 1
+  - uid: 190
+    components:
+    - type: Transform
+      pos: 7.5,-0.5
+      parent: 1
+  - uid: 191
+    components:
+    - type: Transform
+      pos: 6.5,-0.5
+      parent: 1
+  - uid: 192
+    components:
+    - type: Transform
+      pos: 5.5,-0.5
+      parent: 1
+  - uid: 193
+    components:
+    - type: Transform
+      pos: 18.5,-9.5
+      parent: 1
+  - uid: 194
+    components:
+    - type: Transform
+      pos: 17.5,-9.5
+      parent: 1
+  - uid: 195
+    components:
+    - type: Transform
+      pos: 1.5,-9.5
+      parent: 1
+  - uid: 196
+    components:
+    - type: Transform
+      pos: 17.5,-8.5
+      parent: 1
+  - uid: 197
+    components:
+    - type: Transform
+      pos: 17.5,-7.5
+      parent: 1
+  - uid: 198
+    components:
+    - type: Transform
+      pos: 17.5,-6.5
+      parent: 1
+  - uid: 199
+    components:
+    - type: Transform
+      pos: 17.5,-5.5
+      parent: 1
+  - uid: 200
+    components:
+    - type: Transform
+      pos: 17.5,-4.5
+      parent: 1
+  - uid: 201
+    components:
+    - type: Transform
+      pos: 17.5,-3.5
+      parent: 1
+  - uid: 202
+    components:
+    - type: Transform
+      pos: 17.5,-2.5
+      parent: 1
+  - uid: 203
+    components:
+    - type: Transform
+      pos: 17.5,-10.5
+      parent: 1
+  - uid: 204
+    components:
+    - type: Transform
+      pos: 17.5,-11.5
+      parent: 1
+  - uid: 205
+    components:
+    - type: Transform
+      pos: 17.5,-12.5
+      parent: 1
+  - uid: 206
+    components:
+    - type: Transform
+      pos: 0.5,-9.5
+      parent: 1
+  - uid: 207
+    components:
+    - type: Transform
+      pos: -0.5,-9.5
+      parent: 1
+  - uid: 208
+    components:
+    - type: Transform
+      pos: -0.5,-8.5
+      parent: 1
+  - uid: 209
+    components:
+    - type: Transform
+      pos: -0.5,-7.5
+      parent: 1
+  - uid: 210
+    components:
+    - type: Transform
+      pos: -0.5,-6.5
+      parent: 1
+  - uid: 211
+    components:
+    - type: Transform
+      pos: -0.5,-5.5
+      parent: 1
+  - uid: 212
+    components:
+    - type: Transform
+      pos: -0.5,-3.5
+      parent: 1
+  - uid: 213
+    components:
+    - type: Transform
+      pos: -0.5,-4.5
+      parent: 1
+  - uid: 214
+    components:
+    - type: Transform
+      pos: -1.5,-3.5
+      parent: 1
+  - uid: 215
+    components:
+    - type: Transform
+      pos: -2.5,-3.5
+      parent: 1
+  - uid: 216
+    components:
+    - type: Transform
+      pos: -3.5,-3.5
+      parent: 1
+  - uid: 217
+    components:
+    - type: Transform
+      pos: -4.5,-3.5
+      parent: 1
+  - uid: 218
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 1
+  - uid: 219
+    components:
+    - type: Transform
+      pos: 1.5,-3.5
+      parent: 1
+  - uid: 220
+    components:
+    - type: Transform
+      pos: 2.5,-3.5
+      parent: 1
+  - uid: 221
+    components:
+    - type: Transform
+      pos: -0.5,-10.5
+      parent: 1
+  - uid: 222
+    components:
+    - type: Transform
+      pos: -0.5,-11.5
+      parent: 1
+  - uid: 223
+    components:
+    - type: Transform
+      pos: -4.5,-11.5
+      parent: 1
+  - uid: 224
+    components:
+    - type: Transform
+      pos: 0.5,-11.5
+      parent: 1
+  - uid: 225
+    components:
+    - type: Transform
+      pos: 1.5,-11.5
+      parent: 1
+  - uid: 226
+    components:
+    - type: Transform
+      pos: -3.5,-11.5
+      parent: 1
+  - uid: 227
+    components:
+    - type: Transform
+      pos: -2.5,-11.5
+      parent: 1
+  - uid: 228
+    components:
+    - type: Transform
+      pos: -1.5,-11.5
+      parent: 1
+  - uid: 229
+    components:
+    - type: Transform
+      pos: 2.5,-11.5
+      parent: 1
+  - uid: 230
+    components:
+    - type: Transform
+      pos: -1.5,-7.5
+      parent: 1
+  - uid: 231
+    components:
+    - type: Transform
+      pos: -2.5,-7.5
+      parent: 1
+  - uid: 232
+    components:
+    - type: Transform
+      pos: -3.5,-7.5
+      parent: 1
+  - uid: 233
+    components:
+    - type: Transform
+      pos: 15.5,-5.5
+      parent: 1
+  - uid: 234
+    components:
+    - type: Transform
+      pos: 14.5,-5.5
+      parent: 1
+  - uid: 235
+    components:
+    - type: Transform
+      pos: 13.5,-5.5
+      parent: 1
+  - uid: 236
+    components:
+    - type: Transform
+      pos: 12.5,-5.5
+      parent: 1
+  - uid: 237
+    components:
+    - type: Transform
+      pos: 11.5,-5.5
+      parent: 1
+  - uid: 238
+    components:
+    - type: Transform
+      pos: 10.5,-5.5
+      parent: 1
+  - uid: 239
+    components:
+    - type: Transform
+      pos: 9.5,-5.5
+      parent: 1
+  - uid: 240
+    components:
+    - type: Transform
+      pos: 9.5,-7.5
+      parent: 1
+  - uid: 241
+    components:
+    - type: Transform
+      pos: 9.5,-6.5
+      parent: 1
+  - uid: 242
+    components:
+    - type: Transform
+      pos: 9.5,-4.5
+      parent: 1
+  - uid: 243
+    components:
+    - type: Transform
+      pos: 9.5,-3.5
+      parent: 1
+  - uid: 244
+    components:
+    - type: Transform
+      pos: 12.5,-6.5
+      parent: 1
+  - uid: 245
+    components:
+    - type: Transform
+      pos: 12.5,-7.5
+      parent: 1
+  - uid: 246
+    components:
+    - type: Transform
+      pos: 12.5,-8.5
+      parent: 1
+  - uid: 247
+    components:
+    - type: Transform
+      pos: 9.5,-8.5
+      parent: 1
+  - uid: 248
+    components:
+    - type: Transform
+      pos: 13.5,-7.5
+      parent: 1
+  - uid: 249
+    components:
+    - type: Transform
+      pos: 8.5,-7.5
+      parent: 1
+  - uid: 250
+    components:
+    - type: Transform
+      pos: 9.5,-9.5
+      parent: 1
+  - uid: 251
+    components:
+    - type: Transform
+      pos: 12.5,-9.5
+      parent: 1
+  - uid: 252
+    components:
+    - type: Transform
+      pos: 4.5,-13.5
+      parent: 1
+  - uid: 253
+    components:
+    - type: Transform
+      pos: 4.5,-12.5
+      parent: 1
+  - uid: 254
+    components:
+    - type: Transform
+      pos: 4.5,-11.5
+      parent: 1
+  - uid: 255
+    components:
+    - type: Transform
+      pos: 5.5,-11.5
+      parent: 1
+  - uid: 256
+    components:
+    - type: Transform
+      pos: 6.5,-11.5
+      parent: 1
+  - uid: 257
+    components:
+    - type: Transform
+      pos: 8.5,-11.5
+      parent: 1
+  - uid: 258
+    components:
+    - type: Transform
+      pos: 9.5,-11.5
+      parent: 1
+  - uid: 259
+    components:
+    - type: Transform
+      pos: 10.5,-11.5
+      parent: 1
+  - uid: 260
+    components:
+    - type: Transform
+      pos: 7.5,-11.5
+      parent: 1
+  - uid: 261
+    components:
+    - type: Transform
+      pos: 11.5,-11.5
+      parent: 1
+  - uid: 262
+    components:
+    - type: Transform
+      pos: 12.5,-11.5
+      parent: 1
+  - uid: 263
+    components:
+    - type: Transform
+      pos: 13.5,-11.5
+      parent: 1
+  - uid: 264
+    components:
+    - type: Transform
+      pos: 14.5,-11.5
+      parent: 1
+  - uid: 265
+    components:
+    - type: Transform
+      pos: 6.5,-14.5
+      parent: 1
+  - uid: 266
+    components:
+    - type: Transform
+      pos: 11.5,-14.5
+      parent: 1
+  - uid: 267
+    components:
+    - type: Transform
+      pos: 18.5,-7.5
+      parent: 1
+  - uid: 268
+    components:
+    - type: Transform
+      pos: -2.5,0.5
+      parent: 1
+  - uid: 269
+    components:
+    - type: Transform
+      pos: -1.5,0.5
+      parent: 1
+  - uid: 270
+    components:
+    - type: Transform
+      pos: -0.5,0.5
+      parent: 1
+  - uid: 271
+    components:
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 1
+  - uid: 272
+    components:
+    - type: Transform
+      pos: 1.5,0.5
+      parent: 1
+  - uid: 273
+    components:
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 1
+  - uid: 274
+    components:
+    - type: Transform
+      pos: 3.5,0.5
+      parent: 1
+  - uid: 275
+    components:
+    - type: Transform
+      pos: 0.5,1.5
+      parent: 1
+  - uid: 276
+    components:
+    - type: Transform
+      pos: 0.5,2.5
+      parent: 1
+  - uid: 277
+    components:
+    - type: Transform
+      pos: -3.5,0.5
+      parent: 1
+  - uid: 278
+    components:
+    - type: Transform
+      pos: -4.5,0.5
+      parent: 1
+  - uid: 279
+    components:
+    - type: Transform
+      pos: 0.5,4.5
+      parent: 1
+  - uid: 280
+    components:
+    - type: Transform
+      pos: -0.5,4.5
+      parent: 1
+  - uid: 281
+    components:
+    - type: Transform
+      pos: -2.5,4.5
+      parent: 1
+  - uid: 282
+    components:
+    - type: Transform
+      pos: -1.5,4.5
+      parent: 1
+  - uid: 283
+    components:
+    - type: Transform
+      pos: 1.5,4.5
+      parent: 1
+  - uid: 284
+    components:
+    - type: Transform
+      pos: 2.5,4.5
+      parent: 1
+  - uid: 285
+    components:
+    - type: Transform
+      pos: -4.5,2.5
+      parent: 1
+  - uid: 286
+    components:
+    - type: Transform
+      pos: -4.5,3.5
+      parent: 1
+  - uid: 287
+    components:
+    - type: Transform
+      pos: -5.5,3.5
+      parent: 1
+  - uid: 288
+    components:
+    - type: Transform
+      pos: -5.5,0.5
+      parent: 1
+  - uid: 289
+    components:
+    - type: Transform
+      pos: -6.5,0.5
+      parent: 1
+  - uid: 290
+    components:
+    - type: Transform
+      pos: -7.5,0.5
+      parent: 1
+  - uid: 291
+    components:
+    - type: Transform
+      pos: -7.5,1.5
+      parent: 1
+  - uid: 292
+    components:
+    - type: Transform
+      pos: -7.5,-0.5
+      parent: 1
+  - uid: 293
+    components:
+    - type: Transform
+      pos: -7.5,-1.5
+      parent: 1
+  - uid: 294
+    components:
+    - type: Transform
+      pos: -6.5,-15.5
+      parent: 1
+  - uid: 295
+    components:
+    - type: Transform
+      pos: -7.5,-15.5
+      parent: 1
+  - uid: 296
+    components:
+    - type: Transform
+      pos: -7.5,-14.5
+      parent: 1
+  - uid: 297
+    components:
+    - type: Transform
+      pos: -7.5,-16.5
+      parent: 1
+  - uid: 298
+    components:
+    - type: Transform
+      pos: -7.5,-13.5
+      parent: 1
+  - uid: 299
+    components:
+    - type: Transform
+      pos: -4.5,-16.5
+      parent: 1
+  - uid: 300
+    components:
+    - type: Transform
+      pos: -4.5,-18.5
+      parent: 1
+  - uid: 301
+    components:
+    - type: Transform
+      pos: -4.5,-17.5
+      parent: 1
+  - uid: 302
+    components:
+    - type: Transform
+      pos: -5.5,-18.5
+      parent: 1
+  - uid: 303
+    components:
+    - type: Transform
+      pos: -0.5,-18.5
+      parent: 1
+  - uid: 304
+    components:
+    - type: Transform
+      pos: -0.5,-19.5
+      parent: 1
+  - uid: 305
+    components:
+    - type: Transform
+      pos: -1.5,-19.5
+      parent: 1
+  - uid: 306
+    components:
+    - type: Transform
+      pos: 15.5,-15.5
+      parent: 1
+  - uid: 307
+    components:
+    - type: Transform
+      pos: -2.5,-19.5
+      parent: 1
+  - uid: 308
+    components:
+    - type: Transform
+      pos: 0.5,-19.5
+      parent: 1
+  - uid: 309
+    components:
+    - type: Transform
+      pos: 1.5,-19.5
+      parent: 1
+  - uid: 310
+    components:
+    - type: Transform
+      pos: 2.5,-19.5
+      parent: 1
+  - uid: 311
+    components:
+    - type: Transform
+      pos: 16.5,-15.5
+      parent: 1
+  - uid: 312
+    components:
+    - type: Transform
+      pos: 16.5,-14.5
+      parent: 1
+  - uid: 313
+    components:
+    - type: Transform
+      pos: 16.5,-16.5
+      parent: 1
+  - uid: 314
+    components:
+    - type: Transform
+      pos: 16.5,-18.5
+      parent: 1
+  - uid: 315
+    components:
+    - type: Transform
+      pos: 16.5,-17.5
+      parent: 1
+  - uid: 316
+    components:
+    - type: Transform
+      pos: 16.5,-19.5
+      parent: 1
+  - uid: 317
+    components:
+    - type: Transform
+      pos: 17.5,-0.5
+      parent: 1
+  - uid: 318
+    components:
+    - type: Transform
+      pos: 17.5,-14.5
+      parent: 1
+- proto: CableHV
+  entities:
+  - uid: 319
+    components:
+    - type: Transform
+      pos: -1.5,2.5
+      parent: 1
+  - uid: 320
+    components:
+    - type: Transform
+      pos: -0.5,2.5
+      parent: 1
+  - uid: 321
+    components:
+    - type: Transform
+      pos: 0.5,2.5
+      parent: 1
+  - uid: 322
+    components:
+    - type: Transform
+      pos: 1.5,2.5
+      parent: 1
+  - uid: 323
+    components:
+    - type: Transform
+      pos: 1.5,2.5
+      parent: 1
+  - uid: 324
+    components:
+    - type: Transform
+      pos: 2.5,2.5
+      parent: 1
+  - uid: 325
+    components:
+    - type: Transform
+      pos: 2.5,1.5
+      parent: 1
+  - uid: 326
+    components:
+    - type: Transform
+      pos: 3.5,1.5
+      parent: 1
+  - uid: 327
+    components:
+    - type: Transform
+      pos: 3.5,0.5
+      parent: 1
+  - uid: 328
+    components:
+    - type: Transform
+      pos: 3.5,-0.5
+      parent: 1
+  - uid: 329
+    components:
+    - type: Transform
+      pos: 2.5,-0.5
+      parent: 1
+  - uid: 330
+    components:
+    - type: Transform
+      pos: 2.5,-1.5
+      parent: 1
+  - uid: 331
+    components:
+    - type: Transform
+      pos: -2.5,2.5
+      parent: 1
+- proto: CableMV
+  entities:
+  - uid: 332
+    components:
+    - type: Transform
+      pos: 14.5,-15.5
+      parent: 1
+  - uid: 333
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 1
+  - uid: 334
+    components:
+    - type: Transform
+      pos: 2.5,-1.5
+      parent: 1
+  - uid: 335
+    components:
+    - type: Transform
+      pos: 2.5,-0.5
+      parent: 1
+  - uid: 336
+    components:
+    - type: Transform
+      pos: -1.5,0.5
+      parent: 1
+  - uid: 337
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 1
+  - uid: 338
+    components:
+    - type: Transform
+      pos: 0.5,-0.5
+      parent: 1
+  - uid: 339
+    components:
+    - type: Transform
+      pos: -0.5,-3.5
+      parent: 1
+  - uid: 340
+    components:
+    - type: Transform
+      pos: -0.5,-4.5
+      parent: 1
+  - uid: 341
+    components:
+    - type: Transform
+      pos: -0.5,-5.5
+      parent: 1
+  - uid: 342
+    components:
+    - type: Transform
+      pos: -0.5,-6.5
+      parent: 1
+  - uid: 343
+    components:
+    - type: Transform
+      pos: -0.5,-8.5
+      parent: 1
+  - uid: 344
+    components:
+    - type: Transform
+      pos: -0.5,-9.5
+      parent: 1
+  - uid: 345
+    components:
+    - type: Transform
+      pos: -0.5,-7.5
+      parent: 1
+  - uid: 346
+    components:
+    - type: Transform
+      pos: 0.5,-9.5
+      parent: 1
+  - uid: 347
+    components:
+    - type: Transform
+      pos: 1.5,-9.5
+      parent: 1
+  - uid: 348
+    components:
+    - type: Transform
+      pos: 0.5,-14.5
+      parent: 1
+  - uid: 349
+    components:
+    - type: Transform
+      pos: 0.5,-13.5
+      parent: 1
+  - uid: 350
+    components:
+    - type: Transform
+      pos: 0.5,-12.5
+      parent: 1
+  - uid: 351
+    components:
+    - type: Transform
+      pos: 0.5,-11.5
+      parent: 1
+  - uid: 352
+    components:
+    - type: Transform
+      pos: 0.5,-10.5
+      parent: 1
+  - uid: 353
+    components:
+    - type: Transform
+      pos: -2.5,-14.5
+      parent: 1
+  - uid: 354
+    components:
+    - type: Transform
+      pos: -1.5,-14.5
+      parent: 1
+  - uid: 355
+    components:
+    - type: Transform
+      pos: -0.5,-14.5
+      parent: 1
+  - uid: 356
+    components:
+    - type: Transform
+      pos: 0.5,-14.5
+      parent: 1
+  - uid: 357
+    components:
+    - type: Transform
+      pos: -2.5,-13.5
+      parent: 1
+  - uid: 358
+    components:
+    - type: Transform
+      pos: 11.5,-12.5
+      parent: 1
+  - uid: 359
+    components:
+    - type: Transform
+      pos: 15.5,-11.5
+      parent: 1
+  - uid: 360
+    components:
+    - type: Transform
+      pos: 16.5,-11.5
+      parent: 1
+  - uid: 361
+    components:
+    - type: Transform
+      pos: 16.5,-10.5
+      parent: 1
+  - uid: 362
+    components:
+    - type: Transform
+      pos: 16.5,-9.5
+      parent: 1
+  - uid: 363
+    components:
+    - type: Transform
+      pos: 17.5,-9.5
+      parent: 1
+  - uid: 364
+    components:
+    - type: Transform
+      pos: 18.5,-9.5
+      parent: 1
+  - uid: 365
+    components:
+    - type: Transform
+      pos: 11.5,-13.5
+      parent: 1
+  - uid: 366
+    components:
+    - type: Transform
+      pos: 11.5,-14.5
+      parent: 1
+  - uid: 367
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 1
+  - uid: 368
+    components:
+    - type: Transform
+      pos: 12.5,-14.5
+      parent: 1
+  - uid: 369
+    components:
+    - type: Transform
+      pos: 13.5,-14.5
+      parent: 1
+  - uid: 370
+    components:
+    - type: Transform
+      pos: 14.5,-14.5
+      parent: 1
+  - uid: 371
+    components:
+    - type: Transform
+      pos: 2.5,-3.5
+      parent: 1
+  - uid: 372
+    components:
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 1
+  - uid: 373
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 1
+  - uid: 374
+    components:
+    - type: Transform
+      pos: 5.5,-3.5
+      parent: 1
+  - uid: 375
+    components:
+    - type: Transform
+      pos: 1.5,-3.5
+      parent: 1
+  - uid: 376
+    components:
+    - type: Transform
+      pos: 5.5,-4.5
+      parent: 1
+  - uid: 377
+    components:
+    - type: Transform
+      pos: 5.5,-5.5
+      parent: 1
+  - uid: 378
+    components:
+    - type: Transform
+      pos: 5.5,-6.5
+      parent: 1
+  - uid: 379
+    components:
+    - type: Transform
+      pos: 6.5,-6.5
+      parent: 1
+  - uid: 380
+    components:
+    - type: Transform
+      pos: 5.5,-2.5
+      parent: 1
+  - uid: 381
+    components:
+    - type: Transform
+      pos: 5.5,-1.5
+      parent: 1
+  - uid: 382
+    components:
+    - type: Transform
+      pos: 5.5,-0.5
+      parent: 1
+  - uid: 383
+    components:
+    - type: Transform
+      pos: 6.5,-0.5
+      parent: 1
+  - uid: 384
+    components:
+    - type: Transform
+      pos: 7.5,-0.5
+      parent: 1
+  - uid: 385
+    components:
+    - type: Transform
+      pos: 8.5,-0.5
+      parent: 1
+  - uid: 386
+    components:
+    - type: Transform
+      pos: 10.5,-0.5
+      parent: 1
+  - uid: 387
+    components:
+    - type: Transform
+      pos: 11.5,-0.5
+      parent: 1
+  - uid: 388
+    components:
+    - type: Transform
+      pos: 12.5,-0.5
+      parent: 1
+  - uid: 389
+    components:
+    - type: Transform
+      pos: 13.5,-0.5
+      parent: 1
+  - uid: 390
+    components:
+    - type: Transform
+      pos: 14.5,-0.5
+      parent: 1
+  - uid: 391
+    components:
+    - type: Transform
+      pos: 15.5,-0.5
+      parent: 1
+  - uid: 392
+    components:
+    - type: Transform
+      pos: 9.5,-0.5
+      parent: 1
+  - uid: 393
+    components:
+    - type: Transform
+      pos: 14.5,-0.5
+      parent: 1
+  - uid: 394
+    components:
+    - type: Transform
+      pos: 14.5,-1.5
+      parent: 1
+  - uid: 395
+    components:
+    - type: Transform
+      pos: 14.5,-2.5
+      parent: 1
+  - uid: 396
+    components:
+    - type: Transform
+      pos: 14.5,-3.5
+      parent: 1
+  - uid: 397
+    components:
+    - type: Transform
+      pos: 14.5,-4.5
+      parent: 1
+  - uid: 398
+    components:
+    - type: Transform
+      pos: 14.5,-5.5
+      parent: 1
+  - uid: 399
+    components:
+    - type: Transform
+      pos: 15.5,-5.5
+      parent: 1
+  - uid: 400
+    components:
+    - type: Transform
+      pos: 1.5,-11.5
+      parent: 1
+  - uid: 401
+    components:
+    - type: Transform
+      pos: 2.5,-11.5
+      parent: 1
+  - uid: 402
+    components:
+    - type: Transform
+      pos: 6.5,-11.5
+      parent: 1
+  - uid: 403
+    components:
+    - type: Transform
+      pos: 3.5,-11.5
+      parent: 1
+  - uid: 404
+    components:
+    - type: Transform
+      pos: 7.5,-11.5
+      parent: 1
+  - uid: 405
+    components:
+    - type: Transform
+      pos: 5.5,-11.5
+      parent: 1
+  - uid: 406
+    components:
+    - type: Transform
+      pos: 8.5,-11.5
+      parent: 1
+  - uid: 407
+    components:
+    - type: Transform
+      pos: 9.5,-11.5
+      parent: 1
+  - uid: 408
+    components:
+    - type: Transform
+      pos: 10.5,-11.5
+      parent: 1
+  - uid: 409
+    components:
+    - type: Transform
+      pos: 11.5,-11.5
+      parent: 1
+  - uid: 410
+    components:
+    - type: Transform
+      pos: 12.5,-11.5
+      parent: 1
+  - uid: 411
+    components:
+    - type: Transform
+      pos: 13.5,-11.5
+      parent: 1
+  - uid: 412
+    components:
+    - type: Transform
+      pos: 14.5,-11.5
+      parent: 1
+  - uid: 413
+    components:
+    - type: Transform
+      pos: 4.5,-11.5
+      parent: 1
+  - uid: 414
+    components:
+    - type: Transform
+      pos: 15.5,-15.5
+      parent: 1
+  - uid: 415
+    components:
+    - type: Transform
+      pos: 4.5,-12.5
+      parent: 1
+  - uid: 416
+    components:
+    - type: Transform
+      pos: 4.5,-13.5
+      parent: 1
+  - uid: 417
+    components:
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 1
+  - uid: 418
+    components:
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 1
+  - uid: 419
+    components:
+    - type: Transform
+      pos: 1.5,0.5
+      parent: 1
+  - uid: 420
+    components:
+    - type: Transform
+      pos: -0.5,0.5
+      parent: 1
+  - uid: 421
+    components:
+    - type: Transform
+      pos: -1.5,-1.5
+      parent: 1
+  - uid: 422
+    components:
+    - type: Transform
+      pos: -1.5,-0.5
+      parent: 1
+- proto: CableTerminal
+  entities:
+  - uid: 423
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,1.5
+      parent: 1
+- proto: CarpetGreen
+  entities:
+  - uid: 424
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,-15.5
+      parent: 1
+  - uid: 425
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,-17.5
+      parent: 1
+  - uid: 426
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,-16.5
+      parent: 1
+  - uid: 427
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,-17.5
+      parent: 1
+  - uid: 428
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,-16.5
+      parent: 1
+  - uid: 429
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,-15.5
+      parent: 1
+  - uid: 430
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,-15.5
+      parent: 1
+  - uid: 431
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,-16.5
+      parent: 1
+  - uid: 432
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,-17.5
+      parent: 1
+- proto: CarpetSBlue
+  entities:
+  - uid: 433
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,3.5
+      parent: 1
+  - uid: 434
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,1.5
+      parent: 1
+  - uid: 435
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,2.5
+      parent: 1
+  - uid: 436
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,2.5
+      parent: 1
+  - uid: 437
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,2.5
+      parent: 1
+  - uid: 438
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,2.5
+      parent: 1
+  - uid: 439
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,2.5
+      parent: 1
+  - uid: 440
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,3.5
+      parent: 1
+  - uid: 441
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,1.5
+      parent: 1
+  - uid: 442
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,2.5
+      parent: 1
+- proto: Catwalk
+  entities:
+  - uid: 443
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,0.5
+      parent: 1
+  - uid: 444
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,0.5
+      parent: 1
+  - uid: 445
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,0.5
+      parent: 1
+  - uid: 446
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,0.5
+      parent: 1
+  - uid: 447
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,0.5
+      parent: 1
+  - uid: 448
+    components:
+    - type: Transform
+      pos: 16.5,-14.5
+      parent: 1
+  - uid: 449
+    components:
+    - type: Transform
+      pos: 16.5,-0.5
+      parent: 1
+- proto: CentcommComputerComms
+  entities:
+  - uid: 450
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-3.5
+      parent: 1
+- proto: ChairOfficeDark
+  entities:
+  - uid: 451
+    components:
+    - type: Transform
+      pos: 3.5,-8.5
+      parent: 1
+- proto: ChairOfficeLight
+  entities:
+  - uid: 452
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,0.5
+      parent: 1
+  - uid: 453
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,0.5
+      parent: 1
+  - uid: 454
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-2.5
+      parent: 1
+  - uid: 455
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-3.5
+      parent: 1
+  - uid: 456
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-12.5
+      parent: 1
+  - uid: 457
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-11.5
+      parent: 1
+- proto: ChairPilotSeat
+  entities:
+  - uid: 458
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-7.5
+      parent: 1
+  - uid: 459
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-8.5
+      parent: 1
+  - uid: 460
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-6.5
+      parent: 1
+- proto: ChairWood
+  entities:
+  - uid: 461
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,-15.5
+      parent: 1
+  - uid: 462
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-17.5
+      parent: 1
+  - uid: 463
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-16.5
+      parent: 1
+  - uid: 464
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-15.5
+      parent: 1
+  - uid: 465
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,-17.5
+      parent: 1
+  - uid: 466
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,-16.5
+      parent: 1
+- proto: CheckerBoard
+  entities:
+  - uid: 467
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.474409,-17.342514
+      parent: 1
+- proto: ChemDispenser
+  entities:
+  - uid: 468
+    components:
+    - type: Transform
+      pos: 4.5,-9.5
+      parent: 1
+- proto: ChemistryHotplate
+  entities:
+  - uid: 469
+    components:
+    - type: Transform
+      pos: 3.5,-9.5
+      parent: 1
+- proto: ChemMaster
+  entities:
+  - uid: 470
+    components:
+    - type: Transform
+      pos: 4.5,-7.5
+      parent: 1
+- proto: ChessBoard
+  entities:
+  - uid: 471
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.521284,-15.498764
+      parent: 1
+- proto: CloningPod
+  entities:
+  - uid: 472
+    components:
+    - type: Transform
+      pos: 9.5,-8.5
+      parent: 1
+  - uid: 473
+    components:
+    - type: Transform
+      pos: 12.5,-8.5
+      parent: 1
+- proto: ClosetWall
+  entities:
+  - uid: 69
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-5.5
+      parent: 1
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 76
+          - 72
+          - 70
+          - 75
+          - 73
+          - 77
+          - 71
+          - 74
+          - 78
+  - uid: 474
+    components:
+    - type: Transform
+      pos: 12.5,-4.5
+      parent: 1
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 485
+          - 475
+          - 476
+          - 477
+          - 478
+          - 479
+          - 480
+          - 481
+          - 482
+          - 483
+          - 484
+          - 486
+  - uid: 487
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-1.5
+      parent: 1
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 489
+          - 488
+          - 493
+          - 491
+          - 492
+          - 490
+- proto: ClosetWallWardrobeMixedFilled
+  entities:
+  - uid: 494
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-10.5
+      parent: 1
+  - uid: 495
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,-10.5
+      parent: 1
+- proto: ClothingBackpackWaterTank
+  entities:
+  - uid: 496
+    components:
+    - type: MetaData
+      name: Flamethrower
+    - type: Transform
+      pos: 2.6104558,-14.49816
+      parent: 1
+    - type: ContainerContainer
+      containers:
+        item: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: 497
+- proto: ClothingBeltUtilityEngineering
+  entities:
+  - uid: 488
+    components:
+    - type: Transform
+      parent: 487
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 489
+    components:
+    - type: Transform
+      parent: 487
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ClothingEyesGlassesCentComm
+  entities:
+  - uid: 5
+    components:
+    - type: Transform
+      parent: 2
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 499
+    components:
+    - type: Transform
+      parent: 498
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 507
+    components:
+    - type: Transform
+      parent: 506
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 515
+    components:
+    - type: Transform
+      parent: 514
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 523
+    components:
+    - type: Transform
+      parent: 522
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 531
+    components:
+    - type: Transform
+      parent: 530
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ClothingHandsGlovesCombat
+  entities:
+  - uid: 6
+    components:
+    - type: Transform
+      parent: 2
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 500
+    components:
+    - type: Transform
+      parent: 498
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 508
+    components:
+    - type: Transform
+      parent: 506
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 516
+    components:
+    - type: Transform
+      parent: 514
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 524
+    components:
+    - type: Transform
+      parent: 522
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 532
+    components:
+    - type: Transform
+      parent: 530
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ClothingMaskGasERT
+  entities:
+  - uid: 7
+    components:
+    - type: Transform
+      parent: 2
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 501
+    components:
+    - type: Transform
+      parent: 498
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 509
+    components:
+    - type: Transform
+      parent: 506
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 517
+    components:
+    - type: Transform
+      parent: 514
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 525
+    components:
+    - type: Transform
+      parent: 522
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 533
+    components:
+    - type: Transform
+      parent: 530
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ClothingOuterHardsuitCBURN
+  entities:
+  - uid: 8
+    components:
+    - type: Transform
+      parent: 2
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 502
+    components:
+    - type: Transform
+      parent: 498
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 510
+    components:
+    - type: Transform
+      parent: 506
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 518
+    components:
+    - type: Transform
+      parent: 514
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 526
+    components:
+    - type: Transform
+      parent: 522
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 534
+    components:
+    - type: Transform
+      parent: 530
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ClothingShoesBootsCombatFilled
+  entities:
+  - uid: 9
+    components:
+    - type: Transform
+      parent: 2
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 503
+    components:
+    - type: Transform
+      parent: 498
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 511
+    components:
+    - type: Transform
+      parent: 506
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 519
+    components:
+    - type: Transform
+      parent: 514
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 527
+    components:
+    - type: Transform
+      parent: 522
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 535
+    components:
+    - type: Transform
+      parent: 530
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ComputerCloningConsole
+  entities:
+  - uid: 538
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,-7.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        907:
+        - - MedicalScannerSender
+          - MedicalScannerReceiver
+        472:
+        - - CloningPodSender
+          - CloningPodReceiver
+  - uid: 539
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,-7.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        908:
+        - - MedicalScannerSender
+          - MedicalScannerReceiver
+        473:
+        - - CloningPodSender
+          - CloningPodReceiver
+- proto: ComputerComms
+  entities:
+  - uid: 540
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-2.5
+      parent: 1
+- proto: ComputerId
+  entities:
+  - uid: 541
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-12.5
+      parent: 1
+- proto: ComputerIFF
+  entities:
+  - uid: 542
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-11.5
+      parent: 1
+- proto: ComputerRadar
+  entities:
+  - uid: 543
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-6.5
+      parent: 1
+- proto: ComputerShuttle
+  entities:
+  - uid: 544
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-7.5
+      parent: 1
+- proto: ComputerSurveillanceCameraMonitor
+  entities:
+  - uid: 545
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-8.5
+      parent: 1
+- proto: CrateCommandSecure
+  entities:
+  - uid: 546
+    components:
+    - type: MetaData
+      name: Ambuzol+ crate
+    - type: Transform
+      anchored: True
+      pos: 0.5,-8.5
+      parent: 1
+    - type: Lock
+      locked: False
+    - type: Physics
+      bodyType: Static
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 556
+          - 555
+          - 554
+          - 553
+          - 552
+          - 551
+          - 550
+          - 549
+          - 548
+          - 547
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+- proto: CrateFreezer
+  entities:
+  - uid: 557
+    components:
+    - type: Transform
+      anchored: True
+      pos: 8.5,-3.5
+      parent: 1
+    - type: Physics
+      bodyType: Static
+  - uid: 558
+    components:
+    - type: Transform
+      anchored: True
+      pos: 8.5,-4.5
+      parent: 1
+    - type: Physics
+      bodyType: Static
+  - uid: 559
+    components:
+    - type: Transform
+      anchored: True
+      pos: 8.5,-2.5
+      parent: 1
+    - type: Physics
+      bodyType: Static
+  - uid: 560
+    components:
+    - type: Transform
+      anchored: True
+      pos: 11.5,-3.5
+      parent: 1
+    - type: Physics
+      bodyType: Static
+  - uid: 561
+    components:
+    - type: Transform
+      anchored: True
+      pos: 11.5,-4.5
+      parent: 1
+    - type: Physics
+      bodyType: Static
+  - uid: 562
+    components:
+    - type: Transform
+      anchored: True
+      pos: 11.5,-2.5
+      parent: 1
+    - type: Physics
+      bodyType: Static
+- proto: CrateTrashCart
+  entities:
+  - uid: 563
+    components:
+    - type: Transform
+      pos: 14.5,-14.5
+      parent: 1
+- proto: DefibrillatorCabinetFilled
+  entities:
+  - uid: 564
+    components:
+    - type: Transform
+      pos: 12.5,4.5
+      parent: 1
+  - uid: 565
+    components:
+    - type: Transform
+      pos: 7.5,4.5
+      parent: 1
+  - uid: 566
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,0.5
+      parent: 1
+  - uid: 567
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,0.5
+      parent: 1
+- proto: DiseaseDiagnoser
+  entities:
+  - uid: 568
+    components:
+    - type: Transform
+      pos: 3.5,-5.5
+      parent: 1
+- proto: DrinkShaker
+  entities:
+  - uid: 569
+    components:
+    - type: Transform
+      pos: 5.2650146,-15.313744
+      parent: 1
+  - uid: 570
+    components:
+    - type: Transform
+      pos: 5.394068,-15.581383
+      parent: 1
+- proto: EmergencyRollerBedSpawnFolded
+  entities:
+  - uid: 571
+    components:
+    - type: Transform
+      pos: 12.163195,-0.65625
+      parent: 1
+  - uid: 572
+    components:
+    - type: Transform
+      pos: 7.7100697,-0.703125
+      parent: 1
+  - uid: 573
+    components:
+    - type: Transform
+      pos: 12.475695,-0.546875
+      parent: 1
+  - uid: 574
+    components:
+    - type: Transform
+      pos: 7.3663197,-0.625
+      parent: 1
+  - uid: 575
+    components:
+    - type: Transform
+      pos: 7.6631947,-0.203125
+      parent: 1
+  - uid: 576
+    components:
+    - type: Transform
+      pos: 12.131945,-0.1875
+      parent: 1
+- proto: FaxMachineBase
+  entities:
+  - uid: 577
+    components:
+    - type: Transform
+      pos: 0.5,-6.5
+      parent: 1
+    - type: FaxMachine
+      name: CBURN
+- proto: FloorDrain
+  entities:
+  - uid: 578
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,-7.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+  - uid: 579
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,-7.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+  - uid: 580
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-18.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+  - uid: 581
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-8.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
+- proto: FoodSnackNutribrick
+  entities:
+  - uid: 582
+    components:
+    - type: Transform
+      pos: 7.387781,-18.31067
+      parent: 1
+  - uid: 583
+    components:
+    - type: Transform
+      pos: 7.497156,-17.982546
+      parent: 1
+  - uid: 584
+    components:
+    - type: Transform
+      pos: 7.387781,-17.763796
+      parent: 1
+  - uid: 585
+    components:
+    - type: Transform
+      pos: 7.590906,-17.576296
+      parent: 1
+  - uid: 586
+    components:
+    - type: Transform
+      pos: 7.340906,-17.24817
+      parent: 1
+  - uid: 587
+    components:
+    - type: Transform
+      pos: 7.559656,-16.982546
+      parent: 1
+  - uid: 588
+    components:
+    - type: Transform
+      pos: 7.340906,-16.732546
+      parent: 1
+  - uid: 589
+    components:
+    - type: Transform
+      pos: 7.669031,-16.56067
+      parent: 1
+  - uid: 590
+    components:
+    - type: Transform
+      pos: 7.387781,-16.295046
+      parent: 1
+  - uid: 591
+    components:
+    - type: Transform
+      pos: 7.637781,-16.045046
+      parent: 1
+  - uid: 592
+    components:
+    - type: Transform
+      pos: 7.294031,-15.904421
+      parent: 1
+- proto: FuelDispenser
+  entities:
+  - uid: 593
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-8.5
+      parent: 1
+- proto: GasMinerNitrogen
+  entities:
+  - uid: 594
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,1.5
+      parent: 1
+- proto: GasMinerOxygen
+  entities:
+  - uid: 595
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-0.5
+      parent: 1
+- proto: GasMixerFlipped
+  entities:
+  - uid: 596
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,0.5
+      parent: 1
+    - type: GasMixer
+      inletTwoConcentration: 0.78
+      inletOneConcentration: 0.22
+      targetPressure: 103
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+    - type: VentCrawTube
+      connected: True
+- proto: GasPassiveVent
+  entities:
+  - uid: 597
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,1.5
+      parent: 1
+  - uid: 598
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-0.5
+      parent: 1
+  - uid: 599
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 16.5,-0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+- proto: GasPipeBend
+  entities:
+  - uid: 600
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,2.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+  - uid: 601
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-3.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 602
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,0.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+  - uid: 603
+    components:
+    - type: Transform
+      pos: 1.5,0.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 604
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-8.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 605
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,0.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 606
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,-0.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 607
+    components:
+    - type: Transform
+      pos: 13.5,-0.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 608
+    components:
+    - type: Transform
+      pos: 14.5,1.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 609
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,1.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 610
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-0.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 611
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-2.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 612
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-6.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 613
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,1.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 614
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-2.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 615
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-12.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 616
+    components:
+    - type: Transform
+      pos: 1.5,-12.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 617
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-16.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 618
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-5.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 619
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-9.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 620
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,-9.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 621
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,-16.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 622
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-16.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 623
+    components:
+    - type: Transform
+      pos: -2.5,1.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+  - uid: 624
+    components:
+    - type: Transform
+      pos: -2.5,2.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+- proto: GasPipeFourway
+  entities:
+  - uid: 625
+    components:
+    - type: Transform
+      pos: 5.5,-3.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+- proto: GasPipeStraight
+  entities:
+  - uid: 626
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,0.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 627
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,-12.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 628
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-12.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 629
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 13.5,-11.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 630
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,0.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 631
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,0.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 632
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-3.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 633
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-3.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 634
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-3.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 635
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-3.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 636
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-3.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 637
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-10.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 638
+    components:
+    - type: Transform
+      pos: 0.5,-4.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 639
+    components:
+    - type: Transform
+      pos: 0.5,-5.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 640
+    components:
+    - type: Transform
+      pos: 0.5,-6.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 641
+    components:
+    - type: Transform
+      pos: 0.5,-7.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 642
+    components:
+    - type: Transform
+      pos: 0.5,-8.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 643
+    components:
+    - type: Transform
+      pos: 0.5,-9.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 644
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 645
+    components:
+    - type: Transform
+      pos: 1.5,-1.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 646
+    components:
+    - type: Transform
+      pos: 1.5,-2.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 647
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-10.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 648
+    components:
+    - type: Transform
+      pos: 0.5,-12.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 649
+    components:
+    - type: Transform
+      pos: 0.5,-13.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 650
+    components:
+    - type: Transform
+      pos: 0.5,-14.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 651
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-11.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 652
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-11.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 653
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-11.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 654
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-11.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 655
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-11.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 656
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-11.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 657
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-11.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 658
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-11.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 659
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-11.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 660
+    components:
+    - type: Transform
+      pos: 10.5,-12.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 661
+    components:
+    - type: Transform
+      pos: 10.5,-13.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 662
+    components:
+    - type: Transform
+      pos: 10.5,-14.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 663
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-15.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 664
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-15.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 665
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-11.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 666
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-11.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 667
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-11.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 668
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-4.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 669
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-5.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 670
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-6.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 671
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-7.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 672
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-2.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 673
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-1.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 674
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-0.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 675
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,1.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 676
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,0.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 677
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,0.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 678
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,0.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 679
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,0.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 680
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,0.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 681
+    components:
+    - type: Transform
+      pos: 13.5,-2.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 682
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-3.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 683
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-3.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 684
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,-1.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 685
+    components:
+    - type: Transform
+      pos: 13.5,-4.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 686
+    components:
+    - type: Transform
+      pos: 13.5,-5.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 687
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-6.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 688
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-6.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 689
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-6.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 690
+    components:
+    - type: Transform
+      pos: 13.5,-7.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 691
+    components:
+    - type: Transform
+      pos: 10.5,-5.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 692
+    components:
+    - type: Transform
+      pos: 10.5,-4.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 693
+    components:
+    - type: Transform
+      pos: 14.5,-1.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 694
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-0.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 695
+    components:
+    - type: Transform
+      pos: 14.5,0.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 696
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,1.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 697
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,1.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 698
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,1.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 699
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,1.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 700
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,1.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 701
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,0.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 702
+    components:
+    - type: Transform
+      pos: 6.5,-1.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 703
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-2.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 704
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 705
+    components:
+    - type: Transform
+      pos: 4.5,-4.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 706
+    components:
+    - type: Transform
+      pos: 4.5,-5.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 707
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-2.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 708
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-2.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 709
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-2.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 710
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-1.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 711
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-0.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 712
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,0.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 713
+    components:
+    - type: Transform
+      pos: -0.5,-3.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 714
+    components:
+    - type: Transform
+      pos: -0.5,-4.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 715
+    components:
+    - type: Transform
+      pos: -0.5,-5.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 716
+    components:
+    - type: Transform
+      pos: -0.5,-6.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 717
+    components:
+    - type: Transform
+      pos: -0.5,-7.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 718
+    components:
+    - type: Transform
+      pos: -0.5,-8.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 719
+    components:
+    - type: Transform
+      pos: -0.5,-9.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 720
+    components:
+    - type: Transform
+      pos: -0.5,-10.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 721
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-12.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 722
+    components:
+    - type: Transform
+      pos: 1.5,-13.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 723
+    components:
+    - type: Transform
+      pos: 1.5,-14.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 724
+    components:
+    - type: Transform
+      pos: 1.5,-15.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 725
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-16.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 726
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-16.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 727
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-2.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 728
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,-3.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 729
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,-4.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 730
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 13.5,-5.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 731
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,-5.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 732
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-5.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 733
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-5.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 734
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-4.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 735
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,-7.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 736
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,-8.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 737
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,-9.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 738
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-9.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 739
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-9.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 740
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,-9.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 741
+    components:
+    - type: Transform
+      pos: 13.5,-10.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 742
+    components:
+    - type: Transform
+      pos: 13.5,-11.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 743
+    components:
+    - type: Transform
+      pos: 12.5,-13.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 744
+    components:
+    - type: Transform
+      pos: 12.5,-14.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 745
+    components:
+    - type: Transform
+      pos: 12.5,-15.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 746
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-16.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 747
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,-16.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 748
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-16.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+- proto: GasPipeTJunction
+  entities:
+  - uid: 749
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-0.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+  - uid: 750
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,-12.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 751
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-3.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 752
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-10.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 753
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-3.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 754
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-11.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 755
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 756
+    components:
+    - type: Transform
+      pos: 9.5,-11.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 757
+    components:
+    - type: Transform
+      pos: 10.5,-11.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 758
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,-15.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 759
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,0.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 760
+    components:
+    - type: Transform
+      pos: 12.5,0.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 761
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 13.5,-6.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 762
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,-6.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 763
+    components:
+    - type: Transform
+      pos: 11.5,-16.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 764
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,-0.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 765
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,1.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 766
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-0.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 767
+    components:
+    - type: Transform
+      pos: 4.5,-2.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 768
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-2.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 769
+    components:
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 770
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-11.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 771
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,-2.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 772
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-5.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 773
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-6.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 774
+    components:
+    - type: Transform
+      pos: 13.5,-9.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 775
+    components:
+    - type: Transform
+      pos: 12.5,-12.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 776
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,1.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+- proto: GasPort
+  entities:
+  - uid: 777
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-0.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+  - uid: 778
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,1.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+- proto: GasVentPump
+  entities:
+  - uid: 779
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-0.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 780
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-10.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 781
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-15.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 782
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-15.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 783
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-6.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 784
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-15.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 785
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,-8.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 786
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-12.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 787
+    components:
+    - type: Transform
+      pos: 6.5,2.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 788
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 13.5,0.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 789
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-3.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 790
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-8.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 791
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-4.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 792
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 16.5,-11.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 793
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 16.5,-3.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 794
+    components:
+    - type: Transform
+      pos: 10.5,-3.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+- proto: GasVentScrubber
+  entities:
+  - uid: 795
+    components:
+    - type: Transform
+      pos: 6.5,0.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 796
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,1.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 797
+    components:
+    - type: Transform
+      pos: 13.5,2.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 798
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 16.5,-2.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 799
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 16.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+    - type: VentCrawTube
+      connected: True
+  - uid: 800
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,-17.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 801
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-3.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 802
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-11.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 803
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-6.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 804
+    components:
+    - type: Transform
+      pos: 8.5,-8.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 805
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-6.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 806
+    components:
+    - type: Transform
+      pos: 9.5,-3.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 807
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-12.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 808
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-16.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 809
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,-17.5
+      parent: 1
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+- proto: Gauze1
+  entities:
+  - uid: 810
+    components:
+    - type: Transform
+      pos: 11.575129,-0.48613083
+      parent: 1
+  - uid: 811
+    components:
+    - type: Transform
+      pos: 11.528254,-0.25175583
+      parent: 1
+  - uid: 812
+    components:
+    - type: Transform
+      pos: 11.278254,-0.51738083
+      parent: 1
+  - uid: 813
+    components:
+    - type: Transform
+      pos: 11.247004,-0.25175583
+      parent: 1
+- proto: GeneratorBasic15kW
+  entities:
+  - uid: 814
+    components:
+    - type: Transform
+      pos: 0.5,2.5
+      parent: 1
+  - uid: 815
+    components:
+    - type: Transform
+      pos: -1.5,2.5
+      parent: 1
+  - uid: 816
+    components:
+    - type: Transform
+      pos: -0.5,2.5
+      parent: 1
+  - uid: 817
+    components:
+    - type: Transform
+      pos: 1.5,2.5
+      parent: 1
+  - uid: 818
+    components:
+    - type: Transform
+      pos: 2.5,2.5
+      parent: 1
+  - uid: 819
+    components:
+    - type: Transform
+      pos: -2.5,2.5
+      parent: 1
+- proto: GnomePlushie
+  entities:
+  - uid: 820
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-7.5
+      parent: 1
+- proto: GoldenBeaker
+  entities:
+  - uid: 76
+    components:
+    - type: Transform
+      parent: 69
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: GravityGeneratorMini
+  entities:
+  - uid: 821
+    components:
+    - type: Transform
+      pos: 3.5,-0.5
+      parent: 1
+- proto: Grille
+  entities:
+  - uid: 822
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-7.5
+      parent: 1
+  - uid: 823
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-3.5
+      parent: 1
+  - uid: 824
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-6.5
+      parent: 1
+  - uid: 825
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-7.5
+      parent: 1
+  - uid: 826
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-8.5
+      parent: 1
+  - uid: 827
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-11.5
+      parent: 1
+  - uid: 828
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 17.5,-1.5
+      parent: 1
+  - uid: 829
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,-1.5
+      parent: 1
+  - uid: 830
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 17.5,-13.5
+      parent: 1
+  - uid: 831
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,-13.5
+      parent: 1
+  - uid: 832
+    components:
+    - type: Transform
+      pos: 1.5,-6.5
+      parent: 1
+  - uid: 833
+    components:
+    - type: Transform
+      pos: 1.5,-7.5
+      parent: 1
+  - uid: 834
+    components:
+    - type: Transform
+      pos: 1.5,-8.5
+      parent: 1
+  - uid: 835
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-7.5
+      parent: 1
+  - uid: 836
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-8.5
+      parent: 1
+  - uid: 837
+    components:
+    - type: Transform
+      pos: 10.5,4.5
+      parent: 1
+  - uid: 838
+    components:
+    - type: Transform
+      pos: 9.5,4.5
+      parent: 1
+  - uid: 839
+    components:
+    - type: Transform
+      pos: 8.5,4.5
+      parent: 1
+  - uid: 840
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-10.5
+      parent: 1
+  - uid: 841
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,0.5
+      parent: 1
+  - uid: 842
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,0.5
+      parent: 1
+  - uid: 843
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,1.5
+      parent: 1
+  - uid: 844
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-0.5
+      parent: 1
+  - uid: 845
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-6.5
+      parent: 1
+  - uid: 846
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-2.5
+      parent: 1
+  - uid: 847
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-3.5
+      parent: 1
+  - uid: 848
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-12.5
+      parent: 1
+  - uid: 849
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-11.5
+      parent: 1
+  - uid: 850
+    components:
+    - type: Transform
+      pos: 11.5,4.5
+      parent: 1
+  - uid: 851
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-10.5
+      parent: 1
+  - uid: 852
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,0.5
+      parent: 1
+  - uid: 853
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-10.5
+      parent: 1
+  - uid: 854
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-10.5
+      parent: 1
+  - uid: 855
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-17.5
+      parent: 1
+  - uid: 856
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-16.5
+      parent: 1
+  - uid: 857
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 15.5,2.5
+      parent: 1
+  - uid: 858
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 15.5,1.5
+      parent: 1
+- proto: GrilleDiagonal
+  entities:
+  - uid: 859
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-9.5
+      parent: 1
+  - uid: 860
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-10.5
+      parent: 1
+  - uid: 861
+    components:
+    - type: Transform
+      pos: -6.5,-10.5
+      parent: 1
+  - uid: 862
+    components:
+    - type: Transform
+      pos: -5.5,-9.5
+      parent: 1
+  - uid: 863
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-4.5
+      parent: 1
+  - uid: 864
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-5.5
+      parent: 1
+  - uid: 865
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-4.5
+      parent: 1
+  - uid: 866
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-5.5
+      parent: 1
+- proto: GunSafeBaseSecure
+  entities:
+  - uid: 87
+    components:
+    - type: MetaData
+      name: Shotgun safe
+    - type: Transform
+      pos: 2.5,-17.5
+      parent: 1
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 90
+          - 96
+          - 95
+          - 94
+          - 93
+          - 92
+          - 91
+          - 88
+          - 89
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+  - uid: 97
+    components:
+    - type: MetaData
+      name: Shotgun safe
+    - type: Transform
+      pos: 3.5,-17.5
+      parent: 1
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 103
+          - 102
+          - 101
+          - 98
+          - 99
+          - 100
+          - 104
+          - 105
+          - 106
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+  - uid: 867
+    components:
+    - type: MetaData
+      name: Vibroblade safe
+    - type: Transform
+      pos: 0.5,-17.5
+      parent: 1
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 872
+          - 870
+          - 868
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.147
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+  - uid: 874
+    components:
+    - type: MetaData
+      name: Vibroblade safe
+    - type: Transform
+      pos: 1.5,-17.5
+      parent: 1
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 877
+          - 875
+          - 879
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.147
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+- proto: GunSafeLaserCarbine
+  entities:
+  - uid: 881
+    components:
+    - type: MetaData
+      name: Laser safe
+    - type: Transform
+      pos: -1.5,-17.5
+      parent: 1
+  - uid: 882
+    components:
+    - type: MetaData
+      name: Laser safe
+    - type: Transform
+      pos: -0.5,-17.5
+      parent: 1
+- proto: Gyroscope
+  entities:
+  - uid: 883
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,3.5
+      parent: 1
+  - uid: 884
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-18.5
+      parent: 1
+  - uid: 885
+    components:
+    - type: Transform
+      pos: 3.5,0.5
+      parent: 1
+  - uid: 886
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 16.5,0.5
+      parent: 1
+  - uid: 887
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 16.5,-15.5
+      parent: 1
+  - uid: 888
+    components:
+    - type: Transform
+      pos: 1.5,4.5
+      parent: 1
+  - uid: 889
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-19.5
+      parent: 1
+- proto: HandLabeler
+  entities:
+  - uid: 77
+    components:
+    - type: Transform
+      parent: 69
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: HighSecCentralCommandLocked
+  entities:
+  - uid: 890
+    components:
+    - type: Transform
+      pos: 0.5,-13.5
+      parent: 1
+  - uid: 891
+    components:
+    - type: Transform
+      pos: 1.5,-13.5
+      parent: 1
+- proto: HolopadBluespace
+  entities:
+  - uid: 892
+    components:
+    - type: Transform
+      pos: -0.5,-7.5
+      parent: 1
+- proto: Jukebox
+  entities:
+  - uid: 893
+    components:
+    - type: Transform
+      pos: 13.5,-14.5
+      parent: 1
+- proto: KitchenReagentGrinder
+  entities:
+  - uid: 894
+    components:
+    - type: Transform
+      pos: 2.5,-9.5
+      parent: 1
+- proto: LockableButtonCommand
+  entities:
+  - uid: 895
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-13.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        56:
+        - - Pressed
+          - Toggle
+        57:
+        - - Pressed
+          - Toggle
+        1040:
+        - - Pressed
+          - Toggle
+        1039:
+        - - Pressed
+          - Toggle
+        1038:
+        - - Pressed
+          - Toggle
+        59:
+        - - Pressed
+          - Toggle
+        58:
+        - - Pressed
+          - Toggle
+  - uid: 896
+    components:
+    - type: Transform
+      pos: -3.5,-1.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        58:
+        - - Pressed
+          - Toggle
+        59:
+        - - Pressed
+          - Toggle
+        57:
+        - - Pressed
+          - Toggle
+        56:
+        - - Pressed
+          - Toggle
+        1038:
+        - - Pressed
+          - Toggle
+        1039:
+        - - Pressed
+          - Toggle
+        1040:
+        - - Pressed
+          - Toggle
+- proto: LockerWallMedicalFilled
+  entities:
+  - uid: 897
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-0.5
+      parent: 1
+- proto: MachineCentrifuge
+  entities:
+  - uid: 898
+    components:
+    - type: Transform
+      pos: 2.5,-8.5
+      parent: 1
+- proto: MachineElectrolysisUnit
+  entities:
+  - uid: 899
+    components:
+    - type: Transform
+      pos: 2.5,-7.5
+      parent: 1
+- proto: MaterialBiomass
+  entities:
+  - uid: 475
+    components:
+    - type: Transform
+      parent: 474
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 476
+    components:
+    - type: Transform
+      parent: 474
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 477
+    components:
+    - type: Transform
+      parent: 474
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 478
+    components:
+    - type: Transform
+      parent: 474
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 479
+    components:
+    - type: Transform
+      parent: 474
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 480
+    components:
+    - type: Transform
+      parent: 474
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 481
+    components:
+    - type: Transform
+      parent: 474
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 482
+    components:
+    - type: Transform
+      parent: 474
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 483
+    components:
+    - type: Transform
+      parent: 474
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 484
+    components:
+    - type: Transform
+      parent: 474
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: MedicalBed
+  entities:
+  - uid: 900
+    components:
+    - type: Transform
+      pos: 5.5,3.5
+      parent: 1
+  - uid: 901
+    components:
+    - type: Transform
+      pos: 11.5,3.5
+      parent: 1
+  - uid: 902
+    components:
+    - type: Transform
+      pos: 5.5,1.5
+      parent: 1
+  - uid: 903
+    components:
+    - type: Transform
+      pos: 5.5,2.5
+      parent: 1
+  - uid: 904
+    components:
+    - type: Transform
+      pos: 8.5,3.5
+      parent: 1
+  - uid: 905
+    components:
+    - type: Transform
+      pos: 10.5,3.5
+      parent: 1
+  - uid: 906
+    components:
+    - type: Transform
+      pos: 9.5,3.5
+      parent: 1
+- proto: MedicalScanner
+  entities:
+  - uid: 907
+    components:
+    - type: Transform
+      pos: 9.5,-7.5
+      parent: 1
+  - uid: 908
+    components:
+    - type: Transform
+      pos: 12.5,-7.5
+      parent: 1
+- proto: MedkitCombatFilled
+  entities:
+  - uid: 909
+    components:
+    - type: Transform
+      pos: 8.511875,0.64957905
+      parent: 1
+  - uid: 910
+    components:
+    - type: Transform
+      pos: 8.622004,0.54511917
+      parent: 1
+  - uid: 911
+    components:
+    - type: Transform
+      pos: 8.450129,0.46699417
+      parent: 1
+  - uid: 912
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.3287277,-9.53085
+      parent: 1
+  - uid: 913
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.6724777,-9.296475
+      parent: 1
+- proto: MopBucketFull
+  entities:
+  - uid: 914
+    components:
+    - type: Transform
+      pos: 14.5,-15.5
+      parent: 1
+    - type: ContainerContainer
+      containers:
+        storagebase: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        item_slot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: 915
+- proto: MopItem
+  entities:
+  - uid: 916
+    components:
+    - type: Transform
+      pos: 14.48557,-15.513462
+      parent: 1
+- proto: Multitool
+  entities:
+  - uid: 485
+    components:
+    - type: Transform
+      parent: 474
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: NitrogenCanister
+  entities:
+  - uid: 917
+    components:
+    - type: Transform
+      pos: -2.5,1.5
+      parent: 1
+- proto: NitrogenTankFilled
+  entities:
+  - uid: 10
+    components:
+    - type: Transform
+      parent: 2
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 504
+    components:
+    - type: Transform
+      parent: 498
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 512
+    components:
+    - type: Transform
+      parent: 506
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 520
+    components:
+    - type: Transform
+      parent: 514
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 528
+    components:
+    - type: Transform
+      parent: 522
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 536
+    components:
+    - type: Transform
+      parent: 530
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: Ointment
+  entities:
+  - uid: 918
+    components:
+    - type: Transform
+      pos: 10.18375,-0.33479595
+      parent: 1
+  - uid: 919
+    components:
+    - type: Transform
+      pos: 10.511875,-0.58479595
+      parent: 1
+  - uid: 920
+    components:
+    - type: Transform
+      pos: 10.68375,-0.33479595
+      parent: 1
+  - uid: 921
+    components:
+    - type: Transform
+      pos: 10.215,-0.63167095
+      parent: 1
+- proto: OxygenCanister
+  entities:
+  - uid: 922
+    components:
+    - type: Transform
+      pos: -2.5,-0.5
+      parent: 1
+- proto: OxygenTankFilled
+  entities:
+  - uid: 3
+    components:
+    - type: Transform
+      parent: 2
+    - type: GasTank
+      toggleActionEntity: 4
+    - type: Physics
+      canCollide: False
+    - type: ActionsContainer
+    - type: ContainerContainer
+      containers:
+        actions: !type:Container
+          ents:
+          - 4
+    - type: InsideEntityStorage
+  - uid: 505
+    components:
+    - type: Transform
+      parent: 498
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 513
+    components:
+    - type: Transform
+      parent: 506
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 521
+    components:
+    - type: Transform
+      parent: 514
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 529
+    components:
+    - type: Transform
+      parent: 522
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 537
+    components:
+    - type: Transform
+      parent: 530
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: PianoInstrument
+  entities:
+  - uid: 923
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,-17.5
+      parent: 1
+- proto: PigPlushie
+  entities:
+  - uid: 924
+    components:
+    - type: Transform
+      pos: 8.525559,-18.20821
+      parent: 1
+- proto: PillAmbuzol
+  entities:
+  - uid: 925
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.237062,-7.040344
+      parent: 1
+  - uid: 926
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.283937,-6.399719
+      parent: 1
+  - uid: 927
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.752687,-7.837219
+      parent: 1
+  - uid: 928
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.674562,-6.493469
+      parent: 1
+  - uid: 929
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.377687,-6.837219
+      parent: 1
+  - uid: 930
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.783937,-7.180969
+      parent: 1
+  - uid: 931
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.377687,-7.305969
+      parent: 1
+  - uid: 932
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.207619,-6.665344
+      parent: 1
+  - uid: 933
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.455812,-8.071594
+      parent: 1
+  - uid: 934
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.330812,-8.587219
+      parent: 1
+  - uid: 935
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.582619,-7.009094
+      parent: 1
+  - uid: 936
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.580812,-8.634094
+      parent: 1
+  - uid: 937
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.770119,-6.180969
+      parent: 1
+  - uid: 938
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.721437,-8.212219
+      parent: 1
+  - uid: 939
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.268312,-7.868469
+      parent: 1
+  - uid: 940
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.549562,-7.618469
+      parent: 1
+  - uid: 941
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.752687,-6.837219
+      parent: 1
+  - uid: 942
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.237062,-8.290344
+      parent: 1
+  - uid: 943
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.190187,-7.477844
+      parent: 1
+  - uid: 944
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.502687,-6.243469
+      parent: 1
+- proto: PillAmbuzolPlus
+  entities:
+  - uid: 547
+    components:
+    - type: Transform
+      parent: 546
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 548
+    components:
+    - type: Transform
+      parent: 546
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 549
+    components:
+    - type: Transform
+      parent: 546
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 550
+    components:
+    - type: Transform
+      parent: 546
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 551
+    components:
+    - type: Transform
+      parent: 546
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 552
+    components:
+    - type: Transform
+      parent: 546
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 553
+    components:
+    - type: Transform
+      parent: 546
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 554
+    components:
+    - type: Transform
+      parent: 546
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 555
+    components:
+    - type: Transform
+      parent: 546
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 556
+    components:
+    - type: Transform
+      parent: 546
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: PlasmaReinforcedWindowDirectional
+  entities:
+  - uid: 945
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 18.5,-11.5
+      parent: 1
+  - uid: 946
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 18.5,-3.5
+      parent: 1
+  - uid: 947
+    components:
+    - type: Transform
+      pos: 18.5,-11.5
+      parent: 1
+  - uid: 948
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-16.5
+      parent: 1
+  - uid: 949
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-14.5
+      parent: 1
+  - uid: 950
+    components:
+    - type: Transform
+      pos: 18.5,-3.5
+      parent: 1
+  - uid: 1360
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-14.5
+      parent: 1
+  - uid: 1363
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-14.5
+      parent: 1
+- proto: PlasmaWindoorSecureCentralCommandLocked
+  entities:
+  - uid: 951
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 18.5,-2.5
+      parent: 1
+  - uid: 952
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 18.5,-4.5
+      parent: 1
+  - uid: 953
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 18.5,-10.5
+      parent: 1
+  - uid: 954
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 18.5,-12.5
+      parent: 1
+  - uid: 955
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-15.5
+      parent: 1
+  - uid: 1361
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-15.5
+      parent: 1
+  - uid: 1362
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-15.5
+      parent: 1
+- proto: PlushieBee
+  entities:
+  - uid: 956
+    components:
+    - type: Transform
+      pos: 8.525559,-16.45821
+      parent: 1
+- proto: PlushieHampter
+  entities:
+  - uid: 957
+    components:
+    - type: Transform
+      pos: 8.525559,-14.42696
+      parent: 1
+- proto: PlushieRouny
+  entities:
+  - uid: 958
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,1.5
+      parent: 1
+- proto: PlushieSharkGrey
+  entities:
+  - uid: 915
+    components:
+    - type: Transform
+      parent: 914
+    - type: Physics
+      canCollide: False
+- proto: PosterLegitPeriodicTable
+  entities:
+  - uid: 959
+    components:
+    - type: Transform
+      pos: 3.5,-4.5
+      parent: 1
+- proto: PottedPlantRandom
+  entities:
+  - uid: 960
+    components:
+    - type: Transform
+      pos: -3.5,-9.5
+      parent: 1
+  - uid: 961
+    components:
+    - type: Transform
+      pos: -3.5,-5.5
+      parent: 1
+- proto: PowerCellMedium
+  entities:
+  - uid: 962
+    components:
+    - type: Transform
+      pos: 11.6525,0.55582905
+      parent: 1
+- proto: PowerCellRecharger
+  entities:
+  - uid: 963
+    components:
+    - type: Transform
+      pos: 11.5,0.5
+      parent: 1
+- proto: Poweredlight
+  entities:
+  - uid: 964
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-7.5
+      parent: 1
+  - uid: 965
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,-9.5
+      parent: 1
+  - uid: 966
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-9.5
+      parent: 1
+  - uid: 967
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-7.5
+      parent: 1
+  - uid: 968
+    components:
+    - type: Transform
+      pos: 3.5,-5.5
+      parent: 1
+  - uid: 969
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-9.5
+      parent: 1
+  - uid: 970
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-9.5
+      parent: 1
+  - uid: 971
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-5.5
+      parent: 1
+  - uid: 972
+    components:
+    - type: Transform
+      pos: 7.5,-14.5
+      parent: 1
+  - uid: 973
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-12.5
+      parent: 1
+  - uid: 974
+    components:
+    - type: Transform
+      pos: 2.5,-2.5
+      parent: 1
+  - uid: 975
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-12.5
+      parent: 1
+  - uid: 976
+    components:
+    - type: Transform
+      pos: 2.5,-14.5
+      parent: 1
+  - uid: 977
+    components:
+    - type: Transform
+      pos: -4.5,-14.5
+      parent: 1
+  - uid: 978
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-16.5
+      parent: 1
+  - uid: 979
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-17.5
+      parent: 1
+  - uid: 980
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-17.5
+      parent: 1
+  - uid: 981
+    components:
+    - type: Transform
+      pos: -0.5,-14.5
+      parent: 1
+  - uid: 982
+    components:
+    - type: Transform
+      pos: -1.5,-2.5
+      parent: 1
+  - uid: 983
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,-9.5
+      parent: 1
+  - uid: 984
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,-5.5
+      parent: 1
+  - uid: 985
+    components:
+    - type: Transform
+      pos: 12.5,-11.5
+      parent: 1
+  - uid: 986
+    components:
+    - type: Transform
+      pos: 9.5,-11.5
+      parent: 1
+  - uid: 987
+    components:
+    - type: Transform
+      pos: 6.5,-11.5
+      parent: 1
+  - uid: 988
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-0.5
+      parent: 1
+  - uid: 989
+    components:
+    - type: Transform
+      pos: 0.5,2.5
+      parent: 1
+  - uid: 990
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-0.5
+      parent: 1
+  - uid: 991
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,-18.5
+      parent: 1
+- proto: PoweredlightExterior
+  entities:
+  - uid: 992
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,3.5
+      parent: 1
+  - uid: 993
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,4.5
+      parent: 1
+  - uid: 994
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,-18.5
+      parent: 1
+  - uid: 995
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,0.5
+      parent: 1
+  - uid: 996
+    components:
+    - type: Transform
+      pos: -4.5,-18.5
+      parent: 1
+  - uid: 997
+    components:
+    - type: Transform
+      pos: 1.5,-19.5
+      parent: 1
+  - uid: 998
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,-15.5
+      parent: 1
+  - uid: 999
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,0.5
+      parent: 1
+  - uid: 1000
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-15.5
+      parent: 1
+- proto: PoweredlightLED
+  entities:
+  - uid: 1001
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,-0.5
+      parent: 1
+  - uid: 1002
+    components:
+    - type: Transform
+      pos: 13.5,3.5
+      parent: 1
+  - uid: 1003
+    components:
+    - type: Transform
+      pos: 6.5,3.5
+      parent: 1
+  - uid: 1004
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,-0.5
+      parent: 1
+- proto: PoweredSmallLight
+  entities:
+  - uid: 1005
+    components:
+    - type: Transform
+      pos: 18.5,-2.5
+      parent: 1
+  - uid: 1006
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-12.5
+      parent: 1
+  - uid: 1007
+    components:
+    - type: Transform
+      pos: -4.5,-2.5
+      parent: 1
+  - uid: 1008
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 18.5,-4.5
+      parent: 1
+  - uid: 1009
+    components:
+    - type: Transform
+      pos: 18.5,-10.5
+      parent: 1
+  - uid: 1010
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 18.5,-12.5
+      parent: 1
+  - uid: 1011
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-3.5
+      parent: 1
+  - uid: 1012
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-3.5
+      parent: 1
+- proto: PoweredWarmSmallLight
+  entities:
+  - uid: 1013
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-3.5
+      parent: 1
+  - uid: 1014
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-3.5
+      parent: 1
+  - uid: 1015
+    components:
+    - type: Transform
+      pos: 13.5,-14.5
+      parent: 1
+  - uid: 1016
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,-18.5
+      parent: 1
+  - uid: 1017
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-0.5
+      parent: 1
+  - uid: 1018
+    components:
+    - type: Transform
+      pos: -4.5,1.5
+      parent: 1
+- proto: PrototypeVibroblade
+  entities:
+  - uid: 869
+    components:
+    - type: Transform
+      parent: 868
+    - type: Physics
+      canCollide: False
+  - uid: 871
+    components:
+    - type: Transform
+      parent: 870
+    - type: Physics
+      canCollide: False
+  - uid: 873
+    components:
+    - type: Transform
+      parent: 872
+    - type: Physics
+      canCollide: False
+  - uid: 876
+    components:
+    - type: Transform
+      parent: 875
+    - type: Physics
+      canCollide: False
+  - uid: 878
+    components:
+    - type: Transform
+      parent: 877
+    - type: Physics
+      canCollide: False
+  - uid: 880
+    components:
+    - type: Transform
+      parent: 879
+    - type: Physics
+      canCollide: False
+- proto: PrototypeVibrobladeSheath
+  entities:
+  - uid: 868
+    components:
+    - type: Transform
+      parent: 867
+    - type: Physics
+      canCollide: False
+    - type: ContainerContainer
+      containers:
+        item: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: 869
+    - type: InsideEntityStorage
+  - uid: 870
+    components:
+    - type: Transform
+      parent: 867
+    - type: Physics
+      canCollide: False
+    - type: ContainerContainer
+      containers:
+        item: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: 871
+    - type: InsideEntityStorage
+  - uid: 872
+    components:
+    - type: Transform
+      parent: 867
+    - type: Physics
+      canCollide: False
+    - type: ContainerContainer
+      containers:
+        item: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: 873
+    - type: InsideEntityStorage
+  - uid: 875
+    components:
+    - type: Transform
+      parent: 874
+    - type: Physics
+      canCollide: False
+    - type: ContainerContainer
+      containers:
+        item: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: 876
+    - type: InsideEntityStorage
+  - uid: 877
+    components:
+    - type: Transform
+      parent: 874
+    - type: Physics
+      canCollide: False
+    - type: ContainerContainer
+      containers:
+        item: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: 878
+    - type: InsideEntityStorage
+  - uid: 879
+    components:
+    - type: Transform
+      parent: 874
+    - type: Physics
+      canCollide: False
+    - type: ContainerContainer
+      containers:
+        item: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: 880
+    - type: InsideEntityStorage
+- proto: Rack
+  entities:
+  - uid: 1019
+    components:
+    - type: Transform
+      pos: 7.5,-5.5
+      parent: 1
+  - uid: 1020
+    components:
+    - type: Transform
+      pos: 2.5,-14.5
+      parent: 1
+  - uid: 1021
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-14.5
+      parent: 1
+- proto: RagItem
+  entities:
+  - uid: 1022
+    components:
+    - type: Transform
+      pos: 5.706568,-15.581383
+      parent: 1
+- proto: Railing
+  entities:
+  - uid: 1023
+    components:
+    - type: Transform
+      pos: 14.5,-16.5
+      parent: 1
+  - uid: 1024
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-17.5
+      parent: 1
+- proto: RailingCorner
+  entities:
+  - uid: 1025
+    components:
+    - type: Transform
+      pos: -3.5,-5.5
+      parent: 1
+  - uid: 1026
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-9.5
+      parent: 1
+- proto: RailingCornerSmall
+  entities:
+  - uid: 1027
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,-16.5
+      parent: 1
+  - uid: 1028
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-10.5
+      parent: 1
+  - uid: 1029
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-4.5
+      parent: 1
+  - uid: 1030
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-10.5
+      parent: 1
+  - uid: 1031
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-4.5
+      parent: 1
+- proto: RailingRound
+  entities:
+  - uid: 1032
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-4.5
+      parent: 1
+  - uid: 1033
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-10.5
+      parent: 1
+- proto: RCD
+  entities:
+  - uid: 490
+    components:
+    - type: Transform
+      parent: 487
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 491
+    components:
+    - type: Transform
+      parent: 487
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: RCDAmmo
+  entities:
+  - uid: 492
+    components:
+    - type: Transform
+      parent: 487
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 493
+    components:
+    - type: Transform
+      parent: 487
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: SheetPlasma
+  entities:
+  - uid: 78
+    components:
+    - type: Transform
+      parent: 69
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: SheetPlastic
+  entities:
+  - uid: 1359
+    components:
+    - type: Transform
+      pos: -0.46766925,-14.49816
+      parent: 1
+  - uid: 1364
+    components:
+    - type: Transform
+      pos: -0.46766925,-14.49816
+      parent: 1
+  - uid: 1365
+    components:
+    - type: Transform
+      pos: -0.46766925,-14.49816
+      parent: 1
+  - uid: 1366
+    components:
+    - type: Transform
+      pos: -0.46766925,-14.49816
+      parent: 1
+- proto: SheetSteel
+  entities:
+  - uid: 1034
+    components:
+    - type: Transform
+      pos: -0.85829425,-14.451285
+      parent: 1
+  - uid: 1035
+    components:
+    - type: Transform
+      pos: -0.85829425,-14.451285
+      parent: 1
+  - uid: 1036
+    components:
+    - type: Transform
+      pos: -0.85829425,-14.451285
+      parent: 1
+  - uid: 1037
+    components:
+    - type: Transform
+      pos: -0.85829425,-14.451285
+      parent: 1
+- proto: ShuttersWindowOpen
+  entities:
+  - uid: 1038
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-6.5
+      parent: 1
+  - uid: 1039
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-7.5
+      parent: 1
+  - uid: 1040
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-8.5
+      parent: 1
+- proto: ShuttleWindow
+  entities:
+  - uid: 1041
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-10.5
+      parent: 1
+  - uid: 1042
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-3.5
+      parent: 1
+  - uid: 1043
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-7.5
+      parent: 1
+  - uid: 1044
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-6.5
+      parent: 1
+  - uid: 1045
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-8.5
+      parent: 1
+  - uid: 1046
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-11.5
+      parent: 1
+  - uid: 1047
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 17.5,-13.5
+      parent: 1
+  - uid: 1048
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,-13.5
+      parent: 1
+  - uid: 1049
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 17.5,-1.5
+      parent: 1
+  - uid: 1050
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,-1.5
+      parent: 1
+  - uid: 1051
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 15.5,1.5
+      parent: 1
+  - uid: 1052
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-7.5
+      parent: 1
+  - uid: 1053
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 15.5,2.5
+      parent: 1
+  - uid: 1054
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-10.5
+      parent: 1
+  - uid: 1055
+    components:
+    - type: Transform
+      pos: 1.5,-8.5
+      parent: 1
+  - uid: 1056
+    components:
+    - type: Transform
+      pos: 1.5,-7.5
+      parent: 1
+  - uid: 1057
+    components:
+    - type: Transform
+      pos: 1.5,-6.5
+      parent: 1
+  - uid: 1058
+    components:
+    - type: Transform
+      pos: 10.5,4.5
+      parent: 1
+  - uid: 1059
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-10.5
+      parent: 1
+  - uid: 1060
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-6.5
+      parent: 1
+  - uid: 1061
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,0.5
+      parent: 1
+  - uid: 1062
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,0.5
+      parent: 1
+  - uid: 1063
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-7.5
+      parent: 1
+  - uid: 1064
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-8.5
+      parent: 1
+  - uid: 1065
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-12.5
+      parent: 1
+  - uid: 1066
+    components:
+    - type: Transform
+      pos: 11.5,4.5
+      parent: 1
+  - uid: 1067
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-11.5
+      parent: 1
+  - uid: 1068
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-3.5
+      parent: 1
+  - uid: 1069
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-2.5
+      parent: 1
+  - uid: 1070
+    components:
+    - type: Transform
+      pos: 9.5,4.5
+      parent: 1
+  - uid: 1071
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,1.5
+      parent: 1
+  - uid: 1072
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-0.5
+      parent: 1
+  - uid: 1073
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,0.5
+      parent: 1
+  - uid: 1074
+    components:
+    - type: Transform
+      pos: 8.5,4.5
+      parent: 1
+  - uid: 1075
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-10.5
+      parent: 1
+  - uid: 1076
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-16.5
+      parent: 1
+  - uid: 1077
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-17.5
+      parent: 1
+- proto: ShuttleWindowDiagonal
+  entities:
+  - uid: 1078
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-4.5
+      parent: 1
+  - uid: 1079
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-5.5
+      parent: 1
+  - uid: 1080
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-5.5
+      parent: 1
+  - uid: 1081
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-4.5
+      parent: 1
+  - uid: 1082
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-9.5
+      parent: 1
+  - uid: 1083
+    components:
+    - type: Transform
+      pos: -5.5,-9.5
+      parent: 1
+  - uid: 1084
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-10.5
+      parent: 1
+  - uid: 1085
+    components:
+    - type: Transform
+      pos: -6.5,-10.5
+      parent: 1
+- proto: SignBar
+  entities:
+  - uid: 1086
+    components:
+    - type: Transform
+      pos: 13.5,-13.5
+      parent: 1
+- proto: SignCloning
+  entities:
+  - uid: 1087
+    components:
+    - type: Transform
+      pos: 15.5,-4.5
+      parent: 1
+- proto: SignMedical
+  entities:
+  - uid: 1088
+    components:
+    - type: Transform
+      pos: 15.5,-1.5
+      parent: 1
+- proto: SignMorgue
+  entities:
+  - uid: 1089
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,-4.5
+      parent: 1
+- proto: SinkWide
+  entities:
+  - uid: 1090
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-18.5
+      parent: 1
+  - uid: 1091
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-8.5
+      parent: 1
+- proto: SMESAdvanced
+  entities:
+  - uid: 1092
+    components:
+    - type: Transform
+      pos: 3.5,1.5
+      parent: 1
+- proto: SodaDispenser
+  entities:
+  - uid: 1093
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-17.5
+      parent: 1
+- proto: SpeedLoaderShotgunIncendiary
+  entities:
+  - uid: 91
+    components:
+    - type: Transform
+      parent: 87
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 92
+    components:
+    - type: Transform
+      parent: 87
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 93
+    components:
+    - type: Transform
+      parent: 87
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 101
+    components:
+    - type: Transform
+      parent: 97
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 102
+    components:
+    - type: Transform
+      parent: 97
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 103
+    components:
+    - type: Transform
+      parent: 97
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: StairDark
+  entities:
+  - uid: 1094
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-4.5
+      parent: 1
+  - uid: 1095
+    components:
+    - type: Transform
+      pos: -0.5,-10.5
+      parent: 1
+  - uid: 1096
+    components:
+    - type: Transform
+      pos: -1.5,-10.5
+      parent: 1
+  - uid: 1097
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-4.5
+      parent: 1
+  - uid: 1098
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-4.5
+      parent: 1
+  - uid: 1099
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-4.5
+      parent: 1
+  - uid: 1100
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-11.5
+      parent: 1
+  - uid: 1101
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-12.5
+      parent: 1
+  - uid: 1102
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-3.5
+      parent: 1
+  - uid: 1103
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-2.5
+      parent: 1
+  - uid: 1104
+    components:
+    - type: Transform
+      pos: 1.5,-10.5
+      parent: 1
+  - uid: 1105
+    components:
+    - type: Transform
+      pos: 0.5,-10.5
+      parent: 1
+- proto: StairStageWood
+  entities:
+  - uid: 1106
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 13.5,-18.5
+      parent: 1
+- proto: StasisBed
+  entities:
+  - uid: 1107
+    components:
+    - type: Transform
+      pos: 14.5,1.5
+      parent: 1
+  - uid: 1108
+    components:
+    - type: Transform
+      pos: 14.5,2.5
+      parent: 1
+  - uid: 1109
+    components:
+    - type: Transform
+      pos: 14.5,3.5
+      parent: 1
+- proto: Stool
+  entities:
+  - uid: 1110
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,-18.5
+      parent: 1
+- proto: StoolBar
+  entities:
+  - uid: 1111
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-18.5
+      parent: 1
+  - uid: 1112
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-17.5
+      parent: 1
+  - uid: 1113
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-16.5
+      parent: 1
+  - uid: 1114
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-15.5
+      parent: 1
+  - uid: 1115
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-14.5
+      parent: 1
+- proto: SubstationWallBasic
+  entities:
+  - uid: 1116
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-1.5
+      parent: 1
+- proto: SuitStorageBase
+  entities:
+  - uid: 2
+    components:
+    - type: Transform
+      pos: -4.5,-14.5
+      parent: 1
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 3
+          - 6
+          - 8
+          - 10
+          - 7
+          - 5
+          - 9
+  - uid: 498
+    components:
+    - type: Transform
+      pos: -5.5,-14.5
+      parent: 1
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 503
+          - 500
+          - 501
+          - 504
+          - 502
+          - 505
+          - 499
+  - uid: 506
+    components:
+    - type: Transform
+      pos: -3.5,-14.5
+      parent: 1
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 509
+          - 512
+          - 508
+          - 513
+          - 507
+          - 510
+          - 511
+  - uid: 514
+    components:
+    - type: Transform
+      pos: -5.5,-16.5
+      parent: 1
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 519
+          - 518
+          - 517
+          - 521
+          - 520
+          - 516
+          - 515
+  - uid: 522
+    components:
+    - type: Transform
+      pos: -4.5,-16.5
+      parent: 1
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 527
+          - 526
+          - 528
+          - 524
+          - 525
+          - 529
+          - 523
+  - uid: 530
+    components:
+    - type: Transform
+      pos: -3.5,-16.5
+      parent: 1
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 535
+          - 536
+          - 534
+          - 532
+          - 533
+          - 537
+          - 531
+- proto: SurveillanceCameraGeneral
+  entities:
+  - uid: 1117
+    components:
+    - type: Transform
+      pos: 9.5,-9.5
+      parent: 1
+    - type: SurveillanceCamera
+      id: Cloning/Morgue
+  - uid: 1118
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-14.5
+      parent: 1
+    - type: SurveillanceCamera
+      id: Bar
+  - uid: 1119
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 16.5,-10.5
+      parent: 1
+    - type: SurveillanceCamera
+      id: Docking South
+  - uid: 1120
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 16.5,-4.5
+      parent: 1
+    - type: SurveillanceCamera
+      id: Docking North
+  - uid: 1121
+    components:
+    - type: Transform
+      pos: 10.5,-0.5
+      parent: 1
+    - type: SurveillanceCamera
+      id: Medbay
+  - uid: 1122
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-14.5
+      parent: 1
+    - type: SurveillanceCamera
+      id: Armory
+  - uid: 1123
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-6.5
+      parent: 1
+    - type: SurveillanceCamera
+      id: Chemistry
+  - uid: 1124
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-2.5
+      parent: 1
+    - type: SurveillanceCamera
+      id: Bridge North
+  - uid: 1125
+    components:
+    - type: Transform
+      pos: -2.5,-12.5
+      parent: 1
+    - type: SurveillanceCamera
+      id: Bridge South
+  - uid: 1126
+    components:
+    - type: Transform
+      pos: -0.5,-0.5
+      parent: 1
+    - type: SurveillanceCamera
+      id: Engineering
+  - uid: 1127
+    components:
+    - type: Transform
+      pos: 9.5,-12.5
+      parent: 1
+    - type: SurveillanceCamera
+      id: Hallway South
+- proto: SurveillanceCameraRouterGeneral
+  entities:
+  - uid: 1128
+    components:
+    - type: Transform
+      pos: 3.5,-14.5
+      parent: 1
+- proto: Table
+  entities:
+  - uid: 1129
+    components:
+    - type: Transform
+      pos: 3.5,-9.5
+      parent: 1
+  - uid: 1130
+    components:
+    - type: Transform
+      pos: 2.5,-9.5
+      parent: 1
+  - uid: 1131
+    components:
+    - type: Transform
+      pos: 2.5,-7.5
+      parent: 1
+  - uid: 1132
+    components:
+    - type: Transform
+      pos: 2.5,-8.5
+      parent: 1
+  - uid: 1133
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 18.5,-8.5
+      parent: 1
+  - uid: 1134
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 18.5,-7.5
+      parent: 1
+  - uid: 1135
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 18.5,-6.5
+      parent: 1
+- proto: TableCounterWood
+  entities:
+  - uid: 1136
+    components:
+    - type: Transform
+      pos: 7.5,-18.5
+      parent: 1
+  - uid: 1137
+    components:
+    - type: Transform
+      pos: 7.5,-17.5
+      parent: 1
+  - uid: 1138
+    components:
+    - type: Transform
+      pos: 7.5,-16.5
+      parent: 1
+  - uid: 1139
+    components:
+    - type: Transform
+      pos: 7.5,-14.5
+      parent: 1
+  - uid: 1140
+    components:
+    - type: Transform
+      pos: 7.5,-15.5
+      parent: 1
+- proto: TableReinforced
+  entities:
+  - uid: 1141
+    components:
+    - type: Transform
+      pos: -2.5,-9.5
+      parent: 1
+  - uid: 1142
+    components:
+    - type: Transform
+      pos: -2.5,-5.5
+      parent: 1
+  - uid: 1143
+    components:
+    - type: Transform
+      pos: 0.5,-7.5
+      parent: 1
+  - uid: 1144
+    components:
+    - type: Transform
+      pos: 0.5,-6.5
+      parent: 1
+- proto: TableReinforcedGlass
+  entities:
+  - uid: 1145
+    components:
+    - type: Transform
+      pos: 11.5,-0.5
+      parent: 1
+  - uid: 1146
+    components:
+    - type: Transform
+      pos: 9.5,-0.5
+      parent: 1
+  - uid: 1147
+    components:
+    - type: Transform
+      pos: 10.5,-0.5
+      parent: 1
+  - uid: 1148
+    components:
+    - type: Transform
+      pos: 8.5,0.5
+      parent: 1
+  - uid: 1149
+    components:
+    - type: Transform
+      pos: 11.5,0.5
+      parent: 1
+  - uid: 1150
+    components:
+    - type: Transform
+      pos: 8.5,-0.5
+      parent: 1
+- proto: TableWood
+  entities:
+  - uid: 1151
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-17.5
+      parent: 1
+  - uid: 1152
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-16.5
+      parent: 1
+  - uid: 1153
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-15.5
+      parent: 1
+  - uid: 1154
+    components:
+    - type: Transform
+      pos: 11.5,-17.5
+      parent: 1
+  - uid: 1155
+    components:
+    - type: Transform
+      pos: 11.5,-15.5
+      parent: 1
+  - uid: 1156
+    components:
+    - type: Transform
+      pos: 11.5,-16.5
+      parent: 1
+- proto: Thruster
+  entities:
+  - uid: 1157
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 16.5,3.5
+      parent: 1
+  - uid: 1158
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 16.5,-18.5
+      parent: 1
+  - uid: 1159
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 16.5,-17.5
+      parent: 1
+  - uid: 1160
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 16.5,-16.5
+      parent: 1
+  - uid: 1161
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 16.5,1.5
+      parent: 1
+  - uid: 1162
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 16.5,2.5
+      parent: 1
+  - uid: 1163
+    components:
+    - type: Transform
+      pos: -2.5,4.5
+      parent: 1
+  - uid: 1164
+    components:
+    - type: Transform
+      pos: 2.5,4.5
+      parent: 1
+  - uid: 1165
+    components:
+    - type: Transform
+      pos: -0.5,4.5
+      parent: 1
+  - uid: 1166
+    components:
+    - type: Transform
+      pos: -1.5,4.5
+      parent: 1
+  - uid: 1167
+    components:
+    - type: Transform
+      pos: 0.5,4.5
+      parent: 1
+  - uid: 1168
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,1.5
+      parent: 1
+  - uid: 1169
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,0.5
+      parent: 1
+  - uid: 1170
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-0.5
+      parent: 1
+  - uid: 1171
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-1.5
+      parent: 1
+  - uid: 1172
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-13.5
+      parent: 1
+  - uid: 1173
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-14.5
+      parent: 1
+  - uid: 1174
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-15.5
+      parent: 1
+  - uid: 1175
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-16.5
+      parent: 1
+  - uid: 1176
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-19.5
+      parent: 1
+  - uid: 1177
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-19.5
+      parent: 1
+  - uid: 1178
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-19.5
+      parent: 1
+  - uid: 1179
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-19.5
+      parent: 1
+  - uid: 1180
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-19.5
+      parent: 1
+  - uid: 1181
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 17.5,-14.5
+      parent: 1
+  - uid: 1182
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 17.5,-0.5
+      parent: 1
+- proto: ToyFigurineBartender
+  entities:
+  - uid: 1183
+    components:
+    - type: Transform
+      pos: 7.521824,-14.592514
+      parent: 1
+- proto: ToyFigurineMusician
+  entities:
+  - uid: 1184
+    components:
+    - type: Transform
+      pos: 14.500176,-18.295639
+      parent: 1
+- proto: TurboItemRecharger
+  entities:
+  - uid: 1185
+    components:
+    - type: Transform
+      pos: -2.5,-5.5
+      parent: 1
+- proto: Turnstile
+  entities:
+  - uid: 1186
+    components:
+    - type: Transform
+      pos: 8.5,-10.5
+      parent: 1
+  - uid: 1187
+    components:
+    - type: Transform
+      pos: 13.5,-10.5
+      parent: 1
+- proto: TurnstileCommand
+  entities:
+  - uid: 1188
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-11.5
+      parent: 1
+  - uid: 1189
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-2.5
+      parent: 1
+  - uid: 1190
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-12.5
+      parent: 1
+  - uid: 1191
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-3.5
+      parent: 1
+- proto: Vaccinator
+  entities:
+  - uid: 1192
+    components:
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 1
+- proto: VendingMachineBooze
+  entities:
+  - uid: 1193
+    components:
+    - type: Transform
+      pos: 5.5,-14.5
+      parent: 1
+    missingComponents:
+    - AccessReader
+- proto: VendingMachineChemicals
+  entities:
+  - uid: 1194
+    components:
+    - type: Transform
+      pos: 5.5,-9.5
+      parent: 1
+    missingComponents:
+    - AccessReader
+- proto: VendingMachineTankDispenserEVA
+  entities:
+  - uid: 1195
+    components:
+    - type: Transform
+      pos: 18.5,-3.5
+      parent: 1
+  - uid: 1196
+    components:
+    - type: Transform
+      pos: 18.5,-11.5
+      parent: 1
+- proto: VendingMachineWallMedical
+  entities:
+  - uid: 1197
+    components:
+    - type: Transform
+      pos: 6.5,4.5
+      parent: 1
+    missingComponents:
+    - AccessReader
+  - uid: 1198
+    components:
+    - type: Transform
+      pos: 13.5,4.5
+      parent: 1
+    missingComponents:
+    - AccessReader
+  - uid: 1199
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,-1.5
+      parent: 1
+    missingComponents:
+    - AccessReader
+  - uid: 1200
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,-1.5
+      parent: 1
+    missingComponents:
+    - AccessReader
+- proto: WallShuttle
+  entities:
+  - uid: 1201
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-1.5
+      parent: 1
+  - uid: 1202
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,-1.5
+      parent: 1
+  - uid: 1203
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-5.5
+      parent: 1
+  - uid: 1204
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,-5.5
+      parent: 1
+  - uid: 1205
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-9.5
+      parent: 1
+  - uid: 1206
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,-9.5
+      parent: 1
+  - uid: 1207
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-13.5
+      parent: 1
+  - uid: 1208
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,-13.5
+      parent: 1
+  - uid: 1209
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-13.5
+      parent: 1
+  - uid: 1210
+    components:
+    - type: Transform
+      pos: 13.5,4.5
+      parent: 1
+  - uid: 1211
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-9.5
+      parent: 1
+  - uid: 1212
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-7.5
+      parent: 1
+  - uid: 1213
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-6.5
+      parent: 1
+  - uid: 1214
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-5.5
+      parent: 1
+  - uid: 1215
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-4.5
+      parent: 1
+  - uid: 1216
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-8.5
+      parent: 1
+  - uid: 1217
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-10.5
+      parent: 1
+  - uid: 1218
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-1.5
+      parent: 1
+  - uid: 1219
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-10.5
+      parent: 1
+  - uid: 1220
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-14.5
+      parent: 1
+  - uid: 1221
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-5.5
+      parent: 1
+  - uid: 1222
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-4.5
+      parent: 1
+  - uid: 1223
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-9.5
+      parent: 1
+  - uid: 1224
+    components:
+    - type: Transform
+      pos: 11.5,-1.5
+      parent: 1
+  - uid: 1225
+    components:
+    - type: Transform
+      pos: 9.5,-1.5
+      parent: 1
+  - uid: 1226
+    components:
+    - type: Transform
+      pos: 7.5,-1.5
+      parent: 1
+  - uid: 1227
+    components:
+    - type: Transform
+      pos: 7.5,-3.5
+      parent: 1
+  - uid: 1228
+    components:
+    - type: Transform
+      pos: 7.5,-2.5
+      parent: 1
+  - uid: 1229
+    components:
+    - type: Transform
+      pos: 7.5,-4.5
+      parent: 1
+  - uid: 1230
+    components:
+    - type: Transform
+      pos: 10.5,-1.5
+      parent: 1
+  - uid: 1231
+    components:
+    - type: Transform
+      pos: 8.5,-1.5
+      parent: 1
+  - uid: 1232
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-10.5
+      parent: 1
+  - uid: 1233
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-10.5
+      parent: 1
+  - uid: 1234
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-13.5
+      parent: 1
+  - uid: 1235
+    components:
+    - type: Transform
+      pos: 2.5,3.5
+      parent: 1
+  - uid: 1236
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-0.5
+      parent: 1
+  - uid: 1237
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-9.5
+      parent: 1
+  - uid: 1238
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-4.5
+      parent: 1
+  - uid: 1239
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-10.5
+      parent: 1
+  - uid: 1240
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-10.5
+      parent: 1
+  - uid: 1241
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-5.5
+      parent: 1
+  - uid: 1242
+    components:
+    - type: Transform
+      pos: 3.5,3.5
+      parent: 1
+  - uid: 1243
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,2.5
+      parent: 1
+  - uid: 1244
+    components:
+    - type: Transform
+      pos: 3.5,-1.5
+      parent: 1
+  - uid: 1245
+    components:
+    - type: Transform
+      pos: 4.5,-0.5
+      parent: 1
+  - uid: 1246
+    components:
+    - type: Transform
+      pos: 4.5,0.5
+      parent: 1
+  - uid: 1247
+    components:
+    - type: Transform
+      pos: 15.5,3.5
+      parent: 1
+  - uid: 1248
+    components:
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 1
+  - uid: 1249
+    components:
+    - type: Transform
+      pos: 4.5,2.5
+      parent: 1
+  - uid: 1250
+    components:
+    - type: Transform
+      pos: 5.5,-13.5
+      parent: 1
+  - uid: 1251
+    components:
+    - type: Transform
+      pos: 4.5,-1.5
+      parent: 1
+  - uid: 1252
+    components:
+    - type: Transform
+      pos: -0.5,3.5
+      parent: 1
+  - uid: 1253
+    components:
+    - type: Transform
+      pos: -1.5,3.5
+      parent: 1
+  - uid: 1254
+    components:
+    - type: Transform
+      pos: 7.5,4.5
+      parent: 1
+  - uid: 1255
+    components:
+    - type: Transform
+      pos: 1.5,3.5
+      parent: 1
+  - uid: 1256
+    components:
+    - type: Transform
+      pos: 0.5,3.5
+      parent: 1
+  - uid: 1257
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,2.5
+      parent: 1
+  - uid: 1258
+    components:
+    - type: Transform
+      pos: 4.5,3.5
+      parent: 1
+  - uid: 1259
+    components:
+    - type: Transform
+      pos: 15.5,-15.5
+      parent: 1
+  - uid: 1260
+    components:
+    - type: Transform
+      pos: 15.5,-18.5
+      parent: 1
+  - uid: 1261
+    components:
+    - type: Transform
+      pos: 8.5,-19.5
+      parent: 1
+  - uid: 1262
+    components:
+    - type: Transform
+      pos: 13.5,-19.5
+      parent: 1
+  - uid: 1263
+    components:
+    - type: Transform
+      pos: 9.5,-19.5
+      parent: 1
+  - uid: 1264
+    components:
+    - type: Transform
+      pos: 14.5,-19.5
+      parent: 1
+  - uid: 1265
+    components:
+    - type: Transform
+      pos: 11.5,-19.5
+      parent: 1
+  - uid: 1266
+    components:
+    - type: Transform
+      pos: 10.5,-19.5
+      parent: 1
+  - uid: 1267
+    components:
+    - type: Transform
+      pos: 7.5,-19.5
+      parent: 1
+  - uid: 1268
+    components:
+    - type: Transform
+      pos: 12.5,-19.5
+      parent: 1
+  - uid: 1269
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-13.5
+      parent: 1
+  - uid: 1270
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-13.5
+      parent: 1
+  - uid: 1271
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-1.5
+      parent: 1
+  - uid: 1272
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 1
+  - uid: 1273
+    components:
+    - type: Transform
+      pos: -1.5,-1.5
+      parent: 1
+  - uid: 1274
+    components:
+    - type: Transform
+      pos: -3.5,-1.5
+      parent: 1
+  - uid: 1275
+    components:
+    - type: Transform
+      pos: -4.5,-1.5
+      parent: 1
+  - uid: 1276
+    components:
+    - type: Transform
+      pos: -5.5,-1.5
+      parent: 1
+  - uid: 1277
+    components:
+    - type: Transform
+      pos: -2.5,-1.5
+      parent: 1
+  - uid: 1278
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,-3.5
+      parent: 1
+  - uid: 1279
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-6.5
+      parent: 1
+  - uid: 1280
+    components:
+    - type: Transform
+      pos: 4.5,4.5
+      parent: 1
+  - uid: 1281
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-1.5
+      parent: 1
+  - uid: 1282
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-0.5
+      parent: 1
+  - uid: 1283
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,0.5
+      parent: 1
+  - uid: 1284
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,1.5
+      parent: 1
+  - uid: 1285
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,2.5
+      parent: 1
+  - uid: 1286
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-8.5
+      parent: 1
+  - uid: 1287
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,3.5
+      parent: 1
+  - uid: 1288
+    components:
+    - type: Transform
+      pos: -6.5,-13.5
+      parent: 1
+  - uid: 1289
+    components:
+    - type: Transform
+      pos: 4.5,-19.5
+      parent: 1
+  - uid: 1290
+    components:
+    - type: Transform
+      pos: 6.5,-19.5
+      parent: 1
+  - uid: 1291
+    components:
+    - type: Transform
+      pos: 4.5,-18.5
+      parent: 1
+  - uid: 1292
+    components:
+    - type: Transform
+      pos: 5.5,-19.5
+      parent: 1
+  - uid: 1293
+    components:
+    - type: Transform
+      pos: 4.5,-17.5
+      parent: 1
+  - uid: 1294
+    components:
+    - type: Transform
+      pos: 4.5,-16.5
+      parent: 1
+  - uid: 1295
+    components:
+    - type: Transform
+      pos: 4.5,-15.5
+      parent: 1
+  - uid: 1296
+    components:
+    - type: Transform
+      pos: 4.5,-14.5
+      parent: 1
+  - uid: 1297
+    components:
+    - type: Transform
+      pos: 4.5,-13.5
+      parent: 1
+  - uid: 1298
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-18.5
+      parent: 1
+  - uid: 1299
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-18.5
+      parent: 1
+  - uid: 1300
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-18.5
+      parent: 1
+  - uid: 1301
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-18.5
+      parent: 1
+  - uid: 1302
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-18.5
+      parent: 1
+  - uid: 1303
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-18.5
+      parent: 1
+  - uid: 1304
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-18.5
+      parent: 1
+  - uid: 1305
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-17.5
+      parent: 1
+  - uid: 1306
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-17.5
+      parent: 1
+  - uid: 1307
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-17.5
+      parent: 1
+  - uid: 1308
+    components:
+    - type: Transform
+      pos: -6.5,-16.5
+      parent: 1
+  - uid: 1309
+    components:
+    - type: Transform
+      pos: -6.5,-14.5
+      parent: 1
+  - uid: 1310
+    components:
+    - type: Transform
+      pos: -6.5,-15.5
+      parent: 1
+  - uid: 1311
+    components:
+    - type: Transform
+      pos: -0.5,-13.5
+      parent: 1
+  - uid: 1312
+    components:
+    - type: Transform
+      pos: -2.5,-13.5
+      parent: 1
+  - uid: 1313
+    components:
+    - type: Transform
+      pos: -3.5,-13.5
+      parent: 1
+  - uid: 1314
+    components:
+    - type: Transform
+      pos: -4.5,-13.5
+      parent: 1
+  - uid: 1315
+    components:
+    - type: Transform
+      pos: -5.5,-13.5
+      parent: 1
+  - uid: 1316
+    components:
+    - type: Transform
+      pos: -1.5,-13.5
+      parent: 1
+  - uid: 1317
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,-2.5
+      parent: 1
+  - uid: 1318
+    components:
+    - type: Transform
+      pos: 13.5,-13.5
+      parent: 1
+  - uid: 1319
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,-10.5
+      parent: 1
+  - uid: 1320
+    components:
+    - type: Transform
+      pos: 12.5,-4.5
+      parent: 1
+  - uid: 1321
+    components:
+    - type: Transform
+      pos: 6.5,-4.5
+      parent: 1
+  - uid: 1322
+    components:
+    - type: Transform
+      pos: 12.5,-1.5
+      parent: 1
+  - uid: 1323
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 15.5,0.5
+      parent: 1
+  - uid: 1324
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,4.5
+      parent: 1
+  - uid: 1325
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,4.5
+      parent: 1
+  - uid: 1326
+    components:
+    - type: Transform
+      pos: 7.5,-13.5
+      parent: 1
+  - uid: 1327
+    components:
+    - type: Transform
+      pos: 8.5,-13.5
+      parent: 1
+  - uid: 1328
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,4.5
+      parent: 1
+  - uid: 1329
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-13.5
+      parent: 1
+  - uid: 1330
+    components:
+    - type: Transform
+      pos: 12.5,4.5
+      parent: 1
+  - uid: 1331
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-10.5
+      parent: 1
+- proto: WallShuttleDiagonal
+  entities:
+  - uid: 1332
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-10.5
+      parent: 1
+  - uid: 1333
+    components:
+    - type: Transform
+      pos: 1.5,-4.5
+      parent: 1
+  - uid: 1334
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 15.5,-19.5
+      parent: 1
+  - uid: 1335
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,2.5
+      parent: 1
+  - uid: 1336
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,4.5
+      parent: 1
+  - uid: 1337
+    components:
+    - type: Transform
+      pos: -6.5,2.5
+      parent: 1
+  - uid: 1338
+    components:
+    - type: Transform
+      pos: -3.5,3.5
+      parent: 1
+  - uid: 1339
+    components:
+    - type: Transform
+      pos: 3.5,4.5
+      parent: 1
+  - uid: 1340
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-19.5
+      parent: 1
+  - uid: 1341
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-17.5
+      parent: 1
+  - uid: 1342
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-18.5
+      parent: 1
+  - uid: 1343
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-17.5
+      parent: 1
+- proto: WarningN2
+  entities:
+  - uid: 1344
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,1.5
+      parent: 1
+- proto: WarningO2
+  entities:
+  - uid: 1345
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-0.5
+      parent: 1
+- proto: WarpPoint
+  entities:
+  - uid: 1346
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-7.5
+      parent: 1
+    - type: WarpPoint
+      location: CBURN Shuttle
+- proto: WeaponShotgunRiot
+  entities:
+  - uid: 94
+    components:
+    - type: Transform
+      parent: 87
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 95
+    components:
+    - type: Transform
+      parent: 87
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 96
+    components:
+    - type: Transform
+      parent: 87
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 104
+    components:
+    - type: Transform
+      parent: 97
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 105
+    components:
+    - type: Transform
+      parent: 97
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 106
+    components:
+    - type: Transform
+      parent: 97
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: WeaponSprayNozzle
+  entities:
+  - uid: 497
+    components:
+    - type: Transform
+      parent: 496
+    - type: Physics
+      canCollide: False
+- proto: WeaponTurretPointDefense
+  entities:
+  - uid: 1347
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,3.5
+      parent: 1
+  - uid: 1348
+    components:
+    - type: Transform
+      pos: -5.5,-18.5
+      parent: 1
+  - uid: 1349
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 16.5,4.5
+      parent: 1
+  - uid: 1350
+    components:
+    - type: Transform
+      pos: 16.5,-19.5
+      parent: 1
+- proto: WindowReinforcedDirectional
+  entities:
+  - uid: 1351
+    components:
+    - type: Transform
+      pos: 11.5,-4.5
+      parent: 1
+  - uid: 1352
+    components:
+    - type: Transform
+      pos: 8.5,-4.5
+      parent: 1
+  - uid: 1353
+    components:
+    - type: Transform
+      pos: -1.5,2.5
+      parent: 1
+  - uid: 1354
+    components:
+    - type: Transform
+      pos: -2.5,2.5
+      parent: 1
+  - uid: 1355
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,3.5
+      parent: 1
+  - uid: 1356
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,3.5
+      parent: 1
+  - uid: 1357
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,0.5
+      parent: 1
+  - uid: 1358
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,0.5
+      parent: 1
+- proto: Wrench
+  entities:
+  - uid: 486
+    components:
+    - type: Transform
+      parent: 474
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+...
diff --git a/Resources/Maps/_Starlight/Shuttles/WizardShuttle.yml b/Resources/Maps/_Starlight/Shuttles/WizardShuttle.yml
new file mode 100644
index 000000000000..6bf540f749b8
--- /dev/null
+++ b/Resources/Maps/_Starlight/Shuttles/WizardShuttle.yml
@@ -0,0 +1,5196 @@
+meta:
+  format: 7
+  category: Map
+  engineVersion: 265.0.0
+  forkId: ""
+  forkVersion: ""
+  time: 08/19/2025 20:49:28
+  entityCount: 796
+maps:
+- 1
+grids:
+- 2
+orphans: []
+nullspace: []
+tilemap:
+  0: Space
+  23: FloorCaveDrought
+  29: FloorDark
+  30: FloorDarkDiagonal
+  32: FloorDarkHerringbone
+  34: FloorDarkMono
+  35: FloorDarkOffset
+  36: FloorDarkPavement
+  37: FloorDarkPavementVertical
+  48: FloorGrassDark
+  89: FloorSteel
+  100: FloorSteelMono
+  104: FloorTechMaint
+  108: FloorWhite
+  112: FloorWhiteMini
+  118: FloorWood
+  120: Lattice
+  121: Plating
+entities:
+- proto: ""
+  entities:
+  - uid: 1
+    components:
+    - type: MetaData
+      name: Map Entity
+    - type: Transform
+    - type: Map
+      mapPaused: True
+    - type: GridTree
+    - type: Broadphase
+    - type: OccluderTree
+  - uid: 2
+    components:
+    - type: MetaData
+    - type: Transform
+      pos: 0.3842575,0.4217209
+      parent: 1
+    - type: MapGrid
+      chunks:
+        -1,-1:
+          ind: -1,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAIgAAAAACAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAHkAAAAAAABkAAAAAAMAZAAAAAADAFkAAAAAAQB5AAAAAAAAdgAAAAACAHYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAB5AAAAAAAAZAAAAAAAAGQAAAAAAgBZAAAAAAIAeQAAAAAAAHYAAAAAAwB2AAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAeQAAAAAAAFkAAAAAAwBZAAAAAAMAWQAAAAAAAHkAAAAAAAB2AAAAAAMAdgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAIgAAAAACAHkAAAAAAAB5AAAAAAAAeQAAAAAAACIAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAAgAAAAAAEAJQAAAAABACAAAAAAAAAlAAAAAAIAIAAAAAABACUAAAAAAwAgAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAHkAAAAAAAAgAAAAAAMAJAAAAAADACAAAAAAAAAkAAAAAAMAIAAAAAAAACQAAAAAAgAgAAAAAAAAIAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAHgAAAAAAAB5AAAAAAAAJQAAAAACACAAAAAAAAAlAAAAAAIAIAAAAAABACUAAAAAAQAgAAAAAAEAJQAAAAABACAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAIgAAAAADAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAiAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAIgAAAAAAACIAAAAAAAB5AAAAAAAAHQAAAAABAB0AAAAAAAB5AAAAAAAAMAAAAAABADAAAAAAAAAwAAAAAAEAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAACIAAAAAAwAiAAAAAAIAIgAAAAADAB0AAAAAAgAdAAAAAAMAeQAAAAAAADAAAAAAAQAeAAAAAAIAHgAAAAACAB4AAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAABZAAAAAAEAWQAAAAADAHkAAAAAAAAdAAAAAAAAHQAAAAADAHkAAAAAAAAwAAAAAAAAHgAAAAACAB4AAAAAAgAeAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiAAAAAAAAIgAAAAABACIAAAAAAAAiAAAAAAIAHQAAAAAAAB0AAAAAAwB5AAAAAAAAMAAAAAABAB4AAAAAAwAeAAAAAAEAHgAAAAACAA==
+          version: 7
+        0,-1:
+          ind: 0,-1
+          tiles: aAAAAAAAAGgAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHYAAAAAAAB5AAAAAAAAbAAAAAACAGwAAAAAAgBsAAAAAAIAeQAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB2AAAAAAIAeQAAAAAAAGwAAAAAAwBwAAAAAAIAbAAAAAAAAHkAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdgAAAAACAHkAAAAAAABsAAAAAAIAbAAAAAAAAGwAAAAAAAB5AAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAACIAAAAAAgB5AAAAAAAAeQAAAAAAAHkAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAlAAAAAAIAIAAAAAADACUAAAAAAgAgAAAAAAEAJQAAAAADACAAAAAAAwB5AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACQAAAAAAAAgAAAAAAAAJAAAAAABACAAAAAAAAAkAAAAAAEAIAAAAAAAAHkAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACUAAAAAAQAgAAAAAAEAJQAAAAACACAAAAAAAgAlAAAAAAIAIAAAAAACACUAAAAAAAB5AAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAACADAAAAAAAwAwAAAAAAAAeQAAAAAAABcAAAAABAAXAAAAAAYAFwAAAAAHABcAAAAAAgB5AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAQAeAAAAAAMAMAAAAAACAHkAAAAAAAAXAAAAAAMAFwAAAAADABcAAAAABgAXAAAAAAQAFwAAAAACACIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAMAHgAAAAACADAAAAAAAwB5AAAAAAAAFwAAAAAHABcAAAAABAAXAAAAAAMAFwAAAAADABcAAAAAAQB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACAB4AAAAAAgAwAAAAAAMAeQAAAAAAABcAAAAABwAXAAAAAAIAFwAAAAABABcAAAAABAAXAAAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          version: 7
+        -1,0:
+          ind: -1,0
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAIgAAAAADACIAAAAAAgB5AAAAAAAAHQAAAAABAB0AAAAAAgB5AAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAMAMAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAACIAAAAAAwB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAACIAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAB4AAAAAAAAeQAAAAAAAHYAAAAAAgB2AAAAAAMAdgAAAAADAHYAAAAAAwB2AAAAAAMAeQAAAAAAACMAAAAAAAAjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAHkAAAAAAAB2AAAAAAEAdgAAAAADAHYAAAAAAQB2AAAAAAEAdgAAAAADAHkAAAAAAAAjAAAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAeQAAAAAAAHYAAAAAAQB2AAAAAAMAdgAAAAAAAHYAAAAAAAAiAAAAAAAAIwAAAAAAACMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAHkAAAAAAAB5AAAAAAAAdgAAAAAAAHYAAAAAAQB2AAAAAAAAeQAAAAAAACMAAAAAAAAjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB2AAAAAAEAdgAAAAACAHkAAAAAAAAjAAAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAACIAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAB5AAAAAAAAIwAAAAAAACMAAAAAAAAjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAeQAAAAAAACMAAAAAAAAjAAAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAIwAAAAAAACMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAAB4AAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          version: 7
+        0,0:
+          ind: 0,0
+          tiles: MAAAAAADADAAAAAAAQAwAAAAAAMAeQAAAAAAABcAAAAABQAXAAAAAAAAFwAAAAAFABcAAAAAAAB5AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAjAAAAAAAAeQAAAAAAAHYAAAAAAAB2AAAAAAEAdgAAAAADAHYAAAAAAwB2AAAAAAMAeQAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAAHkAAAAAAAB2AAAAAAMAdgAAAAACAHYAAAAAAQB2AAAAAAMAdgAAAAACAHkAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACMAAAAAAAAiAAAAAAEAdgAAAAABAHYAAAAAAAB2AAAAAAEAdgAAAAACAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAjAAAAAAAAeQAAAAAAAHYAAAAAAQB2AAAAAAEAdgAAAAAAAHkAAAAAAAB5AAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAAHkAAAAAAAB2AAAAAAIAdgAAAAADAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAjAAAAAAAAIwAAAAAAAHkAAAAAAAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAACMAAAAAAAB5AAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACMAAAAAAAB5AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAeQAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          version: 7
+        -1,-2:
+          ind: -1,-2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAeAAAAAAAAHgAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAA==
+          version: 7
+        0,-2:
+          ind: 0,-2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4AAAAAAAAeAAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          version: 7
+    - type: Broadphase
+    - type: Physics
+      bodyStatus: InAir
+      angularDamping: 0.05
+      linearDamping: 0.05
+      fixedRotation: False
+      bodyType: Dynamic
+    - type: Fixtures
+      fixtures: {}
+    - type: OccluderTree
+    - type: Shuttle
+      dampingModifier: 0.25
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+    - type: DecalGrid
+      chunkCollection:
+        version: 2
+        nodes:
+        - node:
+            color: '#FFFFFFFF'
+            id: Bot
+          decals:
+            0: -6,-11
+            1: -5,-11
+            2: -5,-12
+            3: -6,-12
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkCornerNe
+          decals:
+            4: 1,-1
+            29: 0,6
+            30: 1,9
+            31: 0,10
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkCornerNw
+          decals:
+            5: -3,-1
+            32: -2,10
+            33: -3,9
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkCornerSe
+          decals:
+            6: 1,-3
+            36: 1,8
+            39: 0,2
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkCornerSw
+          decals:
+            7: -3,-3
+            37: -3,8
+            38: -2,2
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkInnerNe
+          decals:
+            34: 0,9
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkInnerNw
+          decals:
+            35: -2,9
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkLineE
+          decals:
+            13: 1,-2
+            26: 0,5
+            27: 0,4
+            28: 0,3
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkLineN
+          decals:
+            8: -2,-1
+            9: -1,-1
+            10: 0,-1
+            19: -1,6
+            20: -1,10
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkLineS
+          decals:
+            14: -2,-3
+            15: -1,-3
+            16: 0,-3
+            17: -1,2
+            18: -1,8
+            21: -2,8
+            22: 0,8
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkLineW
+          decals:
+            11: -3,-1
+            12: -3,-2
+            23: -2,3
+            24: -2,4
+            25: -2,5
+        - node:
+            color: '#739D6FC3'
+            id: Busha3
+          decals:
+            123: 2.1557868,-0.9164014
+            124: -4.142126,-3.8997116
+            125: -4.017002,-0.6243291
+            126: -2.8074682,0.37706184
+            127: -3.683338,-2.0012412
+            128: -0.95146155,-3.6076393
+            129: 1.5301669,-0.019321948
+        - node:
+            color: '#739D6FC3'
+            id: Bushb3
+          decals:
+            118: -3.933586,-2.8148713
+            119: -1.9941614,-3.8162622
+            120: 0.13294822,-3.7953997
+            121: 0.696007,0.001540184
+            122: -1.6604974,-0.22794488
+        - node:
+            color: '#739D6FC3'
+            id: Bushc3
+          decals:
+            114: 2.0098097,-2.042966
+            115: -0.86804557,0.08498955
+            116: -3.683338,-0.019321948
+            117: -4.017002,-0.9164014
+        - node:
+            color: '#739D6FC3'
+            id: Bushf1
+          decals:
+            100: -3.725046,-3.8997116
+            101: 1.2799189,-3.9414358
+            102: -0.09644675,0.10585165
+            103: -2.5780752,-0.08190873
+            104: -2.0358694,-4.024885
+            105: 1.9681017,-2.8983202
+            113: -2.4946592,-4.191784
+        - node:
+            color: '#739D6FC3'
+            id: Bushf2
+          decals:
+            106: -3.933586,-1.6465821
+            107: 2.0306628,-0.18622068
+            108: 2.0098097,-2.856596
+            109: 1.9681017,-4.0666094
+            110: 0.11209321,-4.0040226
+            111: -2.2027032,0.022402763
+            112: -1.3893964,-3.98316
+        - node:
+            color: '#73CA6FC3'
+            id: Flowersbr3
+          decals:
+            133: 1.1130869,-4.1500587
+        - node:
+            color: '#73CA6FC3'
+            id: Flowerspv2
+          decals:
+            134: -2.9325922,-3.9414358
+            135: -2.1818483,0.043264866
+        - node:
+            color: '#73CA6FC3'
+            id: Flowersy1
+          decals:
+            131: -4.05871,-0.29053214
+            132: 2.0515177,-1.3127851
+            136: 0.34148818,-0.10277131
+            137: 2.1557868,-3.3364286
+        - node:
+            color: '#73CA6FC3'
+            id: Flowersy3
+          decals:
+            130: -3.9752939,-2.543661
+        - node:
+            color: '#0E7F1B67'
+            id: Grassa5
+          decals:
+            86: -3.579067,-4.024885
+            87: -4.204688,-2.522799
+        - node:
+            color: '#0E7F1BC3'
+            id: Grassa5
+          decals:
+            96: -3.01601,-4.1500587
+            97: 0.09124017,-0.144496
+            98: -4.142126,-0.24880746
+            99: 0.9254,-4.2126455
+        - node:
+            color: '#0E7F1BC3'
+            id: Grassb2
+          decals:
+            88: -3.9127328,-1.3545098
+            89: -3.036863,-0.144496
+            90: 0.779423,0.064127445
+        - node:
+            color: '#0E7F1BC3'
+            id: Grassb3
+          decals:
+            91: 1.8846858,-1.6883063
+            92: 1.6969988,-3.8579865
+            93: -0.30498672,-4.1083345
+            94: -4.079564,-2.4602118
+            95: -1.3685415,-0.019321948
+        - node:
+            angle: 4.71238898038469 rad
+            color: '#FFFFFFFF'
+            id: LoadingArea
+          decals:
+            79: -10,-1
+            80: -10,-3
+        - node:
+            color: '#FFFFFFFF'
+            id: MiniTileWhiteInnerNe
+          decals:
+            46: 2,-12
+        - node:
+            color: '#FFFFFFFF'
+            id: MiniTileWhiteInnerNw
+          decals:
+            47: 4,-12
+        - node:
+            color: '#FFFFFFFF'
+            id: MiniTileWhiteInnerSe
+          decals:
+            45: 2,-10
+        - node:
+            color: '#FFFFFFFF'
+            id: MiniTileWhiteInnerSw
+          decals:
+            44: 4,-10
+        - node:
+            color: '#FFFFFFFF'
+            id: MiniTileWhiteLineE
+          decals:
+            40: 2,-11
+        - node:
+            color: '#FFFFFFFF'
+            id: MiniTileWhiteLineN
+          decals:
+            41: 3,-12
+        - node:
+            color: '#FFFFFFFF'
+            id: MiniTileWhiteLineS
+          decals:
+            43: 3,-10
+        - node:
+            color: '#FFFFFFFF'
+            id: MiniTileWhiteLineW
+          decals:
+            42: 4,-11
+        - node:
+            color: '#FFFFFFFF'
+            id: Rock01
+          decals:
+            82: 7.413066,-1.4588213
+        - node:
+            color: '#FFFFFFFF'
+            id: Rock02
+          decals:
+            83: 5.7864523,-3.1695304
+            85: 1.6761458,-0.18622068
+        - node:
+            color: '#FFFFFFFF'
+            id: Rock03
+          decals:
+            84: -3.891878,-3.628501
+        - node:
+            color: '#FFFFFFFF'
+            id: Rock04
+          decals:
+            81: 4.8271685,-0.9789882
+        - node:
+            color: '#FFFFFFFF'
+            id: Rock06
+          decals:
+            78: 5.2864194,-2.8357334
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineE
+          decals:
+            49: 1,-15
+            50: 1,-14
+            74: -9,-3
+            75: -9,-1
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineN
+          decals:
+            48: -4,-12
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineS
+          decals:
+            72: -7,-3
+            73: -7,-1
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineW
+          decals:
+            145: -5,-10
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerSe
+          decals:
+            58: -4,2
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerSw
+          decals:
+            67: 2,2
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineE
+          decals:
+            59: -4,3
+            60: -4,4
+            61: -4,5
+            62: -4,6
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineN
+          decals:
+            51: -2,-10
+            52: -1,-10
+            53: 0,-10
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineS
+          decals:
+            54: -8,2
+            55: -7,2
+            56: -6,2
+            57: -5,2
+            68: 3,2
+            69: 4,2
+            70: 5,2
+            71: 6,2
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineW
+          decals:
+            63: 2,6
+            64: 2,5
+            65: 2,4
+            66: 2,3
+        - node:
+            color: '#175C138B'
+            id: grasssnowc1
+          decals:
+            138: -4.017002,-2.4810743
+            139: -4.142126,0.2518878
+            140: -3.933586,-0.3948436
+            141: 2.1140788,-1.3127851
+            142: 1.9472468,-3.3781538
+            143: 0.904547,-4.087472
+            144: 0.2997802,0.001540184
+    - type: GridAtmosphere
+      version: 2
+      data:
+        tiles:
+          -1,-1:
+            0: 65535
+          0,-1:
+            0: 65535
+          -1,0:
+            0: 65535
+          -3,-2:
+            0: 61128
+          -3,-1:
+            0: 61166
+          -3,-3:
+            0: 32768
+          -2,-3:
+            0: 65535
+          -2,-2:
+            0: 65535
+          -2,-1:
+            0: 65535
+          -2,-4:
+            0: 61164
+          -1,-4:
+            0: 65535
+          -1,-3:
+            0: 65535
+          -1,-2:
+            0: 65535
+          0,-4:
+            0: 62271
+            1: 192
+            2: 3072
+          0,-3:
+            0: 65535
+          0,-2:
+            0: 65535
+          1,-4:
+            0: 13105
+          1,-3:
+            0: 63351
+          1,-2:
+            0: 65535
+          1,-1:
+            0: 65535
+          2,-2:
+            0: 12560
+          2,-1:
+            0: 13107
+          -3,0:
+            0: 52974
+          -3,1:
+            0: 136
+          -2,0:
+            0: 65535
+          -2,1:
+            0: 52991
+          -2,2:
+            0: 136
+          -1,1:
+            0: 65535
+          -1,2:
+            0: 65535
+          -1,3:
+            0: 14
+          0,0:
+            0: 65535
+          0,1:
+            0: 65535
+          0,2:
+            0: 30719
+          0,3:
+            0: 3
+          1,0:
+            0: 65535
+          1,1:
+            0: 5119
+          2,0:
+            0: 4403
+          -2,-5:
+            0: 32768
+          -1,-5:
+            0: 65280
+          0,-5:
+            0: 63232
+        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
+    - type: SpreaderGrid
+    - type: GridPathfinding
+    - type: ImplicitRoof
+- proto: AirlockExternalGlass
+  entities:
+  - uid: 3
+    components:
+    - type: Transform
+      pos: -7.5,-0.5
+      parent: 2
+  - uid: 4
+    components:
+    - type: Transform
+      pos: -7.5,-2.5
+      parent: 2
+- proto: AirlockGlassShuttle
+  entities:
+  - uid: 5
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-0.5
+      parent: 2
+  - uid: 6
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-2.5
+      parent: 2
+- proto: APCBasic
+  entities:
+  - uid: 7
+    components:
+    - type: Transform
+      pos: -1.5,-12.5
+      parent: 2
+  - uid: 8
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,5.5
+      parent: 2
+- proto: AtmosDeviceFanDirectional
+  entities:
+  - uid: 9
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-2.5
+      parent: 2
+  - uid: 10
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-0.5
+      parent: 2
+- proto: AtmosFixNitrogenMarker
+  entities:
+  - uid: 11
+    components:
+    - type: Transform
+      pos: 2.5,-13.5
+      parent: 2
+  - uid: 12
+    components:
+    - type: Transform
+      pos: 3.5,-13.5
+      parent: 2
+- proto: AtmosFixOxygenMarker
+  entities:
+  - uid: 13
+    components:
+    - type: Transform
+      pos: 2.5,-14.5
+      parent: 2
+  - uid: 14
+    components:
+    - type: Transform
+      pos: 3.5,-14.5
+      parent: 2
+- proto: Bed
+  entities:
+  - uid: 15
+    components:
+    - type: Transform
+      pos: -1.5,-11.5
+      parent: 2
+- proto: BedsheetWiz
+  entities:
+  - uid: 16
+    components:
+    - type: Transform
+      pos: -1.5,-11.5
+      parent: 2
+- proto: BookRandom
+  entities:
+  - uid: 17
+    components:
+    - type: Transform
+      pos: -7.387626,2.56149
+      parent: 2
+  - uid: 18
+    components:
+    - type: Transform
+      pos: -7.700435,2.7283878
+      parent: 2
+- proto: BookRandomStory
+  entities:
+  - uid: 19
+    components:
+    - type: Transform
+      pos: 3.5160534,-11.342207
+      parent: 2
+- proto: BooksBag
+  entities:
+  - uid: 20
+    components:
+    - type: Transform
+      pos: -4.509771,6.4627414
+      parent: 2
+- proto: Bookshelf
+  entities:
+  - uid: 21
+    components:
+    - type: Transform
+      pos: 2.5,-11.5
+      parent: 2
+  - uid: 22
+    components:
+    - type: Transform
+      pos: 4.5,-9.5
+      parent: 2
+  - uid: 23
+    components:
+    - type: Transform
+      pos: -5.5,5.5
+      parent: 2
+  - uid: 24
+    components:
+    - type: Transform
+      pos: -6.5,4.5
+      parent: 2
+  - uid: 25
+    components:
+    - type: Transform
+      pos: 2.5,2.5
+      parent: 2
+- proto: BoxFolderBase
+  entities:
+  - uid: 26
+    components:
+    - type: Transform
+      pos: -3.3141003,2.4580417
+      parent: 2
+  - uid: 27
+    components:
+    - type: Transform
+      pos: -3.3558083,2.7709756
+      parent: 2
+  - uid: 28
+    components:
+    - type: Transform
+      pos: -3.6477642,2.6040778
+      parent: 2
+- proto: CableApcExtension
+  entities:
+  - uid: 29
+    components:
+    - type: Transform
+      pos: -1.5,-12.5
+      parent: 2
+  - uid: 30
+    components:
+    - type: Transform
+      pos: -1.5,-11.5
+      parent: 2
+  - uid: 31
+    components:
+    - type: Transform
+      pos: -1.5,-10.5
+      parent: 2
+  - uid: 32
+    components:
+    - type: Transform
+      pos: -1.5,-9.5
+      parent: 2
+  - uid: 33
+    components:
+    - type: Transform
+      pos: -0.5,-9.5
+      parent: 2
+  - uid: 34
+    components:
+    - type: Transform
+      pos: -0.5,-8.5
+      parent: 2
+  - uid: 35
+    components:
+    - type: Transform
+      pos: -0.5,-7.5
+      parent: 2
+  - uid: 36
+    components:
+    - type: Transform
+      pos: -0.5,-6.5
+      parent: 2
+  - uid: 37
+    components:
+    - type: Transform
+      pos: -0.5,-5.5
+      parent: 2
+  - uid: 38
+    components:
+    - type: Transform
+      pos: 0.5,-5.5
+      parent: 2
+  - uid: 39
+    components:
+    - type: Transform
+      pos: 1.5,-5.5
+      parent: 2
+  - uid: 40
+    components:
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 2
+  - uid: 41
+    components:
+    - type: Transform
+      pos: 3.5,-5.5
+      parent: 2
+  - uid: 42
+    components:
+    - type: Transform
+      pos: 4.5,-5.5
+      parent: 2
+  - uid: 43
+    components:
+    - type: Transform
+      pos: 5.5,-5.5
+      parent: 2
+  - uid: 44
+    components:
+    - type: Transform
+      pos: 6.5,-5.5
+      parent: 2
+  - uid: 45
+    components:
+    - type: Transform
+      pos: 4.5,-4.5
+      parent: 2
+  - uid: 46
+    components:
+    - type: Transform
+      pos: 5.5,-4.5
+      parent: 2
+  - uid: 47
+    components:
+    - type: Transform
+      pos: 6.5,-4.5
+      parent: 2
+  - uid: 48
+    components:
+    - type: Transform
+      pos: 7.5,-5.5
+      parent: 2
+  - uid: 49
+    components:
+    - type: Transform
+      pos: 7.5,-6.5
+      parent: 2
+  - uid: 50
+    components:
+    - type: Transform
+      pos: 7.5,-4.5
+      parent: 2
+  - uid: 51
+    components:
+    - type: Transform
+      pos: 8.5,-4.5
+      parent: 2
+  - uid: 52
+    components:
+    - type: Transform
+      pos: 8.5,-3.5
+      parent: 2
+  - uid: 53
+    components:
+    - type: Transform
+      pos: 9.5,-3.5
+      parent: 2
+  - uid: 54
+    components:
+    - type: Transform
+      pos: 9.5,-2.5
+      parent: 2
+  - uid: 55
+    components:
+    - type: Transform
+      pos: 9.5,-1.5
+      parent: 2
+  - uid: 56
+    components:
+    - type: Transform
+      pos: 9.5,-0.5
+      parent: 2
+  - uid: 57
+    components:
+    - type: Transform
+      pos: -1.5,-5.5
+      parent: 2
+  - uid: 58
+    components:
+    - type: Transform
+      pos: -2.5,-5.5
+      parent: 2
+  - uid: 59
+    components:
+    - type: Transform
+      pos: -3.5,-5.5
+      parent: 2
+  - uid: 60
+    components:
+    - type: Transform
+      pos: -4.5,-5.5
+      parent: 2
+  - uid: 61
+    components:
+    - type: Transform
+      pos: -5.5,-5.5
+      parent: 2
+  - uid: 62
+    components:
+    - type: Transform
+      pos: -6.5,-5.5
+      parent: 2
+  - uid: 63
+    components:
+    - type: Transform
+      pos: -7.5,-5.5
+      parent: 2
+  - uid: 64
+    components:
+    - type: Transform
+      pos: -8.5,-5.5
+      parent: 2
+  - uid: 65
+    components:
+    - type: Transform
+      pos: -8.5,-6.5
+      parent: 2
+  - uid: 66
+    components:
+    - type: Transform
+      pos: -4.5,-6.5
+      parent: 2
+  - uid: 67
+    components:
+    - type: Transform
+      pos: -4.5,-7.5
+      parent: 2
+  - uid: 68
+    components:
+    - type: Transform
+      pos: -4.5,-8.5
+      parent: 2
+  - uid: 69
+    components:
+    - type: Transform
+      pos: -4.5,-9.5
+      parent: 2
+  - uid: 70
+    components:
+    - type: Transform
+      pos: -3.5,-9.5
+      parent: 2
+  - uid: 71
+    components:
+    - type: Transform
+      pos: -3.5,-10.5
+      parent: 2
+  - uid: 72
+    components:
+    - type: Transform
+      pos: -3.5,-11.5
+      parent: 2
+  - uid: 73
+    components:
+    - type: Transform
+      pos: -4.5,-11.5
+      parent: 2
+  - uid: 74
+    components:
+    - type: Transform
+      pos: -5.5,-11.5
+      parent: 2
+  - uid: 75
+    components:
+    - type: Transform
+      pos: -6.5,-11.5
+      parent: 2
+  - uid: 76
+    components:
+    - type: Transform
+      pos: -3.5,-12.5
+      parent: 2
+  - uid: 77
+    components:
+    - type: Transform
+      pos: -3.5,-13.5
+      parent: 2
+  - uid: 78
+    components:
+    - type: Transform
+      pos: -3.5,-14.5
+      parent: 2
+  - uid: 79
+    components:
+    - type: Transform
+      pos: -2.5,-14.5
+      parent: 2
+  - uid: 80
+    components:
+    - type: Transform
+      pos: -1.5,-14.5
+      parent: 2
+  - uid: 81
+    components:
+    - type: Transform
+      pos: -1.5,-13.5
+      parent: 2
+  - uid: 82
+    components:
+    - type: Transform
+      pos: -0.5,-14.5
+      parent: 2
+  - uid: 83
+    components:
+    - type: Transform
+      pos: 0.5,-14.5
+      parent: 2
+  - uid: 84
+    components:
+    - type: Transform
+      pos: 1.5,-14.5
+      parent: 2
+  - uid: 85
+    components:
+    - type: Transform
+      pos: 2.5,-14.5
+      parent: 2
+  - uid: 86
+    components:
+    - type: Transform
+      pos: 3.5,-14.5
+      parent: 2
+  - uid: 87
+    components:
+    - type: Transform
+      pos: 4.5,-14.5
+      parent: 2
+  - uid: 88
+    components:
+    - type: Transform
+      pos: 4.5,-13.5
+      parent: 2
+  - uid: 89
+    components:
+    - type: Transform
+      pos: -1.5,-15.5
+      parent: 2
+  - uid: 90
+    components:
+    - type: Transform
+      pos: -1.5,-16.5
+      parent: 2
+  - uid: 91
+    components:
+    - type: Transform
+      pos: -2.5,-16.5
+      parent: 2
+  - uid: 92
+    components:
+    - type: Transform
+      pos: 0.5,-15.5
+      parent: 2
+  - uid: 93
+    components:
+    - type: Transform
+      pos: 0.5,-16.5
+      parent: 2
+  - uid: 94
+    components:
+    - type: Transform
+      pos: 1.5,-16.5
+      parent: 2
+  - uid: 95
+    components:
+    - type: Transform
+      pos: 3.5,-6.5
+      parent: 2
+  - uid: 96
+    components:
+    - type: Transform
+      pos: 3.5,-7.5
+      parent: 2
+  - uid: 97
+    components:
+    - type: Transform
+      pos: 3.5,-8.5
+      parent: 2
+  - uid: 98
+    components:
+    - type: Transform
+      pos: 3.5,-9.5
+      parent: 2
+  - uid: 99
+    components:
+    - type: Transform
+      pos: 3.5,-10.5
+      parent: 2
+  - uid: 100
+    components:
+    - type: Transform
+      pos: 3.5,-11.5
+      parent: 2
+  - uid: 101
+    components:
+    - type: Transform
+      pos: 4.5,-11.5
+      parent: 2
+  - uid: 102
+    components:
+    - type: Transform
+      pos: 5.5,-11.5
+      parent: 2
+  - uid: 103
+    components:
+    - type: Transform
+      pos: 5.5,-10.5
+      parent: 2
+  - uid: 104
+    components:
+    - type: Transform
+      pos: -2.5,5.5
+      parent: 2
+  - uid: 105
+    components:
+    - type: Transform
+      pos: -1.5,5.5
+      parent: 2
+  - uid: 106
+    components:
+    - type: Transform
+      pos: -0.5,5.5
+      parent: 2
+  - uid: 107
+    components:
+    - type: Transform
+      pos: -0.5,6.5
+      parent: 2
+  - uid: 108
+    components:
+    - type: Transform
+      pos: -0.5,7.5
+      parent: 2
+  - uid: 109
+    components:
+    - type: Transform
+      pos: -0.5,8.5
+      parent: 2
+  - uid: 110
+    components:
+    - type: Transform
+      pos: -0.5,9.5
+      parent: 2
+  - uid: 111
+    components:
+    - type: Transform
+      pos: -0.5,10.5
+      parent: 2
+  - uid: 112
+    components:
+    - type: Transform
+      pos: -0.5,11.5
+      parent: 2
+  - uid: 113
+    components:
+    - type: Transform
+      pos: -1.5,11.5
+      parent: 2
+  - uid: 114
+    components:
+    - type: Transform
+      pos: 0.5,11.5
+      parent: 2
+  - uid: 115
+    components:
+    - type: Transform
+      pos: -1.5,8.5
+      parent: 2
+  - uid: 116
+    components:
+    - type: Transform
+      pos: -2.5,8.5
+      parent: 2
+  - uid: 117
+    components:
+    - type: Transform
+      pos: -3.5,8.5
+      parent: 2
+  - uid: 118
+    components:
+    - type: Transform
+      pos: -3.5,9.5
+      parent: 2
+  - uid: 119
+    components:
+    - type: Transform
+      pos: 0.5,8.5
+      parent: 2
+  - uid: 120
+    components:
+    - type: Transform
+      pos: 1.5,8.5
+      parent: 2
+  - uid: 121
+    components:
+    - type: Transform
+      pos: 2.5,8.5
+      parent: 2
+  - uid: 122
+    components:
+    - type: Transform
+      pos: 2.5,9.5
+      parent: 2
+  - uid: 123
+    components:
+    - type: Transform
+      pos: -0.5,4.5
+      parent: 2
+  - uid: 124
+    components:
+    - type: Transform
+      pos: -0.5,3.5
+      parent: 2
+  - uid: 125
+    components:
+    - type: Transform
+      pos: -0.5,2.5
+      parent: 2
+  - uid: 126
+    components:
+    - type: Transform
+      pos: -0.5,1.5
+      parent: 2
+  - uid: 127
+    components:
+    - type: Transform
+      pos: -2.5,5.5
+      parent: 2
+  - uid: 128
+    components:
+    - type: Transform
+      pos: -3.5,5.5
+      parent: 2
+  - uid: 129
+    components:
+    - type: Transform
+      pos: -4.5,5.5
+      parent: 2
+  - uid: 130
+    components:
+    - type: Transform
+      pos: -5.5,5.5
+      parent: 2
+  - uid: 131
+    components:
+    - type: Transform
+      pos: -5.5,4.5
+      parent: 2
+  - uid: 132
+    components:
+    - type: Transform
+      pos: -6.5,4.5
+      parent: 2
+  - uid: 133
+    components:
+    - type: Transform
+      pos: -6.5,3.5
+      parent: 2
+  - uid: 134
+    components:
+    - type: Transform
+      pos: -6.5,2.5
+      parent: 2
+  - uid: 135
+    components:
+    - type: Transform
+      pos: -6.5,1.5
+      parent: 2
+  - uid: 136
+    components:
+    - type: Transform
+      pos: -6.5,0.5
+      parent: 2
+  - uid: 137
+    components:
+    - type: Transform
+      pos: -7.5,0.5
+      parent: 2
+  - uid: 138
+    components:
+    - type: Transform
+      pos: -8.5,0.5
+      parent: 2
+  - uid: 139
+    components:
+    - type: Transform
+      pos: -9.5,0.5
+      parent: 2
+  - uid: 140
+    components:
+    - type: Transform
+      pos: -6.5,-0.5
+      parent: 2
+  - uid: 141
+    components:
+    - type: Transform
+      pos: -6.5,-1.5
+      parent: 2
+  - uid: 142
+    components:
+    - type: Transform
+      pos: -6.5,-2.5
+      parent: 2
+  - uid: 143
+    components:
+    - type: Transform
+      pos: -6.5,-3.5
+      parent: 2
+  - uid: 144
+    components:
+    - type: Transform
+      pos: -7.5,-3.5
+      parent: 2
+  - uid: 145
+    components:
+    - type: Transform
+      pos: -8.5,-3.5
+      parent: 2
+  - uid: 146
+    components:
+    - type: Transform
+      pos: -9.5,-3.5
+      parent: 2
+  - uid: 147
+    components:
+    - type: Transform
+      pos: 0.5,4.5
+      parent: 2
+  - uid: 148
+    components:
+    - type: Transform
+      pos: 1.5,4.5
+      parent: 2
+  - uid: 149
+    components:
+    - type: Transform
+      pos: 2.5,4.5
+      parent: 2
+  - uid: 150
+    components:
+    - type: Transform
+      pos: 3.5,4.5
+      parent: 2
+  - uid: 151
+    components:
+    - type: Transform
+      pos: 4.5,4.5
+      parent: 2
+  - uid: 152
+    components:
+    - type: Transform
+      pos: 4.5,3.5
+      parent: 2
+  - uid: 153
+    components:
+    - type: Transform
+      pos: 4.5,2.5
+      parent: 2
+  - uid: 154
+    components:
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 2
+  - uid: 155
+    components:
+    - type: Transform
+      pos: 6.5,1.5
+      parent: 2
+  - uid: 156
+    components:
+    - type: Transform
+      pos: 5.5,1.5
+      parent: 2
+  - uid: 157
+    components:
+    - type: Transform
+      pos: 7.5,1.5
+      parent: 2
+  - uid: 158
+    components:
+    - type: Transform
+      pos: 5.5,4.5
+      parent: 2
+- proto: CableHV
+  entities:
+  - uid: 159
+    components:
+    - type: Transform
+      pos: 1.5,-15.5
+      parent: 2
+  - uid: 160
+    components:
+    - type: Transform
+      pos: 0.5,-15.5
+      parent: 2
+  - uid: 161
+    components:
+    - type: Transform
+      pos: -0.5,-15.5
+      parent: 2
+  - uid: 162
+    components:
+    - type: Transform
+      pos: -1.5,-15.5
+      parent: 2
+- proto: CableMV
+  entities:
+  - uid: 163
+    components:
+    - type: Transform
+      pos: -1.5,-15.5
+      parent: 2
+  - uid: 164
+    components:
+    - type: Transform
+      pos: -1.5,-14.5
+      parent: 2
+  - uid: 165
+    components:
+    - type: Transform
+      pos: -2.5,-14.5
+      parent: 2
+  - uid: 166
+    components:
+    - type: Transform
+      pos: -3.5,-14.5
+      parent: 2
+  - uid: 167
+    components:
+    - type: Transform
+      pos: -3.5,-13.5
+      parent: 2
+  - uid: 168
+    components:
+    - type: Transform
+      pos: -3.5,-12.5
+      parent: 2
+  - uid: 169
+    components:
+    - type: Transform
+      pos: -3.5,-11.5
+      parent: 2
+  - uid: 170
+    components:
+    - type: Transform
+      pos: -3.5,-10.5
+      parent: 2
+  - uid: 171
+    components:
+    - type: Transform
+      pos: -3.5,-9.5
+      parent: 2
+  - uid: 172
+    components:
+    - type: Transform
+      pos: -4.5,-13.5
+      parent: 2
+  - uid: 173
+    components:
+    - type: Transform
+      pos: -5.5,-13.5
+      parent: 2
+  - uid: 174
+    components:
+    - type: Transform
+      pos: -5.5,-14.5
+      parent: 2
+  - uid: 175
+    components:
+    - type: Transform
+      pos: -4.5,-11.5
+      parent: 2
+  - uid: 176
+    components:
+    - type: Transform
+      pos: -5.5,-11.5
+      parent: 2
+  - uid: 177
+    components:
+    - type: Transform
+      pos: -6.5,-11.5
+      parent: 2
+  - uid: 178
+    components:
+    - type: Transform
+      pos: -6.5,-10.5
+      parent: 2
+  - uid: 179
+    components:
+    - type: Transform
+      pos: -0.5,-14.5
+      parent: 2
+  - uid: 180
+    components:
+    - type: Transform
+      pos: 0.5,-14.5
+      parent: 2
+  - uid: 181
+    components:
+    - type: Transform
+      pos: 1.5,-14.5
+      parent: 2
+  - uid: 182
+    components:
+    - type: Transform
+      pos: 2.5,-14.5
+      parent: 2
+  - uid: 183
+    components:
+    - type: Transform
+      pos: 3.5,-14.5
+      parent: 2
+  - uid: 184
+    components:
+    - type: Transform
+      pos: 4.5,-14.5
+      parent: 2
+  - uid: 185
+    components:
+    - type: Transform
+      pos: 4.5,-13.5
+      parent: 2
+  - uid: 186
+    components:
+    - type: Transform
+      pos: 4.5,-12.5
+      parent: 2
+  - uid: 187
+    components:
+    - type: Transform
+      pos: 5.5,-12.5
+      parent: 2
+  - uid: 188
+    components:
+    - type: Transform
+      pos: 5.5,-11.5
+      parent: 2
+  - uid: 189
+    components:
+    - type: Transform
+      pos: 5.5,-10.5
+      parent: 2
+  - uid: 190
+    components:
+    - type: Transform
+      pos: -4.5,-9.5
+      parent: 2
+  - uid: 191
+    components:
+    - type: Transform
+      pos: -4.5,-8.5
+      parent: 2
+  - uid: 192
+    components:
+    - type: Transform
+      pos: -4.5,-7.5
+      parent: 2
+  - uid: 193
+    components:
+    - type: Transform
+      pos: -4.5,-6.5
+      parent: 2
+  - uid: 194
+    components:
+    - type: Transform
+      pos: -4.5,-5.5
+      parent: 2
+  - uid: 195
+    components:
+    - type: Transform
+      pos: -5.5,-5.5
+      parent: 2
+  - uid: 196
+    components:
+    - type: Transform
+      pos: -5.5,-4.5
+      parent: 2
+  - uid: 197
+    components:
+    - type: Transform
+      pos: -5.5,-3.5
+      parent: 2
+  - uid: 198
+    components:
+    - type: Transform
+      pos: -5.5,-2.5
+      parent: 2
+  - uid: 199
+    components:
+    - type: Transform
+      pos: -5.5,-1.5
+      parent: 2
+  - uid: 200
+    components:
+    - type: Transform
+      pos: -5.5,-0.5
+      parent: 2
+  - uid: 201
+    components:
+    - type: Transform
+      pos: -5.5,0.5
+      parent: 2
+  - uid: 202
+    components:
+    - type: Transform
+      pos: -6.5,0.5
+      parent: 2
+  - uid: 203
+    components:
+    - type: Transform
+      pos: -6.5,1.5
+      parent: 2
+  - uid: 204
+    components:
+    - type: Transform
+      pos: -6.5,2.5
+      parent: 2
+  - uid: 205
+    components:
+    - type: Transform
+      pos: -6.5,3.5
+      parent: 2
+  - uid: 206
+    components:
+    - type: Transform
+      pos: -6.5,4.5
+      parent: 2
+  - uid: 207
+    components:
+    - type: Transform
+      pos: -5.5,4.5
+      parent: 2
+  - uid: 208
+    components:
+    - type: Transform
+      pos: -4.5,4.5
+      parent: 2
+  - uid: 209
+    components:
+    - type: Transform
+      pos: -3.5,4.5
+      parent: 2
+  - uid: 210
+    components:
+    - type: Transform
+      pos: -2.5,4.5
+      parent: 2
+  - uid: 211
+    components:
+    - type: Transform
+      pos: -1.5,4.5
+      parent: 2
+  - uid: 212
+    components:
+    - type: Transform
+      pos: -0.5,4.5
+      parent: 2
+  - uid: 213
+    components:
+    - type: Transform
+      pos: 0.5,4.5
+      parent: 2
+  - uid: 214
+    components:
+    - type: Transform
+      pos: 1.5,4.5
+      parent: 2
+  - uid: 215
+    components:
+    - type: Transform
+      pos: 2.5,4.5
+      parent: 2
+  - uid: 216
+    components:
+    - type: Transform
+      pos: 3.5,4.5
+      parent: 2
+  - uid: 217
+    components:
+    - type: Transform
+      pos: 4.5,4.5
+      parent: 2
+  - uid: 218
+    components:
+    - type: Transform
+      pos: 4.5,3.5
+      parent: 2
+  - uid: 219
+    components:
+    - type: Transform
+      pos: 4.5,2.5
+      parent: 2
+  - uid: 220
+    components:
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 2
+  - uid: 221
+    components:
+    - type: Transform
+      pos: 5.5,1.5
+      parent: 2
+  - uid: 222
+    components:
+    - type: Transform
+      pos: 6.5,1.5
+      parent: 2
+  - uid: 223
+    components:
+    - type: Transform
+      pos: -3.5,-7.5
+      parent: 2
+  - uid: 224
+    components:
+    - type: Transform
+      pos: -2.5,-7.5
+      parent: 2
+  - uid: 225
+    components:
+    - type: Transform
+      pos: -1.5,-7.5
+      parent: 2
+  - uid: 226
+    components:
+    - type: Transform
+      pos: -0.5,-7.5
+      parent: 2
+  - uid: 227
+    components:
+    - type: Transform
+      pos: 0.5,-7.5
+      parent: 2
+  - uid: 228
+    components:
+    - type: Transform
+      pos: 1.5,-7.5
+      parent: 2
+  - uid: 229
+    components:
+    - type: Transform
+      pos: -1.5,-13.5
+      parent: 2
+  - uid: 230
+    components:
+    - type: Transform
+      pos: -1.5,-12.5
+      parent: 2
+  - uid: 231
+    components:
+    - type: Transform
+      pos: -2.5,5.5
+      parent: 2
+- proto: CableTerminal
+  entities:
+  - uid: 232
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-15.5
+      parent: 2
+- proto: CarpetPurple
+  entities:
+  - uid: 233
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-11.5
+      parent: 2
+  - uid: 234
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-10.5
+      parent: 2
+  - uid: 235
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-11.5
+      parent: 2
+  - uid: 236
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-10.5
+      parent: 2
+  - uid: 237
+    components:
+    - type: Transform
+      pos: 3.5,3.5
+      parent: 2
+  - uid: 238
+    components:
+    - type: Transform
+      pos: 3.5,4.5
+      parent: 2
+  - uid: 239
+    components:
+    - type: Transform
+      pos: 4.5,3.5
+      parent: 2
+  - uid: 240
+    components:
+    - type: Transform
+      pos: 4.5,4.5
+      parent: 2
+  - uid: 241
+    components:
+    - type: Transform
+      pos: 5.5,3.5
+      parent: 2
+  - uid: 242
+    components:
+    - type: Transform
+      pos: 5.5,4.5
+      parent: 2
+  - uid: 243
+    components:
+    - type: Transform
+      pos: 3.5,5.5
+      parent: 2
+  - uid: 244
+    components:
+    - type: Transform
+      pos: 4.5,5.5
+      parent: 2
+  - uid: 245
+    components:
+    - type: Transform
+      pos: -3.5,3.5
+      parent: 2
+  - uid: 246
+    components:
+    - type: Transform
+      pos: -3.5,2.5
+      parent: 2
+  - uid: 247
+    components:
+    - type: Transform
+      pos: -4.5,3.5
+      parent: 2
+  - uid: 248
+    components:
+    - type: Transform
+      pos: -4.5,2.5
+      parent: 2
+  - uid: 249
+    components:
+    - type: Transform
+      pos: -4.5,5.5
+      parent: 2
+  - uid: 250
+    components:
+    - type: Transform
+      pos: -4.5,6.5
+      parent: 2
+  - uid: 251
+    components:
+    - type: Transform
+      pos: -3.5,5.5
+      parent: 2
+  - uid: 252
+    components:
+    - type: Transform
+      pos: -3.5,6.5
+      parent: 2
+- proto: Catwalk
+  entities:
+  - uid: 253
+    components:
+    - type: Transform
+      pos: -2.5,-14.5
+      parent: 2
+  - uid: 254
+    components:
+    - type: Transform
+      pos: -1.5,-14.5
+      parent: 2
+  - uid: 255
+    components:
+    - type: Transform
+      pos: -0.5,-14.5
+      parent: 2
+  - uid: 256
+    components:
+    - type: Transform
+      pos: 0.5,-14.5
+      parent: 2
+- proto: ChairFolding
+  entities:
+  - uid: 257
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-9.5
+      parent: 2
+- proto: ChairPilotSeat
+  entities:
+  - uid: 258
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,9.5
+      parent: 2
+- proto: ChairWood
+  entities:
+  - uid: 259
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-5.5
+      parent: 2
+  - uid: 260
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-5.5
+      parent: 2
+  - uid: 261
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,5.5
+      parent: 2
+  - uid: 262
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,3.5
+      parent: 2
+  - uid: 263
+    components:
+    - type: Transform
+      pos: -3.5,3.5
+      parent: 2
+  - uid: 264
+    components:
+    - type: Transform
+      pos: 3.5,5.5
+      parent: 2
+  - uid: 265
+    components:
+    - type: Transform
+      pos: 4.5,5.5
+      parent: 2
+  - uid: 266
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,4.5
+      parent: 2
+  - uid: 267
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,3.5
+      parent: 2
+- proto: ClockworkShield
+  entities:
+  - uid: 268
+    components:
+    - type: Transform
+      pos: -2.780127,-2.51509
+      parent: 2
+- proto: ClothingBackpackSatchelLeather
+  entities:
+  - uid: 269
+    components:
+    - type: Transform
+      pos: -2.5143497,-5.278594
+      parent: 2
+- proto: ClothingBeltUtilityFilled
+  entities:
+  - uid: 270
+    components:
+    - type: Transform
+      pos: -4.45475,-13.4387665
+      parent: 2
+- proto: ClothingBeltWand
+  entities:
+  - uid: 271
+    components:
+    - type: Transform
+      pos: -2.4604146,-1.0363866
+      parent: 2
+- proto: ClothingHandsGlovesCombat
+  entities:
+  - uid: 272
+    components:
+    - type: Transform
+      pos: -9.39363,-3.5328693
+      parent: 2
+- proto: ClothingHeadHatWitch1
+  entities:
+  - uid: 273
+    components:
+    - type: Transform
+      pos: -5.52865,-9.359842
+      parent: 2
+- proto: ClothingHeadHatWizard
+  entities:
+  - uid: 274
+    components:
+    - type: Transform
+      pos: -2.623579,-1.7162492
+      parent: 2
+- proto: ClothingHeadHelmetWizardHelm
+  entities:
+  - uid: 275
+    components:
+    - type: Transform
+      pos: -1.3289549,-9.370714
+      parent: 2
+- proto: ClothingMaskGasChameleon
+  entities:
+  - uid: 276
+    components:
+    - type: Transform
+      pos: -9.537922,-3.3987489
+      parent: 2
+- proto: ClothingShoesWizard
+  entities:
+  - uid: 277
+    components:
+    - type: Transform
+      pos: -2.4604146,-2.2863867
+      parent: 2
+- proto: ClothingUniformJumpskirtColorBlack
+  entities:
+  - uid: 278
+    components:
+    - type: Transform
+      pos: -5.617341,-9.575869
+      parent: 2
+- proto: ClothingUniformJumpsuitColorBlack
+  entities:
+  - uid: 279
+    components:
+    - type: Transform
+      pos: -5.429654,-9.555006
+      parent: 2
+- proto: ComfyChair
+  entities:
+  - uid: 280
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,3.5
+      parent: 2
+  - uid: 281
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-10.5
+      parent: 2
+- proto: ComputerIFFSyndicate
+  entities:
+  - uid: 282
+    components:
+    - type: Transform
+      pos: -1.5,10.5
+      parent: 2
+- proto: ComputerShuttle
+  entities:
+  - uid: 283
+    components:
+    - type: Transform
+      pos: -0.5,10.5
+      parent: 2
+- proto: ComputerSurveillanceWirelessCameraMonitor
+  entities:
+  - uid: 284
+    components:
+    - type: Transform
+      pos: -3.5,6.5
+      parent: 2
+- proto: CrayonBox
+  entities:
+  - uid: 285
+    components:
+    - type: Transform
+      pos: -3.8145962,2.6666646
+      parent: 2
+- proto: CrayonRainbow
+  entities:
+  - uid: 286
+    components:
+    - type: Transform
+      pos: -3.6894722,2.437179
+      parent: 2
+- proto: DiceBag
+  entities:
+  - uid: 287
+    components:
+    - type: Transform
+      pos: 4.037085,4.423369
+      parent: 2
+- proto: Dresser
+  entities:
+  - uid: 288
+    components:
+    - type: Transform
+      pos: 0.5,-11.5
+      parent: 2
+- proto: DrinkAleBottleFull
+  entities:
+  - uid: 289
+    components:
+    - type: MetaData
+      desc: Made fresh on the mountain by me... And my army of little owls.
+      name: wizard ale
+    - type: Transform
+      pos: 1.9282424,-5.2112255
+      parent: 2
+- proto: DrinkGlass
+  entities:
+  - uid: 290
+    components:
+    - type: Transform
+      pos: 2.6212802,-5.185618
+      parent: 2
+  - uid: 291
+    components:
+    - type: Transform
+      pos: 2.3556552,-5.388743
+      parent: 2
+- proto: FaxMachineSyndie
+  entities:
+  - uid: 292
+    components:
+    - type: Transform
+      pos: -4.5,2.5
+      parent: 2
+- proto: FigureSpawner
+  entities:
+  - uid: 293
+    components:
+    - type: Transform
+      pos: 3.5,4.5
+      parent: 2
+  - uid: 294
+    components:
+    - type: Transform
+      pos: 4.5,4.5
+      parent: 2
+  - uid: 295
+    components:
+    - type: Transform
+      pos: 4.5,3.5
+      parent: 2
+- proto: FirelockGlass
+  entities:
+  - uid: 296
+    components:
+    - type: Transform
+      pos: -0.5,1.5
+      parent: 2
+  - uid: 297
+    components:
+    - type: Transform
+      pos: -0.5,-4.5
+      parent: 2
+  - uid: 298
+    components:
+    - type: Transform
+      pos: -3.5,-12.5
+      parent: 2
+  - uid: 299
+    components:
+    - type: Transform
+      pos: -0.5,7.5
+      parent: 2
+- proto: Fireplace
+  entities:
+  - uid: 300
+    components:
+    - type: Transform
+      pos: 0.5,-9.5
+      parent: 2
+- proto: FloorDrain
+  entities:
+  - uid: 301
+    components:
+    - type: Transform
+      pos: 4.5,-11.5
+      parent: 2
+    - type: Fixtures
+      fixtures: {}
+- proto: FloraRockSolid
+  entities:
+  - uid: 302
+    components:
+    - type: Transform
+      pos: 6.5734406,0.1678339
+      parent: 2
+  - uid: 303
+    components:
+    - type: Transform
+      pos: 5.280491,-2.8363385
+      parent: 2
+- proto: FoodBurgerSpell
+  entities:
+  - uid: 304
+    components:
+    - type: Transform
+      pos: -1.6417658,-9.454163
+      parent: 2
+  - uid: 305
+    components:
+    - type: Transform
+      pos: -3.3355608,-5.270721
+      parent: 2
+- proto: FoodMeat
+  entities:
+  - uid: 306
+    components:
+    - type: Transform
+      pos: 5.238783,-2.0018458
+      parent: 2
+  - uid: 307
+    components:
+    - type: Transform
+      pos: 5.551594,-0.20768729
+      parent: 2
+  - uid: 308
+    components:
+    - type: Transform
+      pos: 7.5535793,-3.0240989
+      parent: 2
+- proto: GasMinerNitrogen
+  entities:
+  - uid: 309
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-13.5
+      parent: 2
+- proto: GasMinerOxygen
+  entities:
+  - uid: 310
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-14.5
+      parent: 2
+- proto: GasMixerFlipped
+  entities:
+  - uid: 311
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-13.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+    - type: GasMixer
+      inletTwoConcentration: 0.22000003
+      inletOneConcentration: 0.78
+- proto: GasPassiveVent
+  entities:
+  - uid: 312
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-13.5
+      parent: 2
+  - uid: 313
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-14.5
+      parent: 2
+- proto: GasPipeBend
+  entities:
+  - uid: 314
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-14.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 315
+    components:
+    - type: Transform
+      pos: -3.5,-9.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 316
+    components:
+    - type: Transform
+      pos: -4.5,-5.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 317
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-5.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 318
+    components:
+    - type: Transform
+      pos: -5.5,0.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 319
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -6.5,0.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 320
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,3.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 321
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,3.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 322
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-7.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 323
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,3.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 324
+    components:
+    - type: Transform
+      pos: 4.5,3.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+- proto: GasPipeFourway
+  entities:
+  - uid: 325
+    components:
+    - type: Transform
+      pos: -0.5,-7.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 326
+    components:
+    - type: Transform
+      pos: -0.5,4.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+- proto: GasPipeStraight
+  entities:
+  - uid: 327
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-13.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 328
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-13.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 329
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-13.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 330
+    components:
+    - type: Transform
+      pos: -3.5,-12.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 331
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-11.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 332
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-10.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 333
+    components:
+    - type: Transform
+      pos: -4.5,-8.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 334
+    components:
+    - type: Transform
+      pos: -4.5,-6.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 335
+    components:
+    - type: Transform
+      pos: -5.5,-4.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 336
+    components:
+    - type: Transform
+      pos: -5.5,-3.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 337
+    components:
+    - type: Transform
+      pos: -5.5,-1.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 338
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -6.5,1.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 339
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -6.5,2.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 340
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,3.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 341
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-7.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 342
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-7.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 343
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-7.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 344
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-7.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 345
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-7.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 346
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-7.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 347
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-7.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 348
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-8.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 349
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-9.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 350
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-8.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 351
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-9.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 352
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-6.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 353
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-5.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 354
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,4.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 355
+    components:
+    - type: Transform
+      pos: -0.5,-4.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 356
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,4.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 357
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,4.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 358
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,5.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 359
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,6.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 360
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,7.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 361
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,4.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 362
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,4.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 363
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,4.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 364
+    components:
+    - type: Transform
+      pos: 4.5,2.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 365
+    components:
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 366
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-2.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 367
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-2.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 368
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-0.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 369
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-0.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+- proto: GasPipeTJunction
+  entities:
+  - uid: 370
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-13.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 371
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-9.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 372
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-7.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 373
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-5.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 374
+    components:
+    - type: Transform
+      pos: 3.5,-7.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 375
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-2.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 376
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-0.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 377
+    components:
+    - type: Transform
+      pos: -4.5,4.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 378
+    components:
+    - type: Transform
+      pos: 3.5,4.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+- proto: GasPressurePump
+  entities:
+  - uid: 379
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-13.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+- proto: GasVentPump
+  entities:
+  - uid: 380
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-9.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 381
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-14.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 382
+    components:
+    - type: Transform
+      pos: 5.5,-6.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 383
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-10.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 384
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-10.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 385
+    components:
+    - type: Transform
+      pos: -0.5,-3.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 386
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,0.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 387
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,4.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 388
+    components:
+    - type: Transform
+      pos: -0.5,8.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 389
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,3.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 390
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,4.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 391
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,-0.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 392
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,-2.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+  - uid: 393
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -6.5,-6.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+- proto: GeneratorBasic15kW
+  entities:
+  - uid: 394
+    components:
+    - type: Transform
+      pos: 1.5,-15.5
+      parent: 2
+  - uid: 395
+    components:
+    - type: Transform
+      pos: 0.5,-15.5
+      parent: 2
+- proto: GravityGeneratorMini
+  entities:
+  - uid: 396
+    components:
+    - type: Transform
+      pos: -2.5,-15.5
+      parent: 2
+- proto: Grille
+  entities:
+  - uid: 397
+    components:
+    - type: Transform
+      pos: -8.5,2.5
+      parent: 2
+  - uid: 398
+    components:
+    - type: Transform
+      pos: -3.5,9.5
+      parent: 2
+  - uid: 399
+    components:
+    - type: Transform
+      pos: -3.5,8.5
+      parent: 2
+  - uid: 400
+    components:
+    - type: Transform
+      pos: 2.5,9.5
+      parent: 2
+  - uid: 401
+    components:
+    - type: Transform
+      pos: 2.5,8.5
+      parent: 2
+  - uid: 402
+    components:
+    - type: Transform
+      pos: 0.5,11.5
+      parent: 2
+  - uid: 403
+    components:
+    - type: Transform
+      pos: -0.5,11.5
+      parent: 2
+  - uid: 404
+    components:
+    - type: Transform
+      pos: -1.5,11.5
+      parent: 2
+  - uid: 405
+    components:
+    - type: Transform
+      pos: -8.5,3.5
+      parent: 2
+  - uid: 406
+    components:
+    - type: Transform
+      pos: 7.5,3.5
+      parent: 2
+  - uid: 407
+    components:
+    - type: Transform
+      pos: 7.5,2.5
+      parent: 2
+  - uid: 408
+    components:
+    - type: Transform
+      pos: 6.5,1.5
+      parent: 2
+  - uid: 409
+    components:
+    - type: Transform
+      pos: 5.5,1.5
+      parent: 2
+  - uid: 410
+    components:
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 2
+  - uid: 411
+    components:
+    - type: Transform
+      pos: -9.5,-4.5
+      parent: 2
+  - uid: 412
+    components:
+    - type: Transform
+      pos: -9.5,1.5
+      parent: 2
+  - uid: 413
+    components:
+    - type: Transform
+      pos: -7.5,-3.5
+      parent: 2
+  - uid: 414
+    components:
+    - type: Transform
+      pos: 6.5,-4.5
+      parent: 2
+  - uid: 415
+    components:
+    - type: Transform
+      pos: -2.5,-16.5
+      parent: 2
+  - uid: 416
+    components:
+    - type: Transform
+      pos: -1.5,-16.5
+      parent: 2
+  - uid: 417
+    components:
+    - type: Transform
+      pos: 0.5,-16.5
+      parent: 2
+  - uid: 418
+    components:
+    - type: Transform
+      pos: 1.5,-16.5
+      parent: 2
+  - uid: 419
+    components:
+    - type: Transform
+      pos: -10.5,-3.5
+      parent: 2
+  - uid: 420
+    components:
+    - type: Transform
+      pos: 5.5,-4.5
+      parent: 2
+  - uid: 421
+    components:
+    - type: Transform
+      pos: 4.5,-4.5
+      parent: 2
+  - uid: 422
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 2
+  - uid: 423
+    components:
+    - type: Transform
+      pos: 3.5,-1.5
+      parent: 2
+  - uid: 424
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-0.5
+      parent: 2
+  - uid: 425
+    components:
+    - type: Transform
+      pos: 7.5,-5.5
+      parent: 2
+  - uid: 426
+    components:
+    - type: Transform
+      pos: 7.5,-6.5
+      parent: 2
+  - uid: 427
+    components:
+    - type: Transform
+      pos: 5.5,-10.5
+      parent: 2
+  - uid: 428
+    components:
+    - type: Transform
+      pos: 5.5,-11.5
+      parent: 2
+  - uid: 429
+    components:
+    - type: Transform
+      pos: -6.5,-10.5
+      parent: 2
+  - uid: 430
+    components:
+    - type: Transform
+      pos: -6.5,-11.5
+      parent: 2
+  - uid: 431
+    components:
+    - type: Transform
+      pos: -5.5,-13.5
+      parent: 2
+  - uid: 432
+    components:
+    - type: Transform
+      pos: -5.5,-14.5
+      parent: 2
+  - uid: 433
+    components:
+    - type: Transform
+      pos: 4.5,-13.5
+      parent: 2
+  - uid: 434
+    components:
+    - type: Transform
+      pos: 4.5,-14.5
+      parent: 2
+  - uid: 435
+    components:
+    - type: Transform
+      pos: -1.5,7.5
+      parent: 2
+  - uid: 436
+    components:
+    - type: Transform
+      pos: 0.5,7.5
+      parent: 2
+  - uid: 437
+    components:
+    - type: Transform
+      pos: -8.5,-5.5
+      parent: 2
+  - uid: 438
+    components:
+    - type: Transform
+      pos: -8.5,-6.5
+      parent: 2
+  - uid: 439
+    components:
+    - type: Transform
+      pos: -4.5,-0.5
+      parent: 2
+  - uid: 440
+    components:
+    - type: Transform
+      pos: -4.5,-1.5
+      parent: 2
+  - uid: 441
+    components:
+    - type: Transform
+      pos: -4.5,-2.5
+      parent: 2
+  - uid: 442
+    components:
+    - type: Transform
+      pos: 9.5,-1.5
+      parent: 2
+  - uid: 443
+    components:
+    - type: Transform
+      pos: -1.5,-4.5
+      parent: 2
+  - uid: 444
+    components:
+    - type: Transform
+      pos: 0.5,-4.5
+      parent: 2
+  - uid: 445
+    components:
+    - type: Transform
+      pos: -0.5,-12.5
+      parent: 2
+  - uid: 446
+    components:
+    - type: Transform
+      pos: -7.5,0.5
+      parent: 2
+  - uid: 447
+    components:
+    - type: Transform
+      pos: -10.5,0.5
+      parent: 2
+  - uid: 448
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-2.5
+      parent: 2
+  - uid: 449
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-0.5
+      parent: 2
+- proto: Gyroscope
+  entities:
+  - uid: 450
+    components:
+    - type: Transform
+      pos: -4.5,-14.5
+      parent: 2
+- proto: HospitalCurtains
+  entities:
+  - uid: 451
+    components:
+    - type: Transform
+      pos: 4.5,-11.5
+      parent: 2
+    - type: Occluder
+      enabled: False
+    - type: Door
+      state: Open
+    - type: Physics
+      canCollide: False
+- proto: HospitalCurtainsOpen
+  entities:
+  - uid: 452
+    components:
+    - type: Transform
+      pos: -1.5,-11.5
+      parent: 2
+- proto: IntercomAll
+  entities:
+  - uid: 453
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,3.5
+      parent: 2
+- proto: JetpackMiniFilled
+  entities:
+  - uid: 454
+    components:
+    - type: Transform
+      pos: -9.508206,-3.3199291
+      parent: 2
+- proto: MedkitAdvancedFilled
+  entities:
+  - uid: 455
+    components:
+    - type: Transform
+      pos: -2.5632703,-0.42328313
+      parent: 2
+- proto: MedkitOxygenFilled
+  entities:
+  - uid: 456
+    components:
+    - type: Transform
+      pos: -2.3338752,-0.5901818
+      parent: 2
+- proto: Mirror
+  entities:
+  - uid: 457
+    components:
+    - type: Transform
+      pos: 2.5,-8.5
+      parent: 2
+- proto: MirrorShield
+  entities:
+  - uid: 458
+    components:
+    - type: Transform
+      pos: 1.3163121,-0.3900899
+      parent: 2
+- proto: NitrogenCanister
+  entities:
+  - uid: 459
+    components:
+    - type: Transform
+      pos: -9.5,0.5
+      parent: 2
+- proto: OxygenCanister
+  entities:
+  - uid: 460
+    components:
+    - type: Transform
+      pos: -8.5,0.5
+      parent: 2
+- proto: Paper
+  entities:
+  - uid: 461
+    components:
+    - type: Transform
+      pos: -3.4183693,2.541491
+      parent: 2
+  - uid: 462
+    components:
+    - type: Transform
+      pos: -3.3349533,2.7083888
+      parent: 2
+  - uid: 463
+    components:
+    - type: Transform
+      pos: 3.578297,4.715441
+      parent: 2
+  - uid: 464
+    components:
+    - type: Transform
+      pos: 4.349894,4.652854
+      parent: 2
+  - uid: 465
+    components:
+    - type: Transform
+      pos: 4.600142,4.193884
+      parent: 2
+  - uid: 466
+    components:
+    - type: Transform
+      pos: 4.662705,3.5888767
+      parent: 2
+- proto: Pen
+  entities:
+  - uid: 467
+    components:
+    - type: Transform
+      pos: 4.391602,3.9643984
+      parent: 2
+  - uid: 468
+    components:
+    - type: Transform
+      pos: 3.80769,4.652854
+      parent: 2
+- proto: PersonalAI
+  entities:
+  - uid: 469
+    components:
+    - type: Transform
+      pos: 1.5621729,-0.9631119
+      parent: 2
+    - type: StockLimitedProcessing
+      processingListings: {}
+- proto: PlasmaDoor
+  entities:
+  - uid: 470
+    components:
+    - type: Transform
+      pos: -0.5,7.5
+      parent: 2
+  - uid: 471
+    components:
+    - type: Transform
+      pos: -2.5,4.5
+      parent: 2
+  - uid: 472
+    components:
+    - type: Transform
+      pos: 1.5,4.5
+      parent: 2
+  - uid: 473
+    components:
+    - type: Transform
+      pos: -0.5,1.5
+      parent: 2
+  - uid: 474
+    components:
+    - type: Transform
+      pos: -0.5,-4.5
+      parent: 2
+  - uid: 475
+    components:
+    - type: Transform
+      pos: -0.5,-8.5
+      parent: 2
+  - uid: 476
+    components:
+    - type: Transform
+      pos: 3.5,-8.5
+      parent: 2
+  - uid: 477
+    components:
+    - type: Transform
+      pos: -4.5,-8.5
+      parent: 2
+  - uid: 478
+    components:
+    - type: Transform
+      pos: -3.5,-12.5
+      parent: 2
+  - uid: 479
+    components:
+    - type: Transform
+      pos: -6.5,1.5
+      parent: 2
+  - uid: 480
+    components:
+    - type: Transform
+      pos: -5.5,-4.5
+      parent: 2
+- proto: PlasmaReinforcedWindowDirectional
+  entities:
+  - uid: 481
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-14.5
+      parent: 2
+  - uid: 482
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-13.5
+      parent: 2
+  - uid: 483
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-14.5
+      parent: 2
+  - uid: 484
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-14.5
+      parent: 2
+  - uid: 485
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-0.5
+      parent: 2
+  - uid: 486
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-2.5
+      parent: 2
+  - uid: 487
+    components:
+    - type: Transform
+      pos: -1.5,12.5
+      parent: 2
+  - uid: 488
+    components:
+    - type: Transform
+      pos: -0.5,12.5
+      parent: 2
+  - uid: 489
+    components:
+    - type: Transform
+      pos: 0.5,12.5
+      parent: 2
+  - uid: 490
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,9.5
+      parent: 2
+  - uid: 491
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,8.5
+      parent: 2
+  - uid: 492
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,9.5
+      parent: 2
+  - uid: 493
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,8.5
+      parent: 2
+  - uid: 494
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,3.5
+      parent: 2
+  - uid: 495
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,2.5
+      parent: 2
+  - uid: 496
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-5.5
+      parent: 2
+  - uid: 497
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-6.5
+      parent: 2
+  - uid: 498
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-10.5
+      parent: 2
+  - uid: 499
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-10.5
+      parent: 2
+  - uid: 500
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-11.5
+      parent: 2
+  - uid: 501
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-11.5
+      parent: 2
+  - uid: 502
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-13.5
+      parent: 2
+  - uid: 503
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-14.5
+      parent: 2
+  - uid: 504
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-17.5
+      parent: 2
+  - uid: 505
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-17.5
+      parent: 2
+  - uid: 506
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-17.5
+      parent: 2
+  - uid: 507
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-17.5
+      parent: 2
+  - uid: 508
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-14.5
+      parent: 2
+  - uid: 509
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-13.5
+      parent: 2
+  - uid: 510
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -9.5,2.5
+      parent: 2
+  - uid: 511
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -9.5,3.5
+      parent: 2
+  - uid: 512
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -9.5,-5.5
+      parent: 2
+  - uid: 513
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -9.5,-6.5
+      parent: 2
+  - uid: 514
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-1.5
+      parent: 2
+  - uid: 515
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-2.5
+      parent: 2
+  - uid: 516
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-1.5
+      parent: 2
+  - uid: 517
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-0.5
+      parent: 2
+  - uid: 518
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,0.5
+      parent: 2
+  - uid: 519
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,0.5
+      parent: 2
+  - uid: 520
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,0.5
+      parent: 2
+  - uid: 521
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 2
+  - uid: 522
+    components:
+    - type: Transform
+      pos: 5.5,-3.5
+      parent: 2
+  - uid: 523
+    components:
+    - type: Transform
+      pos: 6.5,-3.5
+      parent: 2
+- proto: PonderingOrbWizard
+  entities:
+  - uid: 524
+    components:
+    - type: Transform
+      pos: 1.5532424,-1.6617236
+      parent: 2
+- proto: PottedPlantRandom
+  entities:
+  - uid: 525
+    components:
+    - type: Transform
+      pos: -6.5,-7.5
+      parent: 2
+  - uid: 526
+    components:
+    - type: Transform
+      pos: 5.5,-7.5
+      parent: 2
+- proto: PowerCellRecharger
+  entities:
+  - uid: 527
+    components:
+    - type: Transform
+      pos: 1.5,9.5
+      parent: 2
+- proto: Poweredlight
+  entities:
+  - uid: 528
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-7.5
+      parent: 2
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 529
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-7.5
+      parent: 2
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 530
+    components:
+    - type: Transform
+      pos: 3.5,-5.5
+      parent: 2
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 531
+    components:
+    - type: Transform
+      pos: -4.5,-5.5
+      parent: 2
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 532
+    components:
+    - type: Transform
+      pos: -2.5,0.5
+      parent: 2
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 533
+    components:
+    - type: Transform
+      pos: 1.5,0.5
+      parent: 2
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 534
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -9.5,-0.5
+      parent: 2
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 535
+    components:
+    - type: Transform
+      pos: -9.5,-2.5
+      parent: 2
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 536
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,-3.5
+      parent: 2
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 537
+    components:
+    - type: Transform
+      pos: 7.5,0.5
+      parent: 2
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 538
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-16.5
+      parent: 2
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 539
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-10.5
+      parent: 2
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 540
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,5.5
+      parent: 2
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 541
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,8.5
+      parent: 2
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 542
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,8.5
+      parent: 2
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 543
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,12.5
+      parent: 2
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 544
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,12.5
+      parent: 2
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 545
+    components:
+    - type: Transform
+      pos: 9.5,-4.5
+      parent: 2
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 546
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,1.5
+      parent: 2
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 547
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -10.5,2.5
+      parent: 2
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 548
+    components:
+    - type: Transform
+      pos: -10.5,-5.5
+      parent: 2
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 549
+    components:
+    - type: Transform
+      pos: -7.5,-9.5
+      parent: 2
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 550
+    components:
+    - type: Transform
+      pos: 6.5,-9.5
+      parent: 2
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 551
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-17.5
+      parent: 2
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 552
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-17.5
+      parent: 2
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 553
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-16.5
+      parent: 2
+    - type: ApcPowerReceiver
+      powerLoad: 0
+- proto: PoweredSmallLight
+  entities:
+  - uid: 554
+    components:
+    - type: Transform
+      pos: -4.5,6.5
+      parent: 2
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 555
+    components:
+    - type: Transform
+      pos: 3.5,6.5
+      parent: 2
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 556
+    components:
+    - type: Transform
+      pos: 2.5,-9.5
+      parent: 2
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 557
+    components:
+    - type: Transform
+      pos: -2.5,-13.5
+      parent: 2
+  - uid: 558
+    components:
+    - type: Transform
+      pos: -7.5,3.5
+      parent: 2
+  - uid: 559
+    components:
+    - type: Transform
+      pos: 6.5,3.5
+      parent: 2
+- proto: Rack
+  entities:
+  - uid: 560
+    components:
+    - type: Transform
+      pos: -9.5,-3.5
+      parent: 2
+  - uid: 561
+    components:
+    - type: Transform
+      pos: -4.5,-13.5
+      parent: 2
+- proto: RandomPosterAny
+  entities:
+  - uid: 562
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -6.5,-4.5
+      parent: 2
+  - uid: 563
+    components:
+    - type: Transform
+      pos: 4.5,-8.5
+      parent: 2
+  - uid: 564
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,1.5
+      parent: 2
+  - uid: 565
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,3.5
+      parent: 2
+  - uid: 566
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,6.5
+      parent: 2
+  - uid: 567
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -7.5,4.5
+      parent: 2
+- proto: RandomPosterContraband
+  entities:
+  - uid: 568
+    components:
+    - type: Transform
+      pos: 0.5,-12.5
+      parent: 2
+  - uid: 569
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-15.5
+      parent: 2
+- proto: RandomSpawner
+  entities:
+  - uid: 570
+    components:
+    - type: Transform
+      pos: 0.5,-14.5
+      parent: 2
+  - uid: 571
+    components:
+    - type: Transform
+      pos: -6.5,-0.5
+      parent: 2
+  - uid: 572
+    components:
+    - type: Transform
+      pos: 6.5,2.5
+      parent: 2
+- proto: ReinforcedPlasmaWindow
+  entities:
+  - uid: 573
+    components:
+    - type: Transform
+      pos: -1.5,7.5
+      parent: 2
+  - uid: 574
+    components:
+    - type: Transform
+      pos: 0.5,7.5
+      parent: 2
+  - uid: 575
+    components:
+    - type: Transform
+      pos: -7.5,0.5
+      parent: 2
+  - uid: 576
+    components:
+    - type: Transform
+      pos: 2.5,9.5
+      parent: 2
+  - uid: 577
+    components:
+    - type: Transform
+      pos: 2.5,8.5
+      parent: 2
+  - uid: 578
+    components:
+    - type: Transform
+      pos: -1.5,11.5
+      parent: 2
+  - uid: 579
+    components:
+    - type: Transform
+      pos: -0.5,11.5
+      parent: 2
+  - uid: 580
+    components:
+    - type: Transform
+      pos: 0.5,11.5
+      parent: 2
+  - uid: 581
+    components:
+    - type: Transform
+      pos: -3.5,9.5
+      parent: 2
+  - uid: 582
+    components:
+    - type: Transform
+      pos: -3.5,8.5
+      parent: 2
+  - uid: 583
+    components:
+    - type: Transform
+      pos: -2.5,-16.5
+      parent: 2
+  - uid: 584
+    components:
+    - type: Transform
+      pos: -1.5,-16.5
+      parent: 2
+  - uid: 585
+    components:
+    - type: Transform
+      pos: 0.5,-16.5
+      parent: 2
+  - uid: 586
+    components:
+    - type: Transform
+      pos: 1.5,-16.5
+      parent: 2
+  - uid: 587
+    components:
+    - type: Transform
+      pos: 4.5,-13.5
+      parent: 2
+  - uid: 588
+    components:
+    - type: Transform
+      pos: 4.5,-14.5
+      parent: 2
+  - uid: 589
+    components:
+    - type: Transform
+      pos: -5.5,-14.5
+      parent: 2
+  - uid: 590
+    components:
+    - type: Transform
+      pos: -5.5,-13.5
+      parent: 2
+  - uid: 591
+    components:
+    - type: Transform
+      pos: -6.5,-11.5
+      parent: 2
+  - uid: 592
+    components:
+    - type: Transform
+      pos: -6.5,-10.5
+      parent: 2
+  - uid: 593
+    components:
+    - type: Transform
+      pos: 5.5,-11.5
+      parent: 2
+  - uid: 594
+    components:
+    - type: Transform
+      pos: 5.5,-10.5
+      parent: 2
+  - uid: 595
+    components:
+    - type: Transform
+      pos: 7.5,-6.5
+      parent: 2
+  - uid: 596
+    components:
+    - type: Transform
+      pos: 7.5,-5.5
+      parent: 2
+  - uid: 597
+    components:
+    - type: Transform
+      pos: 6.5,-4.5
+      parent: 2
+  - uid: 598
+    components:
+    - type: Transform
+      pos: 5.5,-4.5
+      parent: 2
+  - uid: 599
+    components:
+    - type: Transform
+      pos: 4.5,-4.5
+      parent: 2
+  - uid: 600
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 2
+  - uid: 601
+    components:
+    - type: Transform
+      pos: 3.5,-1.5
+      parent: 2
+  - uid: 602
+    components:
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 2
+  - uid: 603
+    components:
+    - type: Transform
+      pos: 5.5,1.5
+      parent: 2
+  - uid: 604
+    components:
+    - type: Transform
+      pos: 6.5,1.5
+      parent: 2
+  - uid: 605
+    components:
+    - type: Transform
+      pos: -8.5,-6.5
+      parent: 2
+  - uid: 606
+    components:
+    - type: Transform
+      pos: -8.5,-5.5
+      parent: 2
+  - uid: 607
+    components:
+    - type: Transform
+      pos: -7.5,-3.5
+      parent: 2
+  - uid: 608
+    components:
+    - type: Transform
+      pos: -9.5,-4.5
+      parent: 2
+  - uid: 609
+    components:
+    - type: Transform
+      pos: -9.5,1.5
+      parent: 2
+  - uid: 610
+    components:
+    - type: Transform
+      pos: -4.5,-0.5
+      parent: 2
+  - uid: 611
+    components:
+    - type: Transform
+      pos: -4.5,-1.5
+      parent: 2
+  - uid: 612
+    components:
+    - type: Transform
+      pos: -4.5,-2.5
+      parent: 2
+  - uid: 613
+    components:
+    - type: Transform
+      pos: 9.5,-1.5
+      parent: 2
+  - uid: 614
+    components:
+    - type: Transform
+      pos: -1.5,-4.5
+      parent: 2
+  - uid: 615
+    components:
+    - type: Transform
+      pos: 0.5,-4.5
+      parent: 2
+  - uid: 616
+    components:
+    - type: Transform
+      pos: -0.5,-12.5
+      parent: 2
+  - uid: 617
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-0.5
+      parent: 2
+  - uid: 618
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-2.5
+      parent: 2
+  - uid: 619
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-0.5
+      parent: 2
+  - uid: 620
+    components:
+    - type: Transform
+      pos: -10.5,0.5
+      parent: 2
+  - uid: 621
+    components:
+    - type: Transform
+      pos: -10.5,-3.5
+      parent: 2
+  - uid: 622
+    components:
+    - type: Transform
+      pos: -8.5,2.5
+      parent: 2
+  - uid: 623
+    components:
+    - type: Transform
+      pos: -8.5,3.5
+      parent: 2
+  - uid: 624
+    components:
+    - type: Transform
+      pos: 7.5,2.5
+      parent: 2
+  - uid: 625
+    components:
+    - type: Transform
+      pos: 7.5,3.5
+      parent: 2
+- proto: SalvageHumanCorpseSpawner
+  entities:
+  - uid: 626
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,-1.5
+      parent: 2
+- proto: SinkWide
+  entities:
+  - uid: 627
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-9.5
+      parent: 2
+- proto: Skub
+  entities:
+  - uid: 628
+    components:
+    - type: Transform
+      pos: 4.572705,-11.394358
+      parent: 2
+- proto: SMESBasic
+  entities:
+  - uid: 629
+    components:
+    - type: Transform
+      pos: -0.5,-15.5
+      parent: 2
+- proto: SoapOmega
+  entities:
+  - uid: 630
+    components:
+    - type: Transform
+      pos: 2.4979851,-9.465773
+      parent: 2
+- proto: SpawnMobBear
+  entities:
+  - uid: 631
+    components:
+    - type: Transform
+      pos: 7.5,-0.5
+      parent: 2
+  - uid: 632
+    components:
+    - type: Transform
+      pos: 6.5,-2.5
+      parent: 2
+- proto: SpawnPointWizard
+  entities:
+  - uid: 633
+    components:
+    - type: Transform
+      pos: -0.5,-10.5
+      parent: 2
+- proto: StealthBox
+  entities:
+  - uid: 634
+    components:
+    - type: Transform
+      pos: -5.369279,-11.020669
+      parent: 2
+    - type: Stealth
+      enabled: False
+    - type: EntityStorage
+      open: True
+- proto: SubstationBasic
+  entities:
+  - uid: 635
+    components:
+    - type: Transform
+      pos: -1.5,-15.5
+      parent: 2
+- proto: SuitStorageWizard
+  entities:
+  - uid: 636
+    components:
+    - type: Transform
+      pos: -0.5,-11.5
+      parent: 2
+- proto: TableCarpet
+  entities:
+  - uid: 637
+    components:
+    - type: Transform
+      pos: 3.5,4.5
+      parent: 2
+  - uid: 638
+    components:
+    - type: Transform
+      pos: 4.5,3.5
+      parent: 2
+  - uid: 639
+    components:
+    - type: Transform
+      pos: 4.5,4.5
+      parent: 2
+- proto: TableFancyBlack
+  entities:
+  - uid: 640
+    components:
+    - type: Transform
+      pos: -2.5,-5.5
+      parent: 2
+  - uid: 641
+    components:
+    - type: Transform
+      pos: -3.5,-5.5
+      parent: 2
+  - uid: 642
+    components:
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 2
+  - uid: 643
+    components:
+    - type: Transform
+      pos: 1.5,-5.5
+      parent: 2
+- proto: TableStone
+  entities:
+  - uid: 644
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-1.5
+      parent: 2
+  - uid: 645
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-0.5
+      parent: 2
+  - uid: 646
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-0.5
+      parent: 2
+  - uid: 647
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-2.5
+      parent: 2
+  - uid: 648
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-1.5
+      parent: 2
+  - uid: 649
+    components:
+    - type: Transform
+      pos: -2.5,-2.5
+      parent: 2
+- proto: TableWood
+  entities:
+  - uid: 650
+    components:
+    - type: Transform
+      pos: 1.5,8.5
+      parent: 2
+  - uid: 651
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,9.5
+      parent: 2
+  - uid: 652
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,9.5
+      parent: 2
+  - uid: 653
+    components:
+    - type: Transform
+      pos: -2.5,8.5
+      parent: 2
+  - uid: 654
+    components:
+    - type: Transform
+      pos: -4.5,6.5
+      parent: 2
+  - uid: 655
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,2.5
+      parent: 2
+  - uid: 656
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-9.5
+      parent: 2
+  - uid: 657
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,2.5
+      parent: 2
+  - uid: 658
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,2.5
+      parent: 2
+- proto: TargetStrange
+  entities:
+  - uid: 659
+    components:
+    - type: Transform
+      pos: -4.5,-11.5
+      parent: 2
+- proto: Thruster
+  entities:
+  - uid: 660
+    components:
+    - type: Transform
+      pos: -3.5,11.5
+      parent: 2
+  - uid: 661
+    components:
+    - type: Transform
+      pos: 2.5,11.5
+      parent: 2
+  - uid: 662
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,5.5
+      parent: 2
+  - uid: 663
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,5.5
+      parent: 2
+  - uid: 664
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-16.5
+      parent: 2
+  - uid: 665
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-17.5
+      parent: 2
+  - uid: 666
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-16.5
+      parent: 2
+  - uid: 667
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-8.5
+      parent: 2
+  - uid: 668
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,-8.5
+      parent: 2
+- proto: ToiletEmpty
+  entities:
+  - uid: 669
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-11.5
+      parent: 2
+- proto: VendingMachineCoffee
+  entities:
+  - uid: 670
+    components:
+    - type: Transform
+      pos: 3.5,6.5
+      parent: 2
+- proto: VendingMachineDiscount
+  entities:
+  - uid: 671
+    components:
+    - type: Transform
+      pos: 0.5,2.5
+      parent: 2
+- proto: VendingMachineGames
+  entities:
+  - uid: 672
+    components:
+    - type: Transform
+      pos: 2.5,6.5
+      parent: 2
+- proto: VendingMachineMagivend
+  entities:
+  - uid: 673
+    components:
+    - type: Transform
+      pos: -1.5,2.5
+      parent: 2
+- proto: VendingMachineTankDispenserEVA
+  entities:
+  - uid: 674
+    components:
+    - type: Transform
+      pos: -8.5,-3.5
+      parent: 2
+- proto: WallUranium
+  entities:
+  - uid: 675
+    components:
+    - type: Transform
+      pos: -2.5,6.5
+      parent: 2
+  - uid: 676
+    components:
+    - type: Transform
+      pos: 1.5,6.5
+      parent: 2
+  - uid: 677
+    components:
+    - type: Transform
+      pos: 1.5,11.5
+      parent: 2
+  - uid: 678
+    components:
+    - type: Transform
+      pos: 1.5,10.5
+      parent: 2
+  - uid: 679
+    components:
+    - type: Transform
+      pos: 2.5,10.5
+      parent: 2
+  - uid: 680
+    components:
+    - type: Transform
+      pos: 2.5,7.5
+      parent: 2
+  - uid: 681
+    components:
+    - type: Transform
+      pos: 1.5,7.5
+      parent: 2
+  - uid: 682
+    components:
+    - type: Transform
+      pos: -2.5,11.5
+      parent: 2
+  - uid: 683
+    components:
+    - type: Transform
+      pos: -2.5,10.5
+      parent: 2
+  - uid: 684
+    components:
+    - type: Transform
+      pos: -3.5,10.5
+      parent: 2
+  - uid: 685
+    components:
+    - type: Transform
+      pos: -2.5,7.5
+      parent: 2
+  - uid: 686
+    components:
+    - type: Transform
+      pos: -3.5,7.5
+      parent: 2
+  - uid: 687
+    components:
+    - type: Transform
+      pos: -6.5,6.5
+      parent: 2
+  - uid: 688
+    components:
+    - type: Transform
+      pos: -5.5,6.5
+      parent: 2
+  - uid: 689
+    components:
+    - type: Transform
+      pos: -5.5,7.5
+      parent: 2
+  - uid: 690
+    components:
+    - type: Transform
+      pos: -4.5,7.5
+      parent: 2
+  - uid: 691
+    components:
+    - type: Transform
+      pos: -6.5,5.5
+      parent: 2
+  - uid: 692
+    components:
+    - type: Transform
+      pos: -7.5,5.5
+      parent: 2
+  - uid: 693
+    components:
+    - type: Transform
+      pos: -7.5,4.5
+      parent: 2
+  - uid: 694
+    components:
+    - type: Transform
+      pos: -8.5,4.5
+      parent: 2
+  - uid: 695
+    components:
+    - type: Transform
+      pos: -1.5,1.5
+      parent: 2
+  - uid: 696
+    components:
+    - type: Transform
+      pos: 0.5,1.5
+      parent: 2
+  - uid: 697
+    components:
+    - type: Transform
+      pos: 3.5,7.5
+      parent: 2
+  - uid: 698
+    components:
+    - type: Transform
+      pos: 4.5,7.5
+      parent: 2
+  - uid: 699
+    components:
+    - type: Transform
+      pos: 4.5,6.5
+      parent: 2
+  - uid: 700
+    components:
+    - type: Transform
+      pos: 5.5,6.5
+      parent: 2
+  - uid: 701
+    components:
+    - type: Transform
+      pos: 5.5,5.5
+      parent: 2
+  - uid: 702
+    components:
+    - type: Transform
+      pos: 6.5,5.5
+      parent: 2
+  - uid: 703
+    components:
+    - type: Transform
+      pos: 6.5,4.5
+      parent: 2
+  - uid: 704
+    components:
+    - type: Transform
+      pos: 7.5,4.5
+      parent: 2
+  - uid: 705
+    components:
+    - type: Transform
+      pos: 7.5,1.5
+      parent: 2
+  - uid: 706
+    components:
+    - type: Transform
+      pos: 3.5,1.5
+      parent: 2
+  - uid: 707
+    components:
+    - type: Transform
+      pos: 2.5,1.5
+      parent: 2
+  - uid: 708
+    components:
+    - type: Transform
+      pos: 1.5,1.5
+      parent: 2
+  - uid: 709
+    components:
+    - type: Transform
+      pos: 1.5,3.5
+      parent: 2
+  - uid: 710
+    components:
+    - type: Transform
+      pos: 1.5,2.5
+      parent: 2
+  - uid: 711
+    components:
+    - type: Transform
+      pos: 1.5,5.5
+      parent: 2
+  - uid: 712
+    components:
+    - type: Transform
+      pos: -2.5,1.5
+      parent: 2
+  - uid: 713
+    components:
+    - type: Transform
+      pos: -2.5,2.5
+      parent: 2
+  - uid: 714
+    components:
+    - type: Transform
+      pos: -2.5,3.5
+      parent: 2
+  - uid: 715
+    components:
+    - type: Transform
+      pos: -2.5,5.5
+      parent: 2
+  - uid: 716
+    components:
+    - type: Transform
+      pos: -3.5,1.5
+      parent: 2
+  - uid: 717
+    components:
+    - type: Transform
+      pos: -4.5,1.5
+      parent: 2
+  - uid: 718
+    components:
+    - type: Transform
+      pos: -5.5,1.5
+      parent: 2
+  - uid: 719
+    components:
+    - type: Transform
+      pos: -7.5,1.5
+      parent: 2
+  - uid: 720
+    components:
+    - type: Transform
+      pos: -8.5,1.5
+      parent: 2
+  - uid: 721
+    components:
+    - type: Transform
+      pos: 6.5,-7.5
+      parent: 2
+  - uid: 722
+    components:
+    - type: Transform
+      pos: 7.5,-7.5
+      parent: 2
+  - uid: 723
+    components:
+    - type: Transform
+      pos: -8.5,-4.5
+      parent: 2
+  - uid: 724
+    components:
+    - type: Transform
+      pos: -8.5,-7.5
+      parent: 2
+  - uid: 725
+    components:
+    - type: Transform
+      pos: 8.5,1.5
+      parent: 2
+  - uid: 726
+    components:
+    - type: Transform
+      pos: 8.5,0.5
+      parent: 2
+  - uid: 727
+    components:
+    - type: Transform
+      pos: 9.5,0.5
+      parent: 2
+  - uid: 728
+    components:
+    - type: Transform
+      pos: 9.5,-3.5
+      parent: 2
+  - uid: 729
+    components:
+    - type: Transform
+      pos: 8.5,-3.5
+      parent: 2
+  - uid: 730
+    components:
+    - type: Transform
+      pos: 8.5,-4.5
+      parent: 2
+  - uid: 731
+    components:
+    - type: Transform
+      pos: 7.5,-4.5
+      parent: 2
+  - uid: 732
+    components:
+    - type: Transform
+      pos: 3.5,0.5
+      parent: 2
+  - uid: 733
+    components:
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 2
+  - uid: 734
+    components:
+    - type: Transform
+      pos: 3.5,-4.5
+      parent: 2
+  - uid: 735
+    components:
+    - type: Transform
+      pos: 2.5,-4.5
+      parent: 2
+  - uid: 736
+    components:
+    - type: Transform
+      pos: 1.5,-4.5
+      parent: 2
+  - uid: 737
+    components:
+    - type: Transform
+      pos: -3.5,-17.5
+      parent: 2
+  - uid: 738
+    components:
+    - type: Transform
+      pos: -3.5,-16.5
+      parent: 2
+  - uid: 739
+    components:
+    - type: Transform
+      pos: 2.5,-17.5
+      parent: 2
+  - uid: 740
+    components:
+    - type: Transform
+      pos: 2.5,-16.5
+      parent: 2
+  - uid: 741
+    components:
+    - type: Transform
+      pos: -0.5,-16.5
+      parent: 2
+  - uid: 742
+    components:
+    - type: Transform
+      pos: -2.5,-4.5
+      parent: 2
+  - uid: 743
+    components:
+    - type: Transform
+      pos: -4.5,0.5
+      parent: 2
+  - uid: 744
+    components:
+    - type: Transform
+      pos: -4.5,-3.5
+      parent: 2
+  - uid: 745
+    components:
+    - type: Transform
+      pos: -4.5,-4.5
+      parent: 2
+  - uid: 746
+    components:
+    - type: Transform
+      pos: -3.5,-4.5
+      parent: 2
+  - uid: 747
+    components:
+    - type: Transform
+      pos: -7.5,-4.5
+      parent: 2
+  - uid: 748
+    components:
+    - type: Transform
+      pos: -6.5,-4.5
+      parent: 2
+  - uid: 749
+    components:
+    - type: Transform
+      pos: -7.5,-7.5
+      parent: 2
+  - uid: 750
+    components:
+    - type: Transform
+      pos: -7.5,-8.5
+      parent: 2
+  - uid: 751
+    components:
+    - type: Transform
+      pos: -6.5,-8.5
+      parent: 2
+  - uid: 752
+    components:
+    - type: Transform
+      pos: -6.5,-9.5
+      parent: 2
+  - uid: 753
+    components:
+    - type: Transform
+      pos: -6.5,-12.5
+      parent: 2
+  - uid: 754
+    components:
+    - type: Transform
+      pos: -5.5,-12.5
+      parent: 2
+  - uid: 755
+    components:
+    - type: Transform
+      pos: -5.5,-15.5
+      parent: 2
+  - uid: 756
+    components:
+    - type: Transform
+      pos: -3.5,-15.5
+      parent: 2
+  - uid: 757
+    components:
+    - type: Transform
+      pos: 2.5,-15.5
+      parent: 2
+  - uid: 758
+    components:
+    - type: Transform
+      pos: 4.5,-15.5
+      parent: 2
+  - uid: 759
+    components:
+    - type: Transform
+      pos: -4.5,-15.5
+      parent: 2
+  - uid: 760
+    components:
+    - type: Transform
+      pos: 3.5,-15.5
+      parent: 2
+  - uid: 761
+    components:
+    - type: Transform
+      pos: 4.5,-12.5
+      parent: 2
+  - uid: 762
+    components:
+    - type: Transform
+      pos: 5.5,-12.5
+      parent: 2
+  - uid: 763
+    components:
+    - type: Transform
+      pos: 6.5,-8.5
+      parent: 2
+  - uid: 764
+    components:
+    - type: Transform
+      pos: 5.5,-8.5
+      parent: 2
+  - uid: 765
+    components:
+    - type: Transform
+      pos: 5.5,-9.5
+      parent: 2
+  - uid: 766
+    components:
+    - type: Transform
+      pos: -10.5,-4.5
+      parent: 2
+  - uid: 767
+    components:
+    - type: Transform
+      pos: -10.5,1.5
+      parent: 2
+  - uid: 768
+    components:
+    - type: Transform
+      pos: -9.5,-1.5
+      parent: 2
+  - uid: 769
+    components:
+    - type: Transform
+      pos: -10.5,-1.5
+      parent: 2
+  - uid: 770
+    components:
+    - type: Transform
+      pos: -7.5,-1.5
+      parent: 2
+  - uid: 771
+    components:
+    - type: Transform
+      pos: -5.5,-8.5
+      parent: 2
+  - uid: 772
+    components:
+    - type: Transform
+      pos: -3.5,-8.5
+      parent: 2
+  - uid: 773
+    components:
+    - type: Transform
+      pos: -2.5,-8.5
+      parent: 2
+  - uid: 774
+    components:
+    - type: Transform
+      pos: -1.5,-8.5
+      parent: 2
+  - uid: 775
+    components:
+    - type: Transform
+      pos: 0.5,-8.5
+      parent: 2
+  - uid: 776
+    components:
+    - type: Transform
+      pos: 1.5,-8.5
+      parent: 2
+  - uid: 777
+    components:
+    - type: Transform
+      pos: 2.5,-8.5
+      parent: 2
+  - uid: 778
+    components:
+    - type: Transform
+      pos: 4.5,-8.5
+      parent: 2
+  - uid: 779
+    components:
+    - type: Transform
+      pos: -4.5,-12.5
+      parent: 2
+  - uid: 780
+    components:
+    - type: Transform
+      pos: -2.5,-12.5
+      parent: 2
+  - uid: 781
+    components:
+    - type: Transform
+      pos: -2.5,-11.5
+      parent: 2
+  - uid: 782
+    components:
+    - type: Transform
+      pos: -2.5,-9.5
+      parent: 2
+  - uid: 783
+    components:
+    - type: Transform
+      pos: -2.5,-10.5
+      parent: 2
+  - uid: 784
+    components:
+    - type: Transform
+      pos: 1.5,-9.5
+      parent: 2
+  - uid: 785
+    components:
+    - type: Transform
+      pos: 1.5,-10.5
+      parent: 2
+  - uid: 786
+    components:
+    - type: Transform
+      pos: 1.5,-11.5
+      parent: 2
+  - uid: 787
+    components:
+    - type: Transform
+      pos: 1.5,-12.5
+      parent: 2
+  - uid: 788
+    components:
+    - type: Transform
+      pos: -1.5,-12.5
+      parent: 2
+  - uid: 789
+    components:
+    - type: Transform
+      pos: 0.5,-12.5
+      parent: 2
+  - uid: 790
+    components:
+    - type: Transform
+      pos: 2.5,-12.5
+      parent: 2
+  - uid: 791
+    components:
+    - type: Transform
+      pos: 3.5,-12.5
+      parent: 2
+  - uid: 792
+    components:
+    - type: Transform
+      pos: -8.5,-1.5
+      parent: 2
+- proto: WarpPoint
+  entities:
+  - uid: 793
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 2
+    - type: WarpPoint
+      location: Wizard Shuttle
+- proto: WeaponCapacitorRecharger
+  entities:
+  - uid: 794
+    components:
+    - type: Transform
+      pos: -2.5,9.5
+      parent: 2
+- proto: WizardComputerComms
+  entities:
+  - uid: 795
+    components:
+    - type: Transform
+      pos: 0.5,10.5
+      parent: 2
+- proto: WoodblockInstrument
+  entities:
+  - uid: 796
+    components:
+    - type: Transform
+      pos: 1.5449836,-2.289194
+      parent: 2
+...
diff --git a/Resources/Maps/_Starlight/Stations/Leth.yml b/Resources/Maps/_Starlight/Stations/Leth.yml
index 11aa76080ae6..cc2b6045a93c 100644
--- a/Resources/Maps/_Starlight/Stations/Leth.yml
+++ b/Resources/Maps/_Starlight/Stations/Leth.yml
@@ -4,8 +4,8 @@ meta:
   engineVersion: 264.0.0
   forkId: ""
   forkVersion: ""
-  time: 08/13/2025 23:10:06
-  entityCount: 16667
+  time: 08/15/2025 02:14:26
+  entityCount: 16713
 maps:
 - 1
 grids:
@@ -103,11 +103,11 @@ entities:
           version: 7
         1,-4:
           ind: 1,-4
-          tiles: AQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAAAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAAAAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAAAAAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAAAAAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAHQAAAAAAAAAAAAAAAAAdAAAAAAAAAAAAAAAAAB0AAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAMAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAADAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAAMAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAADAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
+          tiles: AgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAAAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAAAAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAAAAAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAAAAAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAHQAAAAAAAAAAAAAAAAAdAAAAAAAAAAAAAAAAAB0AAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAMAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAADAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAAMAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAADAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
           version: 7
         0,-4:
           ind: 0,-4
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAQAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAEAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAABAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAQAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAEAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAABAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAA==
           version: 7
         -1,-4:
           ind: -1,-4
@@ -115,11 +115,11 @@ entities:
           version: 7
         1,-5:
           ind: 1,-5
-          tiles: AgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAA==
+          tiles: AgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAA==
           version: 7
         0,-5:
           ind: 0,-5
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAACAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAgAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAA==
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAEAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAACAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAgAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAAAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA==
           version: 7
         -1,-5:
           ind: -1,-5
@@ -7261,7 +7261,8 @@ entities:
           2,-7:
             0: 28384
           3,-8:
-            0: 32614
+            2: 256
+            0: 32358
           3,-7:
             0: 35763
           3,-6:
@@ -7393,6 +7394,17 @@ entities:
             0: 7645
           -1,-13:
             0: 52701
+          4,-16:
+            1: 4369
+          4,-17:
+            1: 4369
+          3,-16:
+            1: 65535
+          4,-15:
+            1: 17
+          3,-15:
+            1: 143
+            0: 13072
           4,-14:
             0: 4096
             1: 3072
@@ -7469,13 +7481,8 @@ entities:
             0: 65399
           2,-17:
             0: 30583
-          3,-16:
-            1: 30583
-          3,-15:
-            1: 7
-            0: 13072
           3,-17:
-            1: 30583
+            1: 65535
           -4,-16:
             0: 4096
             1: 34
@@ -7497,7 +7504,7 @@ entities:
           -3,-16:
             1: 34952
           -3,-17:
-            1: 63624
+            1: 48844
           -2,-16:
             1: 4471
             0: 49152
@@ -7522,9 +7529,9 @@ entities:
           3,-19:
             1: 64447
           4,-18:
-            1: 1
+            1: 4369
           3,-18:
-            1: 30591
+            1: 65535
           5,-19:
             1: 65280
           5,-20:
@@ -7569,7 +7576,7 @@ entities:
             0: 65535
           1,-19:
             0: 13104
-            2: 34944
+            3: 34944
           1,-18:
             0: 61427
           1,-21:
@@ -7577,15 +7584,15 @@ entities:
           2,-20:
             0: 30711
           2,-19:
-            2: 30576
+            3: 30576
           2,-18:
             0: 30576
           2,-21:
             0: 13107
-            5: 2184
+            6: 2184
           3,-21:
             1: 36044
-            5: 273
+            6: 273
           -5,-17:
             1: 143
           -4,-20:
@@ -7603,7 +7610,7 @@ entities:
           -3,-21:
             1: 17476
           -2,-20:
-            2: 7
+            3: 7
             1: 26368
             0: 32768
           -2,-18:
@@ -7648,8 +7655,8 @@ entities:
             1: 2184
           2,-22:
             0: 4369
-            3: 12
-            4: 3072
+            4: 12
+            5: 3072
           2,-25:
             1: 49152
           3,-24:
@@ -7683,10 +7690,10 @@ entities:
             0: 29
             1: 3840
           -2,-22:
-            6: 7
-            2: 1792
+            7: 7
+            3: 1792
           -2,-21:
-            2: 1799
+            3: 1799
           -2,-25:
             1: 32768
             0: 2184
@@ -7821,7 +7828,8 @@ entities:
           -6,-7:
             0: 52428
           -6,-6:
-            0: 52428
+            0: 36044
+            2: 16384
           5,-4:
             0: 272
           5,-3:
@@ -7928,16 +7936,16 @@ entities:
             0: 52364
             1: 4369
           -12,-7:
-            7: 28944
+            8: 28944
             0: 35008
           -13,-7:
-            7: 34944
+            8: 34944
             1: 1
           -12,-6:
-            7: 3
+            8: 3
             0: 52232
           -13,-6:
-            7: 8
+            8: 8
             1: 17456
           -12,-5:
             0: 52428
@@ -8136,7 +8144,8 @@ entities:
           -11,-12:
             0: 61422
           -11,-11:
-            0: 57304
+            2: 16
+            0: 57288
           -11,-10:
             0: 64969
           -11,-13:
@@ -8197,7 +8206,8 @@ entities:
           -10,-15:
             0: 15
           -10,-14:
-            0: 272
+            0: 16
+            2: 256
             1: 32780
           -10,-17:
             0: 12803
@@ -8446,7 +8456,8 @@ entities:
           11,-14:
             0: 3067
           11,-17:
-            0: 30711
+            0: 29687
+            2: 1024
           12,-16:
             0: 39867
           12,-15:
@@ -8748,6 +8759,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.14975
+          moles:
+          - 20.078888
+          - 75.53487
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -10695,7 +10721,7 @@ entities:
       pos: 7.5,-88.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -127426.914
+      secondsUntilStateChange: -134466.27
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -11226,11 +11252,23 @@ entities:
     - type: Transform
       pos: 36.5,-67.5
       parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        4462:
+        - DoorStatus: DoorBolt
   - uid: 4462
     components:
     - type: Transform
       pos: 38.5,-67.5
       parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        4461:
+        - DoorStatus: DoorBolt
 - proto: AirlockExternalGlassLocked
   entities:
   - uid: 2933
@@ -11938,7 +11976,7 @@ entities:
       pos: -11.5,-24.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -40863.926
+      secondsUntilStateChange: -47903.273
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -14970,13 +15008,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 50.5,-63.5
       parent: 2
-- proto: BarSignWhiskeyEchoes
-  entities:
-  - uid: 2148
-    components:
-    - type: Transform
-      pos: -9.5,-11.5
-      parent: 2
 - proto: BaseGasCondenser
   entities:
   - uid: 2027
@@ -14990,12 +15021,12 @@ entities:
   - uid: 2508
     components:
     - type: Transform
-      pos: -10.679361,-10.430898
+      pos: -10.31862,-10.409195
       parent: 2
   - uid: 2509
     components:
     - type: Transform
-      pos: -10.312443,-10.430898
+      pos: -10.63112,-10.388348
       parent: 2
   - uid: 2546
     components:
@@ -15685,6 +15716,43 @@ entities:
     - type: Transform
       pos: -51.5,-58.5
       parent: 2
+- proto: BoxLightbulb
+  entities:
+  - uid: 1184
+    components:
+    - type: Transform
+      parent: 14959
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 1186
+    components:
+    - type: Transform
+      parent: 15157
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 1187
+    components:
+    - type: Transform
+      parent: 15164
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 16692
+    components:
+    - type: Transform
+      pos: -46.649345,-41.24076
+      parent: 2
+- proto: BoxLightbulbColorfulMixed
+  entities:
+  - uid: 1185
+    components:
+    - type: Transform
+      parent: 15153
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: BoxSyringe
   entities:
   - uid: 4202
@@ -15692,6 +15760,13 @@ entities:
     - type: Transform
       pos: 51.410686,12.618539
       parent: 2
+- proto: BoxWarmLightbulb
+  entities:
+  - uid: 16691
+    components:
+    - type: Transform
+      pos: -20.539528,-10.304252
+      parent: 2
 - proto: BriefcaseBrownFilled
   entities:
   - uid: 15229
@@ -15801,6 +15876,11 @@ entities:
     - type: Transform
       pos: 6.5,-75.5
       parent: 2
+  - uid: 3207
+    components:
+    - type: Transform
+      pos: -1.5,-61.5
+      parent: 2
 - proto: ButtonFrameExit
   entities:
   - uid: 14301
@@ -15981,6 +16061,11 @@ entities:
     - type: Transform
       pos: -37.5,0.5
       parent: 2
+  - uid: 1139
+    components:
+    - type: Transform
+      pos: 16.5,-58.5
+      parent: 2
   - uid: 1143
     components:
     - type: Transform
@@ -26886,6 +26971,11 @@ entities:
     - type: Transform
       pos: 26.5,-27.5
       parent: 2
+  - uid: 14207
+    components:
+    - type: Transform
+      pos: 15.5,-58.5
+      parent: 2
   - uid: 14670
     components:
     - type: Transform
@@ -27081,66 +27171,6 @@ entities:
     - type: Transform
       pos: 14.5,-60.5
       parent: 2
-  - uid: 14861
-    components:
-    - type: Transform
-      pos: 14.5,-59.5
-      parent: 2
-  - uid: 14862
-    components:
-    - type: Transform
-      pos: 14.5,-61.5
-      parent: 2
-  - uid: 14863
-    components:
-    - type: Transform
-      pos: 14.5,-62.5
-      parent: 2
-  - uid: 14864
-    components:
-    - type: Transform
-      pos: 14.5,-63.5
-      parent: 2
-  - uid: 14865
-    components:
-    - type: Transform
-      pos: 14.5,-64.5
-      parent: 2
-  - uid: 14866
-    components:
-    - type: Transform
-      pos: 14.5,-65.5
-      parent: 2
-  - uid: 14867
-    components:
-    - type: Transform
-      pos: 14.5,-66.5
-      parent: 2
-  - uid: 14868
-    components:
-    - type: Transform
-      pos: 14.5,-67.5
-      parent: 2
-  - uid: 14869
-    components:
-    - type: Transform
-      pos: 14.5,-68.5
-      parent: 2
-  - uid: 14870
-    components:
-    - type: Transform
-      pos: 14.5,-69.5
-      parent: 2
-  - uid: 14871
-    components:
-    - type: Transform
-      pos: 14.5,-70.5
-      parent: 2
-  - uid: 14872
-    components:
-    - type: Transform
-      pos: 14.5,-71.5
-      parent: 2
   - uid: 14873
     components:
     - type: Transform
@@ -27921,35 +27951,70 @@ entities:
     - type: Transform
       pos: -35.5,-45.5
       parent: 2
-  - uid: 16662
+  - uid: 16666
     components:
     - type: Transform
-      pos: -7.5,-66.5
+      pos: 16.5,-62.5
       parent: 2
-  - uid: 16663
+  - uid: 16667
     components:
     - type: Transform
-      pos: -7.5,-63.5
+      pos: 15.5,-60.5
       parent: 2
-  - uid: 16664
+  - uid: 16668
     components:
     - type: Transform
-      pos: -7.5,-69.5
+      pos: 16.5,-61.5
       parent: 2
-  - uid: 16665
+  - uid: 16669
     components:
     - type: Transform
-      pos: -6.5,-69.5
+      pos: 16.5,-67.5
       parent: 2
-  - uid: 16666
+  - uid: 16671
     components:
     - type: Transform
-      pos: -6.5,-66.5
+      pos: 16.5,-65.5
       parent: 2
-  - uid: 16667
+  - uid: 16672
     components:
     - type: Transform
-      pos: -6.5,-63.5
+      pos: 16.5,-66.5
+      parent: 2
+  - uid: 16673
+    components:
+    - type: Transform
+      pos: 16.5,-70.5
+      parent: 2
+  - uid: 16674
+    components:
+    - type: Transform
+      pos: 16.5,-64.5
+      parent: 2
+  - uid: 16675
+    components:
+    - type: Transform
+      pos: 16.5,-59.5
+      parent: 2
+  - uid: 16684
+    components:
+    - type: Transform
+      pos: 16.5,-68.5
+      parent: 2
+  - uid: 16685
+    components:
+    - type: Transform
+      pos: 16.5,-69.5
+      parent: 2
+  - uid: 16686
+    components:
+    - type: Transform
+      pos: 16.5,-63.5
+      parent: 2
+  - uid: 16687
+    components:
+    - type: Transform
+      pos: 16.5,-60.5
       parent: 2
 - proto: CableApcStack1
   entities:
@@ -40246,6 +40311,35 @@ entities:
     - type: Transform
       pos: 12.5,-29.5
       parent: 2
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 1184
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
   - uid: 15142
     components:
     - type: Transform
@@ -40306,6 +40400,35 @@ entities:
     - type: Transform
       pos: 46.5,-65.5
       parent: 2
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 1185
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
   - uid: 15154
     components:
     - type: Transform
@@ -40326,6 +40449,35 @@ entities:
     - type: Transform
       pos: -21.5,-20.5
       parent: 2
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 1186
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
   - uid: 15158
     components:
     - type: Transform
@@ -40361,6 +40513,35 @@ entities:
     - type: Transform
       pos: -39.5,-53.5
       parent: 2
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 1187
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
   - uid: 15165
     components:
     - type: Transform
@@ -41301,6 +41482,18 @@ entities:
     - type: Transform
       pos: 42.54701,-64.58094
       parent: 2
+- proto: CrateArtifactContainer
+  entities:
+  - uid: 16688
+    components:
+    - type: Transform
+      pos: 47.5,-46.5
+      parent: 2
+  - uid: 16689
+    components:
+    - type: Transform
+      pos: 47.5,-42.5
+      parent: 2
 - proto: CrateCommandSecure
   entities:
   - uid: 15674
@@ -41563,6 +41756,35 @@ entities:
     - type: Transform
       pos: -43.5,-42.5
       parent: 2
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 1188
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
 - proto: Crematorium
   entities:
   - uid: 4980
@@ -41612,18 +41834,16 @@ entities:
       parent: 2
 - proto: CryogenicSleepUnitSpawner
   entities:
-  - uid: 2226
+  - uid: 1189
     components:
     - type: Transform
-      pos: -11.5,-31.5
+      rot: 3.141592653589793 rad
+      pos: -13.5,-31.5
       parent: 2
-- proto: CryogenicSleepUnitSpawnerLateJoin
-  entities:
-  - uid: 2224
+  - uid: 2226
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -13.5,-31.5
+      pos: -11.5,-31.5
       parent: 2
 - proto: CryoPod
   entities:
@@ -47114,6 +47334,14 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 60.730923,-6.308705
       parent: 2
+- proto: DrinkCoffeeLiqueurBottleFull
+  entities:
+  - uid: 1044
+    components:
+    - type: Transform
+      parent: 141
+    - type: Physics
+      canCollide: False
 - proto: DrinkDetFlask
   entities:
   - uid: 13525
@@ -47130,6 +47358,28 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 4.496311,-7.2920284
       parent: 2
+- proto: DrinkFlaskBar
+  entities:
+  - uid: 16706
+    components:
+    - type: Transform
+      parent: 16701
+    - type: Physics
+      canCollide: False
+  - uid: 16707
+    components:
+    - type: Transform
+      parent: 16701
+    - type: Physics
+      canCollide: False
+- proto: DrinkGildlagerBottleFull
+  entities:
+  - uid: 1038
+    components:
+    - type: Transform
+      parent: 141
+    - type: Physics
+      canCollide: False
 - proto: DrinkGlass
   entities:
   - uid: 15627
@@ -47181,6 +47431,28 @@ entities:
     - type: Transform
       pos: 54.695526,4.674603
       parent: 2
+- proto: DrinkRumBottleFull
+  entities:
+  - uid: 201
+    components:
+    - type: Transform
+      parent: 141
+    - type: Physics
+      canCollide: False
+- proto: DrinkShaker
+  entities:
+  - uid: 16702
+    components:
+    - type: Transform
+      parent: 16701
+    - type: Physics
+      canCollide: False
+  - uid: 16703
+    components:
+    - type: Transform
+      parent: 16701
+    - type: Physics
+      canCollide: False
 - proto: DrinkShotGlass
   entities:
   - uid: 5372
@@ -47225,6 +47497,28 @@ entities:
       parent: 2
     - type: CollisionWake
       enabled: False
+- proto: DrinkTequilaBottleFull
+  entities:
+  - uid: 1045
+    components:
+    - type: Transform
+      parent: 141
+    - type: Physics
+      canCollide: False
+- proto: DrinkVacuumFlask
+  entities:
+  - uid: 16708
+    components:
+    - type: Transform
+      parent: 16701
+    - type: Physics
+      canCollide: False
+  - uid: 16709
+    components:
+    - type: Transform
+      parent: 16701
+    - type: Physics
+      canCollide: False
 - proto: DrinkWaterBottleFull
   entities:
   - uid: 14915
@@ -47251,6 +47545,12 @@ entities:
       parent: 2
 - proto: DrinkWhiskeyBottleFull
   entities:
+  - uid: 1033
+    components:
+    - type: Transform
+      parent: 141
+    - type: Physics
+      canCollide: False
   - uid: 5371
     components:
     - type: Transform
@@ -47258,6 +47558,12 @@ entities:
       parent: 2
 - proto: DrinkWineBottleFull
   entities:
+  - uid: 1042
+    components:
+    - type: Transform
+      parent: 141
+    - type: Physics
+      canCollide: False
   - uid: 15624
     components:
     - type: Transform
@@ -49472,6 +49778,44 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: FoodCondimentBottleBBQ
+  entities:
+  - uid: 1074
+    components:
+    - type: Transform
+      parent: 1046
+    - type: Physics
+      canCollide: False
+- proto: FoodCondimentBottleEnzyme
+  entities:
+  - uid: 1076
+    components:
+    - type: Transform
+      parent: 1046
+    - type: Physics
+      canCollide: False
+  - uid: 1077
+    components:
+    - type: Transform
+      parent: 1046
+    - type: Physics
+      canCollide: False
+- proto: FoodCondimentBottleHotsauce
+  entities:
+  - uid: 1054
+    components:
+    - type: Transform
+      parent: 1046
+    - type: Physics
+      canCollide: False
+- proto: FoodCondimentBottleKetchup
+  entities:
+  - uid: 1058
+    components:
+    - type: Transform
+      parent: 1046
+    - type: Physics
+      canCollide: False
 - proto: FoodPieBananaCream
   entities:
   - uid: 1970
@@ -49502,6 +49846,27 @@ entities:
     - type: Transform
       pos: 44.514366,-72.395256
       parent: 2
+- proto: FoodShakerPepper
+  entities:
+  - uid: 1048
+    components:
+    - type: Transform
+      parent: 1046
+    - type: Physics
+      canCollide: False
+- proto: FoodShakerSalt
+  entities:
+  - uid: 1047
+    components:
+    - type: Transform
+      parent: 1046
+    - type: Physics
+      canCollide: False
+  - uid: 16710
+    components:
+    - type: Transform
+      pos: -13.370704,-11.858118
+      parent: 2
 - proto: FuelDispenser
   entities:
   - uid: 15579
@@ -49679,6 +50044,16 @@ entities:
       connected: True
 - proto: GasOutletInjector
   entities:
+  - uid: 1190
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,-66.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 1512
     components:
     - type: Transform
@@ -49924,14 +50299,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#05B2DCFF'
-  - uid: 16659
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -8.5,-66.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
 - proto: GasPipeBend
   entities:
   - uid: 527
@@ -49974,36 +50341,6 @@ entities:
       color: '#990000FF'
     - type: VentCrawTube
       connected: True
-  - uid: 1038
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-63.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
-    - type: VentCrawTube
-      connected: True
-  - uid: 1046
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-63.5
-      parent: 2
-    - type: VentCrawTube
-      connected: True
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
-  - uid: 1048
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -7.5,-70.5
-      parent: 2
-    - type: VentCrawTube
-      connected: True
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
   - uid: 1055
     components:
     - type: Transform
@@ -50044,25 +50381,6 @@ entities:
       connected: True
     - type: AtmosPipeColor
       color: '#EF6F6CFF'
-  - uid: 1182
-    components:
-    - type: Transform
-      pos: 10.5,-67.5
-      parent: 2
-    - type: VentCrawTube
-      connected: True
-    - type: AtmosPipeColor
-      color: '#EF6F6CFF'
-  - uid: 1183
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 10.5,-65.5
-      parent: 2
-    - type: VentCrawTube
-      connected: True
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
   - uid: 1232
     components:
     - type: Transform
@@ -50082,16 +50400,6 @@ entities:
       connected: True
     - type: AtmosPipeColor
       color: '#EF6F6CFF'
-  - uid: 1246
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,-67.5
-      parent: 2
-    - type: VentCrawTube
-      connected: True
-    - type: AtmosPipeColor
-      color: '#EF6F6CFF'
   - uid: 1247
     components:
     - type: Transform
@@ -50152,15 +50460,6 @@ entities:
       color: '#EF6F6CFF'
     - type: VentCrawTube
       connected: True
-  - uid: 1317
-    components:
-    - type: Transform
-      pos: 10.5,-62.5
-      parent: 2
-    - type: VentCrawTube
-      connected: True
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
   - uid: 1385
     components:
     - type: Transform
@@ -50288,20 +50587,10 @@ entities:
       connected: True
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 5009
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -6.5,-73.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
-    - type: VentCrawTube
-      connected: True
-  - uid: 7401
+  - uid: 5951
     components:
     - type: Transform
-      pos: 6.5,-63.5
+      pos: 1.5,-63.5
       parent: 2
     - type: VentCrawTube
       connected: True
@@ -52015,101 +52304,99 @@ entities:
       connected: True
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 15095
+  - uid: 14847
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,-72.5
+      pos: -2.5,-62.5
       parent: 2
     - type: VentCrawTube
       connected: True
     - type: AtmosPipeColor
       color: '#087CA7FF'
-  - uid: 15096
+  - uid: 14861
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -5.5,-74.5
+      pos: -2.5,-63.5
       parent: 2
     - type: VentCrawTube
       connected: True
     - type: AtmosPipeColor
       color: '#087CA7FF'
-  - uid: 15100
+  - uid: 14864
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 6.5,-65.5
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-64.5
       parent: 2
     - type: VentCrawTube
       connected: True
     - type: AtmosPipeColor
       color: '#087CA7FF'
-  - uid: 15960
+  - uid: 15095
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -7.5,-82.5
+      pos: -5.5,-72.5
       parent: 2
     - type: VentCrawTube
       connected: True
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 15961
+      color: '#087CA7FF'
+  - uid: 15096
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -7.5,-80.5
+      rot: 3.141592653589793 rad
+      pos: -5.5,-74.5
       parent: 2
     - type: VentCrawTube
       connected: True
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 15962
+      color: '#087CA7FF'
+  - uid: 15960
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -7.5,-78.5
+      pos: -7.5,-82.5
       parent: 2
     - type: VentCrawTube
       connected: True
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 16643
+  - uid: 15961
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 3.5,-72.5
+      pos: -7.5,-80.5
       parent: 2
     - type: VentCrawTube
       connected: True
     - type: AtmosPipeColor
-      color: '#087CA7FF'
-  - uid: 16644
+      color: '#990000FF'
+  - uid: 15962
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-72.5
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-78.5
       parent: 2
     - type: VentCrawTube
       connected: True
     - type: AtmosPipeColor
-      color: '#087CA7FF'
-  - uid: 16645
+      color: '#990000FF'
+  - uid: 16642
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 4.5,-69.5
+      pos: 6.5,-63.5
       parent: 2
     - type: VentCrawTube
       connected: True
     - type: AtmosPipeColor
       color: '#087CA7FF'
-  - uid: 16646
+  - uid: 16644
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-69.5
+      pos: 3.5,-74.5
       parent: 2
     - type: VentCrawTube
       connected: True
@@ -52268,15 +52555,6 @@ entities:
       connected: True
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 15240
-    components:
-    - type: Transform
-      pos: 6.5,-63.5
-      parent: 2
-    - type: VentCrawTube
-      connected: True
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
 - proto: GasPipeBendAlt2
   entities:
   - uid: 3836
@@ -52311,15 +52589,6 @@ entities:
       connected: True
 - proto: GasPipeFourway
   entities:
-  - uid: 1047
-    components:
-    - type: Transform
-      pos: -2.5,-69.5
-      parent: 2
-    - type: VentCrawTube
-      connected: True
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
   - uid: 1075
     components:
     - type: Transform
@@ -52547,21 +52816,6 @@ entities:
       color: '#0055CCFF'
 - proto: GasPipeManifold
   entities:
-  - uid: 1050
-    components:
-    - type: Transform
-      pos: 6.5,-64.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
-  - uid: 1237
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-63.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
   - uid: 1253
     components:
     - type: Transform
@@ -52696,10 +52950,10 @@ entities:
       color: '#03FCD3FF'
 - proto: GasPipeSensorTEGCold
   entities:
-  - uid: 1076
+  - uid: 1175
     components:
     - type: Transform
-      pos: 10.5,-64.5
+      pos: 6.5,-64.5
       parent: 2
     - type: AtmosPipeColor
       color: '#087CA7FF'
@@ -52754,15 +53008,6 @@ entities:
       connected: True
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1044
-    components:
-    - type: Transform
-      pos: -2.5,-64.5
-      parent: 2
-    - type: VentCrawTube
-      connected: True
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
   - uid: 1049
     components:
     - type: Transform
@@ -52793,30 +53038,11 @@ entities:
       color: '#087CA7FF'
     - type: VentCrawTube
       connected: True
-  - uid: 1085
-    components:
-    - type: Transform
-      pos: -2.5,-65.5
-      parent: 2
-    - type: VentCrawTube
-      connected: True
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
-  - uid: 1090
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-65.5
-      parent: 2
-    - type: VentCrawTube
-      connected: True
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
-  - uid: 1094
+  - uid: 1081
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -2.5,-62.5
+      pos: 11.5,-64.5
       parent: 2
     - type: VentCrawTube
       connected: True
@@ -52841,35 +53067,6 @@ entities:
       connected: True
     - type: AtmosPipeColor
       color: '#087CA7FF'
-  - uid: 1139
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-63.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
-    - type: VentCrawTube
-      connected: True
-  - uid: 1141
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-63.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
-    - type: VentCrawTube
-      connected: True
-  - uid: 1145
-    components:
-    - type: Transform
-      pos: -6.5,-72.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
-    - type: VentCrawTube
-      connected: True
   - uid: 1161
     components:
     - type: Transform
@@ -52879,96 +53076,6 @@ entities:
       color: '#990000FF'
     - type: VentCrawTube
       connected: True
-  - uid: 1175
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-62.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
-    - type: VentCrawTube
-      connected: True
-  - uid: 1177
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,-62.5
-      parent: 2
-    - type: VentCrawTube
-      connected: True
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
-  - uid: 1184
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-62.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
-    - type: VentCrawTube
-      connected: True
-  - uid: 1185
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,-62.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
-    - type: VentCrawTube
-      connected: True
-  - uid: 1186
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,-62.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
-    - type: VentCrawTube
-      connected: True
-  - uid: 1187
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,-62.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
-    - type: VentCrawTube
-      connected: True
-  - uid: 1188
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-62.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
-    - type: VentCrawTube
-      connected: True
-  - uid: 1189
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-62.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
-    - type: VentCrawTube
-      connected: True
-  - uid: 1190
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-62.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
-    - type: VentCrawTube
-      connected: True
   - uid: 1191
     components:
     - type: Transform
@@ -53056,26 +53163,6 @@ entities:
       connected: True
     - type: AtmosPipeColor
       color: '#087CA7FF'
-  - uid: 1241
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 9.5,-62.5
-      parent: 2
-    - type: VentCrawTube
-      connected: True
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
-  - uid: 1242
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 10.5,-63.5
-      parent: 2
-    - type: VentCrawTube
-      connected: True
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
   - uid: 1249
     components:
     - type: Transform
@@ -54447,11 +54534,11 @@ entities:
       connected: True
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 5007
+  - uid: 5398
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 7.5,-62.5
+      pos: 12.5,-63.5
       parent: 2
     - type: VentCrawTube
       connected: True
@@ -54467,6 +54554,26 @@ entities:
       connected: True
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 5949
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-63.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 5963
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 13.5,-64.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
   - uid: 6564
     components:
     - type: Transform
@@ -54497,6 +54604,16 @@ entities:
       color: '#0055CCFF'
     - type: VentCrawTube
       connected: True
+  - uid: 7401
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,-64.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
   - uid: 8380
     components:
     - type: Transform
@@ -69140,20 +69257,51 @@ entities:
       connected: True
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 14208
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-63.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
   - uid: 14829
     components:
     - type: Transform
-      pos: -6.5,-71.5
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-63.5
       parent: 2
+    - type: VentCrawTube
+      connected: True
     - type: AtmosPipeColor
       color: '#087CA7FF'
+  - uid: 14862
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-63.5
+      parent: 2
     - type: VentCrawTube
       connected: True
-  - uid: 15099
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 14870
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-63.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 14872
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 6.5,-62.5
+      pos: 13.5,-63.5
       parent: 2
     - type: VentCrawTube
       connected: True
@@ -69281,8 +69429,8 @@ entities:
   - uid: 16640
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-66.5
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-63.5
       parent: 2
     - type: VentCrawTube
       connected: True
@@ -69291,56 +69439,8 @@ entities:
   - uid: 16641
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-67.5
-      parent: 2
-    - type: VentCrawTube
-      connected: True
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
-  - uid: 16642
-    components:
-    - type: Transform
-      pos: -2.5,-67.5
-      parent: 2
-    - type: VentCrawTube
-      connected: True
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
-  - uid: 16647
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-68.5
-      parent: 2
-    - type: VentCrawTube
-      connected: True
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
-  - uid: 16648
-    components:
-    - type: Transform
-      pos: -2.5,-66.5
-      parent: 2
-    - type: VentCrawTube
-      connected: True
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
-  - uid: 16649
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-70.5
-      parent: 2
-    - type: VentCrawTube
-      connected: True
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
-  - uid: 16650
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-71.5
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-63.5
       parent: 2
     - type: VentCrawTube
       connected: True
@@ -69350,7 +69450,7 @@ entities:
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 3.5,-73.5
+      pos: -7.5,-66.5
       parent: 2
     - type: VentCrawTube
       connected: True
@@ -69376,88 +69476,48 @@ entities:
       connected: True
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 16660
+  - uid: 16655
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -6.5,-66.5
+      rot: 3.141592653589793 rad
+      pos: -5.5,-66.5
       parent: 2
     - type: VentCrawTube
       connected: True
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 16661
+      color: '#087CA7FF'
+  - uid: 16660
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -7.5,-66.5
+      pos: -6.5,-66.5
       parent: 2
     - type: VentCrawTube
       connected: True
     - type: AtmosPipeColor
       color: '#990000FF'
-- proto: GasPipeStraightAlt1
-  entities:
-  - uid: 1045
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-63.5
-      parent: 2
-    - type: VentCrawTube
-      connected: True
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
-  - uid: 1058
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-63.5
-      parent: 2
-    - type: VentCrawTube
-      connected: True
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
-  - uid: 1077
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-63.5
-      parent: 2
-    - type: VentCrawTube
-      connected: True
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
-  - uid: 1081
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-63.5
-      parent: 2
-    - type: VentCrawTube
-      connected: True
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
-  - uid: 1083
+  - uid: 16661
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-63.5
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-66.5
       parent: 2
     - type: VentCrawTube
       connected: True
     - type: AtmosPipeColor
-      color: '#087CA7FF'
-  - uid: 1084
+      color: '#990000FF'
+  - uid: 16665
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-63.5
+      rot: 3.141592653589793 rad
+      pos: -6.5,-66.5
       parent: 2
     - type: VentCrawTube
       connected: True
     - type: AtmosPipeColor
       color: '#087CA7FF'
+- proto: GasPipeStraightAlt1
+  entities:
   - uid: 2676
     components:
     - type: Transform
@@ -69785,15 +69845,16 @@ entities:
       color: '#087CA7FF'
     - type: VentCrawTube
       connected: True
-  - uid: 1118
+  - uid: 1177
     components:
     - type: Transform
-      pos: 5.5,-63.5
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-67.5
       parent: 2
     - type: VentCrawTube
       connected: True
     - type: AtmosPipeColor
-      color: '#087CA7FF'
+      color: '#EF6F6CFF'
   - uid: 1194
     components:
     - type: Transform
@@ -69804,20 +69865,40 @@ entities:
       connected: True
     - type: AtmosPipeColor
       color: '#EF6F6CFF'
-  - uid: 1227
+  - uid: 1238
+    components:
+    - type: Transform
+      pos: -0.5,-69.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 1242
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 3.5,-74.5
+      pos: 10.5,-65.5
       parent: 2
     - type: VentCrawTube
       connected: True
     - type: AtmosPipeColor
       color: '#087CA7FF'
-  - uid: 1238
+  - uid: 1246
     components:
     - type: Transform
-      pos: -0.5,-69.5
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-67.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#EF6F6CFF'
+  - uid: 1265
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-65.5
       parent: 2
     - type: VentCrawTube
       connected: True
@@ -70070,6 +70151,15 @@ entities:
       connected: True
     - type: AtmosPipeColor
       color: '#087CA7FF'
+  - uid: 5009
+    components:
+    - type: Transform
+      pos: -2.5,-69.5
+      parent: 2
+    - type: VentCrawTube
+      connected: True
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
   - uid: 5079
     components:
     - type: Transform
@@ -72682,18 +72772,6 @@ entities:
       color: '#0055CCFF'
     - type: VentCrawTube
       connected: True
-  - uid: 1033
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-64.5
-      parent: 2
-    - type: GasPressurePump
-      targetPressure: 2000
-    - type: VentCrawTube
-      connected: True
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
   - uid: 1051
     components:
     - type: Transform
@@ -72706,20 +72784,6 @@ entities:
       color: '#087CA7FF'
     - type: VentCrawTube
       connected: True
-  - uid: 1054
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-63.5
-      parent: 2
-    - type: GasPressurePump
-      targetPressure: 4000
-    - type: VentCrawTube
-      connected: True
-    - type: AtmosPipeLayers
-      pipeLayer: Secondary
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
   - uid: 1195
     components:
     - type: Transform
@@ -72727,7 +72791,7 @@ entities:
       pos: -0.5,-70.5
       parent: 2
     - type: GasPressurePump
-      targetPressure: 250
+      targetPressure: 245
     - type: VentCrawTube
       connected: True
     - type: AtmosPipeColor
@@ -72768,18 +72832,6 @@ entities:
       connected: True
     - type: AtmosPipeColor
       color: '#EF6F6CFF'
-  - uid: 1265
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-63.5
-      parent: 2
-    - type: GasPressurePump
-      targetPressure: 4500
-    - type: VentCrawTube
-      connected: True
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
   - uid: 1324
     components:
     - type: Transform
@@ -72963,16 +73015,16 @@ entities:
       connected: True
     - type: AtmosPipeLayers
       pipeLayer: Secondary
-- proto: GasPressureRegulator
-  entities:
-  - uid: 1088
+  - uid: 15103
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,-68.5
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-63.5
       parent: 2
-    - type: GasPressureRegulator
-      threshold: 1000
+    - type: GasPressurePump
+      targetPressure: 4500
+    - type: VentCrawTube
+      connected: True
     - type: AtmosPipeColor
       color: '#087CA7FF'
 - proto: GasRecyclerMachineCircuitboard
@@ -73021,6 +73073,18 @@ entities:
       parent: 2
     - type: GasThermoMachine
       targetTemperature: 295.15
+  - uid: 5953
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,-80.5
+      parent: 2
+  - uid: 5965
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-80.5
+      parent: 2
 - proto: GasThermoMachineFreezerEnabled
   entities:
   - uid: 523
@@ -77049,15 +77113,6 @@ entities:
       pipeLayer: Secondary
 - proto: GasVolumePump
   entities:
-  - uid: 1042
-    components:
-    - type: Transform
-      pos: -7.5,-69.5
-      parent: 2
-    - type: VentCrawTube
-      connected: True
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
   - uid: 1059
     components:
     - type: Transform
@@ -77068,43 +77123,25 @@ entities:
       color: '#087CA7FF'
     - type: VentCrawTube
       connected: True
-  - uid: 1074
-    components:
-    - type: Transform
-      pos: -6.5,-63.5
-      parent: 2
-    - type: VentCrawTube
-      connected: True
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
-  - uid: 1091
-    components:
-    - type: Transform
-      pos: -5.5,-66.5
-      parent: 2
-    - type: VentCrawTube
-      connected: True
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
-  - uid: 1093
+  - uid: 1180
     components:
     - type: Transform
-      pos: -7.5,-66.5
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-65.5
       parent: 2
     - type: VentCrawTube
       connected: True
     - type: AtmosPipeColor
       color: '#087CA7FF'
-  - uid: 1180
+  - uid: 1237
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 9.5,-65.5
+      pos: 6.5,-66.5
       parent: 2
     - type: VentCrawTube
       connected: True
     - type: AtmosPipeColor
-      color: '#087CA7FF'
+      color: '#EF6F6CFF'
   - uid: 1243
     components:
     - type: Transform
@@ -77147,10 +77184,11 @@ entities:
       connected: True
     - type: AtmosPipeColor
       color: '#EF6F6CFF'
-  - uid: 1314
+  - uid: 5948
     components:
     - type: Transform
-      pos: -7.5,-63.5
+      rot: 3.141592653589793 rad
+      pos: 10.5,-66.5
       parent: 2
     - type: VentCrawTube
       connected: True
@@ -77165,15 +77203,6 @@ entities:
       connected: True
     - type: AtmosPipeColor
       color: '#EF6F6CFF'
-  - uid: 15097
-    components:
-    - type: Transform
-      pos: -6.5,-69.5
-      parent: 2
-    - type: VentCrawTube
-      connected: True
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
   - uid: 15101
     components:
     - type: Transform
@@ -77184,33 +77213,6 @@ entities:
       connected: True
     - type: AtmosPipeColor
       color: '#087CA7FF'
-  - uid: 15103
-    components:
-    - type: Transform
-      pos: -5.5,-63.5
-      parent: 2
-    - type: VentCrawTube
-      connected: True
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
-  - uid: 15111
-    components:
-    - type: Transform
-      pos: -5.5,-69.5
-      parent: 2
-    - type: VentCrawTube
-      connected: True
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
-  - uid: 16655
-    components:
-    - type: Transform
-      pos: -6.5,-66.5
-      parent: 2
-    - type: VentCrawTube
-      connected: True
-    - type: AtmosPipeColor
-      color: '#087CA7FF'
 - proto: GavelBlock
   entities:
   - uid: 13731
@@ -77697,6 +77699,51 @@ entities:
     - type: Transform
       pos: -4.5,-69.5
       parent: 2
+  - uid: 1083
+    components:
+    - type: Transform
+      pos: 16.5,-62.5
+      parent: 2
+  - uid: 1084
+    components:
+    - type: Transform
+      pos: 16.5,-61.5
+      parent: 2
+  - uid: 1085
+    components:
+    - type: Transform
+      pos: 16.5,-58.5
+      parent: 2
+  - uid: 1088
+    components:
+    - type: Transform
+      pos: 16.5,-59.5
+      parent: 2
+  - uid: 1090
+    components:
+    - type: Transform
+      pos: 16.5,-65.5
+      parent: 2
+  - uid: 1091
+    components:
+    - type: Transform
+      pos: 16.5,-63.5
+      parent: 2
+  - uid: 1093
+    components:
+    - type: Transform
+      pos: 16.5,-64.5
+      parent: 2
+  - uid: 1094
+    components:
+    - type: Transform
+      pos: 16.5,-67.5
+      parent: 2
+  - uid: 1118
+    components:
+    - type: Transform
+      pos: 16.5,-66.5
+      parent: 2
   - uid: 1159
     components:
     - type: Transform
@@ -79397,11 +79444,6 @@ entities:
     - type: Transform
       pos: 53.5,-53.5
       parent: 2
-  - uid: 4622
-    components:
-    - type: Transform
-      pos: 14.5,-60.5
-      parent: 2
   - uid: 4668
     components:
     - type: Transform
@@ -79817,16 +79859,6 @@ entities:
     - type: Transform
       pos: 47.5,13.5
       parent: 2
-  - uid: 5397
-    components:
-    - type: Transform
-      pos: 14.5,-59.5
-      parent: 2
-  - uid: 5398
-    components:
-    - type: Transform
-      pos: 14.5,-61.5
-      parent: 2
   - uid: 5408
     components:
     - type: Transform
@@ -80692,51 +80724,11 @@ entities:
     - type: Transform
       pos: 31.5,-73.5
       parent: 2
-  - uid: 5947
-    components:
-    - type: Transform
-      pos: 14.5,-62.5
-      parent: 2
-  - uid: 5948
-    components:
-    - type: Transform
-      pos: 14.5,-69.5
-      parent: 2
-  - uid: 5949
-    components:
-    - type: Transform
-      pos: 14.5,-65.5
-      parent: 2
-  - uid: 5950
-    components:
-    - type: Transform
-      pos: 14.5,-63.5
-      parent: 2
-  - uid: 5951
-    components:
-    - type: Transform
-      pos: 14.5,-68.5
-      parent: 2
   - uid: 5952
     components:
     - type: Transform
       pos: 16.5,-71.5
       parent: 2
-  - uid: 5953
-    components:
-    - type: Transform
-      pos: 14.5,-64.5
-      parent: 2
-  - uid: 5954
-    components:
-    - type: Transform
-      pos: 14.5,-71.5
-      parent: 2
-  - uid: 5955
-    components:
-    - type: Transform
-      pos: 14.5,-67.5
-      parent: 2
   - uid: 5958
     components:
     - type: Transform
@@ -80752,16 +80744,6 @@ entities:
     - type: Transform
       pos: 17.5,-73.5
       parent: 2
-  - uid: 5963
-    components:
-    - type: Transform
-      pos: 14.5,-66.5
-      parent: 2
-  - uid: 5965
-    components:
-    - type: Transform
-      pos: 14.5,-70.5
-      parent: 2
   - uid: 5968
     components:
     - type: Transform
@@ -81717,11 +81699,6 @@ entities:
     - type: Transform
       pos: -7.5,-75.5
       parent: 2
-  - uid: 14847
-    components:
-    - type: Transform
-      pos: 15.5,-71.5
-      parent: 2
   - uid: 15071
     components:
     - type: Transform
@@ -82237,6 +82214,31 @@ entities:
     - type: Transform
       pos: -9.5,-67.5
       parent: 2
+  - uid: 16670
+    components:
+    - type: Transform
+      pos: 16.5,-69.5
+      parent: 2
+  - uid: 16676
+    components:
+    - type: Transform
+      pos: 16.5,-70.5
+      parent: 2
+  - uid: 16677
+    components:
+    - type: Transform
+      pos: 16.5,-60.5
+      parent: 2
+  - uid: 16678
+    components:
+    - type: Transform
+      pos: 16.5,-68.5
+      parent: 2
+  - uid: 16679
+    components:
+    - type: Transform
+      pos: 15.5,-58.5
+      parent: 2
 - proto: GrilleBroken
   entities:
   - uid: 4370
@@ -82702,6 +82704,13 @@ entities:
     - type: Transform
       pos: 50.5,5.5
       parent: 2
+- proto: GunSafePistolMk58
+  entities:
+  - uid: 16696
+    components:
+    - type: Transform
+      pos: 47.5,5.5
+      parent: 2
 - proto: GunSafeRifleLecter
   entities:
   - uid: 5253
@@ -82830,6 +82839,134 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#EF6F6CFF'
+  - uid: 1317
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -6.5,-71.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 2148
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 15.5,-63.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 2224
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 15.5,-67.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 3208
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,-66.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 3209
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,-69.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 4622
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,-68.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 5007
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 15.5,-61.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 5397
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 15.5,-62.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 5950
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 15.5,-66.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 5954
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,-62.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 5955
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -6.5,-72.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 14868
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 15.5,-68.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 14869
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 15.5,-69.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 14871
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 15.5,-70.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 15097
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,-70.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 15099
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,-67.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
   - uid: 15104
     components:
     - type: Transform
@@ -82878,6 +83015,102 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#087CA7FF'
+  - uid: 15111
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,-60.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 15240
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,-61.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 16643
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 15.5,-64.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 16645
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 15.5,-65.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 16646
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 15.5,-60.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 16647
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,-65.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 16649
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-69.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 16650
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -6.5,-63.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 16659
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-63.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 16662
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -6.5,-69.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 16663
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -7.5,-63.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 16664
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -7.5,-69.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
 - proto: HeatExchangerBend
   entities:
   - uid: 1078
@@ -82888,6 +83121,45 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#087CA7FF'
+  - uid: 1141
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,-71.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 1145
+    components:
+    - type: Transform
+      pos: 15.5,-59.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 1182
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-71.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 1183
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,-59.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 1241
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -7.5,-70.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
   - uid: 1272
     components:
     - type: Transform
@@ -82966,6 +83238,29 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#EF6F6CFF'
+  - uid: 5947
+    components:
+    - type: Transform
+      pos: 14.5,-64.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 14866
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -6.5,-73.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
+  - uid: 16648
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-63.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#087CA7FF'
 - proto: HighSecArmoryLocked
   entities:
   - uid: 5177
@@ -84159,6 +84454,13 @@ entities:
       parent: 2
 - proto: LightReplacer
   entities:
+  - uid: 1188
+    components:
+    - type: Transform
+      parent: 2858
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
   - uid: 2796
     components:
     - type: Transform
@@ -84210,6 +84512,19 @@ entities:
         - Pressed: Toggle
         2100:
         - Pressed: Toggle
+- proto: LockableButtonEngineering
+  entities:
+  - uid: 15100
+    components:
+    - type: MetaData
+      name: Chamber Blast Door
+    - type: Transform
+      pos: -1.5,-61.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        956:
+        - Pressed: Toggle
 - proto: LockableButtonMedical
   entities:
   - uid: 14200
@@ -84629,22 +84944,22 @@ entities:
           showEnts: False
           occludes: True
           ent: null
-- proto: LockerMiningSpecialist
+- proto: LockerMiningSpecialistFilled
   entities:
-  - uid: 3207
+  - uid: 16680
     components:
     - type: Transform
-      pos: -53.5,17.5
+      pos: -53.5,15.5
       parent: 2
-  - uid: 3208
+  - uid: 16681
     components:
     - type: Transform
       pos: -53.5,16.5
       parent: 2
-  - uid: 3209
+  - uid: 16682
     components:
     - type: Transform
-      pos: -53.5,15.5
+      pos: -53.5,17.5
       parent: 2
 - proto: LockerParamedicFilled
   entities:
@@ -84702,10 +85017,10 @@ entities:
       parent: 2
 - proto: LockerRepresentativeFilled
   entities:
-  - uid: 201
+  - uid: 16699
     components:
     - type: Transform
-      pos: 6.5,-13.5
+      pos: 5.5,-14.5
       parent: 2
 - proto: LockerResearchDirectorFilled
   entities:
@@ -85137,6 +85452,20 @@ entities:
     - type: Transform
       pos: 46.5,-32.5
       parent: 2
+- proto: MagazinePistolSubMachineGunTopMounted
+  entities:
+  - uid: 16694
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 56.488785,1.5012767
+      parent: 2
+  - uid: 16695
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 56.56691,1.6889064
+      parent: 2
 - proto: MailingUnitBar
   entities:
   - uid: 2364
@@ -85339,6 +85668,27 @@ entities:
     - type: Transform
       pos: -0.5,-29.5
       parent: 2
+- proto: MedkitBruteFilled
+  entities:
+  - uid: 16698
+    components:
+    - type: Transform
+      pos: 47.504448,12.636295
+      parent: 2
+- proto: MedkitBurnFilled
+  entities:
+  - uid: 16697
+    components:
+    - type: Transform
+      pos: 49.441948,12.636295
+      parent: 2
+- proto: MedkitCombatFilled
+  entities:
+  - uid: 16700
+    components:
+    - type: Transform
+      pos: 6.4979944,-13.282039
+      parent: 2
 - proto: MedkitRadiationFilled
   entities:
   - uid: 16626
@@ -89625,6 +89975,18 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -50.5,-60.5
       parent: 2
+- proto: RandomArtifactSpawner
+  entities:
+  - uid: 14865
+    components:
+    - type: Transform
+      pos: 52.5,-40.5
+      parent: 2
+  - uid: 14867
+    components:
+    - type: Transform
+      pos: 52.5,-48.5
+      parent: 2
 - proto: RandomCableApcExtensionSpawner
   entities:
   - uid: 15532
@@ -91781,6 +92143,14 @@ entities:
     - type: Transform
       pos: -33.5,20.5
       parent: 2
+- proto: ReagentContainerMayo
+  entities:
+  - uid: 1050
+    components:
+    - type: Transform
+      parent: 1046
+    - type: Physics
+      canCollide: False
 - proto: Recycler
   entities:
   - uid: 2535
@@ -94186,6 +94556,26 @@ entities:
     - type: Transform
       pos: 26.5,4.5
       parent: 2
+- proto: RemoteSignaller
+  entities:
+  - uid: 1227
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.7604966,-81.182846
+      parent: 2
+  - uid: 1314
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.7004359,-61.206112
+      parent: 2
+  - uid: 14863
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.605528,-44.18234
+      parent: 2
 - proto: ResearchAndDevelopmentServer
   entities:
   - uid: 3959
@@ -94529,6 +94919,11 @@ entities:
     - type: Transform
       pos: 26.605242,-70.32316
       parent: 2
+  - uid: 16690
+    components:
+    - type: Transform
+      pos: 35.476307,-46.29501
+      parent: 2
 - proto: SheetPlastic
   entities:
   - uid: 2296
@@ -94715,6 +95110,138 @@ entities:
     - type: Transform
       pos: 2.5876215,-53.372147
       parent: 2
+- proto: ShelfBar
+  entities:
+  - uid: 141
+    components:
+    - type: Transform
+      pos: -10.5,-11.5
+      parent: 2
+    - type: Storage
+      storedItems:
+        201:
+          position: 4,0
+          _rotation: South
+        1033:
+          position: 0,0
+          _rotation: South
+        1038:
+          position: 0,3
+          _rotation: South
+        1042:
+          position: 2,0
+          _rotation: South
+        1044:
+          position: 2,3
+          _rotation: South
+        1045:
+          position: 4,3
+          _rotation: South
+    - type: ContainerContainer
+      containers:
+        storagebase: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 1042
+          - 1033
+          - 201
+          - 1038
+          - 1044
+          - 1045
+  - uid: 16701
+    components:
+    - type: Transform
+      pos: -9.5,-11.5
+      parent: 2
+    - type: Storage
+      storedItems:
+        16702:
+          position: 0,0
+          _rotation: South
+        16703:
+          position: 1,0
+          _rotation: South
+        16704:
+          position: 5,4
+          _rotation: South
+        16705:
+          position: 5,3
+          _rotation: South
+        16706:
+          position: 2,0
+          _rotation: South
+        16707:
+          position: 3,0
+          _rotation: South
+        16708:
+          position: 4,0
+          _rotation: South
+        16709:
+          position: 5,0
+          _rotation: South
+    - type: ContainerContainer
+      containers:
+        storagebase: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 16702
+          - 16703
+          - 16705
+          - 16704
+          - 16706
+          - 16707
+          - 16708
+          - 16709
+- proto: ShelfKitchen
+  entities:
+  - uid: 1046
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -37.5,-27.5
+      parent: 2
+    - type: Storage
+      storedItems:
+        1047:
+          position: 0,0
+          _rotation: South
+        1048:
+          position: 1,0
+          _rotation: South
+        1050:
+          position: 2,0
+          _rotation: South
+        1054:
+          position: 3,0
+          _rotation: South
+        1058:
+          position: 4,0
+          _rotation: South
+        1074:
+          position: 5,0
+          _rotation: South
+        1076:
+          position: 1,3
+          _rotation: South
+        1077:
+          position: 0,3
+          _rotation: South
+    - type: ContainerContainer
+      containers:
+        storagebase: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 1047
+          - 1048
+          - 1050
+          - 1054
+          - 1058
+          - 1074
+          - 1077
+          - 1076
 - proto: Shiv
   entities:
   - uid: 5583
@@ -95132,6 +95659,8 @@ entities:
         - Pressed: DoorBolt
   - uid: 8378
     components:
+    - type: MetaData
+      name: East Shutters
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 4.5,-64.5
@@ -95146,6 +95675,8 @@ entities:
         - Pressed: Toggle
   - uid: 9782
     components:
+    - type: MetaData
+      name: West Shutters
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -1.5,-64.5
@@ -98391,17 +98922,6 @@ entities:
       id: AI Bridge
 - proto: SurveillanceCameraEngineering
   entities:
-  - uid: 141
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 12.5,-66.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraEngineering
-      nameSet: True
-      id: External Path
   - uid: 4329
     components:
     - type: Transform
@@ -98490,28 +99010,6 @@ entities:
       - SurveillanceCameraEngineering
       nameSet: True
       id: Main (W)
-  - uid: 14207
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.5,-59.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraEngineering
-      nameSet: True
-      id: Main (E)
-  - uid: 14208
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 10.5,-61.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraEngineering
-      nameSet: True
-      id: Engine (TEG)
   - uid: 14209
     components:
     - type: Transform
@@ -99672,6 +100170,24 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -15.583425,-50.46728
       parent: 2
+- proto: SyringeEthylredoxrazine
+  entities:
+  - uid: 16704
+    components:
+    - type: MetaData
+      name: Ethyl
+    - type: Transform
+      parent: 16701
+    - type: Physics
+      canCollide: False
+  - uid: 16705
+    components:
+    - type: MetaData
+      name: Ethyl
+    - type: Transform
+      parent: 16701
+    - type: Physics
+      canCollide: False
 - proto: Table
   entities:
   - uid: 118
@@ -100284,6 +100800,11 @@ entities:
     - type: Transform
       pos: 3.5,-61.5
       parent: 2
+  - uid: 16683
+    components:
+    - type: Transform
+      pos: 6.5,-13.5
+      parent: 2
 - proto: TableCarpet
   entities:
   - uid: 5558
@@ -102267,6 +102788,13 @@ entities:
     - type: Transform
       pos: 11.5,-53.5
       parent: 2
+- proto: VendingMachineGames
+  entities:
+  - uid: 16711
+    components:
+    - type: Transform
+      pos: -6.5,-35.5
+      parent: 2
 - proto: VendingMachineHydrobe
   entities:
   - uid: 2036
@@ -102412,6 +102940,13 @@ entities:
     - type: Transform
       pos: 43.5,-47.5
       parent: 2
+- proto: VendingMachineTheater
+  entities:
+  - uid: 16713
+    components:
+    - type: Transform
+      pos: -50.5,-5.5
+      parent: 2
 - proto: VendingMachineVendomat
   entities:
   - uid: 1946
@@ -102426,6 +102961,13 @@ entities:
     - type: Transform
       pos: -0.5,-33.5
       parent: 2
+- proto: VendingMachineWinter
+  entities:
+  - uid: 16712
+    components:
+    - type: Transform
+      pos: 29.5,-1.5
+      parent: 2
 - proto: VendingMachineYouTool
   entities:
   - uid: 985
@@ -113459,6 +114001,14 @@ entities:
       rot: 3.141592653589793 rad
       pos: -5.4492755,-14.168743
       parent: 2
+- proto: WeaponSubMachineGunWt550
+  entities:
+  - uid: 16693
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 56.645035,2.3456132
+      parent: 2
 - proto: WeaponTurretSyndicateBroken
   entities:
   - uid: 3102
diff --git a/Resources/Maps/_Starlight/Stations/Prism.yml b/Resources/Maps/_Starlight/Stations/Prism.yml
index a0d0bb41c2c1..118b3f26b86d 100644
--- a/Resources/Maps/_Starlight/Stations/Prism.yml
+++ b/Resources/Maps/_Starlight/Stations/Prism.yml
@@ -2,10 +2,10 @@ meta:
   format: 7
   category: Map
   engineVersion: 264.0.0
-  forkId: Starlight
-  forkVersion: 1732131340
-  time: 08/14/2025 05:34:17
-  entityCount: 24876
+  forkId: ""
+  forkVersion: ""
+  time: 08/15/2025 04:12:38
+  entityCount: 24879
 maps:
 - 1
 grids:
@@ -120,11 +120,11 @@ entities:
           version: 7
         -2,0:
           ind: -2,0
-          tiles: DwAAAAACAA8AAAAAAAAPAAAAAAAADwAAAAAAAAsAAAAAAwALAAAAAAIAAQAAAAAAAAIAAAAAAAACAAAAAAAABgAAAAADAAYAAAAAAwAGAAAAAAAABgAAAAABAAYAAAAAAAAGAAAAAAIABgAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAALAAAAAAEACwAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAYAAAAAAAAGAAAAAAEABgAAAAAAAAYAAAAAAgAGAAAAAAAABgAAAAABAAYAAAAAAgAPAAAAAAAADwAAAAAAAA8AAAAAAQAPAAAAAAAACwAAAAAAAAsAAAAAAwABAAAAAAAAAgAAAAAAAAIAAAAAAAAGAAAAAAEABgAAAAABAAYAAAAAAwAGAAAAAAEAAQAAAAAAAAIAAAAAAAACAAAAAAAACwAAAAACAAsAAAAAAQALAAAAAAMACwAAAAABAAsAAAAAAwALAAAAAAEAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAAABgAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAABgAAAAADAAYAAAAAAwAMAAAAAAAABQAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAYAAAAAAgAGAAAAAAAADAAAAAAAAAUAAAAAAAAMAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAAGAAAAAAMABgAAAAABAAwAAAAAAAAFAAAAAAAADAAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAABgAAAAACAAYAAAAAAwAMAAAAAAAABQAAAAAAAAwAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAwAGAAAAAAEADAAAAAAAAAUAAAAAAAAMAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAMABgAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAABgAAAAAAAAYAAAAAAgAMAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAYAAAAAAAAGAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAAGAAAAAAEABgAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAwAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAABgAAAAABAAYAAAAAAwAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAAMAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAADAAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAAGAAAAAAMABgAAAAACAA==
+          tiles: DwAAAAACAA8AAAAAAAAPAAAAAAAADwAAAAAAAAsAAAAAAwALAAAAAAIAAQAAAAAAAAIAAAAAAAACAAAAAAAABgAAAAADAAYAAAAAAwAGAAAAAAAABgAAAAABAAYAAAAAAAAGAAAAAAIABgAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAALAAAAAAEACwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAGAAAAAAEABgAAAAAAAAYAAAAAAgAGAAAAAAAABgAAAAABAAYAAAAAAgAPAAAAAAAADwAAAAAAAA8AAAAAAQAPAAAAAAAACwAAAAAAAAsAAAAAAwABAAAAAAAAAgAAAAAAAAIAAAAAAAAGAAAAAAEABgAAAAABAAYAAAAAAwAGAAAAAAEAAQAAAAAAAAIAAAAAAAACAAAAAAAACwAAAAACAAsAAAAAAQALAAAAAAMACwAAAAABAAsAAAAAAwALAAAAAAEAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAAABgAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAABgAAAAADAAYAAAAAAwAMAAAAAAAABQAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAYAAAAAAgAGAAAAAAAADAAAAAAAAAUAAAAAAAAMAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAAGAAAAAAMABgAAAAABAAwAAAAAAAAFAAAAAAAADAAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAABgAAAAACAAYAAAAAAwAMAAAAAAAABQAAAAAAAAwAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAwAGAAAAAAEADAAAAAAAAAUAAAAAAAAMAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAMABgAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAABgAAAAAAAAYAAAAAAgAMAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAYAAAAAAAAGAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAAGAAAAAAEABgAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAwAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAABgAAAAABAAYAAAAAAwAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAAMAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAADAAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAAGAAAAAAMABgAAAAACAA==
           version: 7
         -2,1:
           ind: -2,1
-          tiles: BQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAAGAAAAAAEABgAAAAACAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAwAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAABgAAAAACAAYAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAYAAAAAAgAGAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAIABgAAAAABAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAABgAAAAAAAAYAAAAAAQAFAAAAAAAAAQAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAQAGAAAAAAIAAQAAAAAAAAEAAAAAAAABAAAAAAAABQAAAAAAAAwAAAAAAAAMAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAEABgAAAAADAAEAAAAAAAAMAAAAAAAAAQAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAADAAAAAAAAAEAAAAAAAAMAAAAAAAADAAAAAAAAAUAAAAAAAABAAAAAAAAAQAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAwAAAAAAAABAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAAAQAAAAAAAAEAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAMAAAAAAAAAQAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAEAAAAAAAABAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAMAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAAMAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
+          tiles: BQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAAGAAAAAAEABgAAAAACAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAwAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAABgAAAAACAAYAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAYAAAAAAgAGAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAIABgAAAAABAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAABgAAAAAAAAYAAAAAAQAFAAAAAAAAAQAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAYAAAAAAQAGAAAAAAIAAQAAAAAAAAEAAAAAAAABAAAAAAAABQAAAAAAAAwAAAAAAAAMAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAEABgAAAAADAAEAAAAAAAAMAAAAAAAAAQAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAADAAAAAAAAAEAAAAAAAAMAAAAAAAADAAAAAAAAAUAAAAAAAABAAAAAAAAAQAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAwAAAAAAAABAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAAAQAAAAAAAAEAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAMAAAAAAAAAQAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAEAAAAAAAABAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAMAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAAMAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
           version: 7
         -2,2:
           ind: -2,2
@@ -160,7 +160,7 @@ entities:
           version: 7
         -4,0:
           ind: -4,0
-          tiles: AgAAAAAAAAEAAAAAAAALAAAAAAAACwAAAAADAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAsAAAAAAgALAAAAAAAADwAAAAABAAwAAAAAAAABAAAAAAAACwAAAAADAAsAAAAAAwABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAwAAAAAAAALAAAAAAEACwAAAAABAAwAAAAAAAACAAAAAAAAAQAAAAAAAAsAAAAAAwALAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAACwAAAAAAAAsAAAAAAAAPAAAAAAIADAAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAACwAAAAADAAsAAAAAAgALAAAAAAEACwAAAAAAAAwAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAACAAAAAAAAAQAAAAAAAAkAAAAAAAAJAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAIAAAAAAAAJAAAAAAAACQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAADAAAAAAAAAEAAAAAAAAMAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAwAAAAAAAABAAAAAAAADAAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAUAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAA==
+          tiles: AgAAAAAAAAEAAAAAAAALAAAAAAAACwAAAAADAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAsAAAAAAgALAAAAAAAADwAAAAABAAwAAAAAAAABAAAAAAAACwAAAAADAAsAAAAAAwABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAALAAAAAAEACwAAAAABAAwAAAAAAAACAAAAAAAAAQAAAAAAAAsAAAAAAwALAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAACwAAAAAAAAsAAAAAAAAPAAAAAAIADAAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAACwAAAAADAAsAAAAAAgALAAAAAAEACwAAAAAAAAwAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAACAAAAAAAAAQAAAAAAAAkAAAAAAAAJAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAIAAAAAAAAJAAAAAAAACQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAADAAAAAAAAAEAAAAAAAAMAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAwAAAAAAAABAAAAAAAADAAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAUAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAA==
           version: 7
         -4,-1:
           ind: -4,-1
@@ -188,7 +188,7 @@ entities:
           version: 7
         1,1:
           ind: 1,1
-          tiles: AQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAABUAAAAAAAAVAAAAAAAAFQAAAAAAABAAAAAAAgABAAAAAAAAEgAAAAAAABIAAAAAAQASAAAAAAMAEgAAAAACAAYAAAAAAAAGAAAAAAEABgAAAAACAAYAAAAAAgABAAAAAAAACwAAAAADAAsAAAAAAAAVAAAAAAEAEAAAAAADABUAAAAAAQAQAAAAAAEAAQAAAAAAABIAAAAAAAASAAAAAAMAEgAAAAACABIAAAAAAAAGAAAAAAIABgAAAAABAAYAAAAAAQAGAAAAAAMAAQAAAAAAAAsAAAAAAwALAAAAAAIAFQAAAAACABAAAAAAAAAVAAAAAAIAAgAAAAAAAAEAAAAAAAAGAAAAAAEABgAAAAACAAYAAAAAAwAGAAAAAAMABgAAAAACAAYAAAAAAAAGAAAAAAEABgAAAAABAAEAAAAAAAALAAAAAAIABgAAAAAAABUAAAAAAQAQAAAAAAMAFQAAAAADABAAAAAAAAABAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAMABgAAAAAAAAYAAAAAAwAGAAAAAAAABgAAAAAAAAYAAAAAAAABAAAAAAAACwAAAAAAAAYAAAAAAAAVAAAAAAMAFQAAAAAAABUAAAAAAQAQAAAAAAAAAQAAAAAAAAYAAAAAAAAGAAAAAAEABgAAAAACAAYAAAAAAQAGAAAAAAEABgAAAAAAAAYAAAAAAQAGAAAAAAMAAQAAAAAAAAsAAAAAAQAGAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAEABgAAAAAAAAEAAAAAAAALAAAAAAEACwAAAAADAAYAAAAAAwAGAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABgAAAAAAAAYAAAAAAgABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAEABgAAAAACAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAQAGAAAAAAEAAQAAAAAAAAEAAAAAAAABAAAAAAAABgAAAAADAAYAAAAAAgAGAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAMABgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAQAGAAAAAAIABgAAAAADAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAMABgAAAAACAAYAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAwAAAAABAAYAAAAAAAAGAAAAAAEABgAAAAADAAYAAAAAAAAGAAAAAAIABgAAAAAAAAYAAAAAAQAGAAAAAAEABgAAAAABAAYAAAAAAQAGAAAAAAIABgAAAAABAAYAAAAAAAAGAAAAAAIABgAAAAACAAYAAAAAAQAGAAAAAAIABgAAAAADAAYAAAAAAwAGAAAAAAMABgAAAAACAAYAAAAAAAAGAAAAAAMABgAAAAAAAAYAAAAAAgAGAAAAAAEABgAAAAABAAYAAAAAAQAGAAAAAAEABgAAAAABAAYAAAAAAQAGAAAAAAMABgAAAAAAAAYAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAYAAAAAAQAGAAAAAAMABgAAAAABAA==
+          tiles: AQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAABUAAAAAAAAVAAAAAAAAFQAAAAAAABAAAAAAAgABAAAAAAAAEgAAAAAAABIAAAAAAQASAAAAAAMAEgAAAAACAAYAAAAAAAAGAAAAAAEABgAAAAACAAYAAAAAAgABAAAAAAAACwAAAAADAAsAAAAAAAAVAAAAAAEAEAAAAAADABUAAAAAAQAQAAAAAAEAAgAAAAAAABIAAAAAAAASAAAAAAMAEgAAAAACABIAAAAAAAAGAAAAAAIABgAAAAABAAYAAAAAAQAGAAAAAAMAAQAAAAAAAAsAAAAAAwALAAAAAAIAFQAAAAACABAAAAAAAAAVAAAAAAIAAgAAAAAAAAEAAAAAAAAGAAAAAAEABgAAAAACAAYAAAAAAwAGAAAAAAMABgAAAAACAAYAAAAAAAAGAAAAAAEABgAAAAABAAEAAAAAAAALAAAAAAIABgAAAAAAABUAAAAAAQAQAAAAAAMAFQAAAAADABAAAAAAAAABAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAMABgAAAAAAAAYAAAAAAwAGAAAAAAAABgAAAAAAAAYAAAAAAAABAAAAAAAACwAAAAAAAAYAAAAAAAAVAAAAAAMAFQAAAAAAABUAAAAAAQAQAAAAAAAAAQAAAAAAAAYAAAAAAAAGAAAAAAEABgAAAAACAAYAAAAAAQAGAAAAAAEABgAAAAAAAAYAAAAAAQAGAAAAAAMAAQAAAAAAAAsAAAAAAQAGAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAEABgAAAAAAAAEAAAAAAAALAAAAAAEACwAAAAADAAYAAAAAAwAGAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABgAAAAAAAAYAAAAAAgABAAAAAAAAAQAAAAAAAAIAAAAAAAAGAAAAAAEABgAAAAACAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAQAGAAAAAAEAAQAAAAAAAAEAAAAAAAABAAAAAAAABgAAAAADAAYAAAAAAgAGAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAMABgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAQAGAAAAAAIABgAAAAADAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAMABgAAAAACAAYAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAwAAAAABAAYAAAAAAAAGAAAAAAEABgAAAAADAAYAAAAAAAAGAAAAAAIABgAAAAAAAAYAAAAAAQAGAAAAAAEABgAAAAABAAYAAAAAAQAGAAAAAAIABgAAAAABAAYAAAAAAAAGAAAAAAIABgAAAAACAAYAAAAAAQAGAAAAAAIABgAAAAADAAYAAAAAAwAGAAAAAAMABgAAAAACAAYAAAAAAAAGAAAAAAMABgAAAAAAAAYAAAAAAgAGAAAAAAEABgAAAAABAAYAAAAAAQAGAAAAAAEABgAAAAABAAYAAAAAAQAGAAAAAAMABgAAAAAAAAYAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAYAAAAAAQAGAAAAAAMABgAAAAABAA==
           version: 7
         2,1:
           ind: 2,1
@@ -200,7 +200,7 @@ entities:
           version: 7
         1,3:
           ind: 1,3
-          tiles: CgAAAAAAAAoAAAAAAQABAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAEABgAAAAADACYAAAAAAwAmAAAAAAAAAQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABgAAAAACAAYAAAAAAwAmAAAAAAEAJgAAAAADAAoAAAAAAwABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAQAGAAAAAAMACgAAAAACAAoAAAAAAAAKAAAAAAAACgAAAAABAAYAAAAAAQAKAAAAAAIAAQAAAAAAAAoAAAAAAgAKAAAAAAIACgAAAAACAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAMABgAAAAADAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAMACgAAAAAAAAIAAAAAAAAKAAAAAAAACgAAAAABAAoAAAAAAgABAAAAAAAAAQAAAAAAAAEAAAAAAAADAAAAAAEAAwAAAAADAAMAAAAAAgAKAAAAAAEACgAAAAADAAoAAAAAAQAKAAAAAAIABgAAAAAAAAoAAAAAAwAKAAAAAAEABgAAAAAAAAYAAAAAAgAGAAAAAAEAAQAAAAAAAAEAAAAAAAABAAAAAAAAAwAAAAADAAMAAAAAAQADAAAAAAIACgAAAAAAAAoAAAAAAgAKAAAAAAAACgAAAAADAAYAAAAAAwAKAAAAAAMACgAAAAAAACEAAAAAAwAhAAAAAAEAIQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAMAAAAAAAADAAAAAAEAAwAAAAADAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAIACgAAAAABAAoAAAAAAQAhAAAAAAIAIQAAAAAAACEAAAAAAgABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAMABgAAAAABAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAoAAAAAAAAKAAAAAAMACgAAAAAAAAoAAAAAAwAKAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAABgAAAAABAAYAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAKAAAAAAIACgAAAAADAAoAAAAAAwAKAAAAAAAACgAAAAACAAEAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAgAGAAAAAAEAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAACgAAAAAAAAoAAAAAAQAKAAAAAAAACgAAAAADAAoAAAAAAwABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAMABgAAAAABAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAoAAAAAAwAKAAAAAAIACgAAAAACAAoAAAAAAwAKAAAAAAMAAQAAAAAAAAEAAAAAAAABAAAAAAAABgAAAAAAAAYAAAAAAgABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAYAAAAAAQAGAAAAAAAAAQAAAAAAAAYAAAAAAQAGAAAAAAEABgAAAAACAAYAAAAAAgAGAAAAAAIABgAAAAACAAYAAAAAAAAGAAAAAAAABgAAAAACAAYAAAAAAAAGAAAAAAEABgAAAAAAAAYAAAAAAAAGAAAAAAMABgAAAAAAAAEAAAAAAAAGAAAAAAEABgAAAAACAAYAAAAAAAAGAAAAAAAABgAAAAADAAYAAAAAAgAGAAAAAAIABgAAAAADAAYAAAAAAwAGAAAAAAMABgAAAAAAAAYAAAAAAwAGAAAAAAAABgAAAAACAAYAAAAAAgABAAAAAAAABgAAAAABAAYAAAAAAQAGAAAAAAAABgAAAAABAAYAAAAAAwAGAAAAAAAABgAAAAACAAYAAAAAAgAGAAAAAAIABgAAAAABAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
+          tiles: CgAAAAAAAAoAAAAAAQABAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAEABgAAAAADACYAAAAAAwAmAAAAAAAAAQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABgAAAAACAAYAAAAAAwAmAAAAAAEAJgAAAAADAAoAAAAAAwABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAQAGAAAAAAMACgAAAAACAAoAAAAAAAAKAAAAAAAACgAAAAABAAYAAAAAAQAKAAAAAAIAAQAAAAAAAAoAAAAAAgAKAAAAAAIACgAAAAACAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAMABgAAAAADAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAAGAAAAAAMACgAAAAAAAAIAAAAAAAAKAAAAAAAACgAAAAABAAoAAAAAAgABAAAAAAAAAQAAAAAAAAEAAAAAAAADAAAAAAEAAwAAAAADAAMAAAAAAgAKAAAAAAEACgAAAAADAAoAAAAAAQAKAAAAAAIABgAAAAAAAAoAAAAAAwAKAAAAAAEABgAAAAAAAAYAAAAAAgAGAAAAAAEAAQAAAAAAAAEAAAAAAAABAAAAAAAAAwAAAAADAAMAAAAAAQADAAAAAAIACgAAAAAAAAoAAAAAAgAKAAAAAAAACgAAAAADAAYAAAAAAwAKAAAAAAMACgAAAAAAACEAAAAAAwAhAAAAAAEAIQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAMAAAAAAAADAAAAAAEAAwAAAAADAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAIACgAAAAABAAoAAAAAAQAhAAAAAAIAIQAAAAAAACEAAAAAAgABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAMABgAAAAABAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAoAAAAAAAAKAAAAAAMACgAAAAAAAAoAAAAAAwAKAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAABgAAAAABAAYAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAKAAAAAAIACgAAAAADAAoAAAAAAwAKAAAAAAAACgAAAAACAAEAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAgAGAAAAAAEAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAACgAAAAAAAAoAAAAAAQAKAAAAAAAACgAAAAADAAoAAAAAAwABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAMABgAAAAABAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAoAAAAAAwAKAAAAAAIACgAAAAACAAoAAAAAAwAKAAAAAAMAAQAAAAAAAAEAAAAAAAABAAAAAAAABgAAAAAAAAYAAAAAAgABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAYAAAAAAQAGAAAAAAAAAQAAAAAAAAYAAAAAAQAGAAAAAAEABgAAAAACAAYAAAAAAgAGAAAAAAIABgAAAAACAAYAAAAAAAAGAAAAAAAABgAAAAACAAYAAAAAAAAGAAAAAAEABgAAAAAAAAYAAAAAAAAGAAAAAAMABgAAAAAAAAEAAAAAAAAGAAAAAAEABgAAAAACAAYAAAAAAAAGAAAAAAAABgAAAAADAAYAAAAAAgAGAAAAAAIABgAAAAADAAYAAAAAAwAGAAAAAAMABgAAAAAAAAYAAAAAAwAGAAAAAAAABgAAAAACAAYAAAAAAgABAAAAAAAABgAAAAABAAYAAAAAAQAGAAAAAAAABgAAAAABAAYAAAAAAwAGAAAAAAAABgAAAAACAAYAAAAAAgAGAAAAAAIABgAAAAABAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
           version: 7
         2,3:
           ind: 2,3
@@ -208,7 +208,7 @@ entities:
           version: 7
         1,0:
           ind: 1,0
-          tiles: AQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAYAAAAAAwAGAAAAAAIABgAAAAABAAYAAAAAAwAGAAAAAAEABgAAAAACAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAMABgAAAAAAAAYAAAAAAwARAAAAAAAAEQAAAAAAABEAAAAAAQACAAAAAAAAAQAAAAAAAAEAAAAAAAARAAAAAAIAEQAAAAAAABEAAAAAAwARAAAAAAAAEQAAAAADABEAAAAAAAABAAAAAAAABgAAAAACAAYAAAAAAAAGAAAAAAEAEQAAAAACABEAAAAAAAARAAAAAAMAAQAAAAAAAAYAAAAAAAABAAAAAAAAEQAAAAACABEAAAAAAgARAAAAAAMAEQAAAAAAABEAAAAAAwABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAAAGAAAAAAEABgAAAAABAAoAAAAAAAAKAAAAAAEAAQAAAAAAABEAAAAAAAARAAAAAAEAEQAAAAACABEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAAKAAAAAAAACgAAAAACAAEAAAAAAAARAAAAAAMAEQAAAAADAAcAAAAAAQAHAAAAAAMAAQAAAAAAAAIAAAAAAAAGAAAAAAAABgAAAAADAAYAAAAAAwAGAAAAAAIABgAAAAACAAYAAAAAAwABAAAAAAAAEAAAAAABABAAAAAAAAABAAAAAAAAEQAAAAADABEAAAAAAwAHAAAAAAAABwAAAAABAAEAAAAAAAACAAAAAAAABgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAAAAQAAAAAAABAAAAAAAAAQAAAAAAMAAQAAAAAAABEAAAAAAgARAAAAAAIABwAAAAAAAAcAAAAAAAABAAAAAAAAAgAAAAAAAAYAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAACAAAAAAAABgAAAAAAAAEAAAAAAAAQAAAAAAIAEAAAAAAAAAEAAAAAAAARAAAAAAIAEQAAAAABAAcAAAAAAAAHAAAAAAAAAQAAAAAAAAIAAAAAAAAGAAAAAAMAAgAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAAABAAAAAAAAEAAAAAACABAAAAAAAgABAAAAAAAAEQAAAAADABEAAAAAAQAHAAAAAAAABwAAAAAAAAEAAAAAAAACAAAAAAAABgAAAAADAAYAAAAAAgAGAAAAAAMABgAAAAAAAAYAAAAAAQAGAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAALAAAAAAMACwAAAAACAAsAAAAAAwALAAAAAAMACwAAAAABAAsAAAAAAgALAAAAAAEACwAAAAADAAsAAAAAAwALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAEACwAAAAADAAsAAAAAAQALAAAAAAIACwAAAAACAAsAAAAAAwALAAAAAAMACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAABAAsAAAAAAQALAAAAAAEACwAAAAACAAsAAAAAAAALAAAAAAMACwAAAAABAAsAAAAAAgALAAAAAAEACwAAAAABAA==
+          tiles: AQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAYAAAAAAwAGAAAAAAIABgAAAAABAAYAAAAAAwAGAAAAAAEABgAAAAACAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAMABgAAAAAAAAYAAAAAAwARAAAAAAAAEQAAAAAAABEAAAAAAQACAAAAAAAAAQAAAAAAAAEAAAAAAAARAAAAAAIAEQAAAAAAABEAAAAAAwARAAAAAAAAEQAAAAADABEAAAAAAAABAAAAAAAABgAAAAACAAYAAAAAAAAGAAAAAAEAEQAAAAACABEAAAAAAAARAAAAAAMAAQAAAAAAAAYAAAAAAAABAAAAAAAAEQAAAAACABEAAAAAAgARAAAAAAMAEQAAAAAAABEAAAAAAwABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAAAGAAAAAAEABgAAAAABAAoAAAAAAAAKAAAAAAEAAQAAAAAAABEAAAAAAAARAAAAAAEAEQAAAAACABEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAAKAAAAAAAACgAAAAACAAEAAAAAAAARAAAAAAMAEQAAAAADAAcAAAAAAQAHAAAAAAMAAQAAAAAAAAIAAAAAAAAGAAAAAAAABgAAAAADAAYAAAAAAwAGAAAAAAIABgAAAAACAAYAAAAAAwABAAAAAAAAEAAAAAABABAAAAAAAAABAAAAAAAAEQAAAAADABEAAAAAAwAHAAAAAAAABwAAAAABAAEAAAAAAAACAAAAAAAABgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAAAAQAAAAAAABAAAAAAAAAQAAAAAAMAAQAAAAAAABEAAAAAAgARAAAAAAIABwAAAAAAAAcAAAAAAAABAAAAAAAAAgAAAAAAAAYAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAACAAAAAAAABgAAAAAAAAEAAAAAAAAQAAAAAAIAEAAAAAAAAAEAAAAAAAARAAAAAAIAEQAAAAABAAcAAAAAAAAHAAAAAAAAAQAAAAAAAAIAAAAAAAAGAAAAAAMAAgAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAAABAAAAAAAAEAAAAAACABAAAAAAAgABAAAAAAAAEQAAAAADABEAAAAAAQAHAAAAAAAABwAAAAAAAAEAAAAAAAACAAAAAAAABgAAAAADAAYAAAAAAgAGAAAAAAMABgAAAAAAAAYAAAAAAQAGAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAALAAAAAAMACwAAAAACAAsAAAAAAwALAAAAAAMACwAAAAABAAsAAAAAAgALAAAAAAEACwAAAAADAAsAAAAAAwALAAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAEACwAAAAADAAsAAAAAAQALAAAAAAIACwAAAAACAAsAAAAAAwALAAAAAAMACwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAABAAsAAAAAAQALAAAAAAEACwAAAAACAAsAAAAAAAALAAAAAAMACwAAAAABAAsAAAAAAgALAAAAAAEACwAAAAABAA==
           version: 7
         1,-1:
           ind: 1,-1
@@ -244,7 +244,7 @@ entities:
           version: 7
         0,-2:
           ind: 0,-2
-          tiles: BQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAEAAAAAAAAGAAAAAAMABgAAAAACAAYAAAAAAQABAAAAAAAADAAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAABAAAAAAAABgAAAAADAAYAAAAAAgAGAAAAAAMAAQAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAAAQAAAAAAAAYAAAAAAQAGAAAAAAAABgAAAAAAAAEAAAAAAAAFAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAEAAAAAAAAGAAAAAAAABgAAAAABAAYAAAAAAgABAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAwAAAAAAAABAAAAAAAABgAAAAABAAYAAAAAAAAGAAAAAAIAAQAAAAAAAAUAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAABAAEAAAAAAAAFAAAAAAAABgAAAAADAAYAAAAAAAABAAAAAAAACgAAAAAAAAoAAAAAAQAKAAAAAAAACgAAAAADAAoAAAAAAgAKAAAAAAAACgAAAAADAAoAAAAAAwABAAAAAAAABgAAAAABAAYAAAAAAwABAAAAAAAABQAAAAAAAAYAAAAAAQAGAAAAAAIAAQAAAAAAAAoAAAAAAwAKAAAAAAIACgAAAAABAAoAAAAAAwAKAAAAAAMACgAAAAAAAAoAAAAAAwAKAAAAAAEAAQAAAAAAAAYAAAAAAwAGAAAAAAIAAQAAAAAAAAUAAAAAAAAGAAAAAAEABgAAAAADAAIAAAAAAAAKAAAAAAAACgAAAAADAAoAAAAAAAAKAAAAAAIACgAAAAADAAoAAAAAAQAKAAAAAAEACgAAAAADAAEAAAAAAAAGAAAAAAIABgAAAAAAAAEAAAAAAAAFAAAAAAAABgAAAAAAAAYAAAAAAQABAAAAAAAACgAAAAABAAoAAAAAAgAKAAAAAAAACgAAAAAAAAoAAAAAAwAKAAAAAAMACgAAAAADAAoAAAAAAQABAAAAAAAABgAAAAADAAYAAAAAAgABAAAAAAAABQAAAAAAAAYAAAAAAgAGAAAAAAEAAQAAAAAAAAoAAAAAAgAKAAAAAAAACgAAAAABAAoAAAAAAgAKAAAAAAEACgAAAAAAAAoAAAAAAgAKAAAAAAIAAQAAAAAAAAYAAAAAAAAGAAAAAAMAAQAAAAAAAAUAAAAAAAAGAAAAAAIABgAAAAABAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAIABgAAAAACAAEAAAAAAAAFAAAAAAAABgAAAAAAAAYAAAAAAgABAAAAAAAAFgAAAAACABYAAAAAAQAWAAAAAAMAAQAAAAAAABYAAAAAAAAWAAAAAAMAFgAAAAABAAEAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAgABAAAAAAAABQAAAAAAAAYAAAAAAQAGAAAAAAMAAQAAAAAAABYAAAAAAQAWAAAAAAMAFgAAAAAAAAEAAAAAAAAWAAAAAAAAFgAAAAABABYAAAAAAAABAAAAAAAABgAAAAACAAYAAAAAAgAGAAAAAAMAAQAAAAAAAAUAAAAAAAAGAAAAAAAABgAAAAACAAEAAAAAAAAWAAAAAAIAFgAAAAABABYAAAAAAQABAAAAAAAAFgAAAAACABYAAAAAAQAWAAAAAAEAAQAAAAAAAAYAAAAAAwAGAAAAAAEABgAAAAABAAEAAAAAAAAFAAAAAAAABgAAAAACAAYAAAAAAwABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAIABgAAAAADAAYAAAAAAgABAAAAAAAABQAAAAAAAA==
+          tiles: BQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAEAAAAAAAAGAAAAAAMABgAAAAACAAYAAAAAAQABAAAAAAAADAAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAABAAAAAAAABgAAAAADAAYAAAAAAgAGAAAAAAMAAQAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAAAQAAAAAAAAYAAAAAAQAGAAAAAAAABgAAAAAAAAEAAAAAAAAFAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAEAAAAAAAAGAAAAAAAABgAAAAABAAYAAAAAAgABAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAwAAAAAAAABAAAAAAAABgAAAAABAAYAAAAAAAAGAAAAAAIAAQAAAAAAAAUAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAABAAEAAAAAAAAFAAAAAAAABgAAAAADAAYAAAAAAAABAAAAAAAACgAAAAAAAAoAAAAAAQAKAAAAAAAACgAAAAADAAoAAAAAAgAKAAAAAAAACgAAAAADAAoAAAAAAwABAAAAAAAABgAAAAABAAYAAAAAAwAGAAAAAAAABQAAAAAAAAYAAAAAAQAGAAAAAAIAAQAAAAAAAAoAAAAAAwAKAAAAAAIACgAAAAABAAoAAAAAAwAKAAAAAAMACgAAAAAAAAoAAAAAAwAKAAAAAAEAAQAAAAAAAAYAAAAAAwAGAAAAAAIAAQAAAAAAAAUAAAAAAAAGAAAAAAEABgAAAAADAAIAAAAAAAAKAAAAAAAACgAAAAADAAoAAAAAAAAKAAAAAAIACgAAAAADAAoAAAAAAQAKAAAAAAEACgAAAAADAAEAAAAAAAAGAAAAAAIABgAAAAAAAAEAAAAAAAAFAAAAAAAABgAAAAAAAAYAAAAAAQABAAAAAAAACgAAAAABAAoAAAAAAgAKAAAAAAAACgAAAAAAAAoAAAAAAwAKAAAAAAMACgAAAAADAAoAAAAAAQABAAAAAAAABgAAAAADAAYAAAAAAgABAAAAAAAABQAAAAAAAAYAAAAAAgAGAAAAAAEAAQAAAAAAAAoAAAAAAgAKAAAAAAAACgAAAAABAAoAAAAAAgAKAAAAAAEACgAAAAAAAAoAAAAAAgAKAAAAAAIAAQAAAAAAAAYAAAAAAAAGAAAAAAMAAQAAAAAAAAUAAAAAAAAGAAAAAAIABgAAAAABAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAIABgAAAAACAAEAAAAAAAAFAAAAAAAABgAAAAAAAAYAAAAAAgABAAAAAAAAFgAAAAACABYAAAAAAQAWAAAAAAMAAQAAAAAAABYAAAAAAAAWAAAAAAMAFgAAAAABAAEAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAgABAAAAAAAABQAAAAAAAAYAAAAAAQAGAAAAAAMAAQAAAAAAABYAAAAAAQAWAAAAAAMAFgAAAAAAAAEAAAAAAAAWAAAAAAAAFgAAAAABABYAAAAAAAABAAAAAAAABgAAAAACAAYAAAAAAgAGAAAAAAMABgAAAAAAAAUAAAAAAAAGAAAAAAAABgAAAAACAAEAAAAAAAAWAAAAAAIAFgAAAAABABYAAAAAAQABAAAAAAAAFgAAAAACABYAAAAAAQAWAAAAAAEAAQAAAAAAAAYAAAAAAwAGAAAAAAEABgAAAAABAAEAAAAAAAAFAAAAAAAABgAAAAACAAYAAAAAAwABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAAGAAAAAAIABgAAAAADAAYAAAAAAgABAAAAAAAABQAAAAAAAA==
           version: 7
         -1,-2:
           ind: -1,-2
@@ -256,7 +256,7 @@ entities:
           version: 7
         4,-1:
           ind: 4,-1
-          tiles: BQAAAAAAAAwAAAAAAAAFAAAAAAAADAAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAADAAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAADAAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAMAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAADAAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAABAAAAAAAAAQAAAAAAAA8AAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAADwAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAwAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAAPAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAATAAAAAAAAEwAAAAAAABMAAAAAAAABAAAAAAAAAQAAAAAAAA8AAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAADAAAAAAAAAwAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAABMAAAAAAAABAAAAAAAAAQAAAAAAAAwAAAAAAAAMAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAATAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAABMAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAARAAAAAAEAEQAAAAABABEAAAAAAQABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAHgAAAAAAAB4AAAAAAAARAAAAAAEAAQAAAAAAAAoAAAAAAAAKAAAAAAIACgAAAAAAAAoAAAAAAQABAAAAAAAALQAAAAACAC0AAAAAAwABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
+          tiles: BQAAAAAAAAwAAAAAAAAFAAAAAAAADAAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAADAAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAADAAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAMAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAADAAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAABAAAAAAAAAQAAAAAAAA8AAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAADwAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAwAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAAPAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAATAAAAAAAAEwAAAAAAABMAAAAAAAABAAAAAAAAAQAAAAAAAA8AAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAADAAAAAAAAAwAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAABMAAAAAAAABAAAAAAAAAQAAAAAAAAwAAAAAAAAMAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAATAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAABMAAAAAAAACAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAARAAAAAAEAEQAAAAABABEAAAAAAQABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAHgAAAAAAAB4AAAAAAAARAAAAAAEAAQAAAAAAAAoAAAAAAAAKAAAAAAIACgAAAAAAAAoAAAAAAQABAAAAAAAALQAAAAACAC0AAAAAAwABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAA==
           version: 7
         4,0:
           ind: 4,0
@@ -264,11 +264,11 @@ entities:
           version: 7
         4,1:
           ind: 4,1
-          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAABgAAAAAAAAYAAAAAAwAGAAAAAAEABgAAAAABAAEAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAADAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAACYAAAAAAgAmAAAAAAEAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAmAAAAAAMAJgAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAYAAAAAAwAWAAAAAAIAFgAAAAABABYAAAAAAAAQAAAAAAMACgAAAAABAAoAAAAAAQABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAJgAAAAACACYAAAAAAgAQAAAAAAAAEAAAAAACAAIAAAAAAAAGAAAAAAEAFgAAAAAAABYAAAAAAAAWAAAAAAIAEAAAAAADAAoAAAAAAQAKAAAAAAMAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAACYAAAAAAAAmAAAAAAEAEAAAAAABABAAAAAAAgABAAAAAAAABgAAAAACABYAAAAAAwAWAAAAAAIAFgAAAAAAABAAAAAAAQAKAAAAAAIACgAAAAACAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAmAAAAAAEAJgAAAAAAABAAAAAAAQAQAAAAAAIAAQAAAAAAAAYAAAAAAwAGAAAAAAIABgAAAAADAAYAAAAAAAACAAAAAAAACgAAAAADAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAJgAAAAACACYAAAAAAwAQAAAAAAEAEAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAACYAAAAAAwAmAAAAAAIAAQAAAAAAAAEAAAAAAAAQAAAAAAEAEAAAAAAAABAAAAAAAgAaAAAAAAAAFgAAAAAAABYAAAAAAQAWAAAAAAIAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAmAAAAAAIAJgAAAAACAAsAAAAAAwACAAAAAAAAEAAAAAABABYAAAAAAgAQAAAAAAEAGgAAAAABABYAAAAAAQAWAAAAAAMAFgAAAAACAAEAAAAAAAABAAAAAAAAAQAAAAAAACYAAAAAAwAmAAAAAAEAJgAAAAADACYAAAAAAQABAAAAAAAAAQAAAAAAABAAAAAAAwAWAAAAAAMAEAAAAAAAABoAAAAAAQAWAAAAAAEAFgAAAAAAABYAAAAAAwABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAEAAAAAAAAAIAAAAAAAAQAAAAAAIAFgAAAAACABAAAAAAAAAaAAAAAAIAFgAAAAABABYAAAAAAgAWAAAAAAMAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABAAAAAAAwACAAAAAAAAEAAAAAADABYAAAAAAQAQAAAAAAIAGgAAAAACABYAAAAAAAAWAAAAAAMAFgAAAAABAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABAAAAAAAQAWAAAAAAEAEAAAAAADABoAAAAAAQAWAAAAAAMAFgAAAAACABYAAAAAAgABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAACwAAAAADAAEAAAAAAAAQAAAAAAIAEAAAAAADABAAAAAAAQAaAAAAAAMAFgAAAAADABYAAAAAAwAWAAAAAAMAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAA==
+          tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAABAAAAAAAABgAAAAAAAAYAAAAAAwAGAAAAAAEABgAAAAABAAEAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAADAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAACYAAAAAAgAmAAAAAAEAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAmAAAAAAMAJgAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAYAAAAAAwAWAAAAAAIAFgAAAAABABYAAAAAAAAQAAAAAAMACgAAAAABAAoAAAAAAQABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAJgAAAAACACYAAAAAAgAQAAAAAAAAEAAAAAACAAIAAAAAAAAGAAAAAAEAFgAAAAAAABYAAAAAAAAWAAAAAAIAEAAAAAADAAoAAAAAAQAKAAAAAAMAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAACYAAAAAAAAmAAAAAAEAEAAAAAABABAAAAAAAgABAAAAAAAABgAAAAACABYAAAAAAwAWAAAAAAIAFgAAAAAAABAAAAAAAQAKAAAAAAIACgAAAAACAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAmAAAAAAEAJgAAAAAAABAAAAAAAQAQAAAAAAIAAQAAAAAAAAYAAAAAAwAGAAAAAAIABgAAAAADAAYAAAAAAAACAAAAAAAACgAAAAADAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAJgAAAAACACYAAAAAAwAQAAAAAAEAEAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAACYAAAAAAwAmAAAAAAIAAQAAAAAAAAEAAAAAAAAQAAAAAAEAEAAAAAAAABAAAAAAAgAaAAAAAAAAFgAAAAAAABYAAAAAAQAWAAAAAAIAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAmAAAAAAIAJgAAAAACAAsAAAAAAwACAAAAAAAAEAAAAAABABYAAAAAAgAQAAAAAAEAGgAAAAABABYAAAAAAQAWAAAAAAMAFgAAAAACAAEAAAAAAAABAAAAAAAAAgAAAAAAACYAAAAAAwAmAAAAAAEAJgAAAAADACYAAAAAAQABAAAAAAAAAQAAAAAAABAAAAAAAwAWAAAAAAMAEAAAAAAAABoAAAAAAQAWAAAAAAEAFgAAAAAAABYAAAAAAwABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAEAAAAAAAAAIAAAAAAAAQAAAAAAIAFgAAAAACABAAAAAAAAAaAAAAAAIAFgAAAAABABYAAAAAAgAWAAAAAAMAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABAAAAAAAwACAAAAAAAAEAAAAAADABYAAAAAAQAQAAAAAAIAGgAAAAACABYAAAAAAAAWAAAAAAMAFgAAAAABAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAABAAAAAAAQAWAAAAAAEAEAAAAAADABoAAAAAAQAWAAAAAAMAFgAAAAACABYAAAAAAgABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAACwAAAAADAAEAAAAAAAAQAAAAAAIAEAAAAAADABAAAAAAAQAaAAAAAAMAFgAAAAADABYAAAAAAwAWAAAAAAMAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAA==
           version: 7
         4,2:
           ind: 4,2
-          tiles: CwAAAAAAAAEAAAAAAAABAAAAAAAAEAAAAAABABAAAAAAAQAaAAAAAAIAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAsAAAAAAwALAAAAAAAAEAAAAAABABAAAAAAAwAQAAAAAAAAEAAAAAABABAAAAAAAAAQAAAAAAAAEAAAAAACABAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAAQAAAAAAMADgAAAAADABAAAAAAAQAQAAAAAAIAEAAAAAABABAAAAAAAAAQAAAAAAIAEAAAAAAAABAAAAAAAQAQAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAEAAAAAAAAA4AAAAAAAACAAAAAAAAEAAAAAACABAAAAAAAgAQAAAAAAEAEAAAAAADABAAAAAAAAAQAAAAAAIAEAAAAAABAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAABAAAAAAAgAOAAAAAAAAAgAAAAAAABAAAAAAAwAQAAAAAAIABgAAAAAAAAYAAAAAAAAGAAAAAAMABgAAAAADAAYAAAAAAgABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAAQAAAAAAIADgAAAAAAAAIAAAAAAAAQAAAAAAEAEAAAAAADAAYAAAAAAQAGAAAAAAMABgAAAAABAAYAAAAAAgAGAAAAAAEAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAEAAAAAACAA4AAAAAAwACAAAAAAAAEAAAAAAAABAAAAAAAgAGAAAAAAIABgAAAAACAAYAAAAAAAAGAAAAAAEABgAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAsAAAAAAAALAAAAAAAAAQAAAAAAABUAAAAAAQAVAAAAAAEADQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAALAAAAAAEACwAAAAADAAEAAAAAAAAVAAAAAAMAFQAAAAABAAIAAAAAAAANAAAAAAMADQAAAAAAAA0AAAAAAAANAAAAAAIADQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAFQAAAAACABUAAAAAAQABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAQAAAAAAEAEAAAAAAAABAAAAAAAAAQAAAAAAAAAQAAAAAAABUAAAAAAQAVAAAAAAMAAQAAAAAAAAYAAAAAAAAbAAAAAAIAGwAAAAAAABsAAAAAAgAGAAAAAAEAAgAAAAAAAAEAAAAAAAABAAAAAAAAEAAAAAABABAAAAAAAAAQAAAAAAAAEAAAAAAAAAEAAAAAAAAVAAAAAAIAFQAAAAABAAIAAAAAAAAGAAAAAAEAGwAAAAADABsAAAAAAAAbAAAAAAMABgAAAAADAAEAAAAAAAABAAAAAAAAAQAAAAAAABAAAAAAAQAQAAAAAAEAEAAAAAAAABAAAAAAAgABAAAAAAAAFQAAAAAAABUAAAAAAQABAAAAAAAABgAAAAACAAYAAAAAAAAGAAAAAAIABgAAAAADAAYAAAAAAwABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAEAAAAAACABAAAAAAAgAQAAAAAAIAAgAAAAAAABUAAAAAAQAVAAAAAAMAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAABAAAAAAAgAQAAAAAAIAEAAAAAADAAEAAAAAAAAVAAAAAAMAFQAAAAACAAEAAAAAAAAcAAAAAAAAHAAAAAADABwAAAAAAgAcAAAAAAAAHAAAAAABAAEAAAAAAAABAAAAAAAAAQAAAAAAABAAAAAAAwAQAAAAAAAAEAAAAAAAAAIAAAAAAAABAAAAAAAAFQAAAAACABUAAAAAAwABAAAAAAAAHAAAAAAAABwAAAAAAgAcAAAAAAEAHAAAAAACABwAAAAAAwABAAAAAAAAAQAAAAAAAAEAAAAAAAAQAAAAAAAAEAAAAAAAAA==
+          tiles: CwAAAAAAAAEAAAAAAAABAAAAAAAAEAAAAAABABAAAAAAAQAaAAAAAAIAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAAAsAAAAAAwALAAAAAAAAEAAAAAABABAAAAAAAwAQAAAAAAAAEAAAAAABABAAAAAAAAAQAAAAAAAAEAAAAAACABAAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAAAEAAAAAAAAQAAAAAAMADgAAAAADABAAAAAAAQAQAAAAAAIAEAAAAAABABAAAAAAAAAQAAAAAAIAEAAAAAAAABAAAAAAAQAQAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAEAAAAAAAAA4AAAAAAAACAAAAAAAAEAAAAAACABAAAAAAAgAQAAAAAAEAEAAAAAADABAAAAAAAAAQAAAAAAIAEAAAAAABAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAQAAAAAAABAAAAAAAgAOAAAAAAAAAgAAAAAAABAAAAAAAwAQAAAAAAIABgAAAAAAAAYAAAAAAAAGAAAAAAMABgAAAAADAAYAAAAAAgABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAAgAAAAAAAAEAAAAAAAAQAAAAAAIADgAAAAAAAAIAAAAAAAAQAAAAAAEAEAAAAAADAAYAAAAAAQAGAAAAAAMABgAAAAABAAYAAAAAAgAGAAAAAAEAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAEAAAAAACAA4AAAAAAwACAAAAAAAAEAAAAAAAABAAAAAAAgAGAAAAAAIABgAAAAACAAYAAAAAAAAGAAAAAAEABgAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAsAAAAAAAALAAAAAAAAAQAAAAAAABUAAAAAAQAVAAAAAAEADQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAALAAAAAAEACwAAAAADAAEAAAAAAAAVAAAAAAMAFQAAAAABAAIAAAAAAAANAAAAAAMADQAAAAAAAA0AAAAAAAANAAAAAAIADQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAFQAAAAACABUAAAAAAQABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAQAAAAAAEAEAAAAAAAABAAAAAAAAAQAAAAAAAAAQAAAAAAABUAAAAAAQAVAAAAAAMAAQAAAAAAAAYAAAAAAAAbAAAAAAIAGwAAAAAAABsAAAAAAgAGAAAAAAEAAgAAAAAAAAEAAAAAAAABAAAAAAAAEAAAAAABABAAAAAAAAAQAAAAAAAAEAAAAAAAAAEAAAAAAAAVAAAAAAIAFQAAAAABAAIAAAAAAAAGAAAAAAEAGwAAAAADABsAAAAAAAAbAAAAAAMABgAAAAADAAEAAAAAAAABAAAAAAAAAQAAAAAAABAAAAAAAQAQAAAAAAEAEAAAAAAAABAAAAAAAgABAAAAAAAAFQAAAAAAABUAAAAAAQABAAAAAAAABgAAAAACAAYAAAAAAAAGAAAAAAIABgAAAAADAAYAAAAAAwABAAAAAAAAAQAAAAAAAAEAAAAAAAACAAAAAAAAEAAAAAACABAAAAAAAgAQAAAAAAIAAgAAAAAAABUAAAAAAQAVAAAAAAMAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAgAAAAAAABAAAAAAAgAQAAAAAAIAEAAAAAADAAEAAAAAAAAVAAAAAAMAFQAAAAACAAEAAAAAAAAcAAAAAAAAHAAAAAADABwAAAAAAgAcAAAAAAAAHAAAAAABAAEAAAAAAAABAAAAAAAAAQAAAAAAABAAAAAAAwAQAAAAAAAAEAAAAAAAAAIAAAAAAAABAAAAAAAAFQAAAAACABUAAAAAAwABAAAAAAAAHAAAAAAAABwAAAAAAgAcAAAAAAEAHAAAAAACABwAAAAAAwABAAAAAAAAAQAAAAAAAAEAAAAAAAAQAAAAAAAAEAAAAAAAAA==
           version: 7
         4,3:
           ind: 4,3
@@ -284,7 +284,7 @@ entities:
           version: 7
         5,1:
           ind: 5,1
-          tiles: BQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAEAAAAAAAABAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAmAAAAAAAAAQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAJgAAAAAAAAEAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAACYAAAAAAAABAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAmAAAAAAAAAQAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAABAAAAAAAADAAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAJgAAAAACAAEAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAACYAAAAAAQABAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAmAAAAAAAAAQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAAJgAAAAABAAEAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAACYAAAAAAgABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAQAAAAAAAAEAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAA==
+          tiles: BQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAEAAAAAAAABAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAmAAAAAAAAAQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAJgAAAAAAAAEAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAACYAAAAAAAABAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAmAAAAAAAAAQAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAABAAAAAAAADAAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAJgAAAAACAAEAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAACYAAAAAAQABAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAmAAAAAAAAAQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAAJgAAAAABAAEAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAACYAAAAAAgABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAADAAAAAAAAAUAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAwAAAAAAAAFAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAIAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAQAAAAAAAAEAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAABQAAAAAAAAUAAAAAAAAMAAAAAAAABQAAAAAAAA==
           version: 7
         3,4:
           ind: 3,4
@@ -308,7 +308,7 @@ entities:
           version: 7
         1,-2:
           ind: 1,-2
-          tiles: DAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAABAAAAAAAABgAAAAAAAAYAAAAAAgAGAAAAAAAAAQAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAQAAAAAAAAYAAAAAAAAGAAAAAAEABgAAAAAAAAEAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAEAAAAAAAAGAAAAAAAABgAAAAABAAYAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAABAAAAAAAABgAAAAABAAYAAAAAAwAGAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAQAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAEAAAAAAAAGAAAAAAIABgAAAAABAAYAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAABAAAAAAAABgAAAAABAAYAAAAAAgABAAAAAAAAFwAAAAADABcAAAAAAwAXAAAAAAIAFwAAAAADAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAQAAAAAAAAYAAAAAAAAGAAAAAAIAAgAAAAAAABYAAAAAAQAWAAAAAAIAFgAAAAACABYAAAAAAgAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAEAAAAAAAAGAAAAAAIABgAAAAABAAEAAAAAAAAXAAAAAAIAFwAAAAACABcAAAAAAQAXAAAAAAMABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAABAAAAAAAABgAAAAADAAYAAAAAAgABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAQAAAAAAAAYAAAAAAwAGAAAAAAMAAQAAAAAAAAoAAAAAAQAKAAAAAAAACgAAAAAAAAoAAAAAAQAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAEAAAAAAAAGAAAAAAAABgAAAAABAAEAAAAAAAAKAAAAAAEACgAAAAABAAoAAAAAAgAKAAAAAAEABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAABAAAAAAAABgAAAAADAAYAAAAAAgABAAAAAAAACwAAAAABAAsAAAAAAAAKAAAAAAAACgAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAQAAAAAAAAYAAAAAAQAGAAAAAAMAAQAAAAAAAAsAAAAAAgALAAAAAAEACwAAAAABAAsAAAAAAgAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAEAAAAAAAAGAAAAAAAABgAAAAACAAEAAAAAAAALAAAAAAMACwAAAAAAAAsAAAAAAQALAAAAAAMABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAABAAAAAAAABgAAAAACAAYAAAAAAwABAAAAAAAACwAAAAACAAsAAAAAAgALAAAAAAIACwAAAAADAA==
+          tiles: DAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAABAAAAAAAABgAAAAAAAAYAAAAAAgAGAAAAAAAAAQAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAQAAAAAAAAYAAAAAAAAGAAAAAAEABgAAAAAAAAEAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAEAAAAAAAAGAAAAAAAABgAAAAABAAYAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAABAAAAAAAABgAAAAABAAYAAAAAAwAGAAAAAAAAAgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAQAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAEAAAAAAAAGAAAAAAIABgAAAAABAAYAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAGAAAAAAAABgAAAAABAAYAAAAAAgABAAAAAAAAFwAAAAADABcAAAAAAwAXAAAAAAIAFwAAAAADAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAQAAAAAAAAYAAAAAAAAGAAAAAAIAAgAAAAAAABYAAAAAAQAWAAAAAAIAFgAAAAACABYAAAAAAgAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAEAAAAAAAAGAAAAAAIABgAAAAABAAEAAAAAAAAXAAAAAAIAFwAAAAACABcAAAAAAQAXAAAAAAMABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAABAAAAAAAABgAAAAADAAYAAAAAAgABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAQAAAAAAAAYAAAAAAwAGAAAAAAMAAQAAAAAAAAoAAAAAAQAKAAAAAAAACgAAAAAAAAoAAAAAAQAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAEAAAAAAAAGAAAAAAAABgAAAAABAAEAAAAAAAAKAAAAAAEACgAAAAABAAoAAAAAAgAKAAAAAAEABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAABAAAAAAAABgAAAAADAAYAAAAAAgABAAAAAAAACwAAAAABAAsAAAAAAAAKAAAAAAAACgAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABgAAAAAAAAYAAAAAAQAGAAAAAAMAAQAAAAAAAAsAAAAAAgALAAAAAAEACwAAAAABAAsAAAAAAgAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAEAAAAAAAAGAAAAAAAABgAAAAACAAEAAAAAAAALAAAAAAMACwAAAAAAAAsAAAAAAQALAAAAAAMABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAABAAAAAAAABgAAAAACAAYAAAAAAwABAAAAAAAACwAAAAACAAsAAAAAAgALAAAAAAIACwAAAAADAA==
           version: 7
         1,-3:
           ind: 1,-3
@@ -10236,6 +10236,24 @@ entities:
     - type: Action
       originalIconColor: '#FFFFFFFF'
       container: 17204
+  - uid: 24877
+    mapInit: true
+    paused: true
+    components:
+    - type: Transform
+      parent: 11548
+    - type: Action
+      originalIconColor: '#FFFFFFFF'
+      container: 11548
+  - uid: 24878
+    mapInit: true
+    paused: true
+    components:
+    - type: Transform
+      parent: 11549
+    - type: Action
+      originalIconColor: '#FFFFFFFF'
+      container: 11549
 - proto: AirAlarm
   entities:
   - uid: 46
@@ -12789,7 +12807,7 @@ entities:
       pos: 19.5,52.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -85216.42
+      secondsUntilStateChange: -85878.94
     - type: DeviceLinkSource
       lastSignals:
         DoorStatus: True
@@ -12863,7 +12881,7 @@ entities:
       pos: 72.5,0.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -169291.89
+      secondsUntilStateChange: -169954.4
     - type: DeviceLinkSource
       lastSignals:
         DoorStatus: True
@@ -13103,7 +13121,7 @@ entities:
       pos: 9.5,13.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -128328.29
+      secondsUntilStateChange: -128990.805
     - type: DeviceLinkSource
       lastSignals:
         DoorStatus: True
@@ -13113,7 +13131,7 @@ entities:
       pos: -2.5,11.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -284819.16
+      secondsUntilStateChange: -285481.7
     - type: DeviceLinkSource
       lastSignals:
         DoorStatus: True
@@ -13159,7 +13177,7 @@ entities:
       pos: 3.5,11.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -305807.88
+      secondsUntilStateChange: -306470.4
     - type: DeviceLinkSource
       lastSignals:
         DoorStatus: True
@@ -13261,7 +13279,7 @@ entities:
       pos: -8.5,11.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -278981.34
+      secondsUntilStateChange: -279643.88
     - type: DeviceLinkSource
       lastSignals:
         DoorStatus: True
@@ -13674,7 +13692,7 @@ entities:
       pos: -60.5,-1.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -258444.22
+      secondsUntilStateChange: -259106.73
     - type: DeviceLinkSink
       invokeCounter: 1
     - type: DeviceLinkSource
@@ -13796,7 +13814,7 @@ entities:
       pos: 86.5,29.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -210021.78
+      secondsUntilStateChange: -210684.3
     - type: DeviceLinkSink
       invokeCounter: 1
     - type: DeviceLinkSource
@@ -14249,7 +14267,7 @@ entities:
       pos: 53.5,9.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -10779.509
+      secondsUntilStateChange: -11442.024
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -14260,7 +14278,7 @@ entities:
       pos: 53.5,10.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -10779.708
+      secondsUntilStateChange: -11442.224
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -14624,7 +14642,7 @@ entities:
       pos: 2.5,18.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -295163.3
+      secondsUntilStateChange: -295825.84
     - type: DeviceLinkSource
       lastSignals:
         DoorStatus: True
@@ -14802,7 +14820,7 @@ entities:
       pos: 10.5,-2.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -114283.164
+      secondsUntilStateChange: -114945.68
     - type: DeviceLinkSource
       lastSignals:
         DoorStatus: True
@@ -15177,7 +15195,7 @@ entities:
       pos: 32.5,16.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -238149.67
+      secondsUntilStateChange: -238812.19
     - type: DeviceLinkSource
       lastSignals:
         DoorStatus: True
@@ -15324,7 +15342,7 @@ entities:
       pos: 10.5,48.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -49239.49
+      secondsUntilStateChange: -49902.004
     - type: DeviceLinkSource
       lastSignals:
         DoorStatus: True
@@ -59641,12 +59659,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 10.5,34.5
       parent: 2
-  - uid: 24876
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 15.5,31.5
-      parent: 2
 - proto: ComputerComms
   entities:
   - uid: 9052
@@ -71417,7 +71429,7 @@ entities:
       pos: 16.5,4.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -6411.4805
+      secondsUntilStateChange: -7073.9956
       state: Opening
 - proto: FenceMetalStraight
   entities:
@@ -73466,7 +73478,7 @@ entities:
       pos: 76.5,2.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -113297.59
+      secondsUntilStateChange: -113960.11
       state: Closing
   - uid: 11066
     components:
@@ -75107,7 +75119,7 @@ entities:
       pos: 68.5,32.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -45690.062
+      secondsUntilStateChange: -46352.58
       state: Closing
     - type: DeviceNetwork
       deviceLists:
@@ -78453,13 +78465,41 @@ entities:
   - uid: 11548
     components:
     - type: Transform
-      pos: -3.4449563,13.461549
+      pos: -3.7050219,13.571317
       parent: 2
+    - type: HandheldLight
+      toggleActionEntity: 24877
+    - type: ContainerContainer
+      containers:
+        cell_slot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+        actions: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 24877
+    - type: ActionsContainer
   - uid: 11549
     components:
     - type: Transform
-      pos: -3.6220396,13.78469
+      pos: -3.6946054,13.811066
       parent: 2
+    - type: HandheldLight
+      toggleActionEntity: 24878
+    - type: ContainerContainer
+      containers:
+        cell_slot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+        actions: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 24878
+    - type: ActionsContainer
 - proto: FlashlightSeclite
   entities:
   - uid: 38
@@ -126109,6 +126149,20 @@ entities:
     - type: Transform
       pos: 59.5,11.5
       parent: 2
+- proto: HolofanProjector
+  entities:
+  - uid: 24876
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.2466886,13.78519
+      parent: 2
+  - uid: 24879
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.3300219,13.597559
+      parent: 2
 - proto: Holopad
   entities:
   - uid: 9207
@@ -153991,7 +154045,7 @@ entities:
   - uid: 21383
     components:
     - type: Transform
-      pos: -3.6012063,13.200951
+      pos: -3.5696054,13.1335125
       parent: 2
 - proto: ToolboxEmergencyFilled
   entities:
@@ -172182,7 +172236,7 @@ entities:
       pos: 38.5,-15.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -174662.08
+      secondsUntilStateChange: -175324.6
   - uid: 24597
     components:
     - type: Transform
diff --git a/Resources/Maps/amber.yml b/Resources/Maps/amber.yml
index 17669345863a..9a39510c88cb 100644
--- a/Resources/Maps/amber.yml
+++ b/Resources/Maps/amber.yml
@@ -1,10 +1,10 @@
 meta:
   format: 7
   category: Map
-  engineVersion: 262.0.0
+  engineVersion: 264.0.0
   forkId: ""
   forkVersion: ""
-  time: 06/10/2025 09:19:53
+  time: 07/22/2025 15:41:03
   entityCount: 24836
 maps:
 - 1
@@ -136895,7 +136895,7 @@ entities:
     - type: Transform
       pos: -51.5,-37.5
       parent: 2
-- proto: SpawnMobParrot
+- proto: SpawnMobPollyParrot
   entities:
   - uid: 16167
     components:
diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml
index 3da417fc4b16..3a15131baef3 100644
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
@@ -1,11 +1,11 @@
 meta:
   format: 7
   category: Map
-  engineVersion: 264.0.0
+  engineVersion: 265.0.0
   forkId: ""
   forkVersion: ""
-  time: 07/10/2025 16:46:10
-  entityCount: 25502
+  time: 07/25/2025 19:38:24
+  entityCount: 25505
 maps:
 - 943
 grids:
@@ -107,7 +107,7 @@ entities:
           version: 7
         0,-2:
           ind: 0,-2
-          tiles: XQAAAAAAAF0AAAAAAAB+AAAAAAAAHwAAAAABAB8AAAAAAQAfAAAAAAAAegAAAAABAHoAAAAAAgB6AAAAAAEAfgAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAfgAAAAAAAF0AAAAAAQBdAAAAAAMAfgAAAAAAAB8AAAAAAgAfAAAAAAMAHwAAAAACAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAH4AAAAAAABdAAAAAAAAXQAAAAACAB8AAAAAAQAfAAAAAAMAHwAAAAABAB8AAAAAAQAfAAAAAAAAHwAAAAAAAB8AAAAAAQB+AAAAAAAAfgAAAAAAAH4AAAAAAABOAAAAAAIAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAACAF0AAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAQAfAAAAAAAAHwAAAAADAB8AAAAAAQAfAAAAAAEAfgAAAAAAAA4AAAAAAgB6AAAAAAIAegAAAAACAHoAAAAAAAB6AAAAAAEAegAAAAABAF0AAAAAAABdAAAAAAIAfgAAAAAAAB8AAAAAAgAfAAAAAAEAHwAAAAADAB8AAAAAAAAfAAAAAAIAHwAAAAAAAH4AAAAAAAAOAAAAAAEAegAAAAADAHoAAAAAAwB6AAAAAAIAegAAAAAAAHoAAAAAAQBdAAAAAAAAXQAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAADgAAAAADAA4AAAAAAQAOAAAAAAIADgAAAAABAA4AAAAAAwAOAAAAAAEAXQAAAAADAF0AAAAAAwB+AAAAAAAATQAAAAACAE0AAAAAAwBNAAAAAAAATQAAAAABAE0AAAAAAgBNAAAAAAIAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAgBdAAAAAAAATQAAAAABAF0AAAAAAQBdAAAAAAMAXQAAAAABAF0AAAAAAQBdAAAAAAMAXQAAAAACAF0AAAAAAQBdAAAAAAMAXQAAAAABAF0AAAAAAABdAAAAAAAAXQAAAAACAF0AAAAAAgBdAAAAAAEAXQAAAAAAAE0AAAAAAQBdAAAAAAIAXQAAAAACAF0AAAAAAQBdAAAAAAAAXQAAAAADAF0AAAAAAwBdAAAAAAIAXQAAAAAAAF0AAAAAAQBdAAAAAAMAXQAAAAAAAF0AAAAAAABdAAAAAAIAXQAAAAACAF0AAAAAAgBNAAAAAAIAXQAAAAABAF0AAAAAAgBdAAAAAAAAXQAAAAAAAF0AAAAAAgBdAAAAAAEAXQAAAAADAF0AAAAAAABdAAAAAAAAXQAAAAABAF0AAAAAAgBdAAAAAAEAXQAAAAACAF0AAAAAAwBdAAAAAAMAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAQBdAAAAAAIAXQAAAAABAF0AAAAAAwB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAE0AAAAAAgBdAAAAAAEAXQAAAAACAH4AAAAAAAB9AAAAAAAAfQAAAAAAAH4AAAAAAABdAAAAAAEAXQAAAAACAF0AAAAAAABdAAAAAAAAbQAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAABdAAAAAAIAXQAAAAAAAF0AAAAAAQB+AAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAQBdAAAAAAEAXQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAXQAAAAABAF0AAAAAAgBdAAAAAAEAfgAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAG0AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAwBdAAAAAAIAXQAAAAABAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAIAXQAAAAADAH4AAAAAAABdAAAAAAMAXQAAAAACAF0AAAAAAgB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAACAF0AAAAAAwBdAAAAAAAAXQAAAAABAA==
+          tiles: XQAAAAAAAF0AAAAAAAB+AAAAAAAAHwAAAAABAB8AAAAAAQAfAAAAAAAAegAAAAABAHoAAAAAAgB6AAAAAAEAfgAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAegAAAAAAAF0AAAAAAQBdAAAAAAMAfgAAAAAAAB8AAAAAAgAfAAAAAAMAHwAAAAACAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAH4AAAAAAABdAAAAAAAAXQAAAAACAB8AAAAAAQAfAAAAAAMAHwAAAAABAB8AAAAAAQAfAAAAAAAAHwAAAAAAAB8AAAAAAQB+AAAAAAAAfgAAAAAAAH4AAAAAAABOAAAAAAIAegAAAAAAAHoAAAAAAAB+AAAAAAAAXQAAAAACAF0AAAAAAAB+AAAAAAAAHwAAAAAAAB8AAAAAAQAfAAAAAAAAHwAAAAADAB8AAAAAAQAfAAAAAAEAfgAAAAAAAA4AAAAAAgB6AAAAAAIAegAAAAACAHoAAAAAAAB6AAAAAAEAegAAAAABAF0AAAAAAABdAAAAAAIAfgAAAAAAAB8AAAAAAgAfAAAAAAEAHwAAAAADAB8AAAAAAAAfAAAAAAIAHwAAAAAAAH4AAAAAAAAOAAAAAAEAegAAAAADAHoAAAAAAwB6AAAAAAIAegAAAAAAAHoAAAAAAQBdAAAAAAAAXQAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAADgAAAAADAA4AAAAAAQAOAAAAAAIADgAAAAABAA4AAAAAAwAOAAAAAAEAXQAAAAADAF0AAAAAAwB+AAAAAAAATQAAAAACAE0AAAAAAwBNAAAAAAAATQAAAAABAE0AAAAAAgBNAAAAAAIAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAgBdAAAAAAAATQAAAAABAF0AAAAAAQBdAAAAAAMAXQAAAAABAF0AAAAAAQBdAAAAAAMAXQAAAAACAF0AAAAAAQBdAAAAAAMAXQAAAAABAF0AAAAAAABdAAAAAAAAXQAAAAACAF0AAAAAAgBdAAAAAAEAXQAAAAAAAE0AAAAAAQBdAAAAAAIAXQAAAAACAF0AAAAAAQBdAAAAAAAAXQAAAAADAF0AAAAAAwBdAAAAAAIAXQAAAAAAAF0AAAAAAQBdAAAAAAMAXQAAAAAAAF0AAAAAAABdAAAAAAIAXQAAAAACAF0AAAAAAgBNAAAAAAIAXQAAAAABAF0AAAAAAgBdAAAAAAAAXQAAAAAAAF0AAAAAAgBdAAAAAAEAXQAAAAADAF0AAAAAAABdAAAAAAAAXQAAAAABAF0AAAAAAgBdAAAAAAEAXQAAAAACAF0AAAAAAwBdAAAAAAMAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAQBdAAAAAAIAXQAAAAABAF0AAAAAAwB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAE0AAAAAAgBdAAAAAAEAXQAAAAACAH4AAAAAAAB9AAAAAAAAfQAAAAAAAH4AAAAAAABdAAAAAAEAXQAAAAACAF0AAAAAAABdAAAAAAAAbQAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAABdAAAAAAIAXQAAAAAAAF0AAAAAAQB+AAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAQBdAAAAAAEAXQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAXQAAAAABAF0AAAAAAgBdAAAAAAEAfgAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAG0AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAwBdAAAAAAIAXQAAAAABAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAIAXQAAAAADAH4AAAAAAABdAAAAAAMAXQAAAAACAF0AAAAAAgB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB9AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAACAF0AAAAAAwBdAAAAAAAAXQAAAAABAA==
           version: 7
         -1,-2:
           ind: -1,-2
@@ -115,7 +115,7 @@ entities:
           version: 7
         0,-3:
           ind: 0,-3
-          tiles: XQAAAAACAF0AAAAAAwBdAAAAAAIAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAwBdAAAAAAEAXQAAAAABAH4AAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAZAAAAAAAAGQAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAIAXQAAAAABAF0AAAAAAAAfAAAAAAMAHwAAAAADAB8AAAAAAgAfAAAAAAEAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGQAAAAAAABkAAAAAAAAXQAAAAAAAF0AAAAAAQBdAAAAAAIAfgAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAGQAAAAAAAB+AAAAAAAAfgAAAAAAAGQAAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAwBdAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABkAAAAAAAAZAAAAAAAAH4AAAAAAAB+AAAAAAAAZAAAAAAAAH4AAAAAAABdAAAAAAEAXQAAAAAAAH4AAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAgBtAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAgBdAAAAAAEAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAAAXQAAAAACAH4AAAAAAAAfAAAAAAEAHwAAAAABAB8AAAAAAgB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAABAF0AAAAAAwB+AAAAAAAAHwAAAAAAAB8AAAAAAQAfAAAAAAIAfgAAAAAAAG0AAAAAAAB+AAAAAAAAfgAAAAAAAG0AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABtAAAAAAAAfgAAAAAAAF0AAAAAAgBdAAAAAAEAHwAAAAADAB8AAAAAAAAfAAAAAAEAHwAAAAABAB8AAAAAAgAfAAAAAAAAfgAAAAAAAB8AAAAAAQAfAAAAAAAAHwAAAAACAH4AAAAAAABAAAAAAAAAQAAAAAAAAH4AAAAAAABdAAAAAAMAXQAAAAAAAH4AAAAAAAAfAAAAAAEAHwAAAAACAB8AAAAAAQAfAAAAAAMAHwAAAAADAH4AAAAAAAB6AAAAAAMAegAAAAAAAHoAAAAAAgB+AAAAAAAAQAAAAAAAAEAAAAAAAAB+AAAAAAAAXQAAAAACAF0AAAAAAgB+AAAAAAAAHwAAAAACAB8AAAAAAgAfAAAAAAMAHwAAAAACAB8AAAAAAwB+AAAAAAAAegAAAAACAHoAAAAAAAB6AAAAAAIAfgAAAAAAAEAAAAAAAABAAAAAAAAAfgAAAAAAAF0AAAAAAABdAAAAAAEAfgAAAAAAAB8AAAAAAQAfAAAAAAAAHwAAAAABAB8AAAAAAgAfAAAAAAIAfgAAAAAAAHoAAAAAAgB6AAAAAAEAegAAAAADAH4AAAAAAABAAAAAAAAAQAAAAAAAAH4AAAAAAABdAAAAAAMAXQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAQB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAegAAAAADAH4AAAAAAAB+AAAAAAAAQAAAAAAAAEAAAAAAAAB+AAAAAAAAXQAAAAADAF0AAAAAAQB+AAAAAAAAHwAAAAABAB8AAAAAAAAfAAAAAAIAfgAAAAAAAHoAAAAAAAB6AAAAAAAAfgAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAfgAAAAAAAA==
+          tiles: XQAAAAACAF0AAAAAAwBdAAAAAAIAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAwBdAAAAAAEAXQAAAAABAH4AAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAZAAAAAAAAGQAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAIAXQAAAAABAF0AAAAAAAAfAAAAAAMAHwAAAAADAB8AAAAAAgAfAAAAAAEAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGQAAAAAAABkAAAAAAAAXQAAAAAAAF0AAAAAAQBdAAAAAAIAfgAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAGQAAAAAAAB+AAAAAAAAfgAAAAAAAGQAAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAwBdAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABkAAAAAAAAZAAAAAAAAH4AAAAAAAB+AAAAAAAAZAAAAAAAAH4AAAAAAABdAAAAAAEAXQAAAAAAAH4AAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAAAAF0AAAAAAgBtAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAF0AAAAAAgBdAAAAAAEAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAAAXQAAAAACAH4AAAAAAAAfAAAAAAEAHwAAAAABAB8AAAAAAgB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAXQAAAAABAF0AAAAAAwB+AAAAAAAAHwAAAAAAAB8AAAAAAQAfAAAAAAIAfgAAAAAAAG0AAAAAAAB+AAAAAAAAfgAAAAAAAG0AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABtAAAAAAAAfgAAAAAAAF0AAAAAAgBdAAAAAAEAHwAAAAADAB8AAAAAAAAfAAAAAAEAHwAAAAABAB8AAAAAAgAfAAAAAAAAfgAAAAAAAB8AAAAAAQAfAAAAAAAAHwAAAAACAH4AAAAAAABAAAAAAAAAQAAAAAAAAH4AAAAAAABdAAAAAAMAXQAAAAAAAH4AAAAAAAAfAAAAAAEAHwAAAAACAB8AAAAAAQAfAAAAAAMAHwAAAAADAH4AAAAAAAB6AAAAAAMAegAAAAAAAHoAAAAAAgB+AAAAAAAAQAAAAAAAAEAAAAAAAAB6AAAAAAAAXQAAAAACAF0AAAAAAgB+AAAAAAAAHwAAAAACAB8AAAAAAgAfAAAAAAMAHwAAAAACAB8AAAAAAwB+AAAAAAAAegAAAAACAHoAAAAAAAB6AAAAAAIAfgAAAAAAAEAAAAAAAABAAAAAAAAAegAAAAAAAF0AAAAAAABdAAAAAAEAfgAAAAAAAB8AAAAAAQAfAAAAAAAAHwAAAAABAB8AAAAAAgAfAAAAAAIAfgAAAAAAAHoAAAAAAgB6AAAAAAEAegAAAAADAH4AAAAAAABAAAAAAAAAQAAAAAAAAHoAAAAAAABdAAAAAAMAXQAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAQB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAegAAAAADAH4AAAAAAAB+AAAAAAAAQAAAAAAAAEAAAAAAAAB6AAAAAAAAXQAAAAADAF0AAAAAAQB+AAAAAAAAHwAAAAABAB8AAAAAAAAfAAAAAAIAfgAAAAAAAHoAAAAAAAB6AAAAAAAAfgAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAegAAAAAAAA==
           version: 7
         -1,-3:
           ind: -1,-3
@@ -123,7 +123,7 @@ entities:
           version: 7
         1,-2:
           ind: 1,-2
-          tiles: egAAAAADAHoAAAAAAAB6AAAAAAIAegAAAAAAAHoAAAAAAQB6AAAAAAIAfgAAAAAAAAQAAAAAAwAEAAAAAAEABAAAAAAAAAQAAAAAAwB+AAAAAAAAHwAAAAABAF0AAAAAAABdAAAAAAIAXQAAAAAAAHoAAAAAAwB6AAAAAAMAegAAAAACAHoAAAAAAwB6AAAAAAIAegAAAAAAAH4AAAAAAAAEAAAAAAEABAAAAAACAAQAAAAAAwAEAAAAAAAAfgAAAAAAAB8AAAAAAgBdAAAAAAMAXQAAAAAAAF0AAAAAAAB6AAAAAAEAegAAAAAAAHoAAAAAAgB6AAAAAAMAegAAAAAAAHoAAAAAAQB+AAAAAAAAHwAAAAABAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAAAXQAAAAADAF0AAAAAAQBdAAAAAAEAegAAAAAAAHoAAAAAAAB6AAAAAAMAegAAAAAAAHoAAAAAAgB6AAAAAAEAfgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAB+AAAAAAAAHwAAAAADAF0AAAAAAgBdAAAAAAAAXQAAAAABAHoAAAAAAgB6AAAAAAIAegAAAAADAHoAAAAAAQB6AAAAAAAAegAAAAADAH4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAAfgAAAAAAAB8AAAAAAQBdAAAAAAMAXQAAAAAAAF0AAAAAAwAOAAAAAAMADgAAAAADAA4AAAAAAwAOAAAAAAIADgAAAAACAA4AAAAAAQB+AAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAH4AAAAAAAAfAAAAAAMAHwAAAAADAB8AAAAAAQAfAAAAAAAADgAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAABAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAwB+AAAAAAAAPAAAAAAAAF0AAAAAAABdAAAAAAIATQAAAAABAF0AAAAAAgBdAAAAAAIAXQAAAAAAAF0AAAAAAwBdAAAAAAIAXQAAAAACAF0AAAAAAgBdAAAAAAEAXQAAAAADAF0AAAAAAQBdAAAAAAAAXQAAAAACAF0AAAAAAABdAAAAAAIAXQAAAAADAE0AAAAAAABdAAAAAAEAXQAAAAACAF0AAAAAAgBdAAAAAAIAXQAAAAABAF0AAAAAAABdAAAAAAIAXQAAAAACAF0AAAAAAABdAAAAAAIAXQAAAAACAF0AAAAAAgBdAAAAAAIAXQAAAAACAF0AAAAAAABNAAAAAAMAXQAAAAACAF0AAAAAAwBdAAAAAAIAXQAAAAABAF0AAAAAAwBdAAAAAAMAXQAAAAACAF0AAAAAAgBdAAAAAAAAXQAAAAABAF0AAAAAAABdAAAAAAIAXQAAAAACAE0AAAAAAgBNAAAAAAIAfgAAAAAAAH4AAAAAAAAOAAAAAAMADgAAAAAAAA4AAAAAAwAOAAAAAAEAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAAAXQAAAAADAH4AAAAAAAAfAAAAAAAADgAAAAADAA4AAAAAAAAOAAAAAAEADgAAAAADAA4AAAAAAgB6AAAAAAEAegAAAAAAAHoAAAAAAwB+AAAAAAAAXQAAAAACAHAAAAAAAwB+AAAAAAAAXQAAAAAAAF0AAAAAAQB+AAAAAAAAHwAAAAAAAA4AAAAAAgAOAAAAAAAADgAAAAABAA4AAAAAAgAOAAAAAAAAegAAAAAAAHoAAAAAAQB6AAAAAAAAfgAAAAAAAHAAAAAAAQBwAAAAAAIAcAAAAAADAF0AAAAAAgBdAAAAAAAAHwAAAAADAB8AAAAAAAAOAAAAAAEADgAAAAACAA4AAAAAAQAOAAAAAAEADgAAAAADAHoAAAAAAwB6AAAAAAMAegAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAEAXQAAAAAAAB8AAAAAAwAfAAAAAAMADgAAAAAAAA4AAAAAAwAOAAAAAAMADgAAAAABAA4AAAAAAgB6AAAAAAAAegAAAAABAHoAAAAAAAB+AAAAAAAAcAAAAAADAHAAAAAAAQBwAAAAAAEAXQAAAAACAF0AAAAAAgB+AAAAAAAAHwAAAAADAA4AAAAAAQAOAAAAAAMADgAAAAACAA4AAAAAAwAOAAAAAAIAegAAAAACAHoAAAAAAAB6AAAAAAEAfgAAAAAAAHAAAAAAAwBwAAAAAAMAfgAAAAAAAA==
+          tiles: egAAAAADAHoAAAAAAAB6AAAAAAIAegAAAAAAAHoAAAAAAQB6AAAAAAIAegAAAAAAAAQAAAAAAwAEAAAAAAEABAAAAAAAAAQAAAAAAwAfAAAAAAAAHwAAAAABAF0AAAAAAABdAAAAAAIAXQAAAAAAAHoAAAAAAwB6AAAAAAMAegAAAAACAHoAAAAAAwB6AAAAAAIAegAAAAAAAHoAAAAAAAAEAAAAAAEABAAAAAACAAQAAAAAAwAEAAAAAAAAHwAAAAAAAB8AAAAAAgBdAAAAAAMAXQAAAAAAAF0AAAAAAAB6AAAAAAEAegAAAAAAAHoAAAAAAgB6AAAAAAMAegAAAAAAAHoAAAAAAQB+AAAAAAAAHwAAAAABAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAAfAAAAAAAAXQAAAAADAF0AAAAAAQBdAAAAAAEAegAAAAAAAHoAAAAAAAB6AAAAAAMAegAAAAAAAHoAAAAAAgB6AAAAAAEAfgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAB+AAAAAAAAHwAAAAADAF0AAAAAAgBdAAAAAAAAXQAAAAABAHoAAAAAAgB6AAAAAAIAegAAAAADAHoAAAAAAQB6AAAAAAAAegAAAAADAH4AAAAAAAAuAAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAAfgAAAAAAAB8AAAAAAQBdAAAAAAMAXQAAAAAAAF0AAAAAAwAOAAAAAAMADgAAAAADAA4AAAAAAwAOAAAAAAIADgAAAAACAA4AAAAAAQB+AAAAAAAALgAAAAAAAC4AAAAAAAAuAAAAAAAALgAAAAAAAH4AAAAAAAAfAAAAAAMAHwAAAAADAB8AAAAAAQAfAAAAAAAADgAAAAADAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAHwAAAAABAH4AAAAAAAB+AAAAAAAAfgAAAAAAAB8AAAAAAwB+AAAAAAAAPAAAAAAAAF0AAAAAAABdAAAAAAIATQAAAAABAF0AAAAAAgBdAAAAAAIAXQAAAAAAAF0AAAAAAwBdAAAAAAIAXQAAAAACAF0AAAAAAgBdAAAAAAEAXQAAAAADAF0AAAAAAQBdAAAAAAAAXQAAAAACAF0AAAAAAABdAAAAAAIAXQAAAAADAE0AAAAAAABdAAAAAAEAXQAAAAACAF0AAAAAAgBdAAAAAAIAXQAAAAABAF0AAAAAAABdAAAAAAIAXQAAAAACAF0AAAAAAABdAAAAAAIAXQAAAAACAF0AAAAAAgBdAAAAAAIAXQAAAAACAF0AAAAAAABNAAAAAAMAXQAAAAACAF0AAAAAAwBdAAAAAAIAXQAAAAABAF0AAAAAAwBdAAAAAAMAXQAAAAACAF0AAAAAAgBdAAAAAAAAXQAAAAABAF0AAAAAAABdAAAAAAIAXQAAAAACAE0AAAAAAgBNAAAAAAIAfgAAAAAAAH4AAAAAAAAOAAAAAAMADgAAAAAAAA4AAAAAAwAOAAAAAAEAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAAAXQAAAAADAH4AAAAAAAAfAAAAAAAADgAAAAADAA4AAAAAAAAOAAAAAAEADgAAAAADAA4AAAAAAgB6AAAAAAEAegAAAAAAAHoAAAAAAwB+AAAAAAAAXQAAAAACAHAAAAAAAwB+AAAAAAAAXQAAAAAAAF0AAAAAAQB+AAAAAAAAHwAAAAAAAA4AAAAAAgAOAAAAAAAADgAAAAABAA4AAAAAAgAOAAAAAAAAegAAAAAAAHoAAAAAAQB6AAAAAAAAfgAAAAAAAHAAAAAAAQBwAAAAAAIAcAAAAAADAF0AAAAAAgBdAAAAAAAAHwAAAAADAB8AAAAAAAAOAAAAAAEADgAAAAACAA4AAAAAAQAOAAAAAAEADgAAAAADAHoAAAAAAwB6AAAAAAMAegAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABdAAAAAAEAXQAAAAAAAB8AAAAAAwAfAAAAAAMADgAAAAAAAA4AAAAAAwAOAAAAAAMADgAAAAABAA4AAAAAAgB6AAAAAAAAegAAAAABAHoAAAAAAAB+AAAAAAAAcAAAAAADAHAAAAAAAQBwAAAAAAEAXQAAAAACAF0AAAAAAgB+AAAAAAAAHwAAAAADAA4AAAAAAQAOAAAAAAMADgAAAAACAA4AAAAAAwAOAAAAAAIAegAAAAACAHoAAAAAAAB6AAAAAAEAfgAAAAAAAHAAAAAAAwBwAAAAAAMAfgAAAAAAAA==
           version: 7
         1,-1:
           ind: 1,-1
@@ -147,7 +147,7 @@ entities:
           version: 7
         1,-3:
           ind: 1,-3
-          tiles: fgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAZAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAAAAH4AAAAAAABkAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB9AAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGQAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH0AAAAAAAB9AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbQAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAHwAAAAABAB8AAAAAAgAfAAAAAAIAHwAAAAADAB8AAAAAAwAfAAAAAAIAfgAAAAAAAAQAAAAAAAAEAAAAAAIABAAAAAADAAQAAAAAAwAEAAAAAAMAfgAAAAAAAB8AAAAAAQAfAAAAAAMAfgAAAAAAAB8AAAAAAAAfAAAAAAMAHwAAAAADAB8AAAAAAAAfAAAAAAEAHwAAAAACAH4AAAAAAAAEAAAAAAIABAAAAAADAAQAAAAAAAAEAAAAAAMABAAAAAACAH4AAAAAAAAMAAAAAAIADAAAAAABAH4AAAAAAAB6AAAAAAEAegAAAAABAHoAAAAAAAB6AAAAAAMAegAAAAAAAHoAAAAAAAAfAAAAAAEABAAAAAABAAQAAAAAAAAEAAAAAAEABAAAAAADAAQAAAAAAQAfAAAAAAIADAAAAAADAAwAAAAAAQB+AAAAAAAAegAAAAABAHoAAAAAAQB6AAAAAAIAegAAAAAAAHoAAAAAAAB6AAAAAAAAfgAAAAAAAAQAAAAAAQAEAAAAAAAABAAAAAABAAQAAAAAAAAEAAAAAAIAfgAAAAAAAAwAAAAAAAAMAAAAAAIAfgAAAAAAAHoAAAAAAQB6AAAAAAEAegAAAAABAHoAAAAAAAB6AAAAAAMAegAAAAABAH4AAAAAAAAEAAAAAAEABAAAAAAAAAQAAAAAAAAEAAAAAAIAfgAAAAAAAH4AAAAAAAAMAAAAAAIADAAAAAACAH4AAAAAAAB6AAAAAAMAegAAAAADAHoAAAAAAgB6AAAAAAAAegAAAAACAHoAAAAAAwB+AAAAAAAABAAAAAADAAQAAAAAAwAEAAAAAAEABAAAAAADAH4AAAAAAAAfAAAAAAMAHwAAAAAAAB8AAAAAAgAfAAAAAAIAegAAAAAAAHoAAAAAAwB6AAAAAAIAegAAAAAAAHoAAAAAAwB6AAAAAAAAfgAAAAAAAAQAAAAAAgAEAAAAAAMABAAAAAACAAQAAAAAAAB+AAAAAAAAHwAAAAABAF0AAAAAAQBdAAAAAAAAXQAAAAABAA==
+          tiles: fgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAZAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAAAAH4AAAAAAABkAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAH4AAAAAAAB9AAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGQAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH0AAAAAAAB9AAAAAAAAfQAAAAAAAH0AAAAAAAB9AAAAAAAAAAAAAAAAAAAAAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH0AAAAAAAB9AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAGwAAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAbAAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAABsAAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAfgAAAAAAAH4AAAAAAAB+AAAAAAAAbQAAAAAAAH4AAAAAAAB+AAAAAAAAbAAAAAAAAGwAAAAAAABsAAAAAAAAHwAAAAABAB8AAAAAAgAfAAAAAAIAHwAAAAADAB8AAAAAAwAfAAAAAAIAfgAAAAAAAAQAAAAAAAAEAAAAAAIABAAAAAADAAQAAAAAAwAEAAAAAAMAfgAAAAAAAB8AAAAAAQAfAAAAAAMAfgAAAAAAAB8AAAAAAAAfAAAAAAMAHwAAAAADAB8AAAAAAAAfAAAAAAEAHwAAAAACAH4AAAAAAAAEAAAAAAIABAAAAAADAAQAAAAAAAAEAAAAAAMABAAAAAACAH4AAAAAAAAMAAAAAAIADAAAAAABAH4AAAAAAAB6AAAAAAEAegAAAAABAHoAAAAAAAB6AAAAAAMAegAAAAAAAHoAAAAAAAAfAAAAAAEABAAAAAABAAQAAAAAAAAEAAAAAAEABAAAAAADAAQAAAAAAQAfAAAAAAIADAAAAAADAAwAAAAAAQB+AAAAAAAAegAAAAABAHoAAAAAAQB6AAAAAAIAegAAAAAAAHoAAAAAAAB6AAAAAAAAfgAAAAAAAAQAAAAAAQAEAAAAAAAABAAAAAABAAQAAAAAAAAEAAAAAAIAfgAAAAAAAAwAAAAAAAAMAAAAAAIAfgAAAAAAAHoAAAAAAQB6AAAAAAEAegAAAAABAHoAAAAAAAB6AAAAAAMAegAAAAABAHoAAAAAAAAEAAAAAAEABAAAAAAAAAQAAAAAAAAEAAAAAAIAfgAAAAAAAH4AAAAAAAAMAAAAAAIADAAAAAACAH4AAAAAAAB6AAAAAAMAegAAAAADAHoAAAAAAgB6AAAAAAAAegAAAAACAHoAAAAAAwB6AAAAAAAABAAAAAADAAQAAAAAAwAEAAAAAAEABAAAAAADAB8AAAAAAAAfAAAAAAMAHwAAAAAAAB8AAAAAAgAfAAAAAAIAegAAAAAAAHoAAAAAAwB6AAAAAAIAegAAAAAAAHoAAAAAAwB6AAAAAAAAegAAAAAAAAQAAAAAAgAEAAAAAAMABAAAAAACAAQAAAAAAAAfAAAAAAAAHwAAAAABAF0AAAAAAQBdAAAAAAAAXQAAAAABAA==
           version: 7
         -3,0:
           ind: -3,0
@@ -11884,19 +11884,27 @@ entities:
       parent: 60
     - type: DeviceLinkSource
       linkedPorts:
-        12706:
+        15897:
         - - DoorStatus
-          - DoorBolt
+          - InputB
   - uid: 12706
     components:
     - type: Transform
       pos: 55.5,0.5
       parent: 60
+    - type: DeviceLinkSink
+      invokeCounter: 1
     - type: DeviceLinkSource
       linkedPorts:
         8358:
         - - DoorStatus
           - DoorBolt
+        19007:
+        - - DoorStatus
+          - DoorBolt
+        19006:
+        - - DoorStatus
+          - DoorBolt
   - uid: 13183
     components:
     - type: Transform
@@ -13521,6 +13529,13 @@ entities:
       parent: 60
 - proto: AirlockMedicalGlassLocked
   entities:
+  - uid: 94
+    components:
+    - type: MetaData
+      name: Triage
+    - type: Transform
+      pos: 34.5,-21.5
+      parent: 60
   - uid: 300
     components:
     - type: MetaData
@@ -13540,15 +13555,15 @@ entities:
     - type: Transform
       pos: 42.5,-23.5
       parent: 60
-- proto: AirlockMedicalLocked
-  entities:
-  - uid: 94
+  - uid: 6832
     components:
     - type: MetaData
       name: Triage
     - type: Transform
-      pos: 34.5,-21.5
+      pos: 33.5,-21.5
       parent: 60
+- proto: AirlockMedicalLocked
+  entities:
   - uid: 104
     components:
     - type: MetaData
@@ -13575,13 +13590,6 @@ entities:
     - type: Transform
       pos: 48.5,-15.5
       parent: 60
-  - uid: 6832
-    components:
-    - type: MetaData
-      name: Triage
-    - type: Transform
-      pos: 33.5,-21.5
-      parent: 60
 - proto: AirlockQuartermasterLocked
   entities:
   - uid: 1622
@@ -113722,6 +113730,39 @@ entities:
         - 0
 - proto: LogicGateOr
   entities:
+  - uid: 15846
+    components:
+    - type: Transform
+      anchored: True
+      rot: -1.5707963267948966 rad
+      pos: 54.5,2.5
+      parent: 60
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        15897:
+        - - Output
+          - InputA
+    - type: Physics
+      canCollide: False
+      bodyType: Static
+  - uid: 15897
+    components:
+    - type: Transform
+      anchored: True
+      pos: 54.5,0.5
+      parent: 60
+    - type: DeviceLinkSource
+      linkedPorts:
+        12706:
+        - - Output
+          - DoorBolt
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: Physics
+      canCollide: False
+      bodyType: Static
   - uid: 25536
     components:
     - type: Transform
@@ -133638,6 +133679,13 @@ entities:
     - type: Transform
       pos: 29.5,15.5
       parent: 60
+- proto: SpawnMobPollyParrot
+  entities:
+  - uid: 15898
+    components:
+    - type: Transform
+      pos: 9.5,19.5
+      parent: 60
 - proto: SpawnMobPossumMorty
   entities:
   - uid: 9220
@@ -157181,11 +157229,25 @@ entities:
     - type: Transform
       pos: 53.5,3.5
       parent: 60
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        15846:
+        - - DoorStatus
+          - InputA
   - uid: 19007
     components:
     - type: Transform
       pos: 54.5,3.5
       parent: 60
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        15846:
+        - - DoorStatus
+          - InputB
   - uid: 19023
     components:
     - type: Transform
diff --git a/Resources/Maps/box.yml b/Resources/Maps/box.yml
index 1eed1533fc11..32f6e40f319f 100644
--- a/Resources/Maps/box.yml
+++ b/Resources/Maps/box.yml
@@ -1,11 +1,11 @@
 meta:
   format: 7
   category: Map
-  engineVersion: 260.2.0
+  engineVersion: 264.0.0
   forkId: ""
   forkVersion: ""
-  time: 05/26/2025 20:21:37
-  entityCount: 28663
+  time: 07/22/2025 15:47:55
+  entityCount: 28659
 maps:
 - 780
 grids:
@@ -14586,7 +14586,7 @@ entities:
       pos: 24.5,16.5
       parent: 8364
     - type: Door
-      secondsUntilStateChange: -139227
+      secondsUntilStateChange: -139282.55
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -61522,28 +61522,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -19.5,-72.5
       parent: 8364
-- proto: CapacitorStockPart
-  entities:
-  - uid: 16363
-    components:
-    - type: Transform
-      pos: -8.441639,-39.39827
-      parent: 8364
-  - uid: 16373
-    components:
-    - type: Transform
-      pos: -8.183451,-39.306458
-      parent: 8364
-  - uid: 21190
-    components:
-    - type: Transform
-      pos: 74.41276,-20.008142
-      parent: 8364
-  - uid: 21198
-    components:
-    - type: Transform
-      pos: 74.631615,-20.414675
-      parent: 8364
 - proto: CaptainIDCard
   entities:
   - uid: 5329
@@ -73064,14 +73042,7 @@ entities:
     - type: Transform
       pos: 51.5,-22.5
       parent: 8364
-- proto: ClothingNeckBling
-  entities:
-  - uid: 5122
-    components:
-    - type: Transform
-      pos: -33.388332,5.487677
-      parent: 8364
-- proto: ClothingNeckHeadphones
+- proto: ClothingMultipleHeadphones
   entities:
   - uid: 5108
     components:
@@ -73088,6 +73059,13 @@ entities:
     - type: Transform
       pos: 10.566364,49.540405
       parent: 8364
+- proto: ClothingNeckBling
+  entities:
+  - uid: 5122
+    components:
+    - type: Transform
+      pos: -33.388332,5.487677
+      parent: 8364
 - proto: ClothingNeckMantleRD
   entities:
   - uid: 21247
@@ -89260,7 +89238,7 @@ entities:
       pos: 18.5,-13.5
       parent: 8364
     - type: Door
-      secondsUntilStateChange: -46457.992
+      secondsUntilStateChange: -46513.54
       state: Closing
   - uid: 13388
     components:
@@ -89268,7 +89246,7 @@ entities:
       pos: 18.5,-14.5
       parent: 8364
     - type: Door
-      secondsUntilStateChange: -46493.69
+      secondsUntilStateChange: -46549.24
       state: Closing
   - uid: 13389
     components:
@@ -89426,7 +89404,7 @@ entities:
       pos: -34.5,-14.5
       parent: 8364
     - type: Door
-      secondsUntilStateChange: -133415.53
+      secondsUntilStateChange: -133471.08
       state: Closing
   - uid: 15010
     components:
@@ -132577,13 +132555,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -30.638481,19.375069
       parent: 8364
-- proto: MatterBinStockPart
-  entities:
-  - uid: 16355
-    components:
-    - type: Transform
-      pos: -10.435738,-39.009453
-      parent: 8364
 - proto: Mattress
   entities:
   - uid: 9413
@@ -132760,6 +132731,11 @@ entities:
       parent: 8364
 - proto: MicroManipulatorStockPart
   entities:
+  - uid: 16355
+    components:
+    - type: Transform
+      pos: -10.435738,-39.009453
+      parent: 8364
   - uid: 16356
     components:
     - type: Transform
@@ -132770,6 +132746,16 @@ entities:
     - type: Transform
       pos: -10.310738,-39.540703
       parent: 8364
+  - uid: 16363
+    components:
+    - type: Transform
+      pos: -8.441639,-39.39827
+      parent: 8364
+  - uid: 16373
+    components:
+    - type: Transform
+      pos: -8.183451,-39.306458
+      parent: 8364
   - uid: 21185
     components:
     - type: Transform
@@ -132781,6 +132767,16 @@ entities:
       rot: 0.0004530529258772731 rad
       pos: 74.7369,-19.349794
       parent: 8364
+  - uid: 21190
+    components:
+    - type: Transform
+      pos: 74.41276,-20.008142
+      parent: 8364
+  - uid: 21198
+    components:
+    - type: Transform
+      pos: 74.631615,-20.414675
+      parent: 8364
 - proto: MicrophoneInstrument
   entities:
   - uid: 3819
@@ -151725,6 +151721,13 @@ entities:
     - type: Transform
       pos: 80.5,-32.5
       parent: 8364
+- proto: SpawnMobPollyParrot
+  entities:
+  - uid: 8712
+    components:
+    - type: Transform
+      pos: -6.5,-62.5
+      parent: 8364
 - proto: SpawnMobPossumMorty
   entities:
   - uid: 18697
@@ -179452,7 +179455,7 @@ entities:
       - 273
       - 272
       - 4368
-- proto: WeaponEnergyTurretStation
+- proto: WeaponEnergyTurretSecurity
   entities:
   - uid: 203
     components:
@@ -179481,7 +179484,7 @@ entities:
       deviceLists:
       - 258
       - 28663
-- proto: WeaponEnergyTurretStationControlPanel
+- proto: WeaponEnergyTurretSecurityControlPanel
   entities:
   - uid: 258
     components:
diff --git a/Resources/Maps/elkridge.yml b/Resources/Maps/elkridge.yml
index 87319fa145e0..01129f897aae 100644
--- a/Resources/Maps/elkridge.yml
+++ b/Resources/Maps/elkridge.yml
@@ -1,10 +1,10 @@
 meta:
   format: 7
   category: Map
-  engineVersion: 262.0.0
+  engineVersion: 264.0.0
   forkId: ""
   forkVersion: ""
-  time: 06/13/2025 13:15:20
+  time: 07/22/2025 15:38:07
   entityCount: 18654
 maps:
 - 1
@@ -102695,7 +102695,7 @@ entities:
     - type: Transform
       pos: 0.5,-5.5
       parent: 2
-- proto: SpawnMobParrot
+- proto: SpawnMobPollyParrot
   entities:
   - uid: 16182
     components:
diff --git a/Resources/Maps/exo.yml b/Resources/Maps/exo.yml
index 5ce2d601a42f..ae62cd95faee 100644
--- a/Resources/Maps/exo.yml
+++ b/Resources/Maps/exo.yml
@@ -4,8 +4,8 @@ meta:
   engineVersion: 264.0.0
   forkId: ""
   forkVersion: ""
-  time: 07/03/2025 16:09:47
-  entityCount: 19679
+  time: 07/22/2025 16:43:19
+  entityCount: 19680
 maps:
 - 1
 grids:
@@ -10058,7 +10058,7 @@ entities:
       pos: 11.5,-30.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -127812.8
+      secondsUntilStateChange: -127847.92
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -99082,6 +99082,13 @@ entities:
     - type: Transform
       pos: 10.5,2.5
       parent: 2
+- proto: SpawnMobPollyParrot
+  entities:
+  - uid: 19680
+    components:
+    - type: Transform
+      pos: -30.5,-62.5
+      parent: 2
 - proto: SpawnMobPossumMorty
   entities:
   - uid: 17337
diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml
index 5cbb060a86cf..0d0ec5c8b484 100644
--- a/Resources/Maps/fland.yml
+++ b/Resources/Maps/fland.yml
@@ -1,11 +1,11 @@
 meta:
   format: 7
   category: Map
-  engineVersion: 261.1.0
+  engineVersion: 264.0.0
   forkId: ""
   forkVersion: ""
-  time: 06/04/2025 21:11:26
-  entityCount: 36084
+  time: 07/22/2025 16:38:44
+  entityCount: 36085
 maps:
 - 1
 grids:
@@ -95928,6 +95928,13 @@ entities:
     - type: Transform
       pos: 62.563507,-54.453243
       parent: 13329
+- proto: ClothingMultipleHeadphones
+  entities:
+  - uid: 18652
+    components:
+    - type: Transform
+      pos: 31.565708,30.688412
+      parent: 13329
 - proto: ClothingNeckBling
   entities:
   - uid: 35774
@@ -95942,13 +95949,6 @@ entities:
     - type: Transform
       pos: -35.53245,36.540043
       parent: 13329
-- proto: ClothingNeckHeadphones
-  entities:
-  - uid: 18652
-    components:
-    - type: Transform
-      pos: 31.565708,30.688412
-      parent: 13329
 - proto: ClothingNeckScarfStripedBlue
   entities:
   - uid: 18674
@@ -190647,6 +190647,13 @@ entities:
     - type: Transform
       pos: 92.5,-53.5
       parent: 13329
+- proto: SpawnMobPollyParrot
+  entities:
+  - uid: 36085
+    components:
+    - type: Transform
+      pos: 82.5,-11.5
+      parent: 13329
 - proto: SpawnMobPossumMorty
   entities:
   - uid: 19209
@@ -225472,7 +225479,7 @@ entities:
       - 30752
       - 21433
       - 13389
-- proto: WeaponEnergyTurretStation
+- proto: WeaponEnergyTurretSecurity
   entities:
   - uid: 30221
     components:
@@ -225508,7 +225515,7 @@ entities:
       deviceLists:
       - 35724
       - 30219
-- proto: WeaponEnergyTurretStationControlPanel
+- proto: WeaponEnergyTurretSecurityControlPanel
   entities:
   - uid: 30219
     components:
diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml
index 25adad38606d..284d6d398982 100644
--- a/Resources/Maps/marathon.yml
+++ b/Resources/Maps/marathon.yml
@@ -1,10 +1,10 @@
 meta:
   format: 7
   category: Map
-  engineVersion: 261.1.0
+  engineVersion: 264.0.0
   forkId: ""
   forkVersion: ""
-  time: 06/01/2025 19:23:17
+  time: 07/22/2025 16:14:30
   entityCount: 23140
 maps:
 - 5350
@@ -11531,7 +11531,7 @@ entities:
       pos: 34.5,45.5
       parent: 30
     - type: Door
-      secondsUntilStateChange: -19653.71
+      secondsUntilStateChange: -19680.645
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -53197,6 +53197,13 @@ entities:
     - type: Transform
       pos: -38.937637,39.35975
       parent: 30
+- proto: ClothingMultipleHeadphones
+  entities:
+  - uid: 16118
+    components:
+    - type: Transform
+      pos: 18.544088,42.565483
+      parent: 30
 - proto: ClothingNeckBling
   entities:
   - uid: 5624
@@ -53211,13 +53218,6 @@ entities:
     - type: Transform
       pos: -56.501534,-67.426544
       parent: 30
-- proto: ClothingNeckHeadphones
-  entities:
-  - uid: 16118
-    components:
-    - type: Transform
-      pos: 18.544088,42.565483
-      parent: 30
 - proto: ClothingNeckScarfStripedBlue
   entities:
   - uid: 15999
@@ -121337,9 +121337,9 @@ entities:
     - type: Transform
       pos: 33.5,4.5
       parent: 30
-- proto: SpawnMobParrot
+- proto: SpawnMobPollyParrot
   entities:
-  - uid: 22525
+  - uid: 10256
     components:
     - type: Transform
       pos: -6.5,-34.5
diff --git a/Resources/Maps/oasis.yml b/Resources/Maps/oasis.yml
index 5006d93d932f..be47821c5564 100644
--- a/Resources/Maps/oasis.yml
+++ b/Resources/Maps/oasis.yml
@@ -1,11 +1,11 @@
 meta:
   format: 7
   category: Map
-  engineVersion: 260.1.0
+  engineVersion: 264.0.0
   forkId: ""
   forkVersion: ""
-  time: 05/24/2025 01:22:43
-  entityCount: 30829
+  time: 07/22/2025 16:51:18
+  entityCount: 30823
 maps:
 - 1
 grids:
@@ -7305,7 +7305,7 @@ entities:
             0: 65427
           -13,-12:
             0: 56524
-            6: 17
+            3: 17
           -12,-11:
             0: 60931
           -13,-11:
@@ -7413,12 +7413,12 @@ entities:
             2: 34952
           -11,2:
             2: 255
-            3: 57344
+            4: 57344
           -12,4:
             2: 53192
           -11,3:
             2: 61440
-            4: 224
+            5: 224
           -10,1:
             0: 40847
           -10,2:
@@ -7441,16 +7441,16 @@ entities:
             2: 34952
           -11,6:
             2: 61440
-            6: 224
+            3: 224
           -11,7:
             2: 65535
           -12,8:
             2: 34952
           -11,4:
-            5: 224
-            6: 57344
+            6: 224
+            3: 57344
           -11,5:
-            6: 57568
+            3: 57568
           -11,8:
             2: 65535
           -10,6:
@@ -7544,11 +7544,11 @@ entities:
           -9,-13:
             0: 4095
           -7,-15:
-            6: 61184
+            3: 61184
           -7,-14:
             0: 32752
           -6,-15:
-            6: 256
+            3: 256
             0: 32768
           -6,-14:
             0: 65528
@@ -7580,7 +7580,7 @@ entities:
           -10,-16:
             0: 8704
           -10,-17:
-            6: 49152
+            3: 49152
           -16,-7:
             2: 52416
           -16,-6:
@@ -7605,7 +7605,7 @@ entities:
             0: 52416
           -15,-9:
             0: 34952
-            6: 256
+            3: 256
           -14,-8:
             0: 49080
           -14,-7:
@@ -7625,31 +7625,31 @@ entities:
           -13,-7:
             0: 26214
           -16,-12:
-            6: 32
+            3: 32
           -16,-11:
-            6: 32768
+            3: 32768
           -16,-10:
-            6: 8
+            3: 8
           -15,-11:
-            6: 13036
+            3: 13036
             0: 32768
           -15,-10:
-            6: 307
+            3: 307
             0: 34952
           -15,-12:
-            6: 51336
+            3: 51336
           -14,-12:
-            6: 4607
+            3: 4607
             0: 49152
           -14,-11:
-            6: 17
+            3: 17
             0: 61644
           -14,-10:
             0: 65535
           -14,-13:
-            6: 59392
+            3: 59392
           -13,-13:
-            6: 4352
+            3: 4352
             0: 1604
           8,9:
             0: 65535
@@ -7852,9 +7852,9 @@ entities:
           14,-9:
             0: 36623
           15,-8:
-            6: 16
+            3: 16
           15,-6:
-            6: 16
+            3: 16
             0: 4096
             2: 32768
           15,-9:
@@ -7862,16 +7862,16 @@ entities:
           16,-5:
             2: 304
           12,-11:
-            6: 32772
+            3: 32772
           12,-12:
             2: 12
           12,-13:
             2: 52303
           13,-12:
             2: 15
-            6: 16384
+            3: 16384
           13,-11:
-            6: 65228
+            3: 65228
           13,-10:
             0: 65520
           13,-13:
@@ -7879,7 +7879,7 @@ entities:
           14,-12:
             2: 15
           14,-11:
-            6: 65521
+            3: 65521
           14,-10:
             0: 65520
           14,-13:
@@ -7887,14 +7887,14 @@ entities:
           15,-12:
             2: 1
           15,-11:
-            6: 28688
+            3: 28688
           15,-10:
             0: 4368
-            6: 52420
+            3: 52420
           15,-13:
             2: 4511
           16,-10:
-            6: 19
+            3: 19
           -4,9:
             0: 7421
           -5,9:
@@ -7909,13 +7909,13 @@ entities:
             0: 32767
           -4,12:
             0: 34945
-            6: 13072
+            3: 13072
           -3,9:
             0: 4095
           -3,10:
             0: 65535
           -3,11:
-            6: 61408
+            3: 61408
           -2,9:
             0: 4095
           -2,10:
@@ -7959,7 +7959,7 @@ entities:
             0: 65535
           -5,12:
             0: 13111
-            6: 34816
+            3: 34816
           -12,9:
             2: 65497
           -13,9:
@@ -7968,19 +7968,19 @@ entities:
             2: 52428
           -11,9:
             2: 4607
-            6: 49152
+            3: 49152
           -11,10:
             2: 33041
-            6: 204
+            3: 204
           -12,11:
             2: 136
           -11,11:
             2: 248
           -10,9:
             2: 52479
-            6: 4096
+            3: 4096
           -10,10:
-            6: 17
+            3: 17
             2: 34952
           -10,11:
             2: 2296
@@ -8033,14 +8033,14 @@ entities:
             2: 49
           -5,13:
             0: 51
-            6: 51208
+            3: 51208
           -5,14:
-            6: 264
+            3: 264
           -4,13:
-            6: 29443
+            3: 29443
             0: 136
           -4,14:
-            6: 3
+            3: 3
           -3,12:
             0: 65520
           -3,13:
@@ -8096,7 +8096,7 @@ entities:
             2: 1228
           5,13:
             0: 8738
-            6: 136
+            3: 136
           5,14:
             0: 546
             2: 16384
@@ -8270,7 +8270,7 @@ entities:
           -15,-16:
             2: 65520
           -15,-13:
-            6: 64
+            3: 64
           -14,-16:
             2: 24404
           -14,-15:
@@ -8382,7 +8382,7 @@ entities:
           -10,-19:
             2: 4096
           -10,-18:
-            6: 4
+            3: 4
           -18,-12:
             2: 68
           -18,-13:
@@ -8505,7 +8505,7 @@ entities:
           temperature: 293.15
           moles:
           - 0
-          - 6666.982
+          - 0
           - 0
           - 0
           - 0
@@ -8519,8 +8519,8 @@ entities:
         - volume: 2500
           temperature: 293.15
           moles:
-          - 6666.982
           - 0
+          - 6666.982
           - 0
           - 0
           - 0
@@ -8534,10 +8534,10 @@ entities:
         - volume: 2500
           temperature: 293.15
           moles:
+          - 6666.982
           - 0
           - 0
           - 0
-          - 6666.982
           - 0
           - 0
           - 0
@@ -8552,7 +8552,7 @@ entities:
           - 0
           - 0
           - 0
-          - 0
+          - 6666.982
           - 0
           - 0
           - 0
@@ -14906,7 +14906,7 @@ entities:
       pos: -22.5,26.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -187786.44
+      secondsUntilStateChange: -187932.16
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -15762,7 +15762,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -286615.03
+      secondsUntilStateChange: -286760.75
       state: Opening
   - uid: 6934
     components:
@@ -15774,7 +15774,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -286617.66
+      secondsUntilStateChange: -286763.38
       state: Opening
   - uid: 6935
     components:
@@ -15786,7 +15786,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -286616.5
+      secondsUntilStateChange: -286762.22
       state: Opening
   - uid: 6936
     components:
@@ -15797,7 +15797,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -286615.72
+      secondsUntilStateChange: -286761.44
       state: Opening
 - proto: AirlockTheatreLocked
   entities:
@@ -72162,14 +72162,6 @@ entities:
     - type: Transform
       pos: -56.49786,7.5886436
       parent: 2
-- proto: CapacitorStockPart
-  entities:
-  - uid: 23591
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -25.7441,-49.319046
-      parent: 2
 - proto: CarbonDioxideCanister
   entities:
   - uid: 8865
@@ -80809,6 +80801,20 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: ClothingMultipleHeadphones
+  entities:
+  - uid: 6722
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 51.484985,-35.679863
+      parent: 2
+  - uid: 30253
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 51.474567,-36.84653
+      parent: 2
 - proto: ClothingNeckBling
   entities:
   - uid: 23169
@@ -80825,20 +80831,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: ClothingNeckHeadphones
-  entities:
-  - uid: 6722
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 51.484985,-35.679863
-      parent: 2
-  - uid: 30253
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 51.474567,-36.84653
-      parent: 2
 - proto: ClothingNeckStethoscope
   entities:
   - uid: 2097
@@ -98684,7 +98676,7 @@ entities:
       pos: -13.5,-1.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -277939.03
+      secondsUntilStateChange: -278084.75
     - type: DeviceNetwork
       deviceLists:
       - 18275
@@ -145254,7 +145246,7 @@ entities:
       pos: 36.5,-35.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -314770.8
+      secondsUntilStateChange: -314916.53
       state: Opening
   - uid: 5211
     components:
@@ -148414,13 +148406,6 @@ entities:
     - type: Transform
       pos: -27.247557,-41.294125
       parent: 2
-- proto: MatterBinStockPart
-  entities:
-  - uid: 23592
-    components:
-    - type: Transform
-      pos: -27.514933,-49.371128
-      parent: 2
 - proto: MechEquipmentGrabberSmall
   entities:
   - uid: 29520
@@ -148647,6 +148632,19 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: MicroManipulatorStockPart
+  entities:
+  - uid: 23591
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -25.7441,-49.319046
+      parent: 2
+  - uid: 23592
+    components:
+    - type: Transform
+      pos: -27.514933,-49.371128
+      parent: 2
 - proto: MicrophoneInstrument
   entities:
   - uid: 24163
@@ -168391,10 +168389,19 @@ entities:
     - type: Transform
       pos: -32.5,-17.5
       parent: 2
+    - type: ContainerContainer
+      containers:
+        smart_fridge_inventory: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
     - type: EntityStorage
       air:
         volume: 200
-        immutable: False
         temperature: 293.14673
         moles:
         - 1.7459903
@@ -168409,6 +168416,10 @@ entities:
         - 0
         - 0
         - 0
+      closeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/closetclose.ogg
+      openSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/closetopen.ogg
   - uid: 1648
     components:
     - type: Transform
@@ -170851,6 +170862,13 @@ entities:
     - type: Transform
       pos: -2.5,-18.5
       parent: 2
+- proto: SpawnMobPollyParrot
+  entities:
+  - uid: 8791
+    components:
+    - type: Transform
+      pos: 5.5,43.5
+      parent: 2
 - proto: SpawnMobPossumMorty
   entities:
   - uid: 30302
@@ -198737,7 +198755,7 @@ entities:
     - type: Transform
       pos: 48.66992,-38.664413
       parent: 2
-- proto: WeaponEnergyTurretStation
+- proto: WeaponEnergyTurretSecurity
   entities:
   - uid: 30411
     components:
@@ -200679,7 +200697,7 @@ entities:
       pos: 24.5,2.5
       parent: 21002
     - type: Door
-      secondsUntilStateChange: -659975.5
+      secondsUntilStateChange: -660121.25
       state: Opening
   - uid: 28863
     components:
diff --git a/Resources/Maps/packed.yml b/Resources/Maps/packed.yml
index 70b940fae786..c01fe12654f1 100644
--- a/Resources/Maps/packed.yml
+++ b/Resources/Maps/packed.yml
@@ -1,11 +1,11 @@
 meta:
   format: 7
   category: Map
-  engineVersion: 260.1.0
+  engineVersion: 264.0.0
   forkId: ""
   forkVersion: ""
-  time: 05/20/2025 22:12:43
-  entityCount: 15479
+  time: 07/22/2025 16:27:25
+  entityCount: 15464
 maps:
 - 126
 grids:
@@ -9499,7 +9499,7 @@ entities:
       pos: 44.5,30.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -4038.7175
+      secondsUntilStateChange: -4092.861
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -79838,9 +79838,9 @@ entities:
     - type: Transform
       pos: -14.5,-22.5
       parent: 2
-- proto: SpawnMobParrot
+- proto: SpawnMobPollyParrot
   entities:
-  - uid: 6125
+  - uid: 2409
     components:
     - type: Transform
       pos: 11.5,-33.5
diff --git a/Resources/Maps/plasma.yml b/Resources/Maps/plasma.yml
index 439925f32dbc..4263247cdda7 100644
--- a/Resources/Maps/plasma.yml
+++ b/Resources/Maps/plasma.yml
@@ -1,11 +1,11 @@
 meta:
   format: 7
   category: Map
-  engineVersion: 261.1.0
+  engineVersion: 264.0.0
   forkId: ""
   forkVersion: ""
-  time: 06/03/2025 04:03:17
-  entityCount: 26381
+  time: 07/22/2025 14:44:01
+  entityCount: 26380
 maps:
 - 1
 grids:
@@ -14387,7 +14387,7 @@ entities:
       pos: -131.5,-45.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -52449.348
+      secondsUntilStateChange: -52604.145
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -70587,6 +70587,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -104.5,-22.5
       parent: 2
+  - uid: 6545
+    components:
+    - type: Transform
+      pos: -103.5,-27.5
+      parent: 2
   - uid: 6678
     components:
     - type: Transform
@@ -76476,12 +76481,6 @@ entities:
       - Medical
 - proto: DisposalRouterFlipped
   entities:
-  - uid: 6545
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -103.5,-27.5
-      parent: 2
   - uid: 14320
     components:
     - type: Transform
@@ -106798,13 +106797,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 20082
-    components:
-    - type: Transform
-      pos: -120.5,-37.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 20088
     components:
     - type: Transform
@@ -126327,6 +126319,10 @@ entities:
           showEnts: False
           occludes: True
           ent: 8160
+        goldenplunger_slot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
 - proto: JanitorServiceLight
   entities:
   - uid: 7134
@@ -128023,6 +128019,11 @@ entities:
     - type: Transform
       pos: -69.5,-24.5
       parent: 2
+    - type: MailingUnit
+      tag: Bar
+    - type: Configuration
+      config:
+        tag: Bar
   - uid: 18699
     components:
     - type: Transform
@@ -143807,7 +143808,7 @@ entities:
     - type: Transform
       pos: -68.5,-26.5
       parent: 2
-- proto: SpawnMobParrot
+- proto: SpawnMobPollyParrot
   entities:
   - uid: 16489
     components:
@@ -167588,7 +167589,7 @@ entities:
       - 25854
       - 25852
       - 25851
-- proto: WeaponEnergyTurretStation
+- proto: WeaponEnergyTurretSecurity
   entities:
   - uid: 4564
     components:
@@ -167630,7 +167631,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 5916
-- proto: WeaponEnergyTurretStationControlPanel
+- proto: WeaponEnergyTurretSecurityControlPanel
   entities:
   - uid: 5916
     components:
@@ -167830,7 +167831,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -252556.08
+      secondsUntilStateChange: -252710.88
       state: Opening
     - type: Airlock
       autoClose: False
diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml
index 4b1d16514a80..1337c8035802 100644
--- a/Resources/Prototypes/Alerts/alerts.yml
+++ b/Resources/Prototypes/Alerts/alerts.yml
@@ -30,6 +30,7 @@
     - alertType: Rooted
     - alertType: Pacified
     - alertType: Stealthy
+    - alertType: Offer # Starlight
 
 - type: entity
   id: AlertSpriteView
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
index 5d2e3886fbb0..a1860d87d2f1 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -142,12 +142,14 @@
         amount: 4
       - id: MagazineShotgun
         amount: 4
-      - id: MagazineMagnumRifleSP #Starlight, for the Pitbull
-        amount: 2
+      - id: MagazineRifleSP
+        amount: 3
       - id: MagazineRifleSP #Starlight, for the estoc
         amount: 2 
       - id: MagazineLightRifleBoxSP
         amount: 3
+      - id: MagazineShotgunSlug
+        amount: 1
       - id: MagazineBoxLightRifleSP
         amount: 1
       - id: MagazineBoxLightRifleHP
@@ -351,6 +353,19 @@
       - id: SyndieTrickyBomb
         amount: 2
 
+- type: entity
+  parent: [ ClothingBackpackDuffelBundle, BaseMajorContraband ]
+  id: ClothingBackpackDuffelAcolyteBundle
+  name: acolyte armor bundle
+  description: "Contains the Acolyte Armor, the must have of any cult leader."
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingOuterArmorCult
+    - id: ClothingHeadHelmetCult
+    - id: ClothingShoesCult
+    - id: BedsheetCult
+
 - type: entity
   parent: ClothingBackpackDuffelSyndicateBundle
   id: ClothingBackpackDuffelSyndicateFilledStarterKit
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index 4f44835a6792..765da7e39386 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -46,6 +46,7 @@
       amount: 2
     - id: RemoteSignaller
       amount: 2
+    - id: NetworkConfigurator
     - id: Binoculars
 
 - type: entityTable
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
index 91274386743c..f9fe6cbf4a8e 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
@@ -50,5 +50,4 @@
   contrabandInventory:
     ChemistryBottleEthanol: 3
     DrinkBottleOfNothingFull: 1
-  emaggedInventory:
     DrinkPoisonWinebottleFull: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
index b9533d50183c..9e4c18a76554 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
@@ -31,11 +31,9 @@
     FoodBakedBunHotX: 2
     DrinkWineBottleFull: 1
     ToyFigurineChaplain: 1
+    ClothingNeckScarfStripedBlack: 3
   emaggedInventory:
-    ClothingOuterArmorCult: 1
-    ClothingHeadHelmetCult: 1
     ClothingOuterRobesCult: 3
     ClothingHeadHatHoodCulthood: 3
     ClothingShoesCult: 4
     BedsheetCult: 4
-    ClothingNeckScarfStripedBlack: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml
index 42a484e4ab38..5e5d944a62fa 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml
@@ -25,7 +25,6 @@
   contrabandInventory:
     DrinkLithiumFlask: 1
     StrangePill: 3
-  emaggedInventory:
     ChemistryBottleToxin: 1
 
 - type: vendingMachineInventory
@@ -57,7 +56,6 @@
   contrabandInventory:
     DrinkLithiumFlask: 1
     StrangePill: 3
-  emaggedInventory:
     ChemistryBottlePax: 3
     ChemistryBottleMuteToxin: 3
     ChemistryBottleLead: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml
index 0d675fe3df59..f80214f13358 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml
@@ -18,5 +18,3 @@
     GroundTobacco: 3
     CigarGold: 2
     Igniter: 1
-  emaggedInventory:
-    CigPackSyndicate: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml
index 84837be754ce..778da09e9891 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml
@@ -8,5 +8,4 @@
     DrinkHotCoco: 5
   contrabandInventory:
     DrinkTeapot: 2
-  emaggedInventory:
     DrinkNothing: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml
index 972c0fca0e0c..a82fa2c610ce 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml
@@ -11,6 +11,6 @@
     DrinkFourteenLokoCan: 2
   contrabandInventory:
     DrinkColaBottleFull: 2
+    DrinkChangelingStingCan: 2
   emaggedInventory:
     DrinkNukieCan: 2
-    DrinkChangelingStingCan: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml
index fadd3a7d445f..b4f25e936dab 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml
@@ -8,5 +8,4 @@
   contrabandInventory:
     FoodBagel: 2
     FoodBagelPoppy: 2
-  emaggedInventory:
     FoodDonutPoison: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml
index 94d05e3629f8..304d2850efb9 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/gib.yml
@@ -13,6 +13,6 @@
     ClothingNeckStethoscope: 2
     Saw: 2
     Tourniquet: 3
+    DrinkChangelingStingCan: 2
   emaggedInventory:
     DrinkNukieCan: 2
-    DrinkChangelingStingCan: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml
index 62c1d6ffcd1c..3c46c8bf8896 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml
@@ -7,6 +7,6 @@
     ToyFigurineClown: 1
     ToyFigurineMime: 1
     ToyFigurineNukie: 1
-  emaggedInventory:
     HappyHonkCluwne: 1
+  emaggedInventory:
     HappyHonkNukie: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
index 5847b8d49482..f1a04e7336f5 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
@@ -27,5 +27,3 @@
     # "Legally" obtained currency
     SpaceCash100: 2
     ToyFigurineLawyer: 1
-  emaggedInventory:
-    CyberPen: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml
index 7158cc3055f0..9b68de41e492 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml
@@ -22,5 +22,4 @@
   contrabandInventory:
     ChemistryBottleUnstableMutagen: 1
     Joint: 1
-  emaggedInventory:
     ChemistryBottleLeft4Zed: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml
index b48e876a58fc..f9b06209116e 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml
@@ -12,6 +12,6 @@
     DrinkFourteenLokoCan: 2
   contrabandInventory:
     DrinkDrGibbCan: 3
+    DrinkChangelingStingCan: 2
   emaggedInventory:
     DrinkNukieCan: 2
-    DrinkChangelingStingCan: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
index bd71a536409a..b16fe26b2038 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml
@@ -42,5 +42,4 @@
   contrabandInventory:
     TobaccoSeeds: 2
     FoodSnackSemki: 2
-  emaggedInventory:
     FlyAmanitaSeeds: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/smite.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/smite.yml
index 5523b80b8132..ebe8e17eb029 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/smite.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/smite.yml
@@ -8,6 +8,6 @@
   contrabandInventory:
     DrinkStarkistCan: 2
     ToyHammer: 1
+    DrinkChangelingStingCan: 2
   emaggedInventory:
     DrinkNukieCan: 2
-    DrinkChangelingStingCan: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml
index 5566ea7d0d17..680be21b0558 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml
@@ -11,6 +11,6 @@
     DrinkFourteenLokoCan: 3
   contrabandInventory:
     DrinkColaBottleFull: 2
+    DrinkChangelingStingCan: 3
   emaggedInventory:
     DrinkNukieCan: 3
-    DrinkChangelingStingCan: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml
index d76db2a38bfd..dc39da7c865a 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml
@@ -11,6 +11,6 @@
   contrabandInventory:
     DrinkSpaceMountainWindBottleFull: 2
     DrinkSpaceUpBottleFull: 2
+    DrinkChangelingStingCan: 2
   emaggedInventory:
     DrinkNukieCan: 2
-    DrinkChangelingStingCan: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml
index dac70985ab71..ec6a626f51fc 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml
@@ -11,6 +11,6 @@
     DrinkFourteenLokoCan: 2
   contrabandInventory:
     FoodBurgerCarp: 2
+    DrinkChangelingStingCan: 2
   emaggedInventory:
     DrinkNukieCan: 2
-    DrinkChangelingStingCan: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml
index a36c5e4dc52d..d67412970f4d 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml
@@ -10,8 +10,8 @@
     FoodTinBeans: 3
     FoodTinPeaches: 3
     DrinkBeerCan: 6
-  emaggedInventory:
     KitchenKnife: 2
+  emaggedInventory:
     ClothingMaskBreath: 3
     EmergencyOxygenTankFilled: 3
     DrinkNukieCan: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/syndiedrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/syndiedrobe.yml
index 688706462bb1..a1add7c18b2e 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/syndiedrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/syndiedrobe.yml
@@ -19,9 +19,9 @@
     ToyFigurineFootsoldier: 1
     ToyFigurineNukieElite: 1
     ToyFigurineNukieCommander: 1
+    ClothingUniformJumpskirtTacticalMaid: 5
+    ClothingHandsTacticalMaidGloves: 5
   emaggedInventory:
     ClothingOuterCoatSyndieCapArmored: 1
     ClothingOuterWinterSyndieCapArmored: 1
     ClothingHeadHatTacticalMaidHeadband: 5
-    ClothingUniformJumpskirtTacticalMaid: 5
-    ClothingHandsTacticalMaidGloves: 5 
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
index 5fec98df2ec3..cb5a64583471 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
@@ -82,7 +82,6 @@
     CamoUniformSuit: 1 #Starlight
     TatteredClothesUniformSuit: 1 #Starlight
     ClothingNeckTatteredHood: 1 #Starlight
-  emaggedInventory:
     ClothingShoesBling: 1
     ClothingShoesBootsCowboyFancy: 1
     ClothingOuterDogi: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
index 61089187e54d..8100c298068b 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
@@ -19,8 +19,6 @@
     ClothingHeadHatCanadaBeanie: 4
     ClothingHeadHatSantahat: 2
     ClothingHeadHatXmasCrown: 2
-
   emaggedInventory:
     ClothingNeckScarfStripedSyndieGreen: 3
     ClothingNeckScarfStripedSyndieRed: 3
-    ClothingNeckScarfStripedCentcom: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml
index 71beff3cf522..ee4fdb95f691 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml
@@ -17,5 +17,4 @@
   # Some engineer forgot to take the multitool out the youtool when working on it, happens.
   contrabandInventory:
     Multitool: 1
-  emaggedInventory:
     ClothingHandsGlovesColorYellow: 1
diff --git a/Resources/Prototypes/Catalog/spellbook_catalog.yml b/Resources/Prototypes/Catalog/spellbook_catalog.yml
index feacefc8aeba..fb82029ef4a4 100644
--- a/Resources/Prototypes/Catalog/spellbook_catalog.yml
+++ b/Resources/Prototypes/Catalog/spellbook_catalog.yml
@@ -45,12 +45,14 @@
   description: spellbook-cluwne-desc
   productAction: ActionCluwne
   cost:
-    WizCoin: 300 #starlight make stupid expensive
+    WizCoin: 5 # Starlight: More expensive than usual, back on trial basis.
   categories:
   - SpellbookOffensive
   conditions:
   - !type:ListingLimitedStockCondition
     stock: 1
+  - !type:ListingPlayerCountCondition # Starlight, make this only buyable on highpop
+    minimum: 80
 
 - type: listing
   id: SpellbookSlip
@@ -298,7 +300,7 @@
   description: spellbook-event-summon-guns-description
   productAction: ActionSummonGuns
   cost:
-    WizCoin: 15
+    WizCoin: 11 #Starlight edit. just out of reach
   categories:
   - SpellbookEvents
   conditions:
@@ -312,7 +314,7 @@
   description: spellbook-event-summon-magic-description
   productAction: ActionSummonMagic
   cost:
-    WizCoin: 15
+    WizCoin: 11 #Starlight edit. just out of reach.
   categories:
   - SpellbookEvents
   conditions:
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index f05f415cfa59..c1b8fe9f0930 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -2324,3 +2324,39 @@
     Telecrystal: 2
   categories:
   - UplinkDeception
+
+- type: listing
+  id: UplinkAcolyteArmor
+  name: uplink-acolyte-armor-name
+  description: uplink-acolyte-armor-desc
+  icon: { sprite: Clothing/OuterClothing/Armor/cult_armour.rsi, state: icon}
+  productEntity: ClothingBackpackDuffelAcolyteBundle
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 3
+  cost:
+    Telecrystal: 4
+  categories:
+  - UplinkJob
+  conditions:
+  - !type:BuyerJobCondition
+    whitelist:
+    - Chaplain
+
+#- type: listing
+#  id: UplinkSawAdvanced
+#  name: uplink-saw-advanced-name
+#  description: uplink-saw-advanced-desc
+#  icon: { sprite:  Objects/Specific/Medical/Surgery/saw.rsi, state: advanced}
+#  productEntity: SawAdvanced
+#  discountCategory: rareDiscounts
+#  discountDownTo:
+#    Telecrystal: 1
+#  cost:
+#    Telecrystal: 2
+#  categories:
+#  - UplinkJob
+#  conditions:
+#  - !type:BuyerJobCondition
+#    whitelist:
+#    - MedicalDoctor
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
index d28cd8b200ab..175f2bd0803f 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -323,6 +323,13 @@
     sprite: Clothing/Back/Backpacks/cluwne.rsi
   - type: Unremoveable
     deleteOnDrop: false
+  #region Starlight
+  - type: Tag
+    tags:
+      - WhitelistChameleon
+      - BibleThwackRemovable
+  #endregion Starlight
+  
 
 - type: entity
   parent: ClothingBackpack
diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
index 52277a5d8535..2e76976443ce 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
@@ -173,13 +173,21 @@
     - 0,0,8,4
 
 - type: entity
-  parent: ClothingBackpackDuffelSyndicate
+  parent: [ ClothingBackpackDuffelSyndicate, BaseSyndicateContraband ]
   id: ClothingBackpackDuffelSyndicateBundle
   abstract: true
   components:
   - type: Tag
     tags: [] # ignore "WhitelistChameleon" tag
 
+- type: entity
+  parent: ClothingBackpackDuffel
+  id: ClothingBackpackDuffelBundle
+  abstract: true
+  components:
+  - type: Tag
+    tags: [] # ignore "WhitelistChameleon" tag
+
 - type: entity
   parent: ClothingBackpackDuffelSyndicate
   id: ClothingBackpackDuffelSyndicateAmmo
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index aea39826662c..cbff66dacb92 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -281,6 +281,7 @@
         - WetFloorSign
         - HolosignProjector
         - Plunger
+        - GoldenPlunger
         - WireBrush
       components:
         - LightReplacer
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
index 2ecabd5e1a81..ed50f57eda92 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
@@ -382,6 +382,13 @@
   description:  A cursed pair of cluwne hands.
   components:
   - type: Unremoveable
+  #region Starlight
+  - type: Tag
+    tags:
+    - ClothMade
+    - Recyclable
+    - WhitelistChameleon
+  #endregion Starlight
 
 - type: entity
   parent: [ClothingHandsButcherable, BaseSyndicateContraband]
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
index 278e307a68f0..83495aad058a 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -74,8 +74,42 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/engineering.rsi
+    layers:
+    - state: icon
+    - state: icon-unshaded
+      shader: unshaded
+    - state: light-overlay
+      visible: false
+      shader: unshaded
+      map: [ "light" ]
+  - type: HandheldLight
+    addPrefix: false
+  - type: ToggleableVisuals
+    spriteLayer: light
+    clothingVisuals:
+      head:
+      - state: equipped-head-light
+        shader: unshaded
+      head-vox:
+      - state: equipped-head-light-vox
+        shader: unshaded
+      head-dog:
+      - state: equipped-head-light-dog
+        shader: unshaded
   - type: Clothing
-    sprite: Clothing/Head/Hardsuits/engineering.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head
+      - state: equipped-head-unshaded
+        shader: unshaded
+      head-vox:
+      - state: equipped-head-vox
+      - state: equipped-head-unshaded-vox
+        shader: unshaded
+      head-dog:
+      - state: equipped-head-dog
+      - state: equipped-head-unshaded-dog
+        shader: unshaded
   - type: PointLight
     color: "#ffdbad"
   - type: PressureProtection
@@ -343,8 +377,42 @@
   components:
   - type: Sprite
     sprite: Clothing/Head/Hardsuits/engineering-white.rsi
+    layers:
+    - state: icon
+    - state: icon-unshaded
+      shader: unshaded
+    - state: light-overlay
+      visible: false
+      shader: unshaded
+      map: [ "light" ]
+  - type: HandheldLight
+    addPrefix: false
+  - type: ToggleableVisuals
+    spriteLayer: light
+    clothingVisuals:
+      head:
+      - state: equipped-head-light
+        shader: unshaded
+      head-vox:
+      - state: equipped-head-light-vox
+        shader: unshaded
+      head-dog:
+      - state: equipped-head-light-dog
+        shader: unshaded
   - type: Clothing
-    sprite: Clothing/Head/Hardsuits/engineering-white.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head
+      - state: equipped-head-unshaded
+        shader: unshaded
+      head-vox:
+      - state: equipped-head-vox
+      - state: equipped-head-unshaded-vox
+        shader: unshaded
+      head-dog:
+      - state: equipped-head-dog
+      - state: equipped-head-unshaded-dog
+        shader: unshaded
   - type: PointLight
     color: "#daffad"
   - type: PressureProtection
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
index c7191d8d6c58..e2edd85e0b41 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -315,6 +315,8 @@
   - type: PhysicalComposition
     materialComposition:
       Plastic: 25
+  - type: StaticPrice
+    price: 5
   - type: Tag
     tags:
     - SurgeryCompatibleArmor # Starlight-edit
@@ -375,6 +377,13 @@
   - type: Unremoveable
   - type: AddAccentClothing
     accent: StutteringAccent
+  #region Starlight
+  - type: Tag
+    tags:
+    - ClownMask
+    - WhitelistChameleon
+    - BibleThwackRemovable
+  #endregion Starlight
 
 - type: entity
   parent: [ ClothingMaskGas, BaseSecurityContraband ]
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
index 9ef9b1c9a4ee..7927186f5298 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -177,7 +177,6 @@
         Piercing: 0.3
         Heat: 0.9
     staminaModifier: 0.55
-    ingoreKnockdown: true
   - type: ExplosionResistance
     damageCoefficient: 0.9
   - type: StaticPrice
@@ -207,7 +206,6 @@
         Radiation: 0.5
         Caustic: 0.5
     staminaModifier: 0.35
-    ingoreKnockdown: true
   - type: ExplosionResistance
     damageCoefficient: 0.5
   - type: FireProtection
@@ -266,7 +264,6 @@
         Heat: 0.3
         Caustic: 0.5
     staminaModifier: 0.1
-    ingoreKnockdown: true
   - type: ExplosionResistance
     damageCoefficient: 0.35
   - type: StaminaResistance # do not add these to other equipment or mobs, we don't want to microbalance these everywhere
@@ -365,7 +362,7 @@
       coefficients:
         Blunt: 0.5
         Slash: 0.5
-        Piercing: 0.6
+        Piercing: 0.5
         Heat: 0.5
   - type: GroupExamine
 
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
index a35d506f4c8b..1b90e8e04d65 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -657,7 +657,6 @@
         Radiation: 0.5
         Caustic: 0.5
     staminaModifier: 0.3
-    ingoreKnockdown: true
   - type: ClothingSpeedModifier
     walkModifier: 0.9
     sprintModifier: 0.9
@@ -729,7 +728,6 @@
         Radiation: 0.01
         Caustic: 0.5
     staminaModifier: 0.2
-    ingoreKnockdown: true
   - type: Item
     size: Huge
   - type: ClothingSpeedModifier
@@ -774,7 +772,6 @@
         Radiation: 0.25
         Caustic: 0.4
     staminaModifier: 0.1
-    ingoreKnockdown: true
   - type: ClothingSpeedModifier
     walkModifier: 0.95
     sprintModifier: 0.95
@@ -821,7 +818,6 @@
         Radiation: 0.2
         Caustic: 0.2
     staminaModifier: 0.1
-    ingoreKnockdown: true
   - type: ClothingSpeedModifier
     walkModifier: 0.65
     sprintModifier: 0.65
@@ -1010,7 +1006,6 @@
         Radiation: 0.01 #sl Change
         Caustic: 0.4 #sl Change
     staminaModifier: 0.1
-    ingoreKnockdown: true
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitERTLeader
 
@@ -1123,7 +1118,6 @@
         Radiation: 0.1
         Caustic: 0.1
     staminaModifier: 0.0
-    ingoreKnockdown: true
   - type: ClothingSpeedModifier
     walkModifier: 1.0
     sprintModifier: 1.0
@@ -1198,7 +1192,6 @@
         Piercing: 0.9
         Caustic: 0.8
     staminaModifier: 0.8
-    ingoreKnockdown: true
   - type: ClothingSpeedModifier
     walkModifier: 0.9
     sprintModifier: 0.9
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
index ebf304557e03..3849bf098fe0 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
@@ -239,6 +239,13 @@
   - type: Clothing
     sprite: Clothing/Shoes/Specific/cluwne.rsi
   - type: Unremoveable
+  #region Starlight
+  - type: Tag
+    tags:
+      - ClownShoes
+      - WhitelistChameleon
+      - BibleThwackRemovable
+  #endregion
 
 - type: entity
   parent: ClothingShoesClown
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
index 3e4ec50eb9cd..3b7fe85a911a 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -1122,6 +1122,13 @@
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/cluwne.rsi
   - type: Unremoveable
+  #region Starlight
+  - type: Tag
+    tags:
+    - ClownSuit
+    - WhitelistChameleon
+    - BibleThwackRemovable
+  #endregion
 
 - type: entity
   parent: ClothingUniformBase
diff --git a/Resources/Prototypes/Entities/Interface/admin_tools.yml b/Resources/Prototypes/Entities/Interface/admin_tools.yml
new file mode 100644
index 000000000000..a8c978ed0cb8
--- /dev/null
+++ b/Resources/Prototypes/Entities/Interface/admin_tools.yml
@@ -0,0 +1,14 @@
+# dummy entity for the admin camera EUI
+# this gets parented to the person being observed
+
+- type: entity
+  id: AdminCamera
+  categories: [ HideSpawnMenu ]
+  name: admin camera
+  description: We are watching you.
+  components:
+  - type: Visibility
+    layer: 8 # Don't network this to anyone so cheat clients can't see it. We are adding a PVS override to the user.
+  - type: Eye # for the camera itself
+    drawFov: false
+    pvsScale: 0.8 # we don't need the full range
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml
index 88506d33a62a..d64876eb2522 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml
@@ -42,6 +42,7 @@
       - FoodCakeChristmasSlice
       - FoodCakeVanillaSlice
       - FoodCakeBirthdaySlice
+      - FoodCottonCakeSlice #Starlight moff cake
       - FoodBakedMuffin
       - FoodBakedMuffinBerry
       - FoodBakedMuffinCherry
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml
index 7e580db98051..e1d3e3c5b93e 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_whole.yml
@@ -37,6 +37,7 @@
       - FoodCakeChristmas
       - FoodCakeBirthday
       - FoodCakeVanilla
+      - FoodCottonCake #Starlight moff cake
       - FoodPieApple
       - FoodPieBaklava
       - FoodPieBananaCream
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
index 55226a63642d..b62fd58b3781 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
@@ -292,9 +292,6 @@
     - !type:RoleTimeRequirement
       role: JobBorg
       time: 21600 # 6h STARLIGHT
-    - !type:DepartmentTimeRequirement
-      department: Engineering
-      time: 21600 # 6h STARLIGHT
   - type: Sprite
     sprite: Markers/jobs.rsi
     layers:
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
index cd2b95862be6..20ff1dbaeb99 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -143,9 +143,6 @@
   - type: Body
   - type: StatusEffects
     allowed:
-    - Stun
-    - KnockedDown
-    - SlowedDown
     - Flashed
   - type: TypingIndicator
     proto: robot
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 28fb4852b070..438706752e1a 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -113,6 +113,7 @@
       10: Dead
   - type: Stamina
     critThreshold: 10
+    animationThreshold: 1
   - type: DamageStateVisuals
     states:
       Alive:
@@ -2107,6 +2108,7 @@
 - type: entity
   parent: [ SimpleMobBase, FlyingMobBase ]
   id: MobParrotBase
+  name: parrot
   abstract: true
   description: Infiltrates your domain, spies on you, and somehow still a cool pet.
   components:
@@ -2182,7 +2184,6 @@
     bloodMaxVolume: 50
 
 - type: entity
-  name: parrot
   parent: MobParrotBase
   id: MobParrot
   components:
@@ -3084,7 +3085,7 @@
     factions:
     - Syndicate
   - type: Access
-    tags: 
+    tags:
     - NuclearOperative
     - SyndicateAgent
   - type: MeleeWeapon
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
index de8f15f4c0a9..80e86f6465b4 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
@@ -19,9 +19,7 @@
     group: GenericNumber
   - type: StatusEffects
     allowed:
-    - SlowedDown
     - Stutter
-    - Stun
     - Electrocution
     - TemporaryBlindness
     - RadiationProtection
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/cluwnebeast.yml b/Resources/Prototypes/Entities/Mobs/NPCs/cluwnebeast.yml
index c43ba0175c5a..a3ce15477b1b 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/cluwnebeast.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/cluwnebeast.yml
@@ -99,6 +99,7 @@
     prototype: Human
     requiredLegs: 2
   - type: Cluwne
+    unremovable: true #Starlight
     isCluwne: false
     emoteId: CluwneBeast
   - type: FootstepModifier
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
index c3fc1ec9596e..77bb8e1a7fbd 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
@@ -35,9 +35,6 @@
     bodyType: KinematicController # Same for all inheritors
   - type: StatusEffects
     allowed:
-    - Stun
-    - KnockedDown
-    - SlowedDown
     - Stutter
     - Electrocution
   - type: Pullable
@@ -386,7 +383,6 @@
     chemicalMaxVolume: 100
   - type: StatusEffects
     allowed:
-    - SlowedDown
     - Electrocution
   - type: MeleeWeapon
     soundHit:
@@ -409,6 +405,7 @@
       - FootstepSound
       - CannotSuicide
       - DoorBumpOpener
+      - StunImmune
   - type: NoSlip
   - type: ZombieImmune
   - type: ExaminableSolution
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml b/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml
index a1bcd547a647..f3ec5ff80b3d 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml
@@ -42,6 +42,7 @@
       75: Dead
   - type: Stamina
     critThreshold: 50
+    animationThreshold: 25
   - type: Butcherable
     spawned:
     - id: FoodMeat
@@ -240,6 +241,7 @@
       75: Dead
   - type: Stamina
     critThreshold: 50
+    animationThreshold: 25
   - type: Butcherable
     spawned:
     - id: FoodMeat
@@ -359,4 +361,4 @@
       30: Dead
   - type: MovementSpeedModifier
     baseWalkSpeed: 2
-    baseSprintSpeed: 2.5
\ No newline at end of file
+    baseSprintSpeed: 2.5
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/human.yml b/Resources/Prototypes/Entities/Mobs/NPCs/human.yml
index 2746b38f4fb4..f51bbd39092c 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/human.yml
@@ -96,5 +96,6 @@
   description: A polymorphed unfortunate.
   components:
   - type: Cluwne
+    unremovable: true #Starlight
   - type: Speech
     speechVerb: Cluwne
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml b/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml
index 9500345e4fc7..4717e200ddb8 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml
@@ -48,7 +48,6 @@
         BaseUnshaded: dead_glow
   - type: StatusEffects
     allowed:
-    - Stun
     - Corporeal
     - Electrocution
     - StaminaModifier
@@ -91,6 +90,7 @@
   - type: Tag
     tags:
       - FootstepSound
+      - SlowImmune
   - type: Destructible
     thresholds:
       - trigger:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index 293bcbc822f2..d297316b7f77 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -870,6 +870,10 @@
     name: ghost-role-information-punpun-name
     description: ghost-role-information-punpun-description
     rules: ghost-role-information-nonantagonist-rules
+    requirements:
+    - !type:RoleTimeRequirement
+      role: JobBartender
+      time: 7200 # 2h STARLIGHT
   - type: GhostTakeoverAvailable
   - type: Butcherable
     butcheringType: Spike
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
index ae6ec1946ca6..790d2c620a75 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
@@ -21,7 +21,6 @@
     - state: active
   - type: StatusEffects
     allowed:
-    - Stun
     - Corporeal
   - type: Damageable
     damageContainer: ManifestedSpirit
@@ -84,3 +83,7 @@
   - type: Reactive
     groups:
       Acidic: [Touch]
+  - type: Tag
+    tags:
+    - SlowImmune
+    - KnockdownImmune
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index 56109bcc1871..2c8c784efbe6 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -15,9 +15,6 @@
     bodyType: KinematicController # Same for all inheritors
   - type: StatusEffects
     allowed:
-    - Stun
-    - KnockedDown
-    - SlowedDown
     - Stutter
     - Electrocution
   - type: Repairable
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
index bb095bfffd69..11c0f0d21d5d 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -19,7 +19,6 @@
     baseSprintSpeed : 4
   - type: StatusEffects
     allowed:
-    - SlowedDown
     - Stutter
     - Electrocution
     - TemporaryBlindness
@@ -32,6 +31,7 @@
   - type: Tag
     tags:
     - DoorBumpOpener
+    - StunImmune
 
 - type: entity
   abstract: true
@@ -93,9 +93,6 @@
     baseDecayRate: 0.04
   - type: StatusEffects
     allowed:
-    - Stun
-    - KnockedDown
-    - SlowedDown
     - Stutter
     - Electrocution
     - TemporaryBlindness
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
index f8f24faffb15..9cad59a64392 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
@@ -54,6 +54,7 @@
         recursive: false
   - type: Stamina
     critThreshold: 15
+    animationThreshold: 5
   - type: MovementAlwaysTouching
   - type: DamageStateVisuals
     states:
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
index 4c4dd4b27a72..2786a878fc9b 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -102,7 +102,6 @@
       types: {}
   - type: StatusEffects # Overwriting basesimplemob to remove flash, getting flashed as dragon just feelsbad
     allowed:
-    - SlowedDown
     - Stutter
     - Electrocution
     - TemporaryBlindness
@@ -156,6 +155,7 @@
     tags:
     - CannotSuicide
     - DoorBumpOpener
+    - StunImmune
   - type: Puller
     needsHands: false
   - type: RandomMetadata
diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
index aac6c9acbd97..6d1b3373e78d 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
@@ -642,3 +642,4 @@
       raffle:
         settings: default
     - type: Cluwne
+      unremovable: true #Starlight
diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
index ba1e7391abb2..39161ca72e2e 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -292,6 +292,7 @@
     - HideContextMenu
     - StationAi
     - NoConsoleSound
+    - CanPilot
   - type: StartingMindRole
     mindRole: "MindRoleSiliconBrain"
     silent: true
@@ -466,7 +467,7 @@
         - BorgModuleTool
         - BorgModuleChemical
         - BorgModuleTopicals
-        - BorgModuleRescue
+        - BorgModuleSyndicateWeapon
   - type: ItemSlots
     slots:
       cell_slot:
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index adb46bdffaf7..2387277722b8 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -121,10 +121,7 @@
       - !type:WashCreamPieReaction
   - type: StatusEffects
     allowed:
-    - Stun
     - Friction
-    - KnockedDown
-    - SlowedDown
     - Stutter
     - Electrocution
     - Drunk
@@ -261,9 +258,9 @@
         Heat: 1.5 #per second, scales with temperature & other constants
   - type: TemperatureSpeed
     thresholds:
-      293: 0.8
-      280: 0.6
-      260: 0.4
+      293: 0.9
+      280: 0.8
+      260: 0.7
   - type: ThermalRegulator
     metabolismHeat: 800
     radiatedHeat: 100
diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
index f1478ee0c59e..dc3147c73192 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
@@ -71,9 +71,9 @@
         Heat : 3 #per second, scales with temperature & other constants
   - type: TemperatureSpeed
     thresholds:
-      289: 0.8
-      275: 0.6
-      250: 0.4
+      289: 0.9
+      275: 0.8
+      250: 0.7
   - type: Sprite # sprite again because we want different layer ordering
     noRot: true
     drawdepth: Mobs
diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
index 8a577e02fcde..fd09a30fb57d 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
@@ -66,9 +66,9 @@
         Heat : 1.5 #per second, scales with temperature & other constants
   - type: TemperatureSpeed
     thresholds:
-      301: 0.8
-      295: 0.6
-      285: 0.4
+      301: 0.9
+      295: 0.8
+      285: 0.7
   - type: Wagging
   - type: Inventory
     speciesId: reptilian
diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
index 4976a925784c..98826d14040a 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
@@ -86,11 +86,11 @@
     - map: [ "id" ]
     - map: [ "back" ]
     - map: [ "neck" ]
+    - map: [ "suitstorage" ] # This is not in the default order
     - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
     - map: [ "enum.HumanoidVisualLayers.Hair" ]
     - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
     - map: [ "enum.HumanoidVisualLayers.HeadTop" ]
-    - map: [ "suitstorage" ] # This is not in the default order
     - map: [ "enum.HumanoidVisualLayers.Tail" ]
     - map: [ "mask" ]
     - map: [ "head" ]
@@ -138,6 +138,11 @@
           32:
             sprite: Mobs/Species/Vox/displacement.rsi
             state: head
+      neck:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vox/displacement.rsi
+            state: neck
       back:
         sizeMaps:
           32:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
index c33e24ad3e49..876964aa37f7 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
@@ -4,6 +4,8 @@
   abstract: true
   suffix: Full
   components:
+  - type: ItemPrice
+    priceCategory: drink
   - type: Openable
     sound:
       collection: bottleOpenSounds #Could use a new sound someday ¯\_(ツ)_/¯
@@ -49,6 +51,8 @@
   id: DrinkCartonBaseLargeFull
   abstract: true
   components:
+  - type: ItemPrice
+    priceCategory: drink
   - type: SolutionContainerManager
     solutions:
       drink:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
index c2ac4c606fa5..13667cf27b39 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -43,6 +43,10 @@
   - type: PressurizedSolution
     solution: drink
   - type: Shakeable
+  # Starlight-edit: Vending Machines Prices
+  - type: ItemPrice
+    priceCategory: drink
+  # Starlight-end
 
 - type: entity
   parent: DrinkBase
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
index d933cbcd1b1d..e82799d72451 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -75,6 +75,10 @@
     tags:
     - DrinkCan
   - type: DnaSubstanceTrace
+  # Starlight-edit: Vending Machines Prices
+  - type: ItemPrice
+    priceCategory: drink
+  # Starlight-end
 
 - type: entity
   parent: DrinkCanBaseFull
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
index 842cf13641f3..82e89edb7f1b 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
@@ -42,6 +42,10 @@
   - type: Tag
     tags:
     - DrinkCup
+  # Starlight-edit: Vending Machines Prices
+  - type: ItemPrice
+    priceCategory: drink
+  # Starlight-end
 
 - type: entity
   parent: DrinkBaseCup
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
index 0cd960bed12b..4e25e95fe824 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
@@ -40,6 +40,16 @@
       - DrinkSpaceGlue
   - type: TrashOnSolutionEmpty
     solution: drink
+  # 🌟Starlight-start🌟
+  - type: BoneGel
+  - type: SurgeryTool
+    successRate: 0.4 # really not ideal, but in a pinch...
+    speed: 1.5
+    startSound:
+      path: /Audio/Items/Medical/ointment_begin.ogg
+    endSound:
+      path: /Audio/Items/Medical/ointment_end.ogg
+  # 🌟Starlight-end🌟
 
 - type: entity
   parent: DrinkBase
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
index eb6b71212a21..5c0a4eb7cfb4 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
@@ -1190,3 +1190,58 @@
       Burger: SuppermatterBurger
   - type: Item
     heldPrefix: suppermatter-shard
+
+- type: entity
+  name: cotton cake
+  parent: FoodCakeBase
+  id: FoodCakeCotton
+  description: A cake with a fiber frosting and a wad of cotton on top.
+  components:
+  - type: Sprite
+    state: cotton
+  - type: SliceableFood
+    slice: FoodCakeCottonSlice
+  - type: Tag
+    tags:
+    - Cake
+    - ClothMade
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 55
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 30
+        - ReagentId: Vitamin
+          Quantity: 5
+        - ReagentId: Fiber
+          Quantity: 10
+  - type: Item
+    heldPrefix: cotton
+
+- type: entity
+  name: slice of cotton cake
+  parent: FoodCakeSliceBase
+  id: FoodCakeCottonSlice
+  description: A slice of cotton cake. You can just lick the frosting, it's fine.
+  components:
+  - type: Sprite
+    state: cotton-slice
+  - type: Tag
+    tags:
+    - Cake
+    - ClothMade
+    - Slice
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 15
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 8
+        - ReagentId: Vitamin
+          Quantity: 1
+        - ReagentId: Fiber
+          Quantity: 2
+  - type: Item
+    heldPrefix: cotton-slice
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
index 78543f15e937..819256443ffa 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
@@ -228,8 +228,8 @@
         reagents:
         - ReagentId: Nutriment
           Quantity: 5
-        - ReagentId: Omnizine
-          Quantity: 2
+        - ReagentId: Honk
+          Quantity: 0.50
   - type: Sprite
     state: banana
 
@@ -249,6 +249,8 @@
         reagents:
         - ReagentId: Nutriment
           Quantity: 10
+        - ReagentId: Honk
+          Quantity: 1
         - ReagentId: Omnizine
           Quantity: 2
 
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
index 52ac7b2fe987..9553578e76b8 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
@@ -6,6 +6,10 @@
   abstract: true
   description: Goes great with robust coffee.
   components:
+  # Starlight-start: Vending Machines Prices
+  - type: ItemPrice
+    priceCategory: food_cheap
+  # Starlight-end
   - type: Food
   - type: Tag
     tags:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
index c7de98b4a44d..303a233b136f 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
@@ -69,6 +69,10 @@
   - type: Tag
     tags:
       - Packet
+  # Starlight-start: Vending Machines Prices
+  - type: ItemPrice
+    priceCategory: miscellaneous
+  # Starlight-end
 
 - type: entity
   parent: BaseFoodCondimentPacket
@@ -364,6 +368,16 @@
   - type: PhysicalComposition
     materialComposition:
       Glass: 50
+  # 🌟Starlight-start🌟
+  - type: BoneGel
+  - type: SurgeryTool
+    successRate: 0.01 # How.
+    speed: 0.5
+    startSound:
+      path: /Audio/Items/Medical/ointment_begin.ogg
+    endSound:
+      path: /Audio/Items/Medical/ointment_end.ogg
+  # 🌟Starlight-end🌟
 
 - type: entity
   parent: BaseFoodCondimentBottle
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml
index 3fbf14a6d604..4d19ea5e8187 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml
@@ -50,6 +50,10 @@
     damageContainer: Inorganic
   - type: StaticPrice
     price: 50
+  # Starlight-start: Vending Machines Prices
+  - type: ItemPrice
+    priceCategory: food_medium
+  # Starlight-end
 
 - type: entity
   abstract: true
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index 60a4ae9406aa..93c48b69c25f 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -2694,6 +2694,7 @@
   - type: Item
     sprite: Objects/Specific/Hydroponics/cherry.rsi
     heldPrefix: pit
+    size: Tiny
   - type: Tag
     tags:
     - Recyclable
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
index 91b2fcfefc0d..6e0414054253 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
@@ -6,6 +6,10 @@
   id: FoodSnackBase
   abstract: true
   components:
+  # Starlight-start: Vending Machines Prices
+  - type: ItemPrice
+    priceCategory: food_cheap
+  # Starlight-end
   - type: Food
   - type: Tag
     tags:
@@ -120,6 +124,10 @@
       - id: FoodSnackChocolateBar
     sound:
       path: /Audio/Effects/unwrap.ogg
+  # Starlight-start: Vending Machines Prices
+  - type: ItemPrice
+    priceCategory: food_medium
+  # Starlight-end
 
 - type: entity
   name: chocolate bar
@@ -298,6 +306,10 @@
   - type: Food
     trash:
     - FoodPacketSyndiTrash
+  # Starlight-start: Vending Machines Prices
+  - type: ItemPrice
+    priceCategory: food_medium
+  # Starlight-end
 
 - type: entity
   parent: FoodSnackBase
@@ -399,6 +411,10 @@
   - type: Food
     trash:
     - FoodPacketDanDanTrash
+  # Starlight-start: Vending Machines Prices
+  - type: ItemPrice
+    priceCategory: food_medium
+  # Starlight-end
 
 - type: entity
   name: fortune cookie
@@ -447,6 +463,10 @@
       - id: FoodSnackNutribrickOpen
     sound:
       path: /Audio/Effects/unwrap.ogg
+  # Starlight-start: Vending Machines Prices
+  - type: ItemPrice
+    priceCategory: food_medium
+  # Starlight-end
 
 - type: entity
   id: FoodSnackNutribrickOpen
@@ -474,6 +494,10 @@
         reagents:
         - ReagentId: Nutriment
           Quantity: 20
+  # Starlight-start: Vending Machines Prices
+  - type: ItemPrice
+    priceCategory: food_medium
+  # Starlight-end
 
 - type: entity
   id: FoodSnackMREBrownie
@@ -520,6 +544,10 @@
           Quantity: 10
         - ReagentId: Theobromine
           Quantity: 3
+  # Starlight-start: Vending Machines Prices
+  - type: ItemPrice
+    priceCategory: food_medium
+  # Starlight-end
 
 - type: entity
   name: swirl lollipop
@@ -742,6 +770,7 @@
       - state: trash-inhand-right
         color: "#FF0033"
 
+
 - type: entity
   categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
index 076b4808ce83..6f62737a6c60 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
@@ -142,6 +142,10 @@
     sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi
   - type: Item
     sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi
+  # Starlight-start: Vending Machines Prices
+  - type: ItemPrice
+    priceCategory: cigaretes
+  # Starlight-end
 
 - type: entity
   id: CigPackRed
@@ -153,6 +157,10 @@
     sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi
   - type: Item
     sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi
+  # Starlight-start: Vending Machines Prices
+  - type: ItemPrice
+    priceCategory: cigaretes
+  # Starlight-end
 
 - type: entity
   id: CigPackBlue
@@ -164,6 +172,10 @@
     sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi
   - type: Item
     sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi
+  # Starlight-start: Vending Machines Prices
+  - type: ItemPrice
+    priceCategory: cigaretes
+  # Starlight-end
 
 - type: entity
   id: CigPackBlack
@@ -175,6 +187,10 @@
     sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi
   - type: Item
     sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi
+  # Starlight-start: Vending Machines Prices
+  - type: ItemPrice
+    priceCategory: cigaretes
+  # Starlight-end
 
 - type: entity
   id: CigPackSyndicate  #SL EDIT, Syndie to non-contra
@@ -208,6 +224,10 @@
         rolls: !type:RangeNumberSelector
           range: 2, 9
         tableId: RandomSoakedSmokeTable
+  # Starlight-start: Vending Machines Prices
+  - type: ItemPrice
+    priceCategory: cigaretes
+  # Starlight-end
 
 # Entity tables
 
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml
index 9b5088845d54..61c93d507fc3 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml
@@ -41,6 +41,10 @@
         amount: 2
       - id: CigaretteFilter
         amount: 2
+  # Starlight-start: Vending Machines Prices
+  - type: ItemPrice
+    priceCategory: miscellaneous
+  # Starlight-end
 
 - type: entity
   id: PaperRolling
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/case.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/case.yml
index 5e91d53847f0..055b90664d26 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/case.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/case.yml
@@ -62,6 +62,10 @@
     - cigar7
     - cigar8
   - type: Appearance
+  # Starlight-start: Vending Machines Prices
+  - type: ItemPrice
+    priceCategory: miscellaneous
+  # Starlight-end
 
 - type: entity
   id: CigarGoldCase
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Pipes/pipe.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Pipes/pipe.yml
index 79c568802c52..2d8982d54f78 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Pipes/pipe.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Pipes/pipe.yml
@@ -40,6 +40,10 @@
         path: /Audio/Weapons/Guns/Empty/empty.ogg
       ejectSound:
         path: /Audio/Weapons/Guns/Empty/empty.ogg
+  # Starlight-start: Vending Machines Prices
+  - type: ItemPrice
+    priceCategory: miscellaneous
+  # Starlight-end
 
 - type: entity
   id: SmokingPipeFilledCannabis
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Vapes/vape.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Vapes/vape.yml
index 1aeef4f0668c..15e6cea3f283 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Vapes/vape.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Vapes/vape.yml
@@ -7,3 +7,8 @@
   - type: Sprite
     sprite: Objects/Consumable/Smokeables/Vapes/vape-standard.rsi
     state: icon
+  # Starlight-start: Vending Machines Prices
+  - type: ItemPrice
+    fallbackPrice: 15
+  # Starlight-end
+  
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/igniter.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/igniter.yml
index 24843f608a74..54eb715daee9 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/igniter.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/igniter.yml
@@ -23,3 +23,7 @@
   - type: Tag
     tags:
     - Igniter
+  # Starlight-start: Vending Machines Prices
+  - type: ItemPrice
+    priceCategory: tool_basic
+  # Starlight-end
diff --git a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
index 9b159815074e..e5492b5abeb6 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
@@ -68,7 +68,7 @@
     tags:
       - HolofanProjector
   - type: StaticPrice
-    price: 80
+    price: 50
   - type: GuideHelp
     guides:
     - AtmosTools
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 8ea1a519f2ba..015eea2ec4d1 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -1353,6 +1353,14 @@
   - type: Icon
     state: pda-cluwne
   - type: Unremoveable
+  #region Starlight
+  - type: Tag
+    tags:
+    - DoorBumpOpener
+    - WhitelistChameleon
+    - WhitelistChameleonPDA
+    - BibleThwackRemovable
+  #endregion Starlight
 
 - type: entity
   parent: ClownPDA
diff --git a/Resources/Prototypes/Entities/Objects/Fun/plushies.yml b/Resources/Prototypes/Entities/Objects/Fun/plushies.yml
index f0ab2931c0dc..c0718d022b72 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/plushies.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/plushies.yml
@@ -6,26 +6,24 @@
   id: BasePlushie
   components:
   - type: EmitSoundOnUse
-    sound:
+    sound: &BasePlushieSound
       collection: ToySqueak
+      params:
+        volume: -4
   - type: EmitSoundOnActivate
-    sound:
-      collection: ToySqueak
+    sound: *BasePlushieSound
   - type: EmitSoundOnCollide
-    sound:
-      collection: ToySqueak
+    sound: *BasePlushieSound
   - type: EmitSoundOnLand
-    sound:
-      collection: ToyFall
+    sound: *BasePlushieSound
   - type: EmitSoundOnTrigger
-    sound:
-      collection: ToySqueak
+    sound: *BasePlushieSound
   - type: UseDelay
-    delay: 1.0
+    delay: 3.0
   - type: MeleeWeapon
+    attackRate: 0.333
     wideAnimationRotation: 180
-    soundHit:
-      collection: ToySqueak
+    soundHit: *BasePlushieSound
     damage:
       types:
         Blunt: 0
@@ -37,8 +35,7 @@
     price: 5
   - type: Food
     requiresSpecialDigestion: true
-    useSound:
-      collection: ToySqueak
+    useSound: *BasePlushieSound
     delay: 2
   - type: SolutionContainerManager
     solutions:
@@ -356,28 +353,24 @@
   - type: Item
     sprite: Objects/Fun/Plushies/lizard.rsi
   - type: EmitSoundOnUse
-    sound:
+    sound: &PlushieLizardSound
       path: /Audio/Items/Toys/weh.ogg
+      params:
+        volume: -5
   - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/Toys/weh.ogg
+    sound: *PlushieLizardSound
   - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Items/Toys/weh.ogg
+    sound: *PlushieLizardSound
   - type: EmitSoundOnTrigger
-    sound:
-      path: /Audio/Items/Toys/weh.ogg
+    sound: *PlushieLizardSound
   - type: EmitSoundOnCollide
-    sound:
-      path: /Audio/Items/Toys/weh.ogg
+    sound: *PlushieLizardSound
   - type: Food
     requiresSpecialDigestion: true
-    useSound:
-      path: /Audio/Items/Toys/weh.ogg
+    useSound: *PlushieLizardSound
   - type: MeleeWeapon
     wideAnimationRotation: 180
-    soundHit:
-      path: /Audio/Items/Toys/weh.ogg
+    soundHit: *PlushieLizardSound
   - type: Extractable
     juiceSolution:
       reagents:
@@ -427,28 +420,24 @@
       - state: inhand-right
         shader: shaded
   - type: EmitSoundOnUse
-    sound:
+    sound: &PlushieExperimentSound
       path: /Audio/Items/Toys/arf.ogg
+      params:
+        volume: -5
   - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/Toys/arf.ogg
+    sound: *PlushieExperimentSound
   - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Items/Toys/arf.ogg
+    sound: *PlushieExperimentSound
   - type: EmitSoundOnTrigger
-    sound:
-      path: /Audio/Items/Toys/arf.ogg
+    sound: *PlushieExperimentSound
   - type: EmitSoundOnCollide
-    sound:
-      path: /Audio/Items/Toys/arf.ogg
+    sound: *PlushieExperimentSound
   - type: Food
     requiresSpecialDigestion: true
-    useSound:
-      path: /Audio/Items/Toys/arf.ogg
+    useSound: *PlushieExperimentSound
   - type: MeleeWeapon
     wideAnimationRotation: 180
-    soundHit:
-      path: /Audio/Items/Toys/arf.ogg
+    soundHit: *PlushieExperimentSound
   - type: Clothing
     clothingVisuals:
       head:
@@ -515,28 +504,24 @@
     sprite: Objects/Fun/Plushies/lizard.rsi
     heldPrefix: spacelizard
   - type: EmitSoundOnUse
-    sound:
+    sound: &PlushieSpaceLizardSound
       path: /Audio/Items/Toys/muffled_weh.ogg
+      params:
+        volume: -5
   - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/Toys/muffled_weh.ogg
+    sound: *PlushieSpaceLizardSound
   - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Items/Toys/muffled_weh.ogg
+    sound: *PlushieSpaceLizardSound
   - type: EmitSoundOnTrigger
-    sound:
-      path: /Audio/Items/Toys/muffled_weh.ogg
+    sound: *PlushieSpaceLizardSound
   - type: EmitSoundOnCollide
-    sound:
-      path: /Audio/Items/Toys/muffled_weh.ogg
+    sound: *PlushieSpaceLizardSound
   - type: Food
     requiresSpecialDigestion: true
-    useSound:
-      path: /Audio/Items/Toys/muffled_weh.ogg
+    useSound: *PlushieSpaceLizardSound
   - type: MeleeWeapon
     wideAnimationRotation: 180
-    soundHit:
-      path: /Audio/Items/Toys/muffled_weh.ogg
+    soundHit: *PlushieSpaceLizardSound
   - type: Clothing
     sprite: Objects/Fun/Plushies/lizard.rsi
     slots:
@@ -561,25 +546,22 @@
   - type: Item
     heldPrefix: plushielizardinversed
   - type: EmitSoundOnUse
-    sound:
+    sound: &PlushieLizardInversedSound
       path: /Audio/Items/Toys/hew.ogg
+      params:
+        volume: -5
   - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/Toys/hew.ogg
+    sound: *PlushieLizardInversedSound
   - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Items/Toys/hew.ogg
+    sound: *PlushieLizardInversedSound
   - type: EmitSoundOnTrigger
-    sound:
-      path: /Audio/Items/Toys/hew.ogg
+    sound: *PlushieLizardInversedSound
   - type: Food
     requiresSpecialDigestion: true
-    useSound:
-      path: /Audio/Items/Toys/hew.ogg
+    useSound: *PlushieLizardInversedSound
   - type: MeleeWeapon
     wideAnimationRotation: 180
-    soundHit:
-      path: /Audio/Items/Toys/hew.ogg
+    soundHit: *PlushieLizardInversedSound
   - type: Extractable
     juiceSolution:
       reagents:
@@ -619,28 +601,24 @@
       map: [ "enum.SolutionContainerLayers.Fill" ]
       visible: false
   - type: EmitSoundOnUse
-    sound:
+    sound: &PlushieDionaSound
       path: /Audio/Items/Toys/toy_rustle.ogg
+      params:
+        volume: -5
   - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/Toys/toy_rustle.ogg
+    sound: *PlushieDionaSound
   - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Items/Toys/toy_rustle.ogg
+    sound: *PlushieDionaSound
   - type: EmitSoundOnTrigger
-    sound:
-      path: /Audio/Items/Toys/toy_rustle.ogg
+    sound: *PlushieDionaSound
   - type: EmitSoundOnCollide
-    sound:
-      path: /Audio/Items/Toys/toy_rustle.ogg
+    sound: *PlushieDionaSound
   - type: MeleeWeapon
     wideAnimationRotation: 180
-    soundHit:
-      path: /Audio/Items/Toys/toy_rustle.ogg
+    soundHit: *PlushieDionaSound
   - type: Food
     requiresSpecialDigestion: true
-    useSound:
-      path: /Audio/Items/Toys/toy_rustle.ogg
+    useSound: *PlushieDionaSound
   - type: SolutionContainerManager
     solutions:
       plushie:
@@ -876,9 +854,20 @@
   components:
   - type: Sprite
     state: magicplush
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: magicarpplush-inhand-left
+      right:
+      - state: magicarpplush-inhand-right
   - type: FoodSequenceElement
     entries:
       CottonBurger: MagicarpPlushie
+  - type: Tag
+    tags:
+    - Payload
+    - ClothMade
+    - PlushieCarpMagi
 
 - type: entity
   parent: PlushieCarp
@@ -910,9 +899,20 @@
   components:
   - type: Sprite
     state: holoplush
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: holocarpplush-inhand-left
+      right:
+      - state: holocarpplush-inhand-right
   - type: FoodSequenceElement
     entries:
       CottonBurger: HolocarpPlushie
+  - type: Tag
+    tags:
+    - Payload
+    - ClothMade
+    - PlushieCarpHolo
 
 - type: entity
   parent: BasePlushie
@@ -1044,28 +1044,24 @@
     sprite: Objects/Fun/Plushies/vox.rsi
     state: icon
   - type: EmitSoundOnUse
-    sound:
+    sound: &PlushieVoxSound
       path: /Audio/Voice/Vox/shriek1.ogg
+      params:
+        volume: -5
   - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Voice/Vox/shriek1.ogg
+    sound: *PlushieVoxSound
   - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Voice/Vox/shriek1.ogg
+    sound: *PlushieVoxSound
   - type: EmitSoundOnTrigger
-    sound:
-      path: /Audio/Voice/Vox/shriek1.ogg
+    sound: *PlushieVoxSound
   - type: EmitSoundOnCollide
-    sound:
-      path: /Audio/Voice/Vox/shriek1.ogg
+    sound: *PlushieVoxSound
   - type: Food
     requiresSpecialDigestion: true
-    useSound:
-      path: /Audio/Voice/Vox/shriek1.ogg
+    useSound: *PlushieVoxSound
   - type: MeleeWeapon
     wideAnimationRotation: 180
-    soundHit:
-      path: /Audio/Voice/Vox/shriek1.ogg
+    soundHit: *PlushieVoxSound
   - type: Clothing
     quickEquip: false
     sprite: Objects/Fun/Plushies/vox.rsi
@@ -1113,28 +1109,24 @@
   - type: Item
     size: Normal
   - type: EmitSoundOnUse
-    sound:
+    sound: &PlushieXenoSound
       path: /Audio/Weapons/Xeno/alien_spitacid.ogg
+      params:
+        volume: -8
   - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Weapons/Xeno/alien_spitacid.ogg
+    sound: *PlushieXenoSound
   - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Weapons/Xeno/alien_spitacid.ogg
+    sound: *PlushieXenoSound
   - type: EmitSoundOnTrigger
-    sound:
-      path: /Audio/Weapons/Xeno/alien_spitacid.ogg
+    sound: *PlushieXenoSound
   - type: EmitSoundOnCollide
-    sound:
-      path: /Audio/Weapons/Xeno/alien_spitacid.ogg
+    sound: *PlushieXenoSound
   - type: Food
     requiresSpecialDigestion: true
-    useSound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
+    useSound: *PlushieXenoSound
   - type: MeleeWeapon
     wideAnimationRotation: 180
-    soundHit:
-      path: /Audio/Weapons/Xeno/alien_spitacid.ogg
+    soundHit: *PlushieXenoSound
   - type: Clothing
     quickEquip: false
     sprite: Objects/Fun/Plushies/xeno.rsi
@@ -1176,27 +1168,41 @@
     sprite: Objects/Fun/Plushies/human.rsi
     state: icon
   - type: EmitSoundOnUse
-    sound:
+    sound: &PlushieHuman
       path: /Audio/Voice/Human/malescream_1.ogg
+      params:
+        volume: -8
   - type: EmitSoundOnLand
     sound:
       path: /Audio/Voice/Human/malescream_2.ogg
+      params:
+        volume: -8
   - type: EmitSoundOnActivate
     sound:
       path: /Audio/Voice/Human/malescream_3.ogg
+      params:
+        volume: -8
   - type: EmitSoundOnCollide
     sound:
       path: /Audio/Voice/Human/malescream_4.ogg
+      params:
+        volume: -8
   - type: Food
     requiresSpecialDigestion: true
     useSound:
       path: /Audio/Voice/Human/malescream_1.ogg
+      params:
+        volume: -8
   - type: MeleeWeapon
     soundHit:
       path: /Audio/Voice/Human/malescream_4.ogg
+      params:
+        volume: -8
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Voice/Human/malescream_5.ogg
+      params:
+        volume: -8
   - type: Clothing
     quickEquip: false
     sprite: Objects/Fun/Plushies/human.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 71eef1f75da9..10ef5697d247 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -872,10 +872,11 @@
   - type: UseDelay
     delay: 0.8
   - type: Slippery
+    staminaDamage: 0
     slipData:
-      launchForwardsMultiplier: 0
       stunTime: 0
       knockdownTime: 0
+      launchForwardsMultiplier: 0
     slipSound:
       collection: Parp
       params:
@@ -975,6 +976,16 @@
   - type: Tag
     tags:
     - DrinkSpaceGlue
+  # 🌟Starlight-start🌟
+  - type: BoneGel
+  - type: SurgeryTool
+    successRate: 0.4 # really not ideal, but in a pinch...
+    speed: 1.5
+    startSound:
+      path: "/Audio/Items/bikehorn.ogg"
+    endSound:
+      path: "/Audio/Items/Toys/pushHornHonk.ogg"
+  # 🌟Starlight-end🌟
 
 - type: entity
   parent: BaseItem
diff --git a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml
index 77ddcf0d983d..af72135cd4e4 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml
@@ -16,6 +16,10 @@
     damage:
       types:
         Blunt: 8
+  # Starlight-start: Vending Machines Prices
+  - type: ItemPrice
+    priceCategory: clothing
+  # Starlight-end
 
 - type: entity
   parent: BriefcaseBase
diff --git a/Resources/Prototypes/Entities/Objects/Misc/chopsticks.yml b/Resources/Prototypes/Entities/Objects/Misc/chopsticks.yml
index 0eff2c8d4757..ef839ad7ca16 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/chopsticks.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/chopsticks.yml
@@ -34,3 +34,7 @@
   - type: Tag
     tags:
     - Trash
+  # Starlight-start: Vending Machines Prices
+  - type: ItemPrice
+    priceCategory: miscellaneous
+  # Starlight-end
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
index 1015a406fbb1..664352d7c25e 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
@@ -25,4 +25,14 @@
       stackType: Manipulator
     - type: Tag
       tags:
-      - MicroManipulatorStockPart
\ No newline at end of file
+      - MicroManipulatorStockPart
+    # 🌟Starlight-start🌟
+    - type: ItemPrice
+      priceCategory: tool_cheap
+    - type: Hemostat
+    - type: SurgeryTool
+      successRate: 0.3 # These are crude but, can grab things
+      speed: 1.5
+      startSound:
+        path: /Audio/_Starlight/Medical/Surgery/hemostat1.ogg
+    # 🌟Starlight-end🌟
diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
index 11784db3ce5d..fcd25b80bf7f 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
@@ -1620,6 +1620,90 @@
     graph: TileWoodLarge
     node: woodtilelarge
 
+# Marble
+
+- type: entity
+  name: white marble tile
+  description: A chiseled, polished square of the finest Space Marble. Best not to lose it.
+  parent: FloorTileItemBase
+  id: FloorTileItemWhiteMarble
+  components:
+  - type: Sprite
+    state: white-marble
+  - type: Item
+    heldPrefix: white-marble
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorWhiteMarble
+  - type: Stack
+    stackType: FloorTileWhiteMarble
+
+- type: entity
+  name: dark marble tile
+  description: A chiseled, polished square of the finest Space Marble. Best not to lose it.
+  parent: FloorTileItemWhiteMarble
+  id: FloorTileItemDarkMarble
+  components:
+  - type: Sprite
+    state: dark-marble
+  - type: Item
+    heldPrefix: dark-marble
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorDarkMarble
+  - type: Stack
+    stackType: FloorTileDarkMarble
+
+- type: entity
+  name: plasmarble tile
+  description: A chiseled, polished square of the finest Space Marble. Plasma-infused for extra... something.
+  parent: FloorTileItemWhiteMarble
+  id: FloorTileItemPlasmaMarble
+  components:
+  - type: Sprite
+    state: plasmarble
+  - type: Item
+    heldPrefix: plasmarble
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorPlasmaMarble
+  - type: Stack
+    stackType: FloorTilePlasmaMarble
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Blunt: 6
+
+- type: entity
+  name: uranium marble tile
+  description: A chiseled, polished square of the finest Space Marble. Uranium-infused to make it extra rad! Pun intended!
+  parent: FloorTileItemWhiteMarble
+  id: FloorTileItemUraniumMarble
+  components:
+  - type: Sprite
+    state: uranium-marble
+  - type: Item
+    heldPrefix: uranium-marble
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorUraniumMarble
+  - type: Stack
+    stackType: FloorTileUraniumMarble
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Blunt: 5
+        Radiation: 1
+  - type: PointLight
+    radius: 1.2
+    energy: 0.8
+    castShadows: false
+    color: "#9be792"
+
 - type: entity
   id: FloorTileItemXeno
   parent: FloorTileItemBase
diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
index 06a75c2ca2ce..4a21049b5a5f 100644
--- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
@@ -33,6 +33,10 @@
   - type: Appearance
   - type: PowerCellVisuals
   - type: Riggable
+  # Starlight-start: Vending Machines Prices
+  - type: ItemPrice
+    fallbackPrice: 10
+  # Starlight-end
 
 - type: entity
   name: potato battery
diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
index f5a9776d5386..734ecdd07f8c 100644
--- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml
+++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@@ -558,7 +558,7 @@
                   min: 2
                   max: 2
     - type: StaticPrice
-      price: 250
+      price: 150
 
 - type: entity
   parent: BaseShield
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
index 9d6e085950a6..d4cbce1b0433 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
@@ -60,6 +60,10 @@
     - Book
   - type: StealTarget
     stealGroup: Bible
+  # Starlight-start: Vending Machines Prices
+  - type: ItemPrice
+    fallbackPrice: 0 
+  # Starlight-end
 
 - type: entity
   parent: [Bible, BaseSyndicateContraband]
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
index c9cae52a9cb8..c15985f19779 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
@@ -100,6 +100,16 @@
   - type: PhysicalComposition
     materialComposition:
       Steel: 100
+  # 🌟Starlight-start🌟
+  - type: BoneSaw
+  - type: SurgeryTool
+    successRate: 0.4
+    speed: 0.8
+    startSound:
+      path: /Audio/Effects/chop.ogg
+    endSound:
+      path: /Audio/Effects/chop.ogg
+  # 🌟Starlight-end🌟
 
 - type: entity
   name: spade
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index be05cc26dd63..a755ef6649cd 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -273,6 +273,9 @@
   parent: Plunger
   description: A plunger with a plastic suction cup coated in a thin layer of gold given as a token of appreciation for years of service. Still used to unclog drains.
   components:
+  - type: Tag
+    tags:
+    - GoldenPlunger
   - type: Sprite
     sprite: Objects/Specific/Janitorial/golden_plunger.rsi
     state: plunger
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml
index ee839eb63081..5bec442e8b22 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml
@@ -84,6 +84,14 @@
   - type: ContainerContainer
     containers:
       item-container: !type:Container
+  # 🌟Starlight-start🌟
+  - type: Retractor
+  - type: SurgeryTool
+    successRate: 0.05 # they are very much too large
+    speed: 1.5
+    startSound:
+      path: /Audio/Mecha/sound_mecha_hydraulic.ogg
+  # 🌟Starlight-end🌟
 
 - type: entity
   id: MechEquipmentGrabberSmall
@@ -113,6 +121,14 @@
     tags:
     - IndustrialMech
     - SmallMech
+  # 🌟Starlight-start🌟
+  - type: Retractor
+  - type: SurgeryTool
+    successRate: 0.1 # they are very much too large
+    speed: 1.5
+    startSound:
+      path: /Audio/Mecha/sound_mecha_hydraulic.ogg
+  # 🌟Starlight-end🌟
 
 - type: entity
   id: MechEquipmentHorn
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index cc54d63d0ace..fb80a8a76c76 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -675,6 +675,7 @@
   id: BorgModuleDiagnosis # todo: reuse when med refractor is finished
   parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ]
   name: diagnosis cyborg module
+  suffix: DO NOT USE
   components:
   - type: Sprite
     layers:
@@ -721,6 +722,7 @@
     items:
     - HandheldHealthAnalyzerUnpowered
     - DefibrillatorOneHandedUnpowered
+    - ClothingNeckStethoscope
     - BorgFireExtinguisher
     - BorgHandheldGPSBasic
     - HandLabeler
@@ -761,6 +763,8 @@
     items:
     - HandheldHealthAnalyzerUnpowered
     - BorgHypo
+    - AutoMenderBrute
+    - AutoMenderBurn
     - Syringe
     - BorgDropper
     - BorgBeaker
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml b/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml
index 3e4d203d1af0..7e33ca5e4f4e 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml
@@ -24,13 +24,14 @@
         Piercing: 6
     soundHit:
       path: "/Audio/Weapons/bladeslice.ogg"
-  - type: Scalpel
+  # 🌟Starlight-start🌟
+  - type: Hemostat
   - type: SurgeryTool
-    successRate: 0.12
+    successRate: 0.05 # Using something sharp as a hemostat is very dangerous
+    speed: 1.5
     startSound:
-      path: /Audio/_Starlight/Medical/Surgery/scalpel1.ogg
-    endSound:
-      path: /Audio/_Starlight/Medical/Surgery/scalpel2.ogg
+      path: /Audio/_Starlight/Medical/Surgery/hemostat1.ogg
+  # 🌟Starlight-end🌟
   - type: PhysicalComposition
     materialComposition:
       Steel: 200
diff --git a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
index cf0ccc22adc1..06eca8479aa2 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
@@ -48,10 +48,10 @@
       - Security
       - Service
       - Theatre
-      - Ntrep
-      - Magistrate
-      - GenpopEnter #starlight genpop repairability fix
-      - GenpopLeave #starlight genpop repairability fix
+      - GenpopEnter
+      - GenpopLeave
+      - Ntrep #Starlight job
+      - Magistrate #Starlight job
       privilegedIdSlot:
         name: id-card-console-privileged-id
         ejectSound: /Audio/Machines/id_swipe.ogg
diff --git a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
index 4c24117caab8..216f63e984cb 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
@@ -33,6 +33,18 @@
     guides:
     - VoltageNetworks
     - Power
+  # 🌟Starlight-start🌟
+  - type: ItemPrice
+    priceCategory: miscellaneous
+  - type: Retractor
+  - type: SurgeryTool
+    successRate: 0.6 # really not ideal, but in a pinch...
+    speed: 1.5
+    startSound:
+      path: /Audio/_Starlight/Medical/Surgery/retractor1.ogg
+    endSound:
+      path: /Audio/_Starlight/Medical/Surgery/retractor2.ogg
+  # 🌟Starlight-end🌟
 
 - type: entity
   id: CableHVStack
diff --git a/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml b/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml
index a761bb68291a..b34edb8327d1 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml
@@ -41,6 +41,14 @@
     size: Normal
     shape:
     - 0,0,0,1
+  # 🌟Starlight-start🌟
+  - type: BoneSetter
+  - type: SurgeryTool
+    successRate: 0.4
+    speed: 1.5
+    startSound:
+      path: /Audio/_Starlight/Medical/Surgery/bone_setter.ogg
+  # 🌟Starlight-end🌟
 
 # Standard (grey) Crowbar
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Tools/flare.yml b/Resources/Prototypes/Entities/Objects/Tools/flare.yml
index 34c233921e13..56b6c8a28f6a 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/flare.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flare.yml
@@ -53,6 +53,15 @@
     netsync: false
   - type: IgnitionSource
     temperature: 1000
+  # 🌟Starlight-start🌟
+  - type: SurgeryTool
+    successRate: 0.1
+    startSound:
+      path: /Audio/_Starlight/Medical/Surgery/cautery1.ogg
+    endSound:
+      path: /Audio/_Starlight/Medical/Surgery/cautery2.ogg
+  - type: Cautery
+  # 🌟Starlight-end🌟
   - type: LightBehaviour
     behaviours:
       - !type:FadeBehaviour # have the radius start small and get larger as it starts to burn
diff --git a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
index 6fd27c430235..544ae59a3cb0 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
@@ -74,6 +74,10 @@
     quickEquip: false
     slots:
       - Belt
+  # Starlight-start: Vending Machines Prices
+  - type: ItemPrice
+    fallbackPrice: 12
+  # Starlight-end
 
 - type: entity
   name: seclite
diff --git a/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml b/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml
index 323e13102fc3..36aabc3d02e9 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml
@@ -26,3 +26,7 @@
         tags:
           - Structure
     - type: PhysicalComposition
+    # Starlight-start: Vending Machines Prices
+    - type: ItemPrice
+      priceCategory: tool_basic
+    # Starlight-end
diff --git a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
index 8c925b77ad94..ccd85ee49dea 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
@@ -49,6 +49,16 @@
         Blunt: 10
     soundHit:
       collection: MetalThud
+  # 🌟Starlight-start🌟
+  - type: SurgeryTool
+    successRate: 0.8
+    speed: 0.8
+    startSound:
+      path: /Audio/Items/jaws_cut.ogg
+    endSound:
+      path: /Audio/Items/change_jaws.ogg
+  - type: BoneSaw
+  # 🌟Starlight-end🌟
 
 - type: entity
   name: syndicate jaws of life
diff --git a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
index 149b1c33a42f..a583b93b5929 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
@@ -98,7 +98,11 @@
   - type: PhysicalComposition
   - type: Tag
     tags:
-      - Lighters #SL
+      - Lighters # SL
+  # Starlight-start: Vending Machines Prices
+  - type: ItemPrice
+    priceCategory: cigaretes
+  # Starlight-end
 
 - type: entity
   name: cheap lighter
@@ -224,6 +228,10 @@
   - type: Tag
     tags:
     - Lighters #SL
+  # Starlight-start: Vending Machines Prices
+  - type: ItemPrice
+    priceCategory: cigaretes
+  # Starlight-end
 
 - type: entity
   name: flippo engraved lighter
diff --git a/Resources/Prototypes/Entities/Objects/Tools/matches.yml b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
index 90ad8b16f53d..fbdf37b22afc 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/matches.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
@@ -109,6 +109,10 @@
     - Trash
     - Lighters #SL
   - type: SpaceGarbage
+  # Starlight-start: Vending Machines Prices
+  - type: ItemPrice
+    priceCategory: miscellaneous
+  # Starlight-end
 
 - type: entity
   parent: [Matchbox, BaseSyndicateContraband]
diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
index a0155cdc5cd2..d4df5c103de0 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -43,13 +43,18 @@
       Steel: 100
   - type: StaticPrice
     price: 30
-  - type: Scalpel
+  # 🌟Starlight-start🌟
+  - type: Hemostat
   - type: SurgeryTool
-    successRate: 0.35
+    successRate: 0.05 # Using something sharp as a hemostat is very dangerous
+    speed: 1.5
     startSound:
       path: /Audio/_Starlight/Medical/Surgery/scalpel1.ogg
     endSound:
       path: /Audio/_Starlight/Medical/Surgery/scalpel2.ogg
+  - type: ItemPrice
+    priceCategory: tool_basic
+  # 🌟Starlight-end🌟
 
 - type: entity
   name: screwdriver
@@ -94,6 +99,16 @@
       Steel: 100
   - type: StaticPrice
     price: 30
+  # 🌟Starlight-start🌟
+  - type: ItemPrice
+    priceCategory: tool_basic
+  - type: SurgicalDrill
+  - type: SurgeryTool
+    successRate: 0.4 # really not ideal, but in a pinch...
+    speed: 1.2
+    endSound:
+      path: /Audio/Weapons/smash.ogg
+  # 🌟Starlight-end🌟
 
 - type: entity
   name: wrench
@@ -136,6 +151,10 @@
   - type: GuideHelp
     guides:
     - Construction
+  # Starlight-start: Vending Machines Prices
+  - type: ItemPrice
+    priceCategory: tool_basic
+  # Starlight-end
 
 - type: entity
   name: multitool
@@ -297,6 +316,14 @@
         Piercing: 10
     soundHit:
       path: "/Audio/Items/drill_hit.ogg"
+  # 🌟Starlight-start🌟
+  - type: SurgicalDrill
+  - type: SurgeryTool
+    successRate: 0.6 # Not ideal, but it works
+    speed: 1.2
+    startSound:
+      path: /Audio/Items/drill_use.ogg
+  # 🌟Starlight-end🌟
 
 - type: entity
   id: RCD
diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
index 5e4ab57adc3e..92644f03faa5 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
@@ -105,6 +105,15 @@
     price: 40
   - type: IgnitionSource
     temperature: 700
+  # 🌟Starlight-start🌟
+  - type: SurgeryTool
+    successRate: 0.75
+    startSound:
+      path: /Audio/_Starlight/Medical/Surgery/cautery1.ogg
+    endSound:
+      path: /Audio/_Starlight/Medical/Surgery/cautery2.ogg
+  - type: Cautery
+  # 🌟Starlight-end🌟
 
 - type: entity
   name: industrial welding tool
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml
index 873d97021423..02aab56f7b6e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml
@@ -54,3 +54,20 @@
     count: 10
   - type: TimedDespawn
     lifetime: 0.25
+
+- type: entity
+  id: PelletClusterLessLethal
+  name: pellet (ball, less lethal)
+  categories: [ HideSpawnMenu ]
+  parent: BaseBullet
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
+    state: buckshot
+  - type: Projectile
+    deleteOnCollide: false
+    damage:
+      types:
+        Piercing: 5
+  - type: TimedDespawn
+    lifetime: 0.25
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 8e67a1aefc53..fa5bd7359b51 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -851,6 +851,7 @@
     totalIntensity: 150 # a ~2 tile radius
     intensitySlope: 5
     maxIntensity: 10
+    canCreateVacuum: false
 
 - type: entity
   id: BulletGrenadeFlash
@@ -870,7 +871,6 @@
     timeRemaining: 0.3
   - type: DeleteOnTrigger
 
-# This is supposed to spawn shrapnel and stuff so uhh... TODO?
 - type: entity
   id: BulletGrenadeFrag
   name: frag grenade
@@ -884,9 +884,16 @@
   - type: ExplodeOnTrigger
   - type: Explosive
     explosionType: Default
-    totalIntensity: 175 # about a ~6 tile radius
+    totalIntensity: 50
     intensitySlope: 1
-    maxIntensity: 10
+    maxIntensity: 5
+    canCreateVacuum: false
+  - type: ContainerContainer
+    containers:
+      cluster-payload: !type:Container
+  - type: ProjectileGrenade
+    fillPrototype: PelletClusterLessLethal
+    capacity: 30
 
 - type: entity
   parent: BaseBulletTrigger
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
index e7f390c65096..0d89c722e872 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -131,6 +131,8 @@
   - type: Gun
     spread: 10
     fireRate: 3
+  - type: GunSpreadModifier
+    spread: 0.6
   - type: BallisticAmmoProvider
     capacity: 2
   - type: Construction
@@ -214,6 +216,8 @@
   - type: Gun
     spread: 40
     fireRate: 3
+  - type: GunSpreadModifier
+    spread: 1.4
   - type: BallisticAmmoProvider
     capacity: 2
   - type: Construction
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cane.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cane.yml
index cbf437d0b282..899bf9c680d6 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cane.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cane.yml
@@ -25,6 +25,10 @@
         Blunt: 3
   - type: UseDelay
     delay: 1
+  # Starlight-start: Vending Machines Prices
+  - type: ItemPrice
+    fallbackPrice: 25
+  # Starlight-end
 
 - type: entity
   name: cane blade
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml
index c8d355ffe059..c283ee473db8 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml
@@ -47,10 +47,11 @@
         maxVol: 300
   - type: UseDelay
     delay: 1
-  - type: Scalpel
   - type: SurgeryTool
-    successRate: 0.01
+    successRate: 0.6 # 🌟Starlight🌟
+    speed: 0.2 #Chainsaws are very fast 🌟Starlight🌟
     startSound:
-      path: /Audio/_Starlight/Medical/Surgery/scalpel1.ogg
+      path: /Audio/Weapons/chainsawwield.ogg
     endSound:
-      path: /Audio/_Starlight/Medical/Surgery/scalpel2.ogg
\ No newline at end of file
+      path: /Audio/Weapons/chainsaw.ogg
+  - type: BoneSaw # 🌟Starlight🌟
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index 93e2791da466..d826f9f65a9f 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -70,6 +70,16 @@
   - type: Reflect
   - type: IgnitionSource
     temperature: 700
+  # 🌟Starlight-start🌟
+  - type: SurgeryTool
+    successRate: 0.6
+    startSound:
+      path: /Audio/_Starlight/Medical/Surgery/cautery1.ogg
+    endSound:
+      path: /Audio/_Starlight/Medical/Surgery/cautery2.ogg
+  - type: Cautery
+  - type: Scalpel
+  # 🌟Starlight-end🌟
 
 - type: entity
   name: energy sword
@@ -88,13 +98,6 @@
       map: [ "blade" ]
   - type: Item
     sprite: Objects/Weapons/Melee/e_sword-inhands.rsi
-  - type: Scalpel
-  - type: SurgeryTool
-    successRate: 0.6
-    startSound:
-      path: /Audio/_Starlight/Medical/Surgery/scalpel1.ogg
-    endSound:
-      path: /Audio/_Starlight/Medical/Surgery/scalpel2.ogg
   - type: StaticPrice
     price: 2500
 
@@ -159,13 +162,6 @@
     energy: 1.5
     color: white
     netsync: false
-  - type: Scalpel
-  - type: SurgeryTool
-    successRate: 0.6
-    startSound:
-      path: /Audio/_Starlight/Medical/Surgery/scalpel1.ogg
-    endSound:
-      path: /Audio/_Starlight/Medical/Surgery/scalpel2.ogg
 
 - type: entity
   name: pen
@@ -233,13 +229,6 @@
   - type: Tag
     tags:
     - Write
-  - type: Scalpel
-  - type: SurgeryTool
-    successRate: 0.6
-    startSound:
-      path: /Audio/_Starlight/Medical/Surgery/scalpel1.ogg
-    endSound:
-      path: /Audio/_Starlight/Medical/Surgery/scalpel2.ogg
 
 - type: entity
   parent: [BaseItem, BaseSyndicateContraband]
@@ -345,13 +334,6 @@
   - type: Reflect
     reflectProb: .75
     spread: 75
-  - type: Scalpel
-  - type: SurgeryTool
-    successRate: 0.6
-    startSound:
-      path: /Audio/_Starlight/Medical/Surgery/scalpel1.ogg
-    endSound:
-      path: /Audio/_Starlight/Medical/Surgery/scalpel2.ogg
 
 # Item will look weird in handslot. Will need to adjust handstorage visuals in a future PR
 - type: entity
@@ -415,13 +397,6 @@
   components: # could add energy-draining like the L6C
   - type: Wieldable
     freeHandsRequired: 0 # because borg has no off-hand to wield with.  Without this, it will be unable to activate the esword
-  - type: Scalpel
-  - type: SurgeryTool
-    successRate: 0.6
-    startSound:
-      path: /Audio/_Starlight/Medical/Surgery/scalpel1.ogg
-    endSound:
-      path: /Audio/_Starlight/Medical/Surgery/scalpel2.ogg
 
 - type: entity
   parent: [ EnergyDaggerLoud, BaseXenoborgContraband ]
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
index 8232b04fb39c..d2e86925354b 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
@@ -47,6 +47,16 @@
     stealGroup: FireAxe
   - type: IgniteOnMeleeHit
     fireStacks: -4
+  # 🌟Starlight-start🌟
+  - type: BoneSaw
+  - type: SurgeryTool
+    successRate: 0.6
+    speed: 0.6
+    startSound:
+      path: "/Audio/Effects/chop.ogg"
+    endSound:
+      path: "/Audio/Effects/chop.ogg"
+  # 🌟Starlight-end🌟
 
 - type: entity
   id: FireAxeFlaming
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
index 92ab300c2b2b..91b91c446f8f 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
@@ -39,6 +39,14 @@
     materialComposition:
       Steel: 100
       Wood: 100
+  # 🌟Starlight-start🌟
+  - type: SurgicalDrill
+  - type: SurgeryTool
+    successRate: 0.01 # You can try
+    speed: 0.5
+    endSound:
+      path: "/Audio/Weapons/smash.ogg"
+  # 🌟Starlight-end🌟
 
 - type: entity
   name: mining drill
@@ -66,6 +74,16 @@
         Brute: 3
       types:
         Structural: 15
+  # 🌟Starlight-start🌟
+  - type: SurgicalDrill
+  - type: SurgeryTool
+    successRate: 0.2 # This drill is way too big, really
+    speed: 0.8
+    startSound:
+      path: "/Audio/Items/drill_use.ogg"
+    endSound:
+      path: "/Audio/Items/drill_use.ogg"
+  # 🌟Starlight-end🌟
 
 - type: entity
   name: diamond tipped mining drill
diff --git a/Resources/Prototypes/Entities/StatusEffects/misc.yml b/Resources/Prototypes/Entities/StatusEffects/misc.yml
index bb2aa9de93b3..3ce81081c0eb 100644
--- a/Resources/Prototypes/Entities/StatusEffects/misc.yml
+++ b/Resources/Prototypes/Entities/StatusEffects/misc.yml
@@ -19,25 +19,53 @@
       components:
       - MobState
 
-# The creature sleeps so heavily that nothing can wake him up. Not even its own death.
+# Things that should be removed by rejuvenation should parent to this
+# Also blocks the status effect being added to godmode-ed entities.
 - type: entity
   parent: MobStatusEffectBase
+  id: MobStatusEffectDebuff
+  abstract: true
+  components:
+  - type: RejuvenateRemovedStatusEffect
+
+- type: entity
+  parent: MobStatusEffectDebuff
+  id: MobStandStatusEffectBase
+  abstract: true
+  components:
+  - type: StatusEffect
+    whitelist:
+      components:
+      - MobState
+      - StandingState
+      requireAll: true
+    blacklist: # This blacklist exists because mob prototypes are smelly and everything needs a standing state component.
+      tags:
+      - KnockdownImmune
+
+# The creature sleeps so heavily that nothing can wake him up. Not even its own death.
+- type: entity
+  parent: MobStatusEffectDebuff
   id: StatusEffectForcedSleeping
   name: forced sleep
   components:
   - type: ForcedSleepingStatusEffect
+  - type: StunnedStatusEffect
+  - type: KnockdownStatusEffect
 
 # This creature is asleep because it's disconnected from the game.
 - type: entity
-  parent: MobStatusEffectBase
+  parent: MobStatusEffectBase # Not even rejuvenate can cure SSD...
   id: StatusEffectSSDSleeping
   name: forced sleep
   components:
   - type: ForcedSleepingStatusEffect
+  - type: StunnedStatusEffect
+  - type: KnockdownStatusEffect
 
 # Blurs your vision and makes you randomly fall asleep
 - type: entity
-  parent: MobStatusEffectBase
+  parent: MobStatusEffectDebuff
   id: StatusEffectDrowsiness
   name: drowsiness
   components:
@@ -45,8 +73,8 @@
 
 # Adds drugs overlay
 - type: entity
-  parent: MobStatusEffectBase
+  parent: MobStatusEffectDebuff
   id: StatusEffectSeeingRainbow
   name: hallucinations
   components:
-  - type: SeeingRainbowsStatusEffect
\ No newline at end of file
+  - type: SeeingRainbowsStatusEffect
diff --git a/Resources/Prototypes/Entities/StatusEffects/movement.yml b/Resources/Prototypes/Entities/StatusEffects/movement.yml
new file mode 100644
index 000000000000..a6cbd207246e
--- /dev/null
+++ b/Resources/Prototypes/Entities/StatusEffects/movement.yml
@@ -0,0 +1,67 @@
+- type: entity
+  parent: MobStatusEffectDebuff
+  id: StatusEffectSlowdown
+  abstract: true
+  name: slowdown
+  components:
+  - type: StatusEffect
+    whitelist:
+      components:
+      - MobState
+    blacklist:
+      tags:
+      - SlowImmune
+  - type: MovementModStatusEffect
+
+- type: entity
+  parent: StatusEffectSlowdown
+  id: VomitingSlowdownStatusEffect
+  name: vomiting slowdown
+
+- type: entity
+  parent: StatusEffectSlowdown
+  id: TaserSlowdownStatusEffect
+  name: shot by taser slowdown
+
+- type: entity
+  parent: StatusEffectSlowdown
+  id: FlashSlowdownStatusEffect
+  name: affected by flash slowdown
+
+- type: entity
+  parent: StatusEffectSlowdown
+  id: StatusEffectStaminaLow
+  name: stamina low
+
+# Makes you more slippery, or perhaps less slippery.
+- type: entity
+  parent: MobStatusEffectDebuff # Debatable if this should be MobStatusEffectBase or not
+  id: StatusEffectFriction
+  name: friction
+  components:
+  - type: FrictionStatusEffect
+
+# Stunnable Status Effect
+
+- type: entity
+  parent: MobStatusEffectDebuff
+  id: StatusEffectStunned
+  name: stunned
+  components:
+  - type: StatusEffect
+    whitelist:
+      components:
+      - MobState
+    blacklist:
+      tags:
+      - StunImmune
+  - type: StatusEffectAlert
+    alert: Stun
+  - type: StunnedStatusEffect
+
+- type: entity
+  parent: MobStandStatusEffectBase
+  id: StatusEffectKnockdown
+  name: knocked down
+  components:
+  - type: KnockdownStatusEffect
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml b/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
index ea394c3c1b06..4f03403e25eb 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
@@ -1,7 +1,7 @@
 - type: entity
-  id: BoozeDispenser
+  id: BoozeDispenserEmpty
   name: booze dispenser
-  suffix: Filled
+  suffix: Empty
   description: A booze dispenser with a single slot for a container to be filled.
   parent: ReagentDispenserBase
   components:
@@ -15,6 +15,22 @@
     whitelist:
       tags:
       - DrinkBottle
+  - type: Transform
+    noRot: false
+  - type: Machine
+    board: BoozeDispenserMachineCircuitboard
+  - type: GuideHelp
+    guides:
+    - Bartender
+    - Drinks
+  - type: StealTarget
+    stealGroup: BoozeDispenser
+
+- type: entity
+  id: BoozeDispenser
+  suffix: Filled
+  parent: BoozeDispenserEmpty
+  components:
   - type: StorageFill
     contents:
     - id: DrinkAleBottleFullGrowler
@@ -29,23 +45,3 @@
     - id: DrinkVodkaBottleFull
     - id: DrinkWhiskeyBottleFull
     - id: DrinkWineBottleFull
-  - type: Transform
-    noRot: false
-  - type: Machine
-    board: BoozeDispenserMachineCircuitboard
-  - type: GuideHelp
-    guides:
-    - Bartender
-    - Drinks
-  - type: StealTarget
-    stealGroup: BoozeDispenser
-
-- type: entity
-  id: BoozeDispenserEmpty
-  suffix: Empty
-  parent: BoozeDispenser
-  components:
-  - type: Storage
-    whitelist:
-      tags:
-      - DrinkBottle
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml b/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
index 75a1a485aa79..6df6d595d288 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
@@ -1,9 +1,9 @@
 - type: entity
   parent: ReagentDispenserBase
-  id: SodaDispenser
+  id: SodaDispenserEmpty
   name: soda dispenser
   description: A beverage dispenser with a selection of soda and several other common beverages. Has a single fill slot for containers.
-  suffix: Filled
+  suffix: Empty
   components:
   - type: Rotatable
   - type: Sprite
@@ -15,6 +15,20 @@
     whitelist:
       tags:
       - DrinkBottle
+  - type: Transform
+    noRot: false
+  - type: Machine
+    board: SodaDispenserMachineCircuitboard
+  - type: GuideHelp
+    guides:
+    - Bartender
+    - Drinks
+
+- type: entity
+  parent: SodaDispenserEmpty
+  id: SodaDispenser
+  suffix: Filled
+  components:
   - type: StorageFill
     contents:
     - id: DrinkCoconutWaterJug
@@ -36,16 +50,3 @@
     - id: DrinkTeaJug
     - id: DrinkTonicWaterBottleFull
     - id: DrinkWaterMelonJuiceJug
-  - type: Transform
-    noRot: false
-  - type: Machine
-    board: SodaDispenserMachineCircuitboard
-  - type: GuideHelp
-    guides:
-    - Bartender
-    - Drinks
-
-- type: entity
-  parent: SodaDispenser
-  id: SodaDispenserEmpty
-  suffix: Empty
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/operating_table.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/operating_table.yml
index 4d51a614f1f9..893ce3f8c2da 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/operating_table.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/operating_table.yml
@@ -11,4 +11,17 @@
   - type: Icon
     sprite: Structures/Furniture/Tables/optable.rsi
     state: operating_table
-  - type: OperatingTable
\ No newline at end of file
+  - type: OperatingTable
+  # Starlight-start: Surgery body scanner
+  - type: HealOnBuckle
+    damage: {}
+  - type: InteractionOutline
+  - type: DeviceList
+  - type: DeviceNetwork
+    deviceNetId: Wired
+  - type: DeviceLinkSink
+    ports:
+      - BodyScannerReceiver
+  - type: PlaceableSurface
+    isPlaceable: false
+  # Starlight-end
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/service_light.yml b/Resources/Prototypes/Entities/Structures/Lighting/service_light.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/service_light.yml
rename to Resources/Prototypes/Entities/Structures/Lighting/service_light.yml
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
index b82e88853965..bb77a0be9cb5 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -114,7 +114,7 @@
     color: "#43ccb5"
 
 - type: entity
-  parent: BaseComputer
+  parent: BaseComputerAiAccess
   id: BaseComputerShuttle
   name: shuttle console
   description: Used to pilot a shuttle.
@@ -630,7 +630,7 @@
 - type: entity
   parent: BaseComputerAiAccess
   id: computerBodyScanner
-  name: body scanner computer
+  name: operating computer # Starlight-edit
   description: A body scanner.
   components:
   - type: ApcPowerReceiver
@@ -641,6 +641,37 @@
     radius: 1.5
     energy: 1.6
     color: "#1f8c28"
+  # Starlight-start: Surgery body scanner
+  - type: Sprite
+    layers:
+    - map: ["computerLayerBody"]
+      state: computer
+    - map: ["computerLayerKeyboard"]
+      state: generic_keyboard
+    - map: ["computerLayerScreen"]
+      state: crew
+    - map: ["computerLayerKeys"]
+      state: med_key
+    - map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
+      state: generic_panel_open
+  - type: Speech
+  - type: BodyScanner
+  - type: HealthAnalyzer
+    talk: true
+  - type: ActivatableUI
+    key: enum.HealthAnalyzerUiKey.Key
+  - type: UserInterface
+    interfaces:
+      enum.HealthAnalyzerUiKey.Key:
+        type: HealthAnalyzerBoundUserInterface
+  - type: DeviceList
+  - type: DeviceNetwork
+    deviceNetId: Wired
+  - type: DeviceLinkSource
+    range: 2
+    ports:
+      - BodyScannerSender
+  # Starlight-end
 
 - type: entity
   parent: BaseComputerAiAccess
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/wooden_television.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/wooden_television.yml
new file mode 100644
index 000000000000..b542687b5743
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/wooden_television.yml
@@ -0,0 +1,31 @@
+- type: entity
+  parent: ComputerSurveillanceWirelessCameraMonitor
+  id: ComputerTelevision
+  name: wooden television
+  description: Finally, some decent reception around here...
+  components:
+  - type: Sprite
+    noRot: true
+    drawdepth: SmallObjects
+    layers:
+    - map: ["computerLayerBody"]
+      state: television
+    - map: ["computerLayerScreen"]
+      state: detective_television
+  - type: Computer
+    board: ComputerTelevisionCircuitboard
+  - type: PointLight
+    radius: 1.5
+    energy: 1.6
+    color: "#b89f25"
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.25,-0.25,0.25,0.25"
+        density: 200
+        mask:
+          - TabletopMachineMask
+        layer:
+          - TabletopMachineLayer
diff --git a/Resources/Prototypes/Entities/Structures/Machines/mail_teleporter.yml b/Resources/Prototypes/Entities/Structures/Machines/mail_teleporter.yml
index 6842e3c95894..ad10fbdbeea7 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/mail_teleporter.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/mail_teleporter.yml
@@ -52,3 +52,5 @@
   - type: DeliverySpawner
     table: !type:NestedSelector
       tableId: RandomDeliveryBasic
+    emagTable: !type:NestedSelector #Starlight
+      tableId: RandomDeliveryEvil #Starlight
diff --git a/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml b/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
index 8ea6fee938e2..788febc01410 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
@@ -21,27 +21,37 @@
     - state: smartfridge_door
       map: ["enum.StorageVisualLayers.Door"]
       shader: unshaded
-  - type: EntityStorageVisuals
-    stateBaseClosed: smartfridge
-    stateDoorOpen: smartfridge_open
-    stateDoorClosed: smartfridge_door
   - type: PointLight
     radius: 1.5
     energy: 1.6
     color: "#9dc5c9"
-  - type: EntityStorage
-    isCollidableWhenOpen: true
-    closeSound:
-      path: /Audio/Machines/windoor_open.ogg
-      params:
-        volume: -3
-    openSound:
-      path: /Audio/Machines/windoor_open.ogg
-      params:
-        volume: -3
   - type: ContainerContainer
     containers:
-      entity_storage: !type:Container
+      smart_fridge_inventory: !type:Container
+  - type: LitOnPowered
+  - type: ApcPowerReceiver
+    powerLoad: 200
+  - type: ExtensionCableReceiver
+  - type: SmartFridge
+    whitelist:
+      components:
+      - FitsInDispenser
+      - Pill
+      - Produce
+      - Seed
+      tags:
+      - PillCanister
+      - Bottle
+      - Syringe
+      - ChemDispensable
+  - type: ActivatableUI
+    key: enum.SmartFridgeUiKey.Key
+  - type: ActivatableUIRequiresPower
+  - type: UserInterface
+    interfaces:
+      enum.SmartFridgeUiKey.Key:
+        type: SmartFridgeBoundUserInterface
+  - type: AccessReader
   - type: UseDelay
     delay: 1
   - type: AntiRottingContainer
@@ -105,3 +115,15 @@
         Blunt: 5
     soundHit:
       collection: MetalThud
+  - type: ExplosionResistance
+    damageCoefficient: 0.1
+
+- type: entity
+  parent: SmartFridge
+  id: SmartFridgeMedical
+  suffix: Medical
+  components:
+  - type: SmartFridge
+    flavorText: smart-fridge-request-chemistry
+  - type: AccessReader
+    access: [["Medical"]]
diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index 9cc83cf32c7d..b1c7df65a820 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -1,3 +1,5 @@
+# base
+
 - type: entity
   id: VendingMachine
   parent: BaseMachinePowered
@@ -105,6 +107,8 @@
   - type: Appearance
   - type: WiresVisuals
 
+# Vending machines
+
 - type: entity
   parent: VendingMachine
   id: VendingMachineCondiments
@@ -112,6 +116,7 @@
   description: Slather these thick gooey substances on your food for a full flavor effect.
   components:
   - type: VendingMachine
+    showPrices: false # Starlight-edit: Vending Machines Prices
     pack: CondimentInventory
     offState: off
   - type: Sprite
@@ -146,6 +151,7 @@
   components:
   - type: VendingMachine
     pack: AmmoVendInventory
+    showPrices: false # Starlight-edit: Vending Machines Prices
     offState: off
     brokenState: broken
     normalState: normal-unshaded
@@ -172,6 +178,7 @@
   components:
   - type: VendingMachine
     pack: BoozeOMatInventory
+    showPrices: false # Starlight-edit: Vending Machines Prices
     offState: off
     brokenState: broken
     normalState: normal-unshaded
@@ -207,6 +214,7 @@
   - type: VendingMachine
     pack: BoozeOMatInventory
     offState: off
+    showPrices: false # Starlight-edit: Vending Machines Prices
     brokenState: broken
     normalState: normal-unshaded
     denyState: deny-unshaded
@@ -241,6 +249,7 @@
   - type: VendingMachine
     pack: PTechInventory
     offState: off
+    showPrices: false # Starlight-edit: Vending Machines Prices
     brokenState: broken
     normalState: normal-unshaded
     ejectState: eject-unshaded
@@ -274,6 +283,7 @@
     brokenState: broken
     normalState: normal-unshaded
     ejectState: eject-unshaded
+    showPrices: false # Starlight-edit: Vending Machines Prices
   - type: DatasetVocalizer
     dataset: ChefvendAds
   - type: SpeakOnUIClosed
@@ -727,6 +737,7 @@
     brokenState: broken
     normalState: normal-unshaded
     ejectState: eject-unshaded
+    showPrices: false # Starlight-edit: Vending Machines Prices
   - type: DatasetVocalizer
     dataset: DinnerwareAds
   - type: SpeakOnUIClosed
@@ -757,6 +768,7 @@
   - type: VendingMachine
     pack: MagiVendInventory
     offState: off
+    showPrices: false # Starlight-edit: Vending Machines Prices
     brokenState: broken
     normalState: normal-unshaded
   - type: DatasetVocalizer
@@ -824,6 +836,7 @@
     normalState: normal-unshaded
     ejectState: eject-unshaded
     denyState: deny-unshaded
+    showPrices: false # Starlight-edit: Vending Machines Prices
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/engivend.rsi
     layers:
@@ -855,6 +868,7 @@
     ejectState: eject-unshaded
     denyState: deny-unshaded
     ejectDelay: 0.6
+    showPrices: false # Starlight-edit: Vending Machines Prices
   - type: DatasetVocalizer
     dataset: NanoMedAds
   - type: SpeakOnUIClosed
@@ -892,6 +906,7 @@
     normalState: normal-unshaded
     ejectState: eject-unshaded
     denyState: deny-unshaded
+    showPrices: false # Starlight-edit: Vending Machines Prices
   - type: DatasetVocalizer
     dataset: NutriMaxAds
   - type: SpeakOnUIClosed
@@ -926,6 +941,7 @@
     normalState: normal-unshaded
     ejectState: eject-unshaded
     denyState: deny-unshaded
+    showPrices: false # Starlight-edit: Vending Machines Prices
   - type: DatasetVocalizer
     dataset: SecTechAds
   - type: SpeakOnUIClosed
@@ -965,6 +981,7 @@
     normalState: normal-unshaded
     ejectState: eject-unshaded
     denyState: deny-unshaded
+    showPrices: false # Starlight-edit: Vending Machines Prices
   - type: DatasetVocalizer
     dataset: MegaSeedAds
   - type: SpeakOnUIClosed
@@ -1254,6 +1271,7 @@
     normalState: normal-unshaded
     ejectState: eject-unshaded
     denyState: deny-unshaded
+    showPrices: false # Starlight-edit: Vending Machines Prices
   - type: DatasetVocalizer
     dataset: VendomatAds
   - type: SpeakOnUIClosed
@@ -1291,6 +1309,7 @@
     normalState: normal-unshaded
     ejectState: eject-unshaded
     denyState: deny-unshaded
+    showPrices: false # Starlight-edit: Vending Machines Prices
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/youtool.rsi
     layers:
@@ -1319,6 +1338,7 @@
     normalState: normal-unshaded
     ejectState: eject-unshaded
     ejectDelay: 1.8
+    showPrices: false # Starlight-edit: Vending Machines Prices
   - type: DatasetVocalizer
     dataset: GoodCleanFunAds
   - type: SpeakOnUIClosed
@@ -1379,6 +1399,7 @@
   components:
   - type: VendingMachine
     pack: SalvageEquipmentInventory
+    showPrices: false # Starlight-edit: Vending Machines Prices
     offState: off
     brokenState: broken
     normalState: normal-unshaded
@@ -1436,6 +1457,7 @@
     energy: 1.6
     color: "#d4ab33"
 
+
 # wallmounted machines
 
 - type: entity
@@ -1457,38 +1479,6 @@
   - type: Transform
     noRot: false
 
-- type: entity
-  parent: VendingMachineWallmount
-  id: VendingMachineWallMedical
-  name: NanoMed
-  description: "It's a wall-mounted medical equipment dispenser. Natural chemicals only!"
-  components:
-  - type: VendingMachine
-    pack: NanoMedInventory
-    offState: off
-    brokenState: broken
-    normalState: normal-unshaded
-    denyState: deny-unshaded
-  - type: Sprite
-    sprite: Structures/Machines/VendingMachines/wallmed.rsi
-    layers:
-    - state: "off"
-      map: ["enum.VendingMachineVisualLayers.Base"]
-    - state: "off"
-      map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
-      shader: unshaded
-    - texture: Structures/Machines/VendingMachines/maintenance_panel.png
-      map: ["enum.WiresVisualLayers.MaintenancePanel"]
-  - type: PointLight
-    radius: 1.3
-    energy: 1.6
-    color: "#43ccb5"
-  - type: AccessReader
-    access: [["Medical"]]
-  - type: GuideHelp
-    guides:
-    - Medical
-
 # job clothing
 
 - type: entity
@@ -1592,6 +1582,7 @@
   - type: VendingMachine
     pack: BarDrobeInventory
     offState: off
+    showPrices: false # Starlight-edit: Vending Machines Prices
     brokenState: broken
     normalState: normal-unshaded
   - type: DatasetVocalizer
@@ -2096,6 +2087,7 @@
     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...
+    showPrices: false # Starlight-edit: Vending Machines Prices
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/happyhonk.rsi
     layers:
@@ -2128,6 +2120,7 @@
   - type: VendingMachine
     pack: PrideDrobeInventory
     offState: off
+    showPrices: false # Starlight-start: Vending Machines Prices
     brokenState: broken
     normalState: normal-unshaded
   - type: DatasetVocalizer
@@ -2160,6 +2153,7 @@
   description: A vendor for dispensing gas tanks.
   components:
   - type: VendingMachine
+    showPrices: false # Starlight-edit: Vending Machines Prices
     pack: TankDispenserEVAInventory
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/tankdispenser.rsi #TODO add visualiser for remaining tanks as layers
@@ -2173,6 +2167,7 @@
   description: A vendor for dispensing gas tanks. This one has an engineering livery.
   components:
   - type: VendingMachine
+    showPrices: false # Starlight-edit: Vending Machines Prices
     pack: TankDispenserEngineeringInventory
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/tankdispenser.rsi #TODO add visualiser for remaining tanks as layers
@@ -2187,6 +2182,7 @@
   description: Probably not the coffee machine.
   components:
   - type: VendingMachine
+    showPrices: false # Starlight-edit: Vending Machines Prices
     pack: ChemVendInventory
     offState: off
     brokenState: broken
@@ -2225,3 +2221,36 @@
   - type: AccessReader
     access: [["SyndicateAgent"]]
 
+# wallmount
+- type: entity
+  parent: VendingMachineWallmount
+  id: VendingMachineWallMedical
+  name: NanoMed
+  description: "It's a wall-mounted medical equipment dispenser. Natural chemicals only!"
+  components:
+  - type: VendingMachine
+    pack: NanoMedInventory
+    offState: off
+    showPrices: false # Starlight-edit: Vending Machines Prices
+    brokenState: broken
+    normalState: normal-unshaded
+    denyState: deny-unshaded
+  - type: Sprite
+    sprite: Structures/Machines/VendingMachines/wallmed.rsi
+    layers:
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.Base"]
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
+      shader: unshaded
+    - texture: Structures/Machines/VendingMachines/maintenance_panel.png
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: PointLight
+    radius: 1.3
+    energy: 1.6
+    color: "#43ccb5"
+  - type: AccessReader
+    access: [["Medical"]]
+  - type: GuideHelp
+    guides:
+    - Medical
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/alt_layers.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/alt_layers.yml
index 1f4ab085f1df..62d90657a960 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/alt_layers.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/alt_layers.yml
@@ -131,3 +131,427 @@
     sprite: Structures/Piping/Atmospherics/pipe_alt2.rsi
   - type: Construction
     node: fourwayAlt2
+
+# GasPressurePump
+
+- type: entity
+  parent: [GasPipeLayerAlt1, GasPressurePump]
+  id: GasPressurePumpAlt1
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Structures/Piping/Atmospherics/pump_alt1.rsi
+    layers:
+    - sprite: Structures/Piping/Atmospherics/pipe_alt1.rsi
+      state: pipeStraight
+      map: [ "enum.PipeVisualLayers.Pipe" ]
+    - state: pumpPressure
+      map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
+  - type: Construction
+    node: pressurepumpAlt1
+
+- type: entity
+  parent: [GasPipeLayerAlt2, GasPressurePump]
+  id: GasPressurePumpAlt2
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Structures/Piping/Atmospherics/pump_alt2.rsi
+    layers:
+    - sprite: Structures/Piping/Atmospherics/pipe_alt2.rsi
+      state: pipeStraight
+      map: [ "enum.PipeVisualLayers.Pipe" ]
+    - state: pumpPressure
+      map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
+  - type: Construction
+    node: pressurepumpAlt2
+
+# GasVolumePump
+
+- type: entity
+  parent: [GasPipeLayerAlt1, GasVolumePump]
+  id: GasVolumePumpAlt1
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Structures/Piping/Atmospherics/pump_alt1.rsi
+    layers:
+    - sprite: Structures/Piping/Atmospherics/pipe_alt1.rsi
+      state: pipeStraight
+      map: [ "enum.PipeVisualLayers.Pipe" ]
+    - state: pumpVolume
+      map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
+  - type: Construction
+    node: volumepumpAlt1
+
+- type: entity
+  parent: [GasPipeLayerAlt2, GasVolumePump]
+  id: GasVolumePumpAlt2
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Structures/Piping/Atmospherics/pump_alt2.rsi
+    layers:
+    - sprite: Structures/Piping/Atmospherics/pipe_alt2.rsi
+      state: pipeStraight
+      map: [ "enum.PipeVisualLayers.Pipe" ]
+    - state: pumpVolume
+      map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
+  - type: Construction
+    node: volumepumpAlt2
+
+# GasPassiveGate
+
+- type: entity
+  parent: [GasPipeLayerAlt1, GasPassiveGate]
+  id: GasPassiveGateAlt1
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Structures/Piping/Atmospherics/pump_alt1.rsi
+    layers:
+    - sprite: Structures/Piping/Atmospherics/pipe_alt1.rsi
+      state: pipeStraight
+      map: [ "enum.PipeVisualLayers.Pipe" ]
+    - state: pumpPassiveGate
+      map: [ "enum.SubfloorLayers.FirstLayer" ]
+  - type: Construction
+    node: passivegateAlt1
+
+- type: entity
+  parent: [GasPipeLayerAlt2, GasPassiveGate]
+  id: GasPassiveGateAlt2
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Structures/Piping/Atmospherics/pump_alt2.rsi
+    layers:
+    - sprite: Structures/Piping/Atmospherics/pipe_alt2.rsi
+      state: pipeStraight
+      map: [ "enum.PipeVisualLayers.Pipe" ]
+    - state: pumpPassiveGate
+      map: [ "enum.SubfloorLayers.FirstLayer" ]
+  - type: Construction
+    node: passivegateAlt2
+
+# GasValve
+
+- type: entity
+  parent: [GasPipeLayerAlt1, GasValve]
+  id: GasValveAlt1
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Structures/Piping/Atmospherics/pump_alt1.rsi
+    layers:
+    - sprite: Structures/Piping/Atmospherics/pipe_alt1.rsi
+      state: pipeStraight
+      map: [ "enum.PipeVisualLayers.Pipe" ]
+    - state: pumpManualValve
+      map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
+  - type: Construction
+    node: valveAlt1
+
+- type: entity
+  parent: [GasPipeLayerAlt2, GasValve]
+  id: GasValveAlt2
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Structures/Piping/Atmospherics/pump_alt2.rsi
+    layers:
+    - sprite: Structures/Piping/Atmospherics/pipe_alt2.rsi
+      state: pipeStraight
+      map: [ "enum.PipeVisualLayers.Pipe" ]
+    - state: pumpManualValve
+      map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
+  - type: Construction
+    node: valveAlt2
+
+# SignalControlledValve
+
+- type: entity
+  parent: [GasPipeLayerAlt1, SignalControlledValve]
+  id: SignalControlledValveAlt1
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Structures/Piping/Atmospherics/pump_alt1.rsi
+    layers:
+    - sprite: Structures/Piping/Atmospherics/pipe_alt1.rsi
+      state: pipeStraight
+      map: [ "enum.PipeVisualLayers.Pipe" ]
+    - state: pumpSignalValve
+      map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
+  - type: Construction
+    node: signalvalveAlt1
+
+- type: entity
+  parent: [GasPipeLayerAlt2, SignalControlledValve]
+  id: SignalControlledValveAlt2
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Structures/Piping/Atmospherics/pump_alt2.rsi
+    layers:
+    - sprite: Structures/Piping/Atmospherics/pipe_alt2.rsi
+      state: pipeStraight
+      map: [ "enum.PipeVisualLayers.Pipe" ]
+    - state: pumpSignalValve
+      map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
+  - type: Construction
+    node: signalvalveAlt2
+
+# GasPipeSensor
+
+- type: entity
+  parent: [GasPipeLayerAlt1, GasPipeSensor]
+  id: GasPipeSensorAlt1
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Structures/Piping/Atmospherics/gas_pipe_sensor_alt1.rsi
+    layers:
+    - sprite: Structures/Piping/Atmospherics/pipe_alt1.rsi
+      map: [ "enum.PipeVisualLayers.Pipe" ]
+      state: pipeStraight
+    - map: ["base"]
+      state: base
+    - map: [ "enum.PowerDeviceVisualLayers.Powered" ]
+      state: lights
+      shader: unshaded
+  - type: Construction
+    node: sensorAlt1
+
+- type: entity
+  parent: [GasPipeLayerAlt2, GasPipeSensor]
+  id: GasPipeSensorAlt2
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Structures/Piping/Atmospherics/gas_pipe_sensor_alt2.rsi
+    layers:
+    - sprite: Structures/Piping/Atmospherics/pipe_alt2.rsi
+      map: [ "enum.PipeVisualLayers.Pipe" ]
+      state: pipeStraight
+    - map: ["base"]
+      state: base
+    - map: [ "enum.PowerDeviceVisualLayers.Powered" ]
+      state: lights
+      shader: unshaded
+  - type: Construction
+    node: sensorAlt2
+
+# GasPipeSensorDistribution
+
+- type: entity
+  parent: [GasPipeLayerAlt1, GasPipeSensorDistribution]
+  id: GasPipeSensorDistributionAlt1
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Structures/Piping/Atmospherics/gas_pipe_sensor_alt1.rsi
+    layers:
+    - sprite: Structures/Piping/Atmospherics/pipe_alt1.rsi
+      map: [ "enum.PipeVisualLayers.Pipe" ]
+      state: pipeStraight
+    - map: ["base"]
+      state: base
+    - map: [ "enum.PowerDeviceVisualLayers.Powered" ]
+      state: lights
+      shader: unshaded
+
+- type: entity
+  parent: [GasPipeLayerAlt2, GasPipeSensorDistribution]
+  id: GasPipeSensorDistributionAlt2
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Structures/Piping/Atmospherics/gas_pipe_sensor_alt2.rsi
+    layers:
+    - sprite: Structures/Piping/Atmospherics/pipe_alt2.rsi
+      map: [ "enum.PipeVisualLayers.Pipe" ]
+      state: pipeStraight
+    - map: ["base"]
+      state: base
+    - map: [ "enum.PowerDeviceVisualLayers.Powered" ]
+      state: lights
+      shader: unshaded
+
+# GasPipeSensorWaste
+
+- type: entity
+  parent: [GasPipeLayerAlt1, GasPipeSensorWaste]
+  id: GasPipeSensorWasteAlt1
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Structures/Piping/Atmospherics/gas_pipe_sensor_alt1.rsi
+    layers:
+    - sprite: Structures/Piping/Atmospherics/pipe_alt1.rsi
+      map: [ "enum.PipeVisualLayers.Pipe" ]
+      state: pipeStraight
+    - map: ["base"]
+      state: base
+    - map: [ "enum.PowerDeviceVisualLayers.Powered" ]
+      state: lights
+      shader: unshaded
+
+- type: entity
+  parent: [GasPipeLayerAlt2, GasPipeSensorWaste]
+  id: GasPipeSensorWasteAlt2
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Structures/Piping/Atmospherics/gas_pipe_sensor_alt2.rsi
+    layers:
+    - sprite: Structures/Piping/Atmospherics/pipe_alt2.rsi
+      map: [ "enum.PipeVisualLayers.Pipe" ]
+      state: pipeStraight
+    - map: ["base"]
+      state: base
+    - map: [ "enum.PowerDeviceVisualLayers.Powered" ]
+      state: lights
+      shader: unshaded
+
+# GasPipeSensorMixedAir
+
+- type: entity
+  parent: [GasPipeLayerAlt1, GasPipeSensorMixedAir]
+  id: GasPipeSensorMixedAirAlt1
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Structures/Piping/Atmospherics/gas_pipe_sensor_alt1.rsi
+    layers:
+    - sprite: Structures/Piping/Atmospherics/pipe_alt1.rsi
+      map: [ "enum.PipeVisualLayers.Pipe" ]
+      state: pipeStraight
+    - map: ["base"]
+      state: base
+    - map: [ "enum.PowerDeviceVisualLayers.Powered" ]
+      state: lights
+      shader: unshaded
+
+- type: entity
+  parent: [GasPipeLayerAlt2, GasPipeSensorMixedAir]
+  id: GasPipeSensorMixedAirAlt2
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Structures/Piping/Atmospherics/gas_pipe_sensor_alt2.rsi
+    layers:
+    - sprite: Structures/Piping/Atmospherics/pipe_alt2.rsi
+      map: [ "enum.PipeVisualLayers.Pipe" ]
+      state: pipeStraight
+    - map: ["base"]
+      state: base
+    - map: [ "enum.PowerDeviceVisualLayers.Powered" ]
+      state: lights
+      shader: unshaded
+
+# GasPipeSensorTEGHot
+
+- type: entity
+  parent: [GasPipeLayerAlt1, GasPipeSensorTEGHot]
+  id: GasPipeSensorTEGHotAlt1
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Structures/Piping/Atmospherics/gas_pipe_sensor_alt1.rsi
+    layers:
+    - sprite: Structures/Piping/Atmospherics/pipe_alt1.rsi
+      map: [ "enum.PipeVisualLayers.Pipe" ]
+      state: pipeStraight
+    - map: ["base"]
+      state: base
+    - map: [ "enum.PowerDeviceVisualLayers.Powered" ]
+      state: lights
+      shader: unshaded
+
+- type: entity
+  parent: [GasPipeLayerAlt2, GasPipeSensorTEGHot]
+  id: GasPipeSensorTEGHotAlt2
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Structures/Piping/Atmospherics/gas_pipe_sensor_alt2.rsi
+    layers:
+    - sprite: Structures/Piping/Atmospherics/pipe_alt2.rsi
+      map: [ "enum.PipeVisualLayers.Pipe" ]
+      state: pipeStraight
+    - map: ["base"]
+      state: base
+    - map: [ "enum.PowerDeviceVisualLayers.Powered" ]
+      state: lights
+      shader: unshaded
+
+# GasPipeTEGCold
+
+- type: entity
+  parent: [GasPipeLayerAlt1, GasPipeSensorTEGCold]
+  id: GasPipeSensorTEGColdAlt1
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Structures/Piping/Atmospherics/gas_pipe_sensor_alt1.rsi
+    layers:
+    - sprite: Structures/Piping/Atmospherics/pipe_alt1.rsi
+      map: [ "enum.PipeVisualLayers.Pipe" ]
+      state: pipeStraight
+    - map: ["base"]
+      state: base
+    - map: [ "enum.PowerDeviceVisualLayers.Powered" ]
+      state: lights
+      shader: unshaded
+
+- type: entity
+  parent: [GasPipeLayerAlt2, GasPipeSensorTEGCold]
+  id: GasPipeSensorTEGColdAlt2
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Structures/Piping/Atmospherics/gas_pipe_sensor_alt2.rsi
+    layers:
+    - sprite: Structures/Piping/Atmospherics/pipe_alt2.rsi
+      map: [ "enum.PipeVisualLayers.Pipe" ]
+      state: pipeStraight
+    - map: ["base"]
+      state: base
+    - map: [ "enum.PowerDeviceVisualLayers.Powered" ]
+      state: lights
+      shader: unshaded
+
+# GasPressureRegulator
+
+- type: entity
+  parent: [GasPipeLayerAlt1, GasPressureRegulator]
+  id: GasPressureRegulatorAlt1
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Structures/Piping/Atmospherics/pump_alt1.rsi
+    layers:
+    - sprite: Structures/Piping/Atmospherics/pipe_alt1.rsi
+      state: pipeStraight
+      map: [ "enum.PipeVisualLayers.Pipe" ]
+    - state: pumpPressureRegulator
+      map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
+  - type: Construction
+    node: pressureregulatorAlt1
+
+- type: entity
+  parent: [GasPipeLayerAlt2, GasPressureRegulator]
+  id: GasPressureRegulatorAlt2
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: Structures/Piping/Atmospherics/pump_alt2.rsi
+    layers:
+    - sprite: Structures/Piping/Atmospherics/pipe_alt2.rsi
+      state: pipeStraight
+      map: [ "enum.PipeVisualLayers.Pipe" ]
+    - state: pumpPressureRegulator
+      map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
+  - type: Construction
+    node: pressureregulatorAlt2
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
index 65e64d0d2f84..57c1c3494cee 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
@@ -34,7 +34,7 @@
   name: gas pump
   description: A pump that moves gas by pressure.
   placement:
-    mode: SnapgridCenter
+    mode: AlignAtmosPipeLayers
   components:
   - type: ExtensionCableReceiver
   - type: LightningTarget
@@ -55,6 +55,11 @@
       map: [ "enum.PipeVisualLayers.Pipe" ]
     - state: pumpPressure
       map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
+  - type: AtmosPipeLayers
+    alternativePrototypes:
+      Primary: GasPressurePump
+      Secondary: GasPressurePumpAlt1
+      Tertiary: GasPressurePumpAlt2
   - type: Appearance
   - type: GenericVisualizer
     visuals:
@@ -99,7 +104,7 @@
   name: volumetric gas pump
   description: A pump that moves gas by volume.
   placement:
-    mode: SnapgridCenter
+    mode: AlignAtmosPipeLayers
   components:
     - type: ExtensionCableReceiver
     - type: LightningTarget
@@ -120,6 +125,11 @@
           map: [ "enum.PipeVisualLayers.Pipe" ]
         - state: pumpVolume
           map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
+    - type: AtmosPipeLayers
+      alternativePrototypes:
+        Primary: GasVolumePump
+        Secondary: GasVolumePumpAlt1
+        Tertiary: GasVolumePumpAlt2
     - type: Appearance
     - type: GenericVisualizer
       visuals:
@@ -173,7 +183,7 @@
   name: inlet pressure regulator
   description: A valve that releases gas when the inlet pressure exceeds a certain threshold.
   placement:
-    mode: SnapgridCenter
+    mode: AlignAtmosPipeLayers
   components:
   - type: Rotatable
   - type: Transform
@@ -189,6 +199,11 @@
       map: [ "enum.PipeVisualLayers.Pipe" ]
     - state: pumpPressureRegulator
       map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
+  - type: AtmosPipeLayers
+    alternativePrototypes:
+      Primary: GasPressureRegulator
+      Secondary: GasPressureRegulatorAlt1
+      Tertiary: GasPressureRegulatorAlt2
   - type: Appearance
   - type: GenericVisualizer
     visuals:
@@ -229,7 +244,7 @@
   name: passive gate
   description: A one-way air valve that does not require power.
   placement:
-    mode: SnapgridCenter
+    mode: AlignAtmosPipeLayers
   components:
     - type: SubFloorHide
       visibleLayers:
@@ -242,6 +257,11 @@
           map: [ "enum.PipeVisualLayers.Pipe" ]
         - state: pumpPassiveGate
           map: [ "enum.SubfloorLayers.FirstLayer" ]
+    - type: AtmosPipeLayers
+      alternativePrototypes:
+        Primary: GasPassiveGate
+        Secondary: GasPassiveGateAlt1
+        Tertiary: GasPassiveGateAlt2
     - type: Appearance
     - type: PipeColorVisuals
     - type: GasPassiveGate
@@ -272,7 +292,7 @@
   name: manual valve
   description: A pipe with a valve that can be used to disable the flow of gas through it.
   placement:
-    mode: SnapgridCenter
+    mode: AlignAtmosPipeLayers
   components:
     # TODO ATMOS: Give unique sprite.
     - type: SubFloorHide
@@ -286,6 +306,11 @@
           map: [ "enum.PipeVisualLayers.Pipe" ]
         - state: pumpManualValve
           map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
+    - type: AtmosPipeLayers
+      alternativePrototypes:
+        Primary: GasValve
+        Secondary: GasValveAlt1
+        Tertiary: GasValveAlt2
     - type: Appearance
     - type: GenericVisualizer
       visuals:
@@ -334,7 +359,7 @@
   name: signal valve
   description: A pipe with a valve that can be controlled with signals.
   placement:
-    mode: SnapgridCenter
+    mode: AlignAtmosPipeLayers
   components:
   - type: StationAiWhitelist
   - type: SubFloorHide
@@ -348,6 +373,11 @@
       map: [ "enum.PipeVisualLayers.Pipe" ]
     - state: pumpSignalValve
       map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
+  - type: AtmosPipeLayers
+    alternativePrototypes:
+      Primary: SignalControlledValve
+      Secondary: SignalControlledValveAlt1
+      Tertiary: SignalControlledValveAlt2
   - type: Appearance
   - type: GenericVisualizer
     visuals:
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/gas_pipe_sensor.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/gas_pipe_sensor.yml
index c70b33639e54..92466f323142 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/gas_pipe_sensor.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/gas_pipe_sensor.yml
@@ -4,7 +4,7 @@
   name: gas pipe sensor
   description: Reports on the status of the gas in the attached pipe network.
   placement:
-    mode: SnapgridCenter
+    mode: AlignAtmosPipeLayers
   components:
   - type: Sprite
     sprite: Structures/Piping/Atmospherics/gas_pipe_sensor.rsi
@@ -23,6 +23,10 @@
       Primary: Structures/Piping/Atmospherics/gas_pipe_sensor.rsi
       Secondary: Structures/Piping/Atmospherics/gas_pipe_sensor_alt1.rsi
       Tertiary: Structures/Piping/Atmospherics/gas_pipe_sensor_alt2.rsi
+    alternativePrototypes:
+      Primary: GasPipeSensor
+      Secondary: GasPipeSensorAlt1
+      Tertiary: GasPipeSensorAlt2
   - type: Appearance
   - type: GenericVisualizer
     visuals:
@@ -62,6 +66,11 @@
   components:
   - type: Label
     currentLabel: gas-pipe-sensor-distribution-loop
+  - type: AtmosPipeLayers
+    alternativePrototypes:
+      Primary: GasPipeSensorDistribution
+      Secondary: GasPipeSensorDistributionAlt1
+      Tertiary: GasPipeSensorDistributionAlt2
 
 - type: entity
   parent: GasPipeSensor
@@ -70,6 +79,11 @@
   components:
   - type: Label
     currentLabel: gas-pipe-sensor-waste-loop
+  - type: AtmosPipeLayers
+    alternativePrototypes:
+      Primary: GasPipeSensorWaste
+      Secondary: GasPipeSensorWasteAlt1
+      Tertiary: GasPipeSensorWasteAlt2
 
 - type: entity
   parent: GasPipeSensor
@@ -78,6 +92,11 @@
   components:
   - type: Label
     currentLabel: gas-pipe-sensor-mixed-air
+  - type: AtmosPipeLayers
+    alternativePrototypes:
+      Primary: GasPipeSensorMixedAir
+      Secondary: GasPipeSensorMixedAirAlt1
+      Tertiary: GasPipeSensorMixedAirAlt2
 
 - type: entity
   parent: GasPipeSensor
@@ -86,6 +105,11 @@
   components:
   - type: Label
     currentLabel: gas-pipe-sensor-teg-hot-loop
+  - type: AtmosPipeLayers
+    alternativePrototypes:
+      Primary: GasPipeSensorTEGHot
+      Secondary: GasPipeSensorTEGHotAlt1
+      Tertiary: GasPipeSensorTEGHotAlt2
 
 - type: entity
   parent: GasPipeSensor
@@ -94,3 +118,8 @@
   components:
   - type: Label
     currentLabel: gas-pipe-sensor-teg-cold-loop
+  - type: AtmosPipeLayers
+    alternativePrototypes:
+      Primary: GasPipeSensorTEGCold
+      Secondary: GasPipeSensorTEGColdAlt1
+      Tertiary: GasPipeSensorTEGColdAlt2
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
index 2be509e8e64a..410df0502142 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
@@ -96,11 +96,9 @@
 - type: entity
   abstract: true
   id: BaseGeneratorWallmount
-  parent: BaseGenerator
+  parent: [ BaseGenerator, BaseWallmount ]
   name: wallmount generator
   description: A high efficiency thermoelectric generator stuffed in a wall cabinet.
-  placement:
-    mode: SnapgridCenter
   components:
   - type: AmbientOnPowered
   - type: AmbientSound
@@ -114,12 +112,6 @@
     color: "#3db83b"
     castShadows: false
     netsync: false
-  - type: Fixtures
-  - type: Transform
-    anchored: true
-  - type: Physics
-    bodyType: Static
-    canCollide: false
   - type: Sprite
     drawdepth: WallMountedItems
     sprite: Structures/Power/Generation/wallmount_generator.rsi
@@ -142,7 +134,6 @@
     supplyRate: 3000
     supplyRampRate: 500
     supplyRampTolerance: 500
-  - type: WallMount
   - type: GuideHelp
     guides:
     - ShuttleCraft
@@ -150,20 +141,12 @@
 # Construction Frames
 
 - type: entity
+  parent: BaseWallmountMetallic
   categories: [ HideSpawnMenu ]
   id: BaseGeneratorWallmountFrame
   name: wallmount generator frame
   description: A construction frame for a wallmount generator.
-  placement:
-    mode: SnapgridCenter
   components:
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Physics
-    canCollide: false
-  - type: Fixtures
-  - type: Transform
-    anchored: true
   - type: Sprite
     drawdepth: WallMountedItems
     sprite: Structures/Power/Generation/wallmount_generator.rsi
@@ -172,7 +155,6 @@
   - type: Construction
     graph: WallmountGenerator
     node: frame
-  - type: WallMount
 
 # Generators in use
 
diff --git a/Resources/Prototypes/Entities/Structures/Power/apc.yml b/Resources/Prototypes/Entities/Structures/Power/apc.yml
index 018cf2a2f1af..75f61e7534fd 100644
--- a/Resources/Prototypes/Entities/Structures/Power/apc.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/apc.yml
@@ -1,4 +1,5 @@
 - type: entity
+  parent: BaseWallmount
   categories: [ HideSpawnMenu ]
   id: BaseAPC
   name: APC
@@ -19,12 +20,8 @@
     color: "#3db83b"
     castShadows: false
     netsync: false
-  - type: Clickable
   - type: AccessReader
     access: [["Engineering"]]
-  - type: InteractionOutline
-  - type: Transform
-    anchored: true
   - type: Sprite
     drawdepth: WallMountedItems
     sprite: Structures/Power/apc.rsi
@@ -156,6 +153,7 @@
 
 # APC under construction
 - type: entity
+  parent: BaseWallmountMetallic
   categories: [ HideSpawnMenu ]
   id: APCFrame
   name: APC frame
@@ -163,21 +161,12 @@
   placement:
     mode: SnapgridCenter
   components:
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Transform
-    anchored: true
   - type: Sprite
-    drawdepth: WallMountedItems
     sprite: Structures/Power/apc.rsi
     state: frame
   - type: Construction
     graph: APC
     node: apcFrame
-  - type: WallMount
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Power/chargers.yml b/Resources/Prototypes/Entities/Structures/Power/chargers.yml
index b05cb4e829b3..08cf72353d04 100644
--- a/Resources/Prototypes/Entities/Structures/Power/chargers.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/chargers.yml
@@ -194,7 +194,7 @@
           - PotatoBattery
 
 - type: entity
-  parent: BaseItemRecharger
+  parent: [ BaseItemRecharger, BaseWallmount ]
   id: WallWeaponCapacitorRecharger
   name: wall recharger
   components:
@@ -206,7 +206,6 @@
     - map: ["enum.PowerChargerVisualLayers.Light"]
       state: "light-off"
       shader: "unshaded"
-  - type: WallMount
   - type: Charger
     chargeRate: 25
   - type: ItemSlots
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml b/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml
index c095951d96b9..3be6fb7d6ff5 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml
@@ -51,6 +51,14 @@
         whitelist:
           tags:
             - PlushieCarp
+      mopbucket_magicarpplush:
+        whitelist:
+          tags:
+          - PlushieCarpMagi
+      mopbucket_holocarpplush:
+        whitelist:
+          tags:
+          - PlushieCarpHolo
     sprite: Objects/Specific/Janitorial/janitorial.rsi
   - type: Transform
     noRot: true
@@ -65,6 +73,8 @@
             - PlushieSharkPink
             - PlushieSharkGrey
             - PlushieCarp
+            - PlushieCarpHolo
+            - PlushieCarpMagi
           components:
             - Rehydratable
         priority: 3 # Higher than drinking priority
@@ -177,6 +187,11 @@
           whitelist:
             tags:
               - Plunger
+        goldenplunger_slot:
+          name: janitorial-trolley-slot-component-slot-name-goldenplunger
+          whitelist:
+            tags:
+            - GoldenPlunger
           priority: 8
         wetfloorsign_slot4:
           name: janitorial-trolley-slot-component-slot-name-sign
@@ -286,6 +301,10 @@
           whitelist:
             tags:
               - Plunger
+        cart_goldenplunger:
+          whitelist:
+            tags:
+            - GoldenPlunger
         cart_mop:
           whitelist:
             tags:
@@ -349,6 +368,7 @@
         trashbag_slot: !type:ContainerSlot {}
         bucket_slot: !type:ContainerSlot {}
         plunger_slot: !type:ContainerSlot {}
+        goldenplunger_slot: !type:ContainerSlot {}
         wetfloorsign_slot4: !type:ContainerSlot {}
         wetfloorsign_slot3: !type:ContainerSlot {}
         wetfloorsign_slot2: !type:ContainerSlot {}
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 a30ae00e961e..066284d2ebc6 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
@@ -1,10 +1,11 @@
 - type: entity
   id: LockerBase
   parent: ClosetBase
-  abstract: true
   components:
   - type: AccessReader
   - type: Lock
+    popupMessage: false # Starlight-edit
+    powerNeeded: true # Starlight-edit
   - type: LockVisuals
   - type: Sprite
     sprite: Structures/Storage/closet.rsi
@@ -25,6 +26,21 @@
       sprite: Structures/Storage/closet_labels.rsi
       offset: "-0.065,0"
       map: ["enum.PaperLabelVisuals.Layer"]
+    # Starlight-start: Maintenance panel
+    - state: panel_open
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+      visible: false
+    - state: electrified_ai
+      sprite: Interface/Misc/ai_hud.rsi
+      shader: unshaded
+      visible: false
+      map: ["enum.ElectrifiedLayers.HUD"]
+    - state: electrified
+      sprite: Effects/electricity.rsi
+      shader: unshaded
+      visible: false
+      map: ["enum.ElectrifiedLayers.Sparks"]
+    # Starlight-end
   - type: Destructible
     thresholds:
     - trigger:
@@ -56,11 +72,38 @@
     - entity_storage
   - type: Paintable
     group: Locker
+  # Starlight-start: Wires panel
+  - type: Tag
+    tags: 
+      - Locker
+  - type: Electrified
+    enabled: false
+    requirePower: false
+  - type: PoweredLocker
+  - type: StationAiWhitelist
+  - type: WiresPanel
+  - type: WiresPanelSecurity
+    wiresAccessible: false
+  - type: WiresVisuals
+  - type: Wires
+    boardName: wires-board-name-locker
+    layoutId: Locker
+  - type: UserInterface
+    interfaces:
+      enum.WiresUiKey.Key:
+        type: WiresBoundUserInterface
+  - type: GenericVisualizer
+    visuals:
+      enum.ElectrifiedVisuals.ShowSparks:
+        enum.ElectrifiedLayers.Sparks:
+          True: { visible: True }
+          False: { visible: False }
+  # Starlight-end
 
 - type: entity
   id: LockerBaseSecure
   parent: LockerBase
-  abstract: true
+  name: secure closet # Starlight-edit
   components:
   - type: Damageable
     damageContainer: StructuralInorganic
@@ -73,3 +116,13 @@
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
+# Starlight-start: Base Locker
+  - type: Tag
+    tags: 
+      - SecuredLocker
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: secure
+    stateDoorOpen: secure_open
+    stateDoorClosed: secure_door
+# Starlight-end
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
index 85cb8ab6af89..8a3f842a6143 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -25,12 +25,13 @@
   id: LockerSteel
   parent: LockerBaseSecure
   name: secure closet
-  components:
-  - type: Appearance
-  - type: EntityStorageVisuals
-    stateBaseClosed: secure
-    stateDoorOpen: secure_open
-    stateDoorClosed: secure_door
+  suffix: Mapping # Starlight-edit
+#  components: Starlight-edit: Moved to LockerBaseSecure
+#  - type: Appearance
+#  - type: EntityStorageVisuals
+#    stateBaseClosed: secure
+#    stateDoorOpen: secure_open
+#    stateDoorClosed: secure_door
 
 # Cargo
 - type: entity
@@ -73,6 +74,8 @@
     stateDoorClosed: cap_door
   - type: AccessReader
     access: [["Captain"]]
+  - type: WiresPanelSecurity # Starlight-edit: Maintenance panel
+    securityLevel: medSecurity # Starlight-edit: Maintenance panel
 
 - type: entity
   id: LockerHeadOfPersonnel
@@ -86,6 +89,8 @@
     stateDoorClosed: hop_door
   - type: AccessReader
     access: [["HeadOfPersonnel"]]
+  - type: WiresPanelSecurity # Starlight-edit: Maintenance panel
+    securityLevel: medSecurity # Starlight-edit: Maintenance panel
 
 # CE
 - type: entity
@@ -100,6 +105,8 @@
     stateDoorClosed: ce_door
   - type: AccessReader
     access: [ [ "ChiefEngineer" ] ]
+  - type: WiresPanelSecurity # Starlight-edit: Maintenance panel
+    securityLevel: medSecurity # Starlight-edit: Maintenance panel
 
 # Electrical supplies
 - type: entity
@@ -289,6 +296,8 @@
     stateDoorClosed: cmo_door
   - type: AccessReader
     access: [ [ "ChiefMedicalOfficer" ] ]
+  - type: WiresPanelSecurity # Starlight-edit: Maintenance panel
+    securityLevel: medSecurity # Starlight-edit: Maintenance panel
 
 # Science
 - type: entity
@@ -303,6 +312,8 @@
     stateDoorClosed: rd_door
   - type: AccessReader
     access: [ [ "ResearchDirector" ] ]
+  - type: WiresPanelSecurity # Starlight-edit: Maintenance panel
+    securityLevel: medSecurity # Starlight-edit: Maintenance panel
 
 - type: entity
   id: LockerScientist
@@ -330,6 +341,8 @@
     stateDoorClosed: hos_door
   - type: AccessReader
     access: [["HeadOfSecurity"]]
+  - type: WiresPanelSecurity # Starlight-edit: Maintenance panel
+    securityLevel: medSecurity # Starlight-edit: Maintenance panel
 
 # Warden
 - type: entity
@@ -344,6 +357,8 @@
     stateDoorClosed: warden_door
   - type: AccessReader
     access: [["Armory"]]
+  - type: WiresPanelSecurity # Starlight-edit: Maintenance panel
+    securityLevel: medSecurity # Starlight-edit: Maintenance panel
 
 # Brigmedic
 - 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 c38a20a698c2..ba1ecfd7498b 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
@@ -129,23 +129,16 @@
 
 #Wall Closet
 - type: entity
+  parent: BaseWallmountMetallic
   id: BaseWallCloset
-  placement:
-    mode: SnapgridCenter
   abstract: true
   name: wall closet
   description: A standard-issue Nanotrasen storage unit, now on walls.
   components:
-  - type: InteractionOutline
-  - type: Clickable
   - type: ResistLocker
   - type: Weldable
-  - type: WallMount
-    arc: 175
   - type: StaticPrice
     price: 75
-  - type: Transform
-    noRot: false
   - type: Sprite
     drawdepth: WallMountedItems
     noRot: false
@@ -170,9 +163,6 @@
     containers:
       entity_storage: !type:Container
         ents: []
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: Metallic
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/bell.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/bell.yml
similarity index 66%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/bell.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Misc/bell.yml
index 24e5cfda2af7..c8d5840889e1 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/bell.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/bell.yml
@@ -1,15 +1,9 @@
 - type: entity
+  parent: BaseWallmountMetallic
   id: BoxingBell
   name: boxing bell
   description: Ding ding!
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
   components:
-  - type: Transform
-    anchored: true
-  - type: WallMount
   - type: Sprite
     sprite: Structures/Wallmounts/bell.rsi
     layers:
@@ -18,22 +12,12 @@
     successChance: 1
     interactSuccessSound:
       path: /Audio/Weapons/boxingbell.ogg
-  - type: Clickable
   - type: MeleeSound
     soundGroups:
       Brute:
         path:
           "/Audio/Weapons/boxingbell.ogg"
   - type: Appearance
-  - type: Rotatable
-  - type: CollisionWake
-    enabled: false
-  - type: Physics
-    canCollide: false
-    bodyType: Static
-  - type: Fixtures
-  - type: Damageable
-    damageContainer: Inorganic
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/mirror.yml
similarity index 71%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Misc/mirror.yml
index 619e74e56423..c32a2731cdb9 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/mirror.yml
@@ -1,18 +1,14 @@
 - type: entity
+  parent: BaseWallmountGlass
   id: Mirror
   name: mirror
   description: 'Mirror mirror on the wall , who''s the most robust of them all?'
   placement:
     mode: SnapgridCenter
   components:
-  - type: WallMount
   - type: Sprite
     sprite: Structures/Wallmounts/mirror.rsi
     state: mirror
-  - type: InteractionOutline
-  - type: Clickable
-  - type: Transform
-    anchored: true
   - type: MagicMirror #instant and silent
     changeHairSound: null
     addSlotTime: 0
@@ -26,6 +22,17 @@
     interfaces:
       enum.MagicMirrorUiKey.Key:
         type: MagicMirrorBoundUserInterface
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalGlassBreak
 
 - type: entity
   parent: Mirror
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/noticeboard.yml
similarity index 90%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Misc/noticeboard.yml
index 76e17b3040cc..7f38f6c5abdd 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Misc/noticeboard.yml
@@ -1,11 +1,9 @@
 - type: entity
+  parent: BaseWallmount
   id: NoticeBoard
   name: notice board
   description: Is there a job for a witcher?
-  placement:
-    mode: SnapgridCenter
   components:
-  - type: WallMount
   - type: Sprite
     drawdepth: WallMountedItems
     sprite: Structures/Wallmounts/noticeboard.rsi
@@ -17,10 +15,6 @@
     maxFillLevels: 6
     fillBaseName: notice
   - type: Appearance
-  - type: InteractionOutline
-  - type: Clickable
-  - type: Transform
-    anchored: true
   - type: Damageable
     damageModifierSet: Wood
     damageContainer: StructuralInorganic
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
index 06e85c779dcb..1969becc7bc3 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
@@ -1,23 +1,15 @@
 - type: entity
   id: BaseBarSign
-  parent: BaseStructure
+  parent: [ BaseWallmountGlass, BaseWallmountMetallic ]
   name: bar sign
   abstract: true
   components:
-  - type: MeleeSound
-    soundGroups:
-      Brute:
-        collection: GlassSmash
   - type: WallMount
     arc: 360
   - type: Sprite
-    drawdepth: WallMountedItems
     sprite: Structures/Wallmounts/barsign.rsi
     state: empty
-  - type: ApcPowerReceiver
-  - type: ExtensionCableReceiver
   - type: BarSign
-  - type: InteractionOutline
   - type: AccessReader
     access: [["Bar"]]
   - type: ActivatableUIRequiresPower
@@ -31,8 +23,6 @@
       enum.WiresUiKey.Key:
         type: WiresBoundUserInterface
   - type: Appearance
-  - type: Damageable
-    damageContainer: StructuralInorganic
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml
index 35281d03835d..041a93e9358f 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml
@@ -1,26 +1,12 @@
 - type: entity
+  parent: BaseWallmountMetallic
   id: BaseSign
   name: base sign
   abstract: true
-  placement:
-    mode: SnapgridCenter
   components:
   - type: WallMount
     arc: 360
-  - type: Clickable
-  - type: InteractionOutline
   - type: Rotatable
-  - type: Physics
-    bodyType: Static
-    canCollide: false
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb {}
-  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
   - type: Destructible
     thresholds:
     - trigger:
@@ -30,7 +16,6 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: Sprite
-    drawdepth: WallMountedItems
     sprite: Structures/Wallmounts/signs.rsi
     snapCardinals: true
   - type: StaticPrice
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml
index 992f7a71e6f4..21076f9f07df 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml
@@ -3,10 +3,7 @@
   id: BaseFlag
   abstract: true
   components:
-  - type: WallMount
-    arc: 360
   - type: Sprite
-    drawdepth: WallMountedItems
     sprite: Structures/Wallmounts/flags.rsi
 
 - type: entity
@@ -35,7 +32,7 @@
   components:
   - type: Sprite
     state: syndie_flag
-    
+
 - type: entity
   parent: BaseFlag
   id: LGBTQFlag
@@ -44,7 +41,7 @@
   components:
   - type: Sprite
     state: lgbtq_flag
-    
+
 - type: entity
   parent: BaseFlag
   id: PirateFlag
@@ -52,4 +49,4 @@
   description: Raise the jolly roger, scallywags!
   components:
   - type: Sprite
-    state: pirate_flag
\ No newline at end of file
+    state: pirate_flag
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml
index 4f26432c60af..cc43241d838d 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml
@@ -3,10 +3,7 @@
   id: PaintingBase
   abstract: true
   components:
-  - type: WallMount
-    arc: 360
   - type: Sprite
-    drawdepth: WallMountedItems
     sprite: Structures/Wallmounts/paintings.rsi
 
 - type: entity
@@ -187,4 +184,4 @@
   description: This painting is a sad clown! It sparks joy.
   components:
   - type: Sprite
-    state: painting19  
+    state: painting19
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
index 907725bc98ad..a4d672a24cd0 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
@@ -3,12 +3,8 @@
   id: PosterBase
   abstract: true
   components:
-  - type: WallMount
-    arc: 360
   - type: Sprite
-    drawdepth: WallMountedItems
     sprite: Structures/Wallmounts/posters.rsi
-    snapCardinals: true
   - type: Destructible
     thresholds:
     - trigger: # Excess damage, don't spawn entities
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/base_wallmount_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/base_wallmount_cabinet.yml
new file mode 100644
index 000000000000..69433c3a7de8
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/base_wallmount_cabinet.yml
@@ -0,0 +1,9 @@
+- type: entity
+  parent: [BaseWallmountMetallic, BaseItemCabinet]
+  id: BaseWallmountCabinet
+  abstract: true
+
+- type: entity
+  parent: [BaseWallmountGlass, BaseItemCabinetGlass]
+  id: BaseWallmountCabinetGlass
+  abstract: true
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/defib_cabinet.yml
similarity index 86%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/defib_cabinet.yml
index 3e5c2486ea18..0ca51b5c78e9 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/defib_cabinet.yml
@@ -1,18 +1,12 @@
 # TODO: same as other wallmount cabinets they should use a base structure prototype
 - type: entity
-  parent: BaseItemCabinet
+  parent: BaseWallmountCabinet
   id: DefibrillatorCabinet
   name: defibrillator cabinet
   description: A small wall mounted cabinet designed to hold a defibrillator.
   placement:
     mode: SnapgridCenter
   components:
-  - type: WallMount
-    arc: 175
-  - type: Transform
-    anchored: true
-  - type: Clickable
-  - type: InteractionOutline
   - type: Sprite
     sprite: Structures/Wallmounts/defib_cabinet.rsi
     noRot: false
@@ -30,9 +24,6 @@
         whitelist:
           components:
           - Defibrillator
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: Metallic
   - type: Destructible
     thresholds:
     - trigger: !type:DamageTrigger
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/extinguisher_cabinet.yml
similarity index 79%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/extinguisher_cabinet.yml
index 30db2d8e4d5c..1e051ed75edd 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/extinguisher_cabinet.yml
@@ -1,19 +1,9 @@
-# TODO: this could probably use some kind of base structure prototype
-# every wallmount cabinet copypastes placement and like 8 components
 - type: entity
-  parent: BaseItemCabinet
+  parent: BaseWallmountCabinet
   id: ExtinguisherCabinet
   name: extinguisher cabinet
   description: A small wall mounted cabinet designed to hold a fire extinguisher.
-  placement:
-    mode: SnapgridCenter
   components:
-    - type: WallMount
-      arc: 360
-    - type: Transform
-      anchored: true
-    - type: Clickable
-    - type: InteractionOutline
     - type: Sprite
       sprite: Structures/Wallmounts/extinguisher_cabinet.rsi
       snapCardinals: true
@@ -31,9 +21,6 @@
           whitelist:
             components:
             - SpraySafety
-    - type: Damageable
-      damageContainer: StructuralInorganic
-      damageModifierSet: Metallic
     - type: Destructible
       thresholds:
         - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/fireaxe_cabinet.yml
similarity index 81%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/fireaxe_cabinet.yml
index c2d3c6767f85..0c97f046e718 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/fireaxe_cabinet.yml
@@ -1,15 +1,11 @@
-# TODO: same as fire extinguisher make it use a base structure theres lots of copy paste
 - type: entity
-  parent: BaseItemCabinetGlass
+  parent: BaseWallmountCabinetGlass
   id: FireAxeCabinet
   name: fire axe cabinet
   description: There is a small label that reads "For Emergency use only" along with details for safe use of the axe. As if.
   placement:
     mode: SnapgridCenter
   components:
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: Glass
   - type: Destructible
     thresholds:
     - trigger:
@@ -28,13 +24,6 @@
       - !type:PlaySoundBehavior
         sound:
           collection: MetalGlassBreak
-  - type: MeleeSound
-    soundGroups:
-      Brute:
-        collection: GlassSmash
-  - type: WallMount
-  - type: Clickable
-  - type: InteractionOutline
   - type: Sprite
     sprite: Structures/Wallmounts/fireaxe_cabinet.rsi
     layers:
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/shotgun_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/shotgun_cabinet.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/shotgun_cabinet.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Storage/Cabinets/shotgun_cabinet.yml
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/shelfs.yml
similarity index 98%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Storage/shelfs.yml
index 892a5ebb92a2..aeceba8f2e8b 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/shelfs.yml
@@ -1,23 +1,15 @@
 # Parents
 - type: entity
-  abstract: true
+  parent: BaseWallmount
   id: ShelfBase
+  abstract: true
   name: shelf
   description: A strange place to place, well, anything really. You feel like you shouldn't be seeing this.
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
   components:
-  - type: Clickable
-  - type: Tag
-    tags:
-    - Structure
   - type: Sprite
     drawdepth: WallMountedItems
     sprite: Structures/Storage/Shelfs/wood.rsi
     state: base
-  - type: Transform
   - type: Damageable
     damageModifierSet: Wood
     damageContainer: StructuralInorganic
@@ -32,7 +24,6 @@
           collection: WoodDestroyHeavy
       - !type:DoActsBehavior
         acts: ["Destruction"]
-  - type: WallMount
   - type: Storage
     grid:
     - 0,0,3,1
@@ -42,7 +33,6 @@
     interfaces:
      enum.StorageUiKey.Key:
       type: StorageBoundUserInterface
-  - type: InteractionOutline
   - type: ContainerContainer
     containers:
       storagebase: !type:Container
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/wall_dispensers.yml
similarity index 82%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Storage/wall_dispensers.yml
index 945bfb1a6c2b..962963c341ff 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Storage/wall_dispensers.yml
@@ -1,25 +1,12 @@
 - type: entity
-  id: CleanerDispenser
-  name: space cleaner dispenser
-  description: Wallmount reagent dispenser.
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
+  parent: BaseWallmountMetallic
+  id: BaseDispenser
+  abstract: true
   components:
-  - type: WallMount
-    arc: 175
   - type: Sprite
     sprite: Structures/Storage/tanks.rsi
     state: cleanerdispenser
   - type: Appearance
-  - type: InteractionOutline
-  - type: Clickable
-  - type: Transform
-    anchored: true
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: Metallic
   - type: Destructible
     thresholds:
     - trigger:
@@ -53,12 +40,6 @@
           collection: MetalBreak
       - !type:DoActsBehavior
         acts: ["Destruction"]
-  - type: SolutionContainerManager
-    solutions:
-      tank:
-        reagents:
-        - ReagentId: SpaceCleaner
-          Quantity: 5000
   - type: DrainableSolution
     solution: tank
   - type: ReagentTank
@@ -66,7 +47,7 @@
     solution: tank
 
 - type: entity
-  parent: CleanerDispenser
+  parent: BaseDispenser
   id: FuelDispenser
   name: fuel dispenser
   components:
@@ -86,3 +67,16 @@
     weldingDamage:
       types:
         Heat: 20
+
+- type: entity
+  parent: BaseDispenser
+  id: CleanerDispenser
+  name: space cleaner dispenser
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+        - ReagentId: SpaceCleaner
+          Quantity: 5000
+  - type: ReagentTank
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Switches/switch.yml
similarity index 79%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Switches/switch.yml
index c19c73eb89de..bbc673344123 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Switches/switch.yml
@@ -1,19 +1,12 @@
 - type: entity
+  parent: BaseWallmountMetallic
   id: SignalSwitch
   name: signal switch
   description: It's a switch for toggling power to things.
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
   components:
-  - type: StationAiWhitelist
   - type: WallMount
     arc: 360
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Physics
-    canCollide: false
+  - type: StationAiWhitelist
   - type: Sprite
     drawdepth: SmallObjects
     sprite: Structures/Wallmounts/switch.rsi
@@ -25,7 +18,6 @@
   - type: Construction
     graph: SignalSwitchGraph
     node: SignalSwitchNode
-  - type: Fixtures
   - type: DeviceNetwork
     deviceNetId: Wireless
   - type: WirelessNetworkConnection
@@ -37,26 +29,35 @@
     - Status
     lastSignals:
       Status: false
-  - type: Tag
-    tags:
-    - Structure
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 80
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+      - trigger:
+          !type:DamageTrigger
+          damage: 40
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+          - !type:PlaySoundBehavior
+            sound:
+              collection: MetalBreak
+              params:
+                volume: -8
 
 - type: entity
+  parent: BaseWallmountMetallic
   id: SignalButton
   name: signal button
   description: It's a button for activating something.
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
   components:
-  - type: StationAiWhitelist
   - type: WallMount
     arc: 360
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Physics
-    canCollide: false
+  - type: StationAiWhitelist
   - type: Sprite
     drawdepth: SmallObjects
     sprite: Structures/Wallmounts/switch.rsi
@@ -71,7 +72,6 @@
   - type: Construction
     graph: SignalButtonGraph
     node: SignalButtonNode
-  - type: Fixtures
   - type: DeviceNetwork
     deviceNetId: Wireless
   - type: WirelessNetworkConnection
@@ -79,9 +79,6 @@
   - type: DeviceLinkSource
     ports:
       - Pressed
-  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
   - type: Destructible
     thresholds:
       - trigger:
@@ -101,100 +98,29 @@
               collection: MetalBreak
               params:
                 volume: -8
-  - type: Tag
-    tags:
-    - Structure
 
 - type: entity
+  parent: BaseWallmountMetallic
   id: ApcNetSwitch
   name: apc net switch
   description: It's a switch for toggling lights that are connected to the same apc.
-  placement:
-    mode: SnapgridCenter
-    snap:
-      - Wallmount
-  components:
-    - type: WallMount
-      arc: 360
-    - type: Clickable
-    - type: InteractionOutline
-    - type: Physics
-      canCollide: false
-    - type: Transform
-      anchored: true
-    - type: Sprite
-      drawdepth: SmallObjects
-      sprite: Structures/Wallmounts/switch.rsi
-      state: on
-    - type: Rotatable
-    - type: ExtensionCableReceiver
-    - type: DeviceNetwork
-      deviceNetId: Apc
-      transmitFrequencyId: SmartLight # assuming people want to use it for light switches.
-    - type: ApcNetworkConnection
-    - type: ApcNetSwitch
-    - type: Construction
-      graph: LightSwitchGraph
-      node: LightSwitchNode
-    - type: Fixtures
-    - type: Tag
-      tags:
-      - Structure
-
-- type: entity
-  id: TwoWayLever
-  name: two way lever
-  description: A two way lever.
-  placement:
-    mode: SnapgridCenter
   components:
-    - type: StationAiWhitelist
-    - type: Clickable
-    - type: InteractionOutline
-    - type: Sprite
-      drawdepth: HighFloorObjects
-      sprite: Structures/conveyor.rsi
-      noRot: true
-      layers:
-        - state: switch-off
-          map: ["enabled", "enum.TwoWayLeverState.Middle"]
-    - type: TwoWayLever
-    - type: UseDelay
-      delay: 0.2 # prevent light-toggling auto-clickers.
-    - type: Appearance
-    - type: GenericVisualizer
-      visuals:
-        enum.TwoWayLeverVisuals.State:
-          enabled:
-            Right: { state: switch-fwd }
-            Middle: { state: switch-off }
-            Left: { state: switch-rev }
-    - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
-    - type: Destructible
-      thresholds:
-      - trigger:
-          !type:DamageTrigger
-          damage: 100
-        behaviors:
-        - !type:DoActsBehavior
-          acts: [ "Destruction" ]
-    - type: Construction
-      graph: LeverGraph
-      node: LeverNode
-    - type: DeviceNetwork
-      deviceNetId: Wireless
-    - type: WirelessNetworkConnection
-      range: 200
-    - type: DeviceLinkSource
-      ports:
-        - Left
-        - Right
-        - Middle
-    - type: Tag
-      tags:
-      - Structure
+  - type: WallMount
+    arc: 360
+  - type: Sprite
+    drawdepth: SmallObjects
+    sprite: Structures/Wallmounts/switch.rsi
+    state: on
+  - type: Rotatable
+  - type: ExtensionCableReceiver
+  - type: DeviceNetwork
+    deviceNetId: Apc
+    transmitFrequencyId: SmartLight # assuming people want to use it for light switches.
+  - type: ApcNetworkConnection
+  - type: ApcNetSwitch
+  - type: Construction
+    graph: LightSwitchGraph
+    node: LightSwitchNode
 
 #directional
 
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/switch_autolink.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Switches/switch_autolink.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/switch_autolink.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Switches/switch_autolink.yml
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/Monitors/telescreens.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/Monitors/telescreens.yml
new file mode 100644
index 000000000000..fd2ba1d072a9
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/Monitors/telescreens.yml
@@ -0,0 +1,72 @@
+- type: entity
+  parent: BaseWallmountMachine
+  id: WallmountTelescreen
+  suffix: camera monitor
+  name: telescreen
+  description: Finally, some decent reception around here...
+  components:
+  - type: Sprite
+    sprite: Structures/Machines/computers.rsi
+    layers:
+      - map: ["computerLayerBody"]
+        state: telescreen_frame
+      - map: ["computerLayerScreen"]
+        state: telescreen
+  - type: Construction
+    graph: WallmountTelescreen
+    node: Telescreen
+  - type: PointLight
+    radius: 1.5
+    energy: 1.6
+    color: "#b89f25"
+  - type: DeviceNetwork
+    deviceNetId: Wired
+    receiveFrequencyId: SurveillanceCamera
+    transmitFrequencyId: SurveillanceCamera
+  - type: WiredNetworkConnection
+  - type: DeviceNetworkRequiresPower
+  - type: SurveillanceCameraMonitor
+  - type: ActivatableUI
+    key: enum.SurveillanceCameraMonitorUiKey.Key
+  - type: ActivatableUIRequiresPower
+  - type: ActivatableUIRequiresVision
+  - type: UserInterface
+    interfaces:
+        enum.SurveillanceCameraMonitorUiKey.Key:
+          type: SurveillanceCameraMonitorBoundUserInterface
+
+- type: entity
+  parent: BaseWallmountMetallic
+  id: WallmountTelescreenFrame
+  name: telescreen frame
+  description: Finally, some decent reception around here...
+  components:
+  - type: Construction
+    graph: WallmountTelescreen
+    node: TelescreenFrame
+  - type: Sprite
+    sprite: Structures/Machines/computers.rsi
+    layers:
+      - map: ["computerLayerBody"]
+        state: telescreen_frame
+      - map: ["computerLayerScreen"]
+        state: telescreen
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors: #excess damage, don't spawn entities.
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/Monitors/televisions.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/Monitors/televisions.yml
new file mode 100644
index 000000000000..b600ece98540
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/Monitors/televisions.yml
@@ -0,0 +1,96 @@
+- type: entity
+  parent: BaseWallmountMachine
+  id: WallmountTelevision
+  suffix: entertainment
+  name: television
+  description: Finally, some decent reception around here...
+  components:
+  - type: Construction
+    graph: WallmountTelevision
+    node: Television
+  - type: Sprite
+    sprite: Structures/Wallmounts/flatscreentv.rsi
+    layers:
+      - map: ["computerLayerBody"]
+        state: television_wall
+      - map: ["computerLayerScreen"]
+        state: television_wallscreen
+  - type: DeviceNetwork
+    deviceNetId: Wireless
+    receiveFrequencyId: SurveillanceCamera
+    transmitFrequencyId: SurveillanceCamera
+  - type: WirelessNetworkConnection
+    range: 200
+  - type: DeviceNetworkRequiresPower
+  - type: Speech
+  - type: SurveillanceCameraSpeaker
+  - type: SurveillanceCameraMonitor
+  - type: ActivatableUI
+    key: enum.SurveillanceCameraMonitorUiKey.Key
+  - type: ActivatableUIRequiresPower
+  - type: ActivatableUIRequiresVision
+  - type: UserInterface
+    interfaces:
+        enum.SurveillanceCameraMonitorUiKey.Key:
+          type: SurveillanceCameraMonitorBoundUserInterface
+  - type: PointLight
+    radius: 1.5
+    energy: 1.6
+    color: "#b89f25"
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 200
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+      - trigger:
+          !type:DamageTrigger
+          damage: 100
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+          - !type:PlaySoundBehavior
+            sound:
+              collection: MetalGlassBreak
+              params:
+                volume: -4
+  - type: StationAiWhitelist
+
+- type: entity
+  parent: BaseWallmountGlass
+  id: WallmountTelevisionFrame
+  name: television frame
+  description: Finally, some decent reception around here...
+  components:
+  - type: Construction
+    graph: WallmountTelevision
+    node: TelevisionFrame
+  - type: Sprite
+    drawdepth: WallMountedItems
+    sprite: Structures/Wallmounts/flatscreentv.rsi
+    layers:
+      - map: ["computerLayerBody"]
+        state: television_wall
+      - map: ["computerLayerScreen"]
+        state: television_wallscreen
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 20
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+      - trigger:
+          !type:DamageTrigger
+          damage: 15
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+          - !type:PlaySoundBehavior
+            sound:
+              collection: MetalGlassBreak
+              params:
+                volume: -4
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/air_alarm.yml
similarity index 87%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/air_alarm.yml
index d8c50211cc79..609f6e21ea93 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/air_alarm.yml
@@ -1,19 +1,13 @@
 - type: entity
+  parent: BaseWallmountMachine
   id: AirAlarm
   name: air alarm
   description: An air alarm. Alarms... air?
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
   components:
   - type: StationAiWhitelist
-  - type: WallMount
-  - type: ApcPowerReceiver
   - type: Electrified
     enabled: false
     usesApcPower: true
-  - type: ExtensionCableReceiver
   - type: DeviceNetwork
     deviceNetId: AtmosDevices
     receiveFrequencyId: AtmosMonitor
@@ -86,8 +80,6 @@
       map: ["airAlarmState"] # TODO: fire alarm enum
     - state: alarmx
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
-  - type: Transform
-    anchored: true
   - type: Construction
     graph: AirAlarm
     node: air_alarm
@@ -119,17 +111,11 @@
     - DeviceMonitoringAndControl
 
 - type: entity
+  parent: BaseWallmountMetallic
   id: AirAlarmAssembly
   name: air alarm assembly
   description: An air alarm. Doesn't look like it'll be alarming air any time soon.
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
   components:
-  - type: WallMount
-  - type: Clickable
-  - type: InteractionOutline
   - type: Sprite
     sprite: Structures/Wallmounts/air_monitors.rsi
     layers:
@@ -147,6 +133,25 @@
     node: assembly
   - type: Transform
     anchored: true
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 20
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+      - trigger:
+          !type:DamageTrigger
+          damage: 15
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+          - !type:PlaySoundBehavior
+            sound:
+              collection: MetalGlassBreak
+              params:
+                volume: -4
 
 - type: entity
   id: AirAlarmXeno
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/fire_alarm.yml
similarity index 85%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/fire_alarm.yml
index 93e398a974d3..1f2a20dc30fa 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/fire_alarm.yml
@@ -1,10 +1,11 @@
 - type: entity
+  parent: BaseWallmountMachine
   id: FireAlarm
   name: fire alarm
   description: A fire alarm. Spicy!
   components:
-  - type: WallMount
-  - type: ApcPowerReceiver
+  - type: LightningTarget
+    priority: 0
   - type: Electrified
     enabled: false
     usesApcPower: true
@@ -39,8 +40,6 @@
   - type: Tag
     tags:
       - FireAlarm
-  - type: Clickable
-  - type: InteractionOutline
   - type: FireAlarm
   - type: AtmosAlertsDevice
     group: FireAlarm
@@ -108,19 +107,13 @@
               params:
                 volume: -4
   - type: StationAiWhitelist
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
 
 - type: entity
+  parent: BaseWallmountMetallic
   id: FireAlarmAssembly
   name: fire alarm assembly
   description: A fire alarm assembly. Very mild.
   components:
-  - type: WallMount
-  - type: Clickable
-  - type: InteractionOutline
   - type: Sprite
     sprite: Structures/Wallmounts/air_monitors.rsi
     layers:
@@ -136,12 +129,25 @@
   - type: Construction
     graph: FireAlarm
     node: assembly
-  - type: Transform
-    anchored: true
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 20
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+      - trigger:
+          !type:DamageTrigger
+          damage: 15
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+          - !type:PlaySoundBehavior
+            sound:
+              collection: MetalGlassBreak
+              params:
+                volume: -4
 
 - type: entity
   id: FireAlarmXeno
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/intercom.yml
similarity index 93%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/intercom.yml
index 7a343ab6ad75..6d04ada47c6f 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/intercom.yml
@@ -1,12 +1,11 @@
 - type: entity
+  parent: BaseWallmountMachine
   id: BaseIntercom
   name: intercom
   description: An intercom. For when the station just needs to know something.
   abstract: true
   components:
   - type: StationAiWhitelist
-  - type: WallMount
-  - type: ApcPowerReceiver
   - type: Electrified
     enabled: false
     usesApcPower: true
@@ -27,9 +26,6 @@
   - type: VoiceOverride # This is for the wire that makes an electricity zapping noise.
     speechVerbOverride: Electricity
     enabled: false
-  - type: ExtensionCableReceiver
-  - type: Clickable
-  - type: InteractionOutline
   - type: Appearance
   - type: WiresVisuals
   - type: WiresPanelSecurity
@@ -60,9 +56,6 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
       visible: false
-  - type: Transform
-    noRot: false
-    anchored: true
   - type: WiresPanel
   - type: Wires
     boardName: wires-board-name-intercom
@@ -83,9 +76,6 @@
     containers:
     - board
     - key_slots
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
       - trigger:
@@ -123,19 +113,12 @@
         enum.RadioDeviceVisualLayers.Speaker:
           True: { visible: true }
           False: { visible: false }
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
 
 - type: entity
   id: IntercomAssembly
   name: intercom assembly
   description: An intercom. It doesn't seem very helpful right now.
   components:
-  - type: WallMount
-  - type: Clickable
-  - type: InteractionOutline
   - type: Sprite
     drawdepth: SmallObjects
     sprite: Structures/Wallmounts/intercom.rsi
@@ -154,12 +137,6 @@
   - type: Construction
     graph: Intercom
     node: assembly
-  - type: Transform
-    anchored: true
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
 
 # this weird inheritance BS exists for construction shitcode
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/screen.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/screen.yml
similarity index 61%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/screen.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/screen.yml
index 7fd3df70787c..95ca1e733a47 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/screen.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/screen.yml
@@ -1,19 +1,10 @@
 - type: entity
+  parent: BaseWallmountMachine
   id: Screen
   name: screen
   description: Displays text or time.
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
   components:
-  - type: Transform
-    anchored: true
-  - type: WallMount
-    arc: 360
-  - type: InteractionOutline
-  - type: Clickable
-  - type: Appearance
+  - type: Appearance # Starlight-edit
   - type: Rotatable
   - type: ScreenVisuals
     textOffset: 0,3
@@ -24,18 +15,12 @@
     sprite: Structures/Wallmounts/screen.rsi
     noRot: true
     layers:
-    - state: screen
-    - state: green
-      shader: unshaded
-      map: ["enum.TextScreenVisuals.AlertLevel"]
-  - type: Construction
-    graph: Timer
-    node: screen
+      - state: screen
+      - state: green
+        shader: unshaded
+        map: [ "enum.TextScreenVisuals.AlertLevel" ]
   - type: ApcPowerReceiver
     powerLoad: 100
-  - type: Electrified
-    enabled: false
-    usesApcPower: true
   - type: ExtensionCableReceiver
   - type: Screen
   - type: DeviceNetwork
@@ -46,6 +31,7 @@
   id: ArrivalsShuttleTimer
   parent: Screen
   name: arrivals screen
+  description: Displays time of arrivals shuttle ETA.
   components:
   - type: DeviceNetwork
     deviceNetId: Private
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/station_map.yml
similarity index 86%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/station_map.yml
index becdfc7f659e..5e3b29e36f17 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/station_map.yml
@@ -1,22 +1,15 @@
 - type: entity
+  parent: BaseWallmountMetallic
   id: StationMapBroken
   name: station map
   description: A virtual map of the surrounding station.
   suffix: Wall broken
-  placement:
-    mode: SnapgridCenter
   components:
-    - type: InteractionOutline
-    - type: Clickable
-    - type: Transform
-      anchored: true
     - type: Sprite
       sprite: Structures/Machines/station_map.rsi
       drawdepth: WallMountedItems
       layers:
         - state: station_map_broken
-    - type: Damageable
-      damageContainer: StructuralInorganic
     - type: Destructible
       thresholds:
         - trigger:
@@ -30,17 +23,16 @@
               acts: [ "Destruction" ]
 
 - type: entity
+  parent: BaseWallmountMachine
   id: StationMap
   name: station map
-  parent: BaseComputer
   description: A virtual map of the surrounding station.
   suffix: Wall
-  placement:
-    mode: SnapgridCenter
   components:
+    - type: WallMount
+      arc: 360
+    - type: Appearance
     - type: StationMap
-    - type: Transform
-      anchored: true
     - type: Sprite
       sprite: Structures/Machines/station_map.rsi
       layers:
@@ -59,9 +51,6 @@
         board: !type:Container
     - type: ApcPowerReceiver
       powerLoad: 200
-    - type: WallMount
-      arc: 360
-    - type: ExtensionCableReceiver
     - type: Construction
       graph: StationMap
       node: station_map
@@ -97,15 +86,25 @@
       interfaces:
         enum.StationMapUiKey.Key:
           type: StationMapBoundUserInterface
+    - type: EmitSoundOnUIOpen
+      sound:
+        collection: Keyboard
+        params:
+          volume: -1
+          variation: 0.10
+          pitch: 1.10  # low pitch keyboard sounds feel kinda weird
+      blacklist:
+        tags:
+        - NoConsoleSound
 
 - type: entity
+  parent: BaseWallmountMetallic
   id: StationMapAssembly
   name: station map assembly
   description: A station map assembly.
   components:
   - type: WallMount
-  - type: Clickable
-  - type: InteractionOutline
+    arc: 360
   - type: Sprite
     sprite: Structures/Machines/station_map.rsi
     layers:
@@ -122,9 +121,3 @@
   - type: Construction
     graph: StationMap
     node: assembly
-  - type: Transform
-    anchored: true
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/surveillance_camera.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/surveillance_camera.yml
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/timer.yml
similarity index 85%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/timer.yml
index 6d36d3a9666c..cbf120af07bc 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/timer.yml
@@ -1,19 +1,12 @@
 - type: entity
+  parent: BaseWallmountMachine
   id: SignalTimer
   name: signal timer
   description: It's a timer for sending timed signals to things.
-  placement:
-    mode: SnapgridCenter
-    snap:
-    - Wallmount
   components:
   - type: StationAiWhitelist
-  - type: Transform
-    anchored: true
   - type: WallMount
     arc: 360
-  - type: Clickable
-  - type: InteractionOutline
   - type: Sprite
     drawdepth: SmallObjects
     sprite: Structures/Wallmounts/switch.rsi
@@ -35,12 +28,9 @@
     interfaces:
       enum.SignalTimerUiKey.Key:
         type: SignalTimerBoundUserInterface
-  - type: ApcPowerReceiver
-    powerLoad: 100
   - type: Electrified
     enabled: false
     usesApcPower: true
-  - type: ExtensionCableReceiver
   - type: ActivatableUIRequiresPower
   - type: Construction
     graph: Timer
@@ -102,17 +92,10 @@
 # Construction Frame
 
 - type: entity
-  categories: [ HideSpawnMenu ]
   id: TimerFrame
   name: timer frame
   description: A construction frame for a timer.
-  placement:
-    mode: SnapgridCenter
   components:
-  - type: Clickable
-  - type: InteractionOutline
-  - type: Transform
-    anchored: true
   - type: Sprite
     drawdepth: WallMountedItems
     sprite: Structures/Wallmounts/signalscreen.rsi
@@ -121,3 +104,4 @@
     graph: Timer
     node: frame
   - type: WallMount
+    arc: 360
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/base_wallmount.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/base_wallmount.yml
new file mode 100644
index 000000000000..824a446013e0
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/base_wallmount.yml
@@ -0,0 +1,51 @@
+- type: entity
+  id: BaseWallmount
+  abstract: true
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Wallmount
+  components:
+  - type: Clickable
+  - type: WallMount
+  - type: InteractionOutline
+  - type: Transform
+    anchored: true
+  - type: Tag
+    tags:
+    - Structure
+  - type: Sprite
+    drawdepth: WallMountedItems
+
+- type: entity
+  parent: BaseWallmount
+  id: BaseWallmountGlass
+  abstract: true
+  components:
+  - type: MeleeSound
+    soundGroups:
+      Brute:
+        collection: GlassSmash
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: Glass
+
+- type: entity
+  parent: BaseWallmount
+  id: BaseWallmountMetallic
+  abstract: true
+  components:
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
+
+- type: entity
+  parent: BaseWallmountMetallic
+  id: BaseWallmountMachine
+  abstract: true
+  components:
+  - type: ApcPowerReceiver
+    powerLoad: 100
+  - type: ExtensionCableReceiver
+  - type: LightningTarget
+    priority: 1
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml
deleted file mode 100644
index 8c98831e1fff..000000000000
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml
+++ /dev/null
@@ -1,179 +0,0 @@
-- type: entity
-  parent: ComputerSurveillanceWirelessCameraMonitor
-  id: ComputerTelevision
-  name: wooden television
-  description: Finally, some decent reception around here...
-  components:
-  - type: Sprite
-    noRot: true
-    drawdepth: SmallObjects
-    layers:
-    - map: ["computerLayerBody"]
-      state: television
-    - map: ["computerLayerScreen"]
-      state: detective_television
-  - type: Computer
-    board: ComputerTelevisionCircuitboard
-  - type: PointLight
-    radius: 1.5
-    energy: 1.6
-    color: "#b89f25"
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.25,-0.25,0.25,0.25"
-        density: 200
-        mask:
-          - TabletopMachineMask
-        layer:
-          - TabletopMachineLayer
-
-- type: entity
-  parent: BaseComputer
-  id: WallmountTelescreenFrame
-  name: telescreen frame
-  description: Finally, some decent reception around here...
-  components:
-  - type: Construction
-    graph: WallmountTelescreen
-    node: TelescreenFrame
-  - type: Sprite
-    drawdepth: WallMountedItems
-    sprite: Structures/Machines/computers.rsi
-    layers:
-      - map: ["computerLayerBody"]
-        state: telescreen_frame
-      - map: ["computerLayerScreen"]
-        state: telescreen
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.20,-0.10,0.25,0.35"
-        density: 250
-        mask:
-          - FullTileMask
-        layer:
-          - WallLayer
-  - type: WallMount
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: Metallic
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 200
-      behaviors: #excess damage, don't spawn entities.
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-    - trigger:
-        !type:DamageTrigger
-        damage: 50
-      behaviors:
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          SheetSteel1:
-            min: 1
-            max: 1
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-  - type: Transform
-    anchored: true
-
-- type: entity
-  parent: WallmountTelescreenFrame
-  id: WallmountTelescreen
-  suffix: camera monitor
-  name: telescreen
-  description: Finally, some decent reception around here...
-  components:
-  - type: Construction
-    graph: WallmountTelescreen
-    node: Telescreen
-  - type: PointLight
-    radius: 1.5
-    energy: 1.6
-    color: "#b89f25"
-  - type: DeviceNetwork
-    deviceNetId: Wired
-    receiveFrequencyId: SurveillanceCamera
-    transmitFrequencyId: SurveillanceCamera
-  - type: WiredNetworkConnection
-  - type: DeviceNetworkRequiresPower
-  - type: SurveillanceCameraMonitor
-  - type: ActivatableUI
-    key: enum.SurveillanceCameraMonitorUiKey.Key
-  - type: ActivatableUIRequiresPower
-  - type: ActivatableUIRequiresVision
-  - type: UserInterface
-    interfaces:
-        enum.SurveillanceCameraMonitorUiKey.Key:
-          type: SurveillanceCameraMonitorBoundUserInterface
-
-# Wall Televisions
-
-- type: entity
-  parent: WallmountTelescreenFrame
-  id: WallmountTelevisionFrame
-  name: television frame
-  description: Finally, some decent reception around here...
-  components:
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.75,-0.10,0.75,0.35"
-        density: 75
-        mask:
-          - FullTileMask
-        layer:
-          - WallLayer
-  - type: Construction
-    graph: WallmountTelevision
-    node: TelevisionFrame
-  - type: Sprite
-    drawdepth: WallMountedItems
-    sprite: Structures/Wallmounts/flatscreentv.rsi
-    layers:
-      - map: ["computerLayerBody"]
-        state: television_wall
-      - map: ["computerLayerScreen"]
-        state: television_wallscreen
-
-- type: entity
-  parent: WallmountTelevisionFrame
-  id: WallmountTelevision
-  suffix: entertainment
-  name: television
-  description: Finally, some decent reception around here...
-  components:
-  - type: Construction
-    graph: WallmountTelevision
-    node: Television
-  - type: DeviceNetwork
-    deviceNetId: Wireless
-    receiveFrequencyId: SurveillanceCamera
-    transmitFrequencyId: SurveillanceCamera
-  - type: WirelessNetworkConnection
-    range: 200
-  - type: DeviceNetworkRequiresPower
-  - type: Speech
-  - type: SurveillanceCameraSpeaker
-  - type: SurveillanceCameraMonitor
-  - type: ActivatableUI
-    key: enum.SurveillanceCameraMonitorUiKey.Key
-  - type: ActivatableUIRequiresPower
-  - type: ActivatableUIRequiresVision
-  - type: UserInterface
-    interfaces:
-        enum.SurveillanceCameraMonitorUiKey.Key:
-          type: SurveillanceCameraMonitorBoundUserInterface
-  - type: PointLight
-    radius: 1.5
-    energy: 1.6
-    color: "#b89f25"
diff --git a/Resources/Prototypes/Entities/Structures/lever.yml b/Resources/Prototypes/Entities/Structures/lever.yml
new file mode 100644
index 000000000000..7efb4cea573b
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/lever.yml
@@ -0,0 +1,53 @@
+- type: entity
+  id: TwoWayLever
+  name: two way lever
+  description: A two way lever.
+  placement:
+    mode: SnapgridCenter
+  components:
+    - type: StationAiWhitelist
+    - type: Clickable
+    - type: InteractionOutline
+    - type: Sprite
+      drawdepth: FloorObjects
+      sprite: Structures/conveyor.rsi
+      layers:
+        - state: switch-off
+          map: ["enabled", "enum.TwoWayLeverState.Middle"]
+    - type: TwoWayLever
+    - type: UseDelay
+      delay: 0.2 # prevent light-toggling auto-clickers.
+    - type: Appearance
+    - type: GenericVisualizer
+      visuals:
+        enum.TwoWayLeverVisuals.State:
+          enabled:
+            Right: { state: switch-fwd }
+            Middle: { state: switch-off }
+            Left: { state: switch-rev }
+    - type: Damageable
+      damageContainer: Inorganic
+      damageModifierSet: Metallic
+    - type: Destructible
+      thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 100
+        behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+    - type: Construction
+      graph: LeverGraph
+      node: LeverNode
+    - type: DeviceNetwork
+      deviceNetId: Wireless
+    - type: WirelessNetworkConnection
+      range: 200
+    - type: DeviceLinkSource
+      ports:
+        - Left
+        - Right
+        - Middle
+    - type: Tag
+      tags:
+      - Structure
diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml
index 6e9f446468fd..728beea5b287 100644
--- a/Resources/Prototypes/GameRules/roundstart.yml
+++ b/Resources/Prototypes/GameRules/roundstart.yml
@@ -278,7 +278,7 @@
     - WizardSurviveObjective
     - WizardDemonstrateObjective
   - type: LoadMapRule
-    gridPath: /Maps/Shuttles/wizard.yml
+    mapPath: /Maps/_Starlight/Shuttles/WizardShuttle.yml #Starlight. wizard deserves their shuttle. and it had to be re-saved as a map to get it to work.
   - type: RuleGrids
   - type: AntagSelection
   - type: AntagLoadProfileRule
diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml
index 1fe9710eb9e3..62a5164ac4cb 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml
@@ -45,6 +45,17 @@
     jumpsuit: ClothingUniformJumpskirtHosFormal
   groupBy: "jumpskirt"
 
+- type: loadout
+  id: HeadofSecurityBlueJumpsuit
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitHoSBlue
+  groupBy: "jumpsuit"
+
+- type: loadout
+  id: HeadofSecurityGreyJumpsuit
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitHoSGrey
+
 # Head
 - type: loadout
   id: HeadofSecurityHead
diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
index 134e3b13272d..8f634c3c1e19 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
@@ -101,6 +101,11 @@
   equipment:
     jumpsuit: ClothingUniformJumpskirtSeniorOfficer
 
+- type: loadout
+  id: SecurityJumpsuitBlue
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitSecBlue
+
 # Back
 - type: loadout
   id: SecurityBackpack
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index a69c6dd07e70..9658d2342f49 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -1108,6 +1108,8 @@
   - HeadofSecurityTurtleneckSkirt
   - HeadofSecurityFormalSuit
   - HeadofSecurityFormalSkirt
+  - HeadofSecurityBlueJumpsuit
+  - HeadofSecurityGreyJumpsuit
 
 - type: loadoutGroup
   id: HeadofSecurityNeck
@@ -1237,6 +1239,7 @@
   - SeniorOfficerJumpsuit
   - SeniorOfficerJumpskirt
   - TrooperUniform
+  - SecurityJumpsuitBlue
 
 - type: loadoutGroup
   id: SecurityBackpack
diff --git a/Resources/Prototypes/Magic/teleport_spells.yml b/Resources/Prototypes/Magic/teleport_spells.yml
index ab79a2f5d0ca..fc166e8c4bc7 100644
--- a/Resources/Prototypes/Magic/teleport_spells.yml
+++ b/Resources/Prototypes/Magic/teleport_spells.yml
@@ -35,7 +35,8 @@
       sprite: Objects/Magic/Eldritch/eldritch_actions.rsi
       state: voidblink
   - type: TargetAction
-    checkCanAccess: false
+    accessMask:
+    - Opaque
     repeat: false
     range: 16
   - type: EntityTargetAction
diff --git a/Resources/Prototypes/Parallaxes/wizard.yml b/Resources/Prototypes/Parallaxes/wizard.yml
new file mode 100644
index 000000000000..0fd482a4855c
--- /dev/null
+++ b/Resources/Prototypes/Parallaxes/wizard.yml
@@ -0,0 +1,14 @@
+- type: parallax
+  id: Wizard
+  layers:
+    - texture:
+        !type:ImageParallaxTextureSource
+        path: "/Textures/Parallaxes/purple_nebula.png"
+      slowness: 0.98
+      scale: 1,1
+    - texture:
+        !type:ImageParallaxTextureSource
+        path: "/Textures/Parallaxes/KettleParallaxNeb.png"
+      slowness: 0.95
+      scale: "1.5, 1.5"
+      scrolling: "0.1, -0.05"
diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
index af4fe52455d3..fd4a4d692cd4 100644
--- a/Resources/Prototypes/Reagents/medicine.yml
+++ b/Resources/Prototypes/Reagents/medicine.yml
@@ -142,10 +142,9 @@
   metabolisms:
     Medicine:
       effects:
-      - !type:HealthChange
+      - !type:EvenHealthChange
         damage:
-          groups:
-            Brute: -2
+          Brute: -2 #Starlight adv. chem nerf revert
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold
@@ -904,15 +903,15 @@
           max: 30
         damage:
           groups:
-            Toxin: -3
-            Brute: 0.5
+            Toxin: -3 #Starlight adv. chem nerf revert
+            Brute: 0.5 #Starlight adv. chem nerf revert
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold
           min: 30
         damage:
           groups:
-            Toxin: -1
+            Toxin: -1 #Starlight adv. chem nerf revert
             Brute: 3
       - !type:AdjustReagent
         conditions:
@@ -1026,14 +1025,14 @@
       - !type:HealthChange
         damage:
           types:
-            Caustic: -3
+            Caustic: -3 #Starlight adv. chem nerf revert
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold
-          min: 16
+          min: 16 #Starlight adv. chem nerf revert
         damage:
           types:
-            Heat: 2
+            Heat: 2 #Starlight adv. chem nerf revert
       - !type:Jitter
         conditions:
         - !type:ReagentThreshold
@@ -1081,14 +1080,14 @@
       - !type:HealthChange
         damage:
           types:
-            Slash: -3
+            Slash: -3 #Starlight adv. chem nerf revert
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold
-          min: 12
+          min: 12 #Starlight adv. chem nerf revert
         damage:
           types:
-            Cold: 3
+            Cold: 3 #Starlight adv. chem nerf revert
 
 - type: reagent
   id: Puncturase
@@ -1104,15 +1103,15 @@
       - !type:HealthChange
         damage:
           types:
-            Piercing: -4
-            Blunt: 0.1
+            Piercing: -4 #Starlight adv. chem nerf revert
+            Blunt: 0.1 #Starlight adv. chem nerf revert
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold
-          min: 11
+          min: 11 #Starlight adv. chem nerf revert
         damage:
           types:
-            Blunt: 5
+            Blunt: 5 #Starlight adv. chem nerf revert
 
 - type: reagent
   id: Bruizine
@@ -1128,14 +1127,14 @@
       - !type:HealthChange
         damage:
           types:
-            Blunt: -3.5
+            Blunt: -3.5 #Starlight adv. chem nerf revert
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold
-          min: 10.5
+          min: 10.5 #Starlight adv. chem nerf revert
         damage:
           types:
-            Poison: 4
+            Poison: 4 #Starlight adv. chem nerf revert
 
 - type: reagent
   id: Holywater
@@ -1264,7 +1263,7 @@
       - !type:HealthChange
         damage:
           types:
-            Shock: -4
+            Shock: -4 #Starlight adv. chem nerf revert
       - !type:AdjustReagent
         reagent: Licoxide
         amount: -4
@@ -1278,14 +1277,14 @@
       - !type:HealthChange
         conditions:
         - !type:ReagentThreshold
-          min: 12
+          min: 12 #Starlight adv. chem nerf revert
         damage:
           types:
-            Cold: 2
+            Cold: 2 #Starlight adv. chem nerf revert
       - !type:AdjustTemperature
         conditions:
         - !type:ReagentThreshold
-          min: 12
+          min: 12 #Starlight adv. chem nerf revert
         amount: -30000
       - !type:Jitter
         conditions:
@@ -1504,4 +1503,4 @@
         amount: -3.0
       - !type:AdjustReagent
         reagent: MindbreakerToxin
-        amount: -3.0
+        amount: -3.0
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/atmos_binary.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/atmos_binary.yml
index 6159bc5936fe..678495edbcc5 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/atmos_binary.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/atmos_binary.yml
@@ -10,19 +10,49 @@
         amount: 2
         doAfter: 1
 
+    - to: pressurepumpAlt1
+      steps:
+      - material: Steel
+        amount: 2
+        doAfter: 1
+
+    - to: pressurepumpAlt2
+      steps:
+      - material: Steel
+        amount: 2
+        doAfter: 1
+
     - to: volumepump
       steps:
       - material: Steel
         amount: 2
         doAfter: 1
 
+    - to: volumepumpAlt1
+      steps:
+      - material: Steel
+        amount: 2
+        doAfter: 1
+
+    - to: volumepumpAlt2
+      steps:
+      - material: Steel
+        amount: 2
+        doAfter: 1
+
     - to: passivegate
       steps:
       - material: Steel
         amount: 2
         doAfter: 1
 
-    - to: pressureregulator
+    - to: passivegateAlt1
+      steps:
+      - material: Steel
+        amount: 2
+        doAfter: 1
+
+    - to: passivegateAlt2
       steps:
       - material: Steel
         amount: 2
@@ -34,12 +64,54 @@
         amount: 2
         doAfter: 1
 
+    - to: valveAlt1
+      steps:
+      - material: Steel
+        amount: 2
+        doAfter: 1
+
+    - to: valveAlt2
+      steps:
+      - material: Steel
+        amount: 2
+        doAfter: 1
+
     - to: signalvalve
       steps:
       - material: Steel
         amount: 2
         doAfter: 1
 
+    - to: signalvalveAlt1
+      steps:
+      - material: Steel
+        amount: 2
+        doAfter: 1
+
+    - to: signalvalveAlt2
+      steps:
+      - material: Steel
+        amount: 2
+        doAfter: 1
+
+    - to: pressureregulator
+      steps:
+      - material: Steel
+        amount: 2
+        doAfter: 1
+
+    - to: pressureregulatorAlt1
+      steps:
+      - material: Steel
+        amount: 2
+        doAfter: 1
+
+    - to: pressureregulatorAlt2
+      steps:
+      - material: Steel
+        amount: 2
+        doAfter: 1
+
     - to: port
       steps:
       - material: Steel
@@ -80,6 +152,38 @@
       - tool: Welding
         doAfter: 1
 
+  - node: pressurepumpAlt1
+    entity: GasPressurePumpAlt1
+    edges:
+    - to: start
+      conditions:
+      - !type:EntityAnchored
+        anchored: false
+      completed:
+      - !type:SpawnPrototype
+          prototype: SheetSteel1
+          amount: 2
+      - !type:DeleteEntity
+      steps:
+      - tool: Welding
+        doAfter: 1
+
+  - node: pressurepumpAlt2
+    entity: GasPressurePumpAlt2
+    edges:
+    - to: start
+      conditions:
+      - !type:EntityAnchored
+        anchored: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 2
+      - !type:DeleteEntity
+      steps:
+      - tool: Welding
+        doAfter: 1
+
   - node: volumepump
     entity: GasVolumePump
     edges:
@@ -96,6 +200,38 @@
       - tool: Welding
         doAfter: 1
 
+  - node: volumepumpAlt1
+    entity: GasVolumePumpAlt1
+    edges:
+    - to: start
+      conditions:
+      - !type:EntityAnchored
+        anchored: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 2
+      - !type:DeleteEntity
+      steps:
+      - tool: Welding
+        doAfter: 1
+
+  - node: volumepumpAlt2
+    entity: GasVolumePumpAlt2
+    edges:
+    - to: start
+      conditions:
+      - !type:EntityAnchored
+        anchored: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 2
+      - !type:DeleteEntity
+      steps:
+      - tool: Welding
+        doAfter: 1
+
   - node: passivegate
     entity: GasPassiveGate
     edges:
@@ -112,8 +248,24 @@
       - tool: Welding
         doAfter: 1
 
-  - node: pressureregulator
-    entity: GasPressureRegulator
+  - node: passivegateAlt1
+    entity: GasPassiveGateAlt1
+    edges:
+    - to: start
+      conditions:
+      - !type:EntityAnchored
+        anchored: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 2
+      - !type:DeleteEntity
+      steps:
+      - tool: Welding
+        doAfter: 1
+
+  - node: passivegateAlt2
+    entity: GasPassiveGateAlt2
     edges:
     - to: start
       conditions:
@@ -144,6 +296,38 @@
       - tool: Welding
         doAfter: 1
 
+  - node: valveAlt1
+    entity: GasValveAlt1
+    edges:
+    - to: start
+      conditions:
+      - !type:EntityAnchored
+        anchored: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 2
+      - !type:DeleteEntity
+      steps:
+      - tool: Welding
+        doAfter: 1
+
+  - node: valveAlt2
+    entity: GasValveAlt2
+    edges:
+    - to: start
+      conditions:
+      - !type:EntityAnchored
+        anchored: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 2
+      - !type:DeleteEntity
+      steps:
+      - tool: Welding
+        doAfter: 1
+
   - node: signalvalve
     entity: SignalControlledValve
     edges:
@@ -160,6 +344,86 @@
       - tool: Welding
         doAfter: 1
 
+  - node: signalvalveAlt1
+    entity: SignalControlledValveAlt1
+    edges:
+    - to: start
+      conditions:
+      - !type:EntityAnchored
+        anchored: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 2
+      - !type:DeleteEntity
+      steps:
+      - tool: Welding
+        doAfter: 1
+
+  - node: signalvalveAlt2
+    entity: SignalControlledValveAlt2
+    edges:
+    - to: start
+      conditions:
+      - !type:EntityAnchored
+        anchored: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 2
+      - !type:DeleteEntity
+      steps:
+      - tool: Welding
+        doAfter: 1
+
+  - node: pressureregulator
+    entity: GasPressureRegulator
+    edges:
+    - to: start
+      conditions:
+      - !type:EntityAnchored
+        anchored: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 2
+      - !type:DeleteEntity
+      steps:
+      - tool: Welding
+        doAfter: 1
+
+  - node: pressureregulatorAlt1
+    entity: GasPressureRegulatorAlt1
+    edges:
+    - to: start
+      conditions:
+      - !type:EntityAnchored
+        anchored: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 2
+      - !type:DeleteEntity
+      steps:
+      - tool: Welding
+        doAfter: 1
+
+  - node: pressureregulatorAlt2
+    entity: GasPressureRegulatorAlt2
+    edges:
+    - to: start
+      conditions:
+      - !type:EntityAnchored
+        anchored: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetSteel1
+        amount: 2
+      - !type:DeleteEntity
+      steps:
+      - tool: Welding
+        doAfter: 1
+
   - node: port
     entity: GasPort
     edges:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/gas_pipe_sensor.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/gas_pipe_sensor.yml
index bda6d036e9b9..95e1d3872e05 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/gas_pipe_sensor.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/gas_pipe_sensor.yml
@@ -10,7 +10,19 @@
         amount: 2
         doAfter: 1
 
-  - node: sensor   
+    - to: sensorAlt1
+      steps:
+      - material: Steel
+        amount: 2
+        doAfter: 1
+
+    - to: sensorAlt2
+      steps:
+      - material: Steel
+        amount: 2
+        doAfter: 1
+
+  - node: sensor
     entity: GasPipeSensor
     actions:
     - !type:SetAnchor
@@ -26,4 +38,40 @@
         anchored: false
       steps:
       - tool: Welding
-        doAfter: 1
\ No newline at end of file
+        doAfter: 1
+
+  - node: sensorAlt1
+    entity: GasPipeSensorAlt1
+    actions:
+      - !type:SetAnchor
+    edges:
+      - to: start
+        completed:
+          - !type:SpawnPrototype
+            prototype: SheetSteel1
+            amount: 2
+          - !type:DeleteEntity
+        conditions:
+          - !type:EntityAnchored
+            anchored: false
+        steps:
+          - tool: Welding
+            doAfter: 1
+
+  - node: sensorAlt2
+    entity: GasPipeSensorAlt2
+    actions:
+      - !type:SetAnchor
+    edges:
+      - to: start
+        completed:
+          - !type:SpawnPrototype
+            prototype: SheetSteel1
+            amount: 2
+          - !type:DeleteEntity
+        conditions:
+          - !type:EntityAnchored
+            anchored: false
+        steps:
+          - tool: Welding
+            doAfter: 1
diff --git a/Resources/Prototypes/Recipes/Construction/utilities.yml b/Resources/Prototypes/Recipes/Construction/utilities.yml
index f9c9867aac72..eac72ef65760 100644
--- a/Resources/Prototypes/Recipes/Construction/utilities.yml
+++ b/Resources/Prototypes/Recipes/Construction/utilities.yml
@@ -270,9 +270,43 @@
   startNode: start
   targetNode: sensor
   category: construction-category-structures
-  placementMode: SnapgridCenter
+  placementMode: AlignAtmosPipeLayers
+  objectType: Structure
+  canRotate: true
+  alternativePrototypes:
+  - GasPipeSensor
+  - GasPipeSensorAlt1
+  - GasPipeSensorAlt2
+
+- type: construction
+  id: GasPipeSensorAlt1
+  hide: true
+  graph: GasPipeSensor
+  startNode: start
+  targetNode: sensorAlt1
+  category: construction-category-structures
+  placementMode: AlignAtmosPipeLayers
   objectType: Structure
   canRotate: true
+  alternativePrototypes:
+  - GasPipeSensor
+  - GasPipeSensorAlt1
+  - GasPipeSensorAlt2
+
+- type: construction
+  id: GasPipeSensorAlt2
+  hide: true
+  graph: GasPipeSensor
+  startNode: start
+  targetNode: sensorAlt2
+  category: construction-category-structures
+  placementMode: AlignAtmosPipeLayers
+  objectType: Structure
+  canRotate: true
+  alternativePrototypes:
+  - GasPipeSensor
+  - GasPipeSensorAlt1
+  - GasPipeSensorAlt2
 
 # ATMOS PIPES
 - type: construction
@@ -503,7 +537,7 @@
   placementMode: SnapgridCenter
   canBuildInImpassable: false
   conditions:
-    - !type:NoUnstackableInTile
+  - !type:NoUnstackableInTile
 
 - type: construction
   id: GasPassiveVent
@@ -514,7 +548,7 @@
   placementMode: SnapgridCenter
   canBuildInImpassable: false
   conditions:
-    - !type:NoUnstackableInTile
+  - !type:NoUnstackableInTile
 
 - type: construction
   id: GasVentScrubber
@@ -525,7 +559,7 @@
   placementMode: SnapgridCenter
   canBuildInImpassable: false
   conditions:
-    - !type:NoUnstackableInTile
+  - !type:NoUnstackableInTile
 
 - type: construction
   id: GasOutletInjector
@@ -536,7 +570,7 @@
   placementMode: SnapgridCenter
   canBuildInImpassable: false
   conditions:
-    - !type:NoUnstackableInTile
+  - !type:NoUnstackableInTile
 
 # ATMOS BINARY
 - type: construction
@@ -545,10 +579,46 @@
   startNode: start
   targetNode: pressurepump
   category: construction-category-utilities
-  placementMode: SnapgridCenter
+  placementMode: AlignAtmosPipeLayers
   canBuildInImpassable: false
   conditions:
-    - !type:NoUnstackableInTile
+  - !type:NoUnstackableInTile
+  alternativePrototypes:
+  - GasPressurePump
+  - GasPressurePumpAlt1
+  - GasPressurePumpAlt2
+
+- type: construction
+  id: GasPressurePumpAlt1
+  hide: true
+  graph: GasBinary
+  startNode: start
+  targetNode: pressurepumpAlt1
+  category: construction-category-utilities
+  placementMode: AlignAtmosPipeLayers
+  canBuildInImpassable: false
+  conditions:
+  - !type:NoUnstackableInTile
+  alternativePrototypes:
+  - GasPressurePump
+  - GasPressurePumpAlt1
+  - GasPressurePumpAlt2
+
+- type: construction
+  id: GasPressurePumpAlt2
+  hide: true
+  graph: GasBinary
+  startNode: start
+  targetNode: pressurepumpAlt2
+  category: construction-category-utilities
+  placementMode: AlignAtmosPipeLayers
+  canBuildInImpassable: false
+  conditions:
+  - !type:NoUnstackableInTile
+  alternativePrototypes:
+  - GasPressurePump
+  - GasPressurePumpAlt1
+  - GasPressurePumpAlt2
 
 - type: construction
   id: GasVolumePump
@@ -556,10 +626,46 @@
   startNode: start
   targetNode: volumepump
   category: construction-category-utilities
-  placementMode: SnapgridCenter
+  placementMode: AlignAtmosPipeLayers
   canBuildInImpassable: false
   conditions:
-    - !type:NoUnstackableInTile
+  - !type:NoUnstackableInTile
+  alternativePrototypes:
+  - GasVolumePump
+  - GasVolumePumpAlt1
+  - GasVolumePumpAlt2
+
+- type: construction
+  id: GasVolumePumpAlt1
+  hide: true
+  graph: GasBinary
+  startNode: start
+  targetNode: volumepumpAlt1
+  category: construction-category-utilities
+  placementMode: AlignAtmosPipeLayers
+  canBuildInImpassable: false
+  conditions:
+  - !type:NoUnstackableInTile
+  alternativePrototypes:
+  - GasVolumePump
+  - GasVolumePumpAlt1
+  - GasVolumePumpAlt2
+
+- type: construction
+  id: GasVolumePumpAlt2
+  hide: true
+  graph: GasBinary
+  startNode: start
+  targetNode: volumepumpAlt2
+  category: construction-category-utilities
+  placementMode: AlignAtmosPipeLayers
+  canBuildInImpassable: false
+  conditions:
+  - !type:NoUnstackableInTile
+  alternativePrototypes:
+  - GasVolumePump
+  - GasVolumePumpAlt1
+  - GasVolumePumpAlt2
 
 - type: construction
   id: GasPassiveGate
@@ -567,10 +673,46 @@
   startNode: start
   targetNode: passivegate
   category: construction-category-utilities
-  placementMode: SnapgridCenter
+  placementMode: AlignAtmosPipeLayers
   canBuildInImpassable: false
   conditions:
-    - !type:NoUnstackableInTile
+  - !type:NoUnstackableInTile
+  alternativePrototypes:
+  - GasPassiveGate
+  - GasPassiveGateAlt1
+  - GasPassiveGateAlt2
+
+- type: construction
+  id: GasPassiveGateAlt1
+  hide: true
+  graph: GasBinary
+  startNode: start
+  targetNode: passivegateAlt1
+  category: construction-category-utilities
+  placementMode: AlignAtmosPipeLayers
+  canBuildInImpassable: false
+  conditions:
+  - !type:NoUnstackableInTile
+  alternativePrototypes:
+  - GasPassiveGate
+  - GasPassiveGateAlt1
+  - GasPassiveGateAlt2
+
+- type: construction
+  id: GasPassiveGateAlt2
+  hide: true
+  graph: GasBinary
+  startNode: start
+  targetNode: passivegateAlt2
+  category: construction-category-utilities
+  placementMode: AlignAtmosPipeLayers
+  canBuildInImpassable: false
+  conditions:
+  - !type:NoUnstackableInTile
+  alternativePrototypes:
+  - GasPassiveGate
+  - GasPassiveGateAlt1
+  - GasPassiveGateAlt2
 
 - type: construction
   id: GasPressureRegulator
@@ -578,10 +720,46 @@
   startNode: start
   targetNode: pressureregulator
   category: construction-category-utilities
-  placementMode: SnapgridCenter
+  placementMode: AlignAtmosPipeLayers
+  canBuildInImpassable: false
+  conditions:
+  - !type:NoUnstackableInTile
+  alternativePrototypes:
+  - GasPressureRegulator
+  - GasPressureRegulatorAlt1
+  - GasPressureRegulatorAlt2
+
+- type: construction
+  id: GasPressureRegulatorAlt1
+  hide: true
+  graph: GasBinary
+  startNode: start
+  targetNode: pressureregulatorAlt1
+  category: construction-category-utilities
+  placementMode: AlignAtmosPipeLayers
   canBuildInImpassable: false
   conditions:
   - !type:NoUnstackableInTile
+  alternativePrototypes:
+  - GasPressureRegulator
+  - GasPressureRegulatorAlt1
+  - GasPressureRegulatorAlt2
+
+- type: construction
+  id: GasPressureRegulatorAlt2
+  hide: true
+  graph: GasBinary
+  startNode: start
+  targetNode: pressureregulatorAlt2
+  category: construction-category-utilities
+  placementMode: AlignAtmosPipeLayers
+  canBuildInImpassable: false
+  conditions:
+  - !type:NoUnstackableInTile
+  alternativePrototypes:
+  - GasPressureRegulator
+  - GasPressureRegulatorAlt1
+  - GasPressureRegulatorAlt2
 
 - type: construction
   id: GasValve
@@ -589,10 +767,46 @@
   startNode: start
   targetNode: valve
   category: construction-category-utilities
-  placementMode: SnapgridCenter
+  placementMode: AlignAtmosPipeLayers
   canBuildInImpassable: false
   conditions:
     - !type:NoUnstackableInTile
+  alternativePrototypes:
+  - GasValve
+  - GasValveAlt1
+  - GasValveAlt2
+
+- type: construction
+  id: GasValveAlt1
+  hide: true
+  graph: GasBinary
+  startNode: start
+  targetNode: valveAlt1
+  category: construction-category-utilities
+  placementMode: AlignAtmosPipeLayers
+  canBuildInImpassable: false
+  conditions:
+    - !type:NoUnstackableInTile
+  alternativePrototypes:
+  - GasValve
+  - GasValveAlt1
+  - GasValveAlt2
+
+- type: construction
+  id: GasValveAlt2
+  hide: true
+  graph: GasBinary
+  startNode: start
+  targetNode: valveAlt2
+  category: construction-category-utilities
+  placementMode: AlignAtmosPipeLayers
+  canBuildInImpassable: false
+  conditions:
+    - !type:NoUnstackableInTile
+  alternativePrototypes:
+  - GasValve
+  - GasValveAlt1
+  - GasValveAlt2
 
 - type: construction
   id: SignalControlledValve
@@ -600,10 +814,44 @@
   startNode: start
   targetNode: signalvalve
   category: construction-category-utilities
-  placementMode: SnapgridCenter
+  placementMode: AlignAtmosPipeLayers
   canBuildInImpassable: false
   conditions:
   - !type:NoUnstackableInTile
+  alternativePrototypes:
+  - SignalControlledValve
+  - SignalControlledValveAlt1
+  - SignalControlledValveAlt2
+
+- type: construction
+  id: SignalControlledValveAlt1
+  graph: GasBinary
+  startNode: start
+  targetNode: signalvalveAlt1
+  category: construction-category-utilities
+  placementMode: AlignAtmosPipeLayers
+  canBuildInImpassable: false
+  conditions:
+    - !type:NoUnstackableInTile
+  alternativePrototypes:
+  - SignalControlledValve
+  - SignalControlledValveAlt1
+  - SignalControlledValveAlt2
+
+- type: construction
+  id: SignalControlledValveAlt2
+  graph: GasBinary
+  startNode: start
+  targetNode: signalvalveAlt2
+  category: construction-category-utilities
+  placementMode: AlignAtmosPipeLayers
+  canBuildInImpassable: false
+  conditions:
+    - !type:NoUnstackableInTile
+  alternativePrototypes:
+  - SignalControlledValve
+  - SignalControlledValveAlt1
+  - SignalControlledValveAlt2
 
 - type: construction
   id: GasPort
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index 5aea4860deac..16e92114edfa 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -2524,3 +2524,15 @@
     MobMothroach: 1
     OrganAnimalHeart: 1
     MoproachShoes: 1
+
+- type: microwaveMealRecipe
+  id: RecipeCottonCake
+  name: cotton cake recipe
+  result: FoodCottonCake #Starlight moff cake
+  time: 5
+  group: Cake
+  reagents:
+    Fiber: 10
+  solids:
+    FoodCakePlain: 1
+    
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml
index 006e774de427..aae753f7b871 100644
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml
@@ -39,18 +39,21 @@
       - material: Cable
         amount: 2
         doAfter: 5
-  - node: done
-    entity: LockerSteel
+        
+# Starlight-start: Maintenance Panel for Lockers
+        
+  - node: Cutted
+    actions:
+    - !type:SetWiresPanelSecurity
+      wiresAccessible: false
     edges:
     - to: start
       steps:
-      - tool: Screwing
+      - tool: Prying
         doAfter: 5
       conditions:
       - !type:StorageWelded
-        welded: false
-      - !type:Locked
-        locked: false
+        welded: true
       completed:
       - !type:SpawnPrototype
         prototype: SheetSteel1
@@ -61,6 +64,253 @@
       - !type:EmptyAllContainers
       - !type:DeleteEntity
 
+  - node: done
+    entity: LockerBase # Starlight-edit
+    doNotReplaceInheritingEntities: true # Starlight-edit
+    actions:
+    - !type:SetWiresPanelSecurity
+      wiresAccessible: true
+    edges:
+    - to: Cutted
+      steps:
+      - tool: Cutting
+        doAfter: 2.5
+      conditions:
+      - !type:Locked
+        locked: false
+      - !type:WirePanel {}
+      - !type:AllWiresCut
+
+    - to: medSecurityUnfinished
+      conditions:
+      - !type:WirePanel {}
+      steps:
+      - material: Steel
+        amount: 2
+        doAfter: 2
+
+    - to: highSecurityUnfinished
+      conditions:
+      - !type:WirePanel {}
+      steps:
+      - material: Plasteel
+        amount: 2
+        doAfter: 2
+
+  - node: doneSecure
+    entity: LockerBaseSecure # Starlight-edit
+    doNotReplaceInheritingEntities: true # Starlight-edit
+    actions:
+    - !type:SetWiresPanelSecurity
+      wiresAccessible: true
+    edges:
+    - to: Cutted
+      steps:
+      - tool: Cutting
+        doAfter: 2.5
+      conditions:
+      - !type:Locked
+        locked: false
+      - !type:WirePanel {}
+      - !type:AllWiresCut
+
+    - to: medSecurityUnfinished
+      conditions:
+      - !type:WirePanel {}
+      steps:
+      - material: Steel
+        amount: 2
+        doAfter: 2
+
+    - to: highSecurityUnfinished
+      conditions:
+      - !type:WirePanel {}
+      steps:
+      - material: Plasteel
+        amount: 2
+        doAfter: 2
+
+## Medium security level door: a layer of steel plating protects the internal wiring
+  - node: medSecurityUnfinished
+    actions:
+    - !type:SetWiresPanelSecurity
+      examine: wires-panel-component-on-examine-security-level1
+      wiresAccessible: false
+    edges:
+    - to: done
+      completed:
+      - !type:GivePrototype
+        prototype: SheetSteel1
+        amount: 2
+      conditions:
+      - !type:WirePanel {}
+      - !type:HasTag
+        tag: Locker
+      steps:
+      - tool: Prying
+        doAfter: 4
+
+    - to: doneSecure
+      completed:
+      - !type:GivePrototype
+        prototype: SheetSteel1
+        amount: 2
+      conditions:
+      - !type:WirePanel {}
+      - !type:HasTag
+        tag: SecuredLocker
+      steps:
+      - tool: Prying
+        doAfter: 4
+
+    - to: medSecurity
+      conditions:
+      - !type:WirePanel {}
+      steps:
+      - tool: Welding
+        doAfter: 3
+
+  - node: medSecurity
+    actions:
+    - !type:SetWiresPanelSecurity
+      examine: wires-panel-component-on-examine-security-level2
+      wiresAccessible: false
+    edges:
+    - to: medSecurityUnfinished
+      conditions:
+      - !type:WirePanel {}
+      steps:
+      - tool: Welding
+        doAfter: 10
+
+## High security level door: a layer of plasteel plating protects the internal wiring
+  - node: highSecurityUnfinished
+    actions:
+    - !type:SetWiresPanelSecurity
+      examine: wires-panel-component-on-examine-security-level3
+      wiresAccessible: false
+    edges:
+    - to: done
+      completed:
+      - !type:GivePrototype
+        prototype: SheetPlasteel1
+        amount: 2
+      conditions:
+      - !type:WirePanel {}
+      - !type:HasTag
+        tag: Locker
+      steps:
+      - tool: Prying
+        doAfter: 4
+
+    - to: doneSecure
+      completed:
+      - !type:GivePrototype
+        prototype: SheetPlasteel1
+        amount: 2
+      conditions:
+      - !type:WirePanel {}
+      - !type:HasTag
+        tag: SecuredLocker
+      steps:
+      - tool: Prying
+        doAfter: 4
+
+    - to: highSecurity
+      conditions:
+      - !type:WirePanel {}
+      steps:
+      - tool: Welding
+        doAfter: 5
+
+  - node: highSecurity
+    actions:
+    - !type:SetWiresPanelSecurity
+      examine: wires-panel-component-on-examine-security-level4
+      wiresAccessible: false
+    edges:
+    - to: highSecurityUnfinished
+      conditions:
+      - !type:WirePanel {}
+      steps:
+      - tool: Welding
+        doAfter: 15
+
+    - to: maxSecurity
+      conditions:
+      - !type:WirePanel {}
+      steps:
+      - material: MetalRod
+        amount: 2
+        doAfter: 1
+
+## Max security level door: an electric grill is added
+  - node: maxSecurity
+    actions:
+    - !type:SetWiresPanelSecurity
+      examine: wires-panel-component-on-examine-security-level5
+      wiresAccessible: false
+    edges:
+    - to: highSecurity
+      completed:
+      - !type:AttemptElectrocute
+      - !type:GivePrototype
+        prototype: PartRodMetal1
+        amount: 2
+      conditions:
+      - !type:WirePanel {}
+      steps:
+      - tool: Cutting
+        doAfter: 0.5
+
+    - to: superMaxSecurityUnfinished
+      conditions:
+      - !type:WirePanel {}
+      steps:
+      - material: Plasteel
+        amount: 2
+        doAfter: 2
+
+## Super max security level door: an additional layer of plasteel is added
+  - node: superMaxSecurityUnfinished
+    actions:
+    - !type:SetWiresPanelSecurity
+      examine: wires-panel-component-on-examine-security-level6
+      wiresAccessible: false
+    edges:
+    - to: maxSecurity
+      completed:
+      - !type:GivePrototype
+        prototype: SheetPlasteel1
+        amount: 2
+      conditions:
+      - !type:WirePanel {}
+      steps:
+      - tool: Prying
+        doAfter: 4
+
+    - to: superMaxSecurity
+      conditions:
+      - !type:WirePanel {}
+      steps:
+      - tool: Welding
+        doAfter: 5
+
+  - node: superMaxSecurity
+    actions:
+    - !type:SetWiresPanelSecurity
+      examine: wires-panel-component-on-examine-security-level7
+      wiresAccessible: false
+    edges:
+    - to: superMaxSecurityUnfinished
+      conditions:
+      - !type:WirePanel {}
+      steps:
+      - tool: Welding
+        doAfter: 15
+      
+# Starlight-end: Maintenance Panel for Lockers
+
 - type: constructionGraph
   id: ClosetFreezer
   start: start
@@ -171,4 +421,4 @@
         prototype: SheetSteel1
         amount: 4
       - !type:EmptyAllContainers
-      - !type:DeleteEntity
+      - !type:DeleteEntity
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/tiles.yml b/Resources/Prototypes/Recipes/Lathes/Packs/tiles.yml
index 1ca30cf730e7..94ffd376e04f 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/tiles.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/tiles.yml
@@ -49,3 +49,5 @@
   - FloorTileItemOldConcrete
   - FloorTileItemOldConcreteMono
   - FloorTileItemOldConcreteSmooth
+  - FloorTileItemWhiteMarble
+  - FloorTileItemDarkMarble
diff --git a/Resources/Prototypes/Recipes/Lathes/categories.yml b/Resources/Prototypes/Recipes/Lathes/categories.yml
index 44ab5dbe1bc1..7c9bfb93a40e 100644
--- a/Resources/Prototypes/Recipes/Lathes/categories.yml
+++ b/Resources/Prototypes/Recipes/Lathes/categories.yml
@@ -102,6 +102,10 @@
   id: Wood
   name: lathe-category-wood
 
+- type: latheCategory
+  id: Marble
+  name: lathe-category-marble
+
 # Science
 - type: latheCategory
   id: Mech
diff --git a/Resources/Prototypes/Recipes/Lathes/tiles.yml b/Resources/Prototypes/Recipes/Lathes/tiles.yml
index 832464069fc5..b0e6d63f68b1 100644
--- a/Resources/Prototypes/Recipes/Lathes/tiles.yml
+++ b/Resources/Prototypes/Recipes/Lathes/tiles.yml
@@ -57,6 +57,16 @@
     Steel: 25
     Plastic: 25
 
+- type: latheRecipe
+  abstract: true
+  parent: BaseTileRecipe
+  id: BaseMarbleTileRecipe
+  categories:
+  - Marble
+  materials:
+    Steel: 25
+    Glass: 25
+
 ## Recipes
 
 # Steel tiles
@@ -294,3 +304,14 @@
   parent: BaseConcreteTileRecipe
   id: FloorTileItemOldConcreteSmooth
   result: FloorTileItemOldConcreteSmooth
+
+# Marble
+- type: latheRecipe
+  parent: BaseMarbleTileRecipe
+  id: FloorTileItemWhiteMarble
+  result: FloorTileItemWhiteMarble
+
+- type: latheRecipe
+  parent: BaseMarbleTileRecipe
+  id: FloorTileItemDarkMarble
+  result: FloorTileItemDarkMarble
diff --git a/Resources/Prototypes/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/Recipes/Reactions/chemicals.yml
index cdd5659c7e6b..959488376c6c 100644
--- a/Resources/Prototypes/Recipes/Reactions/chemicals.yml
+++ b/Resources/Prototypes/Recipes/Reactions/chemicals.yml
@@ -104,6 +104,7 @@
   id: PotassiumExplosion
   impact: High
   priority: 20
+  conserveEnergy: false
   reactants:
     Water:
       amount: 1
@@ -112,15 +113,16 @@
   effects:
     - !type:ExplosionReactionEffect
       explosionType: Default
-      maxIntensity: 100
-      intensityPerUnit: 0.5 # 50+50 reagent for maximum explosion
-      intensitySlope: 4
+      intensityPerUnit: 0.25
       maxTotalIntensity: 100
+      intensitySlope: 4
+      maxIntensity: 7
 
 - type: reaction
   id: Smoke
-  priority: 10
+  priority: -10
   impact: High
+  conserveEnergy: false
   reactants:
     Phosphorus:
       amount: 1
@@ -137,8 +139,9 @@
 
 - type: reaction
   id: Foam
-  priority: 10
+  priority: -10
   impact: High
+  conserveEnergy: false
   reactants:
     Fluorosurfactant:
       amount: 1
@@ -154,7 +157,8 @@
 - type: reaction
   id: IronMetalFoam
   impact: High
-  priority: 10
+  priority: -10
+  conserveEnergy: false
   reactants:
     Iron:
       amount: 3
@@ -172,7 +176,8 @@
 - type: reaction
   id: AluminiumMetalFoam
   impact: High
-  priority: 10
+  priority: -10
+  conserveEnergy: false
   reactants:
     Aluminium:
       amount: 3
@@ -191,6 +196,7 @@
   id: UraniumEmpExplosion
   impact: High
   priority: 20
+  conserveEnergy: false
   reactants:
     Iron:
       amount: 1
@@ -209,6 +215,7 @@
   id: Flash
   impact: High
   priority: 20
+  conserveEnergy: false
   reactants:
     Aluminium:
       amount: 1
diff --git a/Resources/Prototypes/Recipes/Reactions/medicine.yml b/Resources/Prototypes/Recipes/Reactions/medicine.yml
index 1a93a3688647..3cc3d4f3d5e4 100644
--- a/Resources/Prototypes/Recipes/Reactions/medicine.yml
+++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml
@@ -445,39 +445,6 @@
   products:
     Bruizine: 2
 
-- type: reaction
-  id: BicarLacerinol # mixing any two brute medications will make Razorium
-  impact: Medium
-  reactants:
-    Lacerinol:
-      amount: 1
-    Bicaridine:
-      amount: 1
-  products:
-    Razorium: 1
-
-- type: reaction
-  id: BicarPuncturase # mixing any two brute medications will make Razorium
-  impact: Medium
-  reactants:
-    Puncturase:
-      amount: 1
-    Bicaridine:
-      amount: 1
-  products:
-    Razorium: 1
-
-- type: reaction
-  id: BicarBruizine # mixing any two brute medications will make Razorium
-  impact: Medium
-  reactants:
-    Bruizine:
-      amount: 1
-    Bicaridine:
-      amount: 1
-  products:
-    Razorium: 1
-
 - type: reaction
   id: BruizineLacerinol # mixing any two brute medications will make Razorium
   impact: Medium
diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
index 233d1b0a758f..bc801b914522 100644
--- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
@@ -44,6 +44,7 @@
   - Detective
   - Salvage
   - Security
+  - Brigmedic # Starlight
   - Brig
   - Lawyer
   - Cargo
diff --git a/Resources/Prototypes/SoundCollections/machines.yml b/Resources/Prototypes/SoundCollections/machines.yml
index 3c567ab7b336..45768bfa88c9 100644
--- a/Resources/Prototypes/SoundCollections/machines.yml
+++ b/Resources/Prototypes/SoundCollections/machines.yml
@@ -22,3 +22,18 @@
   id: CargoBeep
   files:
   - /Audio/Effects/Cargo/beep.ogg
+
+- type: soundCollection
+  id: VendingDispense
+  files:
+  - /Audio/Machines/machine_vend.ogg
+
+- type: soundCollection
+  id: VendingDeny
+  files:
+  - /Audio/Machines/custom_deny.ogg
+
+- type: soundCollection
+  id: MachineInsert
+  files:
+  - /Audio/Weapons/Guns/MagIn/revolver_magin.ogg
diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
index dcfbd99a2307..dab0faded204 100644
--- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml
+++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
@@ -670,3 +670,27 @@
   name: stack-dark-squiggly
   spawn: FloorTileItemDarkSquiggly
   maxCount: 30
+
+- type: stack
+  id: FloorTileWhiteMarble
+  name: stack-white-marble-floor
+  spawn: FloorTileItemWhiteMarble
+  maxCount: 30
+
+- type: stack
+  id: FloorTileDarkMarble
+  name: stack-dark-marble-floor
+  spawn: FloorTileItemDarkMarble
+  maxCount: 30
+
+- type: stack
+  id: FloorTilePlasmaMarble
+  name: stack-plasma-marble-floor
+  spawn: FloorTileItemPlasmaMarble
+  maxCount: 30
+
+- type: stack
+  id: FloorTileUraniumMarble
+  name: stack-uranium-marble-floor
+  spawn: FloorTileItemUraniumMarble
+  maxCount: 30
diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml
index 87e71da0c9d9..6e3a588ab49d 100644
--- a/Resources/Prototypes/Tiles/floors.yml
+++ b/Resources/Prototypes/Tiles/floors.yml
@@ -2131,3 +2131,95 @@
     collection: FootstepHull
   itemDrop: FloorTileItemXenoMaint
   heatCapacity: 10000
+
+- type: tile
+  id: FloorWhiteMarble
+  name: tiles-white-marble
+  sprite: /Textures/Tiles/white_marble.png
+  variants: 8
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepTile
+  friction: 0.8
+  itemDrop: FloorTileItemWhiteMarble
+  heatCapacity: 10000
+
+- type: tile
+  id: FloorDarkMarble
+  name: tiles-dark-marble
+  sprite: /Textures/Tiles/dark_marble.png
+  variants: 8
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepTile
+  friction: 0.8
+  itemDrop: FloorTileItemDarkMarble
+  heatCapacity: 10000
+
+- type: tile
+  id: FloorPlasmaMarble
+  name: tiles-plasma-marble
+  sprite: /Textures/Tiles/plasmarble.png
+  variants: 8
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepTile
+  friction: 0.8
+  itemDrop: FloorTileItemPlasmaMarble
+  heatCapacity: 10000
+
+- type: tile
+  id: FloorUraniumMarble
+  name: tiles-uranium-marble
+  sprite: /Textures/Tiles/uranium_marble.png
+  variants: 8
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepTile
+  friction: 0.8
+  itemDrop: FloorTileItemUraniumMarble
+  heatCapacity: 10000
diff --git a/Resources/Prototypes/Wires/layouts.yml b/Resources/Prototypes/Wires/layouts.yml
index a2cb3856fde4..7bd9a520e0ab 100644
--- a/Resources/Prototypes/Wires/layouts.yml
+++ b/Resources/Prototypes/Wires/layouts.yml
@@ -231,12 +231,4 @@
   dummyWires: 3
   wires:
   - !type:AccessWireAction
-  - !type:AiInteractWireAction
-
-#region Starlight TODO: Move to _Starlight
-- type: wireLayout
-  id: MedibotControls
-  dummyWires: 9
-  wires:
-  - !type:SpeechWireAction
-#endregion
\ No newline at end of file
+  - !type:AiInteractWireAction
\ No newline at end of file
diff --git a/Resources/Prototypes/_StarLight/Alerts/offer.yml b/Resources/Prototypes/_StarLight/Alerts/offer.yml
new file mode 100644
index 000000000000..f582fa4bd5a6
--- /dev/null
+++ b/Resources/Prototypes/_StarLight/Alerts/offer.yml
@@ -0,0 +1,8 @@
+- type: alert
+  id: Offer
+  clickEvent: !type:OfferItemAlertEvent  { }
+  icons:
+  - sprite: /Textures/_Starlight/Interface/Alerts/offer.rsi
+    state: offer
+  name: alerts-offer-name
+  description: alerts-offer-desc
\ No newline at end of file
diff --git a/Resources/Prototypes/_StarLight/Catalog/VendingMachines/Inventories/plushies.yml b/Resources/Prototypes/_StarLight/Catalog/VendingMachines/Inventories/plushies.yml
index 7545a61f8078..6168dd97e6fc 100644
--- a/Resources/Prototypes/_StarLight/Catalog/VendingMachines/Inventories/plushies.yml
+++ b/Resources/Prototypes/_StarLight/Catalog/VendingMachines/Inventories/plushies.yml
@@ -297,6 +297,17 @@
   - !type:ListingLimitedStockCondition
     stock: 1
 
+- type: listing
+  id: VendorPlushieKoni
+  productEntity: PlushieKoni
+  cost:
+    NTCredit: 10
+  categories:
+    - SLPlushies
+  conditions:
+    - !type:ListingLimitedStockCondition
+      stock: 1
+
 - type: listing
   id: VendorPlushieXeno
   productEntity: PlushieXeno
@@ -574,6 +585,16 @@
   conditions:
     - !type:ListingLimitedStockCondition
       stock: 1
+ 
+- type: listing
+  id: VendorPlushieDoxesTheCaptain
+  productEntity: PlushieDoxesTheCaptain
+  cost:
+    NTCredit: 20
+  categories:
+    - SLCrew
+  conditions:
+    - !type:ListingLimitedStockCondition
 
 - type: listing
   id: VendorPlushieFixes
@@ -651,3 +672,14 @@
   conditions:
     - !type:ListingLimitedStockCondition
       stock: 1
+
+- type: listing
+  id: VendorPlushieKilla
+  productEntity: PlushieKilla
+  cost:
+    NTCredit: 20
+  categories:
+    - SLCrew
+  conditions:
+    - !type:ListingLimitedStockCondition
+      stock: 1
diff --git a/Resources/Prototypes/_StarLight/Catalog/spellbook_catalog.yml b/Resources/Prototypes/_StarLight/Catalog/spellbook_catalog.yml
new file mode 100644
index 000000000000..5b4ee0098ab4
--- /dev/null
+++ b/Resources/Prototypes/_StarLight/Catalog/spellbook_catalog.yml
@@ -0,0 +1,26 @@
+- type: listing
+  id: SpellbookStaffHealing
+  name: spellbook-staff-healing-name
+  description: spellbook-staff-healing-description
+  productEntity: WeaponStaffHealing
+  cost:
+    WizCoin: 2
+  categories:
+  - SpellbookEquipment
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+
+- type: listing
+  id: SpellbookSpellSummonCheese
+  name: spellbook-event-summon-cheese-name
+  description: spellbook-event-summon-cheese-description
+  productAction: ActionSummonCheese
+  cost:
+    WizCoin: 0 #ITS FREE
+  categories:
+  - SpellbookUtility
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+  disableRefund: true
diff --git a/Resources/Prototypes/_StarLight/Datasets/Railroading/delivery.yml b/Resources/Prototypes/_StarLight/Datasets/Railroading/delivery.yml
new file mode 100644
index 000000000000..45048268d231
--- /dev/null
+++ b/Resources/Prototypes/_StarLight/Datasets/Railroading/delivery.yml
@@ -0,0 +1,11 @@
+- type: localizedDataset
+  id: railroadingDeliveryMessages
+  values:
+    prefix: railroading-chat-delivery-message-
+    count: 7
+
+- type: localizedDataset
+  id: railroadingDeliveryWrappedMessages
+  values:
+    prefix: railroading-chat-delivery-wrapped-message-
+    count: 7
diff --git a/Resources/Prototypes/_StarLight/DeviceLinking/sink_ports.yml b/Resources/Prototypes/_StarLight/DeviceLinking/sink_ports.yml
new file mode 100644
index 000000000000..9b943958205e
--- /dev/null
+++ b/Resources/Prototypes/_StarLight/DeviceLinking/sink_ports.yml
@@ -0,0 +1,4 @@
+- type: sinkPort
+  id: BodyScannerReceiver
+  name: signal-port-name-body-scanner-receiver
+  description: signal-port-description-body-scanner-receiver
\ No newline at end of file
diff --git a/Resources/Prototypes/_StarLight/DeviceLinking/source_ports.yml b/Resources/Prototypes/_StarLight/DeviceLinking/source_ports.yml
new file mode 100644
index 000000000000..705726af4ebb
--- /dev/null
+++ b/Resources/Prototypes/_StarLight/DeviceLinking/source_ports.yml
@@ -0,0 +1,5 @@
+- type: sourcePort
+  id: BodyScannerSender
+  name: signal-port-name-body-scanner-sender
+  description: signal-port-description-body-scanner-sender
+  defaultLinks: [ BodyScannerReceiver ]
\ No newline at end of file
diff --git a/Resources/Prototypes/_StarLight/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/_StarLight/Entities/Clothing/Head/hardsuit-helmets.yml
index 63f8c9780e0f..426f48fda32a 100644
--- a/Resources/Prototypes/_StarLight/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/_StarLight/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -149,8 +149,8 @@
       coefficients:
         Blunt: 0.8
         Slash: 0.8
-        Piercing: 0.8  
-        
+        Piercing: 0.8
+
 # USSP
 - type: entity
   parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase, BaseSovietContraband]
@@ -199,9 +199,9 @@
   - type: Tag
     tags:
     - WhitelistChameleon
-        
+
 ##ntcc-medics
-        
+
 - type: entity
   parent: [ BaseCentcommContraband, ClothingHeadHelmetHardsuitSyndie ]
   id: ClothingHeadHelmetHardsuitNTNCConsortiumMedic
@@ -222,7 +222,7 @@
         Heat: 0.9
 
 - type: entity
-  parent: ClothingHeadHardsuitBase
+  parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
   id: ClothingHeadHelmetHardsuitLuxmax
   categories: [ HideSpawnMenu ]
   name: QM's luxury maxim hardsuit helmet
@@ -237,4 +237,4 @@
     lowPressureMultiplier: 1000
   - type: PointLight
     radius: 7
-    energy: 3
\ No newline at end of file
+    energy: 3
diff --git a/Resources/Prototypes/_StarLight/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/_StarLight/Entities/Clothing/OuterClothing/armor.yml
index 0adc696f0558..7c2a8433854f 100644
--- a/Resources/Prototypes/_StarLight/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/_StarLight/Entities/Clothing/OuterClothing/armor.yml
@@ -263,7 +263,6 @@
         Radiation: 0.5
         Caustic: 0.5
     staminaModifier: 0.35
-    ingoreKnockdown: true
   - type: ExplosionResistance
     damageCoefficient: 0.5
   - type: FireProtection
diff --git a/Resources/Prototypes/_StarLight/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_StarLight/Entities/Clothing/OuterClothing/hardsuits.yml
index a865a1c1f0f8..bc6fe5e23894 100644
--- a/Resources/Prototypes/_StarLight/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/_StarLight/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -217,7 +217,6 @@
         Radiation: 0.6
         Caustic: 0.6
     staminaModifier: 0.3
-    ingoreKnockdown: true
   - type: ExplosionResistance
     damageCoefficient: 0.5
   - type: ToggleClothing
@@ -301,7 +300,6 @@
         Radiation: 0.1
         Caustic: 0.4
     staminaModifier: 1
-    ingoreKnockdown: false
   - type: ClothingSpeedModifier
     walkModifier: 0.90
     sprintModifier: 0.90
diff --git a/Resources/Prototypes/_StarLight/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/_StarLight/Entities/Markers/Spawners/ghost_roles.yml
index efb89c69ed6f..a0c526a6c8ec 100644
--- a/Resources/Prototypes/_StarLight/Entities/Markers/Spawners/ghost_roles.yml
+++ b/Resources/Prototypes/_StarLight/Entities/Markers/Spawners/ghost_roles.yml
@@ -9,6 +9,12 @@
     rules: ghost-role-information-silicon-rules
     raffle:
       settings: default
+    requirements:
+    - !type:OverallPlaytimeRequirement
+      time: 86400 # 24h STARLIGHT
+    - !type:RoleTimeRequirement
+      role: JobBorg
+      time: 21600 # 6h STARLIGHT
   - type: Sprite
     sprite: Markers/jobs.rsi
     layers:
diff --git a/Resources/Prototypes/_StarLight/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/_StarLight/Entities/Mobs/NPCs/xeno.yml
new file mode 100644
index 000000000000..5c63256b87aa
--- /dev/null
+++ b/Resources/Prototypes/_StarLight/Entities/Mobs/NPCs/xeno.yml
@@ -0,0 +1,218 @@
+# Hacky for the stress test so don't even consider adding to this
+- type: entity
+  name: burrower
+  id: MobXenoAdmeme
+  suffix: Admeme
+  parent: SimpleSpaceMobBase
+  description: They mostly come at night. Mostly.
+  components:
+  - type: ThermalVision
+  - type: Insulated
+  - type: CombatMode
+  - type: InputMover
+  - type: MobMover
+  - type: HTN
+    rootTask:
+      task: XenoCompound
+    blackboard:
+      NavClimb: !type:Bool
+        true
+      NavInteract: !type:Bool
+        true
+      NavPry: !type:Bool
+        true
+      NavSmash: !type:Bool
+        true
+  - type: Prying
+    pryPowered: true
+    force: true
+    speedModifier: 2
+    useSound:
+      path: /Audio/Items/crowbar.ogg
+  - type: Reactive
+    groups:
+      Flammable: [Touch]
+      Extinguish: [Touch]
+  - type: NpcFactionMember
+    factions:
+    - Xeno
+  - type: Hands
+  - type: ComplexInteraction
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: Mobs/Aliens/Xenos/burrower.rsi
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: running
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.25
+        density: 1000
+        mask:
+        - MobMask
+        layer:
+        - MobLayer
+  - type: MobState
+    allowedStates:
+    - Alive
+    - Dead
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      150: Dead
+  - type: SlowOnDamage
+    speedModifierThresholds:
+      25: 0.5
+  - type: Stamina
+    critThreshold: 200
+  - type: Bloodstream
+    bloodReagent: FluorosulfuricAcid
+    bloodMaxVolume: 650
+  - type: MeleeWeapon
+    altDisarm: false
+    angle: 0
+    soundHit:
+     collection: AlienClaw
+    animation: WeaponArcBite
+    damage:
+      groups:
+        Brute: 20 
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: running
+      Critical:
+        Base: crit
+      Dead:
+        Base: dead
+  - type: Puller
+    needsHands: false
+  - type: Butcherable
+    butcheringType: Spike
+    spawned:
+    - id: FoodMeatXeno
+      amount: 5
+  - type: GhostRole
+    allowMovement: true
+    allowSpeech: true
+    makeSentient: true
+    name: ghost-role-information-xeno-name
+    description: ghost-role-information-xeno-description
+    rules: ghost-role-information-xeno-rules
+    raffle:
+      settings: default
+  - type: GhostTakeoverAvailable
+  - type: TypingIndicator
+    proto: alien
+  - type: Temperature
+    heatDamageThreshold: 360
+    coldDamageThreshold: -150
+    currentTemperature: 310.15
+  - type: Tag
+    tags:
+      - CannotSuicide
+      - DoorBumpOpener
+      - FootstepSound
+  - type: NoSlip
+  - type: Perishable #Ummmm the acid kills a lot of the bacteria or something
+    molsPerSecondPerUnitMass: 0.0005
+  - type: Speech
+    speechVerb: LargeMob
+
+- type: entity
+  name: praetorian
+  parent: MobXenoAdmeme
+  id: MobXenoRunnerAdmeme
+  suffix: Admeme
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: Mobs/Aliens/Xenos/runner.rsi
+    offset: 0,0.6
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: running
+  - type: MovementSpeedModifier
+    baseSprintSpeed: 6.0
+  - type: MeleeWeapon
+    damage:
+     groups:
+       Brute: 15
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.35
+        density: 235
+        mask:
+        - MobMask
+        layer:
+        - MobLayer
+
+- type: entity
+  name: rouny
+  parent: MobXenoRunner
+  id: MobXenoRounyAdmeme
+  suffix: Admeme
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: Mobs/Aliens/Xenos/rouny.rsi
+    offset: 0,0.6
+  - type: Butcherable
+    butcheringType: Spike
+    spawned:
+    - id: FoodMeatRouny
+      amount: 3
+
+- type: entity
+  name: spitter
+  parent: MobXenoAdmeme
+  id: MobXenoSpitterAdmeme
+  suffix: Admeme
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: Mobs/Aliens/Xenos/spitter.rsi
+    offset: 0,0.3
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: running
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      150: Dead
+  - type: SlowOnDamage
+    speedModifierThresholds:
+      25: 0.7
+  - type: HTN
+    rootTask:
+      task: SimpleRangedHostileCompound
+  - type: RechargeBasicEntityAmmo
+    rechargeCooldown: 0.75
+  - type: BasicEntityAmmoProvider
+    proto: BulletAcid
+    capacity: 3
+    count: 3
+  - type: Gun
+    fireRate: 0.25
+    useKey: false
+    selectedMode: FullAuto
+    availableModes:
+      - FullAuto
+    soundGunshot: /Audio/Weapons/Xeno/alien_spitacid.ogg
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.45
+        density: 235
+        mask:
+        - MobMask
+        layer:
+        - MobLayer
\ No newline at end of file
diff --git a/Resources/Prototypes/_StarLight/Entities/Mobs/Player/GhostThemes/staff.yml b/Resources/Prototypes/_StarLight/Entities/Mobs/Player/GhostThemes/staff.yml
index 398f6664cca9..91449d50795d 100644
--- a/Resources/Prototypes/_StarLight/Entities/Mobs/Player/GhostThemes/staff.yml
+++ b/Resources/Prototypes/_StarLight/Entities/Mobs/Player/GhostThemes/staff.yml
@@ -7,4 +7,16 @@
       sprite: Mobs/Demons/abomination.rsi
       state: abomination
     color: "#ffffff"
-  requirement: StaffRolesReq
\ No newline at end of file
+  requirement: StaffRolesReq
+
+- type: ghostTheme
+  id: SpaceDragonStaffTheme
+  name: Space Dragon
+  description: Giant space fish.
+  colorizeable: true
+  spriteSpecifier:
+    sprite:
+      sprite: Mobs/Aliens/Carps/dragon.rsi
+      state: alive
+    color: "#ffffff"
+  requirement: StaffRolesReq
diff --git a/Resources/Prototypes/_StarLight/Entities/Objects/Deliveries/deliveries.yml b/Resources/Prototypes/_StarLight/Entities/Objects/Deliveries/deliveries.yml
new file mode 100644
index 000000000000..e55801295751
--- /dev/null
+++ b/Resources/Prototypes/_StarLight/Entities/Objects/Deliveries/deliveries.yml
@@ -0,0 +1,78 @@
+- type: entity
+  parent: BaseDelivery
+  id: PackageDeliveryEvil
+  name: package
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      delivery: !type:NestedSelector
+        tableId: PackageDeliveryRewardsEvil
+
+- type: entity
+  parent: BaseDelivery
+  id: LetterDeliveryEvil
+  name: letter
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      delivery: !type:NestedSelector
+        tableId: LetterDeliveryRewardsEvil
+
+# Railroading
+
+- type: entity
+  parent: BaseDelivery
+  id: BasePackageDeliveryReward
+  name: package
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Cargo/mail_large.rsi
+    layers:
+    - state: icon
+      map: [ "enum.DeliveryVisualLayers.Icon" ]
+    - state: trash
+      map: [ "enum.DeliveryVisualLayers.Trash" ]
+      visible: false
+    - state: priority
+      map: [ "enum.DeliveryVisualLayers.PriorityTape" ]
+      visible: false
+      shader: unshaded
+    - state: fragile
+      map: [ "enum.DeliveryVisualLayers.FragileStamp" ]
+      visible: false
+    - state: postmark
+    - map: [ "enum.DeliveryVisualLayers.JobStamp" ]
+      offset: -0.21875, -0.25
+    - state: locked
+      map: [ "enum.DeliveryVisualLayers.Lock" ]
+    - state: broken
+      map: [ "enum.DeliveryVisualLayers.Breakage" ]
+      visible: false
+    - state: bomb
+      map: [ "enum.DeliveryVisualLayers.Bomb" ]
+      visible: false
+    - state: bomb_unshaded
+      map: [ "enum.DeliveryVisualLayers.BombPrimed" ]
+      shader: unshaded
+      visible: false
+  - type: MultiHandedItem
+  - type: Item
+    size: Huge
+  - type: Delivery
+    baseSpesoReward: 1000
+    baseSpesoPenalty: 250 # So low due to dept economy splitting all the earnings, but not splitting the penalty.
+    systemDeliverySpawn: true
+  - type: Speech
+    speechVerb: Robotic
+  - type: SimpleToolUsage
+    doAfter: 6
+      
+- type: entity
+  parent: BasePackageDeliveryReward
+  id: PackageDeliveryRewardPlush
+  components:
+  - type: ContainerFill
+    containers:
+      delivery:
+      - PlushieCarp
\ No newline at end of file
diff --git a/Resources/Prototypes/_StarLight/Entities/Objects/Deliveries/deliveries_tables.yml b/Resources/Prototypes/_StarLight/Entities/Objects/Deliveries/deliveries_tables.yml
new file mode 100644
index 000000000000..577d7cc21381
--- /dev/null
+++ b/Resources/Prototypes/_StarLight/Entities/Objects/Deliveries/deliveries_tables.yml
@@ -0,0 +1,76 @@
+### Spawners
+- type: entityTable
+  id: RandomDeliveryEvil
+  table: !type:GroupSelector
+    children:
+    - !type:NestedSelector
+      tableId: RandomDeliveryLetterEvil
+      weight: 0.7
+    - !type:NestedSelector
+      tableId: RandomDeliveryPackageEvil
+      weight: 0.3
+
+# Letters
+
+- type: entityTable # Used to pick between all different letter types, if there will be more
+  id: RandomDeliveryLetterEvil
+  table: !type:GroupSelector
+    children:
+    - id: LetterDeliveryEvil
+
+# Packages
+
+- type: entityTable # Used to pick between all different package types, if there will be more
+  id: RandomDeliveryPackageEvil
+  table: !type:GroupSelector
+    children:
+    - id: PackageDeliveryEvil
+
+### Reward Tables
+
+- type: entityTable
+  id: LetterDeliveryRewardsEvil
+  table: !type:GroupSelector
+    children:
+    - !type:NestedSelector
+      tableId: LetterCommonEntityTableEvil
+      weight: 0.6
+    - !type:NestedSelector
+      tableId: LetterUncommonEntityTable
+      weight: 0.1
+    - !type:NestedSelector
+      tableId: LetterRareEntityTable
+      weight: 0.3
+
+- type: entityTable
+  id: PackageDeliveryRewardsEvil
+  table: !type:GroupSelector
+    children:
+    - !type:NestedSelector
+      tableId: PackageCommonEntityTable
+      weight: 0.4
+    - !type:NestedSelector
+      tableId: PackageUncommonEntityTable
+      weight: 0.3
+    - !type:NestedSelector
+      tableId: PackageRareEntityTable
+      weight: 0.3
+
+### Loot Tables
+# Letters
+- type: entityTable
+  id: LetterCommonEntityTableEvil # Basically trash and spam mail, maybe something barely useful here and there
+  table: !type:GroupSelector
+    children:
+    - !type:NestedSelector
+      weight: .5
+      tableId: SpamMailTableEvil
+    - !type:NestedSelector
+      weight: .1
+      tableId: RandomBookTable
+    - !type:NestedSelector
+      weight: .2
+      tableId: RandomSnackTable
+    - !type:NestedSelector
+      weight: .2
+      tableId: RandomAllSodaTable
diff --git a/Resources/Prototypes/_StarLight/Entities/Objects/Deliveries/letter_loot_tables.yml b/Resources/Prototypes/_StarLight/Entities/Objects/Deliveries/letter_loot_tables.yml
index 31e0f9c2a434..a5bef24101d6 100644
--- a/Resources/Prototypes/_StarLight/Entities/Objects/Deliveries/letter_loot_tables.yml
+++ b/Resources/Prototypes/_StarLight/Entities/Objects/Deliveries/letter_loot_tables.yml
@@ -1,3 +1,16 @@
+
+# Common
+- type: entityTable
+  id: SpamMailTableEvil
+  table: !type:GroupSelector
+    children:
+      - id: MailSpamLetter
+        weight: .83
+      - !type:NestedSelector
+        tableId: MailAntagSpamLetter
+        weight: .17 #pre-nerf antag mail chance
+
+
 # all the letters here should have a `AntagOnSign` component of some sort so that when they are signed it can antag them
 
 - type: entityTable
@@ -9,4 +22,4 @@
       - id: MailSpamDontYouWantMore
         weight: .40
       - id: MailSovietSpamLetter25
-        weight: .35
\ No newline at end of file
+        weight: .35
diff --git a/Resources/Prototypes/_StarLight/Entities/Objects/Fun/plushie_datasets.yml b/Resources/Prototypes/_StarLight/Entities/Objects/Fun/plushie_datasets.yml
index c0c6d8c0eb8c..1dba614bd4c2 100644
--- a/Resources/Prototypes/_StarLight/Entities/Objects/Fun/plushie_datasets.yml
+++ b/Resources/Prototypes/_StarLight/Entities/Objects/Fun/plushie_datasets.yml
@@ -153,3 +153,9 @@
   values:
     prefix: plushie-brighteyes-
     count: 10
+
+- type: localizedDataset
+  id: PlushiesKilla
+  values:
+    prefix: plushie-killa-
+    count: 5
\ No newline at end of file
diff --git a/Resources/Prototypes/_StarLight/Entities/Objects/Fun/plushies.yml b/Resources/Prototypes/_StarLight/Entities/Objects/Fun/plushies.yml
index 322204eb0666..cdf98373ad9b 100644
--- a/Resources/Prototypes/_StarLight/Entities/Objects/Fun/plushies.yml
+++ b/Resources/Prototypes/_StarLight/Entities/Objects/Fun/plushies.yml
@@ -331,6 +331,49 @@
   - type: Item
     size: Small
     sprite: _Starlight/Objects/Fun/Plushies/mozan_plushie.rsi
+    
+- type: entity
+  parent: BaseMothPlushie
+  id: PlushieKoni
+  name: koni plushie
+  description: Some sort of moth-cat hybrid. You can't help but find it really cute. Can squeak and meow!
+  components:
+    - type: Sprite
+      sprite: _Starlight/Objects/Fun/Plushies/koni_plush.rsi
+      state: icon
+    - type: Item
+      size: Small
+      sprite: _Starlight/Objects/Fun/Plushies/koni_plush.rsi
+    - type: EmitSoundOnUse
+      sound:
+        collection: CatMothSounds
+    - type: EmitSoundOnActivate
+      sound:
+        collection: CatMothSounds
+    - type: EmitSoundOnCollide
+      sound:
+        collection: CatMothSounds
+    - type: EmitSoundOnLand
+      sound:
+        collection: CatMothScreams
+    - type: EmitSoundOnTrigger
+      sound:
+        collection: CatMothSounds
+    - type: MeleeWeapon
+      soundHit:
+        collection: CatMothSounds
+    - type: Food
+      useSound:
+        collection: CatMothScreams
+    - type: Clothing
+      quickEquip: false
+      sprite: _Starlight/Objects/Fun/Plushies/koni_plush.rsi
+      slots:
+        - HEAD
+      clothingVisuals:
+        head:
+          - state: equipped-HELMET
+      
 
 - type: entity
   parent: BasePlushie
@@ -1472,6 +1515,70 @@
           dataset: PlushiesRedwoods
         - type: TextToSpeech
           voice: klaasjeamandou
+   
+- type: entity
+  parent: BasePlushie
+  id: PlushieDoxesTheCaptain #Weh!
+  name: doxes-the-captain plushie
+  description: An adorable stuffed toy that resembles Doxes-the-Captain. "Captain's IP is 189.47.108.519!"
+  components:
+  - type: Sprite
+    sprite: _Starlight/Objects/Fun/Plushies/doxesthecaptain.rsi
+    state: icon
+  - type: Item
+    sprite: _Starlight/Objects/Fun/Plushies/doxesthecaptain.rsi
+  - type: EmitSoundOnUse
+    sound:
+      path: /Audio/Items/Toys/weh.ogg
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/Items/Toys/weh.ogg
+  - type: EmitSoundOnActivate
+    sound:
+      path: /Audio/Items/Toys/weh.ogg
+  - type: EmitSoundOnTrigger
+    sound:
+      path: /Audio/Items/Toys/weh.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Items/Toys/weh.ogg
+  - type: Food
+    requiresSpecialDigestion: true
+    useSound:
+      path: /Audio/Items/Toys/weh.ogg
+  - type: MeleeWeapon
+    wideAnimationRotation: 180
+    soundHit:
+      path: /Audio/Items/Toys/weh.ogg
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: JuiceThatMakesYouWeh
+        Quantity: 30
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: Fiber
+          Quantity: 10
+        - ReagentId: JuiceThatMakesYouWeh
+          Quantity: 10
+  - type: Clothing
+    quickEquip: false
+    sprite: _Starlight/Objects/Fun/Plushies/doxesthecaptain.rsi
+    slots:
+    - HEAD
+  - type: Speech
+    speechVerb: Reptilian # for pais (In the secret stash)
+  - type: FoodSequenceElement
+    entries:
+      CottonBurger: LizardPlushie
+  - type: Tag
+    tags:
+    - Payload
+    - ClothMade
+    - PlushieLizard
 
 - type: entity
   parent: BaseShadekinPlushie
@@ -1630,7 +1737,6 @@
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Animals/cat_meow2.ogg
-
   - type: Food
     requiresSpecialDigestion: true
     useSound:
@@ -1640,6 +1746,30 @@
     soundHit:
       path: /Audio/Animals/cat_hiss.ogg
 
+- type: entity
+  parent: BaseVulpkaninPlushie
+  id: PlushieKilla
+  name: killa plushie
+  description: Looks like a cheap knockoff, it has visibly loose stitching
+  components:
+  - type: Item
+    size: Small
+    sprite: _Starlight/Objects/Fun/Plushies/killa_plushie.rsi
+  - type: Sprite
+    sprite: _Starlight/Objects/Fun/Plushies/killa_plushie.rsi
+    layers: 
+      - state: KillaTamalePlush
+  - type: ItemToggle
+    onUse: false
+    verbToggleOn: plushie-voicebox-activate
+    verbToggleOff: plushie-voicebox-deactivate
+  - type: ComponentToggler
+    components:
+    - type: DatasetVocalizer
+      dataset: PlushiesKilla
+    - type: TextToSpeech
+      voice: heavy
+
 - type: entity
   parent: BasePlushie
   id: PlushieFixes
@@ -1667,4 +1797,4 @@
   - type: MeleeWeapon
     wideAnimationRotation: 180
     soundHit:
-      path: /Audio/Effects/Lightning/lightningshock.ogg
\ No newline at end of file
+      path: /Audio/Effects/Lightning/lightningshock.ogg
diff --git a/Resources/Prototypes/_StarLight/Entities/Objects/Misc/flatpacks.yml b/Resources/Prototypes/_StarLight/Entities/Objects/Misc/flatpacks.yml
index a54c23c1b523..807df2482280 100644
--- a/Resources/Prototypes/_StarLight/Entities/Objects/Misc/flatpacks.yml
+++ b/Resources/Prototypes/_StarLight/Entities/Objects/Misc/flatpacks.yml
@@ -6,7 +6,11 @@
   components:
   - type: Flatpack
     entity: PrinterDoc
-    
+  # Starlight-start: Vending Machines Prices
+  - type: ItemPrice
+    fallbackPrice: 0
+  # Starlight-end
+
 - type: entity
   parent: BaseFlatpack
   id: KitchenOvenFlatpack
diff --git a/Resources/Prototypes/_StarLight/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_StarLight/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index a6ee5de730ab..9e4f38492fa3 100644
--- a/Resources/Prototypes/_StarLight/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/_StarLight/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -870,3 +870,47 @@
     autoRechargeRate: 100
     autoRechargePause: true
     autoRechargePauseTime: 10
+
+- type: entity
+  name: pulse cannon
+  parent: [BaseWeaponBattery, BaseGunWieldable, BaseCentcommContraband]
+  id: WeaponPulseCannonNTNC
+  description: A weapon meant to blow holes in people with lasers. Like Superman. I like Superman.
+  components:
+  - type: Appearance
+  - type: Sprite
+    sprite: _Starlight/Objects/Weapons/Guns/Battery/ntnc_pulse.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+  - type: Clothing
+    sprite: _Starlight/Objects/Weapons/Guns/Battery/ntnc_pulse.rsi
+  - type: Item
+    size: Large
+  - type: Gun
+    selectedMode: SemiAuto
+    fireRate: 1.5
+    availableModes:
+      - SemiAuto
+      - FullAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
+  - type: HitscanBatteryAmmoProvider
+    proto: DeleteBeam
+    fireCost: 10
+  - type: BatteryWeaponFireModes
+    fireModes:
+    - proto: TaserBoltExtreme
+      fireCost: 10
+      #magState: stun
+    - proto: DeleteBeam
+      fireCost: 10
+      #magState: delete
+  - type: Battery
+    maxCharge: 500
+    startingCharge: 500
+  - type: BatterySelfRecharger
+    autoRecharge: true
+    autoRechargeRate: 50
+    autoRechargePause: true
+    autoRechargePauseTime: 10
diff --git a/Resources/Prototypes/_StarLight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/_StarLight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
index 64ed2277335a..e799e30e1c14 100644
--- a/Resources/Prototypes/_StarLight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
+++ b/Resources/Prototypes/_StarLight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
@@ -844,6 +844,24 @@
   damage:
     types:
       Heat: 60
+
+- type: hitscan
+  id: DeleteBeam
+  name: erasing beam
+  parent: LaserTrace
+  muzzleFlash:
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+    state: muzzle_blue
+  travelFlash:
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+    state: beam_blue
+  impactFlash:
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
+    state: impact_blue
+  damage:
+    types:
+      Heat: 10
+      Blunt: 40
       
 - type: hitscan
   id: DisablerBoltPractice
@@ -883,6 +901,22 @@
     types:
       Heat: 0
       
+- type: hitscan
+  id: TaserBoltExtreme
+  name: taser bolt
+  parent: EnergyTrace
+  bullet:
+    sprite:
+      sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
+      state: spark
+    color: "#ffff33"
+  staminaDamage: 100
+  #knockdownAmount: 0.5
+  #maxLength: 5
+  damage:
+    types:
+      Heat: 0
+      
 - type: hitscan
   id: AdvancedTaserBolt
   name: taser bolt
diff --git a/Resources/Prototypes/_StarLight/Entities/Objects/Weapons/Melee/cyberlimb.yml b/Resources/Prototypes/_StarLight/Entities/Objects/Weapons/Melee/cyberlimb.yml
index 740cb29b0cfb..a6677bfb189e 100644
--- a/Resources/Prototypes/_StarLight/Entities/Objects/Weapons/Melee/cyberlimb.yml
+++ b/Resources/Prototypes/_StarLight/Entities/Objects/Weapons/Melee/cyberlimb.yml
@@ -42,13 +42,16 @@
         Blunt: 0.5
   - type: Item
     sprite: _Starlight/Objects/Weapons/Melee/cyberchainsaw.rsi
-  - type: Scalpel
+  # 🌟Starlight-start🌟
+  - type: BoneSaw
   - type: SurgeryTool
-    successRate: 0.01
+    successRate: 0.6
+    speed: 0.2
     startSound:
-      path: /Audio/Weapons/chainsaw.ogg
+      path: /Audio/Weapons/chainsawwield.ogg
     endSound:
       path: /Audio/Weapons/chainsaw.ogg
+  # 🌟Starlight-end🌟
   - type: Reflect
     reflectProb: 0.1
 
diff --git a/Resources/Prototypes/_StarLight/Entities/Structures/Decorations/statues.yml b/Resources/Prototypes/_StarLight/Entities/Structures/Decorations/statues.yml
index 58f5425031cc..0d1e1f9bf502 100644
--- a/Resources/Prototypes/_StarLight/Entities/Structures/Decorations/statues.yml
+++ b/Resources/Prototypes/_StarLight/Entities/Structures/Decorations/statues.yml
@@ -9,4 +9,18 @@
     sprite: _Starlight/Structures/Decorations/Statues.rsi
     state: stone_tea
     drawdepth: Mobs
+    offset: "0.0,0.5"
+
+- type: entity
+  id: StatueOneYearAnniversary
+  parent: BaseStructure
+  name: monument to the first year
+  description: |
+    A marble statue of an idealized employee, made to commemorate the first anniversary of NanoTrasen control over the Starlight Sector.
+    While ostensibly celebratory, it seems oddly mournful. Many died to make this possible.
+  components:
+  - type: Sprite
+    sprite: _Starlight/Structures/Decorations/Statues.rsi
+    state: one_year_anniversary
+    drawdepth: Mobs
     offset: "0.0,0.5"
\ No newline at end of file
diff --git a/Resources/Prototypes/_StarLight/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_StarLight/Entities/Structures/Machines/vending_machines.yml
index f1e38b255372..a26d52dd5657 100644
--- a/Resources/Prototypes/_StarLight/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/_StarLight/Entities/Structures/Machines/vending_machines.yml
@@ -208,6 +208,7 @@
       pack: AbductorGlandInventory
       offState: icon
       brokenState: icon
+      showPrices: false
       normalState: icon
       denyState: icon
       ejectDelay: 2
diff --git a/Resources/Prototypes/_StarLight/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_StarLight/Entities/Structures/Storage/Closets/Lockers/lockers.yml
index 1684de3f4bf9..0b0777b8d62d 100644
--- a/Resources/Prototypes/_StarLight/Entities/Structures/Storage/Closets/Lockers/lockers.yml
+++ b/Resources/Prototypes/_StarLight/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -37,6 +37,8 @@
     stateDoorClosed: warden_door
   - type: AccessReader
     access: [["Armory"]]
+  - type: WiresPanelSecurity
+    securityLevel: medSecurity
   
 # Brigmedic
 - type: entity
@@ -67,6 +69,8 @@
     stateDoorClosed: bssecure_door
   - type: AccessReader
     access: [ [ "BlueShield" ] ]
+  - type: WiresPanelSecurity
+    securityLevel: medSecurity
     
 # Mining Specialist
 - type: entity
diff --git a/Resources/Prototypes/_StarLight/GameRules/events.yml b/Resources/Prototypes/_StarLight/GameRules/events.yml
index aab8b8f98593..e4583d99ea0d 100644
--- a/Resources/Prototypes/_StarLight/GameRules/events.yml
+++ b/Resources/Prototypes/_StarLight/GameRules/events.yml
@@ -175,6 +175,15 @@
     - type: LoadMapRule
       mapPath: /Maps/_Starlight/EventMaps/research_outpost_map.yml
 
+#Quini's CBURN Shuttle
+- type: entity
+  parent: BaseGameRule
+  id: CBURNShuttleSpawn_Q
+  components:
+    - type: RuleGrids
+    - type: LoadMapRule
+      gridPath: /Maps/_Starlight/Shuttles/CBURN_Q.yml
+
 # Roundender-less events table for survival
 - type: entityTable
   id: BasicAntagEventsTableNoRoundenders
diff --git a/Resources/Prototypes/_StarLight/GameRules/railroading.yml b/Resources/Prototypes/_StarLight/GameRules/railroading.yml
index 61a270625037..6a2e114bd989 100644
--- a/Resources/Prototypes/_StarLight/GameRules/railroading.yml
+++ b/Resources/Prototypes/_StarLight/GameRules/railroading.yml
@@ -17,7 +17,8 @@
 #    - RRCardFoodHerbSalad
 #    - RRCardFoodMelonFruitBowl
 #    - RRCardFoodStew
-    - RRCardMetabolizeNicotine
+#    - RRCardMetabolizeNicotine
+    - RRCardMetabolizeTest
 
 - type: entity
   parent: BaseGameRule
diff --git a/Resources/Prototypes/_StarLight/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/_StarLight/Loadouts/Jobs/Security/security_officer.yml
index 97a14a36a11e..f5280f1b7427 100644
--- a/Resources/Prototypes/_StarLight/Loadouts/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/_StarLight/Loadouts/Jobs/Security/security_officer.yml
@@ -28,4 +28,12 @@
   storage:
     back:
       - WeaponPistolDP
-      - MagazinePistol40SP
\ No newline at end of file
+      - MagazinePistol40SP
+
+- type: loadout
+  id: SecurityPistolEnforcer
+  dummyEntity: WeaponPistolEnforcer
+  storage:
+    back:
+    - WeaponPistolEnforcer
+    - MagazinePistolSP
diff --git a/Resources/Prototypes/_StarLight/Loadouts/loadout_groups.yml b/Resources/Prototypes/_StarLight/Loadouts/loadout_groups.yml
index 7163b17b2caa..d1988805cb43 100644
--- a/Resources/Prototypes/_StarLight/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/_StarLight/Loadouts/loadout_groups.yml
@@ -153,6 +153,7 @@
   loadouts:
   - SecurityMk58
   - SecurityPistolDP
+  - SecurityPistolEnforcer
 
 # Assorted Boots
 - type: loadoutGroup
diff --git a/Resources/Prototypes/_StarLight/Magic/event_spells.yml b/Resources/Prototypes/_StarLight/Magic/event_spells.yml
new file mode 100644
index 000000000000..0dd60a4fc98f
--- /dev/null
+++ b/Resources/Prototypes/_StarLight/Magic/event_spells.yml
@@ -0,0 +1,17 @@
+- type: entity
+  parent: BaseAction
+  id: ActionSummonCheese
+  name: Summon Cheese
+  description: Places a slice of cheese in your hand. delicious!
+  components:
+  - type: Magic
+    requiresClothes: false
+  - type: Action
+    useDelay: 15
+    itemIconStyle: BigAction
+    icon:
+      sprite: Objects/Consumable/Food/ingredients.rsi
+      state: cheesewedge
+  - type: InstantAction
+    event: !type:SpawnItemInHandEvent
+      spawned: FoodCheeseSlice
diff --git a/Resources/Prototypes/_StarLight/Railroading/test.yml b/Resources/Prototypes/_StarLight/Railroading/test.yml
new file mode 100644
index 000000000000..6d0e54425ad0
--- /dev/null
+++ b/Resources/Prototypes/_StarLight/Railroading/test.yml
@@ -0,0 +1,27 @@
+- type: entity
+  id: RRCardMetabolizeTest
+  parent: MetabolizeCondition
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: RailroadSpawnFlow
+    count: 
+      min: 1
+      max: 3
+  - type: RailroadCard
+    title: rr-smoke
+    icon: ""
+    iconColor: '#9FED5896'
+    color: '#515151'
+    image: /Textures/_Starlight/Railroading/smoking.png
+    description: rr-smoking-desc
+  - type: RailroadMetabolizeTask
+    reagents:
+    - ReagentId: Nicotine
+      Quantity: 1
+    icon:
+      sprite: Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi
+      state: lit-icon
+  - type: RailroadDeliveryReward
+    delivery: PackageDeliveryRewardPlush
+    dataset: railroadingDeliveryMessages
+    wrappedDataset: railroadingDeliveryWrappedMessages
\ No newline at end of file
diff --git a/Resources/Prototypes/_StarLight/Recipes/Reactions/medicine.yml b/Resources/Prototypes/_StarLight/Recipes/Reactions/medicine.yml
index f8fa54f25edf..bcba981bfbbe 100644
--- a/Resources/Prototypes/_StarLight/Recipes/Reactions/medicine.yml
+++ b/Resources/Prototypes/_StarLight/Recipes/Reactions/medicine.yml
@@ -10,4 +10,38 @@
     Iron:
       amount: 1
   products:
-    Amoxla: 2
\ No newline at end of file
+    Amoxla: 2
+
+
+- type: reaction
+  id: BicarLacerinol # mixing any two brute medications will make Razorium
+  impact: Medium
+  reactants:
+    Lacerinol:
+      amount: 1
+    Bicaridine:
+      amount: 1
+  products:
+    Razorium: 1
+
+- type: reaction
+  id: BicarPuncturase # mixing any two brute medications will make Razorium
+  impact: Medium
+  reactants:
+    Puncturase:
+      amount: 1
+    Bicaridine:
+      amount: 1
+  products:
+    Razorium: 1
+
+- type: reaction
+  id: BicarBruizine # mixing any two brute medications will make Razorium
+  impact: Medium
+  reactants:
+    Bruizine:
+      amount: 1
+    Bicaridine:
+      amount: 1
+  products:
+    Razorium: 1
\ No newline at end of file
diff --git a/Resources/Prototypes/_StarLight/Roles/Jobs/Representives/blueshield.yml b/Resources/Prototypes/_StarLight/Roles/Jobs/Representives/blueshield.yml
index 37215062e857..e7b0374386dc 100644
--- a/Resources/Prototypes/_StarLight/Roles/Jobs/Representives/blueshield.yml
+++ b/Resources/Prototypes/_StarLight/Roles/Jobs/Representives/blueshield.yml
@@ -33,7 +33,9 @@
     - Detective
     - Salvage
     - Security
+    - Brigmedic
     - Brig
+    - Lawyer
     - Cargo
     - Atmospherics
     - Cargo
diff --git a/Resources/Prototypes/_StarLight/SoundCollections/catmoth.yml b/Resources/Prototypes/_StarLight/SoundCollections/catmoth.yml
new file mode 100644
index 000000000000..ae9602412d0d
--- /dev/null
+++ b/Resources/Prototypes/_StarLight/SoundCollections/catmoth.yml
@@ -0,0 +1,23 @@
+- type: soundCollection
+  id: CatMothSounds
+  files:
+    # too lazy to check if this is true or not but i feel like putting one of these multiple times makes it more likely to play
+    - /Audio/Voice/Moth/moth_chitter.ogg
+    - /Audio/Voice/Moth/moth_chitter.ogg
+    - /Audio/Voice/Moth/moth_squeak.ogg
+    - /Audio/Voice/Moth/moth_squeak.ogg
+    - /Audio/_Starlight/Voice/Felionoid/cat_trill1.ogg
+    - /Audio/_Starlight/Voice/Felionoid/cat_trill2.ogg
+    - /Audio/_Starlight/Voice/Felionoid/cat_mew1.ogg
+    - /Audio/_Starlight/Voice/Felionoid/cat_mew2.ogg
+    - /Audio/_Starlight/Voice/Felionoid/cat_meow4.ogg
+    - /Audio/_Starlight/Voice/Felionoid/cat_meow5.ogg
+- type: soundCollection
+  id: CatMothScreams
+  files:
+    - /Audio/Voice/Moth/moth_chitter.ogg
+    - /Audio/Voice/Moth/moth_squeak.ogg
+    - /Audio/Voice/Moth/moth_scream.ogg
+    - /Audio/_Starlight/Voice/Felionoid/cat_scream2.ogg
+    - /Audio/_Starlight/Voice/Felionoid/cat_scream4.ogg
+    - /Audio/_Starlight/Voice/Felionoid/cat_hiss3.ogg
diff --git a/Resources/Prototypes/_StarLight/Wires/layouts.yml b/Resources/Prototypes/_StarLight/Wires/layouts.yml
new file mode 100644
index 000000000000..91d7158745c4
--- /dev/null
+++ b/Resources/Prototypes/_StarLight/Wires/layouts.yml
@@ -0,0 +1,17 @@
+- type: wireLayout
+  id: Locker
+  wires:
+  - !type:PowerWireAction
+  - !type:PowerWireAction
+    pulseTimeout: 15
+  - !type:AccessWireAction
+    electrify: true
+  - !type:AiInteractWireAction
+  - !type:LogWireAction
+  dummyWires: 1
+  
+- type: wireLayout
+  id: MedibotControls
+  dummyWires: 9
+  wires:
+  - !type:SpeechWireAction
\ No newline at end of file
diff --git a/Resources/Prototypes/_StarLight/price_categories.yml b/Resources/Prototypes/_StarLight/price_categories.yml
new file mode 100644
index 000000000000..631b813a2abe
--- /dev/null
+++ b/Resources/Prototypes/_StarLight/price_categories.yml
@@ -0,0 +1,45 @@
+- type: priceCategory
+  id: food_cheap
+  min: 1
+  max: 3
+
+- type: priceCategory
+  id: food_medium
+  min: 3
+  max: 6
+
+- type: priceCategory
+  id: cigaretes
+  min: 3
+  max: 15
+
+- type: priceCategory
+  id: drink
+  min: 1
+  max: 10
+
+- type: priceCategory
+  id: tool_cheap
+  min: 3
+  max: 18
+
+- type: priceCategory
+  id: tool_basic
+  min: 10
+  max: 30
+
+- type: priceCategory
+  id: medical
+  min: 4
+  max: 20
+
+- type: priceCategory
+  id: clothing
+  min: 2
+  max: 18
+
+- type: priceCategory
+  id: miscellaneous
+  min: 1
+  max: 5
+
diff --git a/Resources/Prototypes/_StarLight/tags.yml b/Resources/Prototypes/_StarLight/tags.yml
index 2ae37f6f29a7..b6611b356a09 100644
--- a/Resources/Prototypes/_StarLight/tags.yml
+++ b/Resources/Prototypes/_StarLight/tags.yml
@@ -3,13 +3,15 @@
 - type: Tag
   id: Arachnid
 
-
 - type: Tag
   id: Avali
 
 - type: Tag
   id: AvianFood
 
+- type: Tag
+  id: BibleThwackRemovable
+
 - type: Tag
   id: BladePlasteel
 
@@ -180,3 +182,9 @@
 
 - type: Tag
   id: Table
+
+- type: Tag
+  id: SecuredLocker
+
+- type: Tag
+  id: Locker
\ No newline at end of file
diff --git a/Resources/Prototypes/name_identifier_groups.yml b/Resources/Prototypes/name_identifier_groups.yml
index ab8c9f90acbc..9777e84243f2 100644
--- a/Resources/Prototypes/name_identifier_groups.yml
+++ b/Resources/Prototypes/name_identifier_groups.yml
@@ -1,37 +1,37 @@
 # Non-fungible apes, anyone?
 - type: nameIdentifierGroup
   id: Monkey
-  prefix: MK
+  format: name-identifier-format-monkey
 
 - type: nameIdentifierGroup
   id: Kobold
-  prefix: KB
+  format: name-identifier-format-kobold
 
 - type: nameIdentifierGroup
   id: Holoparasite
-  prefix: HOLO
+  format: name-identifier-format-holoparasite
 
 - type: nameIdentifierGroup
   id: MMI
-  prefix: MMI
+  format: name-identifier-format-mmi
   minValue: 100
   maxValue: 999
 
 - type: nameIdentifierGroup
   id: PositronicBrain
-  prefix: PB
+  format: name-identifier-format-positronic-brain
   minValue: 10
   maxValue: 99
 
 - type: nameIdentifierGroup
   id: Silicon
-  prefix: Si
+  format: name-identifier-format-silicon
   minValue: 1000
   maxValue: 9999
 
 - type: nameIdentifierGroup
   id: StationAi
-  prefix: AI
+  format: name-identifier-format-station-ai
   minValue: 100
   maxValue: 999
 
@@ -51,6 +51,6 @@
 
 - type: nameIdentifierGroup
   id: CargoTelepads
-  prefix: TELE
+  format: name-identifier-format-telepad
   minValue: 0
   maxValue: 999
diff --git a/Resources/Prototypes/status_effects.yml b/Resources/Prototypes/status_effects.yml
index 1c89f04b6959..0ee17dcff6a7 100644
--- a/Resources/Prototypes/status_effects.yml
+++ b/Resources/Prototypes/status_effects.yml
@@ -8,13 +8,9 @@
   id: Stun
   alert: Stun
 
-- type: statusEffect
+- type: statusEffect #TODO: Starlight mabey?
   id: Friction
 
-- type: statusEffect
-  id: KnockedDown
-  alert: Stun
-
 - type: statusEffect
   id: SlowedDown
 
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index c4a0207480ac..a194e1a0924c 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -698,6 +698,9 @@
 - type: Tag
   id: Goat
 
+- type: Tag
+  id: GoldenPlunger
+
 - type: Tag
   id: Goliath
 
@@ -911,6 +914,9 @@
 - type: Tag
   id: Knife
 
+- type: Tag
+  id: KnockdownImmune
+
 - type: Tag
   id: LavaBrig
 
@@ -1185,6 +1191,12 @@
 - type: Tag
   id: PlushieCarp
 
+- type: Tag
+  id: PlushieCarpHolo
+
+- type: Tag
+  id: PlushieCarpMagi
+
 - type: Tag
   id: PlushieGhost
 
@@ -1360,6 +1372,9 @@
 - type: Tag
   id: Slice # sliced fruit, vegetables, pizza etc.
 
+- type: Tag
+  id: SlowImmune
+
 - type: Tag
   id: SmallAIChip
 
@@ -1436,6 +1451,9 @@
 - type: Tag
   id: StringInstrument
 
+- type: Tag
+  id: StunImmune
+
 - type: Tag
   id: SubdermalImplant
 
diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml b/Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
index ad2c5d9bf26f..d70e4cf4445d 100644
--- a/Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
+++ b/Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
@@ -9,7 +9,7 @@
   ## Various Antagonists
   Antagonists can take many forms, like:
   - [textlink="Traitors" link="Traitors"] amongst the crew who must assassinate, steal and deceive.
-  - [textlink="Thieves" link="Thieves"] driven by kleptomania, determined to get their fix using their special gloves.
+  - [textlink="Thieves" link="Thieves"] driven by kleptomania, determined to get their fix using their special tools.
   - [textlink="Revolutionaries / Red Tide" link="Revolutionaries"] who are intent on taking control of the station from the inside.
   - [textlink="Nuclear operatives" link="Nuclear Operatives"], with the goal of infiltrating and destroying the station.
   - [textlink="Space Ninjas" link="SpaceNinja"], masters of espionage and sabotage with special gear.
diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Thieves.xml b/Resources/ServerInfo/Guidebook/Antagonist/Thieves.xml
index 2250661a96a2..00a86f966e6c 100644
--- a/Resources/ServerInfo/Guidebook/Antagonist/Thieves.xml
+++ b/Resources/ServerInfo/Guidebook/Antagonist/Thieves.xml
@@ -14,10 +14,13 @@
   Unlike other antagonists, [bold]staying out of trouble is almost a requirement for you[/bold] because of your implant.
   You can only run if [color=#cb0000]Security[/color] picks a fight with you, and because you work alone you don't have any friends to pull you out of danger.
 
-  But against all odds, you'll successfully swipe what you want using determination, sleight of hand, a few tools and your [color=cyan]light fingers.[/color]
+  But against all odds, you'll sucessfully swipe what you want using determination, sleight of hand, a few tools and your [color=cyan]pickpocketing skills.[/color]
+
+  The pickpocketing skills you have give you a major advantage: [bold]the ability to take things from people without them even noticing.[/bold] With a little practice you can steal their wallet and keep up a conversation at the same time.
+
+  It is advised to get a pair of gloves as your fingerprints could still be traced back to the stolen goods if they're found.
+
 
-  Your years of experience have given you the ability to [bold]swiftly take things off another person's body without them even noticing.[/bold]
-  With a little practice, you can even steal their wallet and keep up a conversation at the same time.
 
   ## Tools of the Trade
   You've got two more aces up your stolen sleeves: your [color=cyan]beacon[/color] and your [color=cyan]satchel.[/color]
diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
index d8ff4ba54270..78175b087a13 100644
--- a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
+++ b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
@@ -48,7 +48,7 @@
   The purchases that you make should be to help you with your objectives. Some gear may not be of use to you, and you'll have to choose between being sneaky or going loud.
 
   ## Coordination
-  Codewords are words or phrases that every traitor will know. They provide a discreet way to identify or establish contact with a fellow traitor, which can be useful if your objectives include [italic][color=cyan]keeping them alive[/color][/italic] or [italic][color=cyan]helping them with their objectives.[/color][/italic]
+  Codewords are words or phrases that every traitor will know. They provide a discreet way to identify or establish contact with a fellow traitor, which can be useful if your objectives include [italic][color=cyan]helping them with their objectives.[/color][/italic]
 
   When you find some friends, [bold]you can withdraw [color=red]telecrystals[/color] from your uplink to give to them.[/bold] They can put these in their own uplink to spend for themselves.
 
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-dog.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-dog.png
rename to Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-dog.png
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-light-dog.png
similarity index 62%
rename from Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-dog.png
rename to Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-light-dog.png
index 47e86a2eda98..f385d0bfc832 100644
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-dog.png and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-light-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-light-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-light-vox.png
new file mode 100644
index 000000000000..879ce40a74a2
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-light-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-light.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-light.png
new file mode 100644
index 000000000000..9f75f28c0562
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-light.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-unshaded-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-unshaded-dog.png
new file mode 100644
index 000000000000..0bdcc6cc576c
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-unshaded-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-unshaded-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-unshaded-vox.png
new file mode 100644
index 000000000000..66c795f90054
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-unshaded-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-unshaded.png
new file mode 100644
index 000000000000..9b0ba1f35ff1
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-unshaded.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-vox.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-vox.png
rename to Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head-vox.png
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/equipped-head.png
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/icon-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/icon-unshaded.png
new file mode 100644
index 000000000000..ce3eec5f94ab
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/icon-unshaded.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/light-overlay.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/light-overlay.png
new file mode 100644
index 000000000000..5347ab016e2a
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/light-overlay.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json
index 88dabe491ab7..4cdc059df8af 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json
@@ -10,31 +10,49 @@
         {
             "name": "icon"
         },
+        {
+            "name": "icon-unshaded"
+        },
         {
             "name": "icon-flash"
         },
         {
-            "name": "off-equipped-HELMET",
+            "name": "light-overlay"
+        },
+        {
+            "name": "equipped-head",
+            "directions": 4
+        },
+        {
+            "name": "equipped-head-light",
+            "directions": 4
+        },
+        {
+            "name": "equipped-head-unshaded",
+            "directions": 4
+        },
+        {
+            "name": "equipped-head-vox",
             "directions": 4
         },
         {
-            "name": "on-equipped-HELMET",
+            "name": "equipped-head-light-vox",
             "directions": 4
         },
         {
-            "name": "off-equipped-HELMET-vox",
+            "name": "equipped-head-unshaded-vox",
             "directions": 4
         },
         {
-            "name": "on-equipped-HELMET-vox",
+            "name": "equipped-head-dog",
             "directions": 4
         },
         {
-            "name": "off-equipped-HELMET-dog",
+            "name": "equipped-head-light-dog",
             "directions": 4
         },
         {
-            "name": "on-equipped-HELMET-dog",
+            "name": "equipped-head-unshaded-dog",
             "directions": 4
         }
     ]
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-dog.png
deleted file mode 100644
index 30c3ddf6a446..000000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-dog.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-vox.png
deleted file mode 100644
index 574b3d985b70..000000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-vox.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET.png
deleted file mode 100644
index 6baf685a6625..000000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-dog.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-dog.png
rename to Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-dog.png
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-light-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-light-dog.png
new file mode 100644
index 000000000000..f385d0bfc832
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-light-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-light-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-light-vox.png
new file mode 100644
index 000000000000..879ce40a74a2
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-light-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-light.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-light.png
new file mode 100644
index 000000000000..9f75f28c0562
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-light.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-unshaded-dog.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-unshaded-dog.png
new file mode 100644
index 000000000000..c16b5c789726
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-unshaded-dog.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-unshaded-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-unshaded-vox.png
new file mode 100644
index 000000000000..5ef8283e9535
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-unshaded-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-unshaded.png
new file mode 100644
index 000000000000..a0be8625d2dc
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-unshaded.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-vox.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-vox.png
rename to Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head-vox.png
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/equipped-head.png
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon-unshaded.png
new file mode 100644
index 000000000000..dab725cf3e19
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon-unshaded.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon.png
index 45763e5696f2..a691ca7cf158 100644
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/light-overlay.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/light-overlay.png
new file mode 100644
index 000000000000..5347ab016e2a
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/light-overlay.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json
index 9f81ae9002e5..4cdc059df8af 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json
@@ -10,31 +10,49 @@
         {
             "name": "icon"
         },
+        {
+            "name": "icon-unshaded"
+        },
         {
             "name": "icon-flash"
         },
         {
-            "name": "off-equipped-HELMET",
+            "name": "light-overlay"
+        },
+        {
+            "name": "equipped-head",
+            "directions": 4
+        },
+        {
+            "name": "equipped-head-light",
+            "directions": 4
+        },
+        {
+            "name": "equipped-head-unshaded",
+            "directions": 4
+        },
+        {
+            "name": "equipped-head-vox",
             "directions": 4
         },
         {
-            "name": "off-equipped-HELMET-vox",
+            "name": "equipped-head-light-vox",
             "directions": 4
         },
         {
-            "name": "off-equipped-HELMET-dog",
+            "name": "equipped-head-unshaded-vox",
             "directions": 4
         },
         {
-            "name": "on-equipped-HELMET",
+            "name": "equipped-head-dog",
             "directions": 4
         },
         {
-            "name": "on-equipped-HELMET-vox",
+            "name": "equipped-head-light-dog",
             "directions": 4
         },
         {
-            "name": "on-equipped-HELMET-dog",
+            "name": "equipped-head-unshaded-dog",
             "directions": 4
         }
     ]
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-vox.png
deleted file mode 100644
index 1a40bc3a266a..000000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-vox.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET.png
deleted file mode 100644
index 896f1fe37541..000000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/QuarterMaster.png b/Resources/Textures/Interface/Misc/job_icons.rsi/QuarterMaster.png
index 2e2e6fdcd627..07a5f1619fd6 100644
Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/QuarterMaster.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/QuarterMaster.png differ
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
index 1d3a244786d9..9cb6805298a9 100644
--- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
+++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github) | paradoxClone taken from tg station at commit https://github.com/tgstation/tgstation/commit/d0db1ff267557017ae7bde68e6490e70cbb6e42f and modifed by slarticodefast (Github) | Boxer, Chaplain, Janitor, Lawyer, Librarian recoloured by K-Dynamic (github) | Cluwne icon by Professor Renderer (Discord) | Borg and StationAi edit by Eroph for Starlight",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github) | paradoxClone taken from tg station at commit https://github.com/tgstation/tgstation/commit/d0db1ff267557017ae7bde68e6490e70cbb6e42f and modifed by slarticodefast (Github) | Boxer, Chaplain, Janitor, Lawyer, Librarian recoloured by K-Dynamic (github) | Cluwne icon by Professor Renderer (Discord) | QuarterMaster modified by K-Dynamic (github) | Borg and StationAi edit by Eroph for Starlight",
     "size": {
         "x": 8,
         "y": 8
diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail.png b/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail.png
index 7edd5f40f5d8..4cbdc0349e6e 100644
Binary files a/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail.png and b/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail.png differ
diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_big.png b/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_big.png
index a9dfd0f6d612..31626f813baf 100644
Binary files a/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_big.png and b/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_big.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/jumpsuit.png b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/jumpsuit.png
index 2c938634eb63..18ce524dbb74 100644
Binary files a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/jumpsuit.png and b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/jumpsuit.png differ
diff --git a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json
index 0c910f85e564..e46ca5602494 100644
--- a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json
+++ b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json
@@ -26,6 +26,10 @@
             "name": "head",
             "directions": 4
         },
+        {
+            "name": "neck",
+            "directions": 4
+        },
         {
             "name": "ears",
             "directions": 4
diff --git a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/neck.png b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/neck.png
new file mode 100644
index 000000000000..8783d770ea35
Binary files /dev/null and b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/neck.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-inhand-left.png
new file mode 100644
index 000000000000..623d36ba2889
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-inhand-right.png
new file mode 100644
index 000000000000..117e4559b0d8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice-inhand-left.png
new file mode 100644
index 000000000000..db53efc5a9c6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice-inhand-right.png
new file mode 100644
index 000000000000..883083e177f5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice.png
new file mode 100644
index 000000000000..dbcc9f262b10
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton-slice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton.png
new file mode 100644
index 000000000000..eeee2e200ace
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/cotton.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json
index f54a9cfcc960..e00bbdeeea1f 100644
--- a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, inhands by mubururu_ (github)",
+    "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, inhands by mubururu_ (github), cotton cake sprites by DispenserG0inUp",
     "size": {
         "x": 32,
         "y": 32
@@ -308,6 +308,28 @@
         {
             "name": "lemoon-slice"
 
+        },
+		{
+            "name": "cotton"
+        },
+        {
+            "name": "cotton-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "cotton-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "cotton-slice"
+        },
+        {
+            "name": "cotton-slice-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "cotton-slice-inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json b/Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json
index c6e79f0c9b64..fe592577c40e 100644
--- a/Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d, station and syndicate pinpointer resprited by Ubaser, inhands by TiniestShark (github)",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d, station and syndicate pinpointer resprited by Ubaser, inhands by TiniestShark (github). Modified by @whatston3 and @Quantum-cross (github) to center the sprite so arrow rotation is around the proper axis.",
     "states": [
         {
             "name": "pinonalert",
diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonalert.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonalert.png
index 39e73ee2664a..28c34227a3e9 100644
Binary files a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonalert.png and b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonalert.png differ
diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonalertdirect.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonalertdirect.png
index 6e53ef3a3b29..90399cabd2a7 100644
Binary files a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonalertdirect.png and b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonalertdirect.png differ
diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonalertnull.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonalertnull.png
index 1556d82c76d9..7e959c01553e 100644
Binary files a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonalertnull.png and b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonalertnull.png differ
diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonclose.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonclose.png
index d652e4cd02a1..31c8baba2c4e 100644
Binary files a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonclose.png and b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonclose.png differ
diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinondirect.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinondirect.png
index c2ac6e44e272..65ae634ac552 100644
Binary files a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinondirect.png and b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinondirect.png differ
diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinondirectlarge.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinondirectlarge.png
index c8b1fa487524..d7e86873b77e 100644
Binary files a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinondirectlarge.png and b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinondirectlarge.png differ
diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinondirectsmall.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinondirectsmall.png
index ab7940efd992..bef7821c7cca 100644
Binary files a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinondirectsmall.png and b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinondirectsmall.png differ
diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinondirectxtrlarge.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinondirectxtrlarge.png
index 5db693402ca4..edbb1dfbcbe6 100644
Binary files a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinondirectxtrlarge.png and b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinondirectxtrlarge.png differ
diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonfar.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonfar.png
index fd0fbf51ac65..37ed33b205ba 100644
Binary files a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonfar.png and b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonfar.png differ
diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonmedium.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonmedium.png
index 5f8e89aec24f..cb5940779eaa 100644
Binary files a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonmedium.png and b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonmedium.png differ
diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonnull.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonnull.png
index a309d053e593..668c8fa9b8a3 100644
Binary files a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonnull.png and b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonnull.png differ
diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-crew.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-crew.png
index af24601880eb..26b5c3b3dc6d 100644
Binary files a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-crew.png and b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-crew.png differ
diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-crewprox.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-crewprox.png
index c1472880855d..4424d1aba7ec 100644
Binary files a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-crewprox.png and b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-crewprox.png differ
diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-station.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-station.png
index 2b931884db42..d1f10db2dda5 100644
Binary files a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-station.png and b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-station.png differ
diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-syndicate.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-syndicate.png
index 66c0b9dec097..f1d53a88598b 100644
Binary files a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-syndicate.png and b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-syndicate.png differ
diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-way.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-way.png
index 478750439f09..b11dcbff9cc4 100644
Binary files a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-way.png and b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-way.png differ
diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer.png
index 24c7e0dc68da..86fb1f2380c8 100644
Binary files a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer.png and b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer.png differ
diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer_thief.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer_thief.png
index 745d26ac490b..5e62b9ef8d22 100644
Binary files a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer_thief.png and b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer_thief.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/carp.rsi/holocarpplush-inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/holocarpplush-inhand-left.png
new file mode 100644
index 000000000000..7f22ecc21d5b
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/holocarpplush-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/carp.rsi/holocarpplush-inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/holocarpplush-inhand-right.png
new file mode 100644
index 000000000000..b5399af14b6d
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/holocarpplush-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/carp.rsi/magicarpplush-inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/magicarpplush-inhand-left.png
new file mode 100644
index 000000000000..234e7c2de0a4
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/magicarpplush-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/carp.rsi/magicarpplush-inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/magicarpplush-inhand-right.png
new file mode 100644
index 000000000000..d97fd28bbaf1
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/magicarpplush-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Fun/Plushies/carp.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/meta.json
index 8b92838d06f5..60d184a0dbf2 100644
--- a/Resources/Textures/Objects/Fun/Plushies/carp.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-NC-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, holoplush and magicplush modified by deltanedas (github), rainbowcarplush and inhand sprites modified from carpplush and inhand sprites by ArtisticRoomba",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, holoplush and magicplush modified by deltanedas (github), rainbowcarplush and inhand sprites modified from carpplush and inhand sprites by ArtisticRoomba, magicarp and holocarp inhand sprites by TiniestShark (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -21,6 +21,14 @@
         {
             "name": "magicplush"
         },
+        {
+            "name": "magicarpplush-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "magicarpplush-inhand-right",
+            "directions": 4
+        },
         {
             "name": "holoplush",
             "delays": [
@@ -42,6 +50,122 @@
                 ]
             ]
         },
+        {
+            "name": "holocarpplush-inhand-left",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.3,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.3,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.3,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "holocarpplush-inhand-right",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.3,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.3,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.3,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
         {
             "name": "rainbowcarpplush"
         },
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idquartermaster.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idquartermaster.png
index bfdd06787249..e1fb5e5f62e4 100644
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/idquartermaster.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/idquartermaster.png differ
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
index 4ab1360865be..b17aa398dd7b 100644
--- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
@@ -1,284 +1,284 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github), idvisitor by IProduceWidgets (Github), idintern-service by spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github), wizard and idwizard by ScarKy0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "default"
-    },
-    {
-      "name": "centcom"
-    },
-    {
-      "name": "admin"
-    },
-    {
-      "name": "ert_chaplain"
-    },
-    {
-      "name": "ert_commander"
-    },
-    {
-      "name": "ert_engineer"
-    },
-    {
-      "name": "ert_janitor"
-    },
-    {
-      "name": "ert_medic"
-    },
-    {
-      "name": "ert_security"
-    },
-    {
-      "name": "gold"
-    },
-    {
-      "name": "idassistant"
-    },
-    {
-      "name": "idatmospherictechnician"
-    },
-    {
-      "name": "idbartender"
-    },
-    {
-      "name": "idbotanist"
-    },
-    {
-      "name": "idboxer"
-    },
-    {
-      "name": "idcaptain"
-    },
-    {
-      "name": "idcargotechnician"
-    },
-    {
-      "name": "idcentcom"
-    },
-    {
-      "name": "idchaplain"
-    },
-    {
-      "name": "idchemist"
-    },
-    {
-      "name": "idchiefengineer"
-    },
-    {
-      "name": "idchiefmedicalofficer"
-    },
-    {
-      "name": "idclown"
-    },
-    {
-      "name": "idcook"
-    },
-    {
-      "name": "idcurator"
-    },
-    {
-      "name": "iddetective"
-    },
-    {
-      "name": "idgeneticist"
-    },
-    {
-      "name": "idheadofpersonnel"
-    },
-    {
-      "name": "idheadofsecurity"
-    },
-    {
-      "name": "idbrigmedic"
-    },
-    {
-      "name": "idjanitor"
-    },
-    {
-      "name": "idlawyer"
-    },
-    {
-      "name": "idmedicaldoctor"
-    },
-    {
-      "name": "idmime"
-    },
-    {
-      "name": "idparamedic"
-    },
-    {
-      "name": "idpsychologist"
-    },
-    {
-      "name": "idreporter"
-    },
-    {
-      "name": "idprisoner"
-    },
-    {
-      "name": "idquartermaster"
-    },
-    {
-      "name": "idresearchdirector"
-    },
-    {
-      "name": "idroboticist"
-    },
-    {
-      "name": "idscientist"
-    },
-    {
-      "name": "idsecurityofficer"
-    },
-    {
-      "name": "idshaftminer"
-    },
-    {
-      "name": "idstationengineer"
-    },
-    {
-      "name": "idunknown"
-    },
-    {
-      "name": "idvirologist"
-    },
-    {
-      "name": "idvisitor"
-    },
-    {
-      "name": "idwarden"
-    },
-    {
-      "name": "idmusician"
-    },
-    {
-      "name": "idzookeeper"
-    },
-    {
-      "name": "idintern-sci"
-    },
-    {
-      "name": "idintern-cadet"
-    },
-    {
-      "name": "idintern-med"
-    },
-    {
-      "name": "idintern-service"
-    },
-    {
-      "name": "idintern-tech"
-    },
-    {
-      "name": "idadmin"
-    },
-    {
-      "name": "orange"
-    },
-    {
-      "name": "pirate"
-    },
-    {
-      "name": "prisoner_001"
-    },
-    {
-      "name": "prisoner_002"
-    },
-    {
-      "name": "prisoner_003"
-    },
-    {
-      "name": "prisoner_004"
-    },
-    {
-      "name": "prisoner_005"
-    },
-    {
-      "name": "prisoner_006"
-    },
-    {
-      "name": "prisoner_007"
-    },
-    {
-      "name": "silver"
-    },
-    {
-      "name": "syndie"
-    },
-    {
-      "name": "idcluwne"
-    },
-    {
-      "name": "idseniorengineer"
-    },
-    {
-      "name": "idseniorresearcher"
-    },
-    {
-      "name": "idseniorphysician"
-    },
-    {
-      "name": "idseniorofficer"
-    },
-    {
-      "name": "wizard"
-    },
-    {
-      "name": "idwizard"
-    },
-    {
-      "name": "gold-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "gold-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "default-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "default-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "silver-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "silver-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "orange-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "orange-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "blue-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "blue-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "green-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "green-inhand-right",
-      "directions": 4
-    }
-  ]
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github), idvisitor by IProduceWidgets (Github), idintern-service by spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github), wizard and idwizard by ScarKy0 | idboxer and idlawyer recoloured by K-Dynamic (github) | idquartermaster modified by K-Dynamic (github) | idboxer and idlawyer recoloured by K-Dynamic (github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "default"
+        },
+        {
+            "name": "centcom"
+        },
+        {
+            "name": "admin"
+        },
+        {
+            "name": "ert_chaplain"
+        },
+        {
+            "name": "ert_commander"
+        },
+        {
+            "name": "ert_engineer"
+        },
+        {
+            "name": "ert_janitor"
+        },
+        {
+            "name": "ert_medic"
+        },
+        {
+            "name": "ert_security"
+        },
+        {
+            "name": "gold"
+        },
+        {
+            "name": "idassistant"
+        },
+        {
+            "name": "idatmospherictechnician"
+        },
+        {
+            "name": "idbartender"
+        },
+        {
+            "name": "idbotanist"
+        },
+        {
+            "name": "idboxer"
+        },
+        {
+            "name": "idcaptain"
+        },
+        {
+            "name": "idcargotechnician"
+        },
+        {
+            "name": "idcentcom"
+        },
+        {
+            "name": "idchaplain"
+        },
+        {
+            "name": "idchemist"
+        },
+        {
+            "name": "idchiefengineer"
+        },
+        {
+            "name": "idchiefmedicalofficer"
+        },
+        {
+            "name": "idclown"
+        },
+        {
+            "name": "idcook"
+        },
+        {
+            "name": "idcurator"
+        },
+        {
+            "name": "iddetective"
+        },
+        {
+            "name": "idgeneticist"
+        },
+        {
+            "name": "idheadofpersonnel"
+        },
+        {
+            "name": "idheadofsecurity"
+        },
+        {
+            "name": "idbrigmedic"
+        },
+        {
+            "name": "idjanitor"
+        },
+        {
+            "name": "idlawyer"
+        },
+        {
+            "name": "idmedicaldoctor"
+        },
+        {
+            "name": "idmime"
+        },
+        {
+            "name": "idparamedic"
+        },
+        {
+            "name": "idpsychologist"
+        },
+        {
+            "name": "idreporter"
+        },
+        {
+            "name": "idprisoner"
+        },
+        {
+            "name": "idquartermaster"
+        },
+        {
+            "name": "idresearchdirector"
+        },
+        {
+            "name": "idroboticist"
+        },
+        {
+            "name": "idscientist"
+        },
+        {
+            "name": "idsecurityofficer"
+        },
+        {
+            "name": "idshaftminer"
+        },
+        {
+            "name": "idstationengineer"
+        },
+        {
+            "name": "idunknown"
+        },
+        {
+            "name": "idvirologist"
+        },
+        {
+            "name": "idvisitor"
+        },
+        {
+            "name": "idwarden"
+        },
+        {
+            "name": "idmusician"
+        },
+        {
+            "name": "idzookeeper"
+        },
+        {
+            "name": "idintern-sci"
+        },
+        {
+            "name": "idintern-cadet"
+        },
+        {
+            "name": "idintern-med"
+        },
+        {
+            "name": "idintern-service"
+        },
+        {
+            "name": "idintern-tech"
+        },
+        {
+            "name": "idadmin"
+        },
+        {
+            "name": "orange"
+        },
+        {
+            "name": "pirate"
+        },
+        {
+            "name": "prisoner_001"
+        },
+        {
+            "name": "prisoner_002"
+        },
+        {
+            "name": "prisoner_003"
+        },
+        {
+            "name": "prisoner_004"
+        },
+        {
+            "name": "prisoner_005"
+        },
+        {
+            "name": "prisoner_006"
+        },
+        {
+            "name": "prisoner_007"
+        },
+        {
+            "name": "silver"
+        },
+        {
+            "name": "syndie"
+        },
+        {
+            "name": "idcluwne"
+        },
+        {
+            "name": "idseniorengineer"
+        },
+        {
+            "name": "idseniorresearcher"
+        },
+        {
+            "name": "idseniorphysician"
+        },
+        {
+            "name": "idseniorofficer"
+        },
+        {
+            "name": "wizard"
+        },
+        {
+            "name": "idwizard"
+        },
+        {
+            "name": "gold-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "gold-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "default-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "default-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "silver-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "silver-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "orange-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "orange-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "blue-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "blue-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "green-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "green-inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json
index e4604b165f39..e138281ef612 100644
--- a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Janitorial/janitorial.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, mopbucket_shark_* by Psychpsyo, mopbucket_carpplush adapted by Psychpsyo from tgstation carpplush at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, mopbucket_cube is monkey cube taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi and modified by Hrosts",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, mopbucket_shark_* by Psychpsyo, mopbucket_carpplush adapted by Psychpsyo from tgstation carpplush at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, mopbucket_cube is monkey cube taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi and modified by Hrosts, Holocarp and Magicarp mopbucket sprites by TiniestShark (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -37,6 +37,29 @@
     {
       "name": "mopbucket_carpplush"
     },
+    {
+      "name": "mopbucket_magicarpplush"
+    },
+    {
+      "name": "mopbucket_holocarpplush",
+      "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
+          ]
+      ]
+    },
     {
       "name": "mopbucket_cube"
     },
diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_holocarpplush.png b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_holocarpplush.png
new file mode 100644
index 000000000000..149f3e864f36
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_holocarpplush.png differ
diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_magicarpplush.png b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_magicarpplush.png
new file mode 100644
index 000000000000..17ee679df809
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_magicarpplush.png differ
diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/cart_goldenplunger.png b/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/cart_goldenplunger.png
new file mode 100644
index 000000000000..13988bf1c404
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/cart_goldenplunger.png differ
diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json
index 28617ac255b2..7e5a11d313de 100644
--- a/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "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, cart_goldenplunger modified from cart_plunger by TiniestShark (github)",
     "states": [
         {
             "name": "cart",
@@ -55,6 +55,10 @@
             "name": "cart_plunger",
             "directions": 4
         },
+        {
+            "name": "cart_goldenplunger",
+            "directions": 4
+        },
         {
             "name": "icon-cart"
         },
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark-marble-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark-marble-inhand-left.png
new file mode 100644
index 000000000000..2f8e257064d2
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/dark-marble-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark-marble-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark-marble-inhand-right.png
new file mode 100644
index 000000000000..4a4ad2babab1
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/dark-marble-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/dark-marble.png b/Resources/Textures/Objects/Tiles/tile.rsi/dark-marble.png
new file mode 100644
index 000000000000..bde15f9859ce
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/dark-marble.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
index 3902610d1568..749093b344f0 100644
--- a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
+++ b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
@@ -581,6 +581,50 @@
         },
         {
             "name": "dark-squiggly"
+        },
+	{
+	    "name": "white-marble"
+	},
+	{
+            "name": "white-marble-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "white-marble-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "dark-marble"
+        },
+        {
+            "name": "dark-marble-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "dark-marble-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "plasmarble"
+        },
+        {
+            "name": "plasmarble-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "plasmarble-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "uranium-marble"
+        },
+        {
+            "name": "uranium-marble-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "uranium-marble-inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/plasmarble-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/plasmarble-inhand-left.png
new file mode 100644
index 000000000000..4300d7f162c5
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/plasmarble-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/plasmarble-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/plasmarble-inhand-right.png
new file mode 100644
index 000000000000..7004a2f817fa
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/plasmarble-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/plasmarble.png b/Resources/Textures/Objects/Tiles/tile.rsi/plasmarble.png
new file mode 100644
index 000000000000..07cf925c79e4
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/plasmarble.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/uranium-marble-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/uranium-marble-inhand-left.png
new file mode 100644
index 000000000000..7b01e4de4bc9
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/uranium-marble-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/uranium-marble-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/uranium-marble-inhand-right.png
new file mode 100644
index 000000000000..73e08b50b1f8
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/uranium-marble-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/uranium-marble.png b/Resources/Textures/Objects/Tiles/tile.rsi/uranium-marble.png
new file mode 100644
index 000000000000..fdf5d3c9bf7f
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/uranium-marble.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white-marble-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/white-marble-inhand-left.png
new file mode 100644
index 000000000000..1d4041430594
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/white-marble-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white-marble-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/white-marble-inhand-right.png
new file mode 100644
index 000000000000..08b6a5530fec
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/white-marble-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/white-marble.png b/Resources/Textures/Objects/Tiles/tile.rsi/white-marble.png
new file mode 100644
index 000000000000..ac32ff3d9b32
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/white-marble.png differ
diff --git a/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/activated.png b/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/activated.png
index 07785ce832f0..81815fa4e705 100644
Binary files a/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/activated.png and b/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/activated.png differ
diff --git a/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/icon.png b/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/icon.png
index 426106d04691..1856cc3fe5c8 100644
Binary files a/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/meta.json b/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/meta.json
index 664e16d42c20..5a890d67d5c3 100644
--- a/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Bombs/hot_potato.rsi/meta.json
@@ -1,23 +1,23 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "icon from potato.rsi & modified activated by Prole0 (GitHub)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "activated",
-      "delays": [
-        [
-          0.1,
-          0.1
-        ]
-      ]
-    }
-  ]
-}
\ No newline at end of file
+    "states": [
+        {
+      "name": "icon"
+        },
+        {
+            "name": "activated",
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Parallaxes/attributions.yml b/Resources/Textures/Parallaxes/attributions.yml
index f980eafaece0..ec4b2d8e051d 100644
--- a/Resources/Textures/Parallaxes/attributions.yml
+++ b/Resources/Textures/Parallaxes/attributions.yml
@@ -3,7 +3,7 @@
   copyright: "by Adipemdragon for tgstation, taken at commit 3839e860a7f3102b1488285d3319f61bbfe1fa51 from parallax.dmi"
   source: "https://github.com/tgstation/tgstation"
 
-- files: ["KettleParallaxNeb.png", "KettleParallaxBG.png", "AspidParallaxBG.png", "AspidParallaxBG.png"]
+- files: ["KettleParallaxNeb.png", "KettleParallaxBG.png", "AspidParallaxBG.png", "AspidParallaxBG.png", "purple_nebula.png"]
   license: "CC0-1.0"
   copyright: "adapted from Screaming Brain Studios"
   source: "https://opengameart.org/content/seamless-space-backgrounds"
diff --git a/Resources/Textures/Parallaxes/purple_nebula.png b/Resources/Textures/Parallaxes/purple_nebula.png
new file mode 100644
index 000000000000..f4d187b7a1a1
Binary files /dev/null and b/Resources/Textures/Parallaxes/purple_nebula.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/Structures/Storage/closet.rsi/meta.json
index f3295b971831..0410577a1c6a 100644
--- a/Resources/Textures/Structures/Storage/closet.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/closet.rsi/meta.json
@@ -603,6 +603,9 @@
         },
         {
             "name": "representative_door"
+        },
+        {
+            "name": "panel_open"
         }
     ]
 }
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/panel_open.png b/Resources/Textures/Structures/Storage/closet.rsi/panel_open.png
new file mode 100644
index 000000000000..2e7e9b714428
Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet.rsi/panel_open.png differ
diff --git a/Resources/Textures/Tiles/attributions.yml b/Resources/Textures/Tiles/attributions.yml
index 65b977ac1c1e..4999508701ca 100644
--- a/Resources/Textures/Tiles/attributions.yml
+++ b/Resources/Textures/Tiles/attributions.yml
@@ -150,3 +150,8 @@
   license: "CC-BY-SA-3.0"
   copyright: "Created by obscenelytinyshark for space-station-14."
   source: "https://github.com/space-wizards/space-station-14/"
+
+- files: ["dark_marble.png", "white_marble.png", "plasmarble.png", "uranium_marble.png"]
+  license: "CC0-1.0"
+  copyright: "Created by SeaWyrm"
+  source: "https://github.com/space-wizards/space-station-14/pull/38007"
diff --git a/Resources/Textures/Tiles/dark_marble.png b/Resources/Textures/Tiles/dark_marble.png
new file mode 100644
index 000000000000..c603c02a1723
Binary files /dev/null and b/Resources/Textures/Tiles/dark_marble.png differ
diff --git a/Resources/Textures/Tiles/plasmarble.png b/Resources/Textures/Tiles/plasmarble.png
new file mode 100644
index 000000000000..5f35112b3aa5
Binary files /dev/null and b/Resources/Textures/Tiles/plasmarble.png differ
diff --git a/Resources/Textures/Tiles/uranium_marble.png b/Resources/Textures/Tiles/uranium_marble.png
new file mode 100644
index 000000000000..bd988ac465c1
Binary files /dev/null and b/Resources/Textures/Tiles/uranium_marble.png differ
diff --git a/Resources/Textures/Tiles/white_marble.png b/Resources/Textures/Tiles/white_marble.png
new file mode 100644
index 000000000000..d67c549b3bd1
Binary files /dev/null and b/Resources/Textures/Tiles/white_marble.png differ
diff --git a/Resources/Textures/_Starlight/Clothing/Head/Hardsuits/luxmax.rsi/icon-flash.png b/Resources/Textures/_Starlight/Clothing/Head/Hardsuits/luxmax.rsi/icon-flash.png
new file mode 100644
index 000000000000..2026f54aa958
Binary files /dev/null and b/Resources/Textures/_Starlight/Clothing/Head/Hardsuits/luxmax.rsi/icon-flash.png differ
diff --git a/Resources/Textures/_Starlight/Clothing/Head/Hardsuits/luxmax.rsi/meta.json b/Resources/Textures/_Starlight/Clothing/Head/Hardsuits/luxmax.rsi/meta.json
index b42b494da9f4..ebc9db20e0fd 100644
--- a/Resources/Textures/_Starlight/Clothing/Head/Hardsuits/luxmax.rsi/meta.json
+++ b/Resources/Textures/_Starlight/Clothing/Head/Hardsuits/luxmax.rsi/meta.json
@@ -1,22 +1,33 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "made by stickycheZ101",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "made by stickycheZ101",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "equipped-HELMET-vox",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon-flash"
+        },
+        {
+            "name": "on-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "on-equipped-HELMET-vox",
+            "directions": 4
+        },
+        {
+            "name": "off-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "off-equipped-HELMET-vox",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/_Starlight/Clothing/Head/Hardsuits/luxmax.rsi/equipped-HELMET-vox.png b/Resources/Textures/_Starlight/Clothing/Head/Hardsuits/luxmax.rsi/off-equipped-HELMET-vox.png
similarity index 100%
rename from Resources/Textures/_Starlight/Clothing/Head/Hardsuits/luxmax.rsi/equipped-HELMET-vox.png
rename to Resources/Textures/_Starlight/Clothing/Head/Hardsuits/luxmax.rsi/off-equipped-HELMET-vox.png
diff --git a/Resources/Textures/_Starlight/Clothing/Head/Hardsuits/luxmax.rsi/equipped-HELMET.png b/Resources/Textures/_Starlight/Clothing/Head/Hardsuits/luxmax.rsi/off-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/_Starlight/Clothing/Head/Hardsuits/luxmax.rsi/equipped-HELMET.png
rename to Resources/Textures/_Starlight/Clothing/Head/Hardsuits/luxmax.rsi/off-equipped-HELMET.png
diff --git a/Resources/Textures/_Starlight/Clothing/Head/Hardsuits/luxmax.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/_Starlight/Clothing/Head/Hardsuits/luxmax.rsi/on-equipped-HELMET-vox.png
new file mode 100644
index 000000000000..95de3ca646b1
Binary files /dev/null and b/Resources/Textures/_Starlight/Clothing/Head/Hardsuits/luxmax.rsi/on-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/_Starlight/Clothing/Head/Hardsuits/luxmax.rsi/on-equipped-HELMET.png b/Resources/Textures/_Starlight/Clothing/Head/Hardsuits/luxmax.rsi/on-equipped-HELMET.png
new file mode 100644
index 000000000000..da4c88cb4766
Binary files /dev/null and b/Resources/Textures/_Starlight/Clothing/Head/Hardsuits/luxmax.rsi/on-equipped-HELMET.png differ
diff --git a/Resources/Textures/_Starlight/Interface/Alerts/offer.rsi/meta.json b/Resources/Textures/_Starlight/Interface/Alerts/offer.rsi/meta.json
new file mode 100644
index 000000000000..0afb81f36cf5
--- /dev/null
+++ b/Resources/Textures/_Starlight/Interface/Alerts/offer.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Original icon taken from https://github.com/ss220-space/Paradise/blob/master220/icons/mob/screen_alert.dmi, modified by Mocho",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "offer"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_Starlight/Interface/Alerts/offer.rsi/offer.png b/Resources/Textures/_Starlight/Interface/Alerts/offer.rsi/offer.png
new file mode 100644
index 000000000000..44ac380ddb19
Binary files /dev/null and b/Resources/Textures/_Starlight/Interface/Alerts/offer.rsi/offer.png differ
diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/doxesthecaptain.rsi/equipped-HELMET.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/doxesthecaptain.rsi/equipped-HELMET.png
new file mode 100644
index 000000000000..844aea369427
Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/doxesthecaptain.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/doxesthecaptain.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/doxesthecaptain.rsi/icon.png
new file mode 100644
index 000000000000..8e423d32062a
Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/doxesthecaptain.rsi/icon.png differ
diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/doxesthecaptain.rsi/inhand-left.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/doxesthecaptain.rsi/inhand-left.png
new file mode 100644
index 000000000000..ce6c9709c04d
Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/doxesthecaptain.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/doxesthecaptain.rsi/inhand-right.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/doxesthecaptain.rsi/inhand-right.png
new file mode 100644
index 000000000000..3db0894e1aee
Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/doxesthecaptain.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/doxesthecaptain.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/doxesthecaptain.rsi/meta.json
new file mode 100644
index 000000000000..d22d59071df1
--- /dev/null
+++ b/Resources/Textures/_Starlight/Objects/Fun/Plushies/doxesthecaptain.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-SA-3.0",
+    "copyright": "Edit (By Conflee and SanityGecko) of sprites taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, equipped-HELMET sprite made by Cinder, in-hand lizard plushie sprites by KieueCaprie, plushie_lizard_inversed and inhand sprites modified from plushie_lizard_mirrored and plushielizard-inhand-left, plushielizard-inhand-right by ArtisticRoomba",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/killa_plushie.rsi/KillaTamalePlush.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/killa_plushie.rsi/KillaTamalePlush.png
new file mode 100644
index 000000000000..82a75ee20ab4
Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/killa_plushie.rsi/KillaTamalePlush.png differ
diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/killa_plushie.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/killa_plushie.rsi/meta.json
new file mode 100644
index 000000000000..0125d77b8a7a
--- /dev/null
+++ b/Resources/Textures/_Starlight/Objects/Fun/Plushies/killa_plushie.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+  "version": 2,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "IQlvlZero",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "KillaTamalePlush"
+    }
+  ]
+}
diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plush.rsi/equipped-HELMET.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plush.rsi/equipped-HELMET.png
new file mode 100644
index 000000000000..c51ce765a62d
Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plush.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plush.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plush.rsi/icon.png
new file mode 100644
index 000000000000..795b6eada5ef
Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plush.rsi/icon.png differ
diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plush.rsi/inhand-left.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plush.rsi/inhand-left.png
new file mode 100644
index 000000000000..b9d928e3002e
Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plush.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plush.rsi/inhand-right.png b/Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plush.rsi/inhand-right.png
new file mode 100644
index 000000000000..370c91d91707
Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plush.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plush.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plush.rsi/meta.json
new file mode 100644
index 000000000000..c867965f28ad
--- /dev/null
+++ b/Resources/Textures/_Starlight/Objects/Fun/Plushies/koni_plush.rsi/meta.json
@@ -0,0 +1,28 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Character by neomoth (https://neomoth.dev), spritework by @leg3__ (discord)",
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/ntnc_pulse.rsi/base.png b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/ntnc_pulse.rsi/base.png
new file mode 100644
index 000000000000..b4f7801847bb
Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/ntnc_pulse.rsi/base.png differ
diff --git a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/ntnc_pulse.rsi/equipped-BACKPACK.png b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/ntnc_pulse.rsi/equipped-BACKPACK.png
new file mode 100644
index 000000000000..be0f0dc8b0bc
Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/ntnc_pulse.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/ntnc_pulse.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/ntnc_pulse.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 000000000000..be0f0dc8b0bc
Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/ntnc_pulse.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/ntnc_pulse.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/ntnc_pulse.rsi/icon.png
new file mode 100644
index 000000000000..b4f7801847bb
Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/ntnc_pulse.rsi/icon.png differ
diff --git a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/ntnc_pulse.rsi/inhand-left.png b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/ntnc_pulse.rsi/inhand-left.png
new file mode 100644
index 000000000000..9ba28e4a843c
Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/ntnc_pulse.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/ntnc_pulse.rsi/inhand-right.png b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/ntnc_pulse.rsi/inhand-right.png
new file mode 100644
index 000000000000..95c4aac434d6
Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/ntnc_pulse.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/ntnc_pulse.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/ntnc_pulse.rsi/meta.json
new file mode 100644
index 000000000000..2aa359c118f3
--- /dev/null
+++ b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/ntnc_pulse.rsi/meta.json
@@ -0,0 +1,41 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by ItsAbby",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/ntnc_pulse.rsi/wielded-inhand-left.png b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/ntnc_pulse.rsi/wielded-inhand-left.png
new file mode 100644
index 000000000000..72502f0d6984
Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/ntnc_pulse.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/ntnc_pulse.rsi/wielded-inhand-right.png b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/ntnc_pulse.rsi/wielded-inhand-right.png
new file mode 100644
index 000000000000..2b9f48a5a240
Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Weapons/Guns/Battery/ntnc_pulse.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/_Starlight/Structures/Decorations/Statues.rsi/meta.json b/Resources/Textures/_Starlight/Structures/Decorations/Statues.rsi/meta.json
index 8b6fe03d457a..f1a2d3b9245a 100644
--- a/Resources/Textures/_Starlight/Structures/Decorations/Statues.rsi/meta.json
+++ b/Resources/Textures/_Starlight/Structures/Decorations/Statues.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Stone tea statue by slycoolgamer",
+  "copyright": "Stone tea statue by slycoolgamer, one year statue by Trosling",
   "size": {
     "x": 32,
     "y": 64
@@ -9,6 +9,9 @@
   "states": [
     {
       "name": "stone_tea"
+    },
+    {
+      "name": "one_year_anniversary"
     }
   ]
 }
diff --git a/Resources/Textures/_Starlight/Structures/Decorations/Statues.rsi/one_year_anniversary.png b/Resources/Textures/_Starlight/Structures/Decorations/Statues.rsi/one_year_anniversary.png
new file mode 100644
index 000000000000..01e029e45f98
Binary files /dev/null and b/Resources/Textures/_Starlight/Structures/Decorations/Statues.rsi/one_year_anniversary.png differ
diff --git a/Resources/Textures/_Starlight/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/_Starlight/Structures/Storage/closet.rsi/meta.json
index c56b124b6a5d..fcd9619d9e4d 100644
--- a/Resources/Textures/_Starlight/Structures/Storage/closet.rsi/meta.json
+++ b/Resources/Textures/_Starlight/Structures/Storage/closet.rsi/meta.json
@@ -48,6 +48,9 @@
         },
         {
             "name": "miner_open"
+        },
+        {
+            "name": "panel_open"
         }
     ]
 }
diff --git a/Resources/Textures/_Starlight/Structures/Storage/closet.rsi/panel_open.png b/Resources/Textures/_Starlight/Structures/Storage/closet.rsi/panel_open.png
new file mode 100644
index 000000000000..2e7e9b714428
Binary files /dev/null and b/Resources/Textures/_Starlight/Structures/Storage/closet.rsi/panel_open.png differ
diff --git a/Resources/engineCommandPerms.yml b/Resources/engineCommandPerms.yml
index 6b78207c4f96..3974c42d8ebb 100644
--- a/Resources/engineCommandPerms.yml
+++ b/Resources/engineCommandPerms.yml
@@ -40,6 +40,9 @@
   - hwid
   - showaudio
   - showpos
+  - showvel
+  - showrot
+  - showangvel
   - showray
   - showchunkbb
   - showgridnodes
@@ -60,7 +63,7 @@
   - watch
   - sendgarbage
   - setinputcontext
-  - showvelocities
+  - showplayervelocity
   - tilelookup
   - net_entityreport
   - scene
diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml
index 575cacb36f92..851d0eddd3e3 100644
--- a/Resources/keybinds.yml
+++ b/Resources/keybinds.yml
@@ -188,11 +188,9 @@ binds:
   type: State
   key: Z
   mod1: Alt
-# 🌟Starlight🌟
 - function: OpenCharacterMenu
   type: State
-  key: C
-  mod1: Shift
+  key: U
 - function: OpenEmotesMenu
   type: State
   key: Y
diff --git a/RobustToolbox b/RobustToolbox
index 56eda3ea9291..51c929c8ecb0 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 56eda3ea92913e60c27aa029ba7877c8559dfe9d
+Subproject commit 51c929c8ecb08e84aa695012dabc0b25bd71b8ca
diff --git a/Tools/actions_changelogs_since_last_run.py b/Tools/actions_changelogs_since_last_run.py
index a2384485f745..0a71d6b32cf7 100755
--- a/Tools/actions_changelogs_since_last_run.py
+++ b/Tools/actions_changelogs_since_last_run.py
@@ -20,7 +20,7 @@
 GITHUB_API_URL = os.environ.get("GITHUB_API_URL", "https://api.github.com")
 
 DISCORD_WEBHOOK_URL = os.environ.get("DISCORD_WEBHOOK_URL")
-DISCORD_CHANGELOG_ROLE_ID = 1308143973684088883
+DISCORD_CHANGELOG_ROLE_ID = int(os.environ.get("DISCORD_CHANGELOG_ROLE_ID", "1308143973684088883"))
 
 CHANGELOG_FILE = "Resources/Changelog/ChangelogStarlight.yml"
 TYPES_TO_EMOJI = {"Fix": "🐛", "Add": "🆕", "Remove": "❌", "Tweak": "⚒️"}
@@ -51,7 +51,7 @@ def main():
         print("No new entries to report.")
         return
 
-    ping_role_once(DISCORD_CHANGELOG_ROLE_ID)
+    ping_role_once(str(DISCORD_CHANGELOG_ROLE_ID))
 
     pr_groups = group_entries_by_pr(new_entries)
     for pr_id, entries in pr_groups.items():
@@ -179,9 +179,9 @@ def build_embed_for_pr(pr_id: str, entries: list[ChangelogEntry]) -> dict[str, A
     embed: dict[str, Any] = {
         "title": title,
         "description": description,
-        "fields": [
-            {"name": "Author(s)", "value": author_field[:EMBED_FIELD_VALUE_LIMIT], "inline": False}
-        ],
+  #      "fields": [
+  #          {"name": "Author(s)", "value": author_field[:EMBED_FIELD_VALUE_LIMIT], "inline": False}
+  #      ],
         "footer": {"text": "Starlight changelog"},
         "timestamp": time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime()),
     }